From 1892d71c100b5b3b71005a431af11d3add3f5b0d Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Tue, 22 Aug 2023 20:20:03 +0200
Subject: [PATCH 01/32] alsa-scarlett-gui: add alsa-utils to PATH

alsa-scarlett-gui tries to call alsactl when saving a configuration,
which fails, when alsa-utils is not on the PATH
---
 pkgs/applications/audio/alsa-scarlett-gui/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix
index 0ce5bd359e76..4b40069eaef5 100644
--- a/pkgs/applications/audio/alsa-scarlett-gui/default.nix
+++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix
@@ -2,6 +2,8 @@
 , stdenv
 , fetchFromGitHub
 , pkg-config
+, makeWrapper
+, alsa-utils
 , alsa-lib
 , gtk4
 , wrapGAppsHook4
@@ -22,9 +24,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
   sourceRoot = "${src.name}/src";
-  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ];
   buildInputs = [ gtk4 alsa-lib ];
   postInstall = ''
+    wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}
+
     substituteInPlace $out/share/applications/vu.b4.alsa-scarlett-gui.desktop \
       --replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/alsa-scarlett-gui"
   '';

From 169f5fa54503c4831ac6c9ccfa60368d8df9c54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 26 Aug 2023 10:09:10 -0700
Subject: [PATCH 02/32] poetryPlugins.poetry-plugin-export: 1.4.0 -> 1.5.0

Diff: https://github.com/python-poetry/poetry-plugin-export/compare/refs/tags/1.4.0...1.5.0

Changelog: https://github.com/python-poetry/poetry-plugin-export/blob/refs/tags/1.5.0/CHANGELOG.md
---
 .../poetry/plugins/poetry-plugin-export.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
index 24433f3601eb..d040c32c4834 100644
--- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
+++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-plugin-export";
-  version = "1.4.0";
+  version = "1.5.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk=";
+    hash = "sha256-bX7Mqpe7SYQQVrPNVOl8Bwmeiq7owIiUhw0sp5+Gwck=";
   };
 
   postPatch = ''

From 92236affa23a5a44ade5fa78e31c674a10b2ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 26 Aug 2023 09:43:42 -0700
Subject: [PATCH 03/32] poetry: 1.5.1 -> 1.6.1

Diff: https://github.com/python-poetry/poetry/compare/refs/tags/1.5.1...1.6.1

Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/1.6.1/CHANGELOG.md
---
 .../package-management/poetry/default.nix     | 25 ++-----------------
 .../package-management/poetry/unwrapped.nix   | 22 ++++++++--------
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix
index 62c4ac599697..0276b420ec7d 100644
--- a/pkgs/tools/package-management/poetry/default.nix
+++ b/pkgs/tools/package-management/poetry/default.nix
@@ -10,34 +10,13 @@ let
       poetry = self.callPackage ./unwrapped.nix { };
 
       # version overrides required by poetry and its plugins
-      cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec {
-        version = "0.12.14";
-        format = "setuptools";
-        src = fetchFromGitHub {
-          owner = "ionrock";
-          repo = "cachecontrol";
-          rev = "v${version}";
-          hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c=";
-        };
-        nativeCheckInputs = old.nativeCheckInputs ++ [
-          self.lockfile
-        ];
-      });
-      keyring = super.keyring.overridePythonAttrs (old: rec {
-        version = "23.13.1";
-        src = fetchPypi {
-          inherit (old) pname;
-          inherit version;
-          hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng=";
-        };
-      });
       poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
-        version = "1.6.1";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "python-poetry";
           repo = "poetry-core";
           rev = version;
-          hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74=";
+          hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk=";
         };
         patches = [ ];
         nativeCheckInputs = old.nativeCheckInputs ++ [
diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix
index 839b1882aa05..dd1305501916 100644
--- a/pkgs/tools/package-management/poetry/unwrapped.nix
+++ b/pkgs/tools/package-management/poetry/unwrapped.nix
@@ -4,17 +4,15 @@
 , pythonOlder
 , fetchFromGitHub
 , installShellFiles
+, pythonRelaxDepsHook
 , build
 , cachecontrol
 , cleo
 , crashtest
 , dulwich
-, filelock
-, html5lib
 , installer
 , jsonschema
 , keyring
-, lockfile
 , packaging
 , pexpect
 , pkginfo
@@ -27,7 +25,6 @@
 , shellingham
 , tomlkit
 , trove-classifiers
-, urllib3
 , virtualenv
 , xattr
 , tomli
@@ -44,20 +41,26 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.5.1";
+  version = "1.6.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ=";
+    hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524=";
   };
 
   nativeBuildInputs = [
     installShellFiles
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    # only pinned to avoid dependency on Rust
+    "jsonschema"
   ];
 
   propagatedBuildInputs = [
@@ -66,12 +69,9 @@ buildPythonPackage rec {
     cleo
     crashtest
     dulwich
-    filelock
-    html5lib
     installer
     jsonschema
     keyring
-    lockfile
     packaging
     pexpect
     pkginfo
@@ -84,7 +84,6 @@ buildPythonPackage rec {
     shellingham
     tomlkit
     trove-classifiers
-    urllib3
     virtualenv
   ] ++ lib.optionals (stdenv.isDarwin) [
     xattr
@@ -130,6 +129,7 @@ buildPythonPackage rec {
     "load"
     "vcs"
     "prereleases_if_they_are_compatible"
+    "test_builder_setup_generation_runs_with_pip_editable"
     "test_executor"
     # requires git history to work correctly
     "default_with_excluded_data"

From c82aaab4ec5978990c84d0b481771dbfe123953a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 26 Aug 2023 10:55:57 -0700
Subject: [PATCH 04/32] zeyple: use python3Packages.gpgme

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

diff --git a/pkgs/misc/zeyple/default.nix b/pkgs/misc/zeyple/default.nix
index a14996e1d7d1..18c938453715 100644
--- a/pkgs/misc/zeyple/default.nix
+++ b/pkgs/misc/zeyple/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0r2d1drg2zvwmn3zg0qb32i9mh03r5di9q1yszx23r32rsax9mxh";
   };
 
-  propagatedBuildInputs = [ python3Packages.pygpgme ];
+  propagatedBuildInputs = [ python3Packages.gpgme ];
   installPhase = ''
     install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple
   '';

From 91bd90fa6c1b12dc7d6fcf81cfa32c0ea77f6232 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 20 Aug 2023 13:12:23 +0100
Subject: [PATCH 05/32] libredwg: 0.12.5 -> 0.12.5.6248

---
 pkgs/development/libraries/libredwg/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix
index 8a01ace46415..9630479872b0 100644
--- a/pkgs/development/libraries/libredwg/default.nix
+++ b/pkgs/development/libraries/libredwg/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , writeShellScript
 , pkg-config
@@ -17,19 +18,28 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libredwg";
-  version = "0.12.5";
+  version = "0.12.5.6248";
 
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = pname;
     rev = version;
-    sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE=";
+    hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      name = "dwg2svg-strcasestr-musl-fix.patch";
+      # https://github.com/LibreDWG/libredwg/pull/822
+      url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch";
+      hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI=";
+    })
+  ];
+
   postPatch = let
     printVersion = writeShellScript "print-version" ''
-      echo ${lib.escapeShellArg version}
+      echo -n ${lib.escapeShellArg version}
     '';
   in ''
     # avoid git dependency

From 4e856648103c653e2608158132f02c35ccbb372c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 31 Aug 2023 21:37:45 -0700
Subject: [PATCH 06/32] nodePackages.leetcode-cli: make alias of
 vsc-leetcode-cli

