diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index d606d473d91e..03133fa1bc43 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -375,7 +375,7 @@ let
         }
         trap cleanup EXIT
 
-        tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX)
+        tmp=$(mktemp -d ''${TMPDIR:-/tmp}/initrd-secrets.XXXXXXXXXX)
 
         ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source:
             let source' = if source == null then dest else toString source; in
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index cf37512ad9f5..f46e1f499c4d 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -69,23 +69,15 @@ let
 
 in mkDerivation rec {
   pname = "drawpile";
-  version = "2.1.17";
+  version = "2.1.19";
 
   src = fetchFromGitHub {
     owner = "drawpile";
     repo = "drawpile";
     rev = version;
-    sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
+    sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I=";
   };
 
-  patches = [
-    # fix for libmicrohttpd 0.9.71
-    (fetchpatch {
-      url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
-      sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
-      name = "mhdfix.patch"; })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules ];
 
   buildInputs = [
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index e699115ab29d..551453e9a2eb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -72,9 +72,9 @@ let
 
   policies = {
     DisableAppUpdate = true;
-  };
+  } // config.firefox.policies or {};
 
-  policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; });
+  policiesJson = writeText "firefox-policies.json" (builtins.toJSON { inherit policies; });
 
   defaultSource = lib.findFirst (sourceMatches "en-US") {} sources;
 
diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
index 7f84e2360704..35e5036076ff 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/pkgs/development/beam-modules/fetch-hex.nix
@@ -1,21 +1,22 @@
 { lib, stdenv, fetchurl }:
 
