about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-08-08 18:01:03 +0000
committerGitHub <noreply@github.com>2021-08-08 18:01:03 +0000
commit610ef47b2030813fcc9017eeda5bfd7621851bc3 (patch)
treef502bfbbebabe66c056a0db027bdfbbf200c052f
parent0b7e5da7bda5ae262fe09d0397b37dd4b46e04b6 (diff)
parent717538e9082a42d97dce9f53740045a73865b18e (diff)
downloadnixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar.gz
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar.bz2
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar.lz
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar.xz
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.tar.zst
nixlib-610ef47b2030813fcc9017eeda5bfd7621851bc3.zip
Merge master into staging-next
-rw-r--r--maintainers/maintainer-list.nix18
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
-rw-r--r--nixos/modules/security/acme.nix54
-rw-r--r--nixos/modules/security/polkit.nix2
-rw-r--r--nixos/modules/services/mail/nullmailer.nix2
-rw-r--r--nixos/modules/services/misc/nitter.nix25
-rw-r--r--nixos/modules/services/networking/mullvad-vpn.nix6
-rw-r--r--nixos/modules/services/networking/ntp/chrony.nix29
-rw-r--r--nixos/modules/services/networking/tinc.nix5
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix4
-rw-r--r--nixos/modules/services/web-servers/nginx/vhost-options.nix2
-rw-r--r--nixos/modules/system/boot/systemd.nix1
-rw-r--r--nixos/modules/virtualisation/containerd.nix1
-rw-r--r--nixos/tests/acme.nix8
-rw-r--r--nixos/tests/bazarr.nix2
-rw-r--r--nixos/tests/nitter.nix6
-rw-r--r--nixos/tests/wireguard/wg-quick.nix2
-rw-r--r--pkgs/applications/audio/boops/default.nix4
-rw-r--r--pkgs/applications/audio/helvum/default.nix6
-rw-r--r--pkgs/applications/blockchains/lndconnect/default.nix2
-rw-r--r--pkgs/applications/blockchains/turbo-geth/default.nix2
-rw-r--r--pkgs/applications/misc/ausweisapp2/default.nix4
-rw-r--r--pkgs/applications/misc/cherrytree/default.nix4
-rw-r--r--pkgs/applications/misc/elogind/default.nix4
-rw-r--r--pkgs/applications/misc/zola/default.nix10
-rw-r--r--pkgs/applications/networking/browsers/lagrange/default.nix21
-rw-r--r--pkgs/applications/science/misc/cwltool/default.nix41
-rw-r--r--pkgs/applications/terminal-emulators/foot/default.nix12
-rw-r--r--pkgs/applications/version-management/git-and-tools/ghq/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix2
-rw-r--r--pkgs/applications/video/kodi-packages/requests-cache/default.nix29
-rw-r--r--pkgs/applications/video/kodi-packages/routing/default.nix25
-rw-r--r--pkgs/applications/video/kodi-packages/steam-library/default.nix27
-rw-r--r--pkgs/data/themes/orchis-theme/default.nix4
-rw-r--r--pkgs/desktops/gnome/extensions/gsconnect/default.nix4
-rw-r--r--pkgs/development/compilers/llvm/git/clang/default.nix11
-rw-r--r--pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch4
-rw-r--r--pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch71
-rw-r--r--pkgs/development/compilers/llvm/git/compiler-rt/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/git/lldb/default.nix11
-rw-r--r--pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch26
-rw-r--r--pkgs/development/libraries/dqlite/default.nix4
-rw-r--r--pkgs/development/libraries/entt/default.nix4
-rw-r--r--pkgs/development/libraries/fcft/default.nix19
-rw-r--r--pkgs/development/libraries/java/commons/compress/default.nix4
-rw-r--r--pkgs/development/libraries/microsoft_gsl/default.nix2
-rw-r--r--pkgs/development/libraries/raft-canonical/default.nix9
-rw-r--r--pkgs/development/libraries/range-v3/default.nix2
-rw-r--r--pkgs/development/libraries/rocksdb/default.nix6
-rw-r--r--pkgs/development/libraries/tllist/default.nix11
-rw-r--r--pkgs/development/lisp-modules/clwrapper/default.nix2
-rw-r--r--pkgs/development/node-packages/node-packages.json1
-rw-r--r--pkgs/development/node-packages/node-packages.nix2238
-rw-r--r--pkgs/development/ocaml-modules/eliom/default.nix20
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-server/default.nix45
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-start/default.nix19
-rw-r--r--pkgs/development/python-modules/ansible/core.nix3
-rw-r--r--pkgs/development/python-modules/bagit/default.nix39
-rw-r--r--pkgs/development/python-modules/ledgerwallet/default.nix2
-rw-r--r--pkgs/development/python-modules/pytorch/default.nix5
-rw-r--r--pkgs/development/python-modules/resolvelib/default.nix9
-rw-r--r--pkgs/development/python-modules/schema-salad/default.nix45
-rw-r--r--pkgs/development/python-modules/shellescape/default.nix27
-rw-r--r--pkgs/development/python-modules/torchvision/default.nix24
-rw-r--r--pkgs/development/python-modules/trackpy/default.nix20
-rw-r--r--pkgs/development/tools/analysis/tflint/default.nix6
-rw-r--r--pkgs/development/tools/esbuild/default.nix4
-rw-r--r--pkgs/development/tools/fission/default.nix6
-rw-r--r--pkgs/development/tools/go-containerregistry/default.nix9
-rw-r--r--pkgs/development/tools/hcloud/default.nix6
-rw-r--r--pkgs/development/tools/misc/circleci-cli/default.nix6
-rwxr-xr-xpkgs/development/tools/rust/rust-analyzer/update.sh3
-rw-r--r--pkgs/development/tools/stylua/default.nix6
-rw-r--r--pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json2
-rw-r--r--pkgs/os-specific/linux/fwts/default.nix13
-rw-r--r--pkgs/servers/bazarr/default.nix2
-rw-r--r--pkgs/servers/dendrite/default.nix6
-rw-r--r--pkgs/servers/headscale/default.nix4
-rw-r--r--pkgs/servers/jackett/default.nix4
-rw-r--r--pkgs/servers/keycloak/default.nix4
-rw-r--r--pkgs/servers/mail/spamassassin/default.nix4
-rw-r--r--pkgs/servers/nitter/default.nix5
-rw-r--r--pkgs/servers/nosql/influxdb/default.nix6
-rw-r--r--pkgs/servers/sql/dolt/default.nix6
-rw-r--r--pkgs/tools/admin/acme.sh/default.nix4
-rw-r--r--pkgs/tools/admin/lxd/default.nix6
-rw-r--r--pkgs/tools/misc/czkawka/default.nix6
-rw-r--r--pkgs/tools/misc/grc/default.nix4
-rw-r--r--pkgs/tools/networking/eggdrop/default.nix4
-rw-r--r--pkgs/tools/networking/frp/default.nix6
-rw-r--r--pkgs/tools/networking/wifite2/default.nix7
-rw-r--r--pkgs/tools/networking/wireguard-tools/default.nix2
-rw-r--r--pkgs/tools/security/gpg-tui/default.nix6
-rw-r--r--pkgs/tools/text/epubcheck/default.nix4
-rw-r--r--pkgs/tools/virtualization/reg/default.nix26
-rw-r--r--pkgs/top-level/all-packages.nix20
-rw-r--r--pkgs/top-level/kodi-packages.nix6
-rw-r--r--pkgs/top-level/python-packages.nix6
99 files changed, 1841 insertions, 1436 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3ebd91d66f8f..4829cdb792d1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2289,6 +2289,12 @@
       fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
     }];
   };
+  d-xo = {
+    email = "hi@d-xo.org";
+    github = "d-xo";
+    githubId = 6689924;
+    name = "David Terry";
+  };
   dadada = {
     name = "dadada";
     email = "dadada@dadada.li";
@@ -3243,6 +3249,12 @@
       fingerprint = "2D37 1AD2 7E2B BC77 97E1  B759 6C79 278F 3FCD CC02";
     }];
   };
+  ereslibre = {
+    email = "ereslibre@ereslibre.es";
+    github = "ereslibre";
+    githubId = 8706;
+    name = "Rafael Fernández López";
+  };
   ericbmerritt = {
     email = "eric@afiniate.com";
     github = "ericbmerritt";
@@ -11710,12 +11722,6 @@
     githubId = 1962985;
     name = "Vincenzo Mantova";
   };
-  xwvvvvwx = {
-    email = "davidterry@posteo.de";
-    github = "xwvvvvwx";
-    githubId = 6689924;
-    name = "David Terry";
-  };
   xzfc = {
     email = "xzfcpw@gmail.com";
     github = "xzfc";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index d5bccd21735e..27175564e9d0 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -841,6 +841,15 @@
           version of zfs.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Nginx will use the value of
+          <literal>sslTrustedCertificate</literal> if provided for a
+          virtual host, even if <literal>enableACME</literal> is set.
+          This is useful for providers not using the same certificate to
+          sign OCSP responses and server certificates.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 54347750a678..8596cea10d7e 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -213,3 +213,5 @@ pt-services.clipcat.enable).
 - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up.
 
 - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs.
+
+- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates.
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 22bf34198a30..bcbd17d8e10e 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -21,15 +21,51 @@ let
   # The Group can vary depending on what the user has specified in
   # security.acme.certs.<cert>.group on some of the services.
   commonServiceConfig = {
-      Type = "oneshot";
-      User = "acme";
-      Group = mkDefault "acme";
-      UMask = 0022;
-      StateDirectoryMode = 750;
-      ProtectSystem = "full";
-      PrivateTmp = true;
-
-      WorkingDirectory = "/tmp";
+    Type = "oneshot";
+    User = "acme";
+    Group = mkDefault "acme";
+    UMask = 0022;
+    StateDirectoryMode = 750;
+    ProtectSystem = "strict";
+    ReadWritePaths = [
+      "/var/lib/acme"
+    ];
+    PrivateTmp = true;
+
+    WorkingDirectory = "/tmp";
+
+    CapabilityBoundingSet = [ "" ];
+    DevicePolicy = "closed";
+    LockPersonality = true;
+    MemoryDenyWriteExecute = true;
+    NoNewPrivileges = true;
+    PrivateDevices = true;
+    ProtectClock = true;
+    ProtectHome = true;
+    ProtectHostname = true;
+    ProtectControlGroups = true;
+    ProtectKernelLogs = true;
+    ProtectKernelModules = true;
+    ProtectKernelTunables = true;
+    ProtectProc = "invisible";
+    ProcSubset = "pid";
+    RemoveIPC = true;
+    RestrictAddressFamilies = [
+      "AF_INET"
+      "AF_INET6"
+    ];
+    RestrictNamespaces = true;
+    RestrictRealtime = true;
+    RestrictSUIDSGID = true;
+    SystemCallArchitectures = "native";
+    SystemCallFilter = [
+      # 1. allow a reasonable set of syscalls
+      "@system-service"
+      # 2. and deny unreasonable ones
+      "~@privileged @resources"
+      # 3. then allow the required subset within denied groups
+      "@chown"
+    ];
   };
 
   # In order to avoid race conditions creating the CA for selfsigned certs,
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index a6724bd75832..f556cca23cdc 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -96,8 +96,10 @@ in
     users.users.polkituser = {
       description = "PolKit daemon";
       uid = config.ids.uids.polkituser;
+      group = "polkituser";
     };
 
+    users.groups.polkituser = {};
   };
 
 }
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 09874ca0ed75..f9c345669978 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -220,7 +220,7 @@ with lib;
       after = [ "network.target" ];
 
       preStart = ''
-        mkdir -p /var/spool/nullmailer/{queue,tmp}
+        mkdir -p /var/spool/nullmailer/{queue,tmp,failed}
         rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
       '';
 
diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix
index 095a15f21f6a..301af76c336a 100644
--- a/nixos/modules/services/misc/nitter.nix
+++ b/nixos/modules/services/misc/nitter.nix
@@ -312,6 +312,31 @@ in
           AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
           Restart = "on-failure";
           RestartSec = "5s";
+          # Hardening
+          CapabilityBoundingSet = if (cfg.server.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
+          DeviceAllow = [ "" ];
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          PrivateDevices = true;
+          # A private user cannot have process capabilities on the host's user
+          # namespace and thus CAP_NET_BIND_SERVICE has no effect.
+          PrivateUsers = (cfg.server.port >= 1024);
+          ProcSubset = "pid";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
+          UMask = "0077";
         };
     };
 
diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
index 8ce71f26b3ee..9ec1ddc929e1 100644
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -9,6 +9,7 @@ with lib;
     default = false;
     description = ''
       This option enables Mullvad VPN daemon.
+      This sets <option>networking.firewall.checkReversePath</option> to "loose", which might be undesirable for security.
     '';
   };
 
@@ -18,6 +19,9 @@ with lib;
     # mullvad-daemon writes to /etc/iproute2/rt_tables
     networking.iproute2.enable = true;
 
+    # See https://github.com/NixOS/nixpkgs/issues/113589
+    networking.firewall.checkReversePath = "loose";
+
     systemd.services.mullvad-daemon = {
       description = "Mullvad VPN daemon";
       wantedBy = [ "multi-user.target" ];
@@ -42,5 +46,5 @@ with lib;
     };
   };
 
-  meta.maintainers = [ maintainers.xfix ];
+  meta.maintainers = with maintainers; [ ymarkus ];
 }
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index a4b17bbbff57..ed61c178c685 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -81,17 +81,26 @@ in
         '';
       };
 
-      initstepslew = mkOption {
-        type = types.attrsOf (types.either types.bool types.int);
-        default = {
-          enabled = true;
-          threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)
+      initstepslew = {
+        enabled = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Allow chronyd to make a rapid measurement of the system clock error
+            at boot time, and to correct the system clock by stepping before
+            normal operation begins.
+          '';
+        };
+
+        threshold = mkOption {
+          type = types.either types.float types.int;
+          default = 1000; # by default, same threshold as 'ntpd -g' (1000s)
+          description = ''
+            The threshold of system clock error (in seconds) above which the
+            clock will be stepped. If the correction required is less than the
+            threshold, a slew is used instead.
+          '';
         };
-        description = ''
-          Allow chronyd to make a rapid measurement of the system clock error at
-          boot time, and to correct the system clock by stepping before normal
-          operation begins.
-        '';
       };
 
       directory = mkOption {
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 9e433ad1a98f..22caf9f4ec56 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -427,9 +427,12 @@ in
       nameValuePair ("tinc.${network}") ({
         description = "Tinc daemon user for ${network}";
         isSystemUser = true;
+        group = "tinc.${network}";
       })
     );
-
+    users.groups = flip mapAttrs' cfg.networks (network: _:
+      nameValuePair "tinc.${network}" {}
+    );
   };
 
   meta.maintainers = with maintainers; [ minijackson ];
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index ebb3c38d6c25..136811ada420 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -22,7 +22,9 @@ let
     } // (optionalAttrs (vhostConfig.enableACME || vhostConfig.useACMEHost != null) {
       sslCertificate = "${certs.${certName}.directory}/fullchain.pem";
       sslCertificateKey = "${certs.${certName}.directory}/key.pem";
-      sslTrustedCertificate = "${certs.${certName}.directory}/chain.pem";
+      sslTrustedCertificate = if vhostConfig.sslTrustedCertificate != null
+                              then vhostConfig.sslTrustedCertificate
+                              else "${certs.${certName}.directory}/chain.pem";
     })
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index bc18bcaa7b34..bbf4ccb01c8c 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -145,7 +145,7 @@ with lib;
     sslTrustedCertificate = mkOption {
       type = types.nullOr types.path;
       default = null;
-      example = "/var/root.cert";
+      example = "\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
       description = "Path to root SSL certificate for stapling and client certificates.";
     };
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 73616065a083..b53cb9e7d410 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -1128,6 +1128,7 @@ in
 
     users.groups.systemd-journal.gid = config.ids.gids.systemd-journal;
     users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
+    users.users.systemd-journal-gateway.group = "systemd-journal-gateway";
     users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
 
     # Generate timer units for all services that have a ‘startAt’ value.
diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix
index c7ceb816a311..43cb6273f253 100644
--- a/nixos/modules/virtualisation/containerd.nix
+++ b/nixos/modules/virtualisation/containerd.nix
@@ -86,6 +86,7 @@ in
 
         StateDirectory = "containerd";
         RuntimeDirectory = "containerd";