---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/main-programs.nix           |   1 -
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 261 ------------------
 4 files changed, 1 insertion(+), 263 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 03bcbc595d1d..8229364812a6 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -78,6 +78,7 @@ mapAliases {
   ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
+  leetcode-cli = vsc-leetcode-cli; # added 2023-08-31
   manta = pkgs.node-manta; # Added 2023-05-06
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index abb336280282..5cdbd11073ad 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -47,7 +47,6 @@
   grunt-cli = "grunt";
   gulp-cli = "gulp";
   kaput-cli = "kaput";
-  leetcode-cli = "leetcode";
   less = "lessc";
   localtunnel = "lt";
   lua-fmt = "luafmt";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index af55cfddee18..2dce8b47f2ae 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -170,7 +170,6 @@
 , "katex"
 , "keyoxide"
 , "lcov-result-merger"
-, "leetcode-cli"
 , "vsc-leetcode-cli"
 , "lerna"
 , "less"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 35bbb65656a1..675b75efc72c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -95039,267 +95039,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  leetcode-cli = nodeEnv.buildNodePackage {
-    name = "leetcode-cli";
-    packageName = "leetcode-cli";
-    version = "2.6.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.6.2.tgz";
-      sha512 = "wP2yB6yGq+dlXgi8PMNgXS24Sb7rtYRs/WYQ4+zrJ9Oa/7Qp47PbVxuS4Dl62yeEo3OSlT1hovp1SWY6jE7ToQ==";
-    };
-    dependencies = [
-      sources."abab-1.0.4"
-      sources."acorn-2.7.0"
-      sources."acorn-globals-1.0.9"
-      sources."ajv-6.12.6"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-1.5.2"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.12.0"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."boolbase-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."camelcase-2.1.1"
-      sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
-      sources."cheerio-0.20.0"
-      sources."cli-cursor-2.1.0"
-      sources."cli-spinners-1.3.1"
-      sources."cliui-3.2.0"
-      sources."clone-1.0.4"
-      sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colors-1.4.0"
-      sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-6.0.5"
-      sources."css-select-1.2.0"
-      sources."css-what-2.1.3"
-      sources."cssom-0.3.8"
-      sources."cssstyle-0.2.37"
-      sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
-      sources."decamelize-1.2.0"
-      sources."deep-equal-0.2.2"
-      sources."deep-is-0.1.4"
-      sources."defaults-1.0.4"
-      sources."delayed-stream-1.0.0"
-      sources."dom-serializer-0.1.1"
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."ecc-jsbn-0.1.2"
-      sources."end-of-stream-1.4.4"
-      sources."entities-1.1.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.14.3"
-      sources."esprima-4.0.1"
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."execa-1.0.0"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."eyes-0.1.8"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."find-up-3.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-4.1.0"
-      sources."getpass-0.1.7"
-      sources."glob-7.2.3"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-flag-3.0.0"
-      sources."he-1.2.0"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."entities-1.0.0"
-        ];
-      })
-      sources."http-signature-1.2.0"
-      sources."i-0.3.7"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."invert-kv-1.0.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-0.0.1"
-      sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."jsdom-7.2.2"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."lcid-1.0.0"
-      sources."levn-0.3.0"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.21"
-      sources."log-symbols-2.2.0"
-      sources."map-age-cleaner-0.1.3"
-      (sources."mem-4.3.0" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-        ];
-      })
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.29.4"
-      sources."mute-stream-0.0.8"
-      (sources."nconf-0.10.0" // {
-        dependencies = [
-          sources."yargs-3.32.0"
-        ];
-      })
-      sources."ncp-1.0.1"
-      sources."nice-try-1.0.5"
-      sources."npm-run-path-2.0.2"
-      sources."nth-check-1.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."nwmatcher-1.4.4"
-      sources."oauth-sign-0.9.0"
-      sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      sources."optionator-0.8.3"
-      (sources."ora-3.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."os-locale-1.4.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."parse5-1.5.1"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
-      sources."performance-now-2.1.0"
-      sources."pkginfo-0.4.1"
-      sources."prelude-ls-1.1.2"
-      sources."prompt-1.0.0"
-      sources."psl-1.9.0"
-      sources."pump-3.0.0"
-      sources."punycode-2.3.0"
-      sources."qs-6.5.3"
-      sources."read-1.0.7"
-      sources."readable-stream-1.1.14"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
-        ];
-      })
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."restore-cursor-2.0.0"
-      sources."revalidator-0.1.8"
-      sources."rimraf-2.7.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."secure-keys-1.0.0"
-      sources."semver-5.7.2"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.7"
-      sources."source-map-0.6.1"
-      sources."sshpk-1.17.0"
-      sources."stack-trace-0.0.10"
-      sources."string-width-1.0.2"
-      sources."string_decoder-0.10.31"
-      sources."strip-ansi-3.0.1"
-      sources."strip-eof-1.0.0"
-      sources."supports-color-5.5.0"
-      sources."symbol-tree-3.2.4"
-      sources."tough-cookie-2.5.0"
-      sources."tr46-0.0.3"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-check-0.3.2"
-      sources."underscore-1.9.1"
-      sources."uri-js-4.4.1"
-      (sources."utile-0.3.0" // {
-        dependencies = [
-          sources."async-0.9.2"
-        ];
-      })
-      sources."uuid-3.4.0"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."core-util-is-1.0.2"
-        ];
-      })
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-2.0.1"
-      sources."whatwg-url-compat-0.6.5"
-      sources."which-1.3.1"
-      sources."which-module-2.0.1"
-      sources."window-size-0.1.4"
-      (sources."winston-2.1.1" // {
-        dependencies = [
-          sources."async-1.0.0"
-          sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
-        ];
-      })
-      sources."word-wrap-1.2.5"
-      sources."wordwrap-1.0.0"
-      sources."wrap-ansi-2.1.0"
-      sources."wrappy-1.0.2"
-      sources."xml-name-validator-2.0.1"
-      sources."y18n-3.2.2"
-      (sources."yargs-12.0.4" // {
-        dependencies = [
-          sources."ansi-regex-3.0.1"
-          sources."cliui-4.1.0"
-          sources."invert-kv-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."lcid-2.0.0"
-          sources."os-locale-3.1.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      (sources."yargs-parser-11.1.1" // {
-        dependencies = [
-          sources."camelcase-5.3.1"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A cli tool to enjoy leetcode!";
-      homepage = "https://github.com/skygragon/leetcode-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vsc-leetcode-cli = nodeEnv.buildNodePackage {
     name = "vsc-leetcode-cli";
     packageName = "vsc-leetcode-cli";

From be45243fb43702b3c0509ac93892ccbd90c965b0 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sat, 2 Sep 2023 00:07:38 +0200
Subject: [PATCH 07/32] netdata: 1.42.1 -> 1.42.2

https://github.com/netdata/netdata/releases/tag/v1.42.2
---
 pkgs/tools/system/netdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index e61f3673bc87..e3dbabe1f52e 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation rec {
   # Don't forget to update go.d.plugin.nix as well
-  version = "1.42.1";
+  version = "1.42.2";
   pname = "netdata";
 
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata";
     rev = "v${version}";
-    hash = "sha256-uVr897LF5F+ZGz2rzrTBLhoOOFE+BrE69xztQM8Lq8Q=";
+    hash = "sha256-8L8PhPgNIHvw+Dcx2D6OE8fp2+GEYOc9wEIoPJSqXME=";
     fetchSubmodules = true;
   };
 

From fb4905d7fc9c68bab3b0256a85a844bc85d04186 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 2 Sep 2023 04:20:00 +0000
Subject: [PATCH 08/32] rubyfmt: 0.8.1 -> 0.10.0

---
 .../0001-cargo-lock-update-version.patch      | 25 -------------------
 pkgs/development/tools/rubyfmt/default.nix    | 19 ++++++++------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch

diff --git a/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch b/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch
deleted file mode 100644
index d2bf9f9431ca..000000000000
--- a/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d9df7aaaaf9c758499f569376a041045d99e4015 Mon Sep 17 00:00:00 2001
-From: Bob van der Linden <bobvanderlinden@gmail.com>
-Date: Thu, 9 Feb 2023 16:17:46 +0100
-Subject: [PATCH 1/2] cargo: lock: update version
-
----
- Cargo.lock | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 79a81d1..374c10a 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -642,7 +642,7 @@ dependencies = [
- 
- [[package]]
- name = "rubyfmt-main"
--version = "0.8.0-pre"
-+version = "0.8.1"
- dependencies = [
-  "atty",
-  "clap",
--- 
-2.39.1
-
diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix
index 6cf2324b1d41..15457e80aad9 100644
--- a/pkgs/development/tools/rubyfmt/default.nix
+++ b/pkgs/development/tools/rubyfmt/default.nix
@@ -12,19 +12,20 @@
 , libobjc
 , libunwind
 , libxcrypt
+, libyaml
 , Foundation
 , Security
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rubyfmt";
-  version = "0.8.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "fables-tales";
     repo = "rubyfmt";
     rev = "v${version}";
-    hash = "sha256-lHq9lcLMp6HUHMonEe3T2YGwMYW1W131H1jo1cy6kyc=";
+    hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
     fetchSubmodules = true;
   };
 
@@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     zlib
     libxcrypt
+    libyaml
   ] ++ lib.optionals stdenv.isDarwin [
     readline
     libiconv
@@ -55,15 +57,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   cargoPatches = [
-    # The 0.8.1 release did not have an up-to-date lock file. The rubyfmt
-    # version in Cargo.toml was bumped, but it wasn't updated in the lock file.
-    ./0001-cargo-lock-update-version.patch
-
     # Avoid checking whether ruby gitsubmodule is up-to-date.
     ./0002-remove-dependency-on-git.patch
   ];
 
-  cargoHash = "sha256-keeIonGNgE0U0IVi8DeXAy6ygTXVXH+WDjob36epUDI=";
+  cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk=";
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
 
   preFixup = ''
     mv $out/bin/rubyfmt{-main,}
@@ -74,5 +74,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/fables-tales/rubyfmt";
     license = licenses.mit;
     maintainers = with maintainers; [ bobvanderlinden ];
+    # = note: Undefined symbols for architecture x86_64:
+    #       "_utimensat", referenced from:
+    #           _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o)
+    broken = stdenv.isDarwin && stdenv.isx86_64;
+    mainProgram = "rubyfmt";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44986968eea2..261b97dc11dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18195,8 +18195,8 @@ with pkgs;
 
   rbenv = callPackage ../development/ruby-modules/rbenv { };
 
-  rubyfmt = callPackage ../development/tools/rubyfmt {
-    inherit (darwin.apple_sdk.frameworks) Foundation Security;
+  rubyfmt = darwin.apple_sdk_11_0.callPackage ../development/tools/rubyfmt {
+    inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
     inherit (darwin) libobjc;
   };
 

From 88502e537279c65a5f9307ea0918f1eaf8d484f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 09:37:29 -0700
Subject: [PATCH 09/32] gqlint: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 44 -------------------
 pkgs/development/tools/gqlint/default.nix     | 28 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 31 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/development/tools/gqlint/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..565f8c89b793 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -67,6 +67,7 @@ mapAliases {
   flood = pkgs.flood; # Added 2023-07-25
   git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
   glob = pkgs.node-glob; # added 2023-08-18
+  inherit (pkgs) gqlint; # added 2023-08-19
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
   inherit (pkgs) html-minifier; # added 2023-08-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..d6d916704265 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -141,7 +141,6 @@
 , "grunt-cli"
 , "makam"
 , "meshcommander"
-, "gqlint"
 , "gulp"
 , "gulp-cli"
 , "he"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..4f23aeafb041 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -89960,50 +89960,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  gqlint = nodeEnv.buildNodePackage {
-    name = "gqlint";
-    packageName = "gqlint";
-    version = "1.8.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gqlint/-/gqlint-1.8.0.tgz";
-      sha512 = "X5tNjxscqbH8xHXubB8kY6yGt11krk+RuB6N/zI2B2RdRadzwavBRMAHkIJzp2RpFgliF08UqP/p+spS/aNd5w==";
-    };
-    dependencies = [
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."babel-code-frame-6.26.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.20.3"
-      sources."encoding-0.1.13"
-      sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
-      sources."graphql-14.7.0"
-      sources."has-ansi-2.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."is-stream-1.1.0"
-      sources."iterall-1.3.0"
-      sources."js-tokens-3.0.2"
-      sources."lodash-4.17.21"
-      sources."node-fetch-1.7.3"
-      sources."pad-component-0.0.1"
-      sources."pluralize-5.1.0"
-      sources."prettier-1.19.1"
-      sources."safer-buffer-2.1.2"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."text-table-0.2.0"
-      sources."wordwrap-1.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "GraphQL Linter";
-      homepage = "https://github.com/happylinks/gqlint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   gulp = nodeEnv.buildNodePackage {
     name = "gulp";
     packageName = "gulp";
diff --git a/pkgs/development/tools/gqlint/default.nix b/pkgs/development/tools/gqlint/default.nix
new file mode 100644
index 000000000000..18fc0cc624b7
--- /dev/null
+++ b/pkgs/development/tools/gqlint/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "gqlint";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "happylinks";
+    repo = "gqlint";
+    rev = "v${version}";
+    hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw=";
+  };
+
+  npmDepsHash = "sha256-Fc5RbBqrJB7KSqLgTmIsPf3MK2n7vef/UVeFqH0o7mE=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "GraphQL linter";
+    homepage = "https://github.com/happylinks/gqlint";
+    license = lib.licenses.mit;
+    mainProgram = "gqlint";
+    maintainers = with lib.maintainers; [ hardselius ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf075..5c003533d261 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19481,6 +19481,8 @@ with pkgs;
 
   gpuvis = callPackage ../development/tools/misc/gpuvis { };
 
+  gqlint = callPackage ../development/tools/gqlint { };
+
   gradle-packages = import ../development/tools/build-managers/gradle {
     inherit jdk8 jdk11 jdk17;
   };

From e42ad74457de1c1b5596f3d92eb234c0f601cb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 21 Aug 2023 21:29:07 -0700
Subject: [PATCH 10/32] react-static: use mkYarnPackage

---
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1826 -----------------
 .../tools/react-static/default.nix            |   55 +
 .../tools/react-static/package.json           |  154 ++
 pkgs/top-level/all-packages.nix               |    2 +
 6 files changed, 212 insertions(+), 1827 deletions(-)
 create mode 100644 pkgs/development/tools/react-static/default.nix
 create mode 100644 pkgs/development/tools/react-static/package.json

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..e011dc775e54 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -84,6 +84,7 @@ mapAliases {
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
   node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) npm-check-updates; # added 2023-08-22
+  inherit (pkgs) react-static; # added 2023-08-21
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
   reveal-md = pkgs.reveal-md; # added 2023-07-31
   inherit (pkgs) rtlcss; # added 2023-08-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..cce1924b80b4 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -233,7 +233,6 @@
 , "pyright"
 , "quicktype"
 , "react-native-cli"
-, "react-static"
 , "react-tools"
 , "redoc-cli"
 , "remod-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..e6a9f89d396b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -106257,1832 +106257,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  react-static = nodeEnv.buildNodePackage {
-    name = "react-static";
-    packageName = "react-static";
-    version = "7.6.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/react-static/-/react-static-7.6.2.tgz";
-      sha512 = "JQACM+3GgF1vkUH6E6w1k0Qut6IbcfXjU37shGUWM9tIs3F9e/33saXK4G/uSl1kc8qjI+RekAQs/qyjMlUKlg==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.2.1"
-      sources."@babel/cli-7.22.10"
-      sources."@babel/code-frame-7.22.10"
-      sources."@babel/compat-data-7.22.9"
-      (sources."@babel/core-7.22.10" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."@babel/generator-7.22.10"
-      sources."@babel/helper-annotate-as-pure-7.22.5"
-      sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.10"
-      (sources."@babel/helper-compilation-targets-7.22.10" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      (sources."@babel/helper-create-class-features-plugin-7.22.10" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."@babel/helper-define-polyfill-provider-0.4.2"
-      sources."@babel/helper-environment-visitor-7.22.5"
-      sources."@babel/helper-function-name-7.22.5"
-      sources."@babel/helper-hoist-variables-7.22.5"
-      sources."@babel/helper-member-expression-to-functions-7.22.5"
-      sources."@babel/helper-module-imports-7.22.5"
-      sources."@babel/helper-module-transforms-7.22.9"
-      sources."@babel/helper-optimise-call-expression-7.22.5"
-      sources."@babel/helper-plugin-utils-7.22.5"
-      sources."@babel/helper-remap-async-to-generator-7.22.9"
-      sources."@babel/helper-replace-supers-7.22.9"
-      sources."@babel/helper-simple-access-7.22.5"
-      sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5"
-      sources."@babel/helper-split-export-declaration-7.22.6"
-      sources."@babel/helper-string-parser-7.22.5"
-      sources."@babel/helper-validator-identifier-7.22.5"
-      sources."@babel/helper-validator-option-7.22.5"
-      sources."@babel/helper-wrap-function-7.22.10"
-      sources."@babel/helpers-7.22.10"
-      sources."@babel/highlight-7.22.10"
-      sources."@babel/parser-7.22.10"
-      sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5"
-      sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5"
-      sources."@babel/plugin-proposal-class-properties-7.18.6"
-      sources."@babel/plugin-proposal-export-default-from-7.22.5"
-      sources."@babel/plugin-proposal-optional-chaining-7.21.0"
-      sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2"
-      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.22.5"
-      sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
-      sources."@babel/plugin-syntax-import-assertions-7.22.5"
-      sources."@babel/plugin-syntax-import-attributes-7.22.5"
-      sources."@babel/plugin-syntax-import-meta-7.10.4"
-      sources."@babel/plugin-syntax-json-strings-7.8.3"
-      sources."@babel/plugin-syntax-jsx-7.22.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-unicode-sets-regex-7.18.6"
-      sources."@babel/plugin-transform-arrow-functions-7.22.5"
-      sources."@babel/plugin-transform-async-generator-functions-7.22.10"
-      sources."@babel/plugin-transform-async-to-generator-7.22.5"
-      sources."@babel/plugin-transform-block-scoped-functions-7.22.5"
-      sources."@babel/plugin-transform-block-scoping-7.22.10"
-      sources."@babel/plugin-transform-class-properties-7.22.5"
-      sources."@babel/plugin-transform-class-static-block-7.22.5"
-      sources."@babel/plugin-transform-classes-7.22.6"
-      sources."@babel/plugin-transform-computed-properties-7.22.5"
-      sources."@babel/plugin-transform-destructuring-7.22.10"
-      sources."@babel/plugin-transform-dotall-regex-7.22.5"
-      sources."@babel/plugin-transform-duplicate-keys-7.22.5"
-      sources."@babel/plugin-transform-dynamic-import-7.22.5"
-      sources."@babel/plugin-transform-exponentiation-operator-7.22.5"
-      sources."@babel/plugin-transform-export-namespace-from-7.22.5"
-      sources."@babel/plugin-transform-for-of-7.22.5"
-      sources."@babel/plugin-transform-function-name-7.22.5"
-      sources."@babel/plugin-transform-json-strings-7.22.5"
-      sources."@babel/plugin-transform-literals-7.22.5"
-      sources."@babel/plugin-transform-logical-assignment-operators-7.22.5"
-      sources."@babel/plugin-transform-member-expression-literals-7.22.5"
-      sources."@babel/plugin-transform-modules-amd-7.22.5"
-      sources."@babel/plugin-transform-modules-commonjs-7.22.5"
-      sources."@babel/plugin-transform-modules-systemjs-7.22.5"
-      sources."@babel/plugin-transform-modules-umd-7.22.5"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5"
-      sources."@babel/plugin-transform-new-target-7.22.5"
-      sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.5"
-      sources."@babel/plugin-transform-numeric-separator-7.22.5"
-      sources."@babel/plugin-transform-object-rest-spread-7.22.5"
-      sources."@babel/plugin-transform-object-super-7.22.5"
-      sources."@babel/plugin-transform-optional-catch-binding-7.22.5"
-      sources."@babel/plugin-transform-optional-chaining-7.22.10"
-      sources."@babel/plugin-transform-parameters-7.22.5"
-      sources."@babel/plugin-transform-private-methods-7.22.5"
-      sources."@babel/plugin-transform-private-property-in-object-7.22.5"
-      sources."@babel/plugin-transform-property-literals-7.22.5"
-      sources."@babel/plugin-transform-react-display-name-7.22.5"
-      sources."@babel/plugin-transform-react-jsx-7.22.5"
-      sources."@babel/plugin-transform-react-jsx-development-7.22.5"
-      sources."@babel/plugin-transform-react-pure-annotations-7.22.5"
-      sources."@babel/plugin-transform-regenerator-7.22.10"
-      sources."@babel/plugin-transform-reserved-words-7.22.5"
-      (sources."@babel/plugin-transform-runtime-7.22.10" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."@babel/plugin-transform-shorthand-properties-7.22.5"
-      sources."@babel/plugin-transform-spread-7.22.5"
-      sources."@babel/plugin-transform-sticky-regex-7.22.5"
-      sources."@babel/plugin-transform-template-literals-7.22.5"
-      sources."@babel/plugin-transform-typeof-symbol-7.22.5"
-      sources."@babel/plugin-transform-unicode-escapes-7.22.10"
-      sources."@babel/plugin-transform-unicode-property-regex-7.22.5"
-      sources."@babel/plugin-transform-unicode-regex-7.22.5"
-      sources."@babel/plugin-transform-unicode-sets-regex-7.22.5"
-      (sources."@babel/preset-env-7.22.10" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."@babel/preset-modules-0.1.6-no-external-plugins"
-      sources."@babel/preset-react-7.22.5"
-      sources."@babel/preset-stage-0-7.8.3"
-      sources."@babel/register-7.22.5"
-      sources."@babel/regjsgen-0.8.0"
-      sources."@babel/runtime-7.22.10"
-      sources."@babel/template-7.22.5"
-      sources."@babel/traverse-7.22.10"
-      sources."@babel/types-7.22.10"
-      sources."@jridgewell/gen-mapping-0.3.3"
-      sources."@jridgewell/resolve-uri-3.1.1"
-      sources."@jridgewell/set-array-1.1.2"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
-      sources."@jridgewell/trace-mapping-0.3.19"
-      sources."@reach/router-1.3.4"
-      sources."@sindresorhus/is-0.7.0"
-      sources."@types/glob-7.2.0"
-      sources."@types/json-schema-7.0.12"
-      sources."@types/minimatch-5.1.2"
-      sources."@types/node-20.5.3"
-      sources."@types/parse-json-4.0.0"
-      sources."@types/prop-types-15.7.5"
-      sources."@types/q-1.5.5"
-      sources."@types/react-17.0.65"
-      sources."@types/scheduler-0.16.3"
-      sources."@webassemblyjs/ast-1.9.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
-      sources."@webassemblyjs/helper-api-error-1.9.0"
-      sources."@webassemblyjs/helper-buffer-1.9.0"
-      sources."@webassemblyjs/helper-code-frame-1.9.0"
-      sources."@webassemblyjs/helper-fsm-1.9.0"
-      sources."@webassemblyjs/helper-module-context-1.9.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
-      sources."@webassemblyjs/helper-wasm-section-1.9.0"
-      sources."@webassemblyjs/ieee754-1.9.0"
-      sources."@webassemblyjs/leb128-1.9.0"
-      sources."@webassemblyjs/utf8-1.9.0"
-      sources."@webassemblyjs/wasm-edit-1.9.0"
-      sources."@webassemblyjs/wasm-gen-1.9.0"
-      sources."@webassemblyjs/wasm-opt-1.9.0"
-      sources."@webassemblyjs/wasm-parser-1.9.0"
-      sources."@webassemblyjs/wast-parser-1.9.0"
-      sources."@webassemblyjs/wast-printer-1.9.0"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."@zeit/schemas-2.6.0"
-      sources."accepts-1.3.8"
-      sources."acorn-6.4.2"
-      sources."acorn-walk-7.2.0"
-      sources."after-0.8.2"
-      sources."ajv-6.12.6"
-      sources."ajv-errors-1.0.1"
-      sources."ajv-keywords-3.5.2"
-      sources."alphanum-sort-1.0.2"
-      sources."ansi-align-2.0.0"
-      sources."ansi-colors-3.2.4"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-html-community-0.0.8"
-      sources."ansi-regex-3.0.1"
-      sources."ansi-styles-3.2.1"
-      sources."anymatch-3.1.3"
-      sources."aproba-1.2.0"
-      sources."arch-2.2.0"
-      (sources."archive-type-4.0.0" // {
-        dependencies = [
-          sources."file-type-4.4.0"
-        ];
-      })
-      sources."arg-2.0.0"
-      sources."argparse-1.0.10"
-      sources."arr-diff-4.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."arr-union-3.1.0"
-      sources."array-buffer-byte-length-1.0.0"
-      sources."array-flatten-1.1.1"
-      sources."array-union-1.0.2"
-      sources."array-uniq-1.0.3"
-      sources."array-unique-0.3.2"
-      sources."array.prototype.reduce-1.0.5"
-      sources."arraybuffer.prototype.slice-1.0.1"
-      sources."arraybuffer.slice-0.0.7"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      (sources."assert-1.5.0" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-          sources."util-0.10.3"
-        ];
-      })
-      sources."assign-symbols-1.0.0"
-      sources."async-2.6.4"
-      sources."async-each-1.0.6"
-      sources."async-limiter-1.0.1"
-      sources."atob-2.1.2"
-      (sources."autoprefixer-9.8.8" // {
-        dependencies = [
-          sources."picocolors-0.2.1"
-        ];
-      })
-      sources."available-typed-arrays-1.0.5"
-      sources."axios-0.21.4"
-      sources."babel-core-7.0.0-bridge.0"
-      (sources."babel-loader-8.3.0" // {
-        dependencies = [
-          sources."find-cache-dir-3.3.2"
-          sources."find-up-4.1.0"
-          sources."locate-path-5.0.0"
-          sources."make-dir-3.1.0"
-          sources."p-locate-4.1.0"
-          sources."path-exists-4.0.0"
-          sources."pkg-dir-4.2.0"
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."babel-plugin-macros-2.8.0"
-      (sources."babel-plugin-polyfill-corejs2-0.4.5" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
-      sources."babel-plugin-polyfill-corejs3-0.8.3"
-      sources."babel-plugin-polyfill-regenerator-0.5.2"
-      sources."babel-plugin-transform-react-remove-prop-types-0.4.24"
-      sources."babel-plugin-universal-import-4.0.2"
-      (sources."babel-runtime-6.26.0" // {
-        dependencies = [
-          sources."regenerator-runtime-0.11.1"
-        ];
-      })
-      sources."backo2-1.0.2"
-      sources."balanced-match-1.0.2"
-      (sources."base-0.11.2" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      sources."base64-arraybuffer-0.1.4"
-      sources."base64-js-1.5.1"
-      sources."base64id-2.0.0"
-      sources."batch-0.6.1"
-      sources."bfj-6.1.2"
-      sources."big.js-5.2.2"
-      sources."binary-extensions-2.2.0"
-      sources."bindings-1.5.0"
-      sources."bl-1.2.3"
-      sources."blob-0.0.5"
-      sources."bluebird-3.7.2"
-      sources."bn.js-5.2.1"
-      (sources."body-parser-1.20.1" // {
-        dependencies = [
-          sources."bytes-3.1.2"
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."qs-6.11.0"
-        ];
-      })
-      (sources."bonjour-3.5.0" // {
-        dependencies = [
-          sources."array-flatten-2.1.2"
-        ];
-      })
-      sources."boolbase-1.0.0"
-      (sources."boxen-1.3.0" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-        ];
-      })
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."brorand-1.1.0"
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.1"
-      sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.1.0"
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
-      sources."browserify-zlib-0.1.4"
-      sources."browserslist-4.21.10"
-      sources."buffer-5.7.1"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-crc32-0.2.13"
-      sources."buffer-fill-1.0.0"
-      sources."buffer-from-1.1.2"
-      sources."buffer-indexof-1.1.1"
-      sources."buffer-xor-1.0.3"
-      sources."bufferutil-4.0.7"
-      sources."builtin-status-codes-3.0.0"
-      sources."bytes-3.0.0"
-      sources."cacache-12.0.4"
-      sources."cache-base-1.0.1"
-      (sources."cacheable-request-2.1.4" // {
-        dependencies = [
-          sources."lowercase-keys-1.0.0"
-        ];
-      })
-      sources."call-bind-1.0.2"
-      (sources."caller-callsite-2.0.0" // {
-        dependencies = [
-          sources."callsites-2.0.0"
-        ];
-      })
-      sources."caller-path-2.0.0"
-      sources."callsites-3.1.0"
-      sources."camel-case-3.0.0"
-      sources."camelcase-5.3.1"
-      sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001522"
-      sources."case-sensitive-paths-webpack-plugin-2.4.0"
-      sources."caw-2.0.1"
-      sources."chalk-2.4.2"
-      sources."chardet-0.7.0"
-      sources."check-types-8.0.3"
-      sources."chokidar-3.5.3"
-      sources."chownr-1.1.4"
-      sources."chrome-trace-event-1.0.3"
-      sources."cipher-base-1.0.4"
-      sources."circular-dependency-plugin-5.2.2"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."clean-css-4.2.4"
-      sources."cli-boxes-1.0.0"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.1"
-      (sources."clipboardy-1.2.3" // {
-        dependencies = [
-          sources."execa-0.8.0"
-        ];
-      })
-      (sources."cliui-5.0.0" // {
-        dependencies = [
-          sources."string-width-3.1.0"
-        ];
-      })
-      sources."clone-deep-4.0.1"
-      sources."clone-response-1.0.2"
-      sources."coa-2.0.2"
-      sources."collection-visit-1.0.0"
-      sources."color-3.2.1"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."color-string-1.9.1"
-      sources."commander-4.1.1"
-      sources."commondir-1.0.1"
-      sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      sources."component-inherit-0.0.3"
-      sources."compressible-2.0.18"
-      (sources."compression-1.7.3" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."config-chain-1.1.13"
-      sources."connect-history-api-fallback-1.6.0"
-      sources."console-browserify-1.2.0"
-      sources."constants-browserify-1.0.0"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."convert-source-map-1.9.0"
-      sources."cookie-0.4.2"
-      sources."cookie-signature-1.0.6"
-      sources."copy-concurrently-1.0.5"
-      sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.12"
-      sources."core-js-compat-3.32.1"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."cosmiconfig-6.0.0"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      sources."create-react-context-0.3.0"
-      (sources."cross-spawn-5.1.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
-      sources."crypto-browserify-3.12.0"
-      sources."css-color-names-0.0.4"
-      sources."css-declaration-sorter-4.0.1"
-      (sources."css-loader-2.1.1" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-          sources."postcss-value-parser-3.3.1"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      sources."css-select-2.1.0"
-      sources."css-select-base-adapter-0.1.1"
-      sources."css-tree-1.0.0-alpha.37"
-      sources."css-what-3.4.2"
-      sources."cssesc-3.0.0"
-      (sources."cssnano-4.1.11" // {
-        dependencies = [
-          sources."cosmiconfig-5.2.1"
-          sources."import-fresh-2.0.0"
-          sources."parse-json-4.0.0"
-          sources."resolve-from-3.0.0"
-        ];
-      })
-      sources."cssnano-preset-default-4.0.8"
-      sources."cssnano-util-get-arguments-4.0.0"
-      sources."cssnano-util-get-match-4.0.0"
-      sources."cssnano-util-raw-cache-4.0.1"
-      sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.2.0" // {
-        dependencies = [
-          sources."css-tree-1.1.3"
-          sources."mdn-data-2.0.14"
-        ];
-      })
-      sources."csstype-3.1.2"
-      sources."cyclist-1.0.2"
-      sources."debug-4.3.4"
-      sources."decamelize-1.2.0"
-      sources."decode-uri-component-0.2.2"
-      (sources."decompress-4.2.1" // {
-        dependencies = [
-          (sources."make-dir-1.3.0" // {
-            dependencies = [
-              sources."pify-3.0.0"
-            ];
-          })
-          sources."pify-2.3.0"
-        ];
-      })
-      sources."decompress-response-3.3.0"
-      (sources."decompress-tar-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
-      (sources."decompress-tarbz2-4.1.1" // {
-        dependencies = [
-          sources."file-type-6.2.0"
-        ];
-      })
-      (sources."decompress-targz-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
-      (sources."decompress-unzip-4.0.1" // {
-        dependencies = [
-          sources."file-type-3.9.0"
-          sources."get-stream-2.3.1"
-          sources."pify-2.3.0"
-        ];
-      })
-      sources."deep-equal-1.1.1"
-      sources."deep-extend-0.6.0"
-      (sources."default-gateway-4.2.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."get-stream-4.1.0"
-          sources."pump-3.0.0"
-        ];
-      })
-      sources."define-properties-1.2.0"
-      sources."define-property-2.0.2"
-      sources."del-4.1.1"
-      sources."depd-2.0.0"
-      sources."des.js-1.1.0"
-      sources."destroy-1.2.0"
-      sources."detect-node-2.1.0"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."dns-equal-1.0.0"
-      sources."dns-packet-1.3.4"
-      sources."dns-txt-2.0.2"
-      sources."dom-converter-0.2.0"
-      (sources."dom-serializer-0.2.2" // {
-        dependencies = [
-          sources."domelementtype-2.3.0"
-        ];
-      })
-      sources."dom-walk-0.1.2"
-      sources."domain-browser-1.2.0"
-      sources."domelementtype-1.3.1"
-      (sources."domhandler-4.3.1" // {
-        dependencies = [
-          sources."domelementtype-2.3.0"
-        ];
-      })
-      sources."domutils-1.7.0"
-      sources."dot-prop-5.3.0"
-      (sources."download-7.1.0" // {
-        dependencies = [
-          sources."make-dir-1.3.0"
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."download-git-repo-2.0.0"
-      sources."duplexer-0.1.2"
-      sources."duplexer3-0.1.5"
-      sources."duplexify-3.7.1"
-      sources."ee-first-1.1.1"
-      sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.499"
-      (sources."elliptic-6.5.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."emoji-regex-7.0.3"
-      sources."emojis-list-3.0.0"
-      sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.4"
-      (sources."engine.io-3.6.1" // {
-        dependencies = [
-          sources."debug-4.1.1"
-        ];
-      })
-      (sources."engine.io-client-3.5.3" // {
-        dependencies = [
-          sources."component-emitter-1.3.0"
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."engine.io-parser-2.2.1"
-      (sources."enhanced-resolve-4.5.0" // {
-        dependencies = [
-          sources."memory-fs-0.5.0"
-        ];
-      })
-      sources."entities-2.2.0"
-      sources."errno-0.1.8"
-      sources."error-ex-1.3.2"
-      sources."es-abstract-1.22.1"
-      sources."es-array-method-boxes-properly-1.0.0"
-      sources."es-set-tostringtag-2.0.1"
-      sources."es-to-primitive-1.2.1"
-      sources."escalade-3.1.1"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-4.0.3"
-      sources."esprima-4.0.1"
-      (sources."esrecurse-4.3.0" // {
-        dependencies = [
-          sources."estraverse-5.3.0"
-        ];
-      })
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."etag-1.8.1"
-      sources."eventemitter3-4.0.7"
-      sources."events-3.3.0"
-      sources."eventsource-2.0.2"
-      sources."evp_bytestokey-1.0.3"
-      sources."execa-0.7.0"
-      (sources."expand-brackets-2.1.4" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."express-4.18.2" // {
-        dependencies = [
-          sources."cookie-0.5.0"
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."path-to-regexp-0.1.7"
-          sources."qs-6.11.0"
-          sources."range-parser-1.2.1"
-        ];
-      })
-      sources."ext-list-2.2.2"
-      sources."ext-name-5.0.0"
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      sources."external-editor-3.1.0"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      (sources."extract-css-chunks-webpack-plugin-4.9.0" // {
-        dependencies = [
-          sources."normalize-url-1.9.1"
-          sources."prepend-http-1.0.4"
-          sources."query-string-4.3.4"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      (sources."fast-url-parser-1.1.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."faye-websocket-0.11.4"
-      sources."fd-slicer-1.1.0"
-      sources."figgy-pudding-3.5.2"
-      sources."figures-2.0.0"
-      (sources."file-loader-3.0.1" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      sources."file-type-8.1.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-2.1.0"
-      sources."filesize-3.6.1"
-      sources."fill-range-7.0.1"
-      (sources."finalhandler-1.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."find-cache-dir-2.1.0"
-      sources."find-up-3.0.0"
-      sources."flush-write-stream-1.1.1"
-      sources."follow-redirects-1.15.2"
-      sources."for-each-0.3.3"
-      sources."for-in-1.0.2"
-      sources."forwarded-0.2.0"
-      sources."fragment-cache-0.2.1"
-      sources."fresh-0.5.2"
-      sources."from2-2.3.0"
-      sources."fs-constants-1.0.0"
-      sources."fs-extra-7.0.1"
-      sources."fs-readdir-recursive-1.1.0"
-      sources."fs-write-stream-atomic-1.0.10"
-      sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.3"
-      sources."function-bind-1.1.1"
-      sources."function.prototype.name-1.1.5"
-      sources."functions-have-names-1.2.3"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.2.1"
-      sources."get-proxy-2.1.0"
-      sources."get-stream-3.0.0"
-      sources."get-symbol-description-1.0.0"
-      sources."get-value-2.0.6"
-      sources."git-clone-0.1.0"
-      sources."git-promise-1.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-4.4.0"
-      sources."globals-11.12.0"
-      sources."globalthis-1.0.3"
-      (sources."globby-6.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
-      sources."gopd-1.0.1"
-      (sources."got-8.3.2" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."graceful-fs-4.2.11"
-      sources."gud-1.0.0"
-      sources."gunzip-maybe-1.4.2"
-      sources."gzip-size-5.1.1"
-      sources."handle-thing-2.0.1"
-      sources."has-1.0.3"
-      sources."has-bigints-1.0.2"
-      (sources."has-binary2-1.0.3" // {
-        dependencies = [
-          sources."isarray-2.0.1"
-        ];
-      })
-      sources."has-cors-1.1.0"
-      sources."has-flag-3.0.0"
-      sources."has-property-descriptors-1.0.0"
-      sources."has-proto-1.0.1"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-symbols-1.0.3"
-      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 = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
-      sources."hash.js-1.1.7"
-      sources."he-1.2.0"
-      sources."hex-color-regex-1.1.0"
-      sources."hmac-drbg-1.0.1"
-      sources."hoist-non-react-statics-3.3.2"
-      sources."hoopy-0.1.4"
-      sources."hpack.js-2.1.6"
-      sources."hsl-regex-1.0.0"
-      sources."hsla-regex-1.0.0"
-      sources."html-entities-1.4.0"
-      (sources."html-minifier-3.5.21" // {
-        dependencies = [
-          sources."commander-2.17.1"
-        ];
-      })
-      (sources."html-webpack-plugin-3.2.0" // {
-        dependencies = [
-          sources."big.js-3.2.0"
-          sources."emojis-list-2.1.0"
-          sources."json5-0.5.1"
-          sources."loader-utils-0.2.17"
-        ];
-      })
-      (sources."htmlparser2-6.1.0" // {
-        dependencies = [
-          sources."dom-serializer-1.4.1"
-          sources."domelementtype-2.3.0"
-          sources."domutils-2.8.0"
-        ];
-      })
-      sources."http-cache-semantics-3.8.1"
-      sources."http-deceiver-1.2.7"
-      sources."http-errors-2.0.0"
-      sources."http-parser-js-0.5.8"
-      sources."http-proxy-1.18.1"
-      sources."http-proxy-middleware-0.19.1"
-      sources."https-browserify-1.0.0"
-      sources."iconv-lite-0.4.24"
-      sources."icss-replace-symbols-1.1.0"
-      sources."icss-utils-4.1.1"
-      sources."ieee754-1.2.1"
-      sources."iferr-0.1.5"
-      sources."import-cwd-2.1.0"
-      (sources."import-fresh-3.3.0" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
-      (sources."import-from-2.1.0" // {
-        dependencies = [
-          sources."resolve-from-3.0.0"
-        ];
-      })
-      sources."import-local-2.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."indexes-of-1.0.1"
-      sources."indexof-0.0.1"
-      sources."infer-owner-1.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."inquirer-6.5.2"
-      (sources."inquirer-autocomplete-prompt-1.4.0" // {
-        dependencies = [
-          sources."ansi-escapes-4.3.2"
-          sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.2"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."figures-3.2.0"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.2.0"
-        ];
-      })
-      sources."internal-ip-4.3.0"
-      sources."internal-slot-1.0.5"
-      sources."intersection-observer-0.7.0"
-      sources."into-stream-3.1.0"
-      sources."invariant-2.2.4"
-      sources."ip-1.1.8"
-      sources."ip-regex-2.1.0"
-      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.1"
-      sources."is-array-buffer-3.0.2"
-      sources."is-arrayish-0.2.1"
-      sources."is-bigint-1.0.4"
-      sources."is-binary-path-2.1.0"
-      sources."is-boolean-object-1.1.2"
-      sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.7"
-      sources."is-color-stop-1.1.0"
-      sources."is-core-module-2.13.0"
-      sources."is-data-descriptor-1.0.0"
-      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"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-gzip-1.0.0"
-      sources."is-natural-number-4.0.1"
-      sources."is-negative-zero-2.0.2"
-      sources."is-number-7.0.0"
-      sources."is-number-object-1.0.7"
-      sources."is-obj-2.0.0"
-      sources."is-object-1.0.2"
-      sources."is-path-cwd-2.2.0"
-      sources."is-path-in-cwd-2.1.0"
-      sources."is-path-inside-2.1.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.4"
-      sources."is-resolvable-1.1.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-shared-array-buffer-1.0.2"
-      sources."is-stream-1.1.0"
-      sources."is-string-1.0.7"
-      sources."is-symbol-1.0.4"
-      sources."is-typed-array-1.1.12"
-      sources."is-weakref-1.0.2"
-      sources."is-windows-1.0.2"
-      sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."isurl-1.0.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
-      sources."jsesc-2.5.2"
-      sources."json-buffer-3.0.0"
-      sources."json-parse-better-errors-1.0.2"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-0.4.1"
-      sources."json5-2.2.3"
-      sources."jsonfile-4.0.0"
-      sources."keyv-3.0.0"
-      sources."killable-1.0.1"
-      sources."kind-of-6.0.3"
-      sources."last-call-webpack-plugin-3.0.0"
-      sources."lines-and-columns-1.2.4"
-      sources."loader-runner-2.4.0"
-      sources."loader-utils-2.0.4"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.debounce-4.0.8"
-      sources."lodash.memoize-4.1.2"
-      sources."lodash.uniq-4.5.0"
-      sources."loglevel-1.8.1"
-      sources."loose-envify-1.4.0"
-      sources."lower-case-1.1.4"
-      sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
-      sources."make-dir-2.1.0"
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
-      sources."match-sorter-3.1.1"
-      sources."md5.js-1.3.5"
-      sources."mdn-data-2.0.4"
-      sources."media-typer-0.3.0"
-      sources."memory-fs-0.4.1"
-      sources."merge-descriptors-1.0.1"
-      sources."methods-1.1.2"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."to-regex-range-2.1.1"
-        ];
-      })
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."mime-2.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."mimic-response-1.0.1"
-      sources."min-document-2.19.0"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      (sources."mississippi-3.0.0" // {
-        dependencies = [
-          sources."pump-3.0.0"
-        ];
-      })
-      (sources."mixin-deep-1.3.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      sources."mkdirp-0.5.6"
-      sources."mkdirp-classic-0.5.3"
-      sources."move-concurrently-1.0.1"
-      sources."ms-2.1.2"
-      sources."multicast-dns-6.2.3"
-      sources."multicast-dns-service-types-1.1.0"
-      sources."mutation-observer-1.0.3"
-      sources."mute-stream-0.0.7"
-      sources."nan-2.17.0"
-      sources."nanomatch-1.2.13"
-      sources."negotiator-0.6.3"
-      sources."neo-async-2.6.2"
-      sources."nice-try-1.0.5"
-      sources."no-case-2.3.2"
-      sources."node-forge-0.10.0"
-      sources."node-gyp-build-4.6.0"
-      (sources."node-libs-browser-2.2.1" // {
-        dependencies = [
-          sources."browserify-zlib-0.2.0"
-          sources."buffer-4.9.2"
-          sources."pako-1.0.11"
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."node-releases-2.0.13"
-      sources."normalize-path-3.0.0"
-      sources."normalize-range-0.1.2"
-      (sources."normalize-url-2.0.1" // {
-        dependencies = [
-          sources."sort-keys-2.0.0"
-        ];
-      })
-      (sources."npm-conf-1.1.3" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."npm-run-path-2.0.2"
-      sources."nth-check-1.0.2"
-      sources."num2fraction-1.2.2"
-      sources."object-assign-4.1.1"
-      (sources."object-copy-0.1.0" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."object-inspect-1.12.3"
-      sources."object-is-1.1.5"
-      sources."object-keys-1.1.1"
-      sources."object-visit-1.0.1"
-      sources."object.assign-4.1.4"
-      sources."object.getownpropertydescriptors-2.1.6"
-      sources."object.pick-1.3.0"
-      sources."object.values-1.1.6"
-      sources."obuf-1.1.2"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      sources."opener-1.5.2"
-      sources."opn-5.5.0"
-      sources."optimize-css-assets-webpack-plugin-5.0.8"
-      sources."os-browserify-0.3.0"
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-0.4.1"
-      sources."p-event-2.3.1"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-map-2.1.0"
-      sources."p-retry-3.0.1"
-      sources."p-timeout-2.0.1"
-      sources."p-try-2.2.0"
-      sources."pako-0.2.9"
-      sources."parallel-transform-1.2.0"
-      sources."param-case-2.1.1"
-      sources."parent-module-1.0.1"
-      sources."parse-asn1-5.1.6"
-      sources."parse-json-5.2.0"
-      sources."parseqs-0.0.6"
-      sources."parseuri-0.0.6"
-      sources."parseurl-1.3.3"
-      sources."pascalcase-0.1.1"
-      sources."path-browserify-0.0.1"
-      sources."path-dirname-1.0.2"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-key-2.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-to-regexp-2.2.1"
-      sources."path-type-4.0.0"
-      sources."pbkdf2-3.1.2"
-      sources."peek-stream-1.1.3"
-      sources."pend-1.2.0"
-      sources."performance-now-2.1.0"
-      sources."picocolors-1.0.0"
-      sources."picomatch-2.3.1"
-      sources."pify-4.0.1"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pirates-4.0.6"
-      sources."pkg-dir-3.0.0"
-      (sources."portfinder-1.0.32" // {
-        dependencies = [
-          sources."debug-3.2.7"
-        ];
-      })
-      sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.39" // {
-        dependencies = [
-          sources."picocolors-0.2.1"
-        ];
-      })
-      sources."postcss-calc-7.0.5"
-      (sources."postcss-colormin-4.0.3" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-convert-values-4.0.1" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      sources."postcss-discard-comments-4.0.2"
-      sources."postcss-discard-duplicates-4.0.2"
-      sources."postcss-discard-empty-4.0.1"
-      sources."postcss-discard-overridden-4.0.1"
-      sources."postcss-flexbugs-fixes-4.2.1"
-      (sources."postcss-load-config-2.1.2" // {
-        dependencies = [
-          sources."cosmiconfig-5.2.1"
-          sources."import-fresh-2.0.0"
-          sources."parse-json-4.0.0"
-          sources."resolve-from-3.0.0"
-        ];
-      })
-      (sources."postcss-loader-3.0.0" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      (sources."postcss-merge-longhand-4.0.11" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-merge-rules-4.0.3" // {
-        dependencies = [
-          sources."postcss-selector-parser-3.1.2"
-        ];
-      })
-      (sources."postcss-minify-font-values-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-minify-gradients-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-minify-params-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-minify-selectors-4.0.2" // {
-        dependencies = [
-          sources."postcss-selector-parser-3.1.2"
-        ];
-      })
-      sources."postcss-modules-extract-imports-2.0.0"
-      (sources."postcss-modules-local-by-default-2.0.6" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      sources."postcss-modules-scope-2.2.0"
-      sources."postcss-modules-values-2.0.0"
-      sources."postcss-normalize-charset-4.0.1"
-      (sources."postcss-normalize-display-values-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-positions-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-repeat-style-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-string-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-timing-functions-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-unicode-4.0.1" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-url-4.0.1" // {
-        dependencies = [
-          sources."normalize-url-3.3.0"
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-normalize-whitespace-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      (sources."postcss-ordered-values-4.1.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      sources."postcss-reduce-initial-4.0.3"
-      (sources."postcss-reduce-transforms-4.0.2" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      sources."postcss-selector-parser-6.0.13"
-      (sources."postcss-svgo-4.0.3" // {
-        dependencies = [
-          sources."postcss-value-parser-3.3.1"
-        ];
-      })
-      sources."postcss-unique-selectors-4.0.1"
-      sources."postcss-value-parser-4.2.0"
-      sources."prepend-http-2.0.0"
-      sources."pretty-error-2.1.2"
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."progress-2.0.3"
-      sources."promise-inflight-1.0.1"
-      sources."prop-types-15.8.1"
-      sources."proto-list-1.2.4"
-      sources."proxy-addr-2.0.7"
-      sources."prr-1.0.1"
-      sources."pseudomap-1.0.2"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."pump-2.0.1"
-      sources."pumpify-1.5.1"
-      sources."punycode-2.3.0"
-      sources."q-1.5.1"
-      sources."qs-6.11.2"
-      sources."query-string-5.1.1"
-      sources."querystring-es3-0.2.1"
-      sources."querystringify-2.2.0"
-      sources."raf-3.4.1"
-      sources."randombytes-2.1.0"
-      sources."randomfill-1.0.4"
-      sources."range-parser-1.2.0"
-      (sources."raw-body-2.5.1" // {
-        dependencies = [
-          sources."bytes-3.1.2"
-        ];
-      })
-      (sources."raw-loader-3.1.0" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-        ];
-      })
-      sources."rc-1.2.8"
-      sources."react-16.14.0"
-      sources."react-dom-16.14.0"
-      sources."react-fast-compare-3.2.2"
-      sources."react-helmet-6.1.0"
-      (sources."react-hot-loader-4.13.1" // {
-        dependencies = [
-          sources."source-map-0.7.4"
-        ];
-      })
-      sources."react-is-16.13.1"
-      sources."react-lifecycles-compat-3.0.4"
-      sources."react-side-effect-2.1.2"
-      sources."react-universal-component-4.5.0"
-      (sources."readable-stream-2.3.8" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."readdirp-3.6.0"
-      sources."regenerate-1.4.2"
-      sources."regenerate-unicode-properties-10.1.0"
-      sources."regenerator-runtime-0.14.0"
-      sources."regenerator-transform-0.15.2"
-      sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.5.0"
-      sources."regexpu-core-5.3.2"
-      sources."registry-auth-token-3.3.2"
-      sources."registry-url-3.1.0"
-      (sources."regjsparser-0.9.1" // {
-        dependencies = [
-          sources."jsesc-0.5.0"
-        ];
-      })
-      sources."relateurl-0.2.7"
-      sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.7" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."css-select-4.3.0"
-          sources."css-what-6.1.0"
-          sources."dom-serializer-1.4.1"
-          sources."domelementtype-2.3.0"
-          sources."domutils-2.8.0"
-          sources."nth-check-2.1.1"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."repeat-element-1.1.4"
-      sources."repeat-string-1.6.1"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."requires-port-1.0.0"
-      sources."resolve-1.22.4"
-      (sources."resolve-cwd-2.0.0" // {
-        dependencies = [
-          sources."resolve-from-3.0.0"
-        ];
-      })
-      sources."resolve-from-5.0.0"
-      sources."resolve-url-0.2.1"
-      sources."responselike-1.0.2"
-      sources."restore-cursor-2.0.0"
-      sources."ret-0.1.15"
-      sources."retry-0.12.0"
-      sources."rgb-regex-1.0.1"
-      sources."rgba-regex-1.0.0"
-      sources."rimraf-2.7.1"
-      sources."ripemd160-2.0.2"
-      sources."run-async-2.4.1"
-      sources."run-queue-1.0.3"
-      sources."rxjs-6.6.7"
-      (sources."safe-array-concat-1.0.0" // {
-        dependencies = [
-          sources."isarray-2.0.5"
-        ];
-      })
-      sources."safe-buffer-5.2.1"
-      sources."safe-regex-1.1.0"
-      sources."safe-regex-test-1.0.0"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."scheduler-0.19.1"
-      sources."schema-utils-2.7.1"
-      (sources."seek-bzip-1.0.6" // {
-        dependencies = [
-          sources."commander-2.20.3"
-        ];
-      })
-      sources."select-hose-2.0.0"
-      sources."selfsigned-1.10.14"
-      sources."semver-5.7.2"
-      (sources."send-0.18.0" // {
-        dependencies = [
-          (sources."debug-2.6.9" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
-          sources."mime-1.6.0"
-          sources."ms-2.1.3"
-          sources."range-parser-1.2.1"
-        ];
-      })
-      sources."serialize-javascript-4.0.0"
-      (sources."serve-11.3.2" // {
-        dependencies = [
-          sources."ajv-6.5.3"
-          sources."chalk-2.4.1"
-          sources."fast-deep-equal-2.0.1"
-        ];
-      })
-      (sources."serve-handler-6.1.3" // {
-        dependencies = [
-          sources."content-disposition-0.5.2"
-          sources."mime-db-1.33.0"
-          sources."mime-types-2.1.18"
-          sources."minimatch-3.0.4"
-        ];
-      })
-      (sources."serve-index-1.9.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
-          sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
-          sources."ms-2.0.0"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.5.0"
-        ];
-      })
-      sources."serve-static-1.15.0"
-      sources."set-blocking-2.0.0"
-      (sources."set-value-2.0.1" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      sources."setimmediate-1.0.5"
-      sources."setprototypeof-1.2.0"
-      sources."sha.js-2.4.11"
-      sources."shallow-clone-3.0.1"
-      sources."shallowequal-1.1.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."shorthash-0.0.2"
-      sources."side-channel-1.0.4"
-      sources."signal-exit-3.0.7"
-      (sources."simple-swizzle-0.2.2" // {
-        dependencies = [
-          sources."is-arrayish-0.3.2"
-        ];
-      })
-      sources."slash-2.0.0"
-      (sources."snapdragon-0.8.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-          sources."source-map-0.5.7"
-        ];
-      })
-      (sources."snapdragon-node-2.1.1" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      (sources."snapdragon-util-3.0.1" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      (sources."socket.io-2.5.0" // {
-        dependencies = [
-          sources."debug-4.1.1"
-        ];
-      })
-      sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.5.0" // {
-        dependencies = [
-          sources."component-emitter-1.3.0"
-          sources."debug-3.1.0"
-          sources."isarray-2.0.1"
-          sources."ms-2.0.0"
-          sources."socket.io-parser-3.3.3"
-        ];
-      })
-      (sources."socket.io-parser-3.4.3" // {
-        dependencies = [
-          sources."debug-4.1.1"
-          sources."isarray-2.0.1"
-        ];
-      })
-      sources."sockjs-0.3.24"
-      (sources."sockjs-client-1.6.1" // {
-        dependencies = [
-          sources."debug-3.2.7"
-        ];
-      })
-      sources."sort-keys-1.1.2"
-      sources."sort-keys-length-1.0.1"
-      sources."source-list-map-2.0.1"
-      sources."source-map-0.6.1"
-      sources."source-map-resolve-0.5.3"
-      sources."source-map-support-0.5.21"
-      sources."source-map-url-0.4.1"
-      sources."spdy-4.0.2"
-      (sources."spdy-transport-3.0.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
-      sources."split-string-3.1.0"
-      sources."sprintf-js-1.0.3"
-      sources."ssri-6.0.2"
-      sources."stable-0.1.8"
-      (sources."static-extend-0.1.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."statuses-2.0.1"
-      sources."stream-browserify-2.0.2"
-      sources."stream-each-1.2.3"
-      sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.1"
-      sources."strict-uri-encode-1.1.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."string.prototype.trim-1.2.7"
-      sources."string.prototype.trimend-1.0.6"
-      sources."string.prototype.trimstart-1.0.6"
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.1"
-        ];
-      })
-      sources."strip-dirs-2.1.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."strip-outer-1.0.1"
-      (sources."style-loader-0.23.1" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      (sources."stylehacks-4.0.3" // {
-        dependencies = [
-          sources."postcss-selector-parser-3.1.2"
-        ];
-      })
-      sources."supports-color-5.5.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."svgo-1.3.2"
-      sources."swimmer-1.4.0"
-      sources."tapable-1.1.3"
-      (sources."tar-fs-2.1.1" // {
-        dependencies = [
-          sources."bl-4.1.0"
-          sources."pump-3.0.0"
-          sources."readable-stream-3.6.2"
-          sources."tar-stream-2.2.0"
-        ];
-      })
-      sources."tar-stream-1.6.2"
-      sources."term-size-1.2.0"
-      (sources."terser-4.8.1" // {
-        dependencies = [
-          sources."commander-2.20.3"
-        ];
-      })
-      (sources."terser-webpack-plugin-1.4.5" // {
-        dependencies = [
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      sources."through-2.3.8"
-      sources."through2-2.0.5"
-      sources."thunky-1.1.0"
-      sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.12"
-      sources."timsort-0.3.0"
-      sources."tmp-0.0.33"
-      sources."to-array-0.1.4"
-      sources."to-arraybuffer-1.0.1"
-      sources."to-buffer-1.1.1"
-      sources."to-fast-properties-2.0.0"
-      (sources."to-object-path-0.3.0" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."to-regex-3.0.2"
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."toposort-1.0.7"
-      sources."trim-repeated-1.0.0"
-      sources."tryer-1.0.1"
-      sources."tslib-1.14.1"
-      sources."tty-browserify-0.0.0"
-      sources."tunnel-agent-0.6.0"
-      sources."type-fest-0.21.3"
-      sources."type-is-1.6.18"
-      sources."typed-array-buffer-1.0.0"
-      sources."typed-array-byte-length-1.0.0"
-      sources."typed-array-byte-offset-1.0.0"
-      sources."typed-array-length-1.0.4"
-      sources."typedarray-0.0.6"
-      (sources."uglify-js-3.4.10" // {
-        dependencies = [
-          sources."commander-2.19.0"
-        ];
-      })
-      sources."unbox-primitive-1.0.2"
-      sources."unbzip2-stream-1.4.3"
-      sources."unicode-canonical-property-names-ecmascript-2.0.0"
-      sources."unicode-match-property-ecmascript-2.0.0"
-      sources."unicode-match-property-value-ecmascript-2.1.0"
-      sources."unicode-property-aliases-ecmascript-2.1.0"
-      sources."union-value-1.0.1"
-      sources."uniq-1.0.1"
-      sources."uniqs-2.0.0"
-      sources."unique-filename-1.1.1"
-      sources."unique-slug-2.0.2"
-      sources."universalify-0.1.2"
-      sources."unpipe-1.0.0"
-      sources."unquote-1.1.1"
-      (sources."unset-value-1.0.0" // {
-        dependencies = [
-          (sources."has-value-0.3.1" // {
-            dependencies = [
-              sources."isobject-2.1.0"
-            ];
-          })
-          sources."has-values-0.1.4"
-        ];
-      })
-      sources."upath-1.2.0"
-      sources."update-browserslist-db-1.0.11"
-      sources."update-check-1.5.2"
-      sources."upper-case-1.1.3"
-      sources."uri-js-4.4.1"
-      sources."urix-0.1.0"
-      (sources."url-0.11.1" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      (sources."url-loader-2.3.0" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-        ];
-      })
-      sources."url-parse-1.5.10"
-      sources."url-parse-lax-3.0.0"
-      sources."url-to-options-1.0.1"
-      sources."use-3.1.1"
-      sources."utf-8-validate-5.0.10"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
-      sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.0"
-      sources."utila-0.4.0"
-      sources."utils-merge-1.0.1"
-      sources."uuid-8.3.2"
-      sources."vary-1.1.2"
-      sources."vendors-1.0.4"
-      sources."vm-browserify-1.1.2"
-      sources."warning-4.0.3"
-      sources."watchpack-1.7.5"
-      (sources."watchpack-chokidar2-2.0.1" // {
-        dependencies = [
-          sources."anymatch-2.0.0"
-          sources."binary-extensions-1.13.1"
-          sources."braces-2.3.2"
-          sources."chokidar-2.1.8"
-          sources."extend-shallow-2.0.1"
-          sources."fill-range-4.0.0"
-          sources."fsevents-1.2.13"
-          sources."glob-parent-3.1.0"
-          sources."is-binary-path-1.0.1"
-          sources."is-glob-3.1.0"
-          sources."is-number-3.0.0"
-          sources."kind-of-3.2.2"
-          sources."normalize-path-2.1.1"
-          sources."readdirp-2.2.1"
-          sources."to-regex-range-2.1.1"
-        ];
-      })
-      sources."wbuf-1.7.3"
-      (sources."webpack-4.46.0" // {
-        dependencies = [
-          sources."json5-1.0.2"
-          sources."loader-utils-1.4.2"
-          sources."schema-utils-1.0.0"
-        ];
-      })
-      (sources."webpack-bundle-analyzer-3.9.0" // {
-        dependencies = [
-          sources."acorn-7.4.1"
-          sources."commander-2.20.3"
-          sources."ws-6.2.2"
-        ];
-      })
-      (sources."webpack-dev-middleware-3.7.3" // {
-        dependencies = [
-          sources."range-parser-1.2.1"
-        ];
-      })
-      (sources."webpack-dev-server-3.11.3" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."anymatch-2.0.0"
-          sources."binary-extensions-1.13.1"
-          sources."braces-2.3.2"
-          sources."chokidar-2.1.8"
-          (sources."compression-1.7.4" // {
-            dependencies = [
-              sources."debug-2.6.9"
-            ];
-          })
-          sources."extend-shallow-2.0.1"
-          sources."fill-range-4.0.0"
-          sources."fsevents-1.2.13"
-          sources."glob-parent-3.1.0"
-          sources."is-absolute-url-3.0.3"
-          sources."is-binary-path-1.0.1"
-          sources."is-glob-3.1.0"
-          sources."is-number-3.0.0"
-          sources."kind-of-3.2.2"
-          sources."ms-2.0.0"
-          sources."normalize-path-2.1.1"
-          sources."readdirp-2.2.1"
-          sources."safe-buffer-5.1.2"
-          sources."schema-utils-1.0.0"
-          sources."semver-6.3.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-6.1.0"
-          sources."to-regex-range-2.1.1"
-          sources."ws-6.2.2"
-        ];
-      })
-      sources."webpack-flush-chunks-2.0.3"
-      (sources."webpack-log-2.0.0" // {
-        dependencies = [
-          sources."uuid-3.4.0"
-        ];
-      })
-      sources."webpack-node-externals-1.7.2"
-      sources."webpack-sources-1.4.3"
-      sources."websocket-driver-0.7.4"
-      sources."websocket-extensions-0.1.4"
-      sources."which-1.3.1"
-      sources."which-boxed-primitive-1.0.2"
-      sources."which-module-2.0.1"
-      sources."which-typed-array-1.1.11"
-      sources."widest-line-2.0.1"
-      sources."worker-farm-1.7.0"
-      (sources."wrap-ansi-5.1.0" // {
-        dependencies = [
-          sources."string-width-3.1.0"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."ws-7.4.6"
-      sources."xmlhttprequest-ssl-1.6.3"
-      sources."xtend-4.0.2"
-      sources."y18n-4.0.3"
-      sources."yallist-3.1.1"
-      sources."yaml-1.10.2"
-      (sources."yargs-13.3.2" // {
-        dependencies = [
-          sources."string-width-3.1.0"
-        ];
-      })
-      sources."yargs-parser-13.1.2"
-      sources."yauzl-2.10.0"
-      sources."yeast-0.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A progressive static site generator for React";
-      homepage = "https://github.com/react-static/react-static#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   react-tools = nodeEnv.buildNodePackage {
     name = "react-tools";
     packageName = "react-tools";
diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/development/tools/react-static/default.nix
new file mode 100644
index 000000000000..d4552f68761a
--- /dev/null
+++ b/pkgs/development/tools/react-static/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, mkYarnPackage
+, fetchFromGitHub
+, fetchYarnDeps
+}:
+
+mkYarnPackage rec {
+  pname = "react-static";
+  version = "7.6.2";
+
+  src = fetchFromGitHub {
+    owner = "react-static";
+    repo = "react-static";
+    rev = "v${version}";
+    hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
+  };
+
+  packageJSON = ./package.json;
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn --cwd deps/react-static/packages/react-static --offline build
+
+    runHook postBuild
+  '';
+
+  doDist = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/lib/node_modules"
+    mv deps/react-static/packages/react-static "$out/lib/node_modules"
+    mv node_modules "$out/lib/node_modules/react-static"
+
+    ln -s "$out/lib/node_modules/react-static/bin" "$out"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md";
+    description = "A progressive static site generator for React";
+    homepage = "https://github.com/react-static/react-static";
+    license = lib.licenses.mit;
+    mainProgram = "react-static";
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/tools/react-static/package.json b/pkgs/development/tools/react-static/package.json
new file mode 100644
index 000000000000..70b873277fd2
--- /dev/null
+++ b/pkgs/development/tools/react-static/package.json
@@ -0,0 +1,154 @@
+{
+  "name": "react-static",
+  "description": "A progressive static site generator for React",
+  "version": "7.6.2",
+  "license": "MIT",
+  "repository": "https://github.com/react-static/react-static",
+  "main": "lib/index.js",
+  "types": "src/index.d.ts",
+  "engines": {
+    "node": ">=8.9.0"
+  },
+  "bin": {
+    "react-static": "./bin/react-static"
+  },
+  "scripts": {
+    "prebuild": "rimraf lib",
+    "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\"  --source-maps inline",
+    "watch": "yarn build --watch",
+    "watch:link": "onchange './lib/**/*' -- yalc push --changed",
+    "start": "yarn watch",
+    "test": "yarn format && yarn lint && yarn unitTest",
+    "lint": "eslint src",
+    "format": "prettier README.md {src,templates/*/src}/**/*.js --write",
+    "unitTest": "cross-env NODE_ENV=test yarn jest ./src",
+    "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch",
+    "preversion": "yarn build && yarn test",
+    "publishLink": "echo '{{event}} to {{changed}}' && yalc publish"
+  },
+  "peerDependencies": {
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
+    "react-hot-loader": "^4.12.11"
+  },
+  "dependencies": {
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-export-default-from": "^7.5.2",
+    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-destructuring": "^7.5.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/preset-stage-0": "^7.0.0",
+    "@babel/register": "^7.5.5",
+    "@babel/runtime": "^7.5.5",
+    "@reach/router": "^1.3.1",
+    "autoprefixer": "^9.7.4",
+    "axios": "^0.21.1",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-macros": "^2.6.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
+    "babel-plugin-universal-import": "^4.0.0",
+    "case-sensitive-paths-webpack-plugin": "^2.2.0",
+    "chalk": "^2.4.2",
+    "chokidar": "^3.0.2",
+    "circular-dependency-plugin": "^5.2.0",
+    "cors": "^2.8.5",
+    "css-loader": "^2.1.1",
+    "download-git-repo": "^2.0.0",
+    "extract-css-chunks-webpack-plugin": "^4.6.0",
+    "file-loader": "3.0.1",
+    "fs-extra": "^7.0.1",
+    "git-promise": "^1.0.0",
+    "glob": "^7.1.4",
+    "gunzip-maybe": "^1.4.1",
+    "html-webpack-plugin": "^3.2.0",
+    "inquirer": "^6.5.1",
+    "inquirer-autocomplete-prompt": "^1.0.1",
+    "intersection-observer": "^0.7.0",
+    "jsesc": "^2.5.2",
+    "match-sorter": "^3.1.1",
+    "minimist": "^1.2.0",
+    "mutation-observer": "^1.0.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "portfinder": "^1.0.21",
+    "postcss-flexbugs-fixes": "^4.1.0",
+    "postcss-loader": "^3.0.0",
+    "pretty-error": "^2.1.1",
+    "progress": "^2.0.3",
+    "prop-types": "^15.7.2",
+    "raf": "^3.4.1",
+    "raw-loader": "^3.1.0",
+    "react-helmet": "^6.1.0",
+    "react-universal-component": "^4.0.0",
+    "resolve-from": "^5.0.0",
+    "serve": "^11.1.0",
+    "shorthash": "^0.0.2",
+    "slash": "^2.0.0",
+    "socket.io": "^2.2.0",
+    "socket.io-client": "^2.2.0",
+    "style-loader": "0.23.1",
+    "swimmer": "^1.4.0",
+    "tar-fs": "^2.0.0",
+    "terser-webpack-plugin": "^1.4.1",
+    "upath": "^1.1.2",
+    "url-loader": "^2.1.0",
+    "webpack": "^4.39.2",
+    "webpack-bundle-analyzer": "^3.4.1",
+    "webpack-dev-server": "^3.8.0",
+    "webpack-flush-chunks": "^2.0.3",
+    "webpack-node-externals": "^1.7.2"
+  },
+  "devDependencies": {
+    "@types/react": "^16.9.1",
+    "@types/react-helmet": "^6.1.0",
+    "babel-jest": "^24.8.0",
+    "cors": "^2.8.5",
+    "cross-env": "^5.2.0",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.14.0",
+    "enzyme-to-json": "^3.4.0",
+    "eslint": "^6.1.0",
+    "eslint-config-prettier": "^6.0.0",
+    "eslint-config-react-tools": "^1.1.7",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-jsx-a11y": "^6.2.3",
+    "eslint-plugin-react": "^7.14.3",
+    "express": "^4.17.1",
+    "husky": "^3.0.3",
+    "jest": "^24.8.0",
+    "lerna": "^3.16.4",
+    "onchange": "^6.0.0",
+    "prettier": "1.18.2",
+    "react": "^16.9.0",
+    "react-dev-utils": "^9.0.3",
+    "react-dom": "^16.9.0",
+    "react-hot-loader": "^4.12.11",
+    "rimraf": "^2.7.0",
+    "webpack-hot-middleware": "^2.25.0"
+  },
+  "jest": {
+    "verbose": true,
+    "moduleDirectories": [
+      "node_modules",
+      "src"
+    ],
+    "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$",
+    "moduleNameMapper": {
+      "static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js"
+    },
+    "setupFiles": [
+      "<rootDir>/setupTests.js"
+    ],
+    "snapshotSerializers": [
+      "enzyme-to-json/serializer"
+    ]
+  },
+  "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a"
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf075..23c761d0186d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20059,6 +20059,8 @@ with pkgs;
 
   rdocker = callPackage ../development/tools/rdocker { };
 
+  react-static = callPackage ../development/tools/react-static { };
+
   redis-dump = callPackage ../development/tools/redis-dump { };
 
   redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { };

From 8b5c880ae5fb1212d4d60a5ebed26f0bff9be15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 19:12:08 -0700
Subject: [PATCH 11/32] jake: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 39 -------------------
 pkgs/development/tools/jake/default.nix       | 28 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 31 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/tools/jake/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..6305117b4d33 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -76,6 +76,7 @@ mapAliases {
   immich = pkgs.immich-cli; # added 2023-08-19
   indium = throw "indium was removed because it was broken"; # added 2023-08-19
   ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
+  inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..a0d51b25d927 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -154,7 +154,6 @@
 , "imapnotify"
 , "insect"
 , "intelephense"
-, "jake"
 , "joplin"
 , "js-beautify"
 , "js-yaml"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..c487b3755e73 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -91730,45 +91730,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  jake = nodeEnv.buildNodePackage {
-    name = "jake";
-    packageName = "jake";
-    version = "10.8.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz";
-      sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==";
-    };
-    dependencies = [
-      sources."ansi-styles-4.3.0"
-      sources."async-3.2.4"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-2.0.1"
-      sources."chalk-4.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      (sources."filelist-1.0.4" // {
-        dependencies = [
-          sources."minimatch-5.1.6"
-        ];
-      })
-      sources."has-flag-4.0.0"
-      (sources."minimatch-3.1.2" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-        ];
-      })
-      sources."supports-color-7.2.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "JavaScript build tool, similar to Make or Rake";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
diff --git a/pkgs/development/tools/jake/default.nix b/pkgs/development/tools/jake/default.nix
new file mode 100644
index 000000000000..b91a779cb53c
--- /dev/null
+++ b/pkgs/development/tools/jake/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "jake";
+  version = "10.8.7";
+
+  src = fetchFromGitHub {
+    owner = "jakejs";
+    repo = "jake";
+    rev = "v${version}";
+    hash = "sha256-Qado9huQx9MVTFp8t7szB+IUVNWQqT/ni62JnURQqeM=";
+  };
+
+  npmDepsHash = "sha256-3pOFrH/em/HMTswrZLAeqPAb9U0/odcZPt4AkQkMhZM=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "JavaScript build tool, similar to Make or Rake";
+    homepage = "https://github.com/jakejs/jake";
+    license = lib.licenses.asl20;
+    mainProgram = "jake";
+    maintainers = with lib.maintainers; [ jasoncarr ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf075..7f2fabaf3f6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19587,6 +19587,8 @@ with pkgs;
 
   jacoco = callPackage ../development/tools/analysis/jacoco { };
 
+  jake = callPackage ../development/tools/jake { };
+
   inherit (callPackage ../development/tools/build-managers/jam { })
     jam
     ftjam;

From feb00018a5314df1aca8e369e4e1de9276d1f394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 18 Aug 2023 16:36:39 -0700
Subject: [PATCH 12/32] dockerfile-language-server-nodejs: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/main-programs.nix           |  1 -
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 32 -------------------
 .../default.nix                               | 27 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 30 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..839f642d4bdc 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -60,6 +60,7 @@ mapAliases {
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   inherit (pkgs) cordova; # added 2023-08-18
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index abb336280282..0811c5e9a6fc 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -35,7 +35,6 @@
   conventional-changelog-cli = "conventional-changelog";
   cpy-cli = "cpy";
   diff2html-cli = "diff2html";
-  dockerfile-language-server-nodejs = "docker-langserver";
   fast-cli = "fast";
   fauna-shell = "fauna";
   fkill-cli = "fkill";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..78d574f83923 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -105,7 +105,6 @@
 , "dhcp"
 , "diagnostic-languageserver"
 , "diff2html-cli"
-, "dockerfile-language-server-nodejs"
 , "dotenv-cli"
 , "dotenv-vault"
 , "elasticdump"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..074a8f07be9a 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -81436,38 +81436,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
-    name = "dockerfile-language-server-nodejs";
-    packageName = "dockerfile-language-server-nodejs";
-    version = "0.10.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.10.2.tgz";
-      sha512 = "vLbaeYv4h3XEzrZ9JOhP6bD1eLzbzGzFFF03F3Ofd6kh9PU2aGBS/LVjd/w1omCyNV2LHviFX0ZGHINmWsZYyw==";
-    };
-    dependencies = [
-      sources."dockerfile-ast-0.5.0"
-      sources."dockerfile-language-service-0.10.2"
-      sources."dockerfile-utils-0.11.0"
-      sources."vscode-jsonrpc-8.1.0"
-      sources."vscode-languageserver-8.1.0"
-      (sources."vscode-languageserver-protocol-3.17.3" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.17.3"
-        ];
-      })
-      sources."vscode-languageserver-textdocument-1.0.10"
-      sources."vscode-languageserver-types-3.17.0-next.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies.";
-      homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   dotenv-cli = nodeEnv.buildNodePackage {
     name = "dotenv-cli";
     packageName = "dotenv-cli";
diff --git a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
new file mode 100644
index 000000000000..899efd605e20
--- /dev/null
+++ b/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "dockerfile-language-server-nodejs";
+  version = "0.10.2";
+
+  src = fetchFromGitHub {
+    owner = "rcjsuen";
+    repo = "dockerfile-language-server-nodejs";
+    rev = "v${version}";
+    hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA=";
+  };
+
+  npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s=";
+
+  meta = {
+    changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md";
+    description = "A language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies";
+    homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs";
+    license = lib.licenses.mit;
+    mainProgram = "docker-langserver";
+    maintainers = with lib.maintainers; [ rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf075..52f6fddd0305 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18507,6 +18507,8 @@ with pkgs;
 
   docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { };
 
+  dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { };
+
   dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { };
 
   emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };

From c55e6297416c125f9926b90eef03d97c66cfe5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 2 Sep 2023 19:53:38 -0700
Subject: [PATCH 13/32] nodePackages.@squoosh/cli: drop

It is broken and was abandoned upstream:
https://github.com/GoogleChromeLabs/squoosh/issues/1033
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/main-programs.nix           |  1 -
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 56 -------------------
 4 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..34fc736ed12d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -89,6 +89,7 @@ mapAliases {
   inherit (pkgs) rtlcss; # added 2023-08-29
   s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
   inherit (pkgs) snyk; # Added 2023-08-30
+  "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
   ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
   stf = throw "stf was removed because it was broken"; # added 2023-08-21
   thelounge = pkgs.thelounge; # Added 2023-05-22
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index abb336280282..3584288e509d 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -4,7 +4,6 @@
   "@antfu/ni" = "ni";
   "@electron-forge/cli" = "electron-forge";
   "@microsoft/rush" = "rush";
-  "@squoosh/cli" = "squoosh-cli";
   "@webassemblyjs/cli-1.11.1" = "wasm2wast";
   coffee-script = "coffee";
   "@withgraphite/graphite-cli" = "gt";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..1de4b5f3a19c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -10,7 +10,6 @@
 , "@microsoft/rush"
 , "@nerdwallet/shepherd"
 , "@shopify/cli"
-, "@squoosh/cli"
 , "@tailwindcss/aspect-ratio"
 , "@tailwindcss/forms"
 , "@tailwindcss/language-server"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..f8f2b9fd73da 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -72272,62 +72272,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@squoosh/cli" = nodeEnv.buildNodePackage {
-    name = "_at_squoosh_slash_cli";
-    packageName = "@squoosh/cli";
-    version = "0.7.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.3.tgz";
-      sha512 = "mU/iWbVWqLXX+gJJa4RBl5U4LdKYaiD9cmxW7bjyw8EEFAuMXFDGAQcq7hEvUZwoP5Em5s7sjimBPirSBJQ87g==";
-    };
-    dependencies = [
-      sources."@squoosh/lib-0.4.1"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."buffer-5.7.1"
-      sources."chalk-4.1.2"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.0"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-7.2.0"
-      sources."defaults-1.0.4"
-      sources."has-flag-4.0.0"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.4"
-      sources."is-interactive-1.0.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."json5-2.2.3"
-      sources."kleur-4.1.5"
-      sources."log-symbols-4.1.0"
-      sources."mimic-fn-2.1.0"
-      sources."onetime-5.1.2"
-      sources."ora-5.4.1"
-      sources."readable-stream-3.6.2"
-      sources."restore-cursor-3.1.0"
-      sources."safe-buffer-5.2.1"
-      sources."signal-exit-3.0.7"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."util-deprecate-1.0.2"
-      sources."wasm-feature-detect-1.5.1"
-      sources."wcwidth-1.0.1"
-      sources."web-streams-polyfill-3.2.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A CLI for Squoosh";
-      homepage = "https://github.com/GoogleChromeLabs/squoosh";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@tailwindcss/aspect-ratio" = nodeEnv.buildNodePackage {
     name = "_at_tailwindcss_slash_aspect-ratio";
     packageName = "@tailwindcss/aspect-ratio";

From 262f18e13ccd414e8fde7921a1ee0747e379b715 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 3 Sep 2023 04:20:00 +0000
Subject: [PATCH 14/32] tflint-plugins.tflint-ruleset-aws: 0.23.1 -> 0.26.0

Diff: https://github.com/terraform-linters/tflint-ruleset-aws/compare/v0.23.1...v0.26.0

Changelog: https://github.com/terraform-linters/tflint-ruleset-aws/blob/v0.26.0/CHANGELOG.md
---
 .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 4f528ebb53b7..4f1dadfbf760 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tflint-ruleset-aws";
-  version = "0.23.1";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-lvqWCTzb/07pEnNcrKkWumO17WXCFrDnNlw4LySl3Rs=";
+    hash = "sha256-SKPmD34a11ynNmnD2cDTSXgRpUZ7tukaGRO8PQY6T5s=";
   };
 
-  vendorHash = "sha256-RFgLAOQhSqpuXT5Jypk4EVk4hgyHlUfhbZUM4rA9pLU=";
+  vendorHash = "sha256-JhAAyfDVRZS2QyvXNa61srlZKgsBFeKloeKbcXXpytk=";
 
   # upstream Makefile also does a  go test $(go list ./... | grep -v integration)
   preCheck = ''

From 814ebba0d45f7f5f6dabfb10b8c75ae8cb44c3f6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 3 Sep 2023 04:20:00 +0000
Subject: [PATCH 15/32] atlas: 0.13.3 -> 0.14.0

Diff: https://github.com/ariga/atlas/compare/v0.13.3...v0.14.0

Changelog: https://github.com/ariga/atlas/releases/tag/v0.14.0
---
 pkgs/development/tools/database/atlas/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix
index f17313ec3a0c..ee5d4f89d63e 100644
--- a/pkgs/development/tools/database/atlas/default.nix
+++ b/pkgs/development/tools/database/atlas/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "atlas";
-  version = "0.13.3";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     rev = "v${version}";
-    hash = "sha256-mnLrmsKFDpjTHyOgOeL/YsWcTfbKgv/M+phJSMFQReU=";
+    hash = "sha256-6Y6b8BBfCErbKJqhR7zhltbysibUlY7KAyZe7g5mRxQ=";
   };
 
   modRoot = "cmd/atlas";
 
-  vendorHash = "sha256-Xi0N3lU/gqmkqJcJeQqkKr0rcbad6cIclhq4t6DCTZI=";
+  vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6a10d0ba54806012047e7e4ee2caf6416ab303d6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 3 Sep 2023 04:20:00 +0000
Subject: [PATCH 16/32] tflint: 0.47.0 -> 0.48.0

Diff: https://github.com/terraform-linters/tflint/compare/v0.47.0...v0.48.0

Changelog: https://github.com/terraform-linters/tflint/blob/v0.48.0/CHANGELOG.md
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index d84f0557cc11..4924e190251d 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.47.0";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-YKsX+dAnVRiD48CRHaXzUzfqsqpi/bWHNH9lqzC/TZQ=";
+    hash = "sha256-QU3nSq13klBoa3+czvdlrNwtG0iQqoC/hcbTHr5KN14=";
   };
 