-{ pkg, version, sha256
-, meta ? {}
+{ pkg
+, version
+, sha256
+, meta ? { }
 }:
 
 with lib;
 
 stdenv.mkDerivation ({
-  name = "hex-source-${pkg}-${version}";
+  pname = "hex-source-${pkg}";
+  inherit version;
 
   src = fetchurl {
     url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar";
     inherit sha256;
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
-
   unpackCmd = ''
     tar -xf $curSrc contents.tar.gz
     mkdir contents
diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix
index d858b3d81aff..0cf2c4c6cb0b 100644
--- a/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix
@@ -1,27 +1,33 @@
 { lib, stdenv, rebar3 }:
 
-{ name, version, sha256, src
-, meta ? {}
+{ name
+, version
+, sha256
+, src
+, meta ? { }
 }:
 
 with lib;
 
 stdenv.mkDerivation ({
-  name = "rebar-deps-${name}-${version}";
+  pname = "rebar-deps-${name}";
+  inherit version;
 
-  phases = [ "downloadPhase" "installPhase" ];
+  dontUnpack = true;
 
-  downloadPhase = ''
+  prePhases = ''
     cp ${src} .
     HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p "$out/_checkouts"
     for i in ./_build/default/lib/* ; do
        echo "$i"
        cp -R "$i" "$out/_checkouts"
     done
+    runHook postInstall
   '';
 
   outputHashAlgo = "sha256";
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3d3a88e2dcda..7190f3942669 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2866,6 +2866,15 @@ let
         sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw==";
       };
     };
+    "@hpcc-js/wasm-1.4.1" = {
+      name = "_at_hpcc-js_slash_wasm";
+      packageName = "@hpcc-js/wasm";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.4.1.tgz";
+        sha512 = "WYeIuG/B1B1cTcM9D9bC6qDFSZnEcJ9R3SpTW5jh10sTh0hD1h1t/dZudfLwarJD+ce8q4/BP43BplbP3CeNkQ==";
+      };
+    };
     "@humanwhocodes/config-array-0.5.0" = {
       name = "_at_humanwhocodes_slash_config-array";
       packageName = "@humanwhocodes/config-array";
@@ -4081,13 +4090,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-18.2.8" = {
+    "@netlify/build-18.2.9" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "18.2.8";
+      version = "18.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.8.tgz";
-        sha512 = "fgLzpoTR/PgS3iRWNlxVuGc9OI7PYpiFyVQtPS+eL+1OS1pvilbqVusD7XbZ3AUSNMsKzOPqaUE+LXi5EwFKkA==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.9.tgz";
+        sha512 = "0resO0G+O8SKcQ7UGUeYmrZCL1qeki+cWo47lOQduo4RNjHNH6fS2HSLM0CJEwTKw9SNiJNBb7hZbRi7C/KNdQ==";
       };
     };
     "@netlify/cache-utils-2.0.1" = {
@@ -4099,13 +4108,13 @@ let
         sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA==";
       };
     };
-    "@netlify/config-15.3.1" = {
+    "@netlify/config-15.3.3" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "15.3.1";
+      version = "15.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.1.tgz";
-        sha512 = "XbPMPHMVN3IHF/KOOJYLvWw84u6F63bpMwt5V4UvObGMAxqosSHElZYl8/Nj4VeplLOwgikT/us50i+EHr7GxA==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.3.tgz";
+        sha512 = "etpctdQCHE/ALOYSWbyXzsquUSswWeUaqMIXfJsJ9pytMmB4oHjB6eu/GIT8FY1R0E6A/aVS2ibeVVexObNXbQ==";
       };
     };
     "@netlify/esbuild-0.13.6" = {
@@ -4540,13 +4549,13 @@ let
         sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA==";
       };
     };
-    "@oclif/core-0.5.29" = {
+    "@oclif/core-0.5.30" = {
       name = "_at_oclif_slash_core";
       packageName = "@oclif/core";
-      version = "0.5.29";
+      version = "0.5.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.29.tgz";
-        sha512 = "v5MMxeTgEKbVcEl7D3jsTVL8Wy3lLTDj0KHX7cOmI751yfjdAOqy9frHQ6IXssxubDkBW6sXzbYN9Bw12zsBqg==";
+        url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.30.tgz";
+        sha512 = "J655ku+fptWPukM15F4DzGZnD1Q1UAzsS7jUy/nHIVhuwjwhl7u9QHLTjZ+1ud/99N2iXaYsa70UcnC1G3mfHQ==";
       };
     };
     "@oclif/errors-1.3.5" = {
@@ -5404,15 +5413,6 @@ let
         sha512 = "9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==";
       };
     };
-    "@rollup/plugin-commonjs-17.1.0" = {
-      name = "_at_rollup_slash_plugin-commonjs";
-      packageName = "@rollup/plugin-commonjs";
-      version = "17.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz";
-        sha512 = "PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==";
-      };
-    };
     "@rollup/plugin-commonjs-18.1.0" = {
       name = "_at_rollup_slash_plugin-commonjs";
       packageName = "@rollup/plugin-commonjs";
@@ -5449,15 +5449,6 @@ let
         sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==";
       };
     };
-    "@rollup/plugin-node-resolve-13.0.4" = {
-      name = "_at_rollup_slash_plugin-node-resolve";
-      packageName = "@rollup/plugin-node-resolve";
-      version = "13.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz";
-        sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==";
-      };
-    };
     "@rollup/pluginutils-3.1.0" = {
       name = "_at_rollup_slash_pluginutils";
       packageName = "@rollup/pluginutils";
@@ -7924,13 +7915,13 @@ let
         sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.29.1" = {
+    "@typescript-eslint/eslint-plugin-4.29.2" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz";
-        sha512 = "AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz";
+        sha512 = "x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -7942,13 +7933,13 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.29.1" = {
+    "@typescript-eslint/experimental-utils-4.29.2" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz";
-        sha512 = "kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz";
+        sha512 = "P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A==";
       };
     };
     "@typescript-eslint/parser-3.10.1" = {
@@ -7960,22 +7951,22 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
-    "@typescript-eslint/parser-4.29.1" = {
+    "@typescript-eslint/parser-4.29.2" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz";
-        sha512 = "3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz";
+        sha512 = "WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==";
       };
     };
-    "@typescript-eslint/scope-manager-4.29.1" = {
+    "@typescript-eslint/scope-manager-4.29.2" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz";
-        sha512 = "Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz";
+        sha512 = "mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==";
       };
     };
     "@typescript-eslint/types-3.10.1" = {
@@ -7987,13 +7978,13 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
-    "@typescript-eslint/types-4.29.1" = {
+    "@typescript-eslint/types-4.29.2" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz";
-        sha512 = "Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz";
+        sha512 = "K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==";
       };
     };
     "@typescript-eslint/typescript-estree-3.10.1" = {
@@ -8005,13 +7996,13 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.29.1" = {
+    "@typescript-eslint/typescript-estree-4.29.2" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz";
-        sha512 = "lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz";
+        sha512 = "TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==";
       };
     };
     "@typescript-eslint/visitor-keys-3.10.1" = {
@@ -8023,13 +8014,13 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.29.1" = {
+    "@typescript-eslint/visitor-keys-4.29.2" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.29.1";
+      version = "4.29.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz";
-        sha512 = "zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz";
+        sha512 = "bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==";
       };
     };
     "@uifabric/foundation-7.9.26" = {
@@ -19392,6 +19383,15 @@ let
         sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==";
       };
     };
+    "d3-7.0.0" = {
+      name = "d3";
+      packageName = "d3";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3/-/d3-7.0.0.tgz";
+        sha512 = "t+jEKGO2jQiSBLJYYq6RFc500tsCeXBB4x41oQaSnZD3Som95nQrlw9XJGrFTMUOQOkwSMauWy9+8Tz1qm9UZw==";
+      };
+    };
     "d3-array-1.2.4" = {
       name = "d3-array";
       packageName = "d3-array";
@@ -19410,6 +19410,15 @@ let
         sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==";
       };
     };
+    "d3-array-3.0.1" = {
+      name = "d3-array";
+      packageName = "d3-array";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.1.tgz";
+        sha512 = "l3Bh5o8RSoC3SBm5ix6ogaFW+J6rOUm42yOtZ2sQPCEvCqUMepeX7zgrlLLGIemxgOyo9s2CsWEidnLv5PwwRw==";
+      };
+    };
     "d3-axis-1.0.12" = {
       name = "d3-axis";
       packageName = "d3-axis";
@@ -19419,6 +19428,15 @@ let
         sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==";
       };
     };
+    "d3-axis-3.0.0" = {
+      name = "d3-axis";
+      packageName = "d3-axis";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz";
+        sha512 = "IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==";
+      };
+    };
     "d3-brush-1.1.6" = {
       name = "d3-brush";
       packageName = "d3-brush";
@@ -19428,6 +19446,15 @@ let
         sha512 = "7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==";
       };
     };
+    "d3-brush-3.0.0" = {
+      name = "d3-brush";
+      packageName = "d3-brush";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz";
+        sha512 = "ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==";
+      };
+    };
     "d3-chord-1.0.6" = {
       name = "d3-chord";
       packageName = "d3-chord";
@@ -19437,6 +19464,15 @@ let
         sha512 = "JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==";
       };
     };
+    "d3-chord-3.0.1" = {
+      name = "d3-chord";
+      packageName = "d3-chord";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz";
+        sha512 = "VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==";
+      };
+    };
     "d3-collection-1.0.7" = {
       name = "d3-collection";
       packageName = "d3-collection";
@@ -19464,6 +19500,15 @@ let
         sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==";
       };
     };
+    "d3-color-3.0.1" = {
+      name = "d3-color";
+      packageName = "d3-color";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-color/-/d3-color-3.0.1.tgz";
+        sha512 = "6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw==";
+      };
+    };
     "d3-contour-1.3.2" = {
       name = "d3-contour";
       packageName = "d3-contour";
@@ -19473,6 +19518,15 @@ let
         sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==";
       };
     };
+    "d3-contour-3.0.1" = {
+      name = "d3-contour";
+      packageName = "d3-contour";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz";
+        sha512 = "0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==";
+      };
+    };
     "d3-delaunay-5.3.0" = {
       name = "d3-delaunay";
       packageName = "d3-delaunay";
@@ -19482,6 +19536,15 @@ let
         sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==";
       };
     };
+    "d3-delaunay-6.0.2" = {
+      name = "d3-delaunay";
+      packageName = "d3-delaunay";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz";
+        sha512 = "IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==";
+      };
+    };
     "d3-dispatch-1.0.6" = {
       name = "d3-dispatch";
       packageName = "d3-dispatch";
@@ -19500,6 +19563,15 @@ let
         sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==";
       };
     };
+    "d3-dispatch-3.0.1" = {
+      name = "d3-dispatch";
+      packageName = "d3-dispatch";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz";
+        sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==";
+      };
+    };
     "d3-drag-1.2.5" = {
       name = "d3-drag";
       packageName = "d3-drag";
@@ -19509,6 +19581,24 @@ let
         sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==";
       };
     };
+    "d3-drag-2.0.0" = {
+      name = "d3-drag";
+      packageName = "d3-drag";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz";
+        sha512 = "g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==";
+      };
+    };
+    "d3-drag-3.0.0" = {
+      name = "d3-drag";
+      packageName = "d3-drag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz";
+        sha512 = "pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==";
+      };
+    };
     "d3-dsv-1.2.0" = {
       name = "d3-dsv";
       packageName = "d3-dsv";
@@ -19527,6 +19617,15 @@ let
         sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==";
       };
     };
+    "d3-dsv-3.0.1" = {
+      name = "d3-dsv";
+      packageName = "d3-dsv";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz";
+        sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==";
+      };
+    };
     "d3-ease-1.0.7" = {
       name = "d3-ease";
       packageName = "d3-ease";
@@ -19536,6 +19635,24 @@ let
         sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==";
       };
     };
+    "d3-ease-2.0.0" = {
+      name = "d3-ease";
+      packageName = "d3-ease";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz";
+        sha512 = "68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==";
+      };
+    };
+    "d3-ease-3.0.1" = {
+      name = "d3-ease";
+      packageName = "d3-ease";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz";
+        sha512 = "wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==";
+      };
+    };
     "d3-fetch-1.2.0" = {
       name = "d3-fetch";
       packageName = "d3-fetch";
@@ -19545,6 +19662,15 @@ let
         sha512 = "yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==";
       };
     };
+    "d3-fetch-3.0.1" = {
+      name = "d3-fetch";
+      packageName = "d3-fetch";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz";
+        sha512 = "kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==";
+      };
+    };
     "d3-force-1.2.1" = {
       name = "d3-force";
       packageName = "d3-force";
@@ -19563,6 +19689,15 @@ let
         sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==";
       };
     };
+    "d3-force-3.0.0" = {
+      name = "d3-force";
+      packageName = "d3-force";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz";
+        sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==";
+      };
+    };
     "d3-format-1.4.5" = {
       name = "d3-format";
       packageName = "d3-format";
@@ -19581,6 +19716,15 @@ let
         sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==";
       };
     };
+    "d3-format-3.0.1" = {
+      name = "d3-format";
+      packageName = "d3-format";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-format/-/d3-format-3.0.1.tgz";
+        sha512 = "hdL7+HBIohpgfolhBxr1KX47VMD6+vVD/oEFrxk5yhmzV2prk99EkFKYpXuhVkFpTgHdJ6/4bYcjdLPPXV4tIA==";
+      };
+    };
     "d3-geo-1.12.1" = {
       name = "d3-geo";
       packageName = "d3-geo";
@@ -19599,6 +19743,15 @@ let
         sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==";
       };
     };
+    "d3-geo-3.0.1" = {
+      name = "d3-geo";
+      packageName = "d3-geo";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz";
+        sha512 = "Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==";
+      };
+    };
     "d3-geo-projection-3.0.0" = {
       name = "d3-geo-projection";
       packageName = "d3-geo-projection";
@@ -19608,6 +19761,15 @@ let
         sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA==";
       };
     };
+    "d3-graphviz-4.0.0" = {
+      name = "d3-graphviz";
+      packageName = "d3-graphviz";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.0.0.tgz";
+        sha512 = "j+fRjPiLnMa3C2QLIWld13vJQzkd9uBhYXZJQSgKI7z2uTvCdMcrvvxJYg7vGdzqceMImKq5Is/oX8kDw+1xng==";
+      };
+    };
     "d3-hierarchy-1.1.9" = {
       name = "d3-hierarchy";
       packageName = "d3-hierarchy";
@@ -19626,6 +19788,15 @@ let
         sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==";
       };
     };
+    "d3-hierarchy-3.0.1" = {
+      name = "d3-hierarchy";
+      packageName = "d3-hierarchy";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.0.1.tgz";
+        sha512 = "RlLTaofEoOrMK1JoXYIGhKTkJFI/6rFrYPgxy6QlZo2BcVc4HGTqEU0rPpzuMq5T/5XcMtAzv1XiLA3zRTfygw==";
+      };
+    };
     "d3-interpolate-1.4.0" = {
       name = "d3-interpolate";
       packageName = "d3-interpolate";
@@ -19644,6 +19815,15 @@ let
         sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==";
       };
     };
+    "d3-interpolate-3.0.1" = {
+      name = "d3-interpolate";
+      packageName = "d3-interpolate";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz";
+        sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==";
+      };
+    };
     "d3-path-1.0.9" = {
       name = "d3-path";
       packageName = "d3-path";
@@ -19662,6 +19842,15 @@ let
         sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==";
       };
     };
+    "d3-path-3.0.1" = {
+      name = "d3-path";
+      packageName = "d3-path";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz";
+        sha512 = "gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==";
+      };
+    };
     "d3-polygon-1.0.6" = {
       name = "d3-polygon";
       packageName = "d3-polygon";
@@ -19671,6 +19860,15 @@ let
         sha512 = "k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==";
       };
     };
+    "d3-polygon-3.0.1" = {
+      name = "d3-polygon";
+      packageName = "d3-polygon";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz";
+        sha512 = "3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==";
+      };
+    };
     "d3-quadtree-1.0.7" = {
       name = "d3-quadtree";
       packageName = "d3-quadtree";
@@ -19689,6 +19887,15 @@ let
         sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw==";
       };
     };
+    "d3-quadtree-3.0.1" = {
+      name = "d3-quadtree";
+      packageName = "d3-quadtree";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz";
+        sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==";
+      };
+    };
     "d3-random-1.1.2" = {
       name = "d3-random";
       packageName = "d3-random";
@@ -19698,6 +19905,15 @@ let
         sha512 = "6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==";
       };
     };
+    "d3-random-3.0.1" = {
+      name = "d3-random";
+      packageName = "d3-random";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz";
+        sha512 = "FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==";
+      };
+    };
     "d3-scale-2.2.2" = {
       name = "d3-scale";
       packageName = "d3-scale";
@@ -19716,6 +19932,15 @@ let
         sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==";
       };
     };
+    "d3-scale-4.0.0" = {
+      name = "d3-scale";
+      packageName = "d3-scale";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.0.tgz";
+        sha512 = "foHQYKpWQcyndH1CGoHdUC4PECxTxonzwwBXGT8qu+Drb1FIc6ON6dG2P5f4hRRMkLiIKeWK7iFtdznDUrnuPQ==";
+      };
+    };
     "d3-scale-chromatic-1.5.0" = {
       name = "d3-scale-chromatic";
       packageName = "d3-scale-chromatic";
@@ -19725,6 +19950,15 @@ let
         sha512 = "ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==";
       };
     };
+    "d3-scale-chromatic-3.0.0" = {
+      name = "d3-scale-chromatic";
+      packageName = "d3-scale-chromatic";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz";
+        sha512 = "Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==";
+      };
+    };
     "d3-selection-1.4.2" = {
       name = "d3-selection";
       packageName = "d3-selection";
@@ -19734,6 +19968,24 @@ let
         sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==";
       };
     };
+    "d3-selection-2.0.0" = {
+      name = "d3-selection";
+      packageName = "d3-selection";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz";
+        sha512 = "XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==";
+      };
+    };
+    "d3-selection-3.0.0" = {
+      name = "d3-selection";
+      packageName = "d3-selection";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz";
+        sha512 = "fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==";
+      };
+    };
     "d3-shape-1.3.7" = {
       name = "d3-shape";
       packageName = "d3-shape";
@@ -19752,6 +20004,15 @@ let
         sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==";
       };
     };
+    "d3-shape-3.0.1" = {
+      name = "d3-shape";
+      packageName = "d3-shape";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.0.1.tgz";
+        sha512 = "HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw==";
+      };
+    };
     "d3-time-1.1.0" = {
       name = "d3-time";
       packageName = "d3-time";
@@ -19770,6 +20031,15 @@ let
         sha512 = "/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==";
       };
     };
+    "d3-time-3.0.0" = {
+      name = "d3-time";
+      packageName = "d3-time";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz";
+        sha512 = "zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==";
+      };
+    };
     "d3-time-format-2.3.0" = {
       name = "d3-time-format";
       packageName = "d3-time-format";
@@ -19788,6 +20058,15 @@ let
         sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==";
       };
     };
+    "d3-time-format-4.0.0" = {
+      name = "d3-time-format";
+      packageName = "d3-time-format";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.0.0.tgz";
+        sha512 = "nzaCwlj+ZVBIlFuVOT1RmU+6xb/7D5IcnhHzHQcBgS/aTa5K9fWZNN5LCXA27LgF5WxoSNJqKBbLcGMtM6Ca6A==";
+      };
+    };
     "d3-timer-1.0.10" = {
       name = "d3-timer";
       packageName = "d3-timer";
@@ -19806,6 +20085,15 @@ let
         sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==";
       };
     };
+    "d3-timer-3.0.1" = {
+      name = "d3-timer";
+      packageName = "d3-timer";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz";
+        sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==";
+      };
+    };
     "d3-transition-1.3.2" = {
       name = "d3-transition";
       packageName = "d3-transition";
@@ -19815,6 +20103,24 @@ let
         sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==";
       };
     };
+    "d3-transition-2.0.0" = {
+      name = "d3-transition";
+      packageName = "d3-transition";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz";
+        sha512 = "42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==";
+      };
+    };
+    "d3-transition-3.0.1" = {
+      name = "d3-transition";
+      packageName = "d3-transition";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz";
+        sha512 = "ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==";
+      };
+    };
     "d3-voronoi-1.1.4" = {
       name = "d3-voronoi";
       packageName = "d3-voronoi";
@@ -19833,6 +20139,24 @@ let
         sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==";
       };
     };
+    "d3-zoom-2.0.0" = {
+      name = "d3-zoom";
+      packageName = "d3-zoom";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz";
+        sha512 = "fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==";
+      };
+    };
+    "d3-zoom-3.0.0" = {
+      name = "d3-zoom";
+      packageName = "d3-zoom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz";
+        sha512 = "b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==";
+      };
+    };
     "dag-map-1.0.2" = {
       name = "dag-map";
       packageName = "dag-map";
@@ -20904,6 +21228,15 @@ let
         sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==";
       };
     };
+    "delaunator-5.0.0" = {
+      name = "delaunator";
+      packageName = "delaunator";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz";
+        sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==";
+      };
+    };
     "delay-4.4.1" = {
       name = "delay";
       packageName = "delay";
@@ -31546,6 +31879,15 @@ let
         sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==";
       };
     };
+    "internmap-2.0.1" = {
+      name = "internmap";
+      packageName = "internmap";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/internmap/-/internmap-2.0.1.tgz";
+        sha512 = "Ujwccrj9FkGqjbY3iVoxD1VV+KdZZeENx0rphrtzmRXbFvkFO88L80BL/zeSIguX/7T+y8k04xqtgWgS5vxwxw==";
+      };
+    };
     "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
@@ -39503,13 +39845,13 @@ let
         sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw==";
       };
     };
-    "mermaid-8.11.4" = {
+    "mermaid-8.11.5" = {
       name = "mermaid";
       packageName = "mermaid";
-      version = "8.11.4";
+      version = "8.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz";
-        sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg==";
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.5.tgz";
+        sha512 = "lbIaDQlFoIQLxnLy8hZgfS6L7gt2Wxlk83fudLslUEhj4yafHyVjzGOlojJQxgsLU5khEANhxLbo0xebtOrhXQ==";
       };
     };
     "meros-1.1.4" = {
@@ -41808,22 +42150,22 @@ let
         sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q==";
       };
     };
-    "netlify-headers-parser-2.1.1" = {
+    "netlify-headers-parser-3.0.1" = {
       name = "netlify-headers-parser";
       packageName = "netlify-headers-parser";
-      version = "2.1.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-2.1.1.tgz";
-        sha512 = "zIVVKf2+5Y/m/dx1+uLdh4xrqf7X6sDFKhFj/RHeyBS8ArqnyAF9vkm3uS0WqByfMpBTmpqZKNXPlJ8dTNihWQ==";
+        url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-3.0.1.tgz";
+        sha512 = "32oDkPa7+JdTFOp0M4H31AZDQ8YVJWgNlPkPuilb1C1dgvmAFXa8k4x+ADpgCbQfTMP3exO3vobvlfj8SUHxnA==";
       };
     };
-    "netlify-redirect-parser-11.0.1" = {
+    "netlify-redirect-parser-11.0.2" = {
       name = "netlify-redirect-parser";
       packageName = "netlify-redirect-parser";
-      version = "11.0.1";
+      version = "11.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.1.tgz";
-        sha512 = "CSIff1lGEA9dn86pnHfsAPei3wr1LfE+vv+XwWO3wStd7kQ1my2bgUxttFBEJDK5YdW+sb7v1285HKm48XZhhw==";
+        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.2.tgz";
+        sha512 = "ngGSxRUv8dsao586J0MsfQFpi66TnIlYND1KRl1vCgjuuMBzvO9WbV8maqJA9d0G6f9NVKb+LqufmOQj4AkkFw==";
       };
     };
     "netlify-redirector-0.2.1" = {
@@ -47922,15 +48264,6 @@ let
         sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
       };
     };
-    "pretty-ms-5.1.0" = {
-      name = "pretty-ms";
-      packageName = "pretty-ms";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.1.0.tgz";
-        sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw==";
-      };
-    };
     "pretty-ms-7.0.1" = {
       name = "pretty-ms";
       packageName = "pretty-ms";
@@ -53070,6 +53403,15 @@ let
         sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==";
       };
     };
+    "robust-predicates-3.0.1" = {
+      name = "robust-predicates";
+      packageName = "robust-predicates";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz";
+        sha512 = "ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==";
+      };
+    };
     "rollup-1.32.1" = {
       name = "rollup";
       packageName = "rollup";
@@ -53079,15 +53421,6 @@ 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.2" = {
       name = "rollup";
       packageName = "rollup";
@@ -55374,13 +55707,13 @@ let
         sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ==";
       };
     };
-    "snyk-python-plugin-1.19.11" = {
+    "snyk-python-plugin-1.20.1" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.19.11";
+      version = "1.20.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz";
-        sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.20.1.tgz";
+        sha512 = "BW5e5o59ev9PzwjVYmWWCgQpVIsMwK3rkEh1BYPMNHFbRC9QXvKsZmr9UX+jSo1rOWNy3fUIjh8t9NAK536YPQ==";
       };
     };
     "snyk-resolve-1.1.0" = {
@@ -64178,13 +64511,13 @@ let
         sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw==";
       };
     };
-    "vscode-json-languageservice-4.1.6" = {
+    "vscode-json-languageservice-4.1.7" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
-      version = "4.1.6";
+      version = "4.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz";
-        sha512 = "DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA==";
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz";
+        sha512 = "cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ==";
       };
     };
     "vscode-jsonrpc-3.5.0" = {
@@ -74490,7 +74823,7 @@ in
       sources."ms-2.0.0"
       sources."request-light-0.4.0"
       sources."vscode-json-languageserver-1.3.4"
-      (sources."vscode-json-languageservice-4.1.6" // {
+      (sources."vscode-json-languageservice-4.1.7" // {
         dependencies = [
           sources."vscode-nls-5.0.0"
         ];
@@ -76367,10 +76700,10 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.8.3";
+    version = "1.8.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.3.tgz";
-      sha512 = "dOvu5TY1zuZ/d7l/v3pGhbgYrhBVQSsmTiLNUL1dYzXCuVUuzNNm5CzZcr8yLTr3diCPU2eavLKs8iBwBvs/8g==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.5.tgz";
+      sha512 = "wFjtKm9KeXOpI/po5unbnju1H6/pm1wT3fHHfNo3LYF5PVKgz39Suvv09XCEAUSBC5PPu8wXNZLoBeVRMI4yuQ==";
     };
     dependencies = [
       sources."typescript-4.3.5"
@@ -85536,7 +85869,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@oclif/core-0.5.29" // {
+      (sources."@oclif/core-0.5.30" // {
         dependencies = [
           sources."chalk-4.1.2"
           (sources."cli-ux-5.6.3" // {
@@ -92819,7 +93152,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@oclif/core-0.5.29" // {
+      (sources."@oclif/core-0.5.30" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."debug-4.3.2"
@@ -93487,7 +93820,7 @@ in
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.4"
+      sources."mermaid-8.11.5"
       sources."micromatch-4.0.4"
       sources."mime-db-1.49.0"
       sources."mime-types-2.1.32"
@@ -95114,7 +95447,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@oclif/core-0.5.29" // {
+      (sources."@oclif/core-0.5.30" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -99811,7 +100144,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@oclif/core-0.5.29" // {
+      (sources."@oclif/core-0.5.30" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -100155,7 +100488,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.4"
+      sources."mermaid-8.11.5"
       sources."micromatch-4.0.4"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
@@ -101031,10 +101364,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "6.4.0";
+    version = "6.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.0.tgz";
-      sha512 = "x68Mpn5UkknbHa5Rl4BChZkg47wlAQpwDAkoeFLlnyr7Xjn5zPE0dEu5eGQtcGgBHIgaJJNZhYNOD/H+EWfk3A==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.2.tgz";
+      sha512 = "3w4D4AG3j0+diPu284sWPenkyTIjZ/j0M3DQ+MU6Vp3298fV/yncpC0taAPk/7NxqAH90Z+iWpdvoO9IUahzzA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
@@ -101169,10 +101502,14 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-18.2.8" // {
+      (sources."@netlify/build-18.2.9" // {
         dependencies = [
           sources."is-plain-obj-2.1.0"
-          sources."locate-path-5.0.0"
+          (sources."locate-path-5.0.0" // {
+            dependencies = [
+              sources."p-locate-4.1.0"
+            ];
+          })
           sources."resolve-2.0.0-next.3"
         ];
       })
@@ -101180,23 +101517,19 @@ in
         dependencies = [
           sources."del-5.1.0"
           sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
           sources."p-map-3.0.0"
           sources."slash-3.0.0"
         ];
       })
-      (sources."@netlify/config-15.3.1" // {
+      (sources."@netlify/config-15.3.3" // {
         dependencies = [
           sources."dot-prop-5.3.0"
           sources."is-plain-obj-2.1.0"
         ];
       })
       sources."@netlify/esbuild-0.13.6"
-      (sources."@netlify/framework-info-5.8.0" // {
-        dependencies = [
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
+      sources."@netlify/framework-info-5.8.0"
       sources."@netlify/functions-utils-2.0.2"
       (sources."@netlify/git-utils-2.0.1" // {
         dependencies = [
@@ -101290,7 +101623,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@oclif/core-0.5.29" // {
+      (sources."@oclif/core-0.5.30" // {
         dependencies = [
           sources."@nodelib/fs.stat-2.0.5"
           sources."ansi-styles-4.3.0"
@@ -101419,8 +101752,8 @@ in
       sources."@types/semver-7.3.8"
       sources."@types/yargs-13.0.12"
       sources."@types/yargs-parser-20.2.1"
-      sources."@typescript-eslint/types-4.29.1"
-      (sources."@typescript-eslint/typescript-estree-4.29.1" // {
+      sources."@typescript-eslint/types-4.29.2"
+      (sources."@typescript-eslint/typescript-estree-4.29.2" // {
         dependencies = [
           sources."@nodelib/fs.stat-2.0.5"
           sources."array-union-2.1.0"
@@ -101437,7 +101770,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@typescript-eslint/visitor-keys-4.29.1"
+      sources."@typescript-eslint/visitor-keys-4.29.2"
       sources."@ungap/from-entries-0.2.1"
       sources."accepts-1.3.7"
       sources."acorn-8.4.1"
@@ -102296,12 +102629,7 @@ in
           sources."type-fest-0.3.1"
         ];
       })
-      (sources."locate-path-6.0.0" // {
-        dependencies = [
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
+      sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.camelcase-4.3.0"
@@ -102420,8 +102748,8 @@ in
           sources."qs-6.10.1"
         ];
       })
-      sources."netlify-headers-parser-2.1.1"
-      sources."netlify-redirect-parser-11.0.1"
+      sources."netlify-headers-parser-3.0.1"
+      sources."netlify-redirect-parser-11.0.2"
       sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
@@ -102544,7 +102872,11 @@ in
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
       sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
+      (sources."p-locate-5.0.0" // {
+        dependencies = [
+          sources."p-limit-3.1.0"
+        ];
+      })
       sources."p-map-4.0.0"
       sources."p-reduce-2.1.0"
       sources."p-timeout-2.0.1"
@@ -102592,6 +102924,7 @@ in
         dependencies = [
           sources."find-up-4.1.0"
           sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
         ];
       })
       sources."posix-character-classes-0.1.1"
@@ -102608,7 +102941,7 @@ in
           sources."color-name-1.1.3"
         ];
       })
-      sources."pretty-ms-5.1.0"
+      sources."pretty-ms-7.0.1"
       sources."prettyjson-1.2.1"
       sources."printj-1.1.2"
       sources."process-es6-0.11.6"
@@ -102641,6 +102974,7 @@ in
         dependencies = [
           sources."find-up-4.1.0"
           sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
           sources."type-fest-0.8.1"
         ];
       })
@@ -103007,6 +103341,7 @@ in
         dependencies = [
           sources."find-up-4.1.0"
           sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
         ];
       })
       sources."yargs-parser-18.1.3"
@@ -111416,7 +111751,7 @@ in
   "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage {
     name = "rust-analyzer";
     packageName = "rust-analyzer";
-    version = "0.2.702";
+    version = "0.2.710";
     src = ../../misc/vscode-extensions/rust-analyzer/build-deps;
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -111432,35 +111767,27 @@ in
           sources."ignore-4.0.6"
         ];
       })
+      sources."@hpcc-js/wasm-1.4.1"
       sources."@humanwhocodes/config-array-0.5.0"
       sources."@humanwhocodes/object-schema-1.2.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@rollup/plugin-commonjs-17.1.0"
-      sources."@rollup/plugin-node-resolve-13.0.4"
-      (sources."@rollup/pluginutils-3.1.0" // {
-        dependencies = [
-          sources."estree-walker-1.0.1"
-        ];
-      })
       sources."@tootallnate/once-1.1.2"
-      sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.4"
       sources."@types/json-schema-7.0.9"
       sources."@types/minimatch-3.0.5"
       sources."@types/mocha-8.2.3"
       sources."@types/node-14.17.9"
       sources."@types/node-fetch-2.5.12"
-      sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.59.0"
-      sources."@typescript-eslint/eslint-plugin-4.29.1"
-      sources."@typescript-eslint/experimental-utils-4.29.1"
-      sources."@typescript-eslint/parser-4.29.1"
-      sources."@typescript-eslint/scope-manager-4.29.1"
-      sources."@typescript-eslint/types-4.29.1"
-      sources."@typescript-eslint/typescript-estree-4.29.1"
-      sources."@typescript-eslint/visitor-keys-4.29.1"
+      sources."@typescript-eslint/eslint-plugin-4.29.2"
+      sources."@typescript-eslint/experimental-utils-4.29.2"
+      sources."@typescript-eslint/parser-4.29.2"
+      sources."@typescript-eslint/scope-manager-4.29.2"
+      sources."@typescript-eslint/types-4.29.2"
+      sources."@typescript-eslint/typescript-estree-4.29.2"
+      sources."@typescript-eslint/visitor-keys-4.29.2"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.2"
@@ -111487,7 +111814,6 @@ in
       sources."buffer-crc32-0.2.13"
       sources."buffer-indexof-polyfill-1.0.2"
       sources."buffers-0.1.1"
-      sources."builtin-modules-3.2.0"
       sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
       sources."camelcase-6.2.0"
@@ -111508,18 +111834,63 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
-      sources."commander-2.20.3"
+      sources."commander-7.2.0"
       sources."commandpost-1.4.0"
-      sources."commondir-1.0.1"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
       sources."css-select-4.1.3"
       sources."css-what-5.0.1"
+      sources."d3-7.0.0"
+      sources."d3-array-3.0.1"
+      sources."d3-axis-3.0.0"
+      sources."d3-brush-3.0.0"
+      sources."d3-chord-3.0.1"
+      sources."d3-color-3.0.1"
+      sources."d3-contour-3.0.1"
+      sources."d3-delaunay-6.0.2"
+      sources."d3-dispatch-3.0.1"
+      sources."d3-drag-3.0.0"
+      sources."d3-dsv-3.0.1"
+      sources."d3-ease-3.0.1"
+      sources."d3-fetch-3.0.1"
+      sources."d3-force-3.0.0"
+      sources."d3-format-3.0.1"
+      sources."d3-geo-3.0.1"
+      (sources."d3-graphviz-4.0.0" // {
+        dependencies = [
+          sources."d3-color-2.0.0"
+          sources."d3-dispatch-2.0.0"
+          sources."d3-drag-2.0.0"
+          sources."d3-ease-2.0.0"
+          sources."d3-format-2.0.0"
+          sources."d3-interpolate-2.0.1"
+          sources."d3-path-2.0.0"
+          sources."d3-selection-2.0.0"
+          sources."d3-timer-2.0.0"
+          sources."d3-transition-2.0.0"
+          sources."d3-zoom-2.0.0"
+        ];
+      })
+      sources."d3-hierarchy-3.0.1"
+      sources."d3-interpolate-3.0.1"
+      sources."d3-path-3.0.1"
+      sources."d3-polygon-3.0.1"
+      sources."d3-quadtree-3.0.1"
+      sources."d3-random-3.0.1"
+      sources."d3-scale-4.0.0"
+      sources."d3-scale-chromatic-3.0.0"
+      sources."d3-selection-3.0.0"
+      sources."d3-shape-3.0.1"
+      sources."d3-time-3.0.0"
+      sources."d3-time-format-4.0.0"
+      sources."d3-timer-3.0.1"
+      sources."d3-transition-3.0.1"
+      sources."d3-zoom-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-4.0.0"
       sources."deep-is-0.1.3"
-      sources."deepmerge-4.2.2"
+      sources."delaunator-5.0.0"
       sources."delayed-stream-1.0.0"
       sources."denodeify-1.2.1"
       sources."diff-5.0.0"
@@ -111532,6 +111903,7 @@ in
       sources."duplexer2-0.1.4"
       (sources."editorconfig-0.15.3" // {
         dependencies = [
+          sources."commander-2.20.3"
           sources."lru-cache-4.1.5"
           sources."semver-5.7.1"
           sources."yallist-2.1.2"
@@ -111572,7 +111944,6 @@ in
         ];
       })
       sources."estraverse-4.3.0"
-      sources."estree-walker-2.0.2"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.2.7"
@@ -111611,20 +111982,19 @@ in
       sources."htmlparser2-6.1.0"
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.0"
+      sources."iconv-lite-0.6.3"
       sources."ignore-5.1.8"
       sources."import-fresh-3.3.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."internmap-2.0.1"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.5.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
-      sources."is-module-1.0.0"
       sources."is-number-7.0.0"
       sources."is-plain-obj-2.1.0"
-      sources."is-reference-1.2.1"
       sources."is-unicode-supported-0.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
@@ -111643,7 +112013,6 @@ in
       sources."lodash.truncate-4.4.2"
       sources."log-symbols-4.1.0"
       sources."lru-cache-6.0.0"
-      sources."magic-string-0.25.7"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
           sources."entities-2.0.3"
@@ -111698,7 +112067,6 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
-      sources."path-parse-1.0.7"
       sources."path-type-4.0.0"
       sources."pend-1.2.0"
       sources."picomatch-2.3.0"
@@ -111720,13 +112088,14 @@ in
       sources."regexpp-3.2.0"
       sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
-      sources."resolve-1.20.0"
       sources."resolve-from-4.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.51.1"
+      sources."robust-predicates-3.0.1"
       sources."run-parallel-1.2.0"
+      sources."rw-1.3.3"
       sources."safe-buffer-5.2.1"
+      sources."safer-buffer-2.1.2"
       sources."semver-7.3.5"
       sources."serialize-javascript-6.0.0"
       sources."setimmediate-1.0.5"
@@ -111742,7 +112111,6 @@ in
           sources."color-name-1.1.4"
         ];
       })
-      sources."sourcemap-codec-1.4.8"
       sources."sprintf-js-1.0.3"
       sources."string-width-4.2.2"
       (sources."string_decoder-1.1.1" // {
@@ -113613,10 +113981,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.682.0";
+    version = "1.683.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.682.0.tgz";
-      sha512 = "tJqDDtHZaSONwURXcs0Itui+0PSFN9te31/+OSpGcyJl4DutDHPcoEyek50bwQcny4yy44s80KW1hFpeOozLZQ==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz";
+      sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ==";
     };
     dependencies = [
       sources."@arcanis/slice-ansi-1.0.2"
@@ -114173,7 +114541,7 @@ in
           sources."yallist-3.1.1"
         ];
       })
-      (sources."snyk-python-plugin-1.19.11" // {
+      (sources."snyk-python-plugin-1.20.1" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -120952,7 +121320,7 @@ in
       sources."jsonc-parser-3.0.0"
       sources."ms-2.0.0"
       sources."request-light-0.4.0"
-      (sources."vscode-json-languageservice-4.1.6" // {
+      (sources."vscode-json-languageservice-4.1.7" // {
         dependencies = [
           sources."vscode-nls-5.0.0"
         ];
@@ -121050,7 +121418,7 @@ in
       sources."typescript-4.3.5"
       sources."vscode-css-languageservice-5.1.4"
       sources."vscode-html-languageservice-4.0.7"
-      sources."vscode-json-languageservice-4.1.6"
+      sources."vscode-json-languageservice-4.1.7"
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
       sources."vscode-languageserver-protocol-3.16.0"
@@ -124691,7 +125059,7 @@ in
       sources."jsonc-parser-3.0.0"
       sources."ms-2.0.0"
       sources."request-light-0.2.5"
-      (sources."vscode-json-languageservice-4.1.6" // {
+      (sources."vscode-json-languageservice-4.1.7" // {
         dependencies = [
           sources."vscode-nls-5.0.0"
           sources."vscode-uri-3.0.2"
diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix
index 127e6f929338..8ed07d9597b1 100644
--- a/pkgs/development/python-modules/crytic-compile/default.nix
+++ b/pkgs/development/python-modules/crytic-compile/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "crytic-compile";
-  version = "0.2.0";
+  version = "0.2.1";
 
   disabled = pythonOlder "3.6";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "crytic";
     repo = "crytic-compile";
     rev = version;
-    sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU=";
+    sha256 = "sha256-RDb4Dc+igt2JKskBFIFvYt4xTAMujp8uXnkWsgnwdJE=";
   };
 
   propagatedBuildInputs = [ pysha3 setuptools ];
diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index a4f907a1aaed..a49c2a8b743b 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "slither-analyzer";
-  version = "0.8.0";
+  version = "0.8.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b8a2e2145daefd9443ffa43639608203532e78a858af99c4c52c2b128ca681f";
+    sha256 = "sha256-5JgF53ip72bne8AlGf126FIIvXi+u7rovJmMSCcZjEQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 915dad400b4c..1700fd14b3a3 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -7,14 +7,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2021-08-09";
-  cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8=";
+  version = "2021-08-16";
+  cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk=";
 
   src = fetchFromGitHub {
     owner = "rust-analyzer";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw=";
+    sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE=";
   };
 
   buildAndTestSubdir = "crates/rust-analyzer";
diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh
index 91bde976ebdb..add400e4d0e8 100755
--- a/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/pkgs/development/tools/rust/rust-analyzer/update.sh
@@ -53,13 +53,11 @@ echo "Extension version: $extension_ver"
 
 build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
 # We need devDependencies to build vsix.
-jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
+# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
+jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
     --arg ver "$extension_ver" \
     >"$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"
-
 old_deps="$(jq '.dependencies' "$build_deps"/package.json)"
 new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)"
 if [[ "$old_deps" == "$new_deps" ]]; then
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 1e69d9e81bae..a98102c36b02 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -1,12 +1,12 @@
 {
   "name": "rust-analyzer",
-  "version": "0.2.702",
+  "version": "0.2.710",
   "dependencies": {
     "https-proxy-agent": "^5.0.0",
     "node-fetch": "^2.6.1",
     "vscode-languageclient": "^7.1.0-next.5",
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
+    "d3": "^7.0.0",
+    "d3-graphviz": "^4.0.0",
     "@types/glob": "^7.1.4",
     "@types/mocha": "^8.2.3",
     "@types/node": "~14.17.5",
@@ -17,7 +17,6 @@
     "eslint": "^7.30.0",
     "glob": "^7.1.6",
     "mocha": "^9.0.2",
-    "rollup": "=2.51.1",
     "tslib": "^2.3.0",
     "typescript": "^4.3.5",
     "typescript-formatter": "^7.2.2",
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
index 479f9f4c6ea9..82491389791e 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
@@ -4,8 +4,9 @@
 , jq
 , rust-analyzer
 , nodePackages
-, setDefaultServerPath ? true
 , moreutils
+, esbuild
+, setDefaultServerPath ? true
 }:
 
 let
@@ -21,7 +22,7 @@ let
 
     releaseTag = rust-analyzer.version;
 
-    nativeBuildInputs = [ jq moreutils ];
+    nativeBuildInputs = [ jq moreutils esbuild ];
 
     # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
     postInstall = ''
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index 5dc57f43e4ab..c5bc50cafd71 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation {
   # and using clang directly here is a better option than relying on cctools.
   # On x86_64-darwin the Clang version is too old to support this mode.
   + lib.optionalString stdenv.isAarch64 ''
-    rm $out/bin/as
-    makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \
+    rm $out/bin/${targetPrefix}as
+    makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
       --add-flags "-x assembler -integrated-as -c"
   '';
 
diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
new file mode 100644
index 000000000000..6bd10614e9a1
--- /dev/null
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, stdenv
+, fetchurl
+, gawk
+, git
+, gnugrep
+, installShellFiles
+, jre
+, makeWrapper
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+  pname = "crowdin-cli";
+  version = "3.6.4";
+
+  src = fetchurl {
+    url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
+    sha256 = "123mv0s1jppidmwsvr8a6f8429xmpskxmnv4p8jpnfa9zrw86aaw";
+  };
+
+  nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D crowdin-cli.jar $out/lib/crowdin-cli.jar
+
+    installShellCompletion --cmd crowdin --bash ./crowdin_completion
+
+    makeWrapper ${jre}/bin/java $out/bin/crowdin \
+      --argv0 crowdin \
+      --add-flags "-jar $out/lib/crowdin-cli.jar" \
+      --prefix PATH : ${lib.makeBinPath [ gawk gnugrep git ]}
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/crowdin/crowdin-cli/";
+    description = "A command-line client for the Crowdin API";
+    license = licenses.mit;
+    maintainers = with maintainers; [ DamienCassou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1694eee0b253..d60ed4b11b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13883,6 +13883,8 @@ with pkgs;
 
   gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
 
+  crowdin-cli = callPackage ../tools/text/crowdin-cli { };
+
   gtranslator = callPackage ../tools/text/gtranslator { };
 
   guff = callPackage ../tools/graphics/guff { };
@@ -23935,8 +23937,8 @@ with pkgs;
 
   drawio = callPackage ../applications/graphics/drawio {};
 
-  drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { };
-  drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile {
+  drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };
+  drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile {
     buildClient = false;
     buildServerGui = false;
   };