+        RuntimeDirectoryPreserve = "yes";
       };
       unitConfig = {
         StartLimitBurst = "16";
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index 6532fc4ac1d4..72b7bb8a396a 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -105,9 +105,9 @@ in import ./make-test-python.nix ({ lib, ... }: {
         security.acme.certs."a.example.test".keyType = "ec384";
         security.acme.certs."a.example.test".postRun = ''
           set -euo pipefail
-          touch test
-          chown root:root test
-          echo testing > test
+          touch /home/test
+          chown root:root /home/test
+          echo testing > /home/test
         '';
       };
 
@@ -383,7 +383,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
           switch_to(webserver, "cert-change")
           webserver.wait_for_unit("acme-finished-a.example.test.target")
           check_connection_key_bits(client, "a.example.test", "384")
-          webserver.succeed("grep testing /var/lib/acme/a.example.test/test")
+          webserver.succeed("grep testing /home/test")
           # Clean to remove the testing file (and anything else messy we did)
           webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
 
diff --git a/nixos/tests/bazarr.nix b/nixos/tests/bazarr.nix
index b8cd8ef38b42..c3337611aa29 100644
--- a/nixos/tests/bazarr.nix
+++ b/nixos/tests/bazarr.nix
@@ -7,7 +7,7 @@ let
 in
 {
   name = "bazarr";
-  meta.maintainers = with maintainers; [ xwvvvvwx ];
+  meta.maintainers = with maintainers; [ d-xo ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/nitter.nix b/nixos/tests/nitter.nix
index e17f1c473436..0e1a6d150f38 100644
--- a/nixos/tests/nitter.nix
+++ b/nixos/tests/nitter.nix
@@ -6,11 +6,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
 
   nodes.machine = {
     services.nitter.enable = true;
+    # Test CAP_NET_BIND_SERVICE
+    services.nitter.server.port = 80;
   };
 
   testScript = ''
     machine.wait_for_unit("nitter.service")
-    machine.wait_for_open_port("8080")
-    machine.succeed("curl --fail http://localhost:8080/")
+    machine.wait_for_open_port("80")
+    machine.succeed("curl --fail http://localhost:80/")
   '';
 })
diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix
index 8cf8c307de38..961c2e15c30f 100644
--- a/nixos/tests/wireguard/wg-quick.nix
+++ b/nixos/tests/wireguard/wg-quick.nix
@@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
   {
     name = "wg-quick";
     meta = with pkgs.lib.maintainers; {
-      maintainers = [ xwvvvvwx ];
+      maintainers = [ d-xo ];
     };
 
     nodes = {
diff --git a/pkgs/applications/audio/boops/default.nix b/pkgs/applications/audio/boops/default.nix
index b1b91aaf9de0..de766f14dbc5 100644
--- a/pkgs/applications/audio/boops/default.nix
+++ b/pkgs/applications/audio/boops/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "boops";
-  version = "1.6.0";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BOops";
     rev = version;
-    sha256 = "sha256-7eNvt8PxIZCp83Y5XX5fBolBon4j+HPtu8wrgG8Miok=";
+    sha256 = "sha256-rljUb0fj231MQh+7jTpjAsZm1QkNzfdSpcI1cS5fs/c=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix
index cc98e9fb359c..39c8a3b3184c 100644
--- a/pkgs/applications/audio/helvum/default.nix
+++ b/pkgs/applications/audio/helvum/default.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "helvum";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "ryuukyu";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A=";
+    sha256 = "sha256-AlHCK4pWaoNjR0eflxHBsuVaaily/RvCbgJv/ByQZK4=";
   };
 
-  cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU=";
+  cargoSha256 = "sha256-mAhh12rGvQjs2xtm+OrtVv0fgG6qni/QM/oRYoFR7U8=";
 
   nativeBuildInputs = [ clang copyDesktopItems pkg-config ];
   buildInputs = [ glib gtk4 pipewire ];
diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix
index 0d6f33ca3ac8..64a8da8b9714 100644
--- a/pkgs/applications/blockchains/lndconnect/default.nix
+++ b/pkgs/applications/blockchains/lndconnect/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
     description = "Generate QRCode to connect apps to lnd Resources";
     license = licenses.mit;
     homepage = "https://github.com/LN-Zap/lndconnect";
-    maintainers = [ maintainers.xwvvvvwx ];
+    maintainers = [ maintainers.d-xo ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/blockchains/turbo-geth/default.nix b/pkgs/applications/blockchains/turbo-geth/default.nix
index b1548212a694..58c0b45337eb 100644
--- a/pkgs/applications/blockchains/turbo-geth/default.nix
+++ b/pkgs/applications/blockchains/turbo-geth/default.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     homepage = "https://github.com/ledgerwatch/turbo-geth/";
     description = "Ethereum node and geth fork focused on scalability and modularity";
     license = with licenses; [ lgpl3Plus gpl3Plus ];
-    maintainers = with maintainers; [ xwvvvvwx ];
+    maintainers = with maintainers; [ d-xo ];
   };
 }
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 4c78f2f5bbb5..40339b49e27f 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "AusweisApp2";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
     rev = version;
-    sha256 = "sha256-fl/3mdVNqnoGfOEMOBWHGhtw9rEBUcrboS7hUNPGO8I=";
+    sha256 = "sha256-Oci1y6//45Gep4IS6Ym+v9MPCP5mOswAiWPkXqd+zR0=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index daef73a56796..7458377d42de 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cherrytree";
-  version = "0.99.39";
+  version = "0.99.40";
 
   src = fetchFromGitHub {
     owner = "giuspen";
     repo = "cherrytree";
     rev = version;
-    sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE=";
+    sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix
index c83385810839..7ff20b16d79a 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/pkgs/applications/misc/elogind/default.nix
@@ -29,13 +29,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "elogind";
-  version = "246.9.2";
+  version = "246.10";
 
   src = fetchFromGitHub {
     owner = "elogind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-EsW19D6eoEO4RJO+jwMA/SMFus+cxq9Fcy2zrcn9pd8=";
+    sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index d669b97c44d1..d51515c597cd 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,17 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "unstable-2021-07-14";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = pname;
-    # unstable because the latest release fails to build
-    rev = "312ffcb04c06c5f157b9fd2b944b858703238592";
-    sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w";
+    rev = "v${version}";
+    sha256 = "1mvin6pfqhsfhaifivbdi6qcn0dsa98w83m1n51q807gh4l1k2yj";
   };
 
-  cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8";
+  cargoSha256 = "02bk399c7x15a5rkaz7ik65yihkfbjn1q46gx7l8hycqq7xb0xmg";
 
   nativeBuildInputs = [ cmake pkg-config installShellFiles];
   buildInputs = [ openssl oniguruma ]
@@ -30,6 +29,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A fast static site generator with everything built-in";
     homepage = "https://www.getzola.org/";
+    changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ dandellion dywedir _0x4A6F ];
     # set because of unstable-* version
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index f15cf6c81b46..9f3a27e22b5a 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -4,6 +4,8 @@
 , nix-update-script
 , cmake
 , pkg-config
+, fribidi
+, harfbuzz
 , libunistring
 , mpg123
 , openssl
@@ -15,27 +17,36 @@
 
 stdenv.mkDerivation rec {
   pname = "lagrange";
-  version = "1.5.2";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     rev = "v${version}";
-    sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI=";
+    sha256 = "sha256-YTWVBQt0X12UDFJv/rPBqlIBC4iXSvpdYi/HIl+BPxc=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    rm -r lib/fribidi lib/harfbuzz
+  '';
+
   nativeBuildInputs = [ cmake pkg-config ];
 
-  buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ]
+  buildInputs = [ fribidi harfbuzz libunistring mpg123 openssl pcre SDL2 zlib ]
     ++ lib.optional stdenv.isDarwin AppKit;
 
   hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
 
-  installPhase = if stdenv.isDarwin then ''
+  cmakeFlags = [
+    "-DENABLE_HARFBUZZ_MINIMAL:BOOL=OFF"
+    "-DENABLE_FRIBIDI_BUILD:BOOL=OFF"
+  ];
+
+  installPhase = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
     mv Lagrange.app $out/Applications
-  '' else null;
+  '';
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
new file mode 100644
index 000000000000..21e3c47b323d
--- /dev/null
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "cwltool";
+  version = "3.1.20210628163208";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "21b885f725420413d2f87eadc5e81c08a9c91beceda89b35d1a702ec4df47e52";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'prov == 1.5.1' 'prov'
+  '';
+
+  propagatedBuildInputs = with python3Packages; [
+    argcomplete
+    bagit
+    coloredlogs
+    mypy-extensions
+    prov
+    psutil
+    pydot
+    schema-salad
+    shellescape
+    typing-extensions
+  ];
+
+  doCheck = false; # hard to setup
+  pythonImportsCheck = [ "cwltool" ];
+
+  meta = with lib; {
+    homepage = "https://www.commonwl.org";
+    license = with licenses; [ asl20 ];
+    description = "Common Workflow Language reference implementation";
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index a5740fc45b13..8f8a074cc599 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, fetchzip
+, fetchFromGitea
 , fetchurl
 , fetchpatch
 , runCommandNoCC
@@ -94,8 +94,11 @@ stdenv.mkDerivation rec {
   pname = "foot";
   inherit version;
 
-  src = fetchzip {
-    url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "dnkl";
+    repo = pname;
+    rev = version;
     sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
   };
 
@@ -147,8 +150,9 @@ stdenv.mkDerivation rec {
     export AR="${ar}"
   '';
 
+  mesonBuildType = "release";
+
   mesonFlags = [
-    "--buildtype=release"
     "-Db_lto=true"
     "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo"
   ];
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 defad82d5a1c..28020f85369d 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ghq";
-  version = "1.1.7";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "x-motemen";
     repo = "ghq";
     rev = "v${version}";
-    sha256 = "sha256-kEs844gj1/PW7Kkpn1tvxfruznRIh2pjHCoSWGF1upQ=";
+    sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4=";
   };
 
   vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
index e2314687d8b9..e91192d53de8 100644
--- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
@@ -58,7 +58,7 @@ appimageTools.wrapType2 {
     description = "A decentralized app for code collaboration";
     homepage = "https://radicle.xyz/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ xwvvvvwx ];
+    maintainers = with maintainers; [ d-xo ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/video/kodi-packages/requests-cache/default.nix b/pkgs/applications/video/kodi-packages/requests-cache/default.nix
new file mode 100644
index 000000000000..de785ab9bb52
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/requests-cache/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }:
+buildKodiAddon rec {
+  pname = "requests-cache";
+  namespace = "script.module.requests-cache";
+  version = "0.5.2+matrix.2";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  passthru = {
+    pythonPath = "lib";
+    updateScript = addonUpdateScript {
+      attrPath = "kodi.packages.requests-cache";
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/reclosedev/requests-cache";
+    description = "Persistent cache for requests library";
+    license = licenses.bsd2;
+    maintainers = teams.kodi.members;
+  };
+}
diff --git a/pkgs/applications/video/kodi-packages/routing/default.nix b/pkgs/applications/video/kodi-packages/routing/default.nix
new file mode 100644
index 000000000000..a75e786cf1ff
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/routing/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+  pname = "routing";
+  namespace = "script.module.routing";
+  version = "0.2.3+matrix.1";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6";
+  };
+
+  passthru = {
+    pythonPath = "lib";
+    updateScript = addonUpdateScript {
+      attrPath = "kodi.packages.routing";
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/tamland/kodi-plugin-routing";
+    description = "A routing module for kodi plugins";
+    license = licenses.gpl3Plus;
+    maintainers = teams.kodi.members;
+  };
+}
diff --git a/pkgs/applications/video/kodi-packages/steam-library/default.nix b/pkgs/applications/video/kodi-packages/steam-library/default.nix
new file mode 100644
index 000000000000..5660be94987f
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/steam-library/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildKodiAddon, fetchFromGitHub, requests, requests-cache, routing }:
+
+buildKodiAddon rec {
+  pname = "steam-library";
+  namespace = "plugin.program.steam.library";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "aanderse";
+    repo = namespace;
+    rev = "v${version}";
+    sha256 = "1d8n8zkprjql0nw5ff752yr994hw2ikd0ny3m9hjr90s4kdykjzr";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    requests-cache
+    routing
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/aanderse/plugin.program.steam.library";
+    description = "View your entire Steam library right from Kodi";
+    license = licenses.gpl3Plus;
+    maintainers = teams.kodi.members;
+  };
+}
diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix
index b63e9c06d29c..f019009db9f8 100644
--- a/pkgs/data/themes/orchis-theme/default.nix
+++ b/pkgs/data/themes/orchis-theme/default.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "orchis-theme";
-  version = "2021-06-09";
+  version = "2021-06-25";
 
   src = fetchFromGitHub {
     repo = "Orchis-theme";
     owner = "vinceliuice";
     rev = version;
-    sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q=";
+    sha256 = "sha256-j0nsw1yR1yOckXiIMtzhC3w6kvfzxQQHgwdY6l0OuXw=";
   };
 
   nativeBuildInputs = [ gtk3 sassc ];
diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 96451d325bb0..37824495a188 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-gsconnect";
-  version = "46";
+  version = "47";
 
   outputs = [ "out" "installedTests" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw";
+    sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q=";
   };
 
   patches = [
diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix
index cfafe43c3a5f..78c2831a2f35 100644
--- a/pkgs/development/compilers/llvm/git/clang/default.nix
+++ b/pkgs/development/compilers/llvm/git/clang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3
+{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3
 , buildLlvmTools
 , fixDarwinDylibNames
 , enableManpages ? false
@@ -37,6 +37,10 @@ let
       ./purity.patch
       # https://reviews.llvm.org/D51899
       ./gnu-install-dirs.patch
+      (substituteAll {
+        src = ../../clang-11-12-LLVMgold-path.patch;
+        libllvmLibdir = "${libllvm.lib}/lib";
+      })
     ];
 
     postPatch = ''
@@ -52,12 +56,7 @@ let
 
     outputs = [ "out" "lib" "dev" "python" ];
 
-    # Clang expects to find LLVMgold in its own prefix
     postInstall = ''
-      if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
-        ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
-      fi
-
       ln -sv $out/bin/clang $out/bin/cpp
 
       # Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch
index f6f9336ad5ad..66742e5b1498 100644
--- a/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch
+++ b/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch
@@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
 index 3a66dd9c3fb..7efc85d9f9f 100644
 --- a/lib/builtins/CMakeLists.txt
 +++ b/lib/builtins/CMakeLists.txt
-@@ -301,6 +301,10 @@ if (NOT MSVC)
-     i386/umoddi3.S
-   )
+@@ -345,4 +345,8 @@ if (NOT MSVC)
  
 +  set(i486_SOURCES ${i386_SOURCES})
 +  set(i586_SOURCES ${i386_SOURCES})
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch
new file mode 100644
index 000000000000..425dc2af01e7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch
@@ -0,0 +1,71 @@
+diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp
+--- a/lib/sanitizer_common/sanitizer_mac.cpp
++++ b/lib/sanitizer_common/sanitizer_mac.cpp
+@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {
+ // Offset example:
+ // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4
+ constexpr u16 GetOSMajorKernelOffset() {
+-  if (TARGET_OS_OSX) return 4;
+-  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
+-  if (TARGET_OS_WATCH) return 13;
++#if TARGET_OS_OSX
++  return 4;
++#endif
++#if TARGET_OS_IOS || TARGET_OS_TV
++  return 6;
++#endif
++#if TARGET_OS_WATCH
++  return 13;
++#endif
+ }
+ 
+ using VersStr = char[64];
+@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {
+   u16 os_major = kernel_major - offset;
+ 
+   const char *format = "%d.0";
+-  if (TARGET_OS_OSX) {
+-    if (os_major >= 16) {  // macOS 11+
+-      os_major -= 5;
+-    } else {  // macOS 10.15 and below
+-      format = "10.%d";
+-    }
++#if TARGET_OS_OSX
++  if (os_major >= 16) {  // macOS 11+
++    os_major -= 5;
++  } else {  // macOS 10.15 and below
++    format = "10.%d";
+   }
++#endif
+   return internal_snprintf(vers, sizeof(VersStr), format, os_major);
+ }
+ 
+@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {
+ // Aligned versions example:
+ // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6
+ static void MapToMacos(u16 *major, u16 *minor) {
+-  if (TARGET_OS_OSX)
+-    return;
+-
+-  if (TARGET_OS_IOS || TARGET_OS_TV)
++#if !TARGET_OS_OSX
++#if TARGET_OS_IOS || TARGET_OS_TV
+     *major += 2;
+-  else if (TARGET_OS_WATCH)
++#elif TARGET_OS_WATCH
+     *major += 9;
+-  else
++#else
+     UNREACHABLE("unsupported platform");
++#endif
+ 
+   if (*major >= 16) {  // macOS 11+
+     *major -= 5;
+@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {
+     *minor = *major;
+     *major = 10;
+   }
++#endif
+ }
+ 
+ static MacosVersion GetMacosAlignedVersionInternal() {
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
index 8e258e349b9d..eb3446342b4a 100644
--- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix
@@ -60,6 +60,8 @@ stdenv.mkDerivation {
     # extra `/`.
     ./normalize-var.patch
   ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    # Prevent a compilation error on darwin
+    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
     ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
diff --git a/pkgs/development/compilers/llvm/git/lldb/default.nix b/pkgs/development/compilers/llvm/git/lldb/default.nix
index 2dd6c46eb82c..96d8b19ee419 100644
--- a/pkgs/development/compilers/llvm/git/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/git/lldb/default.nix
@@ -19,6 +19,7 @@
 , Carbon
 , Cocoa
 , lit
+, makeWrapper
 , enableManpages ? false
 }:
 
@@ -42,7 +43,7 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [
-    cmake python3 which swig lit
+    cmake python3 which swig lit makeWrapper
   ] ++ lib.optionals enableManpages [
     python3.pkgs.sphinx python3.pkgs.recommonmark
   ];
@@ -84,7 +85,15 @@ stdenv.mkDerivation (rec {
 
   doCheck = false;
 
+  installCheckPhase = ''
+    if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
+        return 1;
+    fi
+  '';
+
   postInstall = ''
+    wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
+
     # Editor support
     # vscode:
     install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
diff --git a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch
index 98321f4479e6..afc945ce2614 100644
--- a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch
+++ b/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch
@@ -63,3 +63,29 @@ index 734167e51bc5..f95761b5df58 100644
  install(TARGETS lldbIntelFeatures
 -  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
 +  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
+index 752113b..010f187 100644
+--- a/cmake/modules/LLDBStandalone.cmake
++++ b/cmake/modules/LLDBStandalone.cmake
+@@ -62,7 +62,7 @@ endif()
+
+ # They are used as destination of target generators.
+ set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
+-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+ if(WIN32 OR CYGWIN)
+   # DLL platform -- put DLLs into bin.
+   set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5633e2..86e4738 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON)
+   if(LLDB_BUILD_FRAMEWORK)
+     set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
+   else()
+-    set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
++    set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
+   endif()
+   get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
+   finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 15785d25fe2f..eb14a44e4fa5 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
+    sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkg-config ];
diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix
index 3057c888b02a..122bd9387308 100644
--- a/pkgs/development/libraries/entt/default.nix
+++ b/pkgs/development/libraries/entt/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "entt";
-  version = "3.8.0";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "skypjack";
     repo = "entt";
     rev = "v${version}";
-    sha256 = "sha256-gieft0sErTr3aB6mZLdALSx+RkmCQuE9lopAwJbOXnA=";
+    sha256 = "sha256-vg2tpGyZZM8c97Qko88JMP5YNPZx5kI5qRkkRclvZtA=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix
index 1340f5e87a80..2b284c82aee3 100644
--- a/pkgs/development/libraries/fcft/default.nix
+++ b/pkgs/development/libraries/fcft/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc
+{ stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc
 , freetype, fontconfig, pixman, tllist, check
 , withHarfBuzz ? true
 , harfbuzz
 }:
 
+let
+  # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
+  mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
+in
+
 stdenv.mkDerivation rec {
   pname = "fcft";
   version = "2.4.4";
 
-  src = fetchzip {
-    url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "dnkl";
+    repo = "fcft";
+    rev = version;
     sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
   };
 
@@ -19,15 +27,16 @@ stdenv.mkDerivation rec {
     ++ lib.optional withHarfBuzz harfbuzz;
   checkInputs = [ check ];
 
+  mesonBuildType = "release";
   mesonFlags = [
-    "--buildtype=release"
-    "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}"
+    (mesonFeatureFlag "text-shaping" withHarfBuzz)
   ];
 
   doCheck = true;
 
   meta = with lib; {
     homepage = "https://codeberg.org/dnkl/fcft";
+    changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}";
     description = "Simple library for font loading and glyph rasterization";
     maintainers = with maintainers; [
       fionera
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index 79f63026e388..3bbedde2e954 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20";
+  version = "1.21";
   pname = "commons-compress";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg";
+    sha256 = "sha256-sWF0K5MSOSXUxBLC9+1/RF5ST4tIzVKGnKQvStuVLvM=";
   };
 
   installPhase = ''
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
index 11931199999b..187508a99818 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Microsoft/GSL";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
+    maintainers = with maintainers; [ thoughtpolice yuriaisaka ];
   };
 }
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 1ff8c2b0cc21..4614c1498146 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }:
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
-  version = "0.10.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "raft";
     rev = "v${version}";
-    sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI=";
+    sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkg-config ];
-  buildInputs = [ libuv ];
+  buildInputs = [ libuv lz4 ];
 
   enableParallelBuilding = true;
 
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/canonical/raft";
     license = licenses.asl20;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ wucke13 ];
   };
 }
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 1e9df5be2346..4b5f277fc531 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
     license = licenses.boost;
     platforms = platforms.all;
-    maintainers = with maintainers; [ primeos xwvvvvwx ];
+    maintainers = with maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 6ab2fe9f6cbf..ef4271ee96fd 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksdb";
-  version = "6.17.3";
+  version = "6.23.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM=";
+    sha256 = "0ivdcc012c35f2wcc5qzic2jlrwp4whyz5sbz1nyfyrnv0xf5djw";
   };
 
   nativeBuildInputs = [ cmake ninja ];
@@ -60,7 +60,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://rocksdb.org";
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
+    changelog = "https://github.com/facebook/rocksdb/raw/v${version}/HISTORY.md";
     license = licenses.asl20;
+    platforms = platforms.all;
     maintainers = with maintainers; [ adev magenbluten ];
   };
 }
diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix
index c84973919990..ed957f95776c 100644
--- a/pkgs/development/libraries/tllist/default.nix
+++ b/pkgs/development/libraries/tllist/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, fetchgit
+, fetchFromGitea
 , meson
 , ninja
 }:
@@ -9,18 +9,23 @@ stdenv.mkDerivation rec {
   pname = "tllist";
   version = "1.0.5";
 
-  src = fetchgit {
-    url = "https://codeberg.org/dnkl/tllist.git";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "dnkl";
+    repo = "tllist";
     rev = version;
     sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg=";
   };
 
   nativeBuildInputs = [ meson ninja ];
 
+  mesonBuildType = "release";
+
   doCheck = true;
 
   meta = with lib; {
     homepage = "https://codeberg.org/dnkl/tllist";
+    changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${version}";
     description = "C header file only implementation of a typed linked list";
     longDescription = ''
       Most C implementations of linked list are untyped. That is, their data
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 69872eb41af6..83f3347bdf2e 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   setupHook = ./setup-hook.sh;
 
-  phases="installPhase fixupPhase";
+  dontUnpack = true;
 
   ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}";
 
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0ba7fd8a62b7..eacd0c89d90a 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -77,6 +77,7 @@
 , "create-react-native-app"
 , "csslint"
 , "dat"
+, "degit"
 , "dhcp"
 , "diagnostic-languageserver"
 , "dockerfile-language-server-nodejs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 55eaf452ab80..e00b4d1081ef 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2074,22 +2074,22 @@ let
         sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";
       };
     };
-    "@expo/config-5.0.6" = {
+    "@expo/config-5.0.7" = {
       name = "_at_expo_slash_config";
       packageName = "@expo/config";
-      version = "5.0.6";
+      version = "5.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config/-/config-5.0.6.tgz";
-        sha512 = "KnSEmlRYT4AsxOGa2OPEefeCEJSo4oMZI/2q3/vriiSYlI2J12/YZz2QaZtGUfKD6jm+5hCerYRQcAMhzj5/BA==";
+        url = "https://registry.npmjs.org/@expo/config/-/config-5.0.7.tgz";
+        sha512 = "7Wzao9uALHmRSf59FMsHk1vxW4m4alDCJmfo+enXnl5o6UYiCDYfjNXctMwnW+fBM3opta4FbmmPGIftfXOesw==";
       };
     };
-    "@expo/config-plugins-3.0.6" = {
+    "@expo/config-plugins-3.0.7" = {
       name = "_at_expo_slash_config-plugins";
       packageName = "@expo/config-plugins";
-      version = "3.0.6";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.6.tgz";
-        sha512 = "hJfxEWfsWuqt4WG3X2F74+tL1JrXZomRBgShKLTMw1vvLe4md70rjTLbmaHkcGb+TfY3RtFZSK8p9oqFXCi8KA==";
+        url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.7.tgz";
+        sha512 = "7YOoFtxB6XqDil+OlGXi7iredKHxXVFCAOIVfFyEDzO3oo0gBmWGmUnHgrPDvpMj0q+adCCh5BL8OcvGfc9ITQ==";
       };
     };
     "@expo/config-types-42.0.0" = {
@@ -2101,22 +2101,22 @@ let
         sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w==";
       };
     };
-    "@expo/dev-server-0.1.81" = {
+    "@expo/dev-server-0.1.82" = {
       name = "_at_expo_slash_dev-server";
       packageName = "@expo/dev-server";
-      version = "0.1.81";
+      version = "0.1.82";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.81.tgz";
-        sha512 = "N/NeD/40aUCVM1m8BFlkQggLiy1HeL0SHx/6SXzyXZNCqcA2TdsZ3RGcvLG2RZlPBknSSixufaABQF482yL3fQ==";
+        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.82.tgz";
+        sha512 = "g7H4FDxcdt9y41MpivtpYqgNwEqoaSKA+lrR+qPCVPcZbIcq+xRq/coYfeXhp/L203vAab67cNVnqTQetj1T3A==";
       };
     };
-    "@expo/dev-tools-0.13.112" = {
+    "@expo/dev-tools-0.13.113" = {
       name = "_at_expo_slash_dev-tools";
       packageName = "@expo/dev-tools";
-      version = "0.13.112";
+      version = "0.13.113";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.112.tgz";
-        sha512 = "lUjC0Q6HeNGuwLkV3fIeexhx7ccx1+OCd7W6m2g+eGF0hMPKHPfrUED4Q1Sin/Y9d7yZxQqwzCIOMfxzaZ2GxA==";
+        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.113.tgz";
+        sha512 = "3z1gIBSnDATukcyvN1Q6ywT5FExJrf/wfg+1T0nQ8OZcyzFbi6u/tdns0mjT5Z+AyXDKtyHbQzGnRzegy82i3Q==";
       };
     };
     "@expo/devcert-1.0.0" = {
@@ -2137,22 +2137,22 @@ let
         sha512 = "ZggQK5w7awqYdA/TE0DT02nYxWirQm2r7NNy043zVtzBCtjhLpFpluk1v9W0pH4+nT1ChGk1c67j0mYRKcBkjg==";
       };
     };
-    "@expo/json-file-8.2.32" = {
+    "@expo/json-file-8.2.33" = {
       name = "_at_expo_slash_json-file";
       packageName = "@expo/json-file";
-      version = "8.2.32";
+      version = "8.2.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.32.tgz";
-        sha512 = "VnpoEnjMptBQr/zgkfGHd7L8iJBme9g2AVpUIecI+aoW6qmeIRbBViPmyNABgH4UUQn3ObQCxe+q1dAdJo8KGg==";
+        url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.33.tgz";
+        sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg==";
       };
     };
-    "@expo/metro-config-0.1.81" = {
+    "@expo/metro-config-0.1.82" = {
       name = "_at_expo_slash_metro-config";
       packageName = "@expo/metro-config";
-      version = "0.1.81";
+      version = "0.1.82";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.81.tgz";
-        sha512 = "Ta95ohtPChXnuZsCEqMMl4yWqt5hThEY1VULLMe19kT4dPa/rEQ72rtRzpDFH7adNQBRrahTz7kx9rWj6YO+MA==";
+        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.82.tgz";
+        sha512 = "rgx0ykWFvu+7jXDSe/cJB0fpIKqJX4X2k+azBIS9KmVLl5/ceKuCr6Abjy70HZTAXX/SQ7fS0C+FhzIX2Upgrg==";
       };
     };
     "@expo/osascript-2.0.30" = {
@@ -2164,13 +2164,13 @@ let
         sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g==";
       };
     };
-    "@expo/package-manager-0.0.45" = {
+    "@expo/package-manager-0.0.46" = {
       name = "_at_expo_slash_package-manager";
       packageName = "@expo/package-manager";
-      version = "0.0.45";
+      version = "0.0.46";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.45.tgz";
-        sha512 = "UxQxRVBKkHCd4c5otoigRFQ7tkP/EyP58ZVQ0QN5SpsUULmyKmpPFzvELoOuPsYCgSioyvmwpYe2bMEt07oJJA==";
+        url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.46.tgz";
+        sha512 = "+Mo7UzRNUy52uzefRkeKv8+YEE+2NhBpXfvZ1Btha2/zSJ+8fxDT0mTQUiupiaeMRPyCMqdkoE39qjF26xifYA==";
       };
     };
     "@expo/plist-0.0.13" = {
@@ -2182,13 +2182,13 @@ let
         sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw==";
       };
     };
-    "@expo/prebuild-config-2.0.6" = {
+    "@expo/prebuild-config-2.0.7" = {
       name = "_at_expo_slash_prebuild-config";
       packageName = "@expo/prebuild-config";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.6.tgz";
-        sha512 = "eJHkTFmLwD0llfZMo1eGQNhd50cSmqWrPLcOoY7w1nSwfwYKa6/H18XwQ3ZbTsLf44Ai/Uj8JeI3HClEFYMsxw==";
+        url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.7.tgz";
+        sha512 = "EMgo4ywR9hk+I90XEwtl/UHWOlw8GE01BQtrLWQbIR0pr+bvDOYINfe8PzA21oODPGUkbMvp5Z8E79VZBqqjfg==";
       };
     };
     "@expo/results-1.0.0" = {
@@ -2227,13 +2227,13 @@ let
         sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==";
       };
     };
-    "@expo/webpack-config-0.13.3" = {
+    "@expo/webpack-config-0.14.0" = {
       name = "_at_expo_slash_webpack-config";
       packageName = "@expo/webpack-config";
-      version = "0.13.3";
+      version = "0.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.3.tgz";
-        sha512 = "ja4oGqIpS5K9dqPysAudQYp8Nd/sm0ojXRCIequO4fcePM8JNLQ4D8vbM2ahl6osODAJqpOumH2UlB1pTnSZrA==";
+        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.0.tgz";
+        sha512 = "YsWLjOQIUN/+pJ5CEmhWfERwjpp6KGjxbd2Nm2KWx4v69wphyPudyrKJaD/b/41Iw5TKHGjV3hlHrYWvZ6OFaA==";
       };
     };
     "@expo/xcpretty-3.1.4" = {
@@ -2785,15 +2785,6 @@ let
         sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==";
       };
     };
-    "@hapi/formula-1.2.0" = {
-      name = "_at_hapi_slash_formula";
-      packageName = "@hapi/formula";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz";
-        sha512 = "UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==";
-      };
-    };
     "@hapi/hoek-8.5.1" = {
       name = "_at_hapi_slash_hoek";
       packageName = "@hapi/hoek";
@@ -2821,24 +2812,6 @@ let
         sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
       };
     };
-    "@hapi/joi-16.1.8" = {
-      name = "_at_hapi_slash_joi";
-      packageName = "@hapi/joi";
-      version = "16.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz";
-        sha512 = "wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==";
-      };
-    };
-    "@hapi/pinpoint-1.0.2" = {
-      name = "_at_hapi_slash_pinpoint";
-      packageName = "@hapi/pinpoint";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz";
-        sha512 = "dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==";
-      };
-    };
     "@hapi/topo-3.1.6" = {
       name = "_at_hapi_slash_topo";
       packageName = "@hapi/topo";
@@ -3955,13 +3928,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-17.9.0" = {
+    "@netlify/build-17.9.2" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "17.9.0";
+      version = "17.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.0.tgz";
-        sha512 = "RaDv21H391dkVciAMATG2PkSpcG0qcnAVlwsBSx7Yb1rHrUhynxkY9jTWmn1P4ufWfPoykIDPRG7n/BRVA/Iqg==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.2.tgz";
+        sha512 = "RbaHBWkbrwiXdLf73gjcjJAn7z3zsRqhXqaF2K9ycru7K7XIVG/BGEKztSD8IoAYR2DuY9KqmrlbPuiQg0IFFg==";
       };
     };
     "@netlify/cache-utils-2.0.0" = {
@@ -3973,13 +3946,13 @@ let
         sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ==";
       };
     };
-    "@netlify/config-14.4.1" = {
+    "@netlify/config-14.4.3" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "14.4.1";
+      version = "14.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.1.tgz";
-        sha512 = "30H92pQajmBo6dU+LOXDpa0dC7EKVDmncED6itzMME46bn6hySKswrY524fP6ArAF/g+LJD6Uhf4AlWNDnz3Fw==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz";
+        sha512 = "lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw==";
       };
     };
     "@netlify/esbuild-0.13.6" = {
@@ -4414,6 +4387,15 @@ let
         sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA==";
       };
     };
+    "@oclif/core-0.5.28" = {
+      name = "_at_oclif_slash_core";
+      packageName = "@oclif/core";
+      version = "0.5.28";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.28.tgz";
+        sha512 = "t9jaGLRP5yJKwiMIzKmzYyP1eRxltWAY02lduUDp3d6cE+Dt2pcIGd7KtsOImKUWv+ClLI7O/CVHnMkOfNJvYA==";
+      };
+    };
     "@oclif/errors-1.3.5" = {
       name = "_at_oclif_slash_errors";
       packageName = "@oclif/errors";
@@ -4459,13 +4441,13 @@ let
         sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw==";
       };
     };
-    "@oclif/plugin-help-3.2.2" = {
+    "@oclif/plugin-help-3.3.0" = {
       name = "_at_oclif_slash_plugin-help";
       packageName = "@oclif/plugin-help";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz";
-        sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA==";
+        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.3.0.tgz";
+        sha512 = "+eYQZXsWnc54IM5Hv2+IoKBTKUSDt+vRbwf5I8w+DaXvzOmx0VzAbLgL1ciJzYh66CknjWMUJf/hxoc8ykJHaQ==";
       };
     };
     "@oclif/plugin-not-found-1.2.4" = {
@@ -5323,15 +5305,6 @@ let
         sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==";
       };
     };