-  vendorHash = "sha256-dgK7o2DJUwAynfekrn6mN8IVxCpJa9b+kiYMQSo0RIg=";
+  vendorHash = "sha256-yWxBiOPB0z3+bd6f+LalfVYYoV04scnl3YXJkaTo/dk=";
 
   doCheck = false;
 

From 7441c5def57bd97b55747d76f92906f1f44e1558 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 12:36:25 +0200
Subject: [PATCH 17/32] metasploit: 6.3.31 -> 6.3.32

---
 pkgs/tools/security/metasploit/Gemfile      | 2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 8 ++++----
 pkgs/tools/security/metasploit/default.nix  | 4 ++--
 pkgs/tools/security/metasploit/gemset.nix   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index f62588de9e48..7705961e5b1a 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.31"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.32"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index f608b1b2fd48..c3be1dbeb83d 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: a97e8a0e2a3b15f3b3710f04def1178139ae0fa2
-  ref: refs/tags/6.3.31
+  revision: d644909dcaa8814f9d8ef53d18bf7fa63d197897
+  ref: refs/tags/6.3.32
   specs:
-    metasploit-framework (6.3.31)
+    metasploit-framework (6.3.32)
       actionpack (~> 7.0)
       activerecord (~> 7.0)
       activesupport (~> 7.0)
