Merge branch 'master' into staging-next

; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix

1 files changed, 112 insertions, 96 deletions

diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix
index 94ef1c721885..6e78523b66d6 100644
--- a/pkgs/tools/admin/meshcentral/yarn.nix
+++ b/pkgs/tools/admin/meshcentral/yarn.nix
@@ -10,11 +10,11 @@
       };
     }
     {
-      name = "_babel_generator___generator_7.14.8.tgz";
+      name = "_babel_generator___generator_7.15.0.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.14.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz";
-        sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070";
+        name = "_babel_generator___generator_7.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz";
+        sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15";
       };
     }
     {
@@ -50,11 +50,11 @@
       };
     }
     {
-      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz";
+      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz";
       path = fetchurl {
-        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz";
-        sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c";
+        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz";
+        sha1 = "6654d171b2024f6d8ee151bf2509699919131d48";
       };
     }
     {
@@ -66,11 +66,11 @@
       };
     }
     {
-      name = "_babel_parser___parser_7.14.8.tgz";
+      name = "_babel_parser___parser_7.15.0.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.14.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz";
-        sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4";
+        name = "_babel_parser___parser_7.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.0.tgz";
+        sha1 = "b6d6e29058ca369127b0eeca2a1c4b5794f1b6b9";
       };
     }
     {
@@ -82,19 +82,19 @@
       };
     }
     {
-      name = "_babel_traverse___traverse_7.14.8.tgz";
+      name = "_babel_traverse___traverse_7.15.0.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.14.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz";
-        sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce";
+        name = "_babel_traverse___traverse_7.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz";
+        sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98";
       };
     }
     {
-      name = "_babel_types___types_7.14.8.tgz";
+      name = "_babel_types___types_7.15.0.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.14.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz";
-        sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728";
+        name = "_babel_types___types_7.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz";
+        sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd";
       };
     }
     {
@@ -154,19 +154,35 @@
       };
     }
     {
-      name = "_types_node___node_16.4.5.tgz";
+      name = "_types_node___node_16.4.13.tgz";
       path = fetchurl {
-        name = "_types_node___node_16.4.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-16.4.5.tgz";
-        sha1 = "eac95d4e52775190c405f0b9061ddcfb0304f7fc";
+        name = "_types_node___node_16.4.13.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz";
+        sha1 = "7dfd9c14661edc65cccd43a29eb454174642370d";
       };
     }
     {
-      name = "_types_node___node_14.17.6.tgz";
+      name = "_types_node___node_14.17.9.tgz";
       path = fetchurl {
-        name = "_types_node___node_14.17.6.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-14.17.6.tgz";
-        sha1 = "cc61c8361c89e70c468cda464d1fa3dd7e5ebd62";
+        name = "_types_node___node_14.17.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-14.17.9.tgz";
+        sha1 = "b97c057e6138adb7b720df2bd0264b03c9f504fd";
+      };
+    }
+    {
+      name = "_types_webidl_conversions___webidl_conversions_6.1.1.tgz";
+      path = fetchurl {
+        name = "_types_webidl_conversions___webidl_conversions_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz";
+        sha1 = "e33bc8ea812a01f63f90481c666334844b12a09e";
+      };
+    }
+    {
+      name = "_types_whatwg_url___whatwg_url_8.2.1.tgz";
+      path = fetchurl {
+        name = "_types_whatwg_url___whatwg_url_8.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.1.tgz";
+        sha1 = "f1aac222dab7c59e011663a0cb0a3117b2ef05d4";
       };
     }
     {
@@ -842,11 +858,11 @@
       };
     }
     {
-      name = "async___async_3.2.0.tgz";
+      name = "async___async_3.2.1.tgz";
       path = fetchurl {
-        name = "async___async_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz";
-        sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720";
+        name = "async___async_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz";
+        sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8";
       };
     }
     {
@@ -1674,11 +1690,11 @@
       };
     }
     {
-      name = "chalk___chalk_4.1.1.tgz";
+      name = "chalk___chalk_4.1.2.tgz";
       path = fetchurl {
-        name = "chalk___chalk_4.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz";
-        sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad";
+        name = "chalk___chalk_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz";
+        sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01";
       };
     }
     {
@@ -3194,11 +3210,11 @@
       };
     }
     {
-      name = "google_auth_library___google_auth_library_7.3.0.tgz";
+      name = "google_auth_library___google_auth_library_7.5.0.tgz";
       path = fetchurl {
-        name = "google_auth_library___google_auth_library_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.3.0.tgz";
-        sha1 = "946a911c72425b05f02735915f03410604466657";
+        name = "google_auth_library___google_auth_library_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.5.0.tgz";
+        sha1 = "6b0a623dfb4ee7a8d93a0d25455031d1baf86181";
       };
     }
     {
@@ -3218,27 +3234,27 @@
       };
     }
     {
-      name = "googleapis_common___googleapis_common_5.0.3.tgz";
+      name = "googleapis_common___googleapis_common_5.0.4.tgz";
       path = fetchurl {
-        name = "googleapis_common___googleapis_common_5.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.3.tgz";
-        sha1 = "9580944e538029687a4e25726afea4a1a535ac6f";
+        name = "googleapis_common___googleapis_common_5.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.4.tgz";
+        sha1 = "d47ba164dce40ff32f35319e56d1d67209ae25c3";
       };
     }
     {
-      name = "googleapis___googleapis_82.0.0.tgz";
+      name = "googleapis___googleapis_83.0.0.tgz";
       path = fetchurl {
-        name = "googleapis___googleapis_82.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/googleapis/-/googleapis-82.0.0.tgz";
-        sha1 = "26ab303b065c37fc4c9723b703550e62057ea810";
+        name = "googleapis___googleapis_83.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/googleapis/-/googleapis-83.0.0.tgz";
+        sha1 = "045399fe8403d8516add6aa90802dda604fcfe20";
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.6.tgz";
+      name = "graceful_fs___graceful_fs_4.2.8.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.6.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz";
-        sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee";
+        name = "graceful_fs___graceful_fs_4.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz";
+        sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a";
       };
     }
     {
@@ -4178,11 +4194,11 @@
       };
     }
     {
-      name = "jsdom___jsdom_16.6.0.tgz";
+      name = "jsdom___jsdom_16.7.0.tgz";
       path = fetchurl {
-        name = "jsdom___jsdom_16.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz";
-        sha1 = "f79b3786682065492a3da6a60a4695da983805ac";
+        name = "jsdom___jsdom_16.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz";
+        sha1 = "918ae71965424b197c819f8183a754e18977b710";
       };
     }
     {
@@ -4410,11 +4426,11 @@
       };
     }
     {
-      name = "ldapjs___ldapjs_2.3.0.tgz";
+      name = "ldapjs___ldapjs_2.3.1.tgz";
       path = fetchurl {
-        name = "ldapjs___ldapjs_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.0.tgz";
-        sha1 = "999c85f642216709009dc8728e58ac7793888def";
+        name = "ldapjs___ldapjs_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz";
+        sha1 = "04136815fb1f21d692ac87fab5961a04d86e8b04";
       };
     }
     {
@@ -4914,27 +4930,27 @@
       };
     }
     {
-      name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz";
+      name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.0.tgz";
       path = fetchurl {
-        name = "mongodb_connection_string_url___mongodb_connection_string_url_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.0.1.tgz";
-        sha1 = "1509b44570851f5331f9ca7052b723789d63f8dc";
+        name = "mongodb_connection_string_url___mongodb_connection_string_url_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-1.1.0.tgz";
+        sha1 = "0bd769f16aa1767758c119c275ea22bb5110915f";
       };
     }
     {
-      name = "mongodb___mongodb_4.0.1.tgz";
+      name = "mongodb___mongodb_4.1.0.tgz";
       path = fetchurl {
-        name = "mongodb___mongodb_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.0.1.tgz";
-        sha1 = "e7fa8de3448492097b3c67a0d980c4816907aa83";
+        name = "mongodb___mongodb_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.1.0.tgz";
+        sha1 = "f491de5d52003f41dffbc6ebfd8b95be21174d63";
       };
     }
     {
-      name = "mongodb___mongodb_3.6.10.tgz";
+      name = "mongodb___mongodb_3.6.11.tgz";
       path = fetchurl {
-        name = "mongodb___mongodb_3.6.10.tgz";
-        url  = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.10.tgz";
-        sha1 = "f10e990113c86b195c8af0599b9b3a90748b6ee4";
+        name = "mongodb___mongodb_3.6.11.tgz";
+        url  = "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.11.tgz";
+        sha1 = "8a59a0491a92b00a8c925f72ed9d9a5b054aebb2";
       };
     }
     {
@@ -5026,11 +5042,11 @@
       };
     }
     {
-      name = "nan___nan_2.14.2.tgz";
+      name = "nan___nan_2.15.0.tgz";
       path = fetchurl {
-        name = "nan___nan_2.14.2.tgz";
-        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz";
-        sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19";
+        name = "nan___nan_2.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz";
+        sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee";
       };
     }
     {
@@ -5138,11 +5154,11 @@
       };
     }
     {
-      name = "node_sspi___node_sspi_0.2.8.tgz";
+      name = "node_sspi___node_sspi_0.2.9.tgz";
       path = fetchurl {
-        name = "node_sspi___node_sspi_0.2.8.tgz";
-        url  = "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.8.tgz";
-        sha1 = "e4b4245729fa5c579ebcfa9194d491751354963f";
+        name = "node_sspi___node_sspi_0.2.9.tgz";
+        url  = "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.9.tgz";
+        sha1 = "5a5aab40a4062dbc95cbdbe61a44df34e91afaaf";
       };
     }
     {
@@ -5402,11 +5418,11 @@
       };
     }
     {
-      name = "optional_require___optional_require_1.1.0.tgz";
+      name = "optional_require___optional_require_1.1.4.tgz";
       path = fetchurl {
-        name = "optional_require___optional_require_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.0.tgz";
-        sha1 = "01dfbafbbc2e8d79e33558f5af3917f22cc35c2c";
+        name = "optional_require___optional_require_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.4.tgz";
+        sha1 = "8af7da26b17da76abbf8a1c46e2e148a63813c0e";
       };
     }
     {
@@ -5626,11 +5642,11 @@
       };
     }
     {
-      name = "passport_saml___passport_saml_3.1.0.tgz";
+      name = "passport_saml___passport_saml_3.1.1.tgz";
       path = fetchurl {
-        name = "passport_saml___passport_saml_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.0.tgz";
-        sha1 = "32f79316c617d223ad03f71f23d2ee3813e34516";
+        name = "passport_saml___passport_saml_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.1.tgz";
+        sha1 = "257470003366e06ce3c5738aa64a1209a0f4d7e7";
       };
     }
     {
@@ -6826,11 +6842,11 @@
       };
     }
     {
-      name = "ssh2___ssh2_1.1.0.tgz";
+      name = "ssh2___ssh2_1.2.0.tgz";
       path = fetchurl {
-        name = "ssh2___ssh2_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz";
-        sha1 = "43dd24930e15e317687f519d6b40270d9cd00d00";
+        name = "ssh2___ssh2_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.2.0.tgz";
+        sha1 = "177a46bb12b7ef2b7bce28bdcbd7eae3cbc50045";
       };
     }
     {
@@ -7242,11 +7258,11 @@
       };
     }
     {
-      name = "twilio___twilio_3.66.0.tgz";
+      name = "twilio___twilio_3.66.1.tgz";
       path = fetchurl {
-        name = "twilio___twilio_3.66.0.tgz";
-        url  = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.0.tgz";
-        sha1 = "8df54865b16b3b0578826cf4f342542daa1227c4";
+        name = "twilio___twilio_3.66.1.tgz";
+        url  = "https://registry.yarnpkg.com/twilio/-/twilio-3.66.1.tgz";
+        sha1 = "8435441ca45b0c7cb3761c4ba3011ca32e75ba69";
       };
     }
     {