-    "@rollup/plugin-replace-2.4.2" = {
-      name = "_at_rollup_slash_plugin-replace";
-      packageName = "@rollup/plugin-replace";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz";
-        sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==";
-      };
-    };
     "@rollup/pluginutils-3.1.0" = {
       name = "_at_rollup_slash_pluginutils";
       packageName = "@rollup/pluginutils";
@@ -5953,15 +5926,6 @@ let
         sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==";
       };
     };
-    "@surma/rollup-plugin-off-main-thread-1.4.2" = {
-      name = "_at_surma_slash_rollup-plugin-off-main-thread";
-      packageName = "@surma/rollup-plugin-off-main-thread";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz";
-        sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A==";
-      };
-    };
     "@szmarczak/http-timer-1.1.2" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -6709,13 +6673,13 @@ let
         sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==";
       };
     };
-    "@types/http-assert-1.5.1" = {
+    "@types/http-assert-1.5.2" = {
       name = "_at_types_slash_http-assert";
       packageName = "@types/http-assert";
-      version = "1.5.1";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz";
-        sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
+        url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.2.tgz";
+        sha512 = "Ddzuzv/bB2prZnJKlS1sEYhaeT50wfJjhcTTTQLjEsEZJlk3XB4Xohieyq+P4VXIzg7lrQ1Spd/PfRnBpQsdqA==";
       };
     };
     "@types/http-cache-semantics-4.0.1" = {
@@ -7150,13 +7114,22 @@ let
         sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==";
       };
     };
-    "@types/node-16.4.12" = {
+    "@types/node-16.4.13" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "16.4.12";
+      version = "16.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz";
-        sha512 = "zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz";
+        sha512 = "bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==";
+      };
+    };
+    "@types/node-16.4.3" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "16.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz";
+        sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg==";
       };
     };
     "@types/node-6.14.13" = {
@@ -7555,13 +7528,13 @@ let
         sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg==";
       };
     };
-    "@types/vscode-1.58.1" = {
+    "@types/vscode-1.59.0" = {
       name = "_at_types_slash_vscode";
       packageName = "@types/vscode";
-      version = "1.58.1";
+      version = "1.59.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.1.tgz";
-        sha512 = "sa76rDXiSif09he8KoaWWUQxsuBr2+uND0xn1GUbEODkuEjp2p7Rqd3t5qlvklfmAedLFdL7MdnsPa57uzwcOw==";
+        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.59.0.tgz";
+        sha512 = "Zg38rusx2nU6gy6QdF7v4iqgxNfxzlBlDhrRCjOiPQp+sfaNrp3f9J6OHIhpGNN1oOAca4+9Hq0+8u3jwzPMlQ==";
       };
     };
     "@types/webpack-4.41.30" = {
@@ -7573,13 +7546,13 @@ let
         sha512 = "GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==";
       };
     };
-    "@types/webpack-sources-2.1.1" = {
+    "@types/webpack-sources-3.2.0" = {
       name = "_at_types_slash_webpack-sources";
       packageName = "@types/webpack-sources";
-      version = "2.1.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz";
-        sha512 = "MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==";
+        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz";
+        sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==";
       };
     };
     "@types/websocket-1.0.2" = {
@@ -7897,49 +7870,49 @@ let
         sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084";
       };
     };
-    "@vercel/build-utils-2.11.1" = {
+    "@vercel/build-utils-2.12.1" = {
       name = "_at_vercel_slash_build-utils";
       packageName = "@vercel/build-utils";
-      version = "2.11.1";
+      version = "2.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.11.1.tgz";
-        sha512 = "4eVUV7az4c/Avb9tdkoeJf8EYXW4mSY42ZQh15WRUkEXZq80FAgmywrklKOt3B/J+DW6fn8R4exuI1yXnu2iJg==";
+        url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.12.1.tgz";
+        sha512 = "85FUGmNQWL+gWORGIfW2amNeDt3vBgliZ51j3D9s+2qcAv+Li+ghLfzjoP5w5E+DhO8OxHfy53WbqR5aprAWEA==";
       };
     };
-    "@vercel/go-1.2.2" = {
+    "@vercel/go-1.2.3" = {
       name = "_at_vercel_slash_go";
       packageName = "@vercel/go";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.2.tgz";
-        sha512 = "Oo1lXjXmDrSqdF3LKCWXJGU9DInq5aMe6weQSoWnKRvSZ6v4at2x19ltHYvgUO95y4tbdzqPLRKFNUSQEJVdjQ==";
+        url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.3.tgz";
+        sha512 = "BZCHRz43Qfr0DwZlZQCcofR+3cr+H+HK72/ZPkZy1Uq0NYjJMlmZ3ahuMgvJxT9lfC1RA6eOEUlUsZ+gqKcMCg==";
       };
     };
-    "@vercel/node-1.11.1" = {
+    "@vercel/node-1.12.0" = {
       name = "_at_vercel_slash_node";
       packageName = "@vercel/node";
-      version = "1.11.1";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/node/-/node-1.11.1.tgz";
-        sha512 = "2OheDtjxr1OkYyvMh7laDkOA4K6KfLL60IBg1D+PksNri2YEFaPK1lzdq7xuByuDRUs+tm9U57sPVAlyzGjlvw==";
+        url = "https://registry.npmjs.org/@vercel/node/-/node-1.12.0.tgz";
+        sha512 = "McwhEg6KI0y7R875IG87Ry3HrFvws+60/yKk1KqJxbOud/n/Mj9eEZTI5mxxMFj8tT7KhmFaRdl8pJz8ISR1Cg==";
       };
     };
-    "@vercel/python-2.0.4" = {
+    "@vercel/python-2.0.5" = {
       name = "_at_vercel_slash_python";
       packageName = "@vercel/python";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.4.tgz";
-        sha512 = "pGHtsbF2gVHnZGw62HIUZhfGzO+jXGprFsmgJwHdDWkUjiVGGKpbMKiDZlZPJQF7FC4xTF4rb0JKzrcckrpYXg==";
+        url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.5.tgz";
+        sha512 = "WCSTTw6He2COaSBiGDk2q5Q1ue+z5usRZcvUHCpsK6KvNkkV/PrY8JT73XQysMWKiXh6yQy19IUFAOqK/xwhig==";
       };
     };
-    "@vercel/ruby-1.2.6" = {
+    "@vercel/ruby-1.2.7" = {
       name = "_at_vercel_slash_ruby";
       packageName = "@vercel/ruby";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.6.tgz";
-        sha512 = "ZLDMxMvOL0xd7FBHXQJ9EJxPohw+qzpgwulaNhXGgPuFUfnS9mboUEyj0sU9A9F7lMJFPJ6gs8UfVxBY2eNnGA==";
+        url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.7.tgz";
+        sha512 = "ZG2VxMHHSKocL57UWsfNc9UsblwYGm55/ujqGIBnkNUURnRgtUrwtWlEts1eJ4VHD754Lc/0/R1pfJXoN5SbRw==";
       };
     };
     "@vue/cli-shared-utils-4.5.13" = {
@@ -8527,13 +8500,13 @@ let
         sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==";
       };
     };
-    "@wry/context-0.6.0" = {
+    "@wry/context-0.6.1" = {
       name = "_at_wry_slash_context";
       packageName = "@wry/context";
-      version = "0.6.0";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz";
-        sha512 = "sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==";
+        url = "https://registry.npmjs.org/@wry/context/-/context-0.6.1.tgz";
+        sha512 = "LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==";
       };
     };
     "@wry/equality-0.1.11" = {
@@ -8545,22 +8518,22 @@ let
         sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA==";
       };
     };
-    "@wry/equality-0.5.1" = {
+    "@wry/equality-0.5.2" = {
       name = "_at_wry_slash_equality";
       packageName = "@wry/equality";
-      version = "0.5.1";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz";
-        sha512 = "FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==";
+        url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.2.tgz";
+        sha512 = "oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==";
       };
     };
-    "@wry/trie-0.3.0" = {
+    "@wry/trie-0.3.1" = {
       name = "_at_wry_slash_trie";
       packageName = "@wry/trie";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz";
-        sha512 = "Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==";
+        url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.1.tgz";
+        sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -11065,6 +11038,15 @@ let
         sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
       };
     };
+    "async-3.2.1" = {
+      name = "async";
+      packageName = "async";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-3.2.1.tgz";
+        sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==";
+      };
+    };
     "async-append-only-log-3.0.9" = {
       name = "async-append-only-log";
       packageName = "async-append-only-log";
@@ -11389,13 +11371,13 @@ let
         sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
       };
     };
-    "aws-sdk-2.961.0" = {
+    "aws-sdk-2.963.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.961.0";
+      version = "2.963.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.961.0.tgz";
-        sha512 = "71ELXHWd0roRT0FW8CnqGLYGKLksHARa7Yn8LPN3mF70FJt2LuvVAyK49IChoUczTjlzS78p+Y5197Tkky4N8g==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.963.0.tgz";
+        sha512 = "EY7EPap1c/1RxPx+Py56t9btJug3Z3PJkCfplqzNuU1QlFGs+rN8yYm9xIn8J6gbJ5D8F4Qab0GCtTmGstlHfQ==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -14953,6 +14935,15 @@ let
         sha512 = "rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA==";
       };
     };
+    "cbor-8.0.0" = {
+      name = "cbor";
+      packageName = "cbor";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cbor/-/cbor-8.0.0.tgz";
+        sha512 = "nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig==";
+      };
+    };
     "ccount-1.1.0" = {
       name = "ccount";
       packageName = "ccount";
@@ -17266,13 +17257,13 @@ let
         sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
       };
     };
-    "conf-10.0.1" = {
+    "conf-10.0.2" = {
       name = "conf";
       packageName = "conf";
-      version = "10.0.1";
+      version = "10.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conf/-/conf-10.0.1.tgz";
-        sha512 = "QClEoNcruwBL84QgMEPHibL3ERxWIrRKhbjJKG1VsFBadm5QpS0jsu4QjY/maxUvhyAKXeyrs+ws+lC6PajnEg==";
+        url = "https://registry.npmjs.org/conf/-/conf-10.0.2.tgz";
+        sha512 = "iyy4ArqyQ/yrzNASNBN+jaylu53JRuq0ztvL6KAWYHj4iN56BVuhy2SrzEEHBodNbacZr2Pd/4nWhoAwc66T1g==";
       };
     };
     "conf-6.2.4" = {
@@ -17509,13 +17500,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.3.114" = {
+    "constructs-3.3.117" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.3.114";
+      version = "3.3.117";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.114.tgz";
-        sha512 = "J1R3RypQsCBvZ4zUpogIunj8ShpU4GC73mmHFPmOp7HgxHKYEOpukYAe5VL84pnsoQxv1tnM3EJcScPh/EEQQw==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.117.tgz";
+        sha512 = "y5PVROPr7XFlz2/ZAXNHhkb8Y7HzJs4kBrUcjI5B5tbQz/YXsOmZV73AGRYDiUvMstqvpq+UOVBhL3zoA9vg7Q==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -18329,13 +18320,13 @@ let
         sha512 = "dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==";
       };
     };
-    "create-torrent-4.7.2" = {
+    "create-torrent-5.0.1" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "4.7.2";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.2.tgz";
-        sha512 = "8T5zMK0WhOfm2QubE/ZFVxaoCmhZk6I01ze53MIIe1HI0dxsvYohkNtFXEHL5oXi1vkbJOD/yLVJuUc4cCziog==";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz";
+        sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA==";
       };
     };
     "cron-1.8.2" = {
@@ -19859,13 +19850,13 @@ let
         sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
       };
     };
-    "deasync-0.1.21" = {
+    "deasync-0.1.22" = {
       name = "deasync";
       packageName = "deasync";
-      version = "0.1.21";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.21.tgz";
-        sha512 = "kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w==";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.22.tgz";
+        sha512 = "o21R8Vhv3wX0E19jpATUJIAinQ1I2rHIlAnzRRsMynWlIrvU0HbCwjpquPIYR544Tvg9z/L+NZQev5cjVD1/nQ==";
       };
     };
     "death-1.1.0" = {
@@ -22100,15 +22091,6 @@ let
         sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
       };
     };
-    "ecstatic-3.3.2" = {
-      name = "ecstatic";
-      packageName = "ecstatic";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz";
-        sha512 = "fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==";
-      };
-    };
     "ecstatic-4.1.4" = {
       name = "ecstatic";
       packageName = "ecstatic";
@@ -22190,13 +22172,13 @@ let
         sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==";
       };
     };
-    "electron-notarize-1.0.1" = {
+    "electron-notarize-1.1.0" = {
       name = "electron-notarize";
       packageName = "electron-notarize";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.1.tgz";
-        sha512 = "5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg==";
+        url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz";
+        sha512 = "Dmp/jm2y3PTcjmjVe+jCT0sjsbBfbNuk7GOPtduZce2iae1hgAPnlNErk6x70TalsGIL5Ip3liSryqde/6eB5w==";
       };
     };
     "electron-osx-sign-0.5.0" = {
@@ -22226,13 +22208,13 @@ let
         sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
       };
     };
-    "electron-to-chromium-1.3.796" = {
+    "electron-to-chromium-1.3.799" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.796";
+      version = "1.3.799";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz";
-        sha512 = "agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz";
+        sha512 = "V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -24163,13 +24145,13 @@ let
         sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
       };
     };
-    "expo-pwa-0.0.91" = {
+    "expo-pwa-0.0.92" = {
       name = "expo-pwa";
       packageName = "expo-pwa";
-      version = "0.0.91";
+      version = "0.0.92";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.91.tgz";
-        sha512 = "hwi3eJhL85yHZBvv5ekdS0A1721wmgNAM53LMv5meawTBy5W0NNg8E6Ey+N3UCrL6BP1Kk7WByxX4V4kkzGV8A==";
+        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.92.tgz";
+        sha512 = "lY+m28IQkqpCPZQdAlMBUGgm5HbTEHVaMNt0QnMAeX/siN11rfhxBr2nFQRYfK0R5Kklh6yUTyAjz+vOd2bSKw==";
       };
     };
     "express-2.5.11" = {
@@ -25765,13 +25747,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.156.0" = {
+    "flow-parser-0.157.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.156.0";
+      version = "0.157.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.156.0.tgz";
-        sha512 = "OCE3oIixhOttaV4ahIGtxf9XfaDdxujiTnXuHu+0dvDVVDiSDJlQpgCWdDKqP0OHfFnxQKrjMamArDAXtrBtZw==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.157.0.tgz";
+        sha512 = "p0vdtrM8oAMlscIXpX0e/eGWll5NPteVChNtlQncbIbivH+BdiwXHN5QO6myAfmebd027r9RiQKdUPsFAiEVgQ==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -26971,15 +26953,6 @@ let
         sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==";
       };
     };
-    "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-package-info-1.0.0" = {
       name = "get-package-info";
       packageName = "get-package-info";
@@ -27917,13 +27890,13 @@ let
         sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
       };
     };
-    "google-gax-2.21.1" = {
+    "google-gax-2.22.1" = {
       name = "google-gax";
       packageName = "google-gax";
-      version = "2.21.1";
+      version = "2.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.21.1.tgz";
-        sha512 = "hyfau8+yXt75UuYVP3E3n0pKUwsEyiVQXfozfqQn/ZOL36UoZtS/cIzqIm6SYaSLlK5MWWz3JT/o/1ol09gEbA==";
+        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.22.1.tgz";
+        sha512 = "/X5Ym6f6Q4sH/3blMr1w/QzFhH0ZKnx9kOusUPwwZH6JmSwLpbuyUDbOc7MAvadl4r7yI2AASILLWK3fT+1Thg==";
       };
     };
     "google-p12-pem-3.1.1" = {
@@ -28070,13 +28043,13 @@ let
         sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==";
       };
     };
-    "graceful-fs-4.2.6" = {
+    "graceful-fs-4.2.8" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.6";
+      version = "4.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz";
-        sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
+        sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -28754,6 +28727,15 @@ let
         sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
       };
     };
+    "has-tostringtag-1.0.0" = {
+      name = "has-tostringtag";
+      packageName = "has-tostringtag";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz";
+        sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==";
+      };
+    };
     "has-unicode-2.0.1" = {
       name = "has-unicode";
       packageName = "has-unicode";
@@ -31473,13 +31455,13 @@ let
         sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==";
       };
     };
-    "is-arguments-1.1.0" = {
+    "is-arguments-1.1.1" = {
       name = "is-arguments";
       packageName = "is-arguments";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz";
-        sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==";
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz";
+        sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -31509,13 +31491,13 @@ let
         sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929";
       };
     };
-    "is-bigint-1.0.2" = {
+    "is-bigint-1.0.3" = {
       name = "is-bigint";
       packageName = "is-bigint";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz";
-        sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==";
+        url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz";
+        sha512 = "ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==";
       };
     };
     "is-binary-path-1.0.1" = {
@@ -31536,13 +31518,13 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-boolean-object-1.1.1" = {
+    "is-boolean-object-1.1.2" = {
       name = "is-boolean-object";
       packageName = "is-boolean-object";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz";
-        sha512 = "bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==";
+        url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz";
+        sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==";
       };
     };
     "is-buffer-1.1.6" = {
@@ -31563,13 +31545,13 @@ let
         sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
       };
     };
-    "is-callable-1.2.3" = {
+    "is-callable-1.2.4" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.3";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz";
-        sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz";
+        sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==";
       };
     };
     "is-canonical-base64-1.1.1" = {
@@ -31644,13 +31626,13 @@ let
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
-    "is-date-object-1.0.4" = {
+    "is-date-object-1.0.5" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz";
-        sha512 = "/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz";
+        sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==";
       };
     };
     "is-decimal-1.0.4" = {
@@ -31860,13 +31842,13 @@ let
         sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==";
       };
     };
-    "is-generator-function-1.0.9" = {
+    "is-generator-function-1.0.10" = {
       name = "is-generator-function";
       packageName = "is-generator-function";
-      version = "1.0.9";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz";
-        sha512 = "ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==";
+        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz";
+        sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==";
       };
     };
     "is-glob-2.0.1" = {
@@ -32139,13 +32121,13 @@ let
         sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
       };
     };
-    "is-number-object-1.0.5" = {
+    "is-number-object-1.0.6" = {
       name = "is-number-object";
       packageName = "is-number-object";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz";
-        sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==";
+        url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz";
+        sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==";
       };
     };
     "is-obj-1.0.1" = {
@@ -32373,13 +32355,13 @@ let
         sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==";
       };
     };
-    "is-regex-1.1.3" = {
+    "is-regex-1.1.4" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz";
-        sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz";
+        sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==";
       };
     };
     "is-regexp-1.0.0" = {
@@ -32526,13 +32508,13 @@ let
         sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==";
       };
     };
-    "is-string-1.0.6" = {
+    "is-string-1.0.7" = {
       name = "is-string";
       packageName = "is-string";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz";
-        sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==";
+        url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz";
+        sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==";
       };
     };
     "is-supported-regexp-flag-1.0.1" = {
@@ -32562,13 +32544,13 @@ let
         sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e";
       };
     };
-    "is-typed-array-1.1.5" = {
+    "is-typed-array-1.1.7" = {
       name = "is-typed-array";
       packageName = "is-typed-array";
-      version = "1.1.5";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz";
-        sha512 = "S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==";
+        url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz";
+        sha512 = "VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -33660,13 +33642,13 @@ let
         sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ==";
       };
     };
-    "jsii-srcmak-0.1.316" = {
+    "jsii-srcmak-0.1.319" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.316";
+      version = "0.1.319";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.316.tgz";
-        sha512 = "hJhok9bx0izVqXbfQ/A5Y8n6buUovbl5I3mozAFS8SM2z/RJCVf1ZaBui8yRUhWVADaZ0DsXB5ps40acdWNU3A==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.319.tgz";
+        sha512 = "6FxGDXgt2utZnz0NC/wrBiILM3ZxQXsJF6eflNcadkhKhcjOwe9qCxSZWs6eDwJq6REckVn24iy+8H6pdpHbog==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -33975,13 +33957,13 @@ let
         sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
       };
     };
-    "json2jsii-0.1.286" = {
+    "json2jsii-0.1.289" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.286";
+      version = "0.1.289";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.286.tgz";
-        sha512 = "AD0Ip07hdVs6VrrNUxi6vy7zLuAXmS231/DqfQFCF2zwSkaqMO1cK/OhfDiKafkspZoadwTR/cyQXBXlCsOPpQ==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.289.tgz";
+        sha512 = "HzFig1AW9qqN0Po2qLB3CD6C+UJcAA2dU+0kmpuOtY79WMVaKahj7yHQDvf0yZoEbFO5T4RyMwYyOCMOpCgY5w==";
       };
     };
     "json3-3.2.6" = {
@@ -34290,6 +34272,15 @@ let
         sha512 = "Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==";
       };
     };
+    "jszip-3.7.1" = {
+      name = "jszip";
+      packageName = "jszip";
+      version = "3.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz";
+        sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==";
+      };
+    };
     "junk-3.1.0" = {
       name = "junk";
       packageName = "junk";
@@ -35362,6 +35353,15 @@ let
         sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw==";
       };
     };
+    "lightning-3.5.0" = {
+      name = "lightning";
+      packageName = "lightning";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lightning/-/lightning-3.5.0.tgz";
+        sha512 = "6Kj1JX8tG3JiV5LXYGuZkKckiRJ/OU8ukb/R5qsp7RWq/xw32LDccCKvOK8oRnOGw9K+G8jcZAOY21exr9OSFA==";
+      };
+    };
     "lilconfig-2.0.3" = {
       name = "lilconfig";
       packageName = "lilconfig";
@@ -35515,13 +35515,13 @@ let
         sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA==";
       };
     };
-    "ln-service-51.10.0" = {
+    "ln-service-51.10.1" = {
       name = "ln-service";
       packageName = "ln-service";
-      version = "51.10.0";
+      version = "51.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz";
-        sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ==";
+        url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.1.tgz";
+        sha512 = "fXsA/gDh65+YYVYJ6GNDB2ALPa0rjXV59I9kgciOCkgiJo3F7AYkhNULYIGu0r2FK83J1M85AsH6tycImRVWRQ==";
       };
     };
     "ln-service-51.8.2" = {
@@ -39043,13 +39043,13 @@ let
         sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw==";
       };
     };
-    "mermaid-8.11.3" = {
+    "mermaid-8.11.4" = {
       name = "mermaid";
       packageName = "mermaid";
-      version = "8.11.3";
+      version = "8.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.3.tgz";
-        sha512 = "XhfSF+crAX+BhxyKUL28Pf0Of12bby+jK2VQ05xSLZ/pYE6kVfiTuO1mTA5chnqDdz9xpD9A77pTWHv27IbWsg==";
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz";
+        sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg==";
       };
     };
     "meros-1.1.4" = {
@@ -41321,13 +41321,13 @@ let
         sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q==";
       };
     };
-    "netlify-redirect-parser-8.1.0" = {
+    "netlify-redirect-parser-8.2.0" = {
       name = "netlify-redirect-parser";
       packageName = "netlify-redirect-parser";
-      version = "8.1.0";
+      version = "8.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.1.0.tgz";
-        sha512 = "y5uzRHSyHVDDIgcFwvRRIELliBc7SKFuvuyVgsIMZWaNDCKNO4Etk2CIeGlJG+++g7NFD/XlYJaqgw2jJkqe4A==";
+        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz";
+        sha512 = "XaCojsgAKs19vlT2C4CEs4bp166bBsgA/brt10x2HLsgp4tF3dSacClPfZgGknyHB1MnMK8j3SFp9yq6rYm8CQ==";
       };
     };
     "netlify-redirector-0.2.1" = {
@@ -42096,6 +42096,15 @@ let
         sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug==";
       };
     };
+    "nofilter-3.0.3" = {
+      name = "nofilter";
+      packageName = "nofilter";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nofilter/-/nofilter-3.0.3.tgz";
+        sha512 = "TN/MCrQmXQk5DyUJ8TGUq1Il8rv4fTsjddLmMopV006QP8DMkglmGgYfQKD5620vXLRXfr8iGI6ZZ4/ZWld2cQ==";
+      };
+    };
     "noise-peer-2.1.1" = {
       name = "noise-peer";
       packageName = "noise-peer";
@@ -47921,6 +47930,15 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
+    "proto3-json-serializer-0.1.1" = {
+      name = "proto3-json-serializer";
+      packageName = "proto3-json-serializer";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.1.tgz";
+        sha512 = "Wucuvf7SqAw1wcai0zV+3jW3QZJiO/W9wZoJaTheebYdwfj2k9VfF3Gw9r2vGAaTeslhMbkVbojJG0+LjpgLxQ==";
+      };
+    };
     "protobufjs-3.8.2" = {
       name = "protobufjs";
       packageName = "protobufjs";
@@ -49037,13 +49055,13 @@ let
         sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
       };
     };
-    "pyright-1.1.159" = {
+    "pyright-1.1.160" = {
       name = "pyright";
       packageName = "pyright";
-      version = "1.1.159";
+      version = "1.1.160";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz";
-        sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ==";
+        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz";
+        sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA==";
       };
     };
     "q-0.9.7" = {
@@ -52430,6 +52448,15 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
+    "rollup-2.51.1" = {
+      name = "rollup";
+      packageName = "rollup";
+      version = "2.51.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz";
+        sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw==";
+      };
+    };
     "rollup-2.56.0" = {
       name = "rollup";
       packageName = "rollup";
@@ -54419,13 +54446,13 @@ let
         sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang==";
       };
     };
-    "smart-buffer-4.1.0" = {
+    "smart-buffer-4.2.0" = {
       name = "smart-buffer";
       packageName = "smart-buffer";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz";
-        sha512 = "iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==";
+        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz";
+        sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==";
       };
     };
     "smartdc-auth-2.3.1" = {
@@ -55229,15 +55256,6 @@ let
         sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
       };
     };