@@ -462,4 +462,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   2.4.17
+   2.4.19
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 9cfc107eceef..402a977db21e 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.3.31";
+  version = "6.3.32";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-X0QJ4edzqLh01qAhmpcdiuk8xdAkccoJAZmxeTh3q48=";
+    sha256 = "sha256-3aiHBaYxrpe/KSF2LiafcANIgWvZEp1kgRXry3/uWvY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index d713e28fc444..553a62f79628 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -654,12 +654,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "a97e8a0e2a3b15f3b3710f04def1178139ae0fa2";
-      sha256 = "13xbfww7kccr044wlw94s32krsca3nbrl8d0srsbia3kwzhhji2z";
+      rev = "d644909dcaa8814f9d8ef53d18bf7fa63d197897";
+      sha256 = "1xjsxrzwpsqmh5j9s4nrdf0lh0vhkwk2wxi156zrgbiilq2qga6x";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.3.31";
+    version = "6.3.32";
   };
   metasploit-model = {
     groups = ["default"];

From 765f546100c4bd714ffcd783af77ca13aff1bcbb Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 3 Sep 2023 08:58:49 -0400
Subject: [PATCH 18/32] complgen: 0.1.2 -> 0.1.3

Diff: https://github.com/adaszko/complgen/compare/v0.1.2...v0.1.3

Changelog: https://github.com/adaszko/complgen/blob/v0.1.3/CHANGELOG.md
---
 pkgs/development/tools/misc/complgen/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix
index bed4dae43f62..ac49d7446bab 100644
--- a/pkgs/development/tools/misc/complgen/default.nix
+++ b/pkgs/development/tools/misc/complgen/default.nix
@@ -5,16 +5,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "complgen";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
     rev = "v${version}";
-    hash = "sha256-x6r6sLdPIpf1mLRu8gT94fGoaCtnjpUIlEbMt6uSBR8=";
+    hash = "sha256-YKJleWnUZodPuJcWX8w06PH6q1SzeUXL8AjYr9i7+sY=";
   };
 
-  cargoHash = "sha256-jljrT8OymXx8OKxWU3rE52Nw5Fw9XFmgXaOMxdzMTe4=";
+  cargoHash = "sha256-ytwhIcm4NeHDRzKNHaxo4ke+gridXKmiKHkPnACXV8o=";
+
+  # Cargo.lock is outdated
+  postConfigure = ''
+    cargo metadata --offline
+  '';
 
   meta = with lib; {
     description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";

From 28ff9fc5282b8c565b35f07ee21c57271520edf7 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 3 Sep 2023 18:22:07 +0200
Subject: [PATCH 19/32] i3status-rust: 0.32.0 -> 0.32.1

https://github.com/greshake/i3status-rust/releases/tag/v0.32.1
---
 pkgs/applications/window-managers/i3/status-rust.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 8988aef12bac..e7aeaa3758f6 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "i3status-rust";
-  version = "0.32.0";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
+    hash = "sha256-F09gIDByRIJENwbzUb2IlWkyXjva0b7ivORgXotL/20=";
   };
 
-  cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
+  cargoHash = "sha256-D0XGH6b6dJrgLnFUViRAl9+AhnR2Bt4J2hDXUyJhOyg=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

From 8c9f272219be1a3c15a3929ca526675e0b323996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 13:31:31 -0700
Subject: [PATCH 20/32] dl-librescore: init at 0.34.47