-    "source-map-0.8.0-beta.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.8.0-beta.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz";
-        sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==";
-      };
-    };
     "source-map-js-0.6.2" = {
       name = "source-map-js";
       packageName = "source-map-js";
@@ -56048,13 +56066,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.37" = {
+    "sscaff-1.2.40" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.37";
+      version = "1.2.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.37.tgz";
-        sha512 = "TPvwDnZgM8cPkNtkESjJQ9dCajib2T1YBC763//zVlKsLrJJN3xAwoAQXfey7BdYCCB7DyXKHgtyhKLq0TZl+A==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.40.tgz";
+        sha512 = "XAt/qwEqrzt7uXEkhLW1oVXi1f/Q1qtTaw8TjIuRjryNpbzF0mvFvag4rF/2jWdWC/TJ7HIQXx3mAce3rPb45A==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -56993,15 +57011,6 @@ let
         sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==";
       };
     };
-    "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-package-1.0.1" = {
       name = "stringify-package";
       packageName = "stringify-package";
@@ -57173,15 +57182,6 @@ let
         sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92";
       };
     };
-    "strip-comments-2.0.1" = {
-      name = "strip-comments";
-      packageName = "strip-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz";
-        sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==";
-      };
-    };
     "strip-dirs-2.1.0" = {
       name = "strip-dirs";
       packageName = "strip-dirs";
@@ -58497,15 +58497,6 @@ let
         sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==";
       };
     };
-    "tempy-0.6.0" = {
-      name = "tempy";
-      packageName = "tempy";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz";
-        sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==";
-      };
-    };
     "tempy-0.7.1" = {
       name = "tempy";
       packageName = "tempy";
@@ -60576,15 +60567,6 @@ let
         sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==";
       };
     };
-    "typescript-3.9.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "3.9.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz";
-        sha512 = "D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==";
-      };
-    };
     "typescript-4.0.3" = {
       name = "typescript";
       packageName = "typescript";
@@ -60603,6 +60585,15 @@ let
         sha512 = "pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==";
       };
     };
+    "typescript-4.3.4" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "4.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz";
+        sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==";
+      };
+    };
     "typescript-4.3.5" = {
       name = "typescript";
       packageName = "typescript";
@@ -64177,13 +64168,13 @@ let
         sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA==";
       };
     };
-    "web3-utils-1.5.0" = {
+    "web3-utils-1.5.1" = {
       name = "web3-utils";
       packageName = "web3-utils";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.0.tgz";
-        sha512 = "hNyw7Oxi6TM3ivXmv4hK5Cvyi9ML3UoKtcCYvLF9woPWh5v2dwCCVO1U3Iq5HHK7Dqq28t1d4CxWHqUfOfAkgg==";
+        url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.1.tgz";
+        sha512 = "U8ULaMBwjkp9Rn+kRLjUmgAUHwPqDrM5/Q9tPKgvuDKtMWUggTLC33/KF8RY+PyAhSAlnD+lmNGfZnbjmVKBxQ==";
       };
     };
     "webassemblyjs-1.11.1" = {
@@ -64276,13 +64267,13 @@ let
         sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ==";
       };
     };
-    "webpack-5.48.0" = {
+    "webpack-5.49.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "5.48.0";
+      version = "5.49.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz";
-        sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz";
+        sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==";
       };
     };
     "webpack-bundle-analyzer-3.9.0" = {
@@ -64474,13 +64465,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-1.3.7" = {
+    "webtorrent-1.3.9" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "1.3.7";
+      version = "1.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.7.tgz";
-        sha512 = "0dabc5WmYyuAchbsyugcVPvFeuyrig32cacPK+rvK71WUN80Q5nJOHj4YP+ZnIJMjjJ0LOOvdTdNo5ZPDGqjtQ==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.9.tgz";
+        sha512 = "K52E15SutGIgrBj0YzYNYgkuQMucKePdGk2zxMwLHtFh9sJ0KVPlQgkmORhSbJqC51cRVq/4Xt2jToZde8ioRQ==";
       };
     };
     "well-known-symbols-2.0.0" = {
@@ -64672,13 +64663,13 @@ let
         sha1 = "20b721df05b35b706176ffa10b0909aba4603035";
       };
     };
-    "which-typed-array-1.1.4" = {
+    "which-typed-array-1.1.6" = {
       name = "which-typed-array";
       packageName = "which-typed-array";
-      version = "1.1.4";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz";
-        sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==";
+        url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz";
+        sha512 = "DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q==";
       };
     };
     "wide-align-1.1.3" = {
@@ -64735,13 +64726,13 @@ let
         sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
       };
     };
-    "wikipeg-2.0.5" = {
+    "wikipeg-2.0.6" = {
       name = "wikipeg";
       packageName = "wikipeg";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz";
-        sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g==";
+        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.6.tgz";
+        sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg==";
       };
     };
     "wildcard-2.0.0" = {
@@ -65005,159 +64996,6 @@ let
         sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==";
       };
     };
-    "workbox-background-sync-6.1.5" = {
-      name = "workbox-background-sync";
-      packageName = "workbox-background-sync";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz";
-        sha512 = "VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w==";
-      };
-    };
-    "workbox-broadcast-update-6.1.5" = {
-      name = "workbox-broadcast-update";
-      packageName = "workbox-broadcast-update";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz";
-        sha512 = "zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA==";
-      };
-    };
-    "workbox-build-6.1.5" = {
-      name = "workbox-build";
-      packageName = "workbox-build";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.1.5.tgz";
-        sha512 = "P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA==";
-      };
-    };
-    "workbox-cacheable-response-6.1.5" = {
-      name = "workbox-cacheable-response";
-      packageName = "workbox-cacheable-response";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz";
-        sha512 = "x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA==";
-      };
-    };
-    "workbox-core-6.1.5" = {
-      name = "workbox-core";
-      packageName = "workbox-core";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.5.tgz";
-        sha512 = "9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA==";
-      };
-    };
-    "workbox-expiration-6.1.5" = {
-      name = "workbox-expiration";
-      packageName = "workbox-expiration";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.1.5.tgz";
-        sha512 = "6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ==";
-      };
-    };
-    "workbox-google-analytics-6.1.5" = {
-      name = "workbox-google-analytics";
-      packageName = "workbox-google-analytics";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz";
-        sha512 = "LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA==";
-      };
-    };
-    "workbox-navigation-preload-6.1.5" = {
-      name = "workbox-navigation-preload";
-      packageName = "workbox-navigation-preload";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz";
-        sha512 = "hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg==";
-      };
-    };
-    "workbox-precaching-6.1.5" = {
-      name = "workbox-precaching";
-      packageName = "workbox-precaching";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.1.5.tgz";
-        sha512 = "yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw==";
-      };
-    };
-    "workbox-range-requests-6.1.5" = {
-      name = "workbox-range-requests";
-      packageName = "workbox-range-requests";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz";
-        sha512 = "iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ==";
-      };
-    };
-    "workbox-recipes-6.1.5" = {
-      name = "workbox-recipes";
-      packageName = "workbox-recipes";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.1.5.tgz";
-        sha512 = "MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q==";
-      };
-    };
-    "workbox-routing-6.1.5" = {
-      name = "workbox-routing";
-      packageName = "workbox-routing";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.1.5.tgz";
-        sha512 = "uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ==";
-      };
-    };
-    "workbox-strategies-6.1.5" = {
-      name = "workbox-strategies";
-      packageName = "workbox-strategies";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.1.5.tgz";
-        sha512 = "QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw==";
-      };
-    };
-    "workbox-streams-6.1.5" = {
-      name = "workbox-streams";
-      packageName = "workbox-streams";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.1.5.tgz";
-        sha512 = "OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ==";
-      };
-    };
-    "workbox-sw-6.1.5" = {
-      name = "workbox-sw";
-      packageName = "workbox-sw";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.5.tgz";
-        sha512 = "IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg==";
-      };
-    };
-    "workbox-webpack-plugin-6.1.5" = {
-      name = "workbox-webpack-plugin";
-      packageName = "workbox-webpack-plugin";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz";
-        sha512 = "tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg==";
-      };
-    };
-    "workbox-window-6.1.5" = {
-      name = "workbox-window";
-      packageName = "workbox-window";
-      version = "6.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.5.tgz";
-        sha512 = "akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA==";
-      };
-    };
     "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -65212,15 +65050,6 @@ let
         sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba";
       };
     };
-    "wrap-ansi-4.0.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz";
-        sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==";
-      };
-    };
     "wrap-ansi-5.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -65464,6 +65293,15 @@ let
         sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==";
       };
     };
+    "ws-8.0.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz";
+        sha512 = "6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA==";
+      };
+    };
     "x-default-browser-0.3.1" = {
       name = "x-default-browser";
       packageName = "x-default-browser";
@@ -65545,13 +65383,13 @@ let
         sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ==";
       };
     };
-    "xdl-59.0.52" = {
+    "xdl-59.0.53" = {
       name = "xdl";
       packageName = "xdl";
-      version = "59.0.52";
+      version = "59.0.53";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xdl/-/xdl-59.0.52.tgz";
-        sha512 = "gKyfWDxd0lXut92LmOU4xte+AWt+sIJJTYILIwkbLtw0jqq556mg6+r5EDHI8kIHz1KFM3glTYTr1+W7uJ4wHw==";
+        url = "https://registry.npmjs.org/xdl/-/xdl-59.0.53.tgz";
+        sha512 = "U98lIdfMfwwUTmXwsF5t9Pu/VJSe+Bxb/1v0HWq6UK1VoA13EE2cE5JRBGFmu0+mkrust/Mp6AN289VKpguilw==";
       };
     };
     "xenvar-0.5.1" = {
@@ -66762,7 +66600,7 @@ in
       })
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       (sources."har-validator-5.1.5" // {
         dependencies = [
@@ -66883,7 +66721,7 @@ in
       sources."semver-7.3.5"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.7.3"
@@ -67110,7 +66948,7 @@ in
           sources."mimic-response-1.0.1"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       (sources."gulp-vinyl-zip-2.2.1" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -67347,7 +67185,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."figures-3.2.0"
       sources."form-data-4.0.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."html-encoding-sniffer-2.0.1"
       sources."http-proxy-agent-4.0.1"
@@ -67451,7 +67289,7 @@ in
       sources."@hyperswarm/hypersign-2.1.1"
       sources."@hyperswarm/network-2.1.0"
       sources."@leichtgewicht/ip-codec-2.0.3"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."abstract-extension-3.1.1"
       sources."abstract-leveldown-6.2.3"
       sources."ansi-colors-3.2.3"
@@ -67593,6 +67431,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hashlru-2.3.0"
       sources."he-1.2.0"
       sources."hmac-blake2b-2.0.0"
@@ -67640,24 +67479,24 @@ in
       sources."inspect-custom-symbol-1.1.1"
       sources."internal-slot-1.0.3"
       sources."ipv4-peers-2.0.0"
-      sources."is-bigint-1.0.2"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-2.1.0"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-2.0.5"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-options-1.0.1"
       sources."is-property-1.0.2"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
@@ -67983,7 +67822,7 @@ in
       sources."@types/eslint-scope-3.7.1"
       sources."@types/estree-0.0.50"
       sources."@types/json-schema-7.0.9"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/parse-json-4.0.0"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
@@ -68049,7 +67888,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       (sources."enhanced-resolve-5.8.2" // {
@@ -68090,7 +67929,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."human-signals-1.1.1"
@@ -68442,7 +68281,7 @@ in
       sources."@types/express-serve-static-core-4.17.24"
       sources."@types/fs-capacitor-2.0.0"
       sources."@types/glob-7.1.4"
-      sources."@types/http-assert-1.5.1"
+      sources."@types/http-assert-1.5.2"
       sources."@types/http-errors-1.8.1"
       sources."@types/inquirer-6.5.0"
       (sources."@types/jscodeshift-0.7.2" // {
@@ -68458,7 +68297,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
@@ -68729,7 +68568,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.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -68812,7 +68651,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.156.0"
+      sources."flow-parser-0.157.0"
       sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
@@ -68860,7 +68699,7 @@ in
           sources."into-stream-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphql-14.7.0"
       sources."graphql-extensions-0.15.0"
       sources."graphql-subscriptions-1.2.1"
@@ -68880,6 +68719,7 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-symbols-1.0.2"
       sources."has-to-string-tag-x-1.4.1"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -68920,13 +68760,13 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-core-module-2.5.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-descriptor-1.0.2"
       sources."is-docker-2.2.1"
       sources."is-extendable-0.1.1"
@@ -68940,16 +68780,16 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-object-1.0.2"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.2.2"
       sources."is-property-1.0.2"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
@@ -69737,7 +69577,7 @@ in
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."browserslist-4.16.7"
@@ -69752,7 +69592,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."debug-4.3.2"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -69772,7 +69612,7 @@ in
         ];
       })
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-color-0.1.7"
       sources."has-flag-3.0.0"
@@ -69846,7 +69686,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -69883,7 +69723,7 @@ in
       sources."browserslist-4.16.7"
       sources."caniuse-lite-1.0.30001249"
       sources."colorette-1.2.2"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."escalade-3.1.1"
       sources."fraction.js-4.1.1"
       sources."node-releases-1.1.73"
@@ -69910,14 +69750,14 @@ in
     };
     dependencies = [
       sources."@tootallnate/once-1.1.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/yauzl-2.9.2"
       sources."agent-base-6.0.2"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.961.0" // {
+      (sources."aws-sdk-2.963.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -69991,7 +69831,7 @@ in
       sources."get-stream-5.2.0"
       sources."get-uri-3.0.2"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."htmlparser2-6.1.0"
       sources."http-errors-1.7.3"
@@ -70067,7 +69907,7 @@ in
       sources."sax-1.2.1"
       sources."setprototypeof-1.1.1"
       sources."signal-exit-3.0.3"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.6.1"
@@ -70121,10 +69961,10 @@ in
   balanceofsatoshis = nodeEnv.buildNodePackage {
     name = "balanceofsatoshis";
     packageName = "balanceofsatoshis";
-    version = "10.7.3";
+    version = "10.7.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.3.tgz";
-      sha512 = "z28OLydw1ShAWmnSJFdcES0krIoR1+SXxKarPo2fOPg5VzcNxttaSnWEO5BSsB1E64fJ4EImyMhhwKCZ9uB2xA==";
+      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.6.tgz";
+      sha512 = "dzYzWcLVcwbHwKfTp60ml7IYvWOmX6rD2rC/J9A2HT6VzefbcQ4/59YdzoPRhdlvmhblvj17jwExN0xQxOQJhQ==";
     };
     dependencies = [
       sources."@alexbosworth/html2unicode-1.1.5"
@@ -70137,7 +69977,7 @@ in
       sources."@cto.af/textdecoder-0.0.0"
       (sources."@grpc/grpc-js-1.3.2" // {
         dependencies = [
-          sources."@types/node-16.4.12"
+          sources."@types/node-16.4.13"
         ];
       })
       sources."@grpc/proto-loader-0.6.2"
@@ -70274,7 +70114,7 @@ in
       sources."camelcase-6.2.0"
       sources."caporal-1.4.0"
       sources."caseless-0.12.0"
-      sources."cbor-7.0.6"
+      sources."cbor-8.0.0"
       sources."cert-info-1.5.1"
       (sources."chalk-1.1.3" // {
         dependencies = [
@@ -70389,10 +70229,11 @@ in
           sources."cbor-7.0.5"
           sources."invoices-1.2.1"
           sources."ln-service-51.8.2"
+          sources."nofilter-2.0.3"
         ];
       })
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -70489,6 +70330,7 @@ in
           sources."bn.js-5.2.0"
           sources."cbor-7.0.5"
           sources."invoices-1.2.1"
+          sources."nofilter-2.0.3"
         ];
       })
       (sources."ln-accounting-4.3.1" // {
@@ -70501,21 +70343,24 @@ in
           sources."cbor-7.0.5"
           sources."lightning-3.3.12"
           sources."ln-service-51.8.5"
+          sources."nofilter-2.0.3"
           sources."ws-7.5.0"
         ];
       })
-      (sources."ln-service-51.10.0" // {
+      (sources."ln-service-51.10.1" // {
         dependencies = [
           sources."@grpc/grpc-js-1.3.6"
           sources."@grpc/proto-loader-0.6.4"
           sources."@types/express-4.17.13"
-          sources."@types/node-16.3.3"
+          sources."@types/node-16.4.3"
           sources."@types/request-2.48.6"
           sources."@types/ws-7.4.7"
           sources."bn.js-5.2.0"
+          sources."cbor-7.0.6"
           sources."form-data-2.5.1"
-          sources."lightning-3.4.0"
-          sources."ws-7.5.3"
+          sources."lightning-3.5.0"
+          sources."nofilter-2.0.3"
+          sources."ws-8.0.0"
         ];
       })
       (sources."ln-sync-0.4.7" // {
@@ -70527,8 +70372,10 @@ in
           sources."@types/request-2.48.6"
           sources."@types/ws-7.4.7"
           sources."bn.js-5.2.0"
+          sources."cbor-7.0.6"
           sources."form-data-2.5.1"
           sources."lightning-3.4.0"
+          sources."nofilter-2.0.3"
         ];
       })
       (sources."ln-telegram-3.2.9" // {
@@ -70540,7 +70387,7 @@ in
           sources."@types/request-2.48.6"
           sources."@types/ws-7.4.6"
           sources."bn.js-5.2.0"
-          sources."cbor-7.0.5"
+          sources."cbor-7.0.6"
           sources."form-data-2.5.1"
           sources."lightning-3.3.16"
           sources."ln-service-51.9.0"
@@ -70552,9 +70399,11 @@ in
               sources."@types/node-15.12.5"
               sources."@types/request-2.48.5"
               sources."@types/ws-7.4.5"
+              sources."cbor-7.0.5"
               sources."lightning-3.3.12"
             ];
           })
+          sources."nofilter-2.0.3"
           sources."ws-7.5.3"
         ];
       })
@@ -70618,7 +70467,7 @@ in
       sources."node-addon-api-2.0.2"
       sources."node-fetch-2.6.1"
       sources."node-gyp-build-4.2.3"
-      sources."nofilter-2.0.3"
+      sources."nofilter-3.0.3"
       sources."normalize-url-4.5.1"
       sources."npmlog-2.0.4"
       sources."number-is-nan-1.0.1"
@@ -70659,6 +70508,7 @@ in
           sources."cbor-7.0.5"
           sources."lightning-3.3.12"
           sources."ln-service-51.8.5"
+          sources."nofilter-2.0.3"
           sources."ws-7.5.0"
         ];
       })
@@ -70680,7 +70530,7 @@ in
       sources."process-nextick-args-2.0.1"
       (sources."protobufjs-6.11.2" // {
         dependencies = [
-          sources."@types/node-16.4.12"
+          sources."@types/node-16.4.13"
         ];
       })
       sources."proxy-addr-2.0.7"
@@ -71219,7 +71069,7 @@ in
       sources."find-up-1.1.2"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.2.6"
+          sources."graceful-fs-4.2.8"
         ];
       })
       sources."fs.realpath-1.0.0"
@@ -71240,17 +71090,17 @@ in
       sources."is-utf8-0.2.1"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.6"
+          sources."graceful-fs-4.2.8"
         ];
       })
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.2.6"
+          sources."graceful-fs-4.2.8"
         ];
       })
       (sources."load-json-file-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.6"
+          sources."graceful-fs-4.2.8"
         ];
       })
       sources."lodash-4.2.1"
@@ -71273,7 +71123,7 @@ in
       sources."path-parse-1.0.7"
       (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.6"
+          sources."graceful-fs-4.2.8"
         ];
       })
       sources."pify-2.3.0"
@@ -71417,6 +71267,7 @@ in
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       (sources."hash-base-3.1.0" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -71432,20 +71283,20 @@ in
       sources."inline-source-map-0.6.2"
       sources."insert-module-globals-7.2.1"
       sources."internal-slot-1.0.3"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
-      sources."is-generator-function-1.0.9"
+      sources."is-date-object-1.0.5"
+      sources."is-generator-function-1.0.10"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
-      sources."is-string-1.0.6"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."isarray-1.0.0"
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.2"
@@ -71539,7 +71390,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-1.1.2"
       sources."which-boxed-primitive-1.0.2"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
     ];
@@ -71585,7 +71436,7 @@ in
       sources."asn1-0.2.4"
       sources."assert-never-1.2.1"
       sources."assert-plus-1.0.0"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -71744,6 +71595,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       (sources."hash-base-3.1.0" // {
         dependencies = [
           sources."safe-buffer-5.2.1"
@@ -71771,7 +71623,7 @@ in
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-promise-2.2.2"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-typedarray-1.0.0"
       sources."isarray-2.0.5"
       sources."isstream-0.1.2"
@@ -72025,7 +71877,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."addr-to-ip-port-1.5.4"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -72148,7 +72000,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
       sources."got-1.2.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -72455,7 +72307,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.3.114"
+      sources."constructs-3.3.117"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-5.0.0"
@@ -72483,25 +72335,26 @@ in
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."internal-slot-1.0.3"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
-      sources."is-date-object-1.0.4"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
+      sources."is-date-object-1.0.5"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
@@ -72529,13 +72382,13 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.316" // {
+      (sources."jsii-srcmak-0.1.319" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.3.0"
-      sources."json2jsii-0.1.286"
+      sources."json2jsii-0.1.289"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
@@ -72571,7 +72424,7 @@ in
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.37"
+      sources."sscaff-1.2.40"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -72589,7 +72442,7 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       sources."wrap-ansi-7.0.0"
       sources."xmlbuilder-15.1.1"
       sources."xmldom-0.6.0"
@@ -72723,9 +72576,9 @@ in
       sources."@types/yauzl-2.9.2"
       sources."@types/yoga-layout-1.9.2"
       sources."@types/zen-observable-0.8.3"
-      sources."@wry/context-0.6.0"
-      sources."@wry/equality-0.5.1"
-      sources."@wry/trie-0.3.0"
+      sources."@wry/context-0.6.1"
+      sources."@wry/equality-0.5.2"
+      sources."@wry/trie-0.3.1"
       sources."accepts-1.3.7"
       sources."address-1.1.2"
       (sources."ansi-escapes-4.3.2" // {
@@ -72765,7 +72618,7 @@ in
       sources."array-flatten-1.1.1"
       sources."array-union-2.1.0"
       sources."astral-regex-2.0.0"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."async-retry-1.3.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
@@ -72834,7 +72687,7 @@ in
         ];
       })
       sources."concat-map-0.0.1"
-      sources."constructs-3.3.114"
+      sources."constructs-3.3.117"
       (sources."content-disposition-0.5.3" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -72934,7 +72787,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.3"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphology-0.20.0"
       sources."graphology-types-0.19.3"
       sources."graphql-15.5.1"
@@ -72944,6 +72797,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hoist-non-react-statics-3.3.2"
       (sources."http-errors-1.7.2" // {
         dependencies = [
@@ -72973,13 +72827,13 @@ in
       sources."inquirer-8.1.2"
       sources."internal-slot-1.0.3"
       sources."ipaddr.js-1.9.1"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-2.1.0"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
       sources."is-ci-2.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -72988,13 +72842,13 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
       sources."is-stream-2.0.1"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-unicode-supported-0.1.0"
       sources."is-valid-domain-0.1.2"
       sources."is-weakmap-2.0.1"
@@ -73033,7 +72887,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.316" // {
+      (sources."jsii-srcmak-0.1.319" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
@@ -73191,7 +73045,7 @@ in
       sources."sort-json-2.0.0"
       sources."source-map-0.5.7"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.37"
+      sources."sscaff-1.2.40"
       (sources."stack-utils-2.0.3" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -73251,7 +73105,7 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       sources."widest-line-3.1.0"
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
@@ -73894,10 +73748,11 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.0"
       sources."ieee754-1.2.1"
@@ -73906,16 +73761,16 @@ in
       sources."ini-1.3.8"
       sources."int64-buffer-0.1.10"
       sources."internal-slot-1.0.3"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
-      sources."is-date-object-1.0.4"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
+      sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
@@ -74222,7 +74077,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
@@ -74372,7 +74227,7 @@ in
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
@@ -75027,7 +74882,7 @@ in
       sha512 = "0CoePhEzGBHBin0mGtGhUV+hkg6Uh8+Qz0tN4a1A+vqiip/juRRmokB/yxMyFbhUftDXmkiF/JmrSC04uYCTAw==";
     };
     dependencies = [
-      sources."pyright-1.1.159"
+      sources."pyright-1.1.160"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -75271,7 +75126,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -76058,7 +75913,7 @@ in
     };
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."bintrees-1.0.1"
       sources."color-3.0.0"
       sources."color-convert-1.9.3"
@@ -76343,7 +76198,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -76627,7 +76482,7 @@ in
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."spdx-correct-3.1.1"
@@ -76738,7 +76593,7 @@ in
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -76855,7 +76710,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."globby-9.2.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -77109,7 +76964,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -77288,7 +77143,7 @@ in
       sources."fstream-1.0.12"
       sources."fstream-ignore-1.0.5"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."hyperquest-2.1.3"
       sources."inflight-1.0.6"
@@ -77643,10 +77498,12 @@ in
       sources."global-4.4.0"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -77704,7 +77561,7 @@ in
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
@@ -78061,6 +77918,24 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  degit = nodeEnv.buildNodePackage {
+    name = "degit";
+    packageName = "degit";
+    version = "2.8.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/degit/-/degit-2.8.4.tgz";
+      sha512 = "vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Straightforward project scaffolding";
+      homepage = "https://github.com/Rich-Harris/degit#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
@@ -78113,7 +77988,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."ignore-5.1.8"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
@@ -78220,10 +78095,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.72.0";
+    version = "6.73.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.72.0.tgz";
-      sha512 = "sOsFzBwwUkJkP6EZ8cOwz1eFva5sTf6ojhOgl2gplRs7+PkuqGyng/4TnKL3KIFqwE5lFsA66sIh8UQU4Dkecw==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.73.0.tgz";
+      sha512 = "9QWk+d0xuT6W+AEvr06Zoh1rllXGkDMUH9LxFtey3Abv5E0M2qSvdspGvqb4d6Fw7BZiThX4tDabT6VNpxqftQ==";
     };
     dependencies = [
       sources."@fast-csv/format-4.3.5"
@@ -78427,7 +78302,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/responselike-1.0.0"
       sources."@types/yauzl-2.9.2"
       sources."abbrev-1.1.1"
@@ -78540,7 +78415,7 @@ in
       sources."detect-node-2.1.0"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
-      (sources."electron-notarize-1.0.1" // {
+      (sources."electron-notarize-1.1.0" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
@@ -78652,7 +78527,7 @@ in
       sources."global-tunnel-ng-2.7.1"
       sources."globalthis-1.0.2"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -79080,7 +78955,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -79152,7 +79027,7 @@ in
       })
       sources."defer-to-connect-2.0.1"
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -80046,7 +79921,7 @@ in
       sources."globby-10.0.2"
       sources."glogg-1.0.2"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gulp-4.0.2"
       (sources."gulp-clean-css-4.3.0" // {
         dependencies = [
@@ -81433,10 +81308,10 @@ in
   expo-cli = nodeEnv.buildNodePackage {
     name = "expo-cli";
     packageName = "expo-cli";
-    version = "4.9.1";
+    version = "4.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.9.1.tgz";
-      sha512 = "73+efSO3vFiqQ/6jwfqPti/k2twvvS1u1v0iEoN0ylXpgFxTWO8DylTJZBqr0YdkpzljG7+yWZDrzdTspXLKww==";
+      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.0.tgz";
+      sha512 = "NHQQBPygck2bQUo5nvCB52BHa+JsjxSlXvdQ39lvonJwvbOdn7IACxlqrkmaxvjfopCLBiBADj3yk1uSYh2cnQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -81473,14 +81348,12 @@ in
       sources."@babel/helper-module-transforms-7.15.0"
       sources."@babel/helper-optimise-call-expression-7.14.5"
       sources."@babel/helper-plugin-utils-7.14.5"
-      sources."@babel/helper-remap-async-to-generator-7.14.5"
       sources."@babel/helper-replace-supers-7.15.0"
       sources."@babel/helper-simple-access-7.14.8"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
       sources."@babel/helper-split-export-declaration-7.14.5"
       sources."@babel/helper-validator-identifier-7.14.9"
       sources."@babel/helper-validator-option-7.14.5"
-      sources."@babel/helper-wrap-function-7.14.5"
       sources."@babel/helpers-7.14.8"
       (sources."@babel/highlight-7.14.5" // {
         dependencies = [
@@ -81488,62 +81361,35 @@ in
         ];
       })
       sources."@babel/parser-7.15.0"
-      sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
-      sources."@babel/plugin-proposal-async-generator-functions-7.14.9"
       sources."@babel/plugin-proposal-class-properties-7.14.5"
-      sources."@babel/plugin-proposal-class-static-block-7.14.5"
-      sources."@babel/plugin-proposal-dynamic-import-7.14.5"
       sources."@babel/plugin-proposal-export-default-from-7.14.5"
-      sources."@babel/plugin-proposal-export-namespace-from-7.14.5"
-      sources."@babel/plugin-proposal-json-strings-7.14.5"
-      sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5"
-      sources."@babel/plugin-proposal-numeric-separator-7.14.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.14.7"
       sources."@babel/plugin-proposal-optional-catch-binding-7.14.5"
       sources."@babel/plugin-proposal-optional-chaining-7.14.5"
-      sources."@babel/plugin-proposal-private-methods-7.14.5"
-      sources."@babel/plugin-proposal-private-property-in-object-7.14.5"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.14.5"
-      sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-class-properties-7.12.13"
-      sources."@babel/plugin-syntax-class-static-block-7.14.5"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-export-default-from-7.14.5"
-      sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
       sources."@babel/plugin-syntax-flow-7.14.5"
-      sources."@babel/plugin-syntax-json-strings-7.8.3"
       sources."@babel/plugin-syntax-jsx-7.14.5"
-      sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
       sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
-      sources."@babel/plugin-syntax-numeric-separator-7.10.4"
       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"
-      sources."@babel/plugin-syntax-private-property-in-object-7.14.5"
-      sources."@babel/plugin-syntax-top-level-await-7.14.5"
       sources."@babel/plugin-syntax-typescript-7.14.5"
       sources."@babel/plugin-transform-arrow-functions-7.14.5"
-      sources."@babel/plugin-transform-async-to-generator-7.14.5"
       sources."@babel/plugin-transform-block-scoped-functions-7.14.5"
       sources."@babel/plugin-transform-block-scoping-7.14.5"
       sources."@babel/plugin-transform-classes-7.14.9"
       sources."@babel/plugin-transform-computed-properties-7.14.5"
       sources."@babel/plugin-transform-destructuring-7.14.7"
-      sources."@babel/plugin-transform-dotall-regex-7.14.5"
-      sources."@babel/plugin-transform-duplicate-keys-7.14.5"
       sources."@babel/plugin-transform-exponentiation-operator-7.14.5"
       sources."@babel/plugin-transform-flow-strip-types-7.14.5"
       sources."@babel/plugin-transform-for-of-7.14.5"
       sources."@babel/plugin-transform-function-name-7.14.5"
       sources."@babel/plugin-transform-literals-7.14.5"
       sources."@babel/plugin-transform-member-expression-literals-7.14.5"
-      sources."@babel/plugin-transform-modules-amd-7.14.5"
       sources."@babel/plugin-transform-modules-commonjs-7.15.0"
-      sources."@babel/plugin-transform-modules-systemjs-7.14.5"
-      sources."@babel/plugin-transform-modules-umd-7.14.5"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9"
-      sources."@babel/plugin-transform-new-target-7.14.5"
       sources."@babel/plugin-transform-object-assign-7.14.5"
       sources."@babel/plugin-transform-object-super-7.14.5"
       sources."@babel/plugin-transform-parameters-7.14.5"
@@ -81553,7 +81399,6 @@ in
       sources."@babel/plugin-transform-react-jsx-self-7.14.9"
       sources."@babel/plugin-transform-react-jsx-source-7.14.5"
       sources."@babel/plugin-transform-regenerator-7.14.5"
-      sources."@babel/plugin-transform-reserved-words-7.14.5"
       (sources."@babel/plugin-transform-runtime-7.15.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -81563,21 +81408,9 @@ in
       sources."@babel/plugin-transform-spread-7.14.6"
       sources."@babel/plugin-transform-sticky-regex-7.14.5"
       sources."@babel/plugin-transform-template-literals-7.14.5"
-      sources."@babel/plugin-transform-typeof-symbol-7.14.5"
       sources."@babel/plugin-transform-typescript-7.15.0"
-      sources."@babel/plugin-transform-unicode-escapes-7.14.5"
       sources."@babel/plugin-transform-unicode-regex-7.14.5"
-      (sources."@babel/preset-env-7.15.0" // {
-        dependencies = [
-          sources."semver-6.3.0"
-        ];
-      })
-      sources."@babel/preset-modules-0.1.4"
-      (sources."@babel/runtime-7.14.8" // {
-        dependencies = [
-          sources."regenerator-runtime-0.13.9"
-        ];
-      })
+      sources."@babel/runtime-7.9.0"
       (sources."@babel/template-7.14.5" // {
         dependencies = [
           sources."@babel/code-frame-7.14.5"
@@ -81591,14 +81424,14 @@ in
       sources."@babel/types-7.15.0"
       sources."@expo/apple-utils-0.0.0-alpha.20"
       sources."@expo/bunyan-4.0.0"
-      sources."@expo/config-5.0.6"
-      (sources."@expo/config-plugins-3.0.6" // {
+      sources."@expo/config-5.0.7"
+      (sources."@expo/config-plugins-3.0.7" // {
         dependencies = [
           sources."semver-7.3.5"
         ];
       })
       sources."@expo/config-types-42.0.0"
-      (sources."@expo/dev-server-0.1.81" // {
+      (sources."@expo/dev-server-0.1.82" // {
         dependencies = [
           sources."body-parser-1.19.0"
           sources."bytes-3.1.0"
@@ -81615,7 +81448,7 @@ in
           sources."temp-dir-2.0.0"
         ];
       })
-      sources."@expo/dev-tools-0.13.112"
+      sources."@expo/dev-tools-0.13.113"
       (sources."@expo/devcert-1.0.0" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -81629,10 +81462,10 @@ in
           sources."tempy-0.3.0"
         ];
       })
-      sources."@expo/json-file-8.2.32"
-      sources."@expo/metro-config-0.1.81"
+      sources."@expo/json-file-8.2.33"
+      sources."@expo/metro-config-0.1.82"
       sources."@expo/osascript-2.0.30"
-      (sources."@expo/package-manager-0.0.45" // {
+      (sources."@expo/package-manager-0.0.46" // {
         dependencies = [
           sources."npm-package-arg-7.0.0"
           sources."rimraf-3.0.2"
@@ -81645,7 +81478,7 @@ in
           sources."xmldom-0.5.0"
         ];
       })
-      sources."@expo/prebuild-config-2.0.6"
+      sources."@expo/prebuild-config-2.0.7"
       sources."@expo/results-1.0.0"
       (sources."@expo/schemer-1.3.31" // {
         dependencies = [
@@ -81656,16 +81489,14 @@ in
       })
       sources."@expo/sdk-runtime-versions-1.0.0"
       sources."@expo/spawn-async-1.5.0"
-      (sources."@expo/webpack-config-0.13.3" // {
+      (sources."@expo/webpack-config-0.14.0" // {
         dependencies = [
           (sources."@babel/core-7.9.0" // {
             dependencies = [
               sources."semver-5.7.1"
             ];
           })
-          sources."@babel/runtime-7.9.0"
           sources."json5-2.2.0"
-          sources."regenerator-runtime-0.13.9"
         ];
       })
       (sources."@expo/xcpretty-3.1.4" // {
@@ -81673,16 +81504,7 @@ in
           sources."js-yaml-4.1.0"
         ];
       })
-      sources."@hapi/address-2.1.4"
-      sources."@hapi/formula-1.2.0"
       sources."@hapi/hoek-9.2.0"
-      (sources."@hapi/joi-16.1.8" // {
-        dependencies = [
-          sources."@hapi/hoek-8.5.1"
-          sources."@hapi/topo-3.1.6"
-        ];
-      })
-      sources."@hapi/pinpoint-1.0.2"
       sources."@hapi/topo-5.1.0"
       sources."@jest/types-26.6.2"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -81726,20 +81548,14 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@rollup/plugin-babel-5.3.0"
-      sources."@rollup/plugin-node-resolve-11.2.1"
-      sources."@rollup/plugin-replace-2.4.2"
-      sources."@rollup/pluginutils-3.1.0"
       sources."@segment/loosely-validate-event-2.0.0"
       sources."@sideway/address-4.1.2"
       sources."@sideway/formula-3.0.0"
       sources."@sideway/pinpoint-2.0.0"
       sources."@sindresorhus/is-4.0.1"
-      sources."@surma/rollup-plugin-off-main-thread-1.4.2"
       sources."@szmarczak/http-timer-4.0.6"
       sources."@tootallnate/once-1.1.2"
       sources."@types/cacheable-request-6.0.2"
-      sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.4"
       sources."@types/html-minifier-terser-5.1.2"
       sources."@types/http-cache-semantics-4.0.1"
@@ -81751,7 +81567,6 @@ in
       sources."@types/minimatch-3.0.5"
       sources."@types/node-9.6.61"
       sources."@types/q-1.5.5"
-      sources."@types/resolve-1.17.1"
       sources."@types/responselike-1.0.0"
       sources."@types/retry-0.12.1"
       sources."@types/source-list-map-0.1.2"
@@ -81766,7 +81581,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-sources-2.1.1" // {
+      (sources."@types/webpack-sources-3.2.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -81884,7 +81699,6 @@ in
       sources."babel-plugin-polyfill-regenerator-0.2.2"
       sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0"
       sources."babel-preset-fbjs-3.4.0"
-      sources."babel-runtime-6.26.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.2"
       (sources."base-0.11.2" // {
@@ -81941,7 +81755,6 @@ in
       sources."buffer-from-1.1.2"
       sources."buffer-indexof-1.1.1"
       sources."buffer-xor-1.0.3"
-      sources."builtin-modules-3.2.0"
       sources."builtin-status-codes-3.0.0"
       sources."builtins-1.0.3"
       sources."bytes-3.0.0"
@@ -82048,7 +81861,6 @@ in
       sources."combined-stream-1.0.8"
       sources."command-exists-1.2.9"
       sources."commander-2.17.1"
-      sources."common-tags-1.8.0"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
       sources."component-type-1.2.1"
@@ -82100,7 +81912,6 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."core-js-2.6.12"
       (sources."core-js-compat-3.16.0" // {
         dependencies = [
           sources."browserslist-4.16.7"
@@ -82234,8 +82045,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -82277,8 +82087,6 @@ in
         ];
       })
       sources."estraverse-4.3.0"
-      sources."estree-walker-1.0.1"
-      sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."eventemitter3-2.0.3"
       sources."events-3.3.0"
@@ -82311,7 +82119,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."expo-pwa-0.0.91" // {
+      (sources."expo-pwa-0.0.92" // {
         dependencies = [
           sources."commander-2.20.0"
         ];
@@ -82409,7 +82217,6 @@ in
       sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
-      sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-port-3.2.0"
       sources."get-stream-5.2.0"
       sources."get-value-2.0.6"
@@ -82422,7 +82229,7 @@ in
       sources."globals-11.12.0"
       sources."globby-11.0.1"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphql-0.13.2"
       (sources."graphql-tools-3.0.0" // {
         dependencies = [
@@ -82437,6 +82244,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-unicode-2.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -82535,17 +82343,17 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-2.1.0"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-2.1.0"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-color-stop-1.1.0"
       sources."is-core-module-2.5.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-descriptor-1.0.2"
       sources."is-directory-0.3.1"
       sources."is-docker-2.2.1"
@@ -82560,10 +82368,9 @@ in
         ];
       })
       sources."is-lambda-1.0.1"
-      sources."is-module-1.0.0"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-obj-2.0.0"
       sources."is-path-cwd-2.2.0"
       (sources."is-path-in-cwd-2.1.0" // {
@@ -82597,13 +82404,12 @@ in
           sources."responselike-1.0.2"
         ];
       })
-      sources."is-regex-1.1.3"
-      sources."is-regexp-1.0.0"
+      sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
       sources."is-retry-allowed-1.2.0"
       sources."is-root-2.1.0"
       sources."is-stream-2.0.1"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typedarray-1.0.0"
       sources."is-valid-path-0.1.1"
@@ -82675,7 +82481,6 @@ in
       sources."lodash.isobject-3.0.2"
       sources."lodash.isstring-4.0.1"
       sources."lodash.memoize-4.1.2"
-      sources."lodash.sortby-4.7.0"
       sources."lodash.uniq-4.5.0"
       (sources."log-symbols-2.2.0" // {
         dependencies = [
@@ -82691,7 +82496,6 @@ in
       })
       sources."lowercase-keys-2.0.0"
       sources."lru-cache-6.0.0"
-      sources."magic-string-0.25.7"
       (sources."make-dir-2.1.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -83232,7 +83036,7 @@ in
       sources."recursive-readdir-2.2.2"
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
-      sources."regenerator-runtime-0.11.1"
+      sources."regenerator-runtime-0.13.9"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
       sources."regexp.prototype.flags-1.3.1"
@@ -83295,19 +83099,6 @@ in
         ];
       })
       sources."ripemd160-2.0.2"
-      sources."rollup-2.56.0"
-      (sources."rollup-plugin-terser-7.0.2" // {
-        dependencies = [
-          sources."commander-2.20.3"
-          sources."source-map-0.7.3"
-          (sources."source-map-support-0.5.19" // {
-            dependencies = [
-              sources."source-map-0.6.1"
-            ];
-          })
-          sources."terser-5.7.1"
-        ];
-      })
       sources."router-ips-1.0.0"
       sources."run-parallel-1.2.0"
       sources."run-queue-1.0.3"
@@ -83362,7 +83153,7 @@ in
       sources."sisteransi-1.0.5"
       sources."slash-3.0.0"
       sources."slugify-1.6.0"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -83411,7 +83202,6 @@ in
       sources."source-map-resolve-0.5.3"
       sources."source-map-support-0.4.18"
       sources."source-map-url-0.4.1"
-      sources."sourcemap-codec-1.4.8"
       sources."spdy-4.0.2"
       (sources."spdy-transport-3.0.0" // {
         dependencies = [
@@ -83468,13 +83258,7 @@ in
       sources."string.prototype.trimend-1.0.4"
       sources."string.prototype.trimstart-1.0.4"
       sources."string_decoder-1.1.1"
-      (sources."stringify-object-3.3.0" // {
-        dependencies = [
-          sources."is-obj-1.0.1"
-        ];
-      })
       sources."strip-ansi-6.0.0"
-      sources."strip-comments-2.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."style-loader-1.2.1"
@@ -83575,7 +83359,6 @@ in
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
-      sources."tr46-1.0.1"
       sources."traverse-0.6.6"
       sources."tree-kill-1.2.2"
       sources."ts-interface-checker-0.1.13"
@@ -83677,7 +83460,6 @@ in
       })
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
-      sources."webidl-conversions-4.0.2"
       (sources."webpack-4.43.0" // {
         dependencies = [
           sources."braces-2.3.2"
@@ -83805,7 +83587,6 @@ in
       })
       sources."websocket-driver-0.6.5"
       sources."websocket-extensions-0.1.4"
-      sources."whatwg-url-7.1.0"
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-module-2.0.0"
@@ -83818,34 +83599,6 @@ in
       })
       sources."widest-line-3.1.0"
       sources."with-open-file-0.1.7"
-      sources."workbox-background-sync-6.1.5"
-      sources."workbox-broadcast-update-6.1.5"
-      (sources."workbox-build-6.1.5" // {
-        dependencies = [
-          sources."crypto-random-string-2.0.0"
-          sources."fs-extra-9.1.0"
-          sources."source-map-0.8.0-beta.0"
-          sources."temp-dir-2.0.0"
-          sources."tempy-0.6.0"
-          sources."type-fest-0.16.0"
-          sources."unique-string-2.0.0"
-          sources."universalify-2.0.0"
-        ];
-      })
-      sources."workbox-cacheable-response-6.1.5"
-      sources."workbox-core-6.1.5"
-      sources."workbox-expiration-6.1.5"
-      sources."workbox-google-analytics-6.1.5"
-      sources."workbox-navigation-preload-6.1.5"
-      sources."workbox-precaching-6.1.5"
-      sources."workbox-range-requests-6.1.5"
-      sources."workbox-recipes-6.1.5"
-      sources."workbox-routing-6.1.5"
-      sources."workbox-strategies-6.1.5"
-      sources."workbox-streams-6.1.5"
-      sources."workbox-sw-6.1.5"
-      sources."workbox-webpack-plugin-6.1.5"
-      sources."workbox-window-6.1.5"
       sources."worker-farm-1.7.0"
       sources."worker-rpc-0.1.1"
       (sources."wrap-ansi-7.0.0" // {
@@ -83863,7 +83616,7 @@ in
           sources."uuid-7.0.3"
         ];
       })
-      (sources."xdl-59.0.52" // {
+      (sources."xdl-59.0.53" // {
         dependencies = [
           sources."chownr-1.1.4"
           sources."fs-minipass-1.2.7"
@@ -83871,7 +83624,6 @@ in
           sources."minizlib-1.3.3"
           sources."p-map-3.0.0"
           sources."tar-4.4.6"
-          sources."uuid-3.3.2"
           sources."yallist-3.1.1"
         ];
       })
@@ -83957,7 +83709,7 @@ in
       sources."@babel/traverse-7.15.0"
       sources."@babel/types-7.15.0"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/yauzl-2.9.2"
       sources."@types/yoga-layout-1.9.2"
@@ -84009,7 +83761,7 @@ in
       })
       sources."delay-5.0.0"
       sources."devtools-protocol-0.0.869402"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -84227,18 +83979,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       (sources."@oclif/command-1.8.0" // {
         dependencies = [
-          sources."@oclif/plugin-help-3.2.2"
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-4.1.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-4.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-          sources."supports-color-7.2.0"
-          sources."wrap-ansi-4.0.0"
+          sources."@oclif/plugin-help-3.3.0"
         ];
       })
       (sources."@oclif/config-1.17.0" // {
@@ -84247,6 +83988,24 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      (sources."@oclif/core-0.5.28" // {
+        dependencies = [
+          sources."chalk-4.1.2"
+          (sources."cli-ux-5.6.3" // {
+            dependencies = [
+              sources."fs-extra-8.1.0"
+              sources."supports-color-8.1.1"
+            ];
+          })
+          sources."fs-extra-9.1.0"
+          sources."globby-11.0.4"
+          sources."has-flag-4.0.0"
+          sources."jsonfile-6.1.0"
+          sources."supports-color-7.2.0"
+          sources."tslib-2.3.0"
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."@oclif/errors-1.3.5"
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
@@ -84280,10 +84039,11 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."ansi-escapes-3.2.0"
+      sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."ansicolors-0.3.2"
+      sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -84295,6 +84055,7 @@ in
       sources."assert-plus-1.0.0"
       sources."assign-symbols-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.11.0"
@@ -84313,6 +84074,7 @@ in
           sources."chalk-4.1.2"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
+          sources."type-fest-0.20.2"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -84355,19 +84117,28 @@ in
       })
       sources."clean-stack-3.0.1"
       sources."cli-boxes-2.2.1"
-      sources."cli-table-0.3.6"
+      sources."cli-progress-3.9.0"
+      (sources."cli-table-0.3.6" // {
+        dependencies = [
+          sources."colors-1.0.3"
+        ];
+      })
       (sources."cli-ux-4.9.3" // {
         dependencies = [
+          sources."ansi-escapes-3.2.0"
           sources."ansi-regex-4.1.0"
           sources."ansi-styles-3.2.1"
           sources."clean-stack-2.2.0"
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
+          sources."extract-stack-1.0.0"
           sources."fs-extra-7.0.1"
+          sources."has-flag-2.0.0"
           sources."indent-string-3.2.0"
           sources."is-wsl-1.1.0"
           sources."semver-5.7.1"
           sources."strip-ansi-5.2.0"
+          sources."supports-hyperlinks-1.0.1"
         ];
       })
       sources."clone-response-1.0.2"
@@ -84375,7 +84146,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."colors-1.0.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
@@ -84445,7 +84216,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."extract-stack-1.0.0"
+      sources."extract-stack-2.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-diff-1.2.0"
@@ -84470,6 +84241,7 @@ in
       sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-package-type-0.1.0"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