---
 pkgs/tools/audio/dl-librescore/default.nix | 44 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/tools/audio/dl-librescore/default.nix

diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix
new file mode 100644
index 000000000000..5e8306f21228
--- /dev/null
+++ b/pkgs/tools/audio/dl-librescore/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, darwin
+}:
+
+buildNpmPackage rec {
+  pname = "dl-librescore";
+  version = "0.34.47";
+
+  src = fetchFromGitHub {
+    owner = "LibreScore";
+    repo = "dl-librescore";
+    rev = "v${version}";
+    hash = "sha256-yXreyQiIKmZEw2HcpnCW4TxCTHzdq+KuPSlFPFZy2oU=";
+  };
+
+  npmDepsHash = "sha256-qKu7xViApKg/4EubS4tsZEtNoW62rpC4e6xmBugSkek=";
+
+  # see https://github.com/LibreScore/dl-librescore/pull/32
+  # TODO can be removed with next update
+  postPatch = ''
+    substituteInPlace package-lock.json \
+      --replace 50c7a1508cd9358757c30794e14ba777e6faa8aa b4cb32eb1734a2f73ba2d92743647b1a91c0e2a8
+  '';
+
+  makeCacheWritable = true;
+
+  nativeBuildInputs = [
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.cctools
+  ];
+
+  meta = {
+    description = "Download sheet music";
+    homepage = "https://github.com/LibreScore/dl-librescore";
+    license = lib.licenses.mit;
+    mainProgram = "dl-librescore";
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4faf66e946a4..0d4b7eb99363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3670,6 +3670,8 @@ with pkgs;
 
   dkimpy = with python3Packages; toPythonApplication dkimpy;
 
+  dl-librescore = callPackage ../tools/audio/dl-librescore { };
+
   dontgo403 = callPackage ../tools/security/dontgo403 { };
 
   dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };

From df688627b5fa0e245828fbb391bc3d9e66b28ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 13:32:54 -0700
Subject: [PATCH 21/32] nodePackages.musescore-downloader: make alias of
 dl-librescore

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 84 -------------------
 3 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index e3ff0d15396a..573bbbae364c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -79,6 +79,7 @@ mapAliases {
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
+  musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
   node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
   reveal-md = pkgs.reveal-md; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c715380e4f2a..d8d662a3d1d3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -192,7 +192,6 @@
 , "meat"
 , "mocha"
 , "multi-file-swagger"
-, "musescore-downloader"
 , "near-cli"
 , "neovim"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 845812fdad5e..67bae646ac62 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -99336,90 +99336,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  musescore-downloader = nodeEnv.buildNodePackage {
-    name = "musescore-downloader";
-    packageName = "musescore-downloader";
-    version = "0.26.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.26.0.tgz";
-      sha512 = "AHA5wSaEJLwfEEQDl8kLfin7l4uejXYTzWtn/BgUiyWKw4AbuUK2/xfDmULW2KxUfsK2RoLl0bFtIvdvvm4CNA==";
-    };
-    dependencies = [
-      sources."@librescore/fonts-0.4.1"
-      sources."@librescore/sf3-0.3.0"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."buffer-5.7.1"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.0"
-      sources."cli-width-3.0.0"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."defaults-1.0.4"
-      sources."detect-node-2.1.0"
-      sources."emoji-regex-8.0.0"
-      (sources."encoding-0.1.13" // {
-        dependencies = [
-          sources."iconv-lite-0.6.3"
-        ];
-      })
-      sources."escape-string-regexp-1.0.5"
-      sources."external-editor-3.1.0"
-      sources."figures-3.2.0"
-      sources."has-flag-4.0.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.4"
-      sources."inquirer-7.3.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-interactive-1.0.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."lodash-4.17.21"
-      sources."log-symbols-4.1.0"
-      sources."mimic-fn-2.1.0"
-      sources."mute-stream-0.0.8"
-      sources."node-fetch-2.6.13"
-      sources."onetime-5.1.2"
-      sources."ora-5.4.1"
-      sources."os-tmpdir-1.0.2"
-      sources."readable-stream-3.6.2"
-      sources."restore-cursor-3.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."signal-exit-3.0.7"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."type-fest-0.21.3"
-      sources."util-deprecate-1.0.2"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."webmscore-0.18.0"
-      sources."whatwg-url-5.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "download sheet music from musescore.com for free, no login or Musescore Pro required | 免登录、免 Musescore Pro，免费下载 musescore.com 上的曲谱";
-      homepage = "https://github.com/Xmader/musescore-downloader#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   near-cli = nodeEnv.buildNodePackage {
     name = "near-cli";
     packageName = "near-cli";

From de7b43c66c31e220097be417839a96b9c9968661 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 3 Sep 2023 14:00:06 -0400
Subject: [PATCH 22/32] cargo-expand: 1.0.66 -> 1.0.67

Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.66...1.0.67

Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.67
---
 pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index ba28e3fcd678..d8d568b358a9 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.66";
+  version = "1.0.67";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "sha256-nkE8N0O+aBJPNPGjsp55KnpkaQum11InYHks/Pae+A0=";
+    sha256 = "sha256-l8cEtDb6FlYMqxJyxKxyuwjvLJdefiPRmDnVzRydFPM=";
   };
 
-  cargoHash = "sha256-To36pZW6AkV5HLhYJ0Wke7q9JYgguTBWYehitLJVY6w=";
+  cargoHash = "sha256-IWPd4gG4vI7peXxn4ti93fJeHfJoSxEr0+EKEJWw+IE=";
 
   meta = with lib; {
     description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

From d5447edb4005291b9bf80d916044e7a5197ceadf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 20:03:21 +0200
Subject: [PATCH 23/32] python311Packages.bleak: 0.20.2 -> 0.21.0

Diff: https://github.com/hbldh/bleak/compare/refs/tags/v0.20.2...v0.21.0

Changelog: https://github.com/hbldh/bleak/blob/v0.21.0/CHANGELOG.rst
---
 pkgs/development/python-modules/bleak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index dbe2364a9863..13b335d02617 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bleak";
-  version = "0.20.2";
+  version = "0.21.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "hbldh";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-hiQSsQHq1hoCQhoWU50i2NXYR/LaTHAize9cfr1uZsY=";
+    hash = "sha256-hnXBXm0BFNNzw563Ybr76KHiqt2sFqo0dtiRHGWsu3A=";
   };
 
   nativeBuildInputs = [

From 79a48bec1ed6198dbef98db0e1d37692f850a6fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 20:04:43 +0200
Subject: [PATCH 24/32] python311Packages.bleak-retry-connector: 3.1.1 -> 3.1.2

Diff: https://github.com/Bluetooth-Devices/bleak-retry-connector/compare/refs/tags/v3.1.1...v3.1.2

Changelog: https://github.com/bluetooth-devices/bleak-retry-connector/blob/v3.1.2/CHANGELOG.md
---
 .../python-modules/bleak-retry-connector/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 846684551480..401037eb3dd7 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bleak-retry-connector";
-  version = "3.1.1";
+  version = "3.1.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4=";
+    hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw=";
   };
 
   postPatch = ''

From 8a099ecda875326378ced659f4aaddc3d2bc38df Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 3 Sep 2023 14:48:07 -0400
Subject: [PATCH 25/32] star-history: 1.0.13 -> 1.0.14

Diff: https://diff.rs/star-history/1.0.13/1.0.14
---
 pkgs/tools/misc/star-history/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix
index 6c6ed54eec7e..a983834aa689 100644
--- a/pkgs/tools/misc/star-history/default.nix
+++ b/pkgs/tools/misc/star-history/default.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "star-history";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-WOdiBN/qyszAI4GNFB/RuZd9EV0uj9l5yUnryZ6cqSE=";
+    sha256 = "sha256-bdu0LLH6f5rLwzNw1wz0J9zEspYmAOlJYCWOdamWjyw=";
   };
 