@@ -84508,7 +84280,7 @@ in
         ];
       })
       sources."got-8.3.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -84528,6 +84300,7 @@ in
       })
       (sources."heroku-cli-util-8.0.12" // {
         dependencies = [
+          sources."ansi-escapes-3.2.0"
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."color-convert-1.9.3"
@@ -84570,6 +84343,7 @@ in
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
       sources."js-tokens-4.0.0"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       sources."jsesc-2.5.2"
       sources."json-buffer-3.0.0"
@@ -84603,6 +84377,7 @@ in
       sources."moment-2.29.1"
       sources."ms-2.1.2"
       sources."nanomatch-1.2.13"
+      sources."natural-orderby-2.0.3"
       (sources."netrc-parser-3.1.6" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -84627,6 +84402,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-treeify-1.1.33"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
@@ -84637,7 +84413,11 @@ in
       sources."p-is-promise-1.1.0"
       sources."p-timeout-2.0.1"
       sources."pascalcase-0.1.1"
-      sources."password-prompt-1.1.2"
+      (sources."password-prompt-1.1.2" // {
+        dependencies = [
+          sources."ansi-escapes-3.2.0"
+        ];
+      })
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
@@ -84723,6 +84503,7 @@ in
       sources."source-map-resolve-0.5.3"
       sources."source-map-url-0.4.1"
       sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -84752,9 +84533,10 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-eof-1.0.0"
       sources."supports-color-5.5.0"
-      (sources."supports-hyperlinks-1.0.1" // {
+      (sources."supports-hyperlinks-2.2.0" // {
         dependencies = [
-          sources."has-flag-2.0.0"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
         ];
       })
       sources."timed-out-4.0.1"
@@ -84772,7 +84554,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."type-fest-0.20.2"
+      sources."type-fest-0.21.3"
       sources."union-value-1.0.1"
       sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
@@ -84863,7 +84645,7 @@ in
       sources."@types/json-schema-7.0.9"
       sources."@types/long-4.0.1"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -84909,7 +84691,7 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."ast-types-0.13.4"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -85212,14 +84994,14 @@ in
       sources."glob-slasher-1.0.1"
       sources."global-dirs-2.1.0"
       sources."google-auth-library-6.1.6"
-      (sources."google-gax-2.21.1" // {
+      (sources."google-gax-2.22.1" // {
         dependencies = [
           sources."google-auth-library-7.5.0"
         ];
       })
       sources."google-p12-pem-3.1.1"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gtoken-5.3.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -85479,6 +85261,7 @@ in
       sources."promise-breaker-5.0.0"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-2.0.1"
+      sources."proto3-json-serializer-0.1.1"
       sources."protobufjs-6.11.2"
       sources."proxy-addr-2.0.7"
       (sources."proxy-agent-4.0.1" // {
@@ -85556,7 +85339,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."simple-swizzle-0.2.2"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.6.1"
@@ -85969,7 +85752,7 @@ in
     dependencies = [
       sources."@types/atob-2.1.2"
       sources."@types/inquirer-6.5.0"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/through-0.0.30"
       sources."ajv-6.12.6"
       sources."ansi-escapes-4.3.2"
@@ -86035,7 +85818,7 @@ in
       sources."get-caller-file-2.0.5"
       sources."getpass-0.1.7"
       sources."global-4.4.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-4.0.0"
@@ -86142,7 +85925,7 @@ in
       sources."utf8-3.0.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
-      sources."web3-utils-1.5.0"
+      sources."web3-utils-1.5.1"
       sources."which-module-2.0.0"
       sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
@@ -86330,10 +86113,11 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -86347,14 +86131,14 @@ in
       sources."ini-1.3.8"
       sources."internal-slot-1.0.3"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-1.0.1"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-1.0.1"
       sources."is-extglob-2.1.1"
@@ -86366,14 +86150,14 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-obj-1.0.1"
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."is-windows-1.0.2"
@@ -86577,7 +86361,7 @@ in
       })
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       (sources."winston-0.8.3" // {
         dependencies = [
           sources."async-0.2.10"
@@ -86751,7 +86535,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-patch-0.0.30"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/node-fetch-2.5.12"
       sources."@types/unist-2.0.6"
       sources."@types/yargs-15.0.14"
@@ -86914,7 +86698,7 @@ in
       sources."dotenv-8.6.0"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -87003,7 +86787,7 @@ in
       sources."global-dirs-3.0.0"
       sources."globals-11.12.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphql-15.5.1"
       sources."graphql-compose-7.25.1"
       sources."graphql-subscriptions-1.2.1"
@@ -87591,7 +87375,7 @@ in
       sources."semver-5.7.1"
       sources."separator-escape-0.0.1"
       sources."sha.js-2.4.5"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."sodium-browserify-1.3.0"
       (sources."sodium-browserify-tweetnacl-0.2.6" // {
@@ -87743,7 +87527,7 @@ in
       sources."clone-response-1.0.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."conf-10.0.1"
+      sources."conf-10.0.2"
       (sources."configstore-5.0.1" // {
         dependencies = [
           sources."dot-prop-5.3.0"
@@ -87804,7 +87588,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -87972,7 +87756,7 @@ in
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.6.1"
@@ -88141,7 +87925,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.2"
       sources."abort-controller-3.0.0"
@@ -88283,7 +88067,7 @@ in
           sources."p-cancelable-1.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphql-15.3.0"
       (sources."graphql-config-3.0.3" // {
         dependencies = [
@@ -88299,6 +88083,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."http-cache-semantics-4.1.0"
       sources."http-signature-1.2.0"
       sources."http2-client-1.3.5"
@@ -88326,12 +88111,12 @@ in
         ];
       })
       sources."internal-slot-1.0.3"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
-      sources."is-date-object-1.0.4"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
+      sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -88340,14 +88125,14 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-promise-4.0.0"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-typedarray-1.0.0"
       sources."is-unicode-supported-0.1.0"
       sources."is-weakmap-2.0.1"
@@ -88573,7 +88358,7 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
@@ -89102,7 +88887,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gulp-cli-2.3.0"
       sources."gulplog-1.0.0"
       sources."has-1.0.3"
@@ -89503,7 +89288,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gulplog-1.0.0"
       sources."has-1.0.3"
       sources."has-symbols-1.0.2"
@@ -89893,10 +89678,10 @@ in
   http-server = nodeEnv.buildNodePackage {
     name = "http-server";
     packageName = "http-server";
-    version = "0.12.3";
+    version = "13.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz";
-      sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA==";
+      url = "https://registry.npmjs.org/http-server/-/http-server-13.0.0.tgz";
+      sha512 = "tqOx2M1CiZ3aVaE7Ue/0lup9kOG+Zqg6wdT1HygvxFnvPpU9doBMPcQ1ffT0/QS3J9ua35gipg0o3Dr8N0K0Tg==";
     };
     dependencies = [
       sources."async-2.6.3"
@@ -89905,7 +89690,6 @@ in
       sources."colors-1.4.0"
       sources."corser-2.0.1"
       sources."debug-3.2.7"
-      sources."ecstatic-3.3.2"
       sources."eventemitter3-4.0.7"
       sources."follow-redirects-1.14.1"
       sources."function-bind-1.1.1"
@@ -90206,7 +89990,7 @@ in
           sources."object-assign-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-ansi-2.0.0"
@@ -90462,7 +90246,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-stream-4.1.0"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."historic-readline-1.0.8"
       sources."iconv-lite-0.6.3"
       sources."inflight-1.0.6"
@@ -90616,7 +90400,7 @@ in
       sources."get-stream-4.1.0"
       sources."get-uri-3.0.2"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.2"
@@ -90742,7 +90526,7 @@ in
           sources."is-fullwidth-code-point-3.0.0"
         ];
       })
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.6.1"
@@ -90933,7 +90717,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-3.0.0"
       sources."hashish-0.0.4"
       sources."iconv-lite-0.6.3"
@@ -91255,6 +91039,15 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      (sources."@oclif/core-0.5.28" // {
+        dependencies = [
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."strip-ansi-6.0.0"
+          sources."tslib-2.3.0"
+          sources."universalify-2.0.0"
+        ];
+      })
       (sources."@oclif/errors-1.3.5" // {
         dependencies = [
           sources."fs-extra-8.1.0"
@@ -91271,22 +91064,8 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      (sources."@oclif/plugin-help-3.2.2" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."strip-ansi-6.0.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."@oclif/plugin-help-3.3.0"
+      sources."@oclif/screen-1.0.4"
       sources."@percy/config-1.0.0-beta.63"
       sources."@percy/logger-1.0.0-beta.63"
       sources."@percy/migrate-0.10.0"
@@ -91309,6 +91088,7 @@ in
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
+      sources."ansicolors-0.3.2"
       sources."anymatch-3.1.2"
       sources."aproba-1.2.0"
       (sources."are-we-there-yet-1.1.5" // {
@@ -91342,8 +91122,9 @@ in
       })
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
+      sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.961.0" // {
+      (sources."aws-sdk-2.963.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -91383,6 +91164,7 @@ in
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
       sources."caniuse-lite-1.0.30001249"
+      sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.2" // {
         dependencies = [
@@ -91419,7 +91201,17 @@ in
       })
       sources."clean-stack-3.0.1"
       sources."cli-cursor-3.1.0"
+      sources."cli-progress-3.9.0"
       sources."cli-spinners-2.6.0"
+      (sources."cli-ux-5.6.3" // {
+        dependencies = [
+          sources."fs-extra-8.1.0"
+          sources."has-flag-4.0.0"
+          sources."strip-ansi-6.0.0"
+          sources."supports-color-8.1.1"
+          sources."tslib-2.3.0"
+        ];
+      })
       sources."cli-width-3.0.0"
       sources."cliss-0.0.2"
       sources."clone-1.0.4"
@@ -91455,7 +91247,14 @@ in
       sources."core-util-is-1.0.2"
       sources."cosmiconfig-7.0.0"
       sources."cross-env-6.0.3"
-      sources."cross-spawn-7.0.3"
+      (sources."cross-spawn-7.0.3" // {
+        dependencies = [
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."which-2.0.2"
+        ];
+      })
       sources."crypt-0.0.2"
       (sources."css-3.0.0" // {
         dependencies = [
@@ -91540,7 +91339,7 @@ in
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       (sources."emphasize-1.5.0" // {
         dependencies = [
@@ -91607,6 +91406,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
+      sources."extract-stack-2.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.2.7"
@@ -91624,7 +91424,7 @@ in
       sources."fill-range-7.0.1"
       sources."find-cache-dir-2.1.0"
       sources."find-up-3.0.0"
-      sources."flow-parser-0.156.0"
+      sources."flow-parser-0.157.0"
       sources."follow-redirects-1.14.1"
       sources."font-awesome-filetypes-2.1.0"
       sources."for-each-property-0.0.4"
@@ -91651,6 +91451,7 @@ in
       })
       sources."gensync-1.0.0-beta.2"
       sources."get-intrinsic-1.1.1"
+      sources."get-package-type-0.1.0"
       sources."get-prototype-chain-1.0.1"
       sources."get-stdin-5.0.1"
       sources."get-value-2.0.6"
@@ -91660,7 +91461,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globals-11.12.0"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphlib-2.1.8"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
@@ -91701,6 +91502,7 @@ in
       })
       sources."http-errors-1.8.0"
       sources."http-signature-1.2.0"
+      sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
@@ -91797,6 +91599,7 @@ in
       sources."jmespath-0.15.0"
       sources."jpeg-js-0.4.3"
       sources."js-tokens-4.0.0"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       (sources."jscodeshift-0.11.0" // {
         dependencies = [
@@ -91897,7 +91700,7 @@ in
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.3"
+      sources."mermaid-8.11.4"
       sources."micromatch-4.0.4"
       sources."mime-db-1.49.0"
       sources."mime-types-2.1.32"
@@ -91927,6 +91730,7 @@ in
       sources."nanoid-3.1.23"
       sources."nanomatch-1.2.13"
       sources."napi-build-utils-1.0.2"
+      sources."natural-orderby-2.0.3"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
       (sources."needle-2.8.0" // {
@@ -91936,6 +91740,7 @@ in
       })
       sources."neo-async-2.6.2"
       sources."nextgen-events-1.5.2"
+      sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
       (sources."node-abi-2.30.0" // {
         dependencies = [
@@ -91952,13 +91757,13 @@ in
           sources."nopt-3.0.6"
           sources."semver-5.3.0"
           sources."tar-2.2.2"
-          sources."which-1.3.1"
         ];
       })
       sources."node-modules-regexp-1.0.0"
       (sources."node-notifier-8.0.2" // {
         dependencies = [
           sources."uuid-8.3.2"
+          sources."which-2.0.2"
         ];
       })
       sources."node-persist-2.1.0"
@@ -91999,6 +91804,7 @@ in
           sources."magicli-0.0.5"
         ];
       })
+      sources."object-treeify-1.1.33"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
@@ -92023,9 +91829,16 @@ in
       sources."parse-json-5.2.0"
       sources."parse5-5.1.0"
       sources."pascalcase-0.1.1"
+      (sources."password-prompt-1.1.2" // {
+        dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."cross-spawn-6.0.5"
+          sources."semver-5.7.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."path-type-4.0.0"
       sources."performance-now-2.1.0"
       sources."picomatch-2.3.0"
@@ -92066,6 +91879,7 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      sources."redeyed-2.1.1"
       sources."reduce-flatten-1.0.1"
       sources."redux-3.7.2"
       sources."regex-not-1.0.2"
@@ -92134,8 +91948,8 @@ in
           sources."simple-get-4.0.0"
         ];
       })
-      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."shellwords-0.1.1"
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
@@ -92243,6 +92057,12 @@ in
       sources."strip-json-comments-2.0.1"
       sources."stylis-4.0.10"
       sources."supports-color-5.5.0"
+      (sources."supports-hyperlinks-2.2.0" // {
+        dependencies = [
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
       sources."symbol-observable-1.2.0"
       sources."symbol-tree-3.2.4"
       sources."table-layout-0.4.5"
@@ -92341,7 +92161,7 @@ in
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-7.1.0"
-      sources."which-2.0.2"
+      sources."which-1.3.1"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -92456,7 +92276,7 @@ in
       sources."catharsis-0.9.0"
       sources."entities-2.0.3"
       sources."escape-string-regexp-2.0.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."js2xmlparser-4.0.1"
       sources."klaw-3.0.0"
       sources."linkify-it-2.2.0"
@@ -92729,7 +92549,7 @@ in
       sources."get-stream-4.1.0"
       sources."global-dirs-3.0.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -93065,7 +92885,7 @@ in
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."got-5.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -93491,6 +93311,14 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      (sources."@oclif/core-0.5.28" // {
+        dependencies = [
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."tslib-2.3.0"
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."@oclif/errors-1.3.5"
       sources."@oclif/linewrap-1.0.0"
       (sources."@oclif/parser-3.8.5" // {
@@ -93502,21 +93330,7 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      (sources."@oclif/plugin-help-3.2.2" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."@oclif/plugin-help-3.3.0"
       sources."@oclif/screen-1.0.4"
       (sources."@putdotio/api-client-8.17.0" // {
         dependencies = [
@@ -93531,6 +93345,7 @@ in
       sources."argparse-1.0.10"
       sources."array-union-2.1.0"
       sources."asynckit-0.4.0"
+      sources."at-least-node-1.0.0"
       (sources."axios-0.19.2" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -93611,9 +93426,10 @@ in
       sources."fs-extra-8.1.0"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.1.1"
+      sources."get-package-type-0.1.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
@@ -93763,7 +93579,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
@@ -93818,7 +93634,7 @@ in
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."http-errors-1.7.2"
       sources."http-proxy-1.18.1"
       sources."iconv-lite-0.4.24"
@@ -94024,10 +93840,11 @@ in
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       (sources."hash-base-3.1.0" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -94044,23 +93861,23 @@ in
       sources."inline-source-map-0.6.2"
       sources."insert-module-globals-7.2.1"
       sources."internal-slot-1.0.3"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-fullwidth-code-point-3.0.0"
-      sources."is-generator-function-1.0.9"
+      sources."is-generator-function-1.0.10"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-plain-obj-2.1.0"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-stream-2.0.1"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."isarray-1.0.0"
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.2"
@@ -94167,7 +93984,7 @@ in
       sources."valid-url-1.0.9"
       sources."vm-browserify-1.1.2"
       sources."which-boxed-primitive-1.0.2"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.4"
@@ -94219,7 +94036,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-3.1.0"
       sources."glob-stream-6.1.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-symbols-1.0.2"
       sources."inflight-1.0.6"
@@ -95131,7 +94948,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -95140,6 +94957,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-4.0.2"
       sources."http-cache-semantics-4.1.0"
@@ -95178,26 +94996,26 @@ in
       sources."internal-slot-1.0.3"
       sources."ip-1.1.5"
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
       sources."is-lambda-1.0.1"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-obj-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-ssh-1.3.3"
       sources."is-stream-2.0.1"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-text-path-1.0.1"
       sources."is-typedarray-1.0.0"
@@ -95431,7 +95249,7 @@ in
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
       sources."slide-1.1.6"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."sort-keys-2.0.0"
@@ -95566,7 +95384,7 @@ in
       sources."copy-anything-2.0.3"
       sources."debug-3.2.7"
       sources."errno-0.1.8"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."iconv-lite-0.4.24"
       sources."image-size-0.5.5"
       sources."is-what-3.14.1"
@@ -95741,7 +95559,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -96089,7 +95907,7 @@ in
       sources."github-slugger-1.3.0"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       (sources."has-binary2-1.0.3" // {
@@ -96578,7 +96396,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.9"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.14"
@@ -96635,7 +96453,7 @@ in
       })
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."async-each-1.0.3"
       sources."async-retry-1.3.1"
       sources."asynckit-0.4.0"
@@ -96875,7 +96693,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -96995,7 +96813,7 @@ in
       })
       sources."globals-11.12.0"
       sources."google-closure-compiler-js-20170910.0.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       (sources."gunzip-maybe-1.4.2" // {
         dependencies = [
           sources."browserify-zlib-0.1.4"
@@ -97691,7 +97509,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -97888,7 +97706,7 @@ in
       sources."glob-7.1.7"
       sources."globals-9.18.0"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gulp-eslint-3.0.1"
       (sources."gulp-util-3.0.8" // {
         dependencies = [
@@ -98190,6 +98008,14 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      (sources."@oclif/core-0.5.28" // {
+        dependencies = [
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."tslib-2.3.0"
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."@oclif/errors-1.3.5"
       sources."@oclif/linewrap-1.0.0"
       (sources."@oclif/parser-3.8.5" // {
@@ -98203,25 +98029,12 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@oclif/plugin-help-3.2.2" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."@oclif/plugin-help-3.3.0"
+      sources."@oclif/screen-1.0.4"
       sources."@percy/config-1.0.0-beta.63"
       sources."@percy/logger-1.0.0-beta.63"
       sources."@percy/migrate-0.10.0"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/parse-json-4.0.0"
       sources."@types/yauzl-2.9.2"
       sources."agent-base-6.0.2"
@@ -98229,6 +98042,8 @@ in
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
+      sources."ansicolors-0.3.2"
+      sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -98240,6 +98055,7 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."babel-core-7.0.0-bridge.0"
       sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -98261,6 +98077,7 @@ in
       sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
       sources."caniuse-lite-1.0.30001249"
+      sources."cardinal-2.1.1"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
       sources."chownr-1.1.4"
@@ -98283,7 +98100,14 @@ in
       })
       sources."clean-stack-3.0.1"
       sources."cli-cursor-3.1.0"
+      sources."cli-progress-3.9.0"
       sources."cli-spinners-2.6.0"
+      (sources."cli-ux-5.6.3" // {
+        dependencies = [
+          sources."supports-color-8.1.1"
+          sources."tslib-2.3.0"
+        ];
+      })
       sources."cli-width-3.0.0"
       sources."clone-1.0.4"
       sources."clone-deep-4.0.1"
@@ -98303,7 +98127,14 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."cosmiconfig-7.0.0"
-      sources."cross-spawn-7.0.3"
+      (sources."cross-spawn-7.0.3" // {
+        dependencies = [
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."which-2.0.2"
+        ];
+      })
       sources."d3-5.16.0"
       sources."d3-array-1.2.4"
       sources."d3-axis-1.0.12"
@@ -98350,7 +98181,7 @@ in
       sources."devtools-protocol-0.0.901419"
       sources."dir-glob-3.0.1"
       sources."dompurify-2.3.0"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -98389,6 +98220,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
+      sources."extract-stack-2.0.0"
       sources."extract-zip-2.0.1"
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.2.7"
@@ -98410,7 +98242,7 @@ in
         ];
       })
       sources."find-up-4.1.0"
-      sources."flow-parser-0.156.0"
+      sources."flow-parser-0.157.0"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
@@ -98419,13 +98251,14 @@ in
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
       sources."get-intrinsic-1.1.1"
+      sources."get-package-type-0.1.0"
       sources."get-stream-5.2.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."globals-11.12.0"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphlib-2.1.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -98442,6 +98275,7 @@ in
         ];
       })
       sources."https-proxy-agent-5.0.0"
+      sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
@@ -98476,6 +98310,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."js-tokens-4.0.0"
+      sources."js-yaml-3.14.1"
       (sources."jscodeshift-0.11.0" // {
         dependencies = [
           (sources."braces-2.3.2" // {
@@ -98517,7 +98352,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.3"
+      sources."mermaid-8.11.4"
       sources."micromatch-4.0.4"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
@@ -98532,7 +98367,9 @@ in
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."nanomatch-1.2.13"
+      sources."natural-orderby-2.0.3"
       sources."neo-async-2.6.2"
+      sources."nice-try-1.0.5"
       sources."node-dir-0.1.17"
       sources."node-fetch-2.6.1"
       sources."node-modules-regexp-1.0.0"
@@ -98551,6 +98388,7 @@ in
         ];
       })
       sources."object-keys-1.1.1"
+      sources."object-treeify-1.1.33"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
@@ -98564,9 +98402,16 @@ in
       sources."parent-module-1.0.1"
       sources."parse-json-5.2.0"
       sources."pascalcase-0.1.1"
+      (sources."password-prompt-1.1.2" // {
+        dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."cross-spawn-6.0.5"
+          sources."semver-5.7.1"
+        ];
+      })
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
+      sources."path-key-2.0.1"
       sources."path-type-4.0.0"
       sources."pend-1.2.0"
       sources."picomatch-2.3.0"
@@ -98587,6 +98432,7 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      sources."redeyed-2.1.1"
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.4"
       sources."repeat-string-1.6.1"
@@ -98615,8 +98461,8 @@ in
         ];
       })
       sources."shallow-clone-3.0.1"
-      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.3"
       sources."slash-3.0.0"
       (sources."snapdragon-0.8.2" // {
@@ -98658,6 +98504,7 @@ in
       })
       sources."source-map-url-0.4.1"
       sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -98680,6 +98527,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."stylis-4.0.10"
       sources."supports-color-7.2.0"
+      sources."supports-hyperlinks-2.2.0"
       sources."tar-fs-2.0.0"
       sources."tar-stream-2.2.0"
       (sources."temp-0.8.4" // {
@@ -98717,7 +98565,7 @@ in
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."wcwidth-1.0.1"
-      sources."which-2.0.2"
+      sources."which-1.3.1"
       sources."widest-line-3.1.0"
       sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
@@ -99380,10 +99228,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "6.0.5";
+    version = "6.0.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.5.tgz";
-      sha512 = "u6nQQSwJwKM3llCxjseF71yl3ecEN2apAZVvOkx+rha0wuqBz5SNi70TVbgbLaBMxjhJnfRsbgXEizRBub9fHQ==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.8.tgz";
+      sha512 = "pYqdFgEw/2pWjSZQ4r+UEmXy1UkR4WDSf8INBJOEJvIzw4HaBD/pjsUadwkGvMX/iUjSy2/dD9SLZbESFA8lTA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
@@ -99517,7 +99365,7 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-17.9.0" // {
+      (sources."@netlify/build-17.9.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           (sources."boxen-4.2.0" // {
@@ -99546,7 +99394,7 @@ in
           sources."slash-3.0.0"
         ];
       })
-      (sources."@netlify/config-14.4.1" // {
+      (sources."@netlify/config-14.4.3" // {
         dependencies = [
           sources."dot-prop-5.3.0"
           sources."execa-3.4.0"
@@ -99660,6 +99508,31 @@ in
           sources."tslib-2.3.0"
         ];
       })
+      (sources."@oclif/core-0.5.28" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-2.0.5"
+          sources."ansi-styles-4.3.0"
+          sources."array-union-2.1.0"
+          sources."braces-3.0.2"
+          sources."clean-stack-3.0.1"
+          sources."dir-glob-3.0.1"
+          sources."escape-string-regexp-4.0.0"
+          sources."fast-glob-3.2.7"
+          sources."fill-range-7.0.1"
+          sources."fs-extra-9.1.0"
+          sources."glob-parent-5.1.2"
+          sources."globby-11.0.4"
+          sources."ignore-5.1.8"
+          sources."is-number-7.0.0"
+          sources."jsonfile-6.1.0"
+          sources."micromatch-4.0.4"
+          sources."slash-3.0.0"
+          sources."to-regex-range-5.0.1"
+          sources."tslib-2.3.0"
+          sources."universalify-2.0.0"
+          sources."wrap-ansi-7.0.0"
+        ];
+      })
       (sources."@oclif/errors-1.3.5" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -99678,21 +99551,7 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@oclif/plugin-help-3.2.2" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."@oclif/plugin-help-3.3.0"
       (sources."@oclif/plugin-not-found-1.2.4" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -99774,7 +99633,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/keyv-3.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/node-fetch-2.5.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/resolve-1.17.1"
@@ -99858,7 +99717,7 @@ in
       sources."ascii-table-0.0.9"
       sources."assign-symbols-1.0.0"
       sources."ast-module-types-2.7.1"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
@@ -100198,7 +100057,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."elegant-spinner-1.0.1"
       sources."elf-cam-0.1.1"
       sources."emoji-regex-8.0.0"
@@ -100365,6 +100224,7 @@ in
       sources."get-amd-module-type-3.0.0"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
+      sources."get-package-type-0.1.0"
       sources."get-port-5.1.1"
       sources."get-stream-5.2.0"
       sources."get-value-2.0.6"
@@ -100404,7 +100264,7 @@ in
           sources."to-readable-stream-1.0.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
@@ -100750,7 +100610,7 @@ in
           sources."qs-6.10.1"
         ];
       })
-      (sources."netlify-redirect-parser-8.1.0" // {
+      (sources."netlify-redirect-parser-8.2.0" // {
         dependencies = [
           sources."is-plain-obj-2.1.0"
         ];
@@ -101419,7 +101279,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-unicode-2.0.1"
       sources."http-cache-semantics-4.1.0"
       sources."http-proxy-agent-4.0.1"
@@ -101466,7 +101326,7 @@ in
       sources."semver-7.3.5"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."ssri-8.0.1"
@@ -101603,7 +101463,7 @@ in
         ];
       })
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
       sources."has-1.0.3"
@@ -101927,7 +101787,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
@@ -102082,7 +101942,7 @@ in
       sources."get-stream-5.2.0"
       sources."glob-7.1.7"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-unicode-2.0.1"
       sources."hash-sum-2.0.0"
       (sources."help-me-3.0.0" // {
@@ -102357,7 +102217,7 @@ in
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -102550,7 +102410,7 @@ in
       sources."glob-parent-5.1.2"
       sources."global-dirs-2.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-3.0.0"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -102687,7 +102547,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/parse-json-4.0.0"
       sources."@types/responselike-1.0.0"
@@ -102805,7 +102665,7 @@ in
           sources."type-fest-0.10.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
@@ -103191,10 +103051,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "7.20.3";
+    version = "7.20.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-7.20.3.tgz";
-      sha512 = "Kxk+NSnv+bcUKlWEKRaJ745AjEApYzM6GHxXs9AzR8VJiRMPcKvrIGMp+pdkIaF++2kEbcyg/Kx0FCrv+ySJiQ==";
+      url = "https://registry.npmjs.org/npm/-/npm-7.20.5.tgz";
+      sha512 = "vRyu1V79n5BzKn4vkanag1xEjEMLIZ48Ry1V7IyAvHQHi8syOEiYWvUMxNpeDk+e8JKAKCNG3lIYJDm3pM8VMQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -103339,7 +103199,7 @@ in
       })
       sources."globby-11.0.4"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-4.0.0"
@@ -103501,7 +103361,7 @@ in
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
       sources."slash-3.0.0"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."spawn-please-1.0.0"
@@ -104135,7 +103995,7 @@ in
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."deasync-0.1.21"
+      sources."deasync-0.1.22"
       sources."debug-4.3.2"
       sources."decode-uri-component-0.2.0"
       sources."deep-is-0.1.3"
@@ -104190,7 +104050,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.796"
+      sources."electron-to-chromium-1.3.799"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -104261,7 +104121,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."grapheme-breaker-0.3.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -104274,6 +104134,7 @@ in
       sources."has-bigints-1.0.1"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -104326,11 +104187,11 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-1.0.1"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-color-stop-1.1.0"
       sources."is-core-module-2.5.0"
       (sources."is-data-descriptor-1.0.0" // {
@@ -104338,7 +104199,7 @@ in
           sources."kind-of-6.0.3"
         ];
       })
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -104351,12 +104212,12 @@ in
       sources."is-html-1.1.0"
       sources."is-negative-zero-2.0.1"
       sources."is-number-3.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-obj-2.0.0"
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
@@ -104927,12 +104788,13 @@ in
       sources."get-intrinsic-1.1.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hat-0.0.3"
       sources."heapdump-0.3.15"
       sources."hot-shots-6.8.7"
@@ -104942,7 +104804,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ipaddr.js-1.9.1"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
@@ -105078,7 +104940,7 @@ in
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
       sources."wikimedia-langconv-0.1.0"
-      sources."wikipeg-2.0.5"
+      sources."wikipeg-2.0.6"
       sources."wordwrap-1.0.0"
       sources."worker-farm-1.7.0"
       sources."wrap-ansi-5.1.0"
@@ -105128,7 +104990,7 @@ in
       sources."fs-extra-7.0.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-3.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -105272,11 +105134,12 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hat-0.0.3"
       sources."hosted-git-info-2.8.9"
       sources."http-headers-3.0.2"
@@ -105302,13 +105165,13 @@ in
       sources."ip-1.1.5"
       sources."ip-set-1.0.2"
       sources."ipaddr.js-2.0.1"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
       sources."k-bucket-0.6.0"
@@ -105614,7 +105477,7 @@ in
       sources."get-browser-rtc-1.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       (sources."has-binary2-1.0.3" // {
@@ -105925,7 +105788,7 @@ in
       sources."github-from-package-0.0.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
@@ -106089,7 +105952,7 @@ in
       sources."anymatch-3.1.2"
       sources."argparse-1.0.10"
       sources."ast-types-0.13.4"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       (sources."async-listener-0.6.10" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -106148,7 +106011,7 @@ in
       sources."git-sha1-0.1.2"
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."http-errors-1.7.3"
@@ -106229,7 +106092,7 @@ in
       sources."setprototypeof-1.1.1"
       sources."shimmer-1.2.1"
       sources."signal-exit-3.0.3"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."source-map-0.6.1"
@@ -106273,10 +106136,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "6.11.5";
+    version = "6.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.11.5.tgz";
-      sha512 = "TXMSRyncP88F4GTdKFIIi3kdXSYf+v3uvIKLfNjPTt2YjsrbKmYNCR3VsGjYwlMVSnH2UEo2/sM2VNSefH9Isw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.0.tgz";
+      sha512 = "3kBjfvJo6eFu6tKpXFhit/Mihd364cjaG4bblu4px8kVbSX+oGKmPBGver4zLG2dP0txtglNU+AS0e1OGEJQMw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -106300,7 +106163,7 @@ in
       sources."commander-2.11.0"
       sources."file-or-stdin-1.0.2"
       sources."get-stdin-5.0.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."inspect-with-kind-1.0.5"
       sources."kind-of-6.0.3"
       sources."poor-mans-t-sql-formatter-1.6.10"
@@ -106377,7 +106240,7 @@ in
       sources."get-stdin-8.0.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."ignore-5.1.8"
       sources."import-cwd-3.0.0"
@@ -106619,7 +106482,7 @@ in
       sources."get-assigned-identifiers-1.2.0"
       sources."glob-7.1.7"
       sources."globule-1.3.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       (sources."hash-base-3.1.0" // {
         dependencies = [
@@ -106779,10 +106642,10 @@ in
   purescript-language-server = nodeEnv.buildNodePackage {
     name = "purescript-language-server";
     packageName = "purescript-language-server";
-    version = "0.15.2";
+    version = "0.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.2.tgz";
-      sha512 = "dlxcc6Fv7rcXO3uFVcOgZturcKknB4J00ITJjZCrORTjw5eVbGcSTKrSeSAlNZWaUYu0HQX9NHVKtHDG/6rBNw==";
+      url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.3.tgz";
+      sha512 = "qAlUEFQRTRKnKet3SxRbLmrC5mOyBIiR5CDqzOmorDN10jgcFIR6mL1sJujQc5cRRcE+HNbBuBeoVdiDvznOGg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
@@ -106881,7 +106744,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-symbols-1.0.2"
       sources."http-cache-semantics-4.1.0"
@@ -106922,7 +106785,7 @@ in
       sources."semver-6.3.0"
       sources."side-channel-1.0.4"
       sources."sisteransi-1.0.5"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       sources."socks-proxy-agent-5.0.1"
       sources."strip-json-comments-2.0.1"
@@ -106945,10 +106808,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.159";
+    version = "1.1.160";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz";
-      sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz";
+      sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -107221,23 +107084,24 @@ in
       sources."has-ansi-2.0.0"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."internal-slot-1.0.3"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
-      sources."is-date-object-1.0.4"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
+      sources."is-date-object-1.0.5"
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
@@ -107270,7 +107134,7 @@ in
       sources."utile-0.2.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       (sources."winston-0.8.3" // {
         dependencies = [
           sources."pkginfo-0.3.1"
@@ -107432,7 +107296,7 @@ in
       sources."@types/glob-7.1.4"
       sources."@types/json-schema-7.0.9"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/parse-json-4.0.0"
       sources."@types/q-1.5.5"
       sources."@webassemblyjs/ast-1.9.0"
@@ -107849,7 +107713,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -108017,7 +107881,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gud-1.0.0"
       sources."gunzip-maybe-1.4.2"
       sources."gzip-size-5.1.1"
@@ -108034,6 +107898,7 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-symbols-1.0.2"
       sources."has-to-string-tag-x-1.4.1"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -108139,17 +108004,17 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-2.1.0"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.2"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-2.1.0"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-color-stop-1.1.0"
       sources."is-core-module-2.5.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-deflate-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-directory-0.3.1"
@@ -108161,7 +108026,7 @@ in
       sources."is-natural-number-4.0.1"
       sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-obj-2.0.0"
       sources."is-object-1.0.2"
       sources."is-path-cwd-2.2.0"
@@ -108169,11 +108034,11 @@ in
       sources."is-path-inside-2.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
@@ -109065,7 +108930,7 @@ in
       sources."esprima-3.1.3"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -109567,7 +109432,7 @@ in
       sources."figures-3.2.0"
       sources."find-up-2.1.0"
       sources."function-bind-1.1.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."hosted-git-info-2.8.9"
@@ -109779,7 +109644,7 @@ in
       sources."@types/node-14.17.9"
       sources."@types/node-fetch-2.5.12"
       sources."@types/resolve-1.17.1"
-      sources."@types/vscode-1.58.1"
+      sources."@types/vscode-1.59.0"
       sources."@typescript-eslint/eslint-plugin-4.29.0"
       sources."@typescript-eslint/experimental-utils-4.29.0"
       sources."@typescript-eslint/parser-4.29.0"
@@ -109928,7 +109793,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globals-13.10.0"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -110050,7 +109915,7 @@ in
       sources."resolve-from-4.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.56.0"
+      sources."rollup-2.51.1"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
       sources."semver-7.3.5"
@@ -110428,10 +110293,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.53.0";
+    version = "2.53.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.53.0.tgz";
-      sha512 = "2srJa55dQY4kx+aNGkevvZbJ/8j/C1TLD3AvZdpqgrRPNG41yfl1B3V/pXMmq5sfdpx09Fr8JOeNRgUgJUq7Aw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.53.1.tgz";
+      sha512 = "LK7BWPCpMq0p1TcnJb4uCkxYYrbsM2J7FOCd29BYKmvvUrB+NzFeAVGE1sR/cPF6ECT0PWsR9NEADb24o5D2WA==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -110523,7 +110388,7 @@ in
       sources."@types/keyv-3.1.2"
       sources."@types/lodash-4.14.172"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/request-2.48.7"
       sources."@types/request-promise-native-1.0.18"
       sources."@types/responselike-1.0.0"
@@ -110557,7 +110422,7 @@ in
       })
       (sources."archiver-5.3.0" // {
         dependencies = [
-          sources."async-3.2.0"
+          sources."async-3.2.1"
           sources."bl-4.1.0"
           sources."tar-stream-2.2.0"
         ];
@@ -110584,7 +110449,7 @@ in
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.961.0" // {
+      (sources."aws-sdk-2.963.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -110866,7 +110731,7 @@ in
           sources."responselike-2.0.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphlib-2.1.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -110942,7 +110807,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
-      (sources."jszip-3.7.0" // {
+      (sources."jszip-3.7.1" // {
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
@@ -111635,7 +111500,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."get-value-2.0.6"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graceful-readlink-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -112101,7 +111966,7 @@ in
       sources."arrify-2.0.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -112240,7 +112105,7 @@ in
       sources."globalthis-1.0.2"
       sources."globby-11.0.4"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."grapheme-splitter-1.0.4"
       sources."gunzip-maybe-1.4.2"
       sources."has-1.0.3"
@@ -112261,7 +112126,7 @@ in
       sources."inherits-2.0.4"
       sources."ini-2.0.0"
       sources."is-3.3.0"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-ci-2.0.0"
       sources."is-deflate-1.0.0"
       sources."is-docker-2.2.1"
@@ -112287,7 +112152,7 @@ in
       sources."json-buffer-3.0.1"
       sources."json-file-plus-3.3.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."jszip-3.7.0" // {
+      (sources."jszip-3.7.1" // {
         dependencies = [
           sources."pako-1.0.11"
           sources."readable-stream-2.3.7"
@@ -112530,7 +112395,15 @@ in
           sources."p-map-2.1.0"
         ];
       })
-      sources."snyk-nuget-plugin-1.22.0"
+      (sources."snyk-nuget-plugin-1.22.0" // {
+        dependencies = [
+          sources."jszip-3.7.0"
+          sources."pako-1.0.11"
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."snyk-paket-parser-1.6.0"
       (sources."snyk-php-plugin-1.9.2" // {
         dependencies = [
@@ -112695,7 +112568,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."accepts-1.3.7"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
@@ -112780,7 +112653,7 @@ in
       sources."get-stream-3.0.0"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-2.8.9"
@@ -113139,12 +113012,13 @@ in
       sources."glob-parent-2.0.0"
       sources."globby-4.1.0"
       sources."gossip-query-2.0.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-bigints-1.0.1"
       sources."has-network-0.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       (sources."has-value-1.0.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -113182,12 +113056,12 @@ in
       })
       sources."is-alphabetical-1.0.4"
       sources."is-alphanumerical-1.0.4"
-      sources."is-arguments-1.1.0"
-      sources."is-bigint-1.0.2"
+      sources."is-arguments-1.1.1"
+      sources."is-bigint-1.0.3"
       sources."is-binary-path-1.0.1"
-      sources."is-boolean-object-1.1.1"
+      sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.3"
+      sources."is-callable-1.2.4"
       sources."is-canonical-base64-1.1.1"
       sources."is-core-module-2.5.0"
       (sources."is-data-descriptor-1.0.0" // {
@@ -113195,7 +113069,7 @@ in
           sources."kind-of-6.0.3"
         ];
       })
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-decimal-1.0.4"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
@@ -113212,7 +113086,7 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.1"
       sources."is-number-2.1.0"
-      sources."is-number-object-1.0.5"
+      sources."is-number-object-1.0.6"
       sources."is-options-1.0.1"
       (sources."is-plain-object-2.0.4" // {
         dependencies = [
@@ -113221,11 +113095,11 @@ in
       })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-string-1.0.6"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.5"
+      sources."is-typed-array-1.1.7"
       sources."is-typedarray-1.0.0"
       sources."is-valid-domain-0.0.20"
       sources."is-weakmap-2.0.1"
@@ -113585,7 +113459,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."shellsubstitute-1.2.0"
       sources."side-channel-1.0.4"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -113792,7 +113666,7 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      sources."which-typed-array-1.1.6"
       sources."word-wrap-1.2.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
@@ -113896,7 +113770,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.961.0" // {
+      (sources."aws-sdk-2.963.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -114105,7 +113979,7 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graphlib-2.1.8"
       sources."har-schema-2.0.0"
       sources."har-validator-2.0.6"
@@ -114118,6 +113992,7 @@ in
       })
       sources."has-cors-1.1.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hawk-3.1.3"
       sources."highlight.js-8.2.0"
       (sources."hipchatter-0.3.2" // {
@@ -114160,7 +114035,7 @@ in
       sources."is-my-json-valid-2.20.5"
       sources."is-promise-2.2.2"
       sources."is-property-1.0.2"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -114772,7 +114647,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -115014,7 +114889,7 @@ in
       sources."@emmetio/abbreviation-2.2.2"
       sources."@emmetio/css-abbreviation-2.1.4"
       sources."@emmetio/scanner-1.0.0"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/pug-2.0.5"
       sources."@types/sass-1.16.1"
       sources."anymatch-3.1.2"
@@ -115096,7 +114971,7 @@ in
       sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ==";
     };
     dependencies = [
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/pug-2.0.5"
       sources."@types/sass-1.16.1"
       sources."ansi-styles-4.3.0"
@@ -115405,7 +115280,7 @@ in
       })
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       (sources."graphlib-2.1.8" // {
         dependencies = [
           sources."lodash-4.17.21"
@@ -116066,7 +115941,7 @@ in
       sources."errno-0.1.8"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
@@ -116199,26 +116074,27 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stdin-5.0.1"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."hosted-git-info-2.8.9"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-alphabetical-1.0.4"
       sources."is-alphanumerical-1.0.4"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
       sources."is-core-module-2.5.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-decimal-1.0.4"
       sources."is-file-1.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-hexadecimal-1.0.4"
       sources."is-plain-obj-2.1.0"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-utf8-0.2.1"
       sources."js-yaml-3.14.1"
       sources."json-parse-better-errors-1.0.2"
@@ -116548,7 +116424,7 @@ in
         ];
       })
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -117055,15 +116931,16 @@ in
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."internal-slot-1.0.3"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
-      sources."is-date-object-1.0.4"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
+      sources."is-date-object-1.0.5"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
-      sources."is-string-1.0.6"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."object-inspect-1.11.0"
       sources."object-keys-1.1.1"
@@ -117163,16 +117040,17 @@ in
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."internal-slot-1.0.3"
-      sources."is-bigint-1.0.2"
-      sources."is-boolean-object-1.1.1"
-      sources."is-callable-1.2.3"
+      sources."is-bigint-1.0.3"
+      sources."is-boolean-object-1.1.2"
+      sources."is-callable-1.2.4"
       sources."is-capitalized-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-negative-zero-2.0.1"
-      sources."is-number-object-1.0.5"
-      sources."is-regex-1.1.3"
-      sources."is-string-1.0.6"
+      sources."is-number-object-1.0.6"
+      sources."is-regex-1.1.4"
+      sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."object-inspect-1.11.0"
       sources."object-keys-1.1.1"
@@ -117244,7 +117122,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -117397,7 +117275,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
       sources."got-11.5.2"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -117728,7 +117606,7 @@ in
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."aws-sign2-0.7.0"
@@ -117763,7 +117641,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."http-signature-1.2.0"
@@ -118157,7 +118035,7 @@ in
       sources."glob-7.1.7"
       sources."glob-parent-5.1.2"
       sources."globby-11.0.4"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."ignore-5.1.8"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
@@ -118270,7 +118148,7 @@ in
         ];
       })
       sources."array-flatten-1.1.1"
-      sources."async-3.2.0"
+      sources."async-3.2.1"
       sources."balanced-match-1.0.2"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
@@ -118540,7 +118418,7 @@ in
       sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w==";
     };
     dependencies = [
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/unist-2.0.6"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -118910,20 +118788,20 @@ in
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
-    version = "23.0.1";
+    version = "23.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vercel/-/vercel-23.0.1.tgz";
-      sha512 = "gY9D74WG9OL7TB/z1g4fypxq3eSiWtFMFx1gIbNf0DXIHGxWG+eczhGxa3IiZ14HhrebTfiPnM8O26AL81MVrQ==";
+      url = "https://registry.npmjs.org/vercel/-/vercel-23.1.1.tgz";
+      sha512 = "9HScSWBFGHmFvvInD0IgbkIrP1+rPjajDlI0n/7HTPOgZ68l2DShEpN6Igt2BPFQhbMK8Fwt5MNuC5RM6JTI2Q==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-16.4.12"
-      sources."@vercel/build-utils-2.11.1"
-      sources."@vercel/go-1.2.2"
-      sources."@vercel/node-1.11.1"
-      sources."@vercel/python-2.0.4"
-      sources."@vercel/ruby-1.2.6"
+      sources."@types/node-16.4.13"
+      sources."@vercel/build-utils-2.12.1"
+      sources."@vercel/go-1.2.3"
+      sources."@vercel/node-1.12.0"
+      sources."@vercel/python-2.0.5"
+      sources."@vercel/ruby-1.2.7"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
           sources."string-width-3.1.0"
@@ -118961,7 +118839,7 @@ in
       sources."get-stream-4.1.0"
       sources."global-dirs-2.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -119016,7 +118894,7 @@ in
       sources."ts-node-8.9.1"
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.9.3"
+      sources."typescript-4.3.4"
       sources."unique-string-2.0.0"
       sources."update-notifier-4.1.0"
       sources."url-parse-lax-3.0.0"
@@ -119420,7 +119298,7 @@ in
       sources."@types/json-schema-7.0.9"
       sources."@types/mocha-7.0.2"
       sources."@types/node-8.10.66"
-      sources."@types/vscode-1.58.1"
+      sources."@types/vscode-1.59.0"
       sources."@types/yauzl-2.9.2"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."@webassemblyjs/ast-1.11.1"
@@ -119505,7 +119383,7 @@ in
       sources."domelementtype-2.2.0"
       sources."domhandler-4.2.0"
       sources."domutils-2.7.0"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.8.2"
@@ -119540,7 +119418,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.2"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -119714,7 +119592,7 @@ in
       sources."vscode-debugadapter-testsupport-1.48.0"
       sources."vscode-debugprotocol-1.48.0"
       sources."watchpack-2.2.0"
-      sources."webpack-5.48.0"
+      sources."webpack-5.49.0"
       (sources."webpack-cli-4.7.2" // {
         dependencies = [
           sources."commander-7.2.0"
@@ -119867,7 +119745,7 @@ in
       sources."git-clone-0.1.0"
       sources."glob-7.1.7"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gray-matter-2.1.1"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
@@ -120071,7 +119949,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-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/unist-2.0.6"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -120371,7 +120249,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."gridsome-helper-json-1.0.3"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
@@ -121081,7 +120959,7 @@ in
       sources."gauge-2.7.4"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.7"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-unicode-2.0.1"
       sources."html-encoding-sniffer-2.0.1"
       sources."http-proxy-agent-4.0.1"
@@ -121243,7 +121121,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/yauzl-2.9.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.2"
@@ -121350,7 +121228,7 @@ in
       sources."delayed-stream-1.0.0"
       (sources."dispensary-0.62.0" // {
         dependencies = [
-          sources."async-3.2.0"
+          sources."async-3.2.1"
         ];
       })
       sources."doctrine-3.0.0"
@@ -121464,7 +121342,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."graceful-readlink-1.0.1"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
@@ -121472,6 +121350,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-yarn-2.1.0"
       sources."htmlparser2-6.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -121488,10 +121367,10 @@ in
       sources."ini-2.0.0"
       sources."invert-kv-3.0.1"
       sources."is-absolute-0.1.7"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -121501,7 +121380,7 @@ in
       sources."is-npm-5.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.3"
-      sources."is-regex-1.1.3"
+      sources."is-regex-1.1.4"
       sources."is-relative-0.1.3"
       sources."is-stream-2.0.1"
       sources."is-typedarray-1.0.0"
@@ -121535,7 +121414,7 @@ in
         ];
       })
       sources."jsprim-1.4.1"
-      sources."jszip-3.7.0"
+      sources."jszip-3.7.1"
       sources."jwa-1.4.1"
       sources."jws-3.2.2"
       sources."keyv-3.1.0"
@@ -121779,7 +121658,7 @@ in
       sources."yauzl-2.10.0"
       (sources."zip-dir-2.0.0" // {
         dependencies = [
-          sources."async-3.2.0"
+          sources."async-3.2.1"
         ];
       })
     ];
@@ -121796,17 +121675,17 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.48.0";
+    version = "5.49.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz";
-      sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz";
+      sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==";
     };
     dependencies = [
       sources."@types/eslint-7.28.0"
       sources."@types/eslint-scope-3.7.1"
       sources."@types/estree-0.0.50"
       sources."@types/json-schema-7.0.9"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
       sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -121834,7 +121713,7 @@ in
       sources."chrome-trace-event-1.0.3"
       sources."colorette-1.2.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.796"
+      sources."electron-to-chromium-1.3.799"
       sources."enhanced-resolve-5.8.2"
       sources."es-module-lexer-0.7.1"
       sources."escalade-3.1.1"
@@ -121849,7 +121728,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."jest-worker-27.0.6"
       sources."json-parse-better-errors-1.0.2"
@@ -121971,7 +121850,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -122179,11 +122058,12 @@ in
           sources."pify-2.3.0"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."handle-thing-2.0.1"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.2"
+      sources."has-tostringtag-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -122211,11 +122091,11 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-3.0.3"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.1.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.4"
+      sources."is-date-object-1.0.5"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-1.0.1"
       sources."is-extglob-2.1.1"
@@ -122230,7 +122110,7 @@ in
       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.1.3"
+      sources."is-regex-1.1.4"
       sources."is-stream-1.1.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
@@ -122607,10 +122487,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "3.5.3";
+    version = "3.5.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz";
-      sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ==";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.4.tgz";
+      sha512 = "7YZv5fSs6tf0JPSQT5eT02t+IgZR7sHPGGSbT2ZmE4VO3X1a4WhSIP4tIpQCNxbzcKCCe6NFimpTxlxXNF/KEQ==";
     };
     dependencies = [
       sources."@leichtgewicht/ip-codec-2.0.3"
@@ -122625,7 +122505,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."addr-to-ip-port-1.5.4"
       sources."airplay-js-0.3.0"
       sources."ansi-regex-5.0.0"
@@ -122710,7 +122590,7 @@ in
       })
       sources."core-util-is-1.0.2"
       sources."cpus-1.0.3"
-      sources."create-torrent-4.7.2"
+      sources."create-torrent-5.0.1"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
       sources."define-lazy-prop-2.0.0"
@@ -122915,7 +122795,7 @@ in
       sources."utp-native-2.5.3"
       sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-1.3.7" // {