-  cargoSha256 = "sha256-sET5Gf4vLJAvgdslT+bov9vzCKuTKCEJ0/+JR2GfhmY=";
+  cargoSha256 = "sha256-Z7zq93Orx7Mb2b9oZxAIPn6qObzYPGOx4N86naUvqtg=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 06095dd1850a9044e1a62bbe8adc0780853f170f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 16:07:23 -0700
Subject: [PATCH 26/32] hsd: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 65 -------------------
 pkgs/development/node-packages/overrides.nix  |  3 -
 pkgs/tools/misc/hsd/default.nix               | 42 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 45 insertions(+), 69 deletions(-)
 create mode 100644 pkgs/tools/misc/hsd/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22c..659da294d8dd 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -69,6 +69,7 @@ mapAliases {
   glob = pkgs.node-glob; # added 2023-08-18
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
+  inherit (pkgs) hsd; # added 2023-08-19
   inherit (pkgs) html-minifier; # added 2023-08-19
   inherit (pkgs) htmlhint; # added 2023-08-19
   hueadm = pkgs.hueadm; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e120..fc20a7e253eb 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -146,7 +146,6 @@
 , "gulp-cli"
 , "he"
 , "http-server"
-, "hsd"
 , "hs-airdrop"
 , "hs-client"
 , "ijavascript"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be10..07e1ada73e84 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -90929,71 +90929,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  hsd = nodeEnv.buildNodePackage {
-    name = "hsd";
-    packageName = "hsd";
-    version = "6.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hsd/-/hsd-6.0.0.tgz";
-      sha512 = "pl57FtFzrzL2jSsiOru/WvHLlhZuwM+wskme/d6S96tpj5kOmp8zJaNsZ9bpXZBIawtrM6+hZvRaNvE4pegbLg==";
-    };
-    dependencies = [
-      sources."bcfg-0.2.1"
-      (sources."bcrypto-5.4.0" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."bcurl-0.2.0"
-      sources."bdb-1.4.0"
-      sources."bdns-0.1.5"
-      sources."bevent-0.1.5"
-      sources."bfile-0.2.3"
-      (sources."bfilter-1.0.5" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."bheep-0.1.5"
-      sources."binet-0.3.7"
-      sources."blgr-0.2.0"
-      sources."blru-0.1.6"
-      sources."blst-0.1.5"
-      sources."bmutex-0.1.6"
-      (sources."bns-0.15.0" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."brq-0.1.8"
-      sources."bs32-0.1.6"
-      sources."bsert-0.0.12"
-      sources."bsock-0.1.9"
-      sources."bsocks-0.2.6"
-      sources."btcp-0.1.5"
-      sources."budp-0.1.6"
-      sources."buffer-map-0.0.7"
-      sources."bufio-1.2.0"
-      sources."bupnp-0.2.6"
-      sources."bval-0.1.8"
-      sources."bweb-0.2.0"
-      sources."goosig-0.10.0"
-      sources."loady-0.0.5"
-      sources."mrmr-0.1.10"
-      sources."n64-0.2.10"
-      sources."unbound-0.4.3"
-      sources."urkel-1.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Cryptocurrency bike-shed";
-      homepage = "https://github.com/handshake-org/hsd";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   hs-airdrop = nodeEnv.buildNodePackage {
     name = "hs-airdrop";
     packageName = "hs-airdrop";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 4b94a320362e..b6d6aa9e6e38 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -118,9 +118,6 @@ final: prev: {
     '';
   };
 
-  hsd = prev.hsd.override {
-    buildInputs = [ final.node-gyp-build pkgs.unbound ];
-  };
 
   ijavascript = prev.ijavascript.override (oldAttrs: {
     preRebuild = ''
diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix
new file mode 100644
index 000000000000..ebbba1de07d8
--- /dev/null
+++ b/pkgs/tools/misc/hsd/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, unbound
+, darwin
+}:
+
+buildNpmPackage rec {
+  pname = "hsd";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "handshake-org";
+    repo = "hsd";
+    rev = "v${version}";
+    hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo=";
+  };
+
+  npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc=";
+
+  nativeBuildInputs = [
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.cctools
+  ];
+
+  buildInputs = [
+    unbound
+  ];
+
+  dontNpmBuild = true;
+
+  meta = {
+    changelog = "https://github.com/handshake-org/hsd/blob/${src.rev}/CHANGELOG.md";
+    description = "Implementation of the Handshake protocol";
+    homepage = "https://github.com/handshake-org/hsd";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ d-xo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf075..b0f2a3212da0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1833,6 +1833,8 @@ with pkgs;
 
   hostmux = callPackage ../tools/misc/hostmux { };
 
+  hsd = callPackage ../tools/misc/hsd { };
+
   httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
 
   hyperpotamus = callPackage ../tools/misc/hyperpotamus { };

From f4c5b8747c85b4a8df0bf0f851e931ef55278161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 20 Aug 2023 14:02:00 -0700
Subject: [PATCH 27/32] nodePackages.hs-client: make alias of hsd

The former provides a subset of the executables of the latter.
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 25 -------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 659da294d8dd..01281902888a 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -69,6 +69,7 @@ mapAliases {
   glob = pkgs.node-glob; # added 2023-08-18
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
+  hs-client = pkgs.hsd; # added 2023-08-20
   inherit (pkgs) hsd; # added 2023-08-19
   inherit (pkgs) html-minifier; # added 2023-08-19
   inherit (pkgs) htmlhint; # added 2023-08-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index fc20a7e253eb..f28a56347cf9 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -147,7 +147,6 @@
 , "he"
 , "http-server"
 , "hs-airdrop"
-, "hs-client"
 , "ijavascript"
 , "inliner"
 , "imapnotify"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 07e1ada73e84..1578cf69c68f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -90956,31 +90956,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  hs-client = nodeEnv.buildNodePackage {
-    name = "hs-client";
-    packageName = "hs-client";
-    version = "6.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hs-client/-/hs-client-6.0.0.tgz";
-      sha512 = "zjAOSyMeDtzGpOmIg+GPgZ+D/3CHtswSSn0C1CJUcHL3goPr9Tmc5ZpBxQeFkwkAys3RADWPfxiWNcL8nvDCtQ==";
-    };
-    dependencies = [
-      sources."bcfg-0.2.1"
-      sources."bcurl-0.2.0"
-      sources."brq-0.1.8"
-      sources."bsert-0.0.12"
-      sources."bsock-0.1.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "HSD node and wallet client";
-      homepage = "https://github.com/handshake-org/hsd";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   ijavascript = nodeEnv.buildNodePackage {
     name = "ijavascript";
     packageName = "ijavascript";

From fbe9753456c935aea340bed1fe1f893d1658f953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 18 Aug 2023 16:23:31 -0700
Subject: [PATCH 28/32] degit: use buildNpmPackage

---
 .../version-management/degit/default.nix      | 26 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -------------
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/applications/version-management/degit/default.nix

diff --git a/pkgs/applications/version-management/degit/default.nix b/pkgs/applications/version-management/degit/default.nix
new file mode 100644
index 000000000000..af586da3496a
--- /dev/null
+++ b/pkgs/applications/version-management/degit/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "degit";
+  version = "2.8.4";
+
+  src = fetchFromGitHub {
+    owner = "Rich-Harris";
+    repo = "degit";
+    rev = "v${version}";
+    hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
+  };
+
+  npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw=";
+
+  meta = {
+    changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md";
+    description = "Make copies of git repositories";
+    homepage = "https://github.com/Rich-Harris/degit";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kidonng ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 886df77bddf0..dd521344f1ba 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -60,6 +60,7 @@ mapAliases {
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   inherit (pkgs) cordova; # added 2023-08-18
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) degit; # added 2023-08-18
   inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9591d511dce4..deea04cf5ace 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -101,7 +101,6 @@
 , "create-react-native-app"
 , "cspell"
 , "csslint"
-, "degit"
 , "dhcp"
 , "diagnostic-languageserver"
 , "diff2html-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index dde0a6ae7759..f40f7350304a 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -81217,24 +81217,6 @@ 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6699c1004d45..fde18e7a8b1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2158,6 +2158,8 @@ with pkgs;
 
   darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
 
+  degit = callPackage ../applications/version-management/degit { };
+
   delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
 
   diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };

From a86bf765a99243a47f8f7af2932c148527f262d9 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 3 Sep 2023 15:37:59 -0400
Subject: [PATCH 29/32] slingshot: 0.2.3 -> 0.3.0

Diff: https://github.com/caio-ishikawa/slingshot/compare/v0.2.3...v0.3.0

Changelog: https://github.com/caio-ishikawa/slingshot/releases/tag/v0.3.0
---
 pkgs/tools/misc/slingshot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/slingshot/default.nix b/pkgs/tools/misc/slingshot/default.nix
index 48ea7f24c040..1cf9fe854c3d 100644
--- a/pkgs/tools/misc/slingshot/default.nix
+++ b/pkgs/tools/misc/slingshot/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slingshot";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "caio-ishikawa";
     repo = "slingshot";
     rev = "v${version}";
-    hash = "sha256-PbcpvSBYoRs8TMkbbQjG284BWr+PSaTStPOg4a1GIrw=";
+    hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA=";
   };
 
-  cargoHash = "sha256-Y0H88paBe2yyUyTdwxXO58YFDdH04kK+nHvi1qyYVF0=";
+  cargoHash = "sha256-NZyO6oXmgTUszp2Vc9iVAnCvM78/BJ8IfpeTrsOMvlo=";
 
   meta = with lib; {
     description = "Lightweight command line tool to quickly navigate across folders";

From 44a43142ef57e8551daca3ef8c594b0db091d97d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 22:31:23 +0200
Subject: [PATCH 30/32] python311Packages.hahomematic: 2023.8.14 -> 2023.9.0

Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.8.14...2023.9.0

Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.9.0
---
 pkgs/development/python-modules/hahomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 9aa76821650b..c1bcfbc33899 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2023.8.14";
+  version = "2023.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE=";
+    hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk=";
   };
 
   nativeBuildInputs = [

From 467c3fc9c83f0b709166335f00f18c799b1848fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 22:32:43 +0200
Subject: [PATCH 31/32] python311Packages.peaqevcore: 19.2.1 -> 19.3.2

Changelog: https://github.com/elden1337/peaqev-core/releases/tag/19.3.2
---
 pkgs/development/python-modules/peaqevcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index b759ccfae4f8..6a2cb70d4179 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "19.2.1";
+  version = "19.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4HLRZSxeRqpe8xutu5sGO63LAStx+3OgkQ1qPH1CUDY=";
+    hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM=";
   };
 
   postPatch = ''

From 0c136c38a54fdcb01c3ddf1ce8eb0061eea6dc49 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 3 Sep 2023 23:11:49 +0200
Subject: [PATCH 32/32] broot: 1.25.0 -> 1.25.1

https://github.com/Canop/broot/releases/tag/v1.25.1
---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 8c9994e479db..16222050f30a 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.25.0";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-TLphJr1DhJ30Mu3x3/9pNe1IiI9prafFMg1dDtbgqlE=";
+    hash = "sha256-CgWng5b0w6LGt2m9bx3IVMxOXwqYjgsIddTQdBnN/IY=";
   };
 
-  cargoHash = "sha256-dtNy3rWz6hMkatiV4z2gB4Z00gjtzREqjy7E48tmcdk=";
+  cargoHash = "sha256-xcUDg2vfGq4nmdbN6kFfWwbwaH/WqdLpIO0qrvQ7/t4=";
 
   nativeBuildInputs = [
     installShellFiles