+      (sources."webtorrent-1.3.9" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."decompress-response-6.0.0"
@@ -123307,7 +123187,7 @@ in
           sources."p-cancelable-0.4.1"
         ];
       })
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."grouped-queue-2.0.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -123724,7 +123604,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
-      sources."smart-buffer-4.1.0"
+      sources."smart-buffer-4.2.0"
       sources."socks-2.6.1"
       (sources."socks-proxy-agent-5.0.1" // {
         dependencies = [
@@ -123988,7 +123868,7 @@ in
     dependencies = [
       sources."@types/fs-extra-9.0.12"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.12"
+      sources."@types/node-16.4.13"
       sources."@types/node-fetch-2.5.12"
       sources."ansi-styles-4.3.0"
       sources."asynckit-0.4.0"
@@ -123999,7 +123879,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."form-data-3.0.1"
       sources."fs-extra-10.0.0"
-      sources."graceful-fs-4.2.6"
+      sources."graceful-fs-4.2.8"
       sources."has-flag-4.0.0"
       sources."isexe-2.0.0"
       sources."jsonfile-6.1.0"
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 92d89afe398d..79c7a650cffd 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml,
+{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
   lwt_react,
   opaline, ppx_deriving, findlib
 , ocaml-migrate-parsetree
@@ -7,34 +7,24 @@
 , js_of_ocaml-lwt
 , js_of_ocaml-tyxml
 , lwt_ppx
+, ocamlnet
 }:
 
-if !lib.versionAtLeast ocaml.version "4.07"
-then throw "eliom is not available for OCaml ${ocaml.version}"
-else
-
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.12.4";
+  version = "8.6.0";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
+    sha256 = "0s1hpawwhqp4qcy8w1067n8c6zg8jcjpzplc39bjbb1ycqw667j9";
   };
 
-  patches = [
-    # Compatibility with js_of_ocaml >= 3.9.0, remove at next release
-    (fetchpatch {
-      url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch";
-      sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p";
-    })
-  ];
-
   buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
     ocaml-migrate-parsetree
     js_of_ocaml-ppx_deriving_json opaline
     ppx_tools_versioned
+    ocamlnet
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index aac8b27955b5..25d45d9aed9b 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,46 +1,55 @@
-{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl
-, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr
+{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl
+, bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
+, cohttp, cohttp-lwt-unix, hmap
+, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr
 , pgocaml, camlzip, ocaml_sqlite3
 , makeWrapper
 }:
 
-if !lib.versionAtLeast ocaml.version "4.06.1"
-then throw "ocsigenserver is not available for OCaml ${ocaml.version}"
-else
-
-let mkpath = p: n:
-  "${p}/lib/ocaml/${ocaml.version}/site-lib/${n}";
+let mkpath = p:
+  "${p}/lib/ocaml/${ocaml.version}/site-lib/stublibs";
 in
 
-stdenv.mkDerivation rec {
-  version = "2.18.0";
+let caml_ld_library_path =
+  lib.concatMapStringsSep ":" mkpath [
+    bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit ocaml_pcre
+  ]
+; in
+
+buildDunePackage rec {
+  version = "4.0.1";
   pname = "ocsigenserver";
 
+  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigenserver";
     rev = version;
-    sha256 = "0c61wkq8ddy3qxb2x1jz04rz0722hk92r6jl1zvgikh74m5p5ipp";
+    sha256 = "0pid4irkmdmx1d6n2rvcvx5mnljl3hazzdqc3bql72by35izfac6";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ];
+  nativeBuildInputs = [ makeWrapper which ];
+  buildInputs = [ lwt_react pgocaml camlzip ocaml_sqlite3 ];
 
-  propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet
-    ocaml_pcre tyxml xml-light
+  propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
+    ocaml_pcre xml-light
   ];
 
   configureFlags = [ "--root $(out)" "--prefix /" ];
 
   dontAddPrefix = true;
 
-  createFindlibDestdir = true;
+  postConfigure = ''
+    make -C src confs
+  '';
 
   postFixup =
   ''
   rm -rf $out/var/run
   wrapProgram $out/bin/ocsigenserver \
-    --suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
+    --suffix CAML_LD_LIBRARY_PATH : "${caml_ld_library_path}"
   '';
 
   dontPatchShebangs = true;
@@ -51,7 +60,7 @@ stdenv.mkDerivation rec {
     longDescription =''
       A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
       '';
-    license = lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21Only;
     platforms = ocaml.meta.platforms or [];
     maintainers = [ lib.maintainers.gal_bolle ];
   };
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 26d5d10acbbf..ea5609e63b55 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,37 +1,36 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
 , cohttp-lwt-unix
 , resource-pooling
+, ocamlnet
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ocsigen-start-${version}";
-  version = "2.18.0";
+  version = "4.3.0";
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
+  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
 
   patches = [ ./templates-dir.patch ];
 
-  postPatch = ''
-  substituteInPlace "src/os_db.ml" --replace "citext" "text"
-  '';
-
-  createFindlibDestdir = true;
-
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50";
+    sha256 = "0lkl59dwzyqq2lyr46fyjr27ms0fp9h59xfsn37faaavdd7v0h98";
   };
 
+  preInstall = ''
+    mkdir -p $OCAMLFIND_DESTDIR
+  '';
+
   meta = {
     homepage = "http://ocsigen.org/ocsigen-start";
     description = "Eliom application skeleton";
     longDescription =''
      An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
       '';
-    license = lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21Only;
     inherit (ocaml.meta) platforms;
     maintainers = [ lib.maintainers.gal_bolle ];
   };
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 8584ba7166a2..25b36e6985ca 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -42,9 +42,6 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace lib/ansible/executor/task_executor.py \
       --replace "[python," "["
-
-    substituteInPlace requirements.txt \
-      --replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
new file mode 100644
index 000000000000..7663cf8cf1a9
--- /dev/null
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, coverage
+, gettext
+, mock
+, pytestCheckHook
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "bagit";
+  version = "1.8.1";
+
+  src = fetchFromGitHub {
+    owner = "LibraryOfCongress";
+    repo = "bagit-python";
+    rev = "v${version}";
+    hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI=";
+  };
+
+  nativeBuildInputs = [ gettext setuptools-scm ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+  pytestFlagsArray = [ "test.py" ];
+  pythonImportsCheck = [ "bagit" ];
+
+  meta = with lib; {
+    description = "Python library and command line utility for working with BagIt style packages";
+    homepage = "https://libraryofcongress.github.io/bagit-python/";
+    license = with licenses; [ publicDomain ];
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix
index 42bc0c391295..7650e375b41f 100644
--- a/pkgs/development/python-modules/ledgerwallet/default.nix
+++ b/pkgs/development/python-modules/ledgerwallet/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/LedgerHQ/ledgerctl";
     description = "A library to control Ledger devices";
     license = licenses.mit;
-    maintainers = with maintainers; [ xwvvvvwx ];
+    maintainers = with maintainers; [ d-xo ];
   };
 }
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 35eb79d8b2d3..0de0015ab1ec 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -301,6 +301,11 @@ in buildPythonPackage rec {
   # Builds in 2+h with 2 cores, and ~15m with a big-parallel builder.
   requiredSystemFeatures = [ "big-parallel" ];
 
+  passthru = {
+    inherit cudaSupport;
+    cudaArchList = final_cudaArchList;
+  };
+
   meta = with lib; {
     description = "Open source, prototype-to-production deep learning platform";
     homepage    = "https://pytorch.org/";
diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index a146cac392fb..f5c1f4357268 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -7,13 +7,18 @@
 
 buildPythonPackage rec {
   pname = "resolvelib";
-  version = "0.7.1";
+  # Currently this package is only used by Ansible and breaking changes
+  # are frequently introduced, so when upgrading ensure the new version
+  # is compatible with Ansible
+  # https://github.com/NixOS/nixpkgs/pull/128636
+  # https://github.com/ansible/ansible/blob/devel/requirements.txt
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "resolvelib";
     rev = version;
-    sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8";
+    sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
new file mode 100644
index 000000000000..007cca251436
--- /dev/null
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cachecontrol
+, lockfile
+, mistune
+, rdflib
+, rdflib-jsonld
+, ruamel_yaml
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "schema-salad";
+  version = "8.1.20210716111910";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25";
+  };
+
+  propagatedBuildInputs = [
+    cachecontrol
+    lockfile
+    mistune
+    rdflib
+    rdflib-jsonld
+    ruamel_yaml
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+  disabledTests = [
+    # setup for these tests requires network access
+    "test_secondaryFiles"
+    "test_outputBinding"
+  ];
+  pythonImportsCheck = [ "schema_salad" ];
+
+  meta = with lib; {
+    description = "Semantic Annotations for Linked Avro Data";
+    homepage = "https://github.com/common-workflow-language/schema_salad";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/python-modules/shellescape/default.nix b/pkgs/development/python-modules/shellescape/default.nix
new file mode 100644
index 000000000000..2d7309d88215
--- /dev/null
+++ b/pkgs/development/python-modules/shellescape/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "shellescape";
+  version = "3.8.1";
+
+  src = fetchFromGitHub {
+    owner = "chrissimpkins";
+    repo = "shellescape";
+    rev = "v${version}";
+    hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM=";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "shellescape" ];
+
+  meta = with lib; {
+    description = "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote)";
+    homepage = "https://github.com/chrissimpkins/shellescape";
+    license = with licenses; [ mit psfl ];
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index a42c517ede96..fc9905881cb6 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -1,4 +1,5 @@
 { lib
+, symlinkJoin
 , buildPythonPackage
 , fetchFromGitHub
 , ninja
@@ -10,9 +11,18 @@
 , pillow
 , pytorch
 , pytest
+, cudatoolkit
+, cudnn
+, cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch
 }:
 
-buildPythonPackage rec {
+let
+  cudatoolkit_joined = symlinkJoin {
+    name = "${cudatoolkit.name}-unsplit";
+    paths = [ cudatoolkit.out cudatoolkit.lib ];
+  };
+  cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
+in buildPythonPackage rec {
   pname = "torchvision";
   version = "0.10.0";
 
@@ -23,15 +33,22 @@ buildPythonPackage rec {
     sha256 = "13j04ij0jmi58nhav1p69xrm8dg7jisg23268i3n6lnms37n02kc";
   };
 
-  nativeBuildInputs = [ libpng ninja which ];
+  nativeBuildInputs = [ libpng ninja which ]
+    ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
 
   TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
   TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
 
-  buildInputs = [ libjpeg_turbo libpng ];
+  buildInputs = [ libjpeg_turbo libpng ]
+    ++ lib.optionals cudaSupport [ cudnn ];
 
   propagatedBuildInputs = [ numpy pillow pytorch scipy ];
 
+  preBuild = lib.optionalString cudaSupport ''
+    export TORCH_CUDA_ARCH_LIST="${cudaArchStr}"
+    export FORCE_CUDA=1
+  '';
+
   # tries to download many datasets for tests
   doCheck = false;
 
@@ -45,6 +62,7 @@ buildPythonPackage rec {
     description = "PyTorch vision library";
     homepage = "https://pytorch.org/";
     license = licenses.bsd3;
+    platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
     maintainers = with maintainers; [ ericsagnes ];
   };
 }
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 2c2df4878e39..27321b4c4297 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , numpy
@@ -7,7 +8,8 @@
 , pandas
 , pyyaml
 , matplotlib
-, pytest
+, numba
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -28,25 +30,18 @@ buildPythonPackage rec {
     pandas
     pyyaml
     matplotlib
+    numba
   ];
 
   checkInputs = [
-    pytest
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    ${lib.optionalString (stdenv.isDarwin) ''
+  preCheck = lib.optionalString stdenv.isDarwin ''
     # specifically needed for darwin
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.matplotlib
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
-    ''}
-
-    pytest trackpy --ignore trackpy/tests/test_motion.py \
-                   --ignore trackpy/tests/test_feature_saving.py \
-                   --ignore trackpy/tests/test_feature.py \
-                   --ignore trackpy/tests/test_plots.py \
-                   --ignore trackpy/tests/test_legacy_linking.py
   '';
 
   meta = with lib; {
@@ -54,6 +49,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/soft-matter/trackpy";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
-    broken = true; # not compatible with latest pandas
   };
 }
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index a5798c6ad560..6f3b62fc6e42 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.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k";
+    sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm";
   };
 
-  vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw";
+  vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z";
 
   doCheck = false;
 
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 85d311d7aeb6..f8817ffe37e9 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.12.18";
+  version = "0.12.19";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U=";
+    sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M=";
   };
 
   vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix
index 56d5161b49e9..a87b20402d95 100644
--- a/pkgs/development/tools/fission/default.nix
+++ b/pkgs/development/tools/fission/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fission";
-  version = "1.13.1";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "fission";
     repo = "fission";
     rev = version;
-    sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI=";
+    sha256 = "sha256-U/UV5NZXmycDp8+g5XV6P2b+4SutR51rVHdPp9HdPjM=";
   };
 
-  vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg=";
+  vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s=";
 
   buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}";
 
diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix
index 52b233817ab8..0fcbda696619 100644
--- a/pkgs/development/tools/go-containerregistry/default.nix
+++ b/pkgs/development/tools/go-containerregistry/default.nix
@@ -10,20 +10,19 @@ buildGoModule rec {
     rev = "v${version}";
     hash = "sha256-3mvGHAPKDUmrQkBKwlxnF6PG0ZpZDqlM9SMkCyC5ytE=";
   };
-
   vendorSha256 = null;
 
   subPackages = [ "cmd/crane" "cmd/gcrane" ];
 
-  buildFlagsArray = [
-    "-ldflags=-s -w -X github.com/google/go-containerregistry/cmd/crane/cmd.Version=${version} -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version=${version}"
-  ];
+  ldflags =
+    let t = "github.com/google/go-containerregistry"; in
+    [ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ];
 
   # NOTE: no tests
   doCheck = false;
 
   meta = with lib; {
-    description = "A tool for interacting with remote images and registries";
+    description = "Tools for interacting with remote images and registries including crane and gcrane";
     homepage = "https://github.com/google/go-containerregistry";
     license = licenses.apsl20;
     maintainers = with maintainers; [ yurrriq ];
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 2ad3bcbf9a7d..f531e87e8105 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.21.0";
+  version = "1.26.1";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg=";
+    sha256 = "sha256-fKekn930nOGYUhkQus9p4sKcsuUks+KfO4+X5C/3nWg=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs=";
+  vendorSha256 = "sha256-yPRtqJTmYDqzwHyBmVV4HxOmMe7FuSZ/lsQj8PInhFg=";
 
   doCheck = false;
 
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 2d5e77f79186..13badd48e1cc 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.15149";
+  version = "0.1.15663";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw=";
+    sha256 = "sha256-r5528iMy3RRSSRbTOTilnF1FkWBr5VOUWvAZQU/OBjc=";
   };
 
-  vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
+  vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ=";
 
   doCheck = false;
 
diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh
index a67b6c927a89..893477735f53 100755
--- a/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/pkgs/development/tools/rust/rust-analyzer/update.sh
@@ -51,6 +51,9 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
 jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
     >"$build_deps/package.json.new"
 
+# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195
+sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new"
+
 if cmp --quiet "$build_deps"/package.json{.new,}; then
     echo "package.json not changed, skip updating nodePackages"
     rm "$build_deps"/package.json.new
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix
index 86ab951bb9d9..6d299ce6ece5 100644
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stylua";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf";
+    sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9";
   };
 
-  cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj";
+  cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks";
 
   cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
     ++ lib.optionals luauSupport [ "--features" "luau" ];
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
index a1a43a8f3d37..89fc84022f60 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -17,7 +17,7 @@
     "eslint": "^7.30.0",
     "glob": "^7.1.6",
     "mocha": "^9.0.2",
-    "rollup": "^2.51.1",
+    "rollup": "=2.51.1",
     "tslib": "^2.3.0",
     "typescript": "^4.3.5",
     "typescript-formatter": "^7.2.2",
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 1b5a0e3bdffe..d937d4b75f65 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre
+{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre
 , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
 
 stdenv.mkDerivation rec {
@@ -6,18 +6,19 @@ stdenv.mkDerivation rec {
   version = "20.11.00";
 
   src = fetchzip {
-    url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
+    url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
     sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr";
     stripRoot = false;
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ];
 
   postPatch = ''
-    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci"
-    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode"
-    substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl"       "${iasl}/bin/iasl"
+    substituteInPlace src/lib/include/fwts_binpaths.h \
+      --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
+      --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
+      --replace "/usr/bin/iasl"       "${iasl}/bin/iasl"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index 63a8b13f4f85..112e6d2567e1 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Subtitle manager for Sonarr and Radarr";
     homepage = "https://www.bazarr.media/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ xwvvvvwx ];
+    maintainers = with maintainers; [ d-xo ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix
index 5e6556029c02..1d214b751fcf 100644
--- a/pkgs/servers/dendrite/default.nix
+++ b/pkgs/servers/dendrite/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "matrix-dendrite";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "dendrite";
     rev = "v${version}";
-    sha256 = "sha256-BzQp466Zlp7n56n4SUH4cDRTt8EUWGw3q1dxIBB3TBM=";
+    sha256 = "sha256-F2e+peM7DBihmos/oPar36UDHkibmlzIknCjMauOph8=";
   };
 
-  vendorSha256 = "sha256-ak7fWcAXbyVAiyaJZBGMoe2i2nDh4vc/gCC9nbjadJ0=";
+  vendorSha256 = "sha256-M6mnFO+SInZNvtwMa02TvHIg14Ve7swlGcYfsQFioxQ=";
 
   passthru.tests = {
     inherit (nixosTests) dendrite;
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 800b40bc8f0b..86754710ff81 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "headscale";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     rev = "v${version}";
-    sha256 = "sha256-CYqtGTKOuQDpPOWwixRaczBOkIrYE1tdIieaxuvyqQo=";
+    sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog=";
   };
 
   vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M=";
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index ccda9bcddb95..a5b241b20780 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.18.459";
+  version = "0.18.531";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk=";
+    sha256 = "sha256-ZykgYzE86bt5SNeHng995TQuE15ajWhThgqt2fJFizc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 61d5cd26b4b4..f8e9ec33cf77 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "15.0.0";
+  version = "15.0.1";
 
   src = fetchzip {
     url    = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE=";
+    sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index cc06cc6ee6d3..348a2088f2c2 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -2,11 +2,11 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "SpamAssassin";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchurl {
     url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
-    sha256 = "0qsl18p2swdbq4zizvs9ahl2bkilpcyzq817lk16jj5g4rqzivb7";
+    sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index 47352edf48d3..b5137c92b450 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, nixosTests
 , fetchFromGitHub
 , nim
 , libsass
@@ -120,6 +121,10 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) nitter;
+  };
+
   meta = with lib; {
     description = "Alternative Twitter front-end";
     homepage = "https://github.com/zedeus/nitter";
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 16449d73fdac..df3e116ab74a 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "influxdb";
-  version = "1.8.6";
+  version = "1.8.9";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-v58druwTVeUOItbBUNr8lNsFlam9v0sxXlTeHlM0g6A=";
+    sha256 = "sha256-LavOnVREu7uLWcdM9zIonqoYPJBdY2j5eKMeVNXa1dk=";
   };
 
-  vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o=";
+  vendorSha256 = "sha256-jgAbEWXL1LYRN7ud9ij0Z1KBGHPZ0sRq78tsK92ob8k=";
 
   doCheck = false;
 
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 7d9009f8c654..113866c3911d 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.24.1";
+    version = "0.27.2";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs=";
+        sha256 = "sha256-Px2b0s10N5uDYsz95/1cT2tfS/NfhRfKmCdXIaMb5Po=";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY=";
+  vendorSha256 = "sha256-6KjSmxNLY0msMqpPZR7LUZV63Pj6JGhGVRWTKbbnDtk=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 83d4387bd359..efa565bc3e70 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -2,13 +2,13 @@
   unixtools, dnsutils, coreutils, gnugrep, gnused }:
 stdenv.mkDerivation rec {
   pname = "acme.sh";
-  version = "2.9.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "Neilpang";
     repo = "acme.sh";
     rev = version;
-    sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk=";
+    sha256 = "sha256-KWSDAHzvNl8Iao13OV/ExRoKqkc9nouWim+bAN1V+Jo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index ac831c9da482..722e3b947738 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -19,13 +19,13 @@ let
 in
 buildGoPackage rec {
   pname = "lxd";
-  version = "4.16";
+  version = "4.17";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
-    sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r";
+    sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl";
   };
 
   postPatch = ''
@@ -72,7 +72,7 @@ buildGoPackage rec {
     description = "Daemon based on liblxc offering a REST API to manage containers";
     homepage = "https://linuxcontainers.org/lxd/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ fpletz wucke13 ];
+    maintainers = with maintainers; [ fpletz wucke13 marsam ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix
index 8bca39c2ad52..9ff6a7aaa9aa 100644
--- a/pkgs/tools/misc/czkawka/default.nix
+++ b/pkgs/tools/misc/czkawka/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "czkawka";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "qarmin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LtGgpfToQUNKM1hmMPW7UrS/n7iyI+dz2vbSo+GOcRg=";
+    sha256 = "sha256-OBe6nk5C3kO5Lkas9+G+VY3xAzY7SWx8W5CkSbaYJ9Y=";
   };
 
-  cargoSha256 = "sha256-ZbyoCo1n4GRBkb5SClby5V51rLN1PnvCHD30TiJU2gY=";
+  cargoSha256 = "sha256-Jghkf1mX5ic7zB2KmtOZbSxgF8C6KjRdGG1Yt+dzylI=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index e47ea74bbe98..bb44c800a312 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "grc";
-  version = "1.12";
+  version = "1.13";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "garabik";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA=";
+    sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 2db99bfa8280..79ae5a9713be 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eggdrop";
-  version = "1.8.4";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "eggheads";
     repo = "eggdrop";
     rev = "v${version}";
-    sha256 = "0xqdrv4ydxw72a740lkmpg3fs7ldicaf08b0sfqdyaj7cq8l5x5l";
+    sha256 = "sha256-vh8nym7aYeTRUQ7FBZRy4ToG2ajwRDhzi4jNiJQOEyQ=";
   };
 
   buildInputs = [ tcl ];
diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 871dd5ee5bd9..1fc91277ef3b 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.36.1";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ=";
+    sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8=";
   };
 
-  vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM=";
+  vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix
index 054b77f8c9b8..2482c1749959 100644
--- a/pkgs/tools/networking/wifite2/default.nix
+++ b/pkgs/tools/networking/wifite2/default.nix
@@ -1,16 +1,16 @@
 { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
 , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
-, hcxdumptool, pyrit, which }:
+, hcxdumptool, pyrit, which, bully }:
 
 python3.pkgs.buildPythonApplication rec {
-  version = "2.5.5";
+  version = "2.5.7";
   pname = "wifite2";
 
   src = fetchFromGitHub {
     owner = "kimocoder";
     repo = "wifite2";
     rev = version;
-    sha256 = "0rh54gj471dn8442imxwasjrrwzsx4m40nylkw3y6p8rbjmb92h4";
+    sha256 = "sha256-dJ+UOSIR48m8nGoci/6iblLsX296ZGL1hZ74RUsa9lw=";
   };
 
   patches = [
@@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
     wirelesstools
     pyrit
     which
+    bully
   ];
 
   postFixup = let
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 5972d781bd15..416731eb8db9 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
     homepage = "https://www.wireguard.com/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
+    maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index b63b12aca08e..2f23d218c456 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gpg-tui";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
     rev = "v${version}";
-    sha256 = "sha256-ti49b03Ta/MVDNIzW1WhWxJqHNVW9EALUcbElcZvurQ=";
+    sha256 = "sha256-PJLiP8o4HMkaHMrsnObpUdGtKLxIuXZhxva34U26i40=";
   };
 
-  cargoSha256 = "sha256-jF1Ozo5q5cKG9KjR1scbCCofG3FT3Fv98Cj0iOl18+c=";
+  cargoSha256 = "sha256-6fHMchoJO5Tss6kFTulDmI4aXS3YF5k6RqEWQbh5mNc=";
 
   nativeBuildInputs = [
     gpgme # for gpgme-config
diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix
index 88ead40541f1..45196422ff54 100644
--- a/pkgs/tools/text/epubcheck/default.nix
+++ b/pkgs/tools/text/epubcheck/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epubcheck";
-  version = "4.2.4";
+  version = "4.2.6";
 
   src = fetchzip {
     url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
-    sha256 = "02iy62b9wa5shxggflx99kv2q9xkilcsq94s0gbfq4m2aqjgzfwx";
+    sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/tools/virtualization/reg/default.nix
new file mode 100644
index 000000000000..a1b246aff0d3
--- /dev/null
+++ b/pkgs/tools/virtualization/reg/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+  pname = "reg";
+  version = "0.16.1";
+
+  src = fetchFromGitHub {
+    owner = "genuinetools";
+    repo = "reg";
+    rev = "v${version}";
+    sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m";
+  };
+
+  vendorSha256 = null;
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Docker registry v2 command line client and repo listing generator with security checks";
+    homepage = "https://github.com/genuinetools/reg";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ereslibre ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dac91c0ad2f1..32181d9c47a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10,19 +10,6 @@ res: pkgs: super:
 
 with pkgs;
 
-let
-  self =
-    builtins.trace ''
-        It seems that you are using a patched Nixpkgs that references the self
-        variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
-        named, so its usage needs attention. Please use pkgs for packages or super
-        for functions.
-      ''
-      res; # Do *NOT* use res in your fork. It will be removed.
-
-  # TODO: turn self into an error
-
-in
 {
 
   # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
@@ -3261,6 +3248,8 @@ in
 
   psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
 
+  reg = callPackage ../tools/virtualization/reg { };
+
   river = callPackage ../applications/window-managers/river { };
 
   rmapi = callPackage ../applications/misc/remarkable/rmapi { };
@@ -13550,6 +13539,8 @@ in
     inherit (llvmPackages_11) llvm libclang;
   };
 
+  cwltool = callPackage ../applications/science/misc/cwltool { };
+
   dprint = callPackage ../development/tools/dprint { };
 
   libcxx = llvmPackages.libcxx;
@@ -28695,9 +28686,6 @@ in
 
   zola = callPackage ../applications/misc/zola {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
-    # Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build
-    # with rust 1.53. This should be fixed in the next version.
-    rustPlatform = rustPackages_1_45.rustPlatform;
   };
 
   zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index b0e9e8c0a1e1..a0ff13248085 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -80,6 +80,8 @@ let self = rec {
 
   steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { };
 
+  steam-library = callPackage ../applications/video/kodi-packages/steam-library { };
+
   pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { };
 
   pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { };
@@ -120,6 +122,10 @@ let self = rec {
 
   requests = callPackage ../applications/video/kodi-packages/requests { };
 
+  requests-cache = callPackage ../applications/video/kodi-packages/requests-cache { };
+
+  routing = callPackage ../applications/video/kodi-packages/routing { };
+
   signals = callPackage ../applications/video/kodi-packages/signals { };
 
   six = callPackage ../applications/video/kodi-packages/six { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 147f55fca001..ee7db9d5d36f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -995,6 +995,8 @@ in {
 
   bacpypes = callPackage ../development/python-modules/bacpypes { };
 
+  bagit = callPackage ../development/python-modules/bagit { };
+
   banal = callPackage ../development/python-modules/banal { };
 
   bandit = callPackage ../development/python-modules/bandit { };
@@ -7864,6 +7866,8 @@ in {
 
   schema = callPackage ../development/python-modules/schema { };
 
+  schema-salad = callPackage ../development/python-modules/schema-salad { };
+
   schiene = callPackage ../development/python-modules/schiene { };
 
   scikit-bio = callPackage ../development/python-modules/scikit-bio { };
@@ -8007,6 +8011,8 @@ in {
 
   sh = callPackage ../development/python-modules/sh { };
 
+  shellescape = callPackage ../development/python-modules/shellescape { };
+
   shellingham = callPackage ../development/python-modules/shellingham { };
 
   shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 {