From 60b5f837cac1c5a7f3fac221bf50191bbfac01f6 Mon Sep 17 00:00:00 2001
From: Austin Butler <abutler@riotgames.com>
Date: Tue, 8 Feb 2022 17:33:53 -0800
Subject: [PATCH 01/67] mysql80: fix build on Darwin

---
 pkgs/servers/sql/mysql/8.0.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index ae2e170379df..f897e018d693 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -20,6 +20,8 @@ self = stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
     substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+    substituteInPlace cmake/fido2.cmake \
+    --replace ''$\{MY_PKG_CONFIG_EXECUTABLE\} "${pkg-config}/bin/pkg-config"
   '';
 
   buildInputs = [

From 6d8efcd75a5144cefc10bba222dcd3a341b527e9 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Fri, 4 Mar 2022 22:37:21 +0100
Subject: [PATCH 02/67] pmacct: 1.7.6 -> 1.7.7

---
 pkgs/tools/networking/pmacct/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
index 86f1af029df0..32b800521e16 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -11,19 +11,21 @@
 , withNflog ? true, libnetfilter_log
 , withSQLite ? true, sqlite
 , withPgSQL ? true, postgresql
-, withMysql ? true, libmysqlclient, zlib
+, withMysql ? true, libmysqlclient, zlib, numactl
 , gnutlsSupport ? false, gnutls
+, testVersion
+, pmacct
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.6";
+  version = "1.7.7";
   pname = "pmacct";
 
   src = fetchFromGitHub {
     owner = "pmacct";
     repo = "pmacct";
     rev = "v${version}";
-    sha256 = "0x1i75hwz44siqvn4i58jgji0zwrqgn6ayv89s9m9nh3b423nsiv";
+    sha256 = "1pjaa44qj3y5dfwsd1a9r7a4riy7afza8phx2npcsyyarssxc63w";
   };
 
   nativeBuildInputs = [
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional withNflog libnetfilter_log
   ++ lib.optional withSQLite sqlite
   ++ lib.optional withPgSQL postgresql
-  ++ lib.optionals withMysql [ libmysqlclient zlib ]
+  ++ lib.optionals withMysql [ libmysqlclient zlib numactl ]
   ++ lib.optional gnutlsSupport gnutls;
 
   MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config";
@@ -52,6 +54,10 @@ stdenv.mkDerivation rec {
   ++ lib.optional withMysql "--enable-mysql"
   ++ lib.optional gnutlsSupport "--enable-gnutls";
 
+  passthru.tests = {
+    version = testVersion { package = pmacct; command = "pmacct -V"; };
+  };
+
   meta = with lib; {
     description = "A small set of multi-purpose passive network monitoring tools";
     longDescription = ''
@@ -59,6 +65,7 @@ stdenv.mkDerivation rec {
       [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
     '';
     homepage = "http://www.pmacct.net/";
+    changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog";
     license = licenses.gpl2;
     maintainers = with maintainers; [ _0x4A6F ];
     platforms = platforms.unix;

From f62dfc83ae3d253b45bbabe58b40caaf2bec179e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Mar 2022 21:45:46 +0000
Subject: [PATCH 03/67] yad: 10.1 -> 11.0

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

diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index 3e5ba0c5f492..7db1d1d1212a 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yad";
-  version = "10.1";
+  version = "11.0";
 
   src = fetchFromGitHub {
     owner = "v1cont";
     repo = "yad";
     rev = "v${version}";
-    sha256 = "sha256-k41Z3QVGm7JUR1ny0vJKLxakabK9Da5qCnrPUHvAkWE=";
+    sha256 = "sha256-I+3euq3qel9VCDVf0Bd4XdMOCt+g/CYlnnje50lbRr8=";
   };
 
   configureFlags = [

From b400ae822bdbcebede1e3736a79cf354d84caaae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Mar 2022 16:12:30 +0000
Subject: [PATCH 04/67] regbot: 0.3.10 -> 0.4.0

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

diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix
index f54e6ca26a87..e046b5b0029f 100644
--- a/pkgs/development/tools/regclient/default.nix
+++ b/pkgs/development/tools/regclient/default.nix
@@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in
 
 buildGoModule rec {
   pname = "regclient";
-  version = "0.3.10";
+  version = "0.4.0";
   tag = "v${version}";
 
   src = fetchFromGitHub {
     owner = "regclient";
     repo = "regclient";
     rev = tag;
-    sha256 = "sha256-3nYVhKHNz0V0j6JlZ5Dm5TFWA2kmUhshNVUym/QWSyM=";
+    sha256 = "sha256-AaSl++/i00YAvmvaUSEwLLpItYACtmWEFTuUngl7rkI=";
   };
-  vendorSha256 = "sha256-rj4sQ8Ci2KMayJNXn+KVihOiZehk233l48Ps0yjOOE4=";
+  vendorSha256 = "sha256-qpZ3RsBOkWqLCDK11vBGkAZJBC7T8hmpmm4ccGeWBus=";
 
   outputs = [ "out" ] ++ bins;
 

From d5480e41a41b3a4337f44864b897e6e3dfbb53b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Mar 2022 20:23:02 +0000
Subject: [PATCH 05/67] wob: 0.12 -> 0.13

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

diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix
index 7f5b7b61c628..5434132cd3d3 100644
--- a/pkgs/tools/wayland/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wob";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "francma";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gVQqZbz6ylBBlmhSgyaSEvAyMi48QiuviwZodPVGJxI=";
+    sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

From 7af502587d506d208ff10818624d4c188a5168d9 Mon Sep 17 00:00:00 2001
From: Daniel Albert <git@esclear.de>
Date: Sun, 6 Mar 2022 21:18:23 +0100
Subject: [PATCH 06/67] swaysome: init at 1.1.2

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

diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix
new file mode 100644
index 000000000000..65c0f3af65cd
--- /dev/null
+++ b/pkgs/tools/wayland/swaysome/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, rustPlatform
+, fetchFromGitLab
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "swaysome";
+  version = "1.1.2";
+
+  src = fetchFromGitLab {
+    owner = "hyask";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-eX2Pzn5It4yf94ZWH/7yAJjwpayVYvpvbrvk7qvbimg=";
+  };
+
+  cargoSha256 = "sha256-WXjmXwqeWnQVyFs51t81kHHMMn9HQQjBRw1g1cU+6/M=";
+
+  meta = with lib; {
+    description = "Helper to make sway behave more like awesomewm";
+    homepage = "https://gitlab.com/hyask/swaysome";
+    license = licenses.mit;
+    maintainers = with maintainers; [ esclear ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 111f3c81dad7..b0b821d88e20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2687,6 +2687,8 @@ with pkgs;
 
   swayr = callPackage ../tools/wayland/swayr { };
 
+  swaysome = callPackage ../tools/wayland/swaysome { };
+
   swaytools = callPackage ../tools/wayland/swaytools { };
 
   wayland-utils = callPackage ../tools/wayland/wayland-utils { };

From 1755bbc4c64171ec0bf3901ee8dff9aaf4c427f0 Mon Sep 17 00:00:00 2001
From: Lin Yinfeng <lin.yinfeng@outlook.com>
Date: Sun, 3 Apr 2022 21:59:33 +0800
Subject: [PATCH 07/67] godns: 2.7.1 -> 2.7.3

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

diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix
index 0e026e5d571c..fba6b903365a 100644
--- a/pkgs/tools/networking/godns/default.nix
+++ b/pkgs/tools/networking/godns/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "godns";
-  version = "2.7.1";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "godns";
     rev = "v${version}";
-    sha256 = "sha256-4PkG8u0wYHHFWR9s4s08tkeBbXdxTUv48HRZsSraNak=";
+    sha256 = "sha256-4QWcccJHvytZmWZJnPcI8W6pQCWgXz0FkTe8sX54Cbk=";
   };
 
   vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";

From 5029f4bfef4efe509eee665da910607640e4f078 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 4 Apr 2022 12:04:29 +0800
Subject: [PATCH 08/67] gnome.gnome-boxes: fix typelib path

We patch gobject-introspection and meson to store absolute paths to
libraries in typelibs but that requires the install_dir is an absolute path.
---
 .../gnome/apps/gnome-boxes/default.nix        |  7 ++++++
 .../apps/gnome-boxes/fix-gir-lib-path.patch   | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch

diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 7853a80f073d..e88a831821e0 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -62,6 +62,13 @@ stdenv.mkDerivation rec {
     sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM=";
   };
 
+  patches = [
+    # Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option)
+    # in the gir file. We patch gobject-introspection to hardcode absolute paths but
+    # our Meson patch will only pass the info when install_dir is absolute as well.
+    ./fix-gir-lib-path.patch
+  ];
+
   doCheck = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
new file mode 100644
index 000000000000..6b0ba4732997
--- /dev/null
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
@@ -0,0 +1,22 @@
+--- a/subprojects/libovf-glib/govf/meson.build
++++ b/subprojects/libovf-glib/govf/meson.build
+@@ -39,7 +39,7 @@ govf_lib = shared_library('govf-' + api_version,
+   govf_sources,
+   dependencies: govf_deps,
+   install: true,
+-  install_dir: libdir
++  install_dir: get_option ('prefix') / libdir
+ )
+ 
+ govf_dep = declare_dependency(
+--- a/subprojects/gtk-frdp/src/meson.build
++++ b/subprojects/gtk-frdp/src/meson.build
+@@ -50,7 +50,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version,
+   gtk_frdp_sources,
+   dependencies: gtk_frdp_deps,
+   install: true,
+-  install_dir: libdir
++  install_dir: get_option ('prefix') / libdir
+ )
+ 
+ gtk_frdp_dep = declare_dependency(

From 45b21e33b7d95d682384fc29ca133173a351f2e2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 5 Apr 2022 02:50:59 +0000
Subject: [PATCH 09/67] =?UTF-8?q?gnome.hitori:=203.38.3=20=E2=86=92=203.38?=
 =?UTF-8?q?.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/hitori/-/compare/3.38.3...3.38.4
---
 pkgs/desktops/gnome/games/hitori/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix
index bb210c2fffb1..c17ca56044e4 100644
--- a/pkgs/desktops/gnome/games/hitori/default.nix
+++ b/pkgs/desktops/gnome/games/hitori/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -15,27 +14,17 @@
 , gettext
 , itstool
 , desktop-file-utils
-, adwaita-icon-theme
 }:
 
 stdenv.mkDerivation rec {
   pname = "hitori";
-  version = "3.38.3";
+  version = "3.38.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk=";
+    sha256 = "iZPMkfuSN4jjieA+wqp4dtFcErrZIEz2Wy/6DtOSL30=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # data/meson.build:3:0: ERROR: Function does not take positional arguments.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch";
-      sha256 = "LwBpFFr+vLacLTpto7PwvO1p2lku6epyEv9YZvUvW+g=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -52,7 +41,6 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     cairo
-    adwaita-icon-theme
   ];
 
   postPatch = ''

From 6eb00a41a0850e10e6a12021332a147dd97578a5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 6 Apr 2022 11:03:07 +0300
Subject: [PATCH 10/67] rustfmt: actually fix the failing test

It only runs on nightly, but the next commits will show
why this is useful.
---
 .../compilers/rust/rustfmt-fix-self-tests.patch     | 13 +++++++++++++
 pkgs/development/compilers/rust/rustfmt.nix         |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch

diff --git a/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch
new file mode 100644
index 000000000000..b60332daef44
--- /dev/null
+++ b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch
@@ -0,0 +1,13 @@
+--- a/src/tools/rustfmt/src/ignore_path.rs
++++ b/src/tools/rustfmt/src/ignore_path.rs
+@@ -37,9 +37,9 @@
+     #[nightly_only_test]
+     #[test]
+     fn test_ignore_path_set() {
+-        use std::path::{Path, PathBuf};
+         use crate::config::{Config, FileName};
+         use crate::ignore_path::IgnorePathSet;
++        use std::path::{Path, PathBuf};
+ 
+         let config =
+             Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap();
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index f8ac8bf39df3..9922d60ef705 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
   CFG_RELEASE = rustPlatform.rust.rustc.version;
   CFG_RELEASE_CHANNEL = "stable";
 
+  # FIXME: seems fixed upstream, remove after the next update
+  patches = [ ./rustfmt-fix-self-tests.patch ];
+
   meta = with lib; {
     description = "A tool for formatting Rust code according to style guidelines";
     homepage = "https://github.com/rust-lang-nursery/rustfmt";

From ddef8a68cb5e49323dbb293fd34b079cfa1f8b7a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 6 Apr 2022 11:03:37 +0300
Subject: [PATCH 11/67] rustfmt: allow building as nightly

This is used by bindgen, and may be useful for other projects
as well, as rustfmt disables many features when built as stable.
---
 pkgs/development/compilers/rust/default.nix | 1 +
 pkgs/development/compilers/rust/rustfmt.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 6dfc8a49063f..82579db0e47a 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -77,6 +77,7 @@ in
         pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
       });
       rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
+      rustfmt-nightly = self.callPackage ./rustfmt.nix { inherit Security; asNightly = true; };
       cargo = self.callPackage ./cargo.nix {
         # Use boot package set to break cycle
         rustPlatform = bootRustPlatform;
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 9922d60ef705..5916b6c07fb5 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, rustPlatform, Security }:
+{ lib, stdenv, rustPlatform, Security, asNightly ? false }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "rustfmt";
+  pname = "rustfmt" + lib.optionalString asNightly "-nightly";
   inherit (rustPlatform.rust.rustc) version src;
 
   # the rust source tarball already has all the dependencies vendored, no need to fetch them again
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   # As of rustc 1.45.0, these env vars are required to build rustfmt (due to
   # https://github.com/rust-lang/rust/pull/72001)
   CFG_RELEASE = rustPlatform.rust.rustc.version;
-  CFG_RELEASE_CHANNEL = "stable";
+  CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
 
   # FIXME: seems fixed upstream, remove after the next update
   patches = [ ./rustfmt-fix-self-tests.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 227cdccaec1f..851c26182130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13471,7 +13471,10 @@ with pkgs;
   rhack = callPackage ../development/tools/rust/rhack { };
   inherit (rustPackages) rls;
   roogle = callPackage ../development/tools/rust/roogle { };
+
   rustfmt = rustPackages.rustfmt;
+  rustfmt-nightly = rustPackages.rustfmt-nightly;
+
   rustracer = callPackage ../development/tools/rust/racer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From e5f5ad71acb8e67ac8f90bcced86b1760cfaa3f3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 6 Apr 2022 11:10:17 +0300
Subject: [PATCH 12/67] rust-bindgen: use rustfmt-nightly

bindgen's tests rely on specific output from rustfmt that uses
unstable features, so breaks when we build rustfmt as stable.

Also, use a better way to specify the rustfmt executable.
---
 .../tools/rust/bindgen/unwrapped.nix          | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index 65ce8e20bc0e..5e52c851eab4 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt, writeTextFile
+{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt-nightly
 , runtimeShell
 , bash
 }:
@@ -25,23 +25,11 @@ rustPlatform.buildRustPackage rec {
   '';
 
   doCheck = true;
-  checkInputs =
-    let fakeRustup = writeTextFile {
-      name = "fake-rustup";
-      executable = true;
-      destination = "/bin/rustup";
-      text = ''
-        #!${runtimeShell}
-        shift
-        shift
-        exec "$@"
-      '';
-    };
-  in [
-    rustfmt
-    fakeRustup # the test suite insists in calling `rustup run nightly rustfmt`
-    clang
-  ];
+  checkInputs = [ clang ];
+
+  # bindgen hardcodes rustfmt outputs that use nightly features
+  RUSTFMT = "${rustfmt-nightly}/bin/rustfmt";
+
   preCheck = ''
     # for the ci folder, notably
     patchShebangs .

From e17771067bf9bf5b62e17a2f90b4dbde4c312e1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 Apr 2022 19:47:45 +0000
Subject: [PATCH 13/67] cfripper: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix
index 9d7a30fdc345..1c6caf18a8e8 100644
--- a/pkgs/tools/security/cfripper/default.nix
+++ b/pkgs/tools/security/cfripper/default.nix
@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cfripper";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = pname;
-    rev = version;
-    hash = "sha256-Q1J5M6RyYjVi2rkOCThFQdBCxVKkza+wytO67vLlVQg=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-x6QfS3DdJMpVKOLrz3EvYzIU72GzLdEePfpE9siEmCo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 53b09d37915148d2ecd5445b0805aeadc88046ec Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 7 Apr 2022 20:11:28 +0800
Subject: [PATCH 14/67] pantheon.gala: 6.3.0 -> 6.3.1

---
 .../pantheon/desktop/gala/default.nix         | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 75447adf4a26..0cab4d2e08f5 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -26,29 +25,19 @@
 
 stdenv.mkDerivation rec {
   pname = "gala";
-  version = "6.3.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw=";
+    sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y=";
   };
 
   patches = [
+    # We look for plugins in `/run/current-system/sw/lib/` because
+    # there are multiple plugin providers (e.g. gala and wingpanel).
     ./plugins-dir.patch
-    # Session crashes when switching windows with Alt+Tab
-    # https://github.com/elementary/gala/issues/1312
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
-      sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
-    })
-    # WindowSwitcher: Clear indicator background
-    # https://github.com/elementary/gala/pull/1318
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch";
-      sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q=";
-    })
   ];
 
   nativeBuildInputs = [

From abc7fcc7d446b986b6d1351471cb96b5be003ae4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 7 Apr 2022 20:13:46 +0800
Subject: [PATCH 15/67] pantheon.elementary-notifications: 6.0.0 -> 6.0.1

---
 .../pantheon/services/elementary-notifications/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index 5a78bb9c8a2b..4cea8b0894d2 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-notifications";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "notifications";
     rev = version;
-    sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9";
+    sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg=";
   };
 
   nativeBuildInputs = [

From b46cbe495cc4e24da4fed89f1f9eb589a10d1aad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 7 Apr 2022 20:15:45 +0800
Subject: [PATCH 16/67] pantheon.switchboard-plug-keyboard: 2.6.0 -> 2.7.0

---
 .../pantheon/apps/switchboard-plugs/keyboard/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 1118d52fb43c..18ccac20bb53 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
+    sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw=";
   };
 
   patches = [

From af7c34be0b874493e10df040da137e2611a3e237 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 7 Apr 2022 19:42:14 +0300
Subject: [PATCH 17/67] rustfmt: drop separate nightly alias

If you really want it, override it.
---
 pkgs/development/compilers/rust/default.nix       | 1 -
 pkgs/development/tools/rust/bindgen/unwrapped.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                   | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 82579db0e47a..6dfc8a49063f 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -77,7 +77,6 @@ in
         pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
       });
       rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
-      rustfmt-nightly = self.callPackage ./rustfmt.nix { inherit Security; asNightly = true; };
       cargo = self.callPackage ./cargo.nix {
         # Use boot package set to break cycle
         rustPlatform = bootRustPlatform;
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index 5e52c851eab4..f77e2feb4ff3 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -1,9 +1,11 @@
-{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt-nightly
+{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt
 , runtimeShell
 , bash
 }:
-
-rustPlatform.buildRustPackage rec {
+let
+  # bindgen hardcodes rustfmt outputs that use nightly features
+  rustfmt-nightly = rustfmt.override { asNightly = true; };
+in rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen-unwrapped";
   version = "0.59.2";
 
@@ -27,7 +29,6 @@ rustPlatform.buildRustPackage rec {
   doCheck = true;
   checkInputs = [ clang ];
 
-  # bindgen hardcodes rustfmt outputs that use nightly features
   RUSTFMT = "${rustfmt-nightly}/bin/rustfmt";
 
   preCheck = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 851c26182130..227cdccaec1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13471,10 +13471,7 @@ with pkgs;
   rhack = callPackage ../development/tools/rust/rhack { };
   inherit (rustPackages) rls;
   roogle = callPackage ../development/tools/rust/roogle { };
-
   rustfmt = rustPackages.rustfmt;
-  rustfmt-nightly = rustPackages.rustfmt-nightly;
-
   rustracer = callPackage ../development/tools/rust/racer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 06438e6783834d10a6c0bb08fc88cb4352d34d01 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Thu, 7 Apr 2022 14:28:57 -0400
Subject: [PATCH 18/67] cloudflared: 2022.3.4 -> 2022.4.0

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index e5a3fc2060e9..015612983c29 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2022.3.4";
+  version = "2022.4.0";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    hash   = "sha256-W3XA3AOzuyHlFCps2ne4Fh2X+E48inJT4QrDJLOeD5M=";
+    hash   = "sha256-+40OK2q4WdvlLhoPfZH6q+pghgS7ZLmaZl2VbZK4rdA=";
   };
 
   vendorSha256 = null;
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage    = "https://www.cloudflare.com/products/tunnel";
     license     = licenses.asl20;
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
+    maintainers = with maintainers; [ bbigras enorris thoughtpolice techknowlogick ];
   };
 }

From dcbabe12219785c66f3bbc688b4f80a39f7446c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Apr 2022 18:57:51 +0000
Subject: [PATCH 19/67] esbuild: 0.14.29 -> 0.14.32

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

diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 8844af40f4d1..1dcd8ff7b2e0 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.14.29";
+  version = "0.14.32";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    sha256 = "sha256-v16wKi+CphROS9s3PdzzuRoh3gLfSUgincyTp38WKxQ=";
+    sha256 = "sha256-NIF47eTGAC//4aPojrJbokB434MfGudi1pD+liRsA8k=";
   };
 
   vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

From 09c71b6c614559e73224e6e3b9a11f6c584fdb06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Apr 2022 19:14:04 +0000
Subject: [PATCH 20/67] flyctl: 0.0.310 -> 0.0.314

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

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index f70faf37fac9..8b3d40251ab7 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.310";
+  version = "0.0.314";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-69yyH4og7FGS3+M72YhlrwjatucfGliHYcMpPi1ddjA=";
+    sha256 = "sha256-UPr5crTddmR5tIzR0BulITGDbdlu3RZ1l5W007C3z+E=";
   };
 
   preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  vendorSha256 = "sha256-2goglOmcUud9KT5accn/AMe4xEgRN2Ep1qMfQHtlI+Q=";
+  vendorSha256 = "sha256-QUi23Gmj6vdNXwINa54tfLeZ+eGWLlbAtWGj3yOnzhE=";
 
   doCheck = false;
 

From af9cad4c9427ef795ba71aa09e05b91b8b817a75 Mon Sep 17 00:00:00 2001
From: nixpkgs-upkeep-bot <skainsworth@gmail.com>
Date: Fri, 8 Apr 2022 00:13:23 +0000
Subject: [PATCH 21/67] vscode: 1.66.0 -> 1.66.1

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

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index a9ab7e8e55de..46864a05570d 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -14,17 +14,17 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "077a847p8l2yk3dpn8qqwjdch5nqm8a7fxlnwg5xzx892lr6l4ax";
-    x86_64-darwin = "03gbrnkzks4if3mkpwn4yjajj3z9cax0jskhw8pz5n1mibv4kg4p";
-    aarch64-linux = "0xqpc69m5jmm6dyvhlc20bpbr2czmi0pn00jxpf5md8fqxmbvj90";
-    aarch64-darwin = "1zd2s841xpq5fk6bkrbqbzbcyladpp8sp7wx2spkzj1gmbjfzw4a";
-    armv7l-linux = "1swbg3zklixyk3cf0nh0xcwszm9rrvw1caqzmb80lc3c7qx9qx1s";
+    x86_64-linux = "1j75ivy7lwxjpfhwsikk517a9bxhrbwfy8f8liql392839qryblj";
+    x86_64-darwin = "0sjsrm31rbgq9j6hnry8f69mhhwlsd7drzz5jr31ljk75vgx3j8f";
+    aarch64-linux = "1ll28djzf5xvc0yin1irxzn3nkizpgfz0azknaycjar261q3akdp";
+    aarch64-darwin = "0mfhbdmz0db851mab83dmq654gwgdz9p20igwm9g5h4y6zrvdhg6";
+    armv7l-linux = "1vicvzdj83vcj64rla9v5n9bmi0wgz507xxch3anjszah3n7ld89";
   }.${system};
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.66.0";
+    version = "1.66.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

From f79ae01933f8ea8f7a2dbf4cbb283165c042ce51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 07:37:48 +0000
Subject: [PATCH 22/67] vscodium: 1.66.0 -> 1.66.1

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

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 0101b896e8cf..50bfcc48f2f5 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0dv28i8mxf45n7xj4gzgh4gsx76875nxs4yfqswxij8kzz72vqfn";
-    x86_64-darwin = "0xs4f1ffqcbvzw1v64f9l8i7rflz7h1j5xgjxdz6l0hw0j4aalb2";
-    aarch64-linux = "1fa7g531apigp8k7fxkp2ijmhz5axx7ixzdhlwgbsb80rb2mqhi0";
-    armv7l-linux = "1ry9qm6rk46s0jn7hl30jbjdhi3fshzcs0x9krd9qin7by18hhz3";
+    x86_64-linux = "0r5bzy1r9f0rp2wvcb703vpcfclqn8d4n9g8p9021hz0llslfha7";
+    x86_64-darwin = "15aawk2b7a5dack2bgnp4axki8y3n0ilncww15sjnvwbgk94d4pg";
+    aarch64-linux = "0kq39jx9nrfikcfcylz2gcg2d89yw6gf9sc8blyg1yfimfr9jcjv";
+    armv7l-linux = "0581ksdb1j9xsin7s505gk9kxhf3i5dw8yvyfkxck84wrrvfh6pq";
   }.${system};
 
   sourceRoot = {
@@ -31,7 +31,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.66.0";
+    version = "1.66.1";
     pname = "vscodium";
 
     executableName = "codium";

From 1bf8e7a811034a24a62927ccda475f07406ac01e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 8 Apr 2022 15:57:22 +0200
Subject: [PATCH 23/67] pre-commit: Add libiconv for tests on x86_64-darwin

Note: not a checkInput, because we need
this dependency in the role of a _build_
input during tests: library path, etc.

Solves

    E                 = note: ld: library not found for -liconv
    E                         clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
    E
    E
    E               error: failed to compile `rust-hello-world v0.1.0 (/private/tmp/nix-build-python3.9-pre-commit-2.18.1.drv-1/pytest-of-nixbld4/pytest-0/popen-gw3/test_rust_hook0/0/.pre-commit/repomj5itq00)`, intermediate artifacts can be found at `/private/tmp/nix-build-python3.9-pre-commit-2.18.1.drv-1/pytest-of-nixbld4/pytest-0/popen-gw3/test_rust_hook0/0/.pre-commit/repomj5itq00/target`
    E
    E               Caused by:
    E                 could not compile `rust-hello-world` due to previous error

    pre_commit/util.py:146: CalledProcessError

in test case

    FAILED tests/repository_test.py::test_rust_hook
---
 pkgs/tools/misc/pre-commit/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index 72f7f66c9e43..addd7134b7f8 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -6,6 +6,7 @@
 , dotnet-sdk
 , git
 , go
+, libiconv
 , nodejs
 }:
 
@@ -54,6 +55,11 @@ buildPythonPackage rec {
     re-assert
   ];
 
+  buildInputs = [
+    # Required for rust test on x86_64-darwin
+    libiconv
+  ];
+
   doCheck = true;
 
   postPatch = ''

From f0bc2c78743d3fa3b858a28d298257a26eab6fd6 Mon Sep 17 00:00:00 2001
From: Vanilla <osu_Vanilla@126.com>
Date: Fri, 8 Apr 2022 22:01:18 +0800
Subject: [PATCH 24/67] flat-remix-gnome: 20211223 -> 20220407

---
 pkgs/data/themes/flat-remix-gnome/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix
index c5647094d8ff..178a761d957c 100644
--- a/pkgs/data/themes/flat-remix-gnome/default.nix
+++ b/pkgs/data/themes/flat-remix-gnome/default.nix
@@ -7,25 +7,25 @@
 let
   # make install will use dconf to find desktop background file uri.
   # consider adding an args to allow specify pictures manually.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20211223/Makefile#L38
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20220407/Makefile#L38
   fake-dconf = writeScriptBin "dconf" "echo -n";
 in
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20211223";
+  version = "20220407";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = pname;
     rev = version;
-    hash = "sha256-hAehJNDr8r0Jhhz0h7ygXI08ouNiWDT16SPm49i90lM=";
+    hash = "sha256-Q54uF49NbvupN6LH80bgRtvyW7Cqm9vqsWXDkQrF4HQ=";
   };
 
   nativeBuildInputs = [ glib fake-dconf ];
   makeFlags = [ "PREFIX=$(out)" ];
   preInstall = ''
     # make install will back up this file, it will fail if the file doesn't exist.
-    # https://github.com/daniruiz/flat-remix-gnome/blob/20211223/Makefile#L56
+    # https://github.com/daniruiz/flat-remix-gnome/blob/20220407/Makefile#L56
     mkdir -p $out/share/gnome-shell/
     touch $out/share/gnome-shell/gnome-shell-theme.gresource
   '';

From 0d2748ca8a1179c5c804fe1d5011f71c777e35d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 14:50:53 +0000
Subject: [PATCH 25/67] notcurses: 3.0.7 -> 3.0.8

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

diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix
index ad10cfadf6eb..21b10ad4ed15 100644
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "notcurses";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchFromGitHub {
     owner = "dankamongmen";
     repo = "notcurses";
     rev = "v${version}";
-    sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg=";
+    sha256 = "sha256-5SNWk1iKDNbyoo413Qvzl2bGaR5Lb+q/UPbPQg7YvRU=";
   };
 
   outputs = [ "out" "dev" ];

From 156bacf937734e0f9cf4a211067c29daacd8cef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 15:08:13 +0000
Subject: [PATCH 26/67] morgen: 2.5.0 -> 2.5.2

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

diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix
index a9fce9ff8edb..e3390e54ee39 100644
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "2.5.0";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
-    sha256 = "sha256-6hBhfJ18ROCfmqoxrJZ5TiYCFb1xZKsJeobXFy5yfQM=";
+    sha256 = "sha256-KU58UjhFDEJGzHEGVbrii8a9cZwr7ulkQgK1Fea9smk=";
   };
 
   nativeBuildInputs = [

From 6b4c7368fa83180853063373a5b7e332fe44363c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 5 Mar 2022 01:00:30 +0000
Subject: [PATCH 27/67] retroarchBare: re-add support to Darwin

This still doesn't fix our wrapped retroarch binary, but should be
sufficient to build retroarch+cores in Darwin.
---
 .../emulators/retroarch/default.nix           | 23 ++++++++++++++++---
 .../emulators/retroarch/wrapper.nix           | 16 ++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index 2c49874e5446..c8d8394661dc 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -104,10 +104,30 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString (runtimeLibs != [ ]) ''
     wrapProgram $out/bin/retroarch \
       --prefix LD_LIBRARY_PATH ':' ${lib.makeLibraryPath runtimeLibs}
+  '' + lib.optionalString stdenv.isDarwin ''
+    # https://github.com/libretro/RetroArch/blob/master/retroarch-apple-packaging.sh
+    app=$out/Applications/RetroArch.app
+    mkdir -p $app/Contents/MacOS
+    cp -r pkg/apple/OSX/* $app/Contents
+    cp $out/bin/retroarch $app/Contents/MacOS
+    # FIXME: using Info_Metal.plist results in input not working
+    # mv $app/Contents/Info_Metal.plist $app/Contents/Info.plist
+
+    substituteInPlace $app/Contents/Info.plist \
+      --replace '${"\${EXECUTABLE_NAME}"}' 'RetroArch' \
+      --replace '$(PRODUCT_BUNDLE_IDENTIFIER)' 'com.libretro.RetroArch' \
+      --replace '${"\${PRODUCT_NAME}"}' 'RetroArch' \
+      --replace '${"\${MACOSX_DEPLOYMENT_TARGET}"}' '10.13'
+
+    cp media/retroarch.icns $app/Contents/Resources/
   '';
 
   preFixup = "rm $out/bin/retroarch-cg2glsl";
 
+  # Workaround for the following error affecting newer versions of Clang:
+  # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
+  NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang [ "-Wno-undef-prefix" ];
+
   meta = with lib; {
     homepage = "https://libretro.com";
     description = "Multi-platform emulator frontend for libretro cores";
@@ -115,8 +135,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md";
     maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ];
-    # FIXME: exits with error on macOS:
-    # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
-    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/applications/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix
index b3797c9e9e36..6adcb8ffd8b4 100644
--- a/pkgs/applications/emulators/retroarch/wrapper.nix
+++ b/pkgs/applications/emulators/retroarch/wrapper.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -p $out/lib
-    for coreDir in $cores
-    do
+    for coreDir in $cores; do
       ln -s $coreDir/* $out/lib/.
     done
 
@@ -29,9 +28,14 @@ stdenv.mkDerivation {
 
   meta = with retroarch.meta; {
     inherit changelog description homepage license maintainers platforms;
-    longDescription =
-      "RetroArch is the reference frontend for the libretro API. The following cores are included: "
-      + lib.concatStringsSep ", " (map (x: "${x.name}") cores)
-      + ".";
+    longDescription = ''
+      RetroArch is the reference frontend for the libretro API.
+
+      The following cores are included:
+      ${lib.concatStringsSep "\n" (map (x: "  - ${x.name}") cores)}
+    '';
+    # FIXME: exits with error on macOS:
+    # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
+    broken = stdenv.isDarwin;
   };
 }

From e0eeb37b38212ff33379d26650131a3af3bc3de5 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 9 Mar 2022 18:37:05 +0000
Subject: [PATCH 28/67] retroarch: 1.10.0 -> 1.10.1

---
 .../emulators/retroarch/default.nix           | 10 ++---
 .../disable-menu-show-core-updater.patch      | 13 -------
 ...h => disable-menu_show_core_updater.patch} |  2 +-
 ...e-fixed-paths-on-libretro_info_path.patch} | 38 ++++++++++---------
 4 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch
 rename pkgs/applications/emulators/retroarch/{0001-Disable-menu_show_core_updater.patch => disable-menu_show_core_updater.patch} (92%)
 rename pkgs/applications/emulators/retroarch/{0002-Use-fixed-paths-on-libretro_info_path.patch => use-fixed-paths-on-libretro_info_path.patch} (75%)

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index c8d8394661dc..601ff014b026 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -35,11 +35,11 @@
 }:
 
 let
-  version = "1.10.0";
+  version = "1.10.1";
   libretroCoreInfo = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-core-info";
-    sha256 = "sha256-3j7fvcfbgyk71MmbUUKYi+/0cpQFNbYXO+DMDUjDqkQ=";
+    sha256 = "sha256-9HpfzVv1XG5fE15yM+XiVWjr+fE3xj7oRYp0LHZ/3Xg=";
     rev = "v${version}";
   };
   runtimeLibs = lib.optional withVulkan vulkan-loader
@@ -52,13 +52,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "sha256-bpTSzODVRKRs1OW6JafjbU3e/AqdQeGzWcg1lb9SIyo=";
+    sha256 = "sha256-E0tY5YRBcew6NIVDgTNGBuxSRR0qM9bCBE+gYn61eQQ";
     rev = "v${version}";
   };
 
   patches = [
-    ./0001-Disable-menu_show_core_updater.patch
-    ./0002-Use-fixed-paths-on-libretro_info_path.patch
+    ./disable-menu_show_core_updater.patch
+    ./use-fixed-paths-on-libretro_info_path.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch
deleted file mode 100644
index 34fea554ef71..000000000000
--- a/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/retroarch.cfg b/retroarch.cfg
-index cdcb199c9f..ab72f3920f 100644
---- a/retroarch.cfg
-+++ b/retroarch.cfg
-@@ -681,7 +681,7 @@
- # menu_show_online_updater = true
- 
- # If disabled, will hide the ability to update cores (and core info files) inside the menu.
--# menu_show_core_updater = true
-+menu_show_core_updater = false
- 
- # If disabled, the libretro core will keep running in the background when we
- # are in the menu.
diff --git a/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch
similarity index 92%
rename from pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch
rename to pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch
index 75018dc8c4d1..427cb4871dc9 100644
--- a/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch
+++ b/pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch
@@ -1,7 +1,7 @@
 From 546b343294209abbb193883ab76b679b7f99c6d3 Mon Sep 17 00:00:00 2001
 From: Thiago Kenji Okada <thiagokokada@gmail.com>
 Date: Sat, 20 Nov 2021 16:03:50 -0300
-Subject: [PATCH 1/2] Disable "menu_show_core_updater"
+Subject: [PATCH] Disable "menu_show_core_updater"
 
 ---
  retroarch.cfg | 2 +-
diff --git a/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch
similarity index 75%
rename from pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch
rename to pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch
index 9aa8db6ab048..fd3913ea157e 100644
--- a/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch
+++ b/pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch
@@ -1,7 +1,7 @@
-From 6788718299e1aba3ff8b31cd6ef012e8d3643bd3 Mon Sep 17 00:00:00 2001
+From 7bf021529ff15ca2580b15b3c0bfdc137d5beffe Mon Sep 17 00:00:00 2001
 From: Thiago Kenji Okada <thiagokokada@gmail.com>
-Date: Sat, 20 Nov 2021 15:59:23 -0300
-Subject: [PATCH 2/2] Use fixed paths on "libretro_info_path"
+Date: Wed, 9 Mar 2022 18:24:15 +0000
+Subject: [PATCH] Use fixed paths on "libretro_info_path"
 
 This patch sets "libretro_info_path" to `handle = false`, so instead of
 using the values from `retroarch.cfg`, it will always use the default.
@@ -10,16 +10,16 @@ Also, it patches the default "libretro_info_path" to the
 `@libretro_info_path` string, so we can substitute it with the full path
 to it during build.
 ---
- configuration.c                    | 2 +-
- frontend/drivers/platform_darwin.m | 9 ++-------
- frontend/drivers/platform_unix.c   | 8 ++++----
- 3 files changed, 7 insertions(+), 12 deletions(-)
+ configuration.c                    |  2 +-
+ frontend/drivers/platform_darwin.m |  9 ++-------
+ frontend/drivers/platform_unix.c   | 12 ++++--------
+ 3 files changed, 7 insertions(+), 16 deletions(-)
 
 diff --git a/configuration.c b/configuration.c
-index e6a3841324..afb1d6e2ce 100644
+index 7e346ff6e9..c4b2100203 100644
 --- a/configuration.c
 +++ b/configuration.c
-@@ -1456,7 +1456,7 @@ static struct config_path_setting *populate_settings_path(
+@@ -1466,7 +1466,7 @@ static struct config_path_setting *populate_settings_path(
     SETTING_PATH("core_options_path",
           settings->paths.path_core_options, false, NULL, true);
     SETTING_PATH("libretro_info_path",
@@ -29,10 +29,10 @@ index e6a3841324..afb1d6e2ce 100644
           settings->paths.path_content_database, false, NULL, true);
     SETTING_PATH("cheat_database_path",
 diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
-index f922e50c55..52732f65ae 100644
+index 6c5fdca400..552dcb7e2b 100644
 --- a/frontend/drivers/platform_darwin.m
 +++ b/frontend/drivers/platform_darwin.m
-@@ -383,14 +383,9 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
+@@ -388,14 +388,9 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
           home_dir_buf, "shaders_glsl",
           sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
  #endif
@@ -50,21 +50,25 @@ index f922e50c55..52732f65ae 100644
  #ifdef HAVE_VIDEO_LAYOUT
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_LAYOUT], home_dir_buf, "layouts", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_LAYOUT]));
 diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
-index 722e1c595c..d87e01cf12 100644
+index b3b5dad173..7f1561e523 100644
 --- a/frontend/drivers/platform_unix.c
 +++ b/frontend/drivers/platform_unix.c
-@@ -1815,8 +1815,8 @@ static void frontend_unix_get_env(int *argc,
+@@ -1820,12 +1820,8 @@ static void frontend_unix_get_env(int *argc,
        strcpy_literal(base_path, "retroarch");
  #endif
  
--   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], base_path,
--         "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
+-   if (!string_is_empty(libretro_directory))
+-      strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE], libretro_directory,
+-            sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
+-   else
+-      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], base_path,
+-            "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
 +   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], "@libretro_directory@",
 +         "", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
  #if defined(DINGUX)
     /* On platforms that require manual core installation/
      * removal, placing core info files in the same directory
-@@ -1825,8 +1825,8 @@ static void frontend_unix_get_env(int *argc,
+@@ -1834,8 +1830,8 @@ static void frontend_unix_get_env(int *argc,
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
           "core_info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
  #else
@@ -76,5 +80,5 @@ index 722e1c595c..d87e01cf12 100644
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
           "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
 -- 
-2.31.1
+2.32.0
 

From f5241283fd965edfcbf33e6e6bbca1e22adc036f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 9 Mar 2022 19:52:28 +0000
Subject: [PATCH 29/67] libretro: unstable-2022-01-21 -> unstable-2022-03-09

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 208 +++++++++---------
 2 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index e0045a3827d1..577c470c1605 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ let
     , license
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-01-21"
+    , version ? "unstable-2022-03-09"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 1280f25047d8..3c939fdf046f 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -14,32 +14,32 @@
     "beetle-lynx": {
         "owner": "libretro",
         "repo": "beetle-lynx-libretro",
-        "rev": "8930e88a4342945c023cbf713031a65de11a8e75",
-        "sha256": "bg/a+9ZJNTUIuEHKrFIss8sia3JWMWXIXbxha5qKVeI="
+        "rev": "26d94696eb005499d981970f052fdd7beda12c1e",
+        "sha256": "BUt8a/qFOIJezmTBQPha0VV1mW5CTkvB6DqzVVMBgQI="
     },
     "beetle-ngp": {
         "owner": "libretro",
         "repo": "beetle-ngp-libretro",
-        "rev": "f7c393184e5228c3d3807ee74c951c4c549107d8",
-        "sha256": "7vki8VkwOzxwMZcUxekg1DFSskV7VNQ1SRaU3M1xHZ0="
+        "rev": "6abc74d9dc6a86460ab71c93c153fe1cb8ef4dbb",
+        "sha256": "+p3MwlzwwTghIKTDMzkqGlxhZiy/Px7xaDK3a0JagUE="
     },
     "beetle-pce-fast": {
         "owner": "libretro",
         "repo": "beetle-pce-fast-libretro",
-        "rev": "0f43fd4dc406e7da6bbdc13b6eb1c105d6072f8a",
-        "sha256": "u1lOgXEYuGAF4sOLdsBzcA4/A5Yz1b82TjFBiM57yE4="
+        "rev": "e8801687f232a6f8828b3ff5dadbc9fe1b0076fc",
+        "sha256": "YM+URLnMqsdmk/5yqCg8U4mPpgtmj5qne2CrbTpTeN8="
     },
     "beetle-pcfx": {
         "owner": "libretro",
         "repo": "beetle-pcfx-libretro",
-        "rev": "6d2b11e17ad5a95907c983e7c8a70e75508c2d41",
-        "sha256": "WG2YpCYdL/MxW5EbiP2+1VtAjbX7yYDIcLXhb+YySI4="
+        "rev": "00abc26cafb15cc33dcd73f4bd6b93cbaab6e1ea",
+        "sha256": "4a1wV3WKZmg1ed3BD0PN0Ap9E9XahQtilRWTGV5Ns3g="
     },
     "beetle-psx": {
         "owner": "libretro",
         "repo": "beetle-psx-libretro",
-        "rev": "297970e4ff080ea80a5670209aeea4fde8059020",
-        "sha256": "6kZher3/+5ywXyC3n9R9JVA4IVLZBaSfAcWEKp2SsDE="
+        "rev": "88929ae90b4807a41b1b240377ab440e39ecf2cc",
+        "sha256": "5AX5FPsmsqGWCNzLgJ7lsekZaIdano2j5sb4qUkD4cQ="
     },
     "beetle-saturn": {
         "owner": "libretro",
@@ -56,20 +56,20 @@
     "beetle-supergrafx": {
         "owner": "libretro",
         "repo": "beetle-supergrafx-libretro",
-        "rev": "7bae6fb1a238f1e66b129c7c70c7cb6dbdc09fa1",
-        "sha256": "OAJ86XrwjDrgCjrk0RHMn8sHYaJFhJhLaQnhaEVXN38="
+        "rev": "59991a98c232b1a8350a9d67ac554c5b22771d3c",
+        "sha256": "zv3dAPWrj6hkNaFQ5vUKm5Orcrb2XO48WSkAFiAVUO0="
     },
     "beetle-vb": {
         "owner": "libretro",
         "repo": "beetle-vb-libretro",
-        "rev": "aa77198c6c60b935503b5ea2149b8ff7598344da",
-        "sha256": "ShsMYc2vjDoiN1yCCoSl91P5ecYJDj/V+VWUYuYVxas="
+        "rev": "2ebf072fc4c00d428142f8073d4bef94de78b973",
+        "sha256": "e46G5AiSA3QEvNhiMIX8huw33XC10byV3Rksu0kj5Rg="
     },
     "beetle-wswan": {
         "owner": "libretro",
         "repo": "beetle-wswan-libretro",
-        "rev": "5717c101b314f64d4c384c23b1934d09fcbf82bb",
-        "sha256": "Nfezb6hja1qHv1fMGU9HMbbb56GHAfe/zIgRqrzz334="
+        "rev": "8f9fc6bd7afa7f7741ccba63fc27192d522de4b9",
+        "sha256": "DVuuILS4m0cMDjKQ99VU2HG60y4tFhGKwgDCrFNLp6E="
     },
     "blastem": {
         "owner": "libretro",
@@ -80,14 +80,14 @@
     "bluemsx": {
         "owner": "libretro",
         "repo": "bluemsx-libretro",
-        "rev": "5dfdb75106e10ef8bc21b8bcea1432ecbd590b2a",
-        "sha256": "0D0xufIt3qmQ+/UjyWynoLyLDSza8cTrFp3UwGWBXko="
+        "rev": "92d0c41b4973854114c7b2d06ab727a266d404c5",
+        "sha256": "dL4k+zG8L4KK4lwf9eXPVGk/u5xQn2htIEpoKyj9kQI="
     },
     "bsnes": {
         "owner": "libretro",
         "repo": "bsnes-libretro",
-        "rev": "1b2987ab1e9caf5c8d7550da01ffa08edff2f128",
-        "sha256": "l6Jvn0ZgFaKSWjiV2bN9aemxLyfnNEQFc+HS1/MuiaY="
+        "rev": "26c583e1c5d09253b6c61e2b9d418e8758eef632",
+        "sha256": "Qa0ScFHcEgBUoWouNoW4JINZ2aHjNATndxhcwKw476Q="
     },
     "bsnes-hd": {
         "owner": "DerKoun",
@@ -98,14 +98,14 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "d232c6ea90552f5921fec33a06626f08d3e18b24",
-        "sha256": "fpl7hmqz+Ca+9ZeM6E1JSikbiu+NJUU8xXtyl6Dd9Gg="
+        "rev": "96455ef8dab27a44ffc2dd9ab4f859464423017b",
+        "sha256": "sCowNiCp+g5w8Tgfrj5zf/L1cjPLUK1kGmGmH8mtBkU="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
-        "rev": "b1959d07a340bfd9af65ad464fd19eb6799a96ef",
-        "sha256": "bwnYkMvbtRF5bGZRYVtMWxnCu9P45qeX4+ntOj9eRds=",
+        "rev": "60406d34ed9c0e04a29eb0b83089e727a72162b9",
+        "sha256": "t25ekNUCPoj76fzIXfMvBO1kAJi8FsqxIi+0l9w2OtA=",
         "fetchSubmodules": true,
         "leaveDotGit": true,
         "deepClone": true
@@ -134,8 +134,8 @@
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "3b19e6d1781584f3e1fd2922b48b8ae6b3bcb686",
-        "sha256": "EcgJhkMzdZfYRwSpU1OcsJqQyq4V8dq5PndVufZFy7k="
+        "rev": "6f22ef47d180aeffac69942a205f79f20b2c8892",
+        "sha256": "zXKciPeqYng04HjPimmxcm9c6+K90PGumuke/lXmldc="
     },
     "dosbox": {
         "owner": "libretro",
@@ -158,44 +158,44 @@
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "4ecf2782a4eee042d1e126d1671e5231b6437b6e",
-        "sha256": "15MYI03r45mmRsXCwzWnjfBdtzSaHLp7DfmcACQFTvU="
+        "rev": "384d3837faa3e66d0641d60e9760c477ffb94495",
+        "sha256": "AABcE/0pqeHmc1CamvEC4ycekJbVqu8DAfCzIQpF/as="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "eb06d17e7912780a3ee117ae73bc50c3948c761c",
-        "sha256": "aBqskJtK1bFBjwaoo9hilr33fyAWsdj5+hFC3WY3sKk="
+        "rev": "f52037ad7a558d1e8765d448a34d85569e4ca822",
+        "sha256": "U6iubdMntJ9T+Cw8lP4CPJDjhDYfxzMgWnxrACgPjAw="
     },
     "flycast": {
         "owner": "libretro",
         "repo": "flycast",
-        "rev": "0d8c6a2e717c002bc76ce26a152353b004fb15e7",
-        "sha256": "t2RGHAyYXeHVqTqqhayOUWx/msFN9q/Z9P2wXJUtQTI="
+        "rev": "886188804de48a4bd9324046598e8dedfd0d2099",
+        "sha256": "Wxn1zEQElwLRSND4iLcIdSmiurj0WRdDgf5BfpomD9o="
     },
     "fmsx": {
         "owner": "libretro",
         "repo": "fmsx-libretro",
-        "rev": "dfcda056896576c6a1c75c002a82d0e6c1160ccc",
-        "sha256": "9ANZ1suAQcYOhqSchQ20Yuqvgw06j5Sd3Z1fjrp2UFc="
+        "rev": "f9ea9eacd49297783c216d147dcc1a22465b2749",
+        "sha256": "nDsaaUeZUm4zTj07+2nPDefoDpw18vXdhQr1BH6/4eY="
     },
     "freeintv": {
         "owner": "libretro",
         "repo": "freeintv",
-        "rev": "d58caf23ed1438a1db58f8d6ac24ca521b411d3b",
-        "sha256": "nUV+A3Zh66M1K5NDK0ksNF5H1HS3AQdeYLaGfaA34n4="
+        "rev": "22152376f891de3dc1a26b9635fd8318980d6385",
+        "sha256": "jG6/eO2BO0cHPZc1rVMxgrcfj70SwRbFn5eKdwEpT7k="
     },
     "gambatte": {
         "owner": "libretro",
         "repo": "gambatte-libretro",
-        "rev": "79bb2e56d034c30d8dcac02b6c34a59ec8fe91bc",
-        "sha256": "H+Hkeep18whaSYbyG8DcaJqsVVu7DEX9T28pkfXfyCg="
+        "rev": "671c82eaa6c4e3e28fefb583586f78d3e7b0005d",
+        "sha256": "2hvkMHme8hyP93tGsdPQXpovPk5Ne9UzcYGUizEDsyc="
     },
     "genesis-plus-gx": {
         "owner": "libretro",
         "repo": "Genesis-Plus-GX",
-        "rev": "88c9ad000ba553b9c819d9eb259f741fabd877bb",
-        "sha256": "8ZCMq8/sk5TqwTNWMfDevZHRPSOM1PJ57kiZZ7qfQxA="
+        "rev": "ed5c591fb2319f12b1058a6f138766d5fdcdd0d8",
+        "sha256": "qluSLdETg4XCIC2LQvhFCr9L+KvTYiYfaIRUnpJDRik="
     },
     "gpsp": {
         "owner": "libretro",
@@ -206,14 +206,14 @@
     "gw": {
         "owner": "libretro",
         "repo": "gw-libretro",
-        "rev": "0f1ccca156388880bf4507ad44741f80945dfc6f",
-        "sha256": "BVpx8pL224J2u9W6UDrxzfEv4qIsh6wrf3bDdd1R850="
+        "rev": "fc3d8d355b45466c52f8c56a8bcd395b702b310b",
+        "sha256": "kl7+StKOW7Yri7Q4O5BaxwVBIev9NLGWh0NYvyXZF20="
     },
     "handy": {
         "owner": "libretro",
         "repo": "libretro-handy",
-        "rev": "3b02159ba32aa37c1b93d7f7eac56b28e3715645",
-        "sha256": "mBKK+pdWgkxYkV4OOiBrlWbLAMugDX0fd6QRh0D7JYU="
+        "rev": "5145f79bb746f6d9c0b340c2f9cc4bf059848924",
+        "sha256": "madTjJWKM8elM35LRAwm0RwnA44skLtIK2/7RXPSNl0="
     },
     "hatari": {
         "owner": "libretro",
@@ -224,26 +224,26 @@
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "2f9c793a77222ae46266c71f64d491cf7870dc1e",
-        "sha256": "WAhm6QMMVbnuSIK4PW7Ek+AAkMs7s95gGb6ERzlon0w="
+        "rev": "1f6e6075e9668f55d93c5ef4fa3b032c00c0b305",
+        "sha256": "9mnmnzqlE2ixeNSq8406N9xvUKWKVyRjfZ4atTKRt80="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "4793742b457945afb74053c8a895e6ff0b36b033",
-        "sha256": "DA9fZTic/jlYzSAIiOjfhohyEyQZiBNdIa8YCZoKZNs="
+        "rev": "098df85e3bc04a74db8c810d51fb72879594dc40",
+        "sha256": "VvmDjgR3kgpfPBjo5wUPvxo4mYmpcdE2tlmRbwoGlQE="
     },
     "mame2003": {
         "owner": "libretro",
         "repo": "mame2003-libretro",
-        "rev": "dbda6ddacdd8962cfea25000421dba398e551aef",
-        "sha256": "RSL3iZZEJCxOtsJqjnM5ZiT0yM2nAgg/Ujq6FBLMHkk="
+        "rev": "3eb27d5f161522cf873c0642f14b8e2267b3820f",
+        "sha256": "TQ4FwboKeEP58hOL2hYs4OYes2o0wSKFSp4CqZV5r6I="
     },
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "9c0c954f0f88730f44abdd4d414691fef6b1cd7c",
-        "sha256": "NLdHc0VuZhqQhAzv+8kipc0mhqT2BNaJeLYZUx7DwRU="
+        "rev": "6147fc1c8b759eb03110ddc71a21c2dbb3f5a685",
+        "sha256": "JAnOx4KOERdYFPga/jWR3Bx5x284JnVzfuspi9jDUEM="
     },
     "mame2010": {
         "owner": "libretro",
@@ -266,14 +266,14 @@
     "melonds": {
         "owner": "libretro",
         "repo": "melonds",
-        "rev": "0053daa700018657bf2e47562b3b4eb86f9b9d03",
-        "sha256": "K6ZYuk7cE+ioq1rLRyAKNQxddCYIOXLU5SXT7sYgGnc="
+        "rev": "e93ec3e462d3dfc1556781510a3cee113f02abb2",
+        "sha256": "NDrsqX17OKw1/PIZSrWAxhVl+Qk/xG7lCnr6Ts+7YJ4="
     },
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "094d82bf724448426acbaad45e83bc38994e32f6",
-        "sha256": "9+AqZRv8lugNNa+ZZzIPJNO87J1aBUEiOggL8aYno1M="
+        "rev": "7376e98b8b3a6ef4c9e5c8dd34b65554d322019c",
+        "sha256": "9l8fek3Npm8adBQjkMFAnZs6IeLNjeeprbuXEcfRiHw="
     },
     "mesen-s": {
         "owner": "libretro",
@@ -290,32 +290,32 @@
     "mgba": {
         "owner": "libretro",
         "repo": "mgba",
-        "rev": "43da6e1d54ad0395f474346db88fe59a4c0aa451",
-        "sha256": "JxiWIBQi1fZoBV2lvx2r7iIvlQm0BYuJFz0TsxngUT8="
+        "rev": "5d48e0744059ebf38a4e937b256ffd5df4e0d103",
+        "sha256": "OYw2nlldFx5B7WX0E8Gbgfp1j4h65ZxyKDS9tneHXQg="
     },
     "mupen64plus": {
         "owner": "libretro",
         "repo": "mupen64plus-libretro-nx",
-        "rev": "350f90a73cf0f5d65357ce982ccbaa3b22fc3569",
-        "sha256": "9Hq93+dvO60LBbcXLIHsTq243QThicI0rVJW3tou/5Y="
+        "rev": "6e9dcd2cd9d23d3e79eaf2349bf7e9f25ad45bf1",
+        "sha256": "rs/VL2K6aS8Rl01IyxUiWipzLEzg+7+fbXxI0qN5X/I="
     },
     "neocd": {
         "owner": "libretro",
         "repo": "neocd_libretro",
-        "rev": "83d10f3be10fff2f28aa56fc674c687528cb7f5c",
-        "sha256": "yYZGoMsUfE8cpU9i826UWQGi1l0zPJPcBDb2CINxGeQ="
+        "rev": "3aa984f8d951ed43240a97233879b7063ea808e8",
+        "sha256": "+k0pOOZR8lbBEEQoqC5+TEG6HKNAK+DMTiOb9fwIBDw="
     },
     "nestopia": {
         "owner": "libretro",
         "repo": "nestopia",
-        "rev": "8af07b7ab49e45495cbc4ba73cd2f879d9908b55",
-        "sha256": "Z447flP1L/7gWEovWhbBearPKzsZNnGE2cz7jH7kEnY="
+        "rev": "a05e5bce06177c73de6bd233973ed718566e3f9a",
+        "sha256": "U7BkEZl8G/jtqvwCSRIWoqOz3ZyiGAOz65hfLoCoDeM="
     },
     "np2kai": {
         "owner": "AZO234",
         "repo": "NP2kai",
-        "rev": "30d4b6959c48db039207a37e278c868c7737ed69",
-        "sha256": "uIcgbpcEz6yUKrBe0r84Yq2ihWfT0+TdUTIF5kMT5mI=",
+        "rev": "2b09ea6a589cdcae27bca27160b3f82638fbb45d",
+        "sha256": "M3kGA1TU3xui6of9XgUspI+Zf+hjYP1d2mgKwxsy3IQ=",
         "fetchSubmodules": true
     },
     "o2em": {
@@ -339,53 +339,53 @@
     "pcsx2": {
         "owner": "libretro",
         "repo": "pcsx2",
-        "rev": "3ef2a36b0608e9dcae808c7ef01c7a760d628735",
-        "sha256": "ezqVntonhGfejiGx9cxQEnjsXEHqT++M1fO0Jz1t/Us="
+        "rev": "7874ca39eb3fe11b3b967dc97e0d08f1bc945d22",
+        "sha256": "CCzIksku5RYXBiQUE2f3fkenvuDHAlwkVLjXd4dem+4="
     },
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "12fc12797064599dfca2d44043d5c02a949711ef",
-        "sha256": "SXmNfHGyk+KChiwkKlA+d/oezzp/7p1DJY+w2bES6kg="
+        "rev": "40b19b536c6af2474d679d7ec1a529fcbe17a87c",
+        "sha256": "njOSlrXAPu4LlKKgJ4nBq9VCLnxTexU3SO7cBKtG4oA="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "50b8b47838fea8096535d543caaacdcc56aa7df2",
-        "sha256": "C1Htwel5PHZcjkKmjiiN/QgRofMhqlArxktOSqoTxTc=",
+        "rev": "6a0f515f95ea2080c8ac6b0bd2c194b48d991892",
+        "sha256": "d0n0Qj4/6MdM2Ekt9mlz9wTpVC+xjiQ4RAkmUmDeYyM=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "fd6a5161030215090d48a8036680f57914c71bb0",
-        "sha256": "g6UBRV7biLjPBXdlejjXUSk3v1wrsYWA3quZlpPj23U=",
+        "rev": "26bdfebf5b7458fc05061f35233fe5e11f2a9297",
+        "sha256": "BSttx6nhCc0dyqq5b3WLewz8A8PgF2Xu4RM1YQEm4lI=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "54d63cc1daf2a0cdc812e9af85854bb4ae5ef399",
-        "sha256": "iB/8zf4FYdsbiKZVq/YISTEQSoo1kme1uZsyuhbOcoc=",
+        "rev": "2abe3d615293bdee0cc32d6dd7719bc238e8c107",
+        "sha256": "uO6GVBIIPC0yFw0jjYFOu5y4SQ2zmw8LuKIhHebwvcs=",
         "fetchSubmodules": true
     },
     "prboom": {
         "owner": "libretro",
         "repo": "libretro-prboom",
-        "rev": "af1b5bf89d01095326ee27e178f9257f9e728873",
-        "sha256": "pvTUv4E+wBOYfjz8Ph11CK4E7rIm1T+u90TWDNXEBIU="
+        "rev": "4191903047650b40476f7f7584f4e2248789e4b7",
+        "sha256": "lQtIXsT7K9sPoeDobFFCKA0bj1WGmPezpcEfQCp6QEU="
     },
     "prosystem": {
         "owner": "libretro",
         "repo": "prosystem-libretro",
-        "rev": "89e6df7b60d151310fedbe118fb472959a9dcd61",
-        "sha256": "uxgKddS53X7ntPClE8MGezBAG+7OAFvMXTnyKpOOau0="
+        "rev": "fbf62c3dacaac694f7ec26cf9be10a51b27271e7",
+        "sha256": "Opb6CUeT/bnaTg4MJo7DNsVyaPa73PLbIor25HHWzZ0="
     },
     "quicknes": {
         "owner": "libretro",
         "repo": "QuickNES_Core",
-        "rev": "743e6e06db246c5edab27c738c7a573d83140485",
-        "sha256": "NYmP+HFeZGUeIRaT3bzdpWw9cmEAaBkA3EGnw/zpDXA="
+        "rev": "e6f08c165af45fc2d2f26c80ba0cfc33e26f9cfe",
+        "sha256": "JQtlqN3mvIwKy6iN9opHPHnh0E7AIn9JVitIfXklI/I="
     },
     "sameboy": {
         "owner": "libretro",
@@ -402,50 +402,50 @@
     "smsplus-gx": {
         "owner": "libretro",
         "repo": "smsplus-gx",
-        "rev": "3f1ffede55bcfe0168caa484a00bf041ab591abf",
-        "sha256": "fD+grzMPk4uXvmzGf+f9Mor0eefBLHIumCydsSHUsck="
+        "rev": "ed5ec9e540934f8afb08b1c0aced226f8f797885",
+        "sha256": "GgrNBFjIdAg+IV/YNxB/CgvOxUo/J20j0rWfhP7fxak="
     },
     "snes9x": {
         "owner": "snes9xgit",
         "repo": "snes9x",
-        "rev": "34b6160805c4995a8edf5f9b3328f5e492ae4c44",
-        "sha256": "YRRqtd5iu2evRk+7SyQpqpxqTaEFOkDZ/XQHEjpSBcM="
+        "rev": "0a94eaa6dc578a8d099f17af09cca9ce03de0877",
+        "sha256": "al8pKJxgOoL873Yfy9ony63x02ritTVUUp5C2qU67v0="
     },
     "snes9x2002": {
         "owner": "libretro",
         "repo": "snes9x2002",
-        "rev": "e16cb16efa00765b1bc3b8fee195680efb1542c7",
-        "sha256": "0dhLpNy+NUE3mE/ejEwbq3G28/a2HONS5NPslI5LOEc="
+        "rev": "ef4fa1dddd1c3ed6887d81898ac10c9e210ae84b",
+        "sha256": "gcVM1ip7PvOuEr/2kKWQ+ky1ErkJmENqteyysPX/P0I="
     },
     "snes9x2005": {
         "owner": "libretro",
         "repo": "snes9x2005",
-        "rev": "77e9cd293c791b47f4397da0a47242b329243cb5",
-        "sha256": "iHGfZIGzE4n3EHrVRxTULuYKsOse5NcJftmasoJFwFo="
+        "rev": "abd072aa370620112a88cc7b350c2dfb1b58185a",
+        "sha256": "14XDe0D84xpI53o/HqxlhWUW0MW7sD5dGRZjXXtE2Ac="
     },
     "snes9x2010": {
         "owner": "libretro",
         "repo": "snes9x2010",
-        "rev": "714b1c8e08c7580430190119b07e793405773ac2",
-        "sha256": "yKSQEE+lT4V2V1XqemfziHuIt79TcvC0ranU9ounTXo="
+        "rev": "f422fcf58320e8cce5aad2abd227f2461251222a",
+        "sha256": "93/TT8tHsDntUoW4qCSAFlinUYUZasHb1vCGGkq+oJM="
     },
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "1db9de390a331a7d55c35591c93d9e89184cce5f",
-        "sha256": "vICKxx+UBYvMzZ3a3F86yzJRKfdo0jMxa27wsUX0KZw="
+        "rev": "279cffe7b74909ec936bb44a4c70e98d50cc8420",
+        "sha256": "jmtNEDZmw90eCfGBaAuxYz5zjgjQ0QYPdYWKXPIDOL0="
     },
     "stella2014": {
         "owner": "libretro",
         "repo": "stella2014-libretro",
-        "rev": "934c7a2a44ef038af529b68950ddba4f7ea3478e",
-        "sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak="
+        "rev": "1a2e96bc6ccf91de6fb4322048da05f67a9d21d4",
+        "sha256": "yINO6EU2kCldfxKcqym5ha3uIEQg7I6t4Wmu+8b6Hmw="
     },
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "61c5debe60192b0fecd8c15310b2e4c4473f9438",
-        "sha256": "DZJApJnGDMsUhjO35TBc7tMldCGKDPPtrwxPLe0Ey1s="
+        "rev": "74b958ceae11a1b72ba17d5b783b5eb1a6166701",
+        "sha256": "ge2jhOQmBs+MmWCcdfrn3gshS7ABAnLo5iyKi37wbRY="
     },
     "tgbdual": {
         "owner": "libretro",
@@ -462,8 +462,8 @@
     "tic80": {
         "owner": "libretro",
         "repo": "tic-80",
-        "rev": "967eb78c3610385a0e6cba8bb5c60ebc3b886d3e",
-        "sha256": "N0QFNTYFVbhWwt2yx5fLM7Dl6pJZPYrt9o3+6rjnWa8=",
+        "rev": "510fcacef43b662b9fc4586528482048eaeb7fb4",
+        "sha256": "BYwrdeaUHoX60alH2i1CgyWsHE5qopUTB1pw1n6FN+w=",
         "fetchSubmodules": true
     },
     "vba-m": {
@@ -487,13 +487,13 @@
     "virtualjaguar": {
         "owner": "libretro",
         "repo": "virtualjaguar-libretro",
-        "rev": "d1b1b28a6ad2518b746e3f7537ec6d66db96ec57",
-        "sha256": "Io25dt80fqIqIxwzF2DK9J5UFz6YCUQoqThcIuxdEBo="
+        "rev": "263c979be4ca757c43fb525bd6f0887998e57041",
+        "sha256": "6Q6Y0IFUWS9ZPhnAK3EUo4hMGPdBn8eNEYCK/zLgAKU="
     },
     "yabause": {
         "owner": "libretro",
         "repo": "yabause",
-        "rev": "f30153ff9e534b96049c6f1ac3075b572642ceb5",
-        "sha256": "AdqCr5X3Bq8ic2jkIestmYi+CBByZ5Fyf0BUYwBkWnA="
+        "rev": "17dfcd8de4700341d972993501d3a043925675ce",
+        "sha256": "xwW7Oe3Cy3yC0xC5acLW6OGUIG+dKd1mwiXK5ZAumdo="
     }
 }

From 19ea6302e381835fe1fc19cdfaced7d83c4e47d8 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 30 Mar 2022 12:01:30 +0100
Subject: [PATCH 30/67] retroarch: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index 601ff014b026..c32f46cf2665 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -35,11 +35,11 @@
 }:
 
 let
-  version = "1.10.1";
+  version = "1.10.2";
   libretroCoreInfo = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-core-info";
-    sha256 = "sha256-9HpfzVv1XG5fE15yM+XiVWjr+fE3xj7oRYp0LHZ/3Xg=";
+    sha256 = "sha256-XOSIVH3BSwAFKUeRvyYc2OXDa+TLjoKVGl+b8fgnvtY=";
     rev = "v${version}";
   };
   runtimeLibs = lib.optional withVulkan vulkan-loader
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "sha256-E0tY5YRBcew6NIVDgTNGBuxSRR0qM9bCBE+gYn61eQQ";
+    sha256 = "sha256-fMsHMQiEoXeFKITxeEyRH829z5SCf8p0Hxq6ww1p3z4=";
     rev = "v${version}";
   };
 

From fea4c06edeed4ba4ff899c15b76fa713043d3637 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 30 Mar 2022 12:53:18 +0100
Subject: [PATCH 31/67] libretro: unstable-2022-03-09 -> unstable-2022-04-05

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 168 +++++++++---------
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 577c470c1605..ddf81d9066c5 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ let
     , license
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-03-09"
+    , version ? "unstable-2022-04-05"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 3c939fdf046f..7e5ecbe1a230 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -2,8 +2,8 @@
     "atari800": {
         "owner": "libretro",
         "repo": "libretro-atari800",
-        "rev": "478a8ec99a7f8436a39d5ac193c5fe313233ee7b",
-        "sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI="
+        "rev": "beab30e7ea10b7ed14d0514064f47d16f76cd995",
+        "sha256": "r9MsnasNhhYdFyr2VHJXkTXssB5U00JW6wN/+i+SNUk="
     },
     "beetle-gba": {
         "owner": "libretro",
@@ -14,8 +14,8 @@
     "beetle-lynx": {
         "owner": "libretro",
         "repo": "beetle-lynx-libretro",
-        "rev": "26d94696eb005499d981970f052fdd7beda12c1e",
-        "sha256": "BUt8a/qFOIJezmTBQPha0VV1mW5CTkvB6DqzVVMBgQI="
+        "rev": "de0d520d679cb92767876d4e98da908b1ea6a2d6",
+        "sha256": "BszU5bnlHBOwQSZOM9P4WIP863rS5RluNWvGBFxqzYs="
     },
     "beetle-ngp": {
         "owner": "libretro",
@@ -44,8 +44,8 @@
     "beetle-saturn": {
         "owner": "libretro",
         "repo": "beetle-saturn-libretro",
-        "rev": "e6ba71f8bcc647b646d94dec812b24d00c41cf3f",
-        "sha256": "tDbV+CsDr4bowBbJ/C8J9scfCryTAXxz58pGaUHU5yU="
+        "rev": "ae30f29e340a00b33e38df85ceaa599151a47cd7",
+        "sha256": "nc239PRM/TfkZMWm4Zl5kSoZBQcrMcMudupvCJtTBlc="
     },
     "beetle-snes": {
         "owner": "libretro",
@@ -62,8 +62,8 @@
     "beetle-vb": {
         "owner": "libretro",
         "repo": "beetle-vb-libretro",
-        "rev": "2ebf072fc4c00d428142f8073d4bef94de78b973",
-        "sha256": "e46G5AiSA3QEvNhiMIX8huw33XC10byV3Rksu0kj5Rg="
+        "rev": "a91437af0879124aa00b6cb30ca1189f2c84b7cb",
+        "sha256": "ryahr/g6PDvUKCPkF1D8xozNGNCa4bLw63b5Ra9Vsfo="
     },
     "beetle-wswan": {
         "owner": "libretro",
@@ -98,14 +98,14 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "96455ef8dab27a44ffc2dd9ab4f859464423017b",
-        "sha256": "sCowNiCp+g5w8Tgfrj5zf/L1cjPLUK1kGmGmH8mtBkU="
+        "rev": "60431e0507c3492c4d6e4f950c4e551fe4e7e57d",
+        "sha256": "EAvBEFY0I4960DohDOShgu0Jfnww9B6bf6wPxVi7Ogg="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
-        "rev": "60406d34ed9c0e04a29eb0b83089e727a72162b9",
-        "sha256": "t25ekNUCPoj76fzIXfMvBO1kAJi8FsqxIi+0l9w2OtA=",
+        "rev": "44e01f99016008eff18bc7a28234d1098382358d",
+        "sha256": "iUp8O0hGCyrbVGoKb95Z3MuFlEzjvaLhgWxo8hAOLIk=",
         "fetchSubmodules": true,
         "leaveDotGit": true,
         "deepClone": true
@@ -122,8 +122,8 @@
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
-        "rev": "7ea0fc96804fcd9c8d33e8f76cf64b1be50cc5ea",
-        "sha256": "4S/CirRVOBN6PVbato5X5fu0tBn3Fu5FEAbdf3TBqng="
+        "rev": "7b16293ebb8e272ce28d62efc39573b129cea61d",
+        "sha256": "WTUA0iOG5E8OuHjd+qbd4C5BoaN4WFYetPGj9r7CDpI="
     },
     "desmume2015": {
         "owner": "libretro",
@@ -134,38 +134,38 @@
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "6f22ef47d180aeffac69942a205f79f20b2c8892",
-        "sha256": "zXKciPeqYng04HjPimmxcm9c6+K90PGumuke/lXmldc="
+        "rev": "61475de768fb7457128853656e53a942aedd79fe",
+        "sha256": "pInezsAtzVanlGHCQKraaqzWXWDYf/v5YYE7BS5yOAk="
     },
     "dosbox": {
         "owner": "libretro",
         "repo": "dosbox-libretro",
-        "rev": "aa71b67d54eaaf9e41cdd3cb5153d9cff0ad116e",
-        "sha256": "L0Y67UROjldnXUlLQ+Xbd7RHLb96jDxlB/k+LR9Kbas="
+        "rev": "1aff406faed3cfde5c1b658bacd9f8f639915912",
+        "sha256": "qRUXYd4oWRUFGAezs9Un+Avpx5Rwu1Ngjc80R5gise0="
     },
     "eightyone": {
         "owner": "libretro",
         "repo": "81-libretro",
-        "rev": "86d7d5afe98f16006d4b1fdb99d281f1d7ea6b2f",
-        "sha256": "QN7anzqv1z8SgY8dlkjr8Ns7reGWc7hTneiRmorXZSk="
+        "rev": "6aba19246c1ec08f3de5659b2dbc3277ec6bfb97",
+        "sha256": "2G6NkNlvqvP5RM35ydppnr2/RRbeiIpM2HKOpt8PkgU="
     },
     "fbalpha2012": {
         "owner": "libretro",
         "repo": "fbalpha2012",
-        "rev": "23f98fc7cf4f2f216149c263cf5913d2e28be8d4",
-        "sha256": "dAInW6tTV7oXcPhKMnHWcmQaWQCTqRrYHD2yuaI1I1w="
+        "rev": "7f8860543a81ba79c0e1ce1aa219af44568c628a",
+        "sha256": "r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc="
     },
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "384d3837faa3e66d0641d60e9760c477ffb94495",
-        "sha256": "AABcE/0pqeHmc1CamvEC4ycekJbVqu8DAfCzIQpF/as="
+        "rev": "5ad211ca3d0cfc1945fee6dc260885f2ee661d79",
+        "sha256": "SHURJYmSR42uQyyqYGd071fRci9DZJ6KaD0ZWi3y/S4="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "f52037ad7a558d1e8765d448a34d85569e4ca822",
-        "sha256": "U6iubdMntJ9T+Cw8lP4CPJDjhDYfxzMgWnxrACgPjAw="
+        "rev": "013c6f3b563261747dac316c2ece81a27f963c21",
+        "sha256": "OCtiMkiWvWZYyv+E5KSf06fIrcO9+ZjsUGOVVFWc/c8="
     },
     "flycast": {
         "owner": "libretro",
@@ -182,26 +182,26 @@
     "freeintv": {
         "owner": "libretro",
         "repo": "freeintv",
-        "rev": "22152376f891de3dc1a26b9635fd8318980d6385",
-        "sha256": "jG6/eO2BO0cHPZc1rVMxgrcfj70SwRbFn5eKdwEpT7k="
+        "rev": "295dd3c9e4b2d4f652f6a6a904afbe90a8187068",
+        "sha256": "tz0X6AfD7IL3Y50vjgSO5r6sDhu++6Gj8Rp7de5OqMk="
     },
     "gambatte": {
         "owner": "libretro",
         "repo": "gambatte-libretro",
-        "rev": "671c82eaa6c4e3e28fefb583586f78d3e7b0005d",
-        "sha256": "2hvkMHme8hyP93tGsdPQXpovPk5Ne9UzcYGUizEDsyc="
+        "rev": "15536214cdce31894d374b2ffa2494543057082b",
+        "sha256": "cTSoK6rezRajnuWPt7WkYn3SWL0sTu7h5X3Ig1KukDA="
     },
     "genesis-plus-gx": {
         "owner": "libretro",
         "repo": "Genesis-Plus-GX",
-        "rev": "ed5c591fb2319f12b1058a6f138766d5fdcdd0d8",
-        "sha256": "qluSLdETg4XCIC2LQvhFCr9L+KvTYiYfaIRUnpJDRik="
+        "rev": "144045b30a18ab4b27c3ae46490274988f302748",
+        "sha256": "ydnyPdkJmM+xhuJqIOxZISFcTN8RFgOLbnRvOBJORek="
     },
     "gpsp": {
         "owner": "libretro",
         "repo": "gpsp",
-        "rev": "e554360dd3ed283696fc607877024a219248b735",
-        "sha256": "ImsqB89XmjF8nvs7j8IZVvFltgZRYvF2L7LTcJG/xCU="
+        "rev": "d4547baf26dd70a18eeb38d231ce3f998004ec30",
+        "sha256": "9XU9TmBpuZeAOzqxuKVQZvdHRgX8fm4HcEfleM3jB7E="
     },
     "gw": {
         "owner": "libretro",
@@ -218,20 +218,20 @@
     "hatari": {
         "owner": "libretro",
         "repo": "hatari",
-        "rev": "79d128888ca3efdd27d639a35edf72a9bc81a798",
-        "sha256": "du2xORgAXTSQArqNuFa5gjticgZ+weqySFHVz2Y2qzI="
+        "rev": "e5e36a5262cfeadc3d1c7b411b7a70719c4f293c",
+        "sha256": "T4I3NVEMBKr5HLs60x48VNRl2TMnhqvaF+LTtYQ7qdU="
     },
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "1f6e6075e9668f55d93c5ef4fa3b032c00c0b305",
-        "sha256": "9mnmnzqlE2ixeNSq8406N9xvUKWKVyRjfZ4atTKRt80="
+        "rev": "bd5f688bee8253f9222b13c4d33b6b8f6e442157",
+        "sha256": "23E/EjFXRxoSEG24AHjKW9H5hSjsPs3K/2uC7VJqXN0="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "098df85e3bc04a74db8c810d51fb72879594dc40",
-        "sha256": "VvmDjgR3kgpfPBjo5wUPvxo4mYmpcdE2tlmRbwoGlQE="
+        "rev": "51079410d52da026e67448c482afeac7bcc876e7",
+        "sha256": "glMsTSu7YofKs0+cg1V6tHq1DWWuGl8vAGOUOSHkxFU="
     },
     "mame2003": {
         "owner": "libretro",
@@ -242,8 +242,8 @@
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "6147fc1c8b759eb03110ddc71a21c2dbb3f5a685",
-        "sha256": "JAnOx4KOERdYFPga/jWR3Bx5x284JnVzfuspi9jDUEM="
+        "rev": "8f1498fff4f66323abc42b5e628f8760afe077ed",
+        "sha256": "a8EWUcp0fbOYryJ9lJFPK9rIOdcCyb1St71xVMuQBUY="
     },
     "mame2010": {
         "owner": "libretro",
@@ -272,14 +272,14 @@
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "7376e98b8b3a6ef4c9e5c8dd34b65554d322019c",
-        "sha256": "9l8fek3Npm8adBQjkMFAnZs6IeLNjeeprbuXEcfRiHw="
+        "rev": "7dc6b816abca8663edc525a11c6115c394462c9c",
+        "sha256": "GPBMipEHDiqwH4KhuGl+Mzcy2IBcPbdmgH69etjXOk4="
     },
     "mesen-s": {
         "owner": "libretro",
         "repo": "mesen-s",
-        "rev": "42eb0e8ad346608dae86feb8a04833d16ad21541",
-        "sha256": "q6zeoNiZtFy8ZYls9/E+O7o9BYTcVcmYjbJA48qiraU="
+        "rev": "6e010d1676d9dd6c6bc2f3ddf6b301bb4c235a99",
+        "sha256": "z+O9wkqUPIjzE4fcHit5yUjoi5WFNUrgB0TS+nWy55o="
     },
     "meteor": {
         "owner": "libretro",
@@ -302,14 +302,14 @@
     "neocd": {
         "owner": "libretro",
         "repo": "neocd_libretro",
-        "rev": "3aa984f8d951ed43240a97233879b7063ea808e8",
-        "sha256": "+k0pOOZR8lbBEEQoqC5+TEG6HKNAK+DMTiOb9fwIBDw="
+        "rev": "327aeceecdf71c8a0c0af3d6dc53686c94fe44ad",
+        "sha256": "cY0P+0EQ0b9df+YT2EMvrxjp5L+DwIg31rEJqchU+hc="
     },
     "nestopia": {
         "owner": "libretro",
         "repo": "nestopia",
-        "rev": "a05e5bce06177c73de6bd233973ed718566e3f9a",
-        "sha256": "U7BkEZl8G/jtqvwCSRIWoqOz3ZyiGAOz65hfLoCoDeM="
+        "rev": "7dbd5c6384c4c6326004c97fd8e6fa07cb4edcef",
+        "sha256": "OBkWP36BzwsEW+ORF2opHlXwXHgGN0l2ZxBuyDO/sKY="
     },
     "np2kai": {
         "owner": "AZO234",
@@ -321,8 +321,8 @@
     "o2em": {
         "owner": "libretro",
         "repo": "libretro-o2em",
-        "rev": "f1050243e0d5285e7769e94a882b0cf39d2b7370",
-        "sha256": "wD+iJ8cKC8jYFZ6OVvX71uO7sSh5b/LLoc5+g7f3Yyg="
+        "rev": "efd749cec2dd1ce42a8aa3048a89f817d271d804",
+        "sha256": "aw0bJyQzYFOlQQOfNsRgqdeUJP1qF4llJxLq5t9oc5g="
     },
     "opera": {
         "owner": "libretro",
@@ -339,41 +339,41 @@
     "pcsx2": {
         "owner": "libretro",
         "repo": "pcsx2",
-        "rev": "7874ca39eb3fe11b3b967dc97e0d08f1bc945d22",
-        "sha256": "CCzIksku5RYXBiQUE2f3fkenvuDHAlwkVLjXd4dem+4="
+        "rev": "0251730a21d7238856d79aa25e2942b48edb38f6",
+        "sha256": "a/lWLBCww4QwxdO7Sbvmfq0XF9FnP4xzF51ljsWk46I="
     },
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "40b19b536c6af2474d679d7ec1a529fcbe17a87c",
-        "sha256": "njOSlrXAPu4LlKKgJ4nBq9VCLnxTexU3SO7cBKtG4oA="
+        "rev": "861f92d714211167fb72583f921c992ada90f0fa",
+        "sha256": "474ZGrRBzu4mtr0QFTQIZp/b5fr0PjY4XERzBMpytTk="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "6a0f515f95ea2080c8ac6b0bd2c194b48d991892",
-        "sha256": "d0n0Qj4/6MdM2Ekt9mlz9wTpVC+xjiQ4RAkmUmDeYyM=",
+        "rev": "788a4f955ae308e87705a71c0448ab53cc9c5416",
+        "sha256": "AT7mK0pTDWBSzw2JnK84Yf/4z5V4BYTcb082Pycy1Vk=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "26bdfebf5b7458fc05061f35233fe5e11f2a9297",
-        "sha256": "BSttx6nhCc0dyqq5b3WLewz8A8PgF2Xu4RM1YQEm4lI=",
+        "rev": "eb061f6be52e68ede8f8094372eda66f9b7b925f",
+        "sha256": "t6o/8xiRqG+1g8BQed0geDzlLTtFiGXg1ZuTuIanXak=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "2abe3d615293bdee0cc32d6dd7719bc238e8c107",
-        "sha256": "uO6GVBIIPC0yFw0jjYFOu5y4SQ2zmw8LuKIhHebwvcs=",
+        "rev": "477b1773c2b43d1aeed8bf9c4e0b125326ae7b5a",
+        "sha256": "Xn/6sqV7iswUhHDaLLeugy2b7FtsqanlyY6UsTrKDFM=",
         "fetchSubmodules": true
     },
     "prboom": {
         "owner": "libretro",
         "repo": "libretro-prboom",
-        "rev": "4191903047650b40476f7f7584f4e2248789e4b7",
-        "sha256": "lQtIXsT7K9sPoeDobFFCKA0bj1WGmPezpcEfQCp6QEU="
+        "rev": "b22a6b19fd976a14374db9083baea9c91b079106",
+        "sha256": "NmEWRTHaZjV2Y6Wrc3WOamXCnOawKc2ja1KBDxokRiY="
     },
     "prosystem": {
         "owner": "libretro",
@@ -402,38 +402,38 @@
     "smsplus-gx": {
         "owner": "libretro",
         "repo": "smsplus-gx",
-        "rev": "ed5ec9e540934f8afb08b1c0aced226f8f797885",
-        "sha256": "GgrNBFjIdAg+IV/YNxB/CgvOxUo/J20j0rWfhP7fxak="
+        "rev": "8e8378896bc15c8a9f756339b596171ba266cc14",
+        "sha256": "zvG2SF4zx3Yaaf54NZ2DgsGPN59msW8TvQFCS4OMcHQ="
     },
     "snes9x": {
         "owner": "snes9xgit",
         "repo": "snes9x",
-        "rev": "0a94eaa6dc578a8d099f17af09cca9ce03de0877",
-        "sha256": "al8pKJxgOoL873Yfy9ony63x02ritTVUUp5C2qU67v0="
+        "rev": "78d006ffdbb5cb6944177db52c3640152948d928",
+        "sha256": "Qh+nLtwdLfjwYxXCv49pPPf0mqdxKRv/JLRm82knJu0="
     },
     "snes9x2002": {
         "owner": "libretro",
         "repo": "snes9x2002",
-        "rev": "ef4fa1dddd1c3ed6887d81898ac10c9e210ae84b",
-        "sha256": "gcVM1ip7PvOuEr/2kKWQ+ky1ErkJmENqteyysPX/P0I="
+        "rev": "25d9d4fea4c7d7fcc8608c65c2bec9bcbc41f26e",
+        "sha256": "EYcaWckvTfi2ajx6C1olE5pW51diLSjMdqZdyH8U2Ck="
     },
     "snes9x2005": {
         "owner": "libretro",
         "repo": "snes9x2005",
-        "rev": "abd072aa370620112a88cc7b350c2dfb1b58185a",
-        "sha256": "14XDe0D84xpI53o/HqxlhWUW0MW7sD5dGRZjXXtE2Ac="
+        "rev": "23f759bc4bf2e39733296f7749e446418e3cd0f3",
+        "sha256": "/bZrMp7NHgdYvA3Tw1ZoWXRg7VxmatRUX5cCJsU3NCY="
     },
     "snes9x2010": {
         "owner": "libretro",
         "repo": "snes9x2010",
-        "rev": "f422fcf58320e8cce5aad2abd227f2461251222a",
-        "sha256": "93/TT8tHsDntUoW4qCSAFlinUYUZasHb1vCGGkq+oJM="
+        "rev": "b12f3ba46f09dd5d0254676ed4b9e289d16b9ea8",
+        "sha256": "i4GEqZkgwlehuUQGcjLdMkO9xNWRs8k+3y2OGivwXCw="
     },
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "279cffe7b74909ec936bb44a4c70e98d50cc8420",
-        "sha256": "jmtNEDZmw90eCfGBaAuxYz5zjgjQ0QYPdYWKXPIDOL0="
+        "rev": "fc1d87f6def11cec8773e89009ae8ed152d12487",
+        "sha256": "sja3OuTYq0BZwzuNFQ/pX6fCLaDWEbzTqlcQTxV87ZM="
     },
     "stella2014": {
         "owner": "libretro",
@@ -444,8 +444,8 @@
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "74b958ceae11a1b72ba17d5b783b5eb1a6166701",
-        "sha256": "ge2jhOQmBs+MmWCcdfrn3gshS7ABAnLo5iyKi37wbRY="
+        "rev": "359086eed01e63816ad9daf826dc719da7b6e96a",
+        "sha256": "y4qQecbimsBShROeM9GzlGlKcr5TV5FxOb5pzmQf4LE="
     },
     "tgbdual": {
         "owner": "libretro",
@@ -462,8 +462,8 @@
     "tic80": {
         "owner": "libretro",
         "repo": "tic-80",
-        "rev": "510fcacef43b662b9fc4586528482048eaeb7fb4",
-        "sha256": "BYwrdeaUHoX60alH2i1CgyWsHE5qopUTB1pw1n6FN+w=",
+        "rev": "e9f62f85a154796c6baaee8a9f6fd0cfdd447019",
+        "sha256": "JTAoIqxqpaLjsQiIpJ4wQsREI5/rTxVxDywoL3oLI4Q=",
         "fetchSubmodules": true
     },
     "vba-m": {
@@ -475,14 +475,14 @@
     "vba-next": {
         "owner": "libretro",
         "repo": "vba-next",
-        "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817",
-        "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo="
+        "rev": "ebd175d57ebb2065726099d32034cb25934787ce",
+        "sha256": "hTUlhLzvsemNz6wSmlnQNoNtzaVhipA+hmVmhzZVN+w="
     },
     "vecx": {
         "owner": "libretro",
         "repo": "libretro-vecx",
-        "rev": "28d6efc8972313903d0802a736ff8c3bc115e78f",
-        "sha256": "VYa8s+HB8IYF+HS6SA+sO5DzpgCtnMGrh88KTVNGICY="
+        "rev": "141af284202c86ed0d4ce9030c76954a144287cf",
+        "sha256": "p5vMuG2vr3BTJOQWNcTPb89MlkVrRvJNTIJSU8r9zfU="
     },
     "virtualjaguar": {
         "owner": "libretro",

From 7c4c28b2ca7685a369813dc3bed644ea4c1ceb50 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 17:27:42 +0100
Subject: [PATCH 32/67] libretro.citra-canary: remove it

Not maintained anymore by upstream.
---
 .../applications/emulators/retroarch/cores.nix | 18 ------------------
 .../emulators/retroarch/hashes.json            |  9 ---------
 .../applications/emulators/retroarch/update.py |  7 -------
 3 files changed, 34 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index ddf81d9066c5..830e16e488c6 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -313,24 +313,6 @@ in
     postBuild = "cd src/citra_libretro";
   };
 
-  citra-canary = mkLibRetroCore {
-    core = "citra-canary";
-    description = "Port of Citra Canary/Experimental to libretro";
-    license = lib.licenses.gpl2Plus;
-    extraNativeBuildInputs = [ cmake pkg-config ];
-    extraBuildInputs = [ libGLU libGL boost ];
-    makefile = "Makefile";
-    cmakeFlags = [
-      "-DENABLE_LIBRETRO=ON"
-      "-DENABLE_QT=OFF"
-      "-DENABLE_SDL2=OFF"
-      "-DENABLE_WEB_SERVICE=OFF"
-      "-DENABLE_DISCORD_PRESENCE=OFF"
-    ];
-    preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake";
-    postBuild = "cd src/citra_libretro";
-  };
-
   desmume = mkLibRetroCore {
     core = "desmume";
     description = "libretro wrapper for desmume NDS emulator";
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 7e5ecbe1a230..b7fc01bfb4f5 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -110,15 +110,6 @@
         "leaveDotGit": true,
         "deepClone": true
     },
-    "citra-canary": {
-        "owner": "libretro",
-        "repo": "citra",
-        "rev": "5401990a9be46e4497abc92db3d5f2042674303d",
-        "sha256": "JKKJBa840i7ESwMrB5tKamCBmrYvvoEUdibqxkWg5Gc=",
-        "fetchSubmodules": true,
-        "leaveDotGit": true,
-        "deepClone": true
-    },
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index 68f72103168e..7d858a1dfa57 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -32,13 +32,6 @@ CORES = {
         "deep_clone": True,
         "leave_dot_git": True,
     },
-    "citra-canary": {
-        "repo": "citra",
-        "fetch_submodules": True,
-        "deep_clone": True,
-        "leave_dot_git": True,
-        "rev": "canary",
-    },
     "desmume": {"repo": "desmume"},
     "desmume2015": {"repo": "desmume2015"},
     "dolphin": {"repo": "dolphin"},

From 2e2aed71002ade3bc5291faea27470cbb43be204 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 8 Apr 2022 18:44:02 +0200
Subject: [PATCH 33/67] wiki-js: add update script

---
 pkgs/servers/web-apps/wiki-js/default.nix |  5 ++++-
 pkgs/servers/web-apps/wiki-js/update.sh   | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 pkgs/servers/web-apps/wiki-js/update.sh

diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index f4e7775c400f..0d70a6b0f73c 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.tests = { inherit (nixosTests) wiki-js; };
+  passthru = {
+    tests = { inherit (nixosTests) wiki-js; };
+    updateScript = ./update.sh;
+  };
 
   meta = with lib; {
     homepage = "https://js.wiki/";
diff --git a/pkgs/servers/web-apps/wiki-js/update.sh b/pkgs/servers/web-apps/wiki-js/update.sh
new file mode 100755
index 000000000000..63015800e691
--- /dev/null
+++ b/pkgs/servers/web-apps/wiki-js/update.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion wiki-js" | tr -d '"')"
+latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/Requarks/wiki.git | tail -1 | awk '{ print $2 }' | sed -E "s,^refs/tags/v(.*)$,\1,")"
+
+targetVersion="${1:-$latestTag}"
+if [ ! "${oldVersion}" = "${targetVersion}" ]; then
+  update-source-version wiki-js "${targetVersion}"
+  nix-build -A wiki-js
+else
+  echo "wiki-js is already up-to-date"
+fi

From dfc0ddaa871f470e5643947256ca60d751cda502 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 8 Apr 2022 18:44:16 +0200
Subject: [PATCH 34/67] wiki-js: 2.5.276 -> 2.5.277

ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.277
---
 pkgs/servers/web-apps/wiki-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index 0d70a6b0f73c..c0f94b1bca77 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.276";
+  version = "2.5.277";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-ulx3/yj5wxmHsep0+93xpy6VeQJkMXRjGd/xx2F1zII=";
+    sha256 = "sha256-YLw0DR4dbPfNY56lNybEQFXFEVPZ99sQkwDl6gtz40E=";
   };
 
   sourceRoot = ".";

From e6acb0c6a8b18bbb598616cc5845be735ae4e31b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 18:10:28 +0100
Subject: [PATCH 35/67] libretro.citra: fix build

---
 .../emulators/retroarch/cores.nix             | 34 ++++++++-----------
 .../emulators/retroarch/hashes.json           |  5 ++-
 .../emulators/retroarch/update.py             |  2 +-
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 830e16e488c6..311f365af9e3 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -1,23 +1,22 @@
 { lib
 , stdenv
-, SDL
 , alsa-lib
 , boost
-, buildPackages
 , bzip2
 , cmake
 , curl
 , fetchFromGitHub
 , ffmpeg
 , fluidsynth
+, gcc10Stdenv
 , gettext
 , hexdump
 , hidapi
 , icu
 , libaio
+, libevdev
 , libGL
 , libGLU
-, libevdev
 , libjpeg
 , libpcap
 , libpng
@@ -32,6 +31,7 @@
 , portaudio
 , python3
 , retroarch
+, SDL
 , sfml
 , snappy
 , udev
@@ -53,6 +53,7 @@ let
     , description
       # Check https://github.com/libretro/libretro-core-info for license information
     , license
+    , stdenvOverride ? stdenv
     , src ? (getCoreSrc core)
     , broken ? false
     , version ? "unstable-2022-04-05"
@@ -62,8 +63,9 @@ let
     , normalizeCore ? true
     , ...
     }@args:
-    stdenv.mkDerivation (
+    stdenvOverride.mkDerivation (
       let
+        inherit (stdenvOverride) hostPlatform;
         d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x);
       in
       (rec {
@@ -79,12 +81,12 @@ let
             linux = "unix";
             darwin = "osx";
             windows = "win";
-          }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}"
+          }.${hostPlatform.parsed.kernel.name} or hostPlatform.parsed.kernel.name}"
           "ARCH=${{
             armv7l = "arm";
             armv6l = "arm";
             i686 = "x86";
-          }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}"
+          }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name}"
         ] ++ (args.makeFlags or [ ]);
 
         coreDir = "${placeholder "out"}/lib/retroarch/cores";
@@ -94,9 +96,9 @@ let
 
           mkdir -p $out/bin
           mkdir -p $coreDir
-          mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $coreDir
+          mv ${d2u args.core}_libretro${hostPlatform.extensions.sharedLibrary} $coreDir
           makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
-            --add-flags "-L $coreDir/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@"
+            --add-flags "-L $coreDir/${d2u core}_libretro${hostPlatform.extensions.sharedLibrary} $@"
 
           runHook postInstall
         '';
@@ -298,19 +300,11 @@ in
   citra = mkLibRetroCore {
     core = "citra";
     description = "Port of Citra to libretro";
+    stdenvOverride = gcc10Stdenv;
     license = lib.licenses.gpl2Plus;
-    extraNativeBuildInputs = [ cmake pkg-config ];
-    extraBuildInputs = [ libGLU libGL boost ];
+    extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ];
     makefile = "Makefile";
-    cmakeFlags = [
-      "-DENABLE_LIBRETRO=ON"
-      "-DENABLE_QT=OFF"
-      "-DENABLE_SDL2=OFF"
-      "-DENABLE_WEB_SERVICE=OFF"
-      "-DENABLE_DISCORD_PRESENCE=OFF"
-    ];
-    preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake";
-    postBuild = "cd src/citra_libretro";
+    makeFlags = [ "HAVE_FFMPEG_STATIC=0" ];
   };
 
   desmume = mkLibRetroCore {
@@ -462,7 +456,7 @@ in
     dontUseCmakeConfigure = true;
     dontConfigure = true;
     makeFlags = [ "EXTERNAL_ZLIB=1" ];
-    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    depsBuildBuild = [ stdenv.cc ];
   };
 
   mame = mkLibRetroCore {
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index b7fc01bfb4f5..0f660b50b857 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -105,10 +105,9 @@
         "owner": "libretro",
         "repo": "citra",
         "rev": "44e01f99016008eff18bc7a28234d1098382358d",
-        "sha256": "iUp8O0hGCyrbVGoKb95Z3MuFlEzjvaLhgWxo8hAOLIk=",
+        "sha256": "Vj0d2wAC9UYWgSURL1Qv0LR11g7c789U3W4MV3phv+4=",
         "fetchSubmodules": true,
-        "leaveDotGit": true,
-        "deepClone": true
+        "leaveDotGit": true
     },
     "desmume": {
         "owner": "libretro",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index 7d858a1dfa57..c75b5af622b5 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -29,7 +29,7 @@ CORES = {
     "citra": {
         "repo": "citra",
         "fetch_submodules": True,
-        "deep_clone": True,
+        "deep_clone": False,
         "leave_dot_git": True,
     },
     "desmume": {"repo": "desmume"},

From 5e40bd3313ffb111135b49052754a2f463f025d1 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Fri, 8 Apr 2022 20:19:54 +0200
Subject: [PATCH 36/67] git-branchless: 0.3.10 -> 0.3.12

---
 .../git-and-tools/git-branchless/default.nix                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
index 19f794e6c916..13ba738c46fb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-branchless";
-  version = "0.3.10";
+  version = "0.3.12";
 
   src = fetchFromGitHub {
     owner = "arxanas";
     repo = "git-branchless";
     rev = "v${version}";
-    sha256 = "sha256-TLqAU1/olSS59Zeb+2m9Jq19EYTO1TnbKPYciHPKO2A=";
+    sha256 = "sha256-1bUHltONLfJumkxPnzGJFMMyS02LVqjpDL+KgiewyoQ=";
   };
 
-  cargoSha256 = "sha256-sA4KWGW4bxGUkotTWHUcRqcoaUJsSUCTK8hUkKiRcnY=";
+  cargoSha256 = "sha256-3+ULHqtKAhf4AdoLPK/3IqnfOcskoh6ctlQnY1oTHJ8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From fbf65094b0418097f3c5dc31f031660c3f8f37ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 21:13:23 +0000
Subject: [PATCH 37/67] php74Packages.phpstan: 1.5.3 -> 1.5.4

---
 pkgs/development/php-packages/phpstan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index bafbe23acd2b..029bf14787eb 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, makeWrapper, lib, php }:
 let
   pname = "phpstan";
-  version = "1.5.3";
+  version = "1.5.4";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "sha256-tIVzXxOyHVz2AE0PjQdkQ+uevdSqsjBRIZQWVDwzuKg=";
+    sha256 = "sha256-6dXYrDpQ3E+z8mcZof7GSXOrUMoceuPTHO21Z8l4Wyw=";
   };
 
   dontUnpack = true;

From 1ba13633adf68378034d73ea732b0244bfbde66d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 21:25:08 +0000
Subject: [PATCH 38/67] php74Extensions.xdebug: 3.1.3 -> 3.1.4

---
 pkgs/development/php-packages/xdebug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index ba582dbb757b..3d896a4dc490 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "xdebug";
 
-  version = "3.1.3";
-  sha256 = "sha256-N9CmcBlV9bNAbGwye3cCvXwhRi5lbztMziSgUlgBPU4=";
+  version = "3.1.4";
+  sha256 = "sha256-QZWSb59sToAv90m7LKhaxQY2cZpy5TieNy4171I1Bfk=";
 
   doCheck = true;
   checkTarget = "test";

From 13188121a48fd453dc45f31fee649a7a57e1117f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 18:10:51 +0100
Subject: [PATCH 39/67] libretro.hatari: simplify build

---
 pkgs/applications/emulators/retroarch/cores.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 311f365af9e3..76d4f04ecba2 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -452,11 +452,9 @@ in
     description = "Port of Hatari to libretro";
     license = lib.licenses.gpl2Only;
     extraBuildInputs = [ SDL zlib ];
-    extraNativeBuildInputs = [ cmake which ];
-    dontUseCmakeConfigure = true;
+    extraNativeBuildInputs = [ which ];
     dontConfigure = true;
     makeFlags = [ "EXTERNAL_ZLIB=1" ];
-    depsBuildBuild = [ stdenv.cc ];
   };
 
   mame = mkLibRetroCore {
@@ -464,7 +462,6 @@ in
     description = "Port of MAME to libretro";
     license = with lib.licenses; [ bsd3 gpl2Plus ];
     extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ];
-    makefile = "Makefile.libretro";
   };
 
   mame2000 = mkLibRetroCore {
@@ -595,7 +592,6 @@ in
     src = getCoreSrc core;
     description = "Neko Project II kai libretro port";
     license = lib.licenses.mit;
-    makefile = "Makefile.libretro";
     makeFlags = [
       # See https://github.com/AZO234/NP2kai/tags
       "NP2KAI_VERSION=rev.22"

From 3c1b148066610e9afc864bcea8fad4942ca14873 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 21:00:19 +0100
Subject: [PATCH 40/67] libretro: unstable-2022-04-05 -> unstable-2022-04-08

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 105 +++++++++---------
 .../emulators/retroarch/update.py             |   7 +-
 3 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 76d4f04ecba2..64de314c760f 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -56,7 +56,7 @@ let
     , stdenvOverride ? stdenv
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-04-05"
+    , version ? "unstable-2022-04-08"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 0f660b50b857..78969df95d30 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -50,8 +50,8 @@
     "beetle-snes": {
         "owner": "libretro",
         "repo": "beetle-bsnes-libretro",
-        "rev": "bc867656d7438aaffc6818b3b92350587bc78a47",
-        "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg="
+        "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91",
+        "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0="
     },
     "beetle-supergrafx": {
         "owner": "libretro",
@@ -68,8 +68,8 @@
     "beetle-wswan": {
         "owner": "libretro",
         "repo": "beetle-wswan-libretro",
-        "rev": "8f9fc6bd7afa7f7741ccba63fc27192d522de4b9",
-        "sha256": "DVuuILS4m0cMDjKQ99VU2HG60y4tFhGKwgDCrFNLp6E="
+        "rev": "089a62477c5f51ac746a5fc8eacf3599e9feb649",
+        "sha256": "yaaEJ+XgrBgtTEkffgnxvt2mrp5dsDYJ+TTxCZZU5OE="
     },
     "blastem": {
         "owner": "libretro",
@@ -98,40 +98,39 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "60431e0507c3492c4d6e4f950c4e551fe4e7e57d",
-        "sha256": "EAvBEFY0I4960DohDOShgu0Jfnww9B6bf6wPxVi7Ogg="
+        "rev": "4ba6d8d88e57d3193d95e1bcf39e8d31121f76d4",
+        "sha256": "w2MVslgRlxW4SMzgcXP4gXr9A8B07N7LNrB1LXzk1Zk="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
         "rev": "44e01f99016008eff18bc7a28234d1098382358d",
-        "sha256": "Vj0d2wAC9UYWgSURL1Qv0LR11g7c789U3W4MV3phv+4=",
-        "fetchSubmodules": true,
-        "leaveDotGit": true
+        "sha256": "vIrUStv+VM8pYeznnWSVBRfSA71/B7VIY7B/syymGzE=",
+        "fetchSubmodules": true
     },
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
-        "rev": "7b16293ebb8e272ce28d62efc39573b129cea61d",
-        "sha256": "WTUA0iOG5E8OuHjd+qbd4C5BoaN4WFYetPGj9r7CDpI="
+        "rev": "5d0ae2be2c9fb6362af528b3722e81323318eb9f",
+        "sha256": "4bJ6fLZ+fV7SnZ71YT3JFcXFOgmskNUCmCHwc2QNl0A="
     },
     "desmume2015": {
         "owner": "libretro",
         "repo": "desmume2015",
-        "rev": "cd89fb7c48c735cb321311fbce7e6e9889dda1ce",
-        "sha256": "9Ou/n6pxRjJOp/Ybpyg4+Simosj2X26kLZCMEqeVL6U="
+        "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893",
+        "sha256": "kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="
     },
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "61475de768fb7457128853656e53a942aedd79fe",
-        "sha256": "pInezsAtzVanlGHCQKraaqzWXWDYf/v5YYE7BS5yOAk="
+        "rev": "6a0b6ee8a4d5363e669f5faf43abc8f17e4278a8",
+        "sha256": "TeeHnttGmCeOTDTK/gJM+RpusjDDndapZAa3T+oLiq0="
     },
     "dosbox": {
         "owner": "libretro",
         "repo": "dosbox-libretro",
-        "rev": "1aff406faed3cfde5c1b658bacd9f8f639915912",
-        "sha256": "qRUXYd4oWRUFGAezs9Un+Avpx5Rwu1Ngjc80R5gise0="
+        "rev": "74cd17ed0ff810ff78cb8c1f1e45513bfe8a0f32",
+        "sha256": "0PIloW7j/87asDJ8IDw4r3r4muxNF+RbvkIRPLZQvRc="
     },
     "eightyone": {
         "owner": "libretro",
@@ -148,20 +147,20 @@
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "5ad211ca3d0cfc1945fee6dc260885f2ee661d79",
-        "sha256": "SHURJYmSR42uQyyqYGd071fRci9DZJ6KaD0ZWi3y/S4="
+        "rev": "01bf2e189dcd96f978c3a4ae7bbbb00f2d90aabf",
+        "sha256": "naCfGSrwA9vO3Cu2rHLplCMcTbpx6S/sapwisFCcL5c="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "013c6f3b563261747dac316c2ece81a27f963c21",
-        "sha256": "OCtiMkiWvWZYyv+E5KSf06fIrcO9+ZjsUGOVVFWc/c8="
+        "rev": "b3c35b6515b2b6a789c589f976a4a323ebebe3eb",
+        "sha256": "zwFQGQyO0Vj/IBM1k8JB3D/jB3OwDuGdSHLavr8Fxgw="
     },
     "flycast": {
         "owner": "libretro",
         "repo": "flycast",
-        "rev": "886188804de48a4bd9324046598e8dedfd0d2099",
-        "sha256": "Wxn1zEQElwLRSND4iLcIdSmiurj0WRdDgf5BfpomD9o="
+        "rev": "4c293f306bc16a265c2d768af5d0cea138426054",
+        "sha256": "9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo="
     },
     "fmsx": {
         "owner": "libretro",
@@ -196,8 +195,8 @@
     "gw": {
         "owner": "libretro",
         "repo": "gw-libretro",
-        "rev": "fc3d8d355b45466c52f8c56a8bcd395b702b310b",
-        "sha256": "kl7+StKOW7Yri7Q4O5BaxwVBIev9NLGWh0NYvyXZF20="
+        "rev": "85bf5c936044db0bf4138e7eb8ab20d3a7330035",
+        "sha256": "yCAnveQw+VyZFQ/GsUBuyoMRQ4yfhA0f3tYghZ2HecU="
     },
     "handy": {
         "owner": "libretro",
@@ -214,14 +213,14 @@
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "bd5f688bee8253f9222b13c4d33b6b8f6e442157",
-        "sha256": "23E/EjFXRxoSEG24AHjKW9H5hSjsPs3K/2uC7VJqXN0="
+        "rev": "2a0e4ea0e2362bb7dcf77216c9fcb48426cea1e8",
+        "sha256": "imuHEwzDpI8jbdOeOhBBfzl4k74mDq/3SrKD8upzZmo="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "51079410d52da026e67448c482afeac7bcc876e7",
-        "sha256": "glMsTSu7YofKs0+cg1V6tHq1DWWuGl8vAGOUOSHkxFU="
+        "rev": "f35db3877f8a79a174dd3b2e37f4ebf39d71d5a4",
+        "sha256": "JmtvxKWAYNk1SyV1YpFeLX49zzGqpUv6nqM82xU70OM="
     },
     "mame2003": {
         "owner": "libretro",
@@ -232,8 +231,8 @@
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "8f1498fff4f66323abc42b5e628f8760afe077ed",
-        "sha256": "a8EWUcp0fbOYryJ9lJFPK9rIOdcCyb1St71xVMuQBUY="
+        "rev": "e5ee29ecb8182952f861f22516e5791625fe2671",
+        "sha256": "YunfAITR/Etm8lvEab/HigZoBz+ayJQ7ezjItWI/HvE="
     },
     "mame2010": {
         "owner": "libretro",
@@ -250,8 +249,8 @@
     "mame2016": {
         "owner": "libretro",
         "repo": "mame2016-libretro",
-        "rev": "bcff8046328da388d100b1634718515e1b15415d",
-        "sha256": "XxnX39+0VUbG9TF8+wFEFVxHCm2rzrJsIQryyNsF6zU="
+        "rev": "01058613a0109424c4e7211e49ed83ac950d3993",
+        "sha256": "IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="
     },
     "melonds": {
         "owner": "libretro",
@@ -262,14 +261,14 @@
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "7dc6b816abca8663edc525a11c6115c394462c9c",
-        "sha256": "GPBMipEHDiqwH4KhuGl+Mzcy2IBcPbdmgH69etjXOk4="
+        "rev": "bb9ea02eba28682986044a6f49329ec533aa26ba",
+        "sha256": "G2NQDpByvI9RFEwrRiKXcMnPtVtqpvEoZgk7/fk5qCU="
     },
     "mesen-s": {
         "owner": "libretro",
         "repo": "mesen-s",
-        "rev": "6e010d1676d9dd6c6bc2f3ddf6b301bb4c235a99",
-        "sha256": "z+O9wkqUPIjzE4fcHit5yUjoi5WFNUrgB0TS+nWy55o="
+        "rev": "3694c7f9692a0be32d86979c347884ae9def0a3b",
+        "sha256": "VBNl4682e2X12WNjtXZ3P4/Kw4OeRLSRWyZqYDpfmCo="
     },
     "meteor": {
         "owner": "libretro",
@@ -323,8 +322,8 @@
     "parallel-n64": {
         "owner": "libretro",
         "repo": "parallel-n64",
-        "rev": "28c4572c9a09447b3bf5ed5fbd3594a558bc210d",
-        "sha256": "by8NvKjVT9OrgVhNtv5E4Fqmdva42lWV8UQi0SKfBL8="
+        "rev": "b804ab1a199d6ff1f8fef4aa7dfcf663990e430b",
+        "sha256": "zAet6hYa/79CBbvwZNTNs/ayWuHHlwg+0Y4BAUFddBc="
     },
     "pcsx2": {
         "owner": "libretro",
@@ -335,28 +334,28 @@
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "861f92d714211167fb72583f921c992ada90f0fa",
-        "sha256": "474ZGrRBzu4mtr0QFTQIZp/b5fr0PjY4XERzBMpytTk="
+        "rev": "37d9bf8315be570a350cd44876ae14f9b0eff20b",
+        "sha256": "ieuEWs+NIQFCgMl/yTnaFdClxEv5NurrLuUvkjSUar0="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "788a4f955ae308e87705a71c0448ab53cc9c5416",
-        "sha256": "AT7mK0pTDWBSzw2JnK84Yf/4z5V4BYTcb082Pycy1Vk=",
+        "rev": "bb6a52fe60e6f3bdcd17effe75e68fd0f8c44ba7",
+        "sha256": "wztctLbK7VE4OPJS7ixKwnN4VkQv96Te3FmJlZ5m4A0=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "eb061f6be52e68ede8f8094372eda66f9b7b925f",
-        "sha256": "t6o/8xiRqG+1g8BQed0geDzlLTtFiGXg1ZuTuIanXak=",
+        "rev": "ec2a9460ea2beeb69d30534ee8affbda4fc4b156",
+        "sha256": "8maLaSJiF9soJdIlYoFHSG+2XXYTdLmWH6cq9vZRd/4=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "477b1773c2b43d1aeed8bf9c4e0b125326ae7b5a",
-        "sha256": "Xn/6sqV7iswUhHDaLLeugy2b7FtsqanlyY6UsTrKDFM=",
+        "rev": "0eea0acf13022ff8d910adb55cec14ebad825afc",
+        "sha256": "f1Tscndz0TcW0bUhixEvsrbFKefLfsCFjqWA7ANnfB4=",
         "fetchSubmodules": true
     },
     "prboom": {
@@ -386,8 +385,8 @@
     "scummvm": {
         "owner": "libretro",
         "repo": "scummvm",
-        "rev": "80cb7269a33b233dcea27d8d01df084b0d35c80a",
-        "sha256": "5kMWM8d5aBbT7TseNyaYxw7VDkrLL0G+KUvJcUboQgA="
+        "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3",
+        "sha256": "wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="
     },
     "smsplus-gx": {
         "owner": "libretro",
@@ -422,8 +421,8 @@
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "fc1d87f6def11cec8773e89009ae8ed152d12487",
-        "sha256": "sja3OuTYq0BZwzuNFQ/pX6fCLaDWEbzTqlcQTxV87ZM="
+        "rev": "071e8f7eb1096dfe95d9eb2e5b7b27b30f28fbf9",
+        "sha256": "8WzBL8ojsHYxOqItHeeG4djALhqBBOV7nHE078UzqAY="
     },
     "stella2014": {
         "owner": "libretro",
@@ -434,8 +433,8 @@
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "359086eed01e63816ad9daf826dc719da7b6e96a",
-        "sha256": "y4qQecbimsBShROeM9GzlGlKcr5TV5FxOb5pzmQf4LE="
+        "rev": "0932243b0e5f1a5a237b0521b30b39473b61fa31",
+        "sha256": "krA7X9CIOg53giWSMXgzgazeyWFXEpMobPSnOB7g994="
     },
     "tgbdual": {
         "owner": "libretro",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index c75b5af622b5..0facf4e2656e 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -26,12 +26,7 @@ CORES = {
     "bsnes": {"repo": "bsnes-libretro"},
     "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"},
     "bsnes-mercury": {"repo": "bsnes-mercury"},
-    "citra": {
-        "repo": "citra",
-        "fetch_submodules": True,
-        "deep_clone": False,
-        "leave_dot_git": True,
-    },
+    "citra": { "repo": "citra", "fetch_submodules": True },
     "desmume": {"repo": "desmume"},
     "desmume2015": {"repo": "desmume2015"},
     "dolphin": {"repo": "dolphin"},

From 5f80a7ad986a684bfc4cf9fff2dbbe34fe92d116 Mon Sep 17 00:00:00 2001
From: Daniel Wheeler <daniel.wheeler2@gmail.com>
Date: Fri, 8 Apr 2022 18:03:56 -0400
Subject: [PATCH 41/67] python3Packages.fipy: fix broken build

See #167742

python3Packages.fipy is currently broken on Hydra,
https://hydra.nixos.org/build/172501646. FiPy is unable to read the
version string for Gmsh. This is currently fixed on FiPy's master and
so appropriate patch is now applied.. Patch should be removed at next
release.

Also, Gmsh was not in the path when running the tests so now added to
checkInputs.
---
 .../python-modules/fipy/default.nix           |   8 +
 .../python-modules/fipy/gmsh.patch            | 182 ++++++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 pkgs/development/python-modules/fipy/gmsh.patch

diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix
index ab670e557da4..57835019d5de 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/pkgs/development/python-modules/fipy/default.nix
@@ -39,6 +39,14 @@ buildPythonPackage rec {
   ] ++ lib.optionals isPy27 [ pysparse ]
   ++ lib.optionals (!stdenv.isDarwin) [ gmsh ];
 
+  # Reading version string from Gmsh is broken in latest release of FiPy
+  # This issue is repaired on master branch of FiPy
+  # Fixed with: https://github.com/usnistgov/fipy/pull/848/files
+  # Remove patch with next release.
+  patches = [ ./gmsh.patch ];
+
+  checkInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ];
+
   checkPhase = ''
     export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh
     ${python.interpreter} setup.py test --modules
diff --git a/pkgs/development/python-modules/fipy/gmsh.patch b/pkgs/development/python-modules/fipy/gmsh.patch
new file mode 100644
index 000000000000..7e7b687ac8c6
--- /dev/null
+++ b/pkgs/development/python-modules/fipy/gmsh.patch
@@ -0,0 +1,182 @@
+diff --git a/fipy/meshes/gmshMesh.py b/fipy/meshes/gmshMesh.py
+index fc3ff6c8..d529d532 100755
+--- a/fipy/meshes/gmshMesh.py
++++ b/fipy/meshes/gmshMesh.py
+@@ -13,11 +13,11 @@ import sys
+ import tempfile
+ from textwrap import dedent
+ import warnings
+-from distutils.version import StrictVersion
+ 
+ from fipy.tools import numerix as nx
+ from fipy.tools import parallelComm
+ from fipy.tools import serialComm
++from fipy.tools.version import Version, parse_version
+ from fipy.tests.doctestPlus import register_skipper
+ 
+ from fipy.meshes.mesh import Mesh
+@@ -38,7 +38,7 @@ def _checkForGmsh():
+     hasGmsh = True
+     try:
+         version = _gmshVersion(communicator=parallelComm)
+-        hasGmsh = version >= StrictVersion("2.0")
++        hasGmsh = version >= Version("2.0")
+     except Exception:
+         hasGmsh = False
+     return hasGmsh
+@@ -68,6 +68,7 @@ def gmshVersion(communicator=parallelComm):
+         while True:
+             try:
+                 # gmsh returns version in stderr (Why?!?)
++                # (newer versions of gmsh return the version in stdout)
+                 # spyder on Windows throws
+                 #   OSError: [WinError 6] The handle is invalid
+                 # if we don't PIPE stdout, too
+@@ -77,8 +78,11 @@ def gmshVersion(communicator=parallelComm):
+                 break
+ 
+             try:
+-                out, verStr = p.communicate()
+-                verStr = verStr.decode('ascii').strip()
++                out, err = p.communicate()
++                verStr = err.decode('ascii').strip()
++                if not verStr:
++                    # newer versions of gmsh return the version in stdout
++                    verStr = out.decode('ascii').strip()
+                 break
+             except IOError:
+                 # some weird conflict with things like PyQT can cause
+@@ -93,12 +97,12 @@ def gmshVersion(communicator=parallelComm):
+ def _gmshVersion(communicator=parallelComm):
+     version = gmshVersion(communicator) or "0.0"
+     try:
+-        version = StrictVersion(version)
++        version = parse_version(version)
+     except ValueError:
+         # gmsh returns the version string in stderr,
+         # which means it's often unparsable due to irrelevant warnings
+         # assume it's OK and move on
+-        version = StrictVersion("3.0")
++        version = Version("3.0")
+ 
+     return version
+ 
+@@ -133,7 +137,7 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
+ 
+     # Enforce gmsh version to be either >= 2 or 2.5, based on Nproc.
+     version = _gmshVersion(communicator=communicator)
+-    if version < StrictVersion("2.0"):
++    if version < Version("2.0"):
+         raise EnvironmentError("Gmsh version must be >= 2.0.")
+ 
+     # If we're being passed a .msh file, leave it be. Otherwise,
+@@ -176,9 +180,11 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
+             gmshFlags = ["-%d" % dimensions, "-nopopup"]
+ 
+             if communicator.Nproc > 1:
+-                if not (StrictVersion("2.5") < version <= StrictVersion("4.0")):
+-                    warnstr = "Cannot partition with Gmsh version < 2.5 or >= 4.0. " \
+-                               + "Reverting to serial."
++                if  ((version < Version("2.5"))
++                     or (Version("4.0") <= version < Version("4.5.2"))):
++                    warnstr = ("Cannot partition with Gmsh version < 2.5 "
++                               "or 4.0 <= version < 4.5.2. "
++                               "Reverting to serial.")
+                     warnings.warn(warnstr, RuntimeWarning, stacklevel=2)
+                     communicator = serialComm
+ 
+@@ -188,13 +194,13 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
+                         raise ValueError("'dimensions' must be specified to generate a mesh from a geometry script")
+                 else: # gmsh version is adequate for partitioning
+                     gmshFlags += ["-part", "%d" % communicator.Nproc]
+-                    if version >= StrictVersion("4.0"):
++                    if version >= Version("4.0"):
+                         # Gmsh 4.x needs to be told to generate ghost cells
+-                        # Unfortunately, the ghosts are broken
++                        # Unfortunately, the ghosts are broken in Gmsh 4.0--4.5.1
+                         # https://gitlab.onelab.info/gmsh/gmsh/issues/733
+                         gmshFlags += ["-part_ghosts"]
+ 
+-            gmshFlags += ["-format", "msh2"]
++            gmshFlags += ["-format", "msh2", "-smooth", "8"]
+ 
+             if background is not None:
+                 if communicator.procID == 0:
+@@ -1387,6 +1393,11 @@ class _GmshTopology(_MeshTopology):
+ class Gmsh2D(Mesh2D):
+     """Construct a 2D Mesh using Gmsh
+ 
++    If called in parallel, the mesh will be partitioned based on the value
++    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
++    been previously partitioned with the number of partitions matching
++    `parallelComm.Nproc`.
++
+     >>> radius = 5.
+     >>> side = 4.
+     >>> squaredCircle = Gmsh2D('''
+@@ -1875,6 +1886,11 @@ class Gmsh2D(Mesh2D):
+ class Gmsh2DIn3DSpace(Gmsh2D):
+     """Create a topologically 2D Mesh in 3D coordinates using Gmsh
+ 
++    If called in parallel, the mesh will be partitioned based on the value
++    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
++    been previously partitioned with the number of partitions matching
++    `parallelComm.Nproc`.
++
+     Parameters
+     ----------
+     arg : str
+@@ -1959,6 +1975,11 @@ class Gmsh2DIn3DSpace(Gmsh2D):
+ class Gmsh3D(Mesh):
+     """Create a 3D Mesh using Gmsh
+ 
++    If called in parallel, the mesh will be partitioned based on the value
++    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
++    been previously partitioned with the number of partitions matching
++    `parallelComm.Nproc`.
++
+     Parameters
+     ----------
+     arg : str
+@@ -2225,7 +2246,7 @@ class GmshGrid2D(Gmsh2D):
+         width  = nx * dx
+         numLayers = int(ny / float(dy))
+ 
+-        if _gmshVersion() < StrictVersion("2.7"):
++        if _gmshVersion() < Version("2.7"):
+             # kludge: must offset cellSize by `eps` to work properly
+             eps = float(dx)/(nx * 10)
+         else:
+@@ -2299,7 +2320,7 @@ class GmshGrid3D(Gmsh3D):
+         width  = nx * dx
+         depth  = nz * dz
+ 
+-        if _gmshVersion() < StrictVersion("2.7"):
++        if _gmshVersion() < Version("2.7"):
+             # kludge: must offset cellSize by `eps` to work properly
+             eps = float(dx)/(nx * 10)
+         else:
+diff --git a/fipy/tools/version.py b/fipy/tools/version.py
+new file mode 100644
+index 00000000..93d89c18
+--- /dev/null
++++ b/fipy/tools/version.py
+@@ -0,0 +1,18 @@
++"""Shim for version checking
++
++`distutils.version` is deprecated, but `packaging.version` is unavailable
++in Python 2.7
++"""
++from __future__ import unicode_literals
++
++__docformat__ = 'restructuredtext'
++
++
++__all__ = ["Version", "parse_version"]
++from future.utils import text_to_native_str
++__all__ = [text_to_native_str(n) for n in __all__]
++
++try:
++    from packaging.version import Version, parse as parse_version
++except ImportError:
++    from distutils.version import StrictVersion as Version, StrictVersion as parse_version    

From eab6133b18ac806a5ca0894c0728d34b5fa935a3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 23:22:01 +0100
Subject: [PATCH 42/67] libretro: rename script

---
 .../emulators/retroarch/{update.py => update_cores.py}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/applications/emulators/retroarch/{update.py => update_cores.py} (100%)

diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update_cores.py
similarity index 100%
rename from pkgs/applications/emulators/retroarch/update.py
rename to pkgs/applications/emulators/retroarch/update_cores.py

From cb2cd8f23f58b974b6270fd3c9f3e480498a0a7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 22:48:59 +0000
Subject: [PATCH 43/67] python310Packages.globus-sdk: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 6895db19abc1..88a2c49e0520 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.6.0";
+  version = "3.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "globus";
     repo = "globus-sdk-python";
-    rev = version;
-    hash = "sha256-SBLQ+uSZE8YkT+fQWIKGlfhocJXX5k9kSejAbjazjM8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Us3SCkrBPL3v9YCOQ7ceF3neCUZkJTrchYsvCRSX84Y=";
   };
 
   propagatedBuildInputs = [

From 351814a1512cf522cefef35227058a24c242240b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 23:38:24 +0000
Subject: [PATCH 44/67] postgresql11Packages.plpgsql_check: 2.1.2 -> 2.1.3

---
 pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index ff5f464c8e51..dae538822385 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "plpgsql_check";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-S/b6oQPYgaM6UvloYqlwhF5rxlyKG4Vw6ejN/gK8Spg=";
+    sha256 = "sha256-hVbx1eUrVQ35UzcokoqYCi6RFI5Dn7t9XH8q9VbyDbQ=";
   };
 
   buildInputs = [ postgresql ];

From 8ab5294ee950f99b7c3898d848cb61f7852ebb39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Apr 2022 00:26:58 +0000
Subject: [PATCH 45/67] pipenv: 2022.3.28 -> 2022.4.8

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

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index c177d18f1369..e0d73d7f8f07 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -19,11 +19,11 @@ let
 
 in buildPythonApplication rec {
   pname = "pipenv";
-  version = "2022.3.28";
+  version = "2022.4.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-TnquYtrXZ5zoG1TMNFG+GfssRp4mkzWzaxQTL+XO7LM=";
+    sha256 = "sha256-U1Yr9p2eUjj5mh4hAcNWdGscCu+l3OubioSlo+IB3g0=";
   };
 
   LC_ALL = "en_US.UTF-8";

From 9a83d8ce9490bc240518440f66e9366c6cab1de7 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Apr 2022 01:43:34 -0500
Subject: [PATCH 46/67] binlore: 0.1.4 -> 0.2.0

Also track upstream .nix changes over same period.
---
 .../tools/analysis/binlore/default.nix        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix
index ac46bd4c4185..e6d529b0684a 100644
--- a/pkgs/development/tools/analysis/binlore/default.nix
+++ b/pkgs/development/tools/analysis/binlore/default.nix
@@ -30,8 +30,8 @@ let
   src = fetchFromGitHub {
     owner = "abathur";
     repo = "binlore";
-    rev = "v0.1.4";
-    hash = "sha256-+N0Bqyaj/mAwrcgFtUI8czmKo3VW6J8ZRxaPEghp7QM=";
+    rev = "v0.2.0";
+    hash = "sha256-bBJky7Km+mieHTqoMz3mda3KaKxr9ipYpfQqn/4w8J0=";
   };
   /*
   binlore has one one more yallbacks responsible for
@@ -57,11 +57,11 @@ let
     #   since this form will make it easier to pilot other
     #   uses of binlore.
     callback = lore: drv: overrides: ''
-      if [[ -d "${drv}/bin" ]]; then
+      if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
         echo generating binlore for $drv by running:
-        echo "${yara}/bin/yara ${lore.rules} ${drv}/bin | ${yallback}/bin/yallback ${lore.yallback}"
+        echo "${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}"
       else
-        echo "failed to generate binlore for $drv (${drv}/bin doesn't exist)"
+        echo "failed to generate binlore for $drv (none of ${drv}/{bin,lib,libexec} exist)"
       fi
     '' +
     /*
@@ -83,18 +83,19 @@ let
         fi
         ((i--)) || true # don't break build
       done # || true # don't break build
-      if [[ -d "${drv}/bin" ]]; then
-        ${yara}/bin/yara ${lore.rules} ${drv}/bin | ${yallback}/bin/yallback ${lore.yallback} "$filter"
+      if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
+        ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} "$filter"
       fi
     '';
   };
   overrides = (src + /overrides);
 
 in rec {
-  collect = { lore ? loreDef, drvs }: (runCommand "more-binlore" { } ''
+  collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } ''
     mkdir $out
     for lorefile in ${toString lore.types}; do
-      cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin drvs))} > $out/$lorefile
+      cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin (builtins.filter lib.isDerivation drvs)))} > $out/$lorefile
+      substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace '${x}/' '' ") strip}
     done
   '');
   # TODO: echo for debug, can be removed at some point

From 09d441d21c547254cbd6eb2f2ba8f079b2a16a32 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Apr 2022 01:45:09 -0500
Subject: [PATCH 47/67] resholve: 0.6.9 -> 0.8.0

Also track upstream .nix changes over same window.
---
 pkgs/development/misc/resholve/README.md      | 169 ++++++++++++------
 pkgs/development/misc/resholve/default.nix    |  42 +----
 .../misc/resholve/resholve-package.nix        |  37 ----
 .../misc/resholve/resholve-utils.nix          | 169 +++++++++++++++---
 pkgs/development/misc/resholve/resholve.nix   |  13 +-
 pkgs/development/misc/resholve/source.nix     |   4 +-
 pkgs/development/misc/resholve/test.nix       |  75 ++------
 pkgs/top-level/aliases.nix                    |   9 +
 pkgs/top-level/all-packages.nix               |   2 +-
 9 files changed, 302 insertions(+), 218 deletions(-)
 delete mode 100644 pkgs/development/misc/resholve/resholve-package.nix

diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md
index 0b4bcb371ade..1ea8843c01ed 100644
--- a/pkgs/development/misc/resholve/README.md
+++ b/pkgs/development/misc/resholve/README.md
@@ -1,9 +1,18 @@
 # Using resholve's Nix API
+resholve replaces bare references (subject to a PATH search at runtime) to external commands and scripts with absolute paths.
 
-resholve converts bare executable references in shell scripts to absolute
-paths. This will hopefully make its way into the Nixpkgs manual soon, but
-until then I'll outline how to use the `resholvePackage`, `resholveScript`,
-and `resholveScriptBin` functions.
+This small super-power helps ensure script dependencies are declared, present, and don't unexpectedly shift when the PATH changes.
+
+resholve is developed to enable the Nix package manager to package and integrate Shell projects, but its features are not Nix-specific and inevitably have other applications.
+
+<!-- generated from resholve's repo; best to suggest edits there (or at least notify me) -->
+
+This will hopefully make its way into the Nixpkgs manual soon, but
+until then I'll outline how to use the functions:
+- `resholve.mkDerivation` (formerly `resholvePackage`)
+- `resholve.writeScript` (formerly `resholveScript`)
+- `resholve.writeScriptBin` (formerly `resholveScriptBin`)
+- `resholve.phraseSolution` (new in resholve 0.8.0)
 
 > Fair warning: resholve does *not* aspire to resolving all valid Shell
 > scripts. It depends on the OSH/Oil parser, which aims to support most (but
@@ -11,7 +20,7 @@ and `resholveScriptBin` functions.
 
 ## API Concepts
 
-The main difference between `resholvePackage` and other builder functions
+The main difference between `resholve.mkDerivation` and other builder functions
 is the `solutions` attrset, which describes which scripts to resolve and how.
 Each "solution" (k=v pair) in this attrset describes one resholve invocation.
 
@@ -22,70 +31,81 @@ Each "solution" (k=v pair) in this attrset describes one resholve invocation.
 > - Packages with scripts that require conflicting directives can use multiple
 >   solutions to resolve the scripts separately, but produce a single package.
 
-The `resholveScript` and `resholveScriptBin` functions support a _single_
-`solution` attrset. This is basically the same as any single solution in `resholvePackage`, except that it doesn't need a `scripts` attr (it is automatically added).
+`resholve.writeScript` and `resholve.writeScriptBin` support a _single_
+`solution` attrset. This is basically the same as any single solution in `resholve.mkDerivation`, except that it doesn't need a `scripts` attr (it is automatically added). `resholve.phraseSolution` also only accepts a single solution--but it _does_ still require the `scripts` attr.
 
-## Basic `resholvePackage` Example
+## Basic `resholve.mkDerivation` Example
 
-Here's a simple example from one of my own projects, with annotations:
-<!--
-TODO: ideally this will use a nixpkgs example; but we don't have any IN yet
-and the first package PR (bashup-events) is too complex for this context.
--->
+Here's a simple example of how `resholve.mkDerivation` is already used in nixpkgs:
+
+<!-- TODO: figure out how to pull this externally? -->
 
 ```nix
-{ stdenv, lib, resholvePackage, fetchFromGitHub, bashup-events44, bashInteractive_5, doCheck ? true, shellcheck }:
+{ lib
+, fetchFromGitHub
+, resholve
+, substituteAll
+, bash
+, coreutils
+, goss
+, which
+}:
 
-resholvePackage rec {
-  pname = "shellswain";
-  version = "unreleased";
+resholve.mkDerivation rec {
+  pname = "dgoss";
+  version = "0.3.16";
 
   src = fetchFromGitHub {
-    # ...
+    owner = "aelsabbahy";
+    repo = "goss";
+    rev = "v${version}";
+    sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p";
   };
 
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    sed -i '2i GOSS_PATH=${goss}/bin/goss' extras/dgoss/dgoss
+    install -D extras/dgoss/dgoss $out/bin/dgoss
+  '';
+
   solutions = {
-    # Give each solution a short name. This is what you'd use to
-    # override its settings, and it shows in (some) error messages.
-    profile = {
-      # the only *required* arguments are the 3 below
-
-      # Specify 1 or more $out-relative script paths. Unlike many
-      # builders, resholvePackage modifies the output files during
-      # fixup (to correctly resolve in-package sourcing).
-      scripts = [ "bin/shellswain.bash" ];
-
-      # "none" for no shebang, "${bash}/bin/bash" for bash, etc.
-      interpreter = "none";
-
-      # packages resholve should resolve executables from
-      inputs = [ bashup-events44 ];
+    default = {
+      scripts = [ "bin/dgoss" ];
+      interpreter = "${bash}/bin/bash";
+      inputs = [ coreutils which ];
+      fake = {
+        external = [ "docker" ];
+      };
     };
   };
 
-  makeFlags = [ "prefix=${placeholder "out"}" ];
-
-  inherit doCheck;
-  checkInputs = [ shellcheck ];
-
-  # ...
+  meta = with lib; {
+    homepage = "https://github.com/aelsabbahy/goss/blob/v${version}/extras/dgoss/README.md";
+    description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ hyzual ];
+  };
 }
 ```
 
-## Basic `resholveScript` and `resholveScriptBin` examples
+
+## Basic `resholve.writeScript` and `resholve.writeScriptBin` examples
 
 Both of these functions have the same basic API. This example is a little
 trivial for now. If you have a real usage that you find helpful, please PR it.
 
 ```nix
-resholvedScript = resholveScript "name" {
+resholvedScript = resholve.writeScript "name" {
     inputs = [ file ];
     interpreter = "${bash}/bin/bash";
   } ''
     echo "Hello"
     file .
   '';
-resholvedScriptBin = resholveScriptBin "name" {
+resholvedScriptBin = resholve.writeScriptBin "name" {
     inputs = [ file ];
     interpreter = "${bash}/bin/bash";
   } ''
@@ -94,25 +114,56 @@ resholvedScriptBin = resholveScriptBin "name" {
   '';
 ```
 
+
+## Basic `resholve.phraseSolution` example
+
+This function has a similar API to `writeScript` and `writeScriptBin`, except it does require a `scripts` attr. It is intended to make resholve a little easier to mix into more types of build. This example is a little
+trivial for now. If you have a real usage that you find helpful, please PR it.
+
+```nix
+{ stdenv, resholve, module1 }:
+
+stdenv.mkDerivation {
+  # pname = "testmod3";
+  # version = "unreleased";
+  # src = ...;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install conjure.sh $out/bin/conjure.sh
+    ${resholve.phraseSolution "conjure" {
+      scripts = [ "bin/conjure.sh" ];
+      interpreter = "${bash}/bin/bash";
+      inputs = [ module1 ];
+      fake = {
+        external = [ "jq" "openssl" ];
+      };
+    }}
+  '';
+}
+```
+
+
 ## Options
 
-`resholvePackage` maps Nix types/idioms into the flags and environment variables
+`resholve.mkDerivation` maps Nix types/idioms into the flags and environment variables
 that the `resholve` CLI expects. Here's an overview:
 
-| Option        | Type    | Containing                                            |
-| ------------- | ------- | ----------------------------------------------------- |
-| scripts       | list    | $out-relative string paths to resolve                 |
-| inputs        | list    | packages to resolve executables from                  |
-| interpreter   | string  | 'none' or abspath for shebang                         |
-| prologue      | file    | text to insert before the first code-line             |
-| epilogue      | file    | text to insert after the last code-line               |
-| flags         | list    | strings to pass as flags                              |
-| fake          | attrset | [directives](#controlling-resolution-with-directives) |
-| fix           | attrset | [directives](#controlling-resolution-with-directives) |
-| keep          | attrset | [directives](#controlling-resolution-with-directives) |
-| lore          | string  | [lore directory](#controlling-nested-resolution-with-lore)  |
-| execers       | list    | [execer lore directive](#controlling-nested-resolution-with-lore) |
-| wrappers      | list    | [wrapper lore directive](#controlling-nested-resolution-with-lore) |
+| Option | Type | Containing |
+|--------|------|------------|
+| scripts | `<list>` | scripts to resolve (`$out`-relative paths) |
+| interpreter | `"none"` `<path>` | The absolute interpreter `<path>` for the script's shebang. The special value `none` ensures there is no shebang. |
+| inputs | `<packages>` | Packages to resolve external dependencies from. |
+| fake | `<directives>` | pretend some commands exist |
+| fix | `<directives>` | fix things we can't auto-fix/ignore |
+| keep | `<directives>` | keep things we can't auto-fix/ignore |
+| lore | `<directory>` | control nested resolution |
+| execer | `<statements>` | modify nested resolution |
+| wrapper | `<statements>` | modify nested resolution |
+| prologue | `<file>` | insert file before resolved script |
+| epilogue | `<file>` | insert file after resolved script |
+
+<!-- TODO: section below is largely custom for nixpkgs, but I would LIKE to wurst it. -->
 
 ## Controlling resolution with directives
 
@@ -184,6 +235,7 @@ keep = {
 };
 ```
 
+
 > **Note:** For now, at least, you'll need to reference the manpage to completely understand these examples.
 
 ## Controlling nested resolution with lore
@@ -213,7 +265,7 @@ There will be more mechanisms for controlling this process in the future
 the main lever is the ability to substitute your own lore. This is how you'd
 do it piecemeal:
 
-```
+```nix
 # --execer 'cannot:${openssl.bin}/bin/openssl can:${openssl.bin}/bin/c_rehash'
 execer = [
   /*
@@ -237,5 +289,6 @@ execer = [
 ];
 ```
 
+
 The format is fairly simple to generate--you can script your own generator if
 you need to modify the lore.
diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix
index 714c4ecabe08..b2ee3c1d1b57 100644
--- a/pkgs/development/misc/resholve/default.nix
+++ b/pkgs/development/misc/resholve/default.nix
@@ -1,5 +1,5 @@
 { callPackage
-, writeTextFile
+, ...
 }:
 
 let
@@ -7,47 +7,15 @@ let
   deps = callPackage ./deps.nix { };
 in
 rec {
+  # resholve itself
   resholve = callPackage ./resholve.nix {
     inherit (source) rSrc version;
     inherit (deps.oil) oildev;
+    inherit resholve-utils;
   };
+  # funcs to validate and phrase invocations of resholve
+  # and use those invocations to build packages
   resholve-utils = callPackage ./resholve-utils.nix {
     inherit resholve;
   };
-  resholvePackage = callPackage ./resholve-package.nix {
-    inherit resholve resholve-utils;
-  };
-  resholveScript = name: partialSolution: text:
-    writeTextFile {
-      inherit name text;
-      executable = true;
-      checkPhase = ''
-        (
-          PS4=$'\x1f'"\033[33m[resholve context]\033[0m "
-          set -x
-          ${resholve-utils.makeInvocation name (partialSolution // {
-            scripts = [ "${placeholder "out"}" ];
-          })}
-        )
-        ${partialSolution.interpreter} -n $out
-      '';
-    };
-  resholveScriptBin = name: partialSolution: text:
-    writeTextFile rec {
-      inherit name text;
-      executable = true;
-      destination = "/bin/${name}";
-      checkPhase = ''
-        (
-          cd "$out"
-          PS4=$'\x1f'"\033[33m[resholve context]\033[0m "
-          set -x
-          : changing directory to $PWD
-          ${resholve-utils.makeInvocation name (partialSolution // {
-            scripts = [ "bin/${name}" ];
-          })}
-        )
-        ${partialSolution.interpreter} -n $out/bin/${name}
-      '';
-    };
 }
diff --git a/pkgs/development/misc/resholve/resholve-package.nix b/pkgs/development/misc/resholve/resholve-package.nix
deleted file mode 100644
index 89852efb8bac..000000000000
--- a/pkgs/development/misc/resholve/resholve-package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, resholve, resholve-utils }:
-
-{ pname
-, src
-, version
-, passthru ? { }
-, solutions
-, ...
-}@attrs:
-let
-  inherit stdenv;
-
-  self = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
-    // {
-    inherit pname version src;
-    buildInputs = (lib.optionals (builtins.hasAttr "buildInputs" attrs) attrs.buildInputs) ++ [ resholve ];
-
-    # enable below for verbose debug info if needed
-    # supports default python.logging levels
-    # LOGLEVEL="INFO";
-    /*
-      subshell/PS4/set -x and : command to output resholve envs
-      and invocation. Extra context makes it clearer what the
-      Nix API is doing, makes nix-shell debugging easier, etc.
-    */
-    preFixup = ''
-      (
-        cd "$out"
-        PS4=$'\x1f'"\033[33m[resholve context]\033[0m "
-        set -x
-        : changing directory to $PWD
-        ${builtins.concatStringsSep "\n" (resholve-utils.makeCommands solutions)}
-      )
-    '';
-  }));
-in
-lib.extendDerivation true passthru self
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix
index 2d3c55b87563..27e347e7c4aa 100644
--- a/pkgs/development/misc/resholve/resholve-utils.nix
+++ b/pkgs/development/misc/resholve/resholve-utils.nix
@@ -1,4 +1,4 @@
-{ lib, resholve, binlore }:
+{ lib, stdenv, resholve, binlore, writeTextFile }:
 
 rec {
   /* These functions break up the work of partially validating the
@@ -10,6 +10,7 @@ rec {
 
   # for brevity / line length
   spaces = l: builtins.concatStringsSep " " l;
+  colons = l: builtins.concatStringsSep ":" l;
   semicolons = l: builtins.concatStringsSep ";" l;
 
   /* Throw a fit with dotted attr path context */
@@ -17,58 +18,186 @@ rec {
     throw "${builtins.concatStringsSep "." path}: ${msg}";
 
   /* Special-case directive value representations by type */
-  makeDirective = solution: env: name: val:
+  phraseDirective = solution: env: name: val:
     if builtins.isInt val then builtins.toString val
     else if builtins.isString val then name
     else if true == val then name
     else if false == val then "" # omit!
     else if null == val then "" # omit!
-    else if builtins.isList val then "${name}:${semicolons val}"
+    else if builtins.isList val then "${name}:${semicolons (map lib.escapeShellArg val)}"
     else nope [ solution env name ] "unexpected type: ${builtins.typeOf val}";
 
   /* Build fake/fix/keep directives from Nix types */
-  makeDirectives = solution: env: val:
-    lib.mapAttrsToList (makeDirective solution env) val;
+  phraseDirectives = solution: env: val:
+    lib.mapAttrsToList (phraseDirective solution env) val;
+
+  /* Custom ~search-path routine to handle relative path strings */
+  relSafeBinPath = input:
+    if lib.isDerivation input then ((lib.getOutput "bin" input) + "/bin")
+    else if builtins.isString input then input
+    else throw "unexpected type for input: ${builtins.typeOf input}";
 
   /* Special-case value representation by type/name */
-  makeEnvVal = solution: env: val:
-    if env == "inputs" then lib.makeBinPath val
+  phraseEnvVal = solution: env: val:
+    if env == "inputs" then (colons (map relSafeBinPath val))
     else if builtins.isString val then val
     else if builtins.isList val then spaces val
-    else if builtins.isAttrs val then spaces (makeDirectives solution env val)
+    else if builtins.isAttrs val then spaces (phraseDirectives solution env val)
     else nope [ solution env ] "unexpected type: ${builtins.typeOf val}";
 
   /* Shell-format each env value */
   shellEnv = solution: env: value:
-    lib.escapeShellArg (makeEnvVal solution env value);
+    lib.escapeShellArg (phraseEnvVal solution env value);
 
   /* Build a single ENV=val pair */
-  makeEnv = solution: env: value:
+  phraseEnv = solution: env: value:
     "RESHOLVE_${lib.toUpper env}=${shellEnv solution env value}";
 
-  /* Discard attrs claimed by makeArgs */
-  removeCliArgs = value:
-    removeAttrs value [ "scripts" "flags" ];
+  /* Discard attrs:
+  - claimed by phraseArgs
+  - only needed for binlore.collect
+  */
+  removeUnneededArgs = value:
+    removeAttrs value [ "scripts" "flags" "unresholved" ];
 
   /* Verify required arguments are present */
   validateSolution = { scripts, inputs, interpreter, ... }: true;
 
   /* Pull out specific solution keys to build ENV=val pairs */
-  makeEnvs = solution: value:
-    spaces (lib.mapAttrsToList (makeEnv solution) (removeCliArgs value));
+  phraseEnvs = solution: value:
+    spaces (lib.mapAttrsToList (phraseEnv solution) (removeUnneededArgs value));
 
   /* Pull out specific solution keys to build CLI argstring */
-  makeArgs = { flags ? [ ], scripts, ... }:
+  phraseArgs = { flags ? [ ], scripts, ... }:
     spaces (flags ++ scripts);
 
+  phraseBinloreArgs = value:
+    let
+      hasUnresholved = builtins.hasAttr "unresholved" value;
+    in {
+      drvs = value.inputs ++
+        lib.optionals hasUnresholved [ value.unresholved ];
+      strip = if hasUnresholved then [ value.unresholved ] else [ ];
+    };
+
   /* Build a single resholve invocation */
-  makeInvocation = solution: value:
+  phraseInvocation = solution: value:
     if validateSolution value then
     # we pass resholve a directory
-      "RESHOLVE_LORE=${binlore.collect { drvs = value.inputs; } } ${makeEnvs solution value} ${resholve}/bin/resholve --overwrite ${makeArgs value}"
+      "RESHOLVE_LORE=${binlore.collect (phraseBinloreArgs value) } ${phraseEnvs solution value} ${resholve}/bin/resholve --overwrite ${phraseArgs value}"
     else throw "invalid solution"; # shouldn't trigger for now
 
+  injectUnresholved = solutions: unresholved: (builtins.mapAttrs (name: value: value // { inherit unresholved; } ) solutions);
+
   /* Build resholve invocation for each solution. */
-  makeCommands = solutions:
-    lib.mapAttrsToList makeInvocation solutions;
+  phraseCommands = solutions: unresholved:
+    builtins.concatStringsSep "\n" (
+      lib.mapAttrsToList phraseInvocation (injectUnresholved solutions unresholved)
+    );
+
+  /*
+    subshell/PS4/set -x and : command to output resholve envs
+    and invocation. Extra context makes it clearer what the
+    Nix API is doing, makes nix-shell debugging easier, etc.
+  */
+  phraseContext = { invokable, prep ? ''cd "$out"'' }: ''
+    (
+      ${prep}
+      PS4=$'\x1f'"\033[33m[resholve context]\033[0m "
+      set -x
+      : invoking resholve with PWD=$PWD
+      ${invokable}
+    )
+  '';
+  phraseContextForPWD = invokable: phraseContext { inherit invokable; prep = ""; };
+  phraseContextForOut = invokable: phraseContext { inherit invokable; };
+
+  phraseSolution = name: solution: (phraseContextForOut (phraseInvocation name solution));
+  phraseSolutions = solutions: unresholved:
+    phraseContextForOut (phraseCommands solutions unresholved);
+
+  writeScript = name: partialSolution: text:
+    writeTextFile {
+      inherit name text;
+      executable = true;
+      checkPhase = ''
+         ${(phraseContextForPWD (
+             phraseInvocation name (
+               partialSolution // {
+                 scripts = [ "${placeholder "out"}" ];
+               }
+             )
+           )
+         )}
+        ${partialSolution.interpreter} -n $out
+      '';
+    };
+  writeScriptBin = name: partialSolution: text:
+    writeTextFile rec {
+      inherit name text;
+      executable = true;
+      destination = "/bin/${name}";
+      checkPhase = ''
+        ${phraseContextForOut (
+            phraseInvocation name (
+              partialSolution // {
+                scripts = [ "bin/${name}" ];
+              }
+            )
+          )
+        }
+        ${partialSolution.interpreter} -n $out/bin/${name}
+      '';
+    };
+  mkDerivation = { pname
+    , src
+    , version
+    , passthru ? { }
+    , solutions
+    , ...
+    }@attrs:
+    let
+      inherit stdenv;
+
+      /*
+      Knock out our special solutions arg, but otherwise
+      just build what the caller is giving us. We'll
+      actually resholve it separately below (after we
+      generate binlore for it).
+      */
+      unresholved = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
+        // {
+        inherit pname version src;
+      }));
+    in
+    /*
+    resholve in a separate derivation; some concerns:
+    - we aren't keeping many of the user's args, so they
+      can't readily set LOGLEVEL and such...
+    - not sure how this affects multiple outputs
+    */
+    lib.extendDerivation true passthru (stdenv.mkDerivation {
+      src = unresholved;
+      version = unresholved.version;
+      pname = "resholved-${unresholved.pname}";
+      buildInputs = [ resholve ];
+
+      # retain a reference to the base
+      passthru = unresholved.passthru // {
+        unresholved = unresholved;
+      };
+
+      # do these imply that we should use NoCC or something?
+      dontConfigure = true;
+      dontBuild = true;
+
+      installPhase = ''
+        cp -R $src $out
+      '';
+
+      # enable below for verbose debug info if needed
+      # supports default python.logging levels
+      # LOGLEVEL="INFO";
+      preFixup = phraseSolutions solutions unresholved;
+    });
 }
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index f364b73158e9..959e7ee0cb52 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -7,14 +7,13 @@
 , version
 , oildev
 , binlore
+, resholve-utils
 }:
 
 python27Packages.buildPythonApplication {
   pname = "resholve";
   inherit version;
   src = rSrc;
-  format = "other";
-  dontBuild = true;
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -32,13 +31,12 @@ python27Packages.buildPythonApplication {
   ];
 
   patchPhase = ''
-    for file in resholve; do
+    for file in setup.cfg _resholve/version.py; do
       substituteInPlace $file --subst-var-by version ${version}
     done
   '';
 
-  installPhase = ''
-    install -Dm755 resholve $out/bin/resholve
+   postInstall = ''
     installManPage resholve.1
   '';
 
@@ -48,7 +46,10 @@ python27Packages.buildPythonApplication {
     rm $out/nix-support/propagated-build-inputs
   '';
 
-  passthru.tests = callPackage ./test.nix { inherit rSrc; inherit binlore; };
+  passthru = {
+    inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin;
+    tests = callPackage ./test.nix { inherit rSrc binlore; };
+  };
 
   meta = with lib; {
     description = "Resolve external shell-script dependencies";
diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix
index f2d431d37ef8..ee69f6c21be9 100644
--- a/pkgs/development/misc/resholve/source.nix
+++ b/pkgs/development/misc/resholve/source.nix
@@ -3,7 +3,7 @@
 }:
 
 rec {
-  version = "0.6.9";
+  version = "0.8.0";
   rSrc =
     # local build -> `make ci`; `make clean` to restore
     # return to remote source
@@ -14,6 +14,6 @@ rec {
         owner = "abathur";
         repo = "resholve";
         rev = "v${version}";
-        hash = "sha256-y9O5w4wA/kR8zoPay9pGs3vwxNqq3JEeZmX0wBJq4UQ=";
+        hash = "sha256-oWS4ZBPjgH2UvYmvHVVRcyl15r3VS964BmB89y9DGo8=";
       };
 }
diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix
index 2c17cf2ea038..2b8a3ec3d296 100644
--- a/pkgs/development/misc/resholve/test.nix
+++ b/pkgs/development/misc/resholve/test.nix
@@ -2,10 +2,8 @@
 , stdenv
 , callPackage
 , resholve
-, resholvePackage
-, resholveScript
-, resholveScriptBin
 , shunit2
+, fetchFromGitHub
 , coreutils
 , gnused
 , gnugrep
@@ -34,46 +32,7 @@ let
   parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ];
 in
 rec {
-  re_shunit2 = with shunit2;
-    resholvePackage {
-      inherit pname src version installPhase;
-      solutions = {
-        shunit = {
-          interpreter = "none";
-          scripts = [ "bin/shunit2" ];
-          inputs = [ coreutils gnused gnugrep findutils ];
-          # resholve's Nix API is analogous to the CLI flags
-          # documented in 'man resholve'
-          fake = {
-            # "missing" functions shunit2 expects the user to declare
-            function = [
-              "oneTimeSetUp"
-              "oneTimeTearDown"
-              "setUp"
-              "tearDown"
-              "suite"
-              "noexec"
-            ];
-            # shunit2 is both bash and zsh compatible, and in
-            # some zsh-specific code it uses this non-bash builtin
-            builtin = [ "setopt" ];
-          };
-          fix = {
-            # stray absolute path; make it resolve from coreutils
-            "/usr/bin/od" = true;
-          };
-          keep = {
-            # variables invoked as commands; long-term goal is to
-            # resolve the *variable*, but that is complexish, so
-            # this is where we are...
-            "$__SHUNIT_CMD_ECHO_ESC" = true;
-            "$_SHUNIT_LINENO_" = true;
-            "$SHUNIT_CMD_TPUT" = true;
-          };
-        };
-      };
-    };
-  module1 = resholvePackage {
+  module1 = resholve.mkDerivation {
     pname = "testmod1";
     version = "unreleased";
 
@@ -97,7 +56,7 @@ rec {
 
     is_it_okay_with_arbitrary_envs = "shonuff";
   };
-  module2 = resholvePackage {
+  module2 = resholve.mkDerivation {
     pname = "testmod2";
     version = "unreleased";
 
@@ -105,19 +64,20 @@ rec {
     setSourceRoot = "sourceRoot=$(echo */tests/nix/openssl)";
 
     installPhase = ''
-      mkdir -p $out/bin
+      mkdir -p $out/bin $out/libexec
       install openssl.sh $out/bin/openssl.sh
+      install libexec.sh $out/libexec/invokeme
       install profile $out/profile
     '';
-
+    # LOGLEVEL="DEBUG";
     solutions = {
       openssl = {
         fix = {
           aliases = true;
         };
-        scripts = [ "bin/openssl.sh" ];
+        scripts = [ "bin/openssl.sh" "libexec/invokeme" ];
         interpreter = "none";
-        inputs = [ re_shunit2 openssl.bin ];
+        inputs = [ shunit2 openssl.bin "libexec" "libexec/invokeme" ];
         execer = [
           /*
             This is the same verdict binlore will
@@ -136,7 +96,8 @@ rec {
       };
     };
   };
-  module3 = resholvePackage {
+  # demonstrate that we could use resholve in larger build
+  module3 = stdenv.mkDerivation {
     pname = "testmod3";
     version = "unreleased";
 
@@ -146,15 +107,15 @@ rec {
     installPhase = ''
       mkdir -p $out/bin
       install conjure.sh $out/bin/conjure.sh
-    '';
-
-    solutions = {
-      conjure = {
+      ${resholve.phraseSolution "conjure" {
         scripts = [ "bin/conjure.sh" ];
         interpreter = "${bash}/bin/bash";
         inputs = [ module1 ];
-      };
-    };
+        fake = {
+          external = [ "jq" "openssl" ];
+        };
+      }}
+    '';
   };
 
   cli = stdenv.mkDerivation {
@@ -204,14 +165,14 @@ rec {
   };
 
   # Caution: ci.nix asserts the equality of both of these w/ diff
-  resholvedScript = resholveScript "resholved-script" {
+  resholvedScript = resholve.writeScript "resholved-script" {
     inputs = [ file ];
     interpreter = "${bash}/bin/bash";
   } ''
     echo "Hello"
     file .
   '';
-  resholvedScriptBin = resholveScriptBin "resholved-script-bin" {
+  resholvedScriptBin = resholve.writeScriptBin "resholved-script-bin" {
     inputs = [ file ];
     interpreter = "${bash}/bin/bash";
   } ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f3a3ed3404d1..41c3f40f052f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1039,6 +1039,15 @@ mapAliases ({
   redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
   reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
   renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
+
+  /* 3 resholve aliases below added 2022-04-08 to ease breaking change
+  - convert to throw after 2022-07-01
+  - drop after 2022-11-30?
+  */
+  resholvePackage = builtins.trace "resholvePackage is deprecated, use resholve.mkDerivation instead" resholve.mkDerivation;
+  resholveScript = builtins.trace "resholveScript is deprecated, use resholve.writeScript instead" resholve.writeScript;
+  resholveScriptBin = builtins.trace "resholveScriptBin is deprecated, use resholve.writeScriptBin instead" resholve.writeScriptBin;
+
   residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
   retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19
   retroshare06 = retroshare;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8b9406d343..ae2bbc045ecf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9540,7 +9540,7 @@ with pkgs;
   rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };
 
   inherit (callPackage ../development/misc/resholve { })
-    resholve resholvePackage resholveScript resholveScriptBin;
+    resholve;
 
   restool = callPackage ../os-specific/linux/restool {};
 

From 368346c5a13a5c5c6f6dfbe5e7719c3065ce3429 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Apr 2022 01:47:36 -0500
Subject: [PATCH 48/67] resholve: track API update in dependent packages

---
 pkgs/applications/version-management/yadm/default.nix |  4 ++--
 pkgs/development/interpreters/bats/default.nix        |  4 ++--
 pkgs/development/libraries/bashup-events/generic.nix  |  4 ++--
 pkgs/tools/misc/arch-install-scripts/default.nix      |  6 +++---
 pkgs/tools/misc/dgoss/default.nix                     |  4 ++--
 pkgs/tools/misc/shunit2/default.nix                   |  6 +++---
 pkgs/tools/typesetting/pdf2odt/default.nix            |  4 ++--
 pkgs/top-level/aliases.nix                            | 11 ++++-------
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index ffd5fdaab7c0..c48962841fd8 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , git
 , bash
@@ -27,7 +27,7 @@ to support their use in yadm.
 , yadm
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "yadm";
   version = "3.1.1";
 
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 3379d1370af1..da12e7a3e65f 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,4 +1,4 @@
-{ resholvePackage
+{ resholve
 , lib
 , stdenv
 , fetchFromGitHub
@@ -10,7 +10,7 @@
 , doInstallCheck ? true
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "bats";
   version = "1.6.0";
 
diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix
index 2f99a2616816..bf46dcd8def2 100644
--- a/pkgs/development/libraries/bashup-events/generic.nix
+++ b/pkgs/development/libraries/bashup-events/generic.nix
@@ -1,7 +1,7 @@
 {
   # general
   lib
-, resholvePackage
+, resholve
 , bash
 , doCheck ? true
 , doInstallCheck ? true
@@ -32,7 +32,7 @@ let
     '';
 
 in
-resholvePackage rec {
+resholve.mkDerivation rec {
   # bashup.events doesn't version yet but it has two variants with
   # differing features/performance characteristics:
   # - branch master: a variant for bash 3.2+
diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix
index 0df8ae1e7337..a967e4989e61 100644
--- a/pkgs/tools/misc/arch-install-scripts/default.nix
+++ b/pkgs/tools/misc/arch-install-scripts/default.nix
@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , asciidoc
 , bash
@@ -10,7 +10,7 @@
 , util-linux
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "arch-install-scripts";
   version = "24";
 
@@ -43,7 +43,7 @@ resholvePackage rec {
       # the only *required* arguments are the 3 below
 
       # Specify 1 or more $out-relative script paths. Unlike many
-      # builders, resholvePackage modifies the output files during
+      # builders, resholve.mkDerivation modifies the output files during
       # fixup (to correctly resolve in-package sourcing).
       scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ];
 
diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/tools/misc/dgoss/default.nix
index 5af576b3877a..e050ff0f26b4 100644
--- a/pkgs/tools/misc/dgoss/default.nix
+++ b/pkgs/tools/misc/dgoss/default.nix
@@ -1,6 +1,6 @@
 { lib
 , fetchFromGitHub
-, resholvePackage
+, resholve
 , substituteAll
 , bash
 , coreutils
@@ -8,7 +8,7 @@
 , which
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "dgoss";
   version = "0.3.16";
 
diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix
index a0ec572a409d..1120c756895b 100644
--- a/pkgs/tools/misc/shunit2/default.nix
+++ b/pkgs/tools/misc/shunit2/default.nix
@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , bash
 , coreutils
@@ -9,7 +9,7 @@
 , ncurses
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "shunit2";
   version = "2.1.8";
 
@@ -63,7 +63,7 @@ resholvePackage rec {
         interpreter, we can pre-test this. But if we go fiddle
         the interpreter later, I guess we _could_ break it.
         */
-        "$__SHUNIT_CMD_ECHO_ESC" = [ "'echo -e'" ];
+        "$__SHUNIT_CMD_ECHO_ESC" = [ "echo -e" ];
         "$SHUNIT_CMD_TPUT" = [ "tput" ]; # from ncurses
       };
       keep = {
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
index f1568de60ebb..e0063d2f72e8 100644
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ b/pkgs/tools/typesetting/pdf2odt/default.nix
@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , bc
 , coreutils
@@ -13,7 +13,7 @@
 , findutils
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "pdf2odt";
   version = "20170207";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 41c3f40f052f..7b6b4f3e3d4f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1040,13 +1040,10 @@ mapAliases ({
   reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
   renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
 
-  /* 3 resholve aliases below added 2022-04-08 to ease breaking change
-  - convert to throw after 2022-07-01
-  - drop after 2022-11-30?
-  */
-  resholvePackage = builtins.trace "resholvePackage is deprecated, use resholve.mkDerivation instead" resholve.mkDerivation;
-  resholveScript = builtins.trace "resholveScript is deprecated, use resholve.writeScript instead" resholve.writeScript;
-  resholveScriptBin = builtins.trace "resholveScriptBin is deprecated, use resholve.writeScriptBin instead" resholve.writeScriptBin;
+  # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30?
+  resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation";
+  resholveScript = throw "resholveScript has been renamed to resholve.writeScript";
+  resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin";
 
   residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
   retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19

From 1e29572c5770acad2a0448228220a3dfdaa1d850 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Apr 2022 10:19:46 -0500
Subject: [PATCH 49/67] resholve: add release note for API reorg

---
 .../from_md/release-notes/rl-2205.section.xml | 27 +++++++++++++++++++
 .../manual/release-notes/rl-2205.section.md   |  5 ++++
 2 files changed, 32 insertions(+)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 4a2e58ff871d..10985e6e3f4f 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1294,6 +1294,33 @@
           example.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Existing <literal>resholve*</literal> functions have been
+          renamed and nested under <literal>pkgs.resholve</literal>.
+          Update uses to:
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              <literal>resholvePackage</literal> -&gt;
+              <literal>resholve.mkDerivation</literal>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>resholveScript</literal> -&gt;
+              <literal>resholve.writeScript</literal>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>resholveScriptBin</literal> -&gt;
+              <literal>resholve.writeScriptBin</literal>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
       <listitem>
         <para>
           <literal>pkgs.cosmopolitan</literal> no longer provides the
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 6a42cac87782..127d44443be0 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -456,6 +456,11 @@ In addition to numerous new and upgraded packages, this release has the followin
 
   See the `vscode` package for a more detailed example.
 
+- Existing `resholve*` functions have been renamed and nested under `pkgs.resholve`. Update uses to:
+  - `resholvePackage` -> `resholve.mkDerivation`
+  - `resholveScript` -> `resholve.writeScript`
+  - `resholveScriptBin` -> `resholve.writeScriptBin`
+
 - `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From 9dec3ecd7086f7384ebef8a6475f4599071fa6d0 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sat, 9 Apr 2022 08:56:30 +0800
Subject: [PATCH 50/67] eksctl: 0.91.0 -> 0.92.0

---
 pkgs/tools/admin/eksctl/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index df96da11d105..fdb9a37806ab 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.91.0";
+  version = "0.92.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Hz/joHOzy71ZtbpoTjomccSgc49VyWACTC9EwSiDpzc=";
+    sha256 = "sha256-CsOR5S2FpIE/T1N/wLzXs5ltuLkice0YRKgdZUTz3ic=";
   };
 
-  vendorSha256 = "sha256-rkEVtIHXD5lXj8r89vhoWhJZF3unvwB43Zz3jBHRjYU=";
+  vendorSha256 = "sha256-gNmIBjGG/EieNNjC7XLOD/SXQm96kRxbiT2JmdaPrh4=";
 
   doCheck = false;
 
@@ -29,10 +29,10 @@ buildGoModule rec {
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    for shell in bash fish zsh; do
-      $out/bin/eksctl completion $shell > eksctl.$shell
-      installShellCompletion eksctl.$shell
-    done
+    installShellCompletion --cmd eksctl \
+      --bash <($out/bin/eksctl completion bash) \
+      --fish <($out/bin/eksctl completion fish) \
+      --zsh  <($out/bin/eksctl completion zsh)
   '';
 
   meta = with lib; {

From 9bea21d0c418aceeb451a84099bf0d3849cccd05 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Fri, 8 Apr 2022 21:04:13 -0400
Subject: [PATCH 51/67] datafusion-cli: init at unstable-2022-04-08

---
 pkgs/development/misc/datafusion/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/misc/datafusion/default.nix

diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix
new file mode 100644
index 000000000000..88859b976129
--- /dev/null
+++ b/pkgs/development/misc/datafusion/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, lib
+, rustPlatform
+, fetchFromGitHub
+}:
+let
+  pname = "datafusion-cli";
+  version = "unstable-2022-04-08";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  # TODO the crate has been yanked so not the best source
+  # the repo is a workspace with a lock inside a subdirectory, making
+  # compilation from github source not straightforward
+  # re-evaluate strategy on release after 7.0.0
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "arrow-datafusion";
+    rev = "9cbde6d0e30fd29f59b0a16e309bdb0843cc7c64";
+    sha256 = "sha256-XXd9jvWVivOBRS0PVOU9F4RQ6MrS/q78JF4S6Htd67w=";
+  };
+  sourceRoot = "source/datafusion-cli";
+
+  cargoSha256 = "sha256-Q0SjVofl1+sex15sSU9s7PgKeHG2b0gJPSqz7YZFOVs=";
+
+  meta = with lib; {
+    description = "cli for Apache Arrow DataFusion";
+    homepage = "https://arrow.apache.org/datafusion";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ happysalada ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae2bbc045ecf..5ef3b1095633 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2869,6 +2869,8 @@ with pkgs;
 
   dasher = callPackage ../applications/accessibility/dasher { };
 
+  datafusion-cli = callPackage ../development/misc/datafusion { };
+
   datamash = callPackage ../tools/misc/datamash { };
 
   datasette = with python3Packages; toPythonApplication datasette;

From f3fc2a5320d9b23fe713d3ebead6815fe7698383 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 01:21:28 +0000
Subject: [PATCH 52/67] jql: 3.2.0 -> 3.2.4

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

diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix
index 0154df2c7fc0..ba3635260125 100644
--- a/pkgs/development/tools/jql/default.nix
+++ b/pkgs/development/tools/jql/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jql";
-  version = "3.2.0";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-U++yypq9M1C6Sh9rv3rmn/qwTXWdPFDBpjFS6eoS2L4=";
+    sha256 = "sha256-wokdlmczClYwVskBDpKQyka1GiLf4JvRiooK+qo7Tv4=";
   };
 
-  cargoSha256 = "sha256-uyD+QBDfnZa3nfZcUAqruYqJ9nVAa5+XOPONds0ysXU=";
+  cargoSha256 = "sha256-6L78LxxzqkjP9k71WmZhkhNVdKLXUwSYioKynaETTaA=";
 
   meta = with lib; {
     description = "A JSON Query Language CLI tool built with Rust";

From 07ef761ff04cb0bcf5736368e56590ae8d4c04cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Apr 2022 01:59:58 +0000
Subject: [PATCH 53/67] i3status-rust: 0.21.8 -> 0.21.9

---
 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 ed518d8eb2e8..83406d33961c 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.21.8";
+  version = "0.21.9";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-l0XfitQSmSkivEg8+XcA/+bWdy/wzIpii/Npc4p8kUw=";
+    sha256 = "sha256-UbQEPY/Qzu3akWqCTdbhO8V46KyNh/4XCA+PySQyNaw=";
   };
 
-  cargoSha256 = "sha256-2rJ9ZZHK1acJu6r6EjuoolLJZMdBsbKgN1DNvGM7deA=";
+  cargoSha256 = "sha256-Bb4kkS0eSg0ue24UIy8f0kwD9w4kSCVTd1OqwEggyVs=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

From 3852ba6881dc5f56dc2a09727287e26c7426ba0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Apr 2022 23:29:18 +0000
Subject: [PATCH 54/67] gping: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix
index 3ca9d3b553e4..89d07b851664 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/pkgs/tools/networking/gping/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gping";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = "gping";
     rev = "gping-v${version}";
-    sha256 = "sha256-Q7M/vDhECEIQ8s8qt1U7wESqv+Im79TyZ6s2vqjU5ps=";
+    sha256 = "sha256-/CH9cSOkgXxdxSN1G4Jg404KOHEYhnsSCK4QB6Zdk+A=";
   };
 
-  cargoSha256 = "sha256-cnmjfvMqq8VDMvjFPnjmmH57Gaqttk36AwEtuuAT6qU=";
+  cargoSha256 = "sha256-2knD3MwrJKvbdovh6bd81GqHHqeAG1OFzXsLB4eO0Do=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 

From 615163679e5c9053d9d3a8ba2fc8897689bc4ab2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Apr 2022 08:51:00 +0000
Subject: [PATCH 55/67] cargo-about: 0.5.0 -> 0.5.1

---
 pkgs/tools/package-management/cargo-about/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index 0ed6f978ba96..8b98858e823b 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-M09X7UwrTtrOhOphhpGHSAqxneY50jNrFKJCeBQhRfc=";
+    sha256 = "sha256-T8Hhody0jMmZb6/xMkSvKCv4STZPbcrf/UB3APspYDM=";
   };
 
   # enable pkg-config feature of zstd
   cargoPatches = [ ./zstd-pkg-config.patch ];
 
-  cargoSha256 = "sha256-E1+OfVAzrezXoUz9Nlyhdq1xxEWm4UJhVyp+nG7UmYY=";
+  cargoSha256 = "sha256-x/HzDYNy0FDxJmhjSUUEiyahM7Sw27aC+ULP/Ii0X/8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From efc8de690c438add3e6175c0eb285fd4e562f8c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Apr 2022 11:40:08 +0000
Subject: [PATCH 56/67] dprint: 0.22.2 -> 0.24.3

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

diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix
index f2bd4bb1b2a2..63f0324ac8f4 100644
--- a/pkgs/development/tools/dprint/default.nix
+++ b/pkgs/development/tools/dprint/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dprint";
-  version = "0.22.2";
+  version = "0.24.3";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-iYqQABXd3Vra+U7cfGKBEyTXfQGwHxFSxEoDyCfKk5Y=";
+    sha256 = "sha256-QWPQ48mSTAeVz+iXid5fE/nSLt1+QxJ562m3FFZ8rcU=";
   };
 
-  cargoSha256 = "sha256-QMOS8Pn3RwZZRtKqp077ihh91Q4VPe8alrtQ6dYIXmA=";
+  cargoSha256 = "sha256-XXGtY4vzS/mkF/aRlLA7A/tsSEqXlJQgU0wJp6q/Nu8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

From 49ec9e33e9ab3be35645fd13ffec5419e3459bea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Apr 2022 04:10:25 +0000
Subject: [PATCH 57/67] python310Packages.pex: 2.1.77 -> 2.1.78

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 305f47a17f05..5aead8eed5ed 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.77";
+  version = "2.1.78";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lvzRb+m3a3DmimzVIroobJaNe2PuMoadb48YwhxCVvA=";
+    hash = "sha256-1bWAEMMBjmyLS1W+VWgD9BsZq5f0DmEOQryXH9vupCY=";
   };
 
   nativeBuildInputs = [

From c5aa205dd5258489f3315791a69421a2d181822e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Apr 2022 04:22:51 +0000
Subject: [PATCH 58/67] python310Packages.python-binance: 1.0.10 -> 1.0.16

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

diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index cd1e09557ecb..bea6492be0dc 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "python-binance";
-  version = "1.0.10";
+  version = "1.0.16";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "sammchardy";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "09pq2blvky1ah4k8yc6zkp2g5nkn3awc52ad3lxvj6m33akfzxiv";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-2v3qeykjQR/CUOC6F0Xomm49Q+wrYJS8vmL3+u6ew0M=";
   };
 
   propagatedBuildInputs = [

From 1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 3 Apr 2022 11:19:04 +0200
Subject: [PATCH 59/67] cudaPackages: overhaul of how we package cuda packages

There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
---
 doc/languages-frameworks/cuda.section.md      |  34 +
 doc/languages-frameworks/index.xml            |   1 +
 nixos/modules/services/misc/ethminer.nix      |   2 +-
 pkgs/applications/misc/blender/default.nix    |   4 +-
 .../applications/misc/firestarter/default.nix |   4 +-
 .../science/math/caffe/default.nix            |  10 +-
 .../science/math/cntk/default.nix             |   8 +-
 .../science/math/mxnet/default.nix            |   8 +-
 .../auto-add-opengl-runpath-hook.sh           |  14 +
 .../compilers/cudatoolkit/common.nix          |   1 +
 .../compilers/cudatoolkit/default.nix         |  94 --
 .../compilers/cudatoolkit/extension.nix       |  15 +
 .../redist/build-cuda-redist-package.nix      |  51 +
 .../cudatoolkit/redist/extension.nix          |  32 +
 .../redist/manifests/redistrib_11.4.4.json    | 862 +++++++++++++++++
 .../redist/manifests/redistrib_11.5.2.json    | 873 ++++++++++++++++++
 .../redist/manifests/redistrib_11.6.2.json    | 873 ++++++++++++++++++
 .../cudatoolkit/redist/overrides.nix          |  72 ++
 .../compilers/cudatoolkit/versions.toml       |  59 ++
 .../libraries/librealsense/default.nix        |   6 +-
 .../libraries/science/math/caffe2/default.nix |   8 +-
 .../libraries/science/math/cudnn/default.nix  | 114 ---
 .../science/math/cudnn/extension.nix          | 112 +++
 .../libraries/science/math/cudnn/generic.nix  |  31 +-
 .../science/math/cutensor/default.nix         |  48 -
 .../science/math/libtorch/test/default.nix    |   5 +-
 .../libraries/science/math/magma/default.nix  |   6 +-
 .../libraries/science/math/tensorflow/bin.nix |   5 +-
 .../python-modules/Theano/default.nix         |  12 +-
 .../python-modules/cupy/default.nix           |  10 +-
 .../development/python-modules/jaxlib/bin.nix |  12 +-
 .../python-modules/jaxlib/default.nix         |   8 +-
 .../python-modules/libgpuarray/default.nix    |   4 +-
 .../python-modules/numba/default.nix          |   7 +-
 .../python-modules/pycuda/default.nix         |   4 +-
 .../python-modules/pytorch/default.nix        |   8 +-
 .../python-modules/tensorflow/bin.nix         |   8 +-
 .../python-modules/tensorflow/default.nix     |   7 +-
 .../python-modules/torchvision/default.nix    |   4 +-
 pkgs/games/katago/default.nix                 |   7 +-
 .../cuda/cuda-library-samples/default.nix     |  52 --
 .../cuda/cuda-library-samples/extension.nix   |   3 +
 .../cuda/cuda-library-samples/generic.nix     |   6 +-
 pkgs/test/cuda/cuda-samples/default.nix       |  54 --
 pkgs/test/cuda/cuda-samples/extension.nix     |  20 +
 pkgs/top-level/aliases.nix                    |  46 +-
 pkgs/top-level/all-packages.nix               |  81 +-
 pkgs/top-level/cuda-packages.nix              |  72 ++
 pkgs/top-level/python-packages.nix            |  39 +-
 pkgs/top-level/release-cuda.nix               |  55 ++
 50 files changed, 3350 insertions(+), 521 deletions(-)
 create mode 100644 doc/languages-frameworks/cuda.section.md
 create mode 100644 pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
 delete mode 100644 pkgs/development/compilers/cudatoolkit/default.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/extension.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/extension.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json
 create mode 100644 pkgs/development/compilers/cudatoolkit/redist/overrides.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/versions.toml
 delete mode 100644 pkgs/development/libraries/science/math/cudnn/default.nix
 create mode 100644 pkgs/development/libraries/science/math/cudnn/extension.nix
 delete mode 100644 pkgs/development/libraries/science/math/cutensor/default.nix
 delete mode 100644 pkgs/test/cuda/cuda-library-samples/default.nix
 create mode 100644 pkgs/test/cuda/cuda-library-samples/extension.nix
 delete mode 100644 pkgs/test/cuda/cuda-samples/default.nix
 create mode 100644 pkgs/test/cuda/cuda-samples/extension.nix
 create mode 100644 pkgs/top-level/cuda-packages.nix
 create mode 100644 pkgs/top-level/release-cuda.nix

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
new file mode 100644
index 000000000000..fccf66bf79d2
--- /dev/null
+++ b/doc/languages-frameworks/cuda.section.md
@@ -0,0 +1,34 @@
+# CUDA {#cuda}
+
+CUDA-only packages are stored in the `cudaPackages` packages set. This set
+includes the `cudatoolkit`, portions of the toolkit in separate derivations,
+`cudnn`, `cutensor` and `nccl`.
+
+A package set is available for each CUDA version, so for example
+`cudaPackages_11_6`. Within each set is a matching version of the above listed
+packages. Additionally, other versions of the packages that are packaged and
+compatible are available as well. For example, there can be a
+`cudaPackages.cudnn_8_3_2` package.
+
+To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional
+```nix
+cudaSupport ? false
+cudaPackages ? {}
+```
+
+When using `callPackage`, you can choose to pass in a different variant, e.g.
+when a different version of the toolkit suffices
+```nix
+mypkg = callPackage { cudaPackages = cudaPackages_11_5; }
+```
+
+If another version of say `cudnn` or `cutensor` is needed, you can override the
+package set to make it the default. This guarantees you get a consistent package
+set.
+```nix
+mypkg = let
+  cudaPackages = cudaPackages_11_5.overrideScope' (final: prev {
+    cudnn = prev.cudnn_8_3_2;
+  }});
+in callPackage { inherit cudaPackages; };
+```
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index f221693e764c..144fa96bac12 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -11,6 +11,7 @@
  <xi:include href="bower.section.xml" />
  <xi:include href="coq.section.xml" />
  <xi:include href="crystal.section.xml" />
+ <xi:include href="cuda.section.xml" />
  <xi:include href="dhall.section.xml" />
  <xi:include href="dotnet.section.xml" />
  <xi:include href="emscripten.section.xml" />
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix
index 253476d1a23e..223634669828 100644
--- a/nixos/modules/services/misc/ethminer.nix
+++ b/nixos/modules/services/misc/ethminer.nix
@@ -85,7 +85,7 @@ in
   config = mkIf cfg.enable {
 
     systemd.services.ethminer = {
-      path = optional (cfg.toolkit == "cuda") [ pkgs.cudatoolkit ];
+      path = optional (cfg.toolkit == "cuda") [ pkgs.cudaPackages.cudatoolkit ];
       description = "ethminer ethereum mining service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index a0467b817142..2e3ff53550a9 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -5,7 +5,7 @@
 , openvdb, libXxf86vm, tbb, alembic
 , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
-, cudaSupport ? config.cudaSupport or false, cudatoolkit_11
+, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
 , colladaSupport ? true, opencollada
 , spaceNavSupport ? stdenv.isLinux, libspnav
 , makeWrapper
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
     ])
     ++ optional jackaudioSupport libjack2
-    ++ optional cudaSupport cudatoolkit_11
+    ++ optional cudaSupport cudaPackages.cudatoolkit
     ++ optional colladaSupport opencollada
     ++ optional spaceNavSupport libspnav;
   pythonPath = with python310Packages; [ numpy requests ];
diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix
index 92c517835d83..dca8e1256919 100644
--- a/pkgs/applications/misc/firestarter/default.nix
+++ b/pkgs/applications/misc/firestarter/default.nix
@@ -8,11 +8,13 @@
 , glibc
 , git
 , pkg-config
-, cudatoolkit
+, cudaPackages ? {}
 , withCuda ? false
 }:
 
 let
+  inherit (cudaPackages) cudatoolkit;
+
   hwloc = stdenv.mkDerivation rec {
     pname = "hwloc";
     version = "2.2.0";
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index db2e74f24523..d6c95633dd52 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -13,13 +13,17 @@
 , Accelerate, CoreGraphics, CoreVideo
 , lmdbSupport ? true, lmdb
 , leveldbSupport ? true, leveldb, snappy
-, cudaSupport ? config.cudaSupport or false, cudatoolkit
-, cudnnSupport ? cudaSupport, cudnn ? null
-, ncclSupport ? false, nccl ? null
+, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
+, cudnnSupport ? cudaSupport
+, ncclSupport ? false
 , pythonSupport ? false, python ? null, numpy ? null
 , substituteAll
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn nccl;
+in
+
 assert leveldbSupport -> (leveldb != null && snappy != null);
 assert cudnnSupport -> cudaSupport;
 assert ncclSupport -> cudaSupport;
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index eb14982575a2..d39c04e8feec 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -2,10 +2,14 @@
 , fetchpatch
 , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
 , onebitSGDSupport ? false
-, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11
-, cudnnSupport ? cudaSupport, cudnn
+, cudaSupport ? false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11
+, cudnnSupport ? cudaSupport
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 assert cudnnSupport -> cudaSupport;
 assert blas.implementation == "openblas" && lapack.implementation == "openblas";
 
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 8e5e1ebd7e80..8353226cefed 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,10 +1,14 @@
 { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake
 , opencv3, gtest, blas, gomp, llvmPackages, perl
-, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
-, cudnnSupport ? cudaSupport, cudnn
+, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11
+, cudnnSupport ? cudaSupport
 , cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ]
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 assert cudnnSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
new file mode 100644
index 000000000000..0b0da336514a
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
@@ -0,0 +1,14 @@
+# Run autoOpenGLRunpath on all files
+echo "Sourcing auto-add-opengl-runpath-hook"
+
+autoAddOpenGLRunpathPhase  () {
+    # TODO: support multiple outputs
+    for file in $(find ${out,lib,bin} -type f); do
+        addOpenGLRunpath $file
+    done
+}
+
+if [ -z "${dontUseAutoAddOpenGLRunpath-}" ]; then
+    echo "Using autoAddOpenGLRunpathPhase"
+    postFixupHooks+=(autoAddOpenGLRunpathPhase)
+fi
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
index 46832e1cc2de..6375c513f411 100644
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -254,6 +254,7 @@ stdenv.mkDerivation rec {
   '';
   passthru = {
     cc = gcc;
+    majorMinorVersion = lib.versions.majorMinor version;
     majorVersion = lib.versions.majorMinor version;
   };
 
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
deleted file mode 100644
index d7fa6ee59f0a..000000000000
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ callPackage
-, fetchurl
-, gcc7
-, gcc9
-, gcc10
-, lib
-}:
-
-let
-  common = callPackage ./common.nix;
-in
-rec {
-  cudatoolkit_10_0 = common {
-    version = "10.0.130";
-    url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
-    sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj";
-
-    gcc = gcc7;
-  };
-
-  cudatoolkit_10_1 = common {
-    version = "10.1.243";
-    url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run";
-    sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7";
-
-    gcc = gcc7;
-  };
-
-  cudatoolkit_10_2 = common {
-    version = "10.2.89";
-    url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run";
-    sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an";
-
-    gcc = gcc7;
-  };
-
-  cudatoolkit_10 = cudatoolkit_10_2;
-
-  cudatoolkit_11_0 = common {
-    version = "11.0.3";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run";
-    sha256 = "1h4c69nfrgm09jzv8xjnjcvpq8n4gnlii17v3wzqry5d13jc8ydh";
-
-    gcc = gcc9;
-  };
-
-  cudatoolkit_11_1 = common {
-    version = "11.1.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run";
-    sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy";
-    gcc = gcc9;
-  };
-
-  cudatoolkit_11_2 = common {
-    version = "11.2.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run";
-    sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g=";
-    gcc = gcc9;
-  };
-
-  cudatoolkit_11_3 = common {
-    version = "11.3.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run";
-    sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd";
-    gcc = gcc9;
-  };
-
-  cudatoolkit_11_4 = common {
-    version = "11.4.2";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run";
-    sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo=";
-    gcc = gcc10; # can bump to 11 along with stdenv.cc
-  };
-
-  cudatoolkit_11_5 = common {
-    version = "11.5.0";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run";
-    sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw=";
-    gcc = gcc10; # can bump to 11 along with stdenv.cc
-  };
-
-  cudatoolkit_11_6 = common {
-    version = "11.6.1";
-    url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run";
-    sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4=";
-    gcc = gcc10; # can bump to 11 along with stdenv.cc
-  };
-
-  # Make sure to only ever update this to a version that is compatible with the
-  # latest cudnn, nccl, cutensor, etc! It sometimes happens that CUDA versions
-  # are released prior to compatibility with the rest of the ecosystem. And
-  # don't forget to request a review from @NixOS/cuda-maintainers!
-  cudatoolkit_11 = cudatoolkit_11_5; # update me to 11_6 when cudnn>=8.3.3
-}
diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix
new file mode 100644
index 000000000000..862c83167992
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/extension.nix
@@ -0,0 +1,15 @@
+final: prev: let
+  ### Cuda Toolkit
+
+  # Function to build the class cudatoolkit package
+  buildCudaToolkitPackage = final.callPackage ./common.nix;
+
+  # Version info for the classic cudatoolkit packages that contain everything that is in redist.
+  cudatoolkitVersions = final.lib.importTOML ./versions.toml;
+
+  ### Add classic cudatoolkit package
+  cudatoolkit = buildCudaToolkitPackage ((attrs: attrs // { gcc = prev.pkgs.${attrs.gcc}; }) cudatoolkitVersions.${final.cudaVersion});
+
+in {
+  inherit cudatoolkit;
+}
diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix
new file mode 100644
index 000000000000..9bbd7ea1da11
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix
@@ -0,0 +1,51 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, autoAddOpenGLRunpathHook
+}:
+
+pname:
+attrs:
+
+let
+  arch = "linux-x86_64";
+in stdenv.mkDerivation {
+  inherit pname;
+  inherit (attrs) version;
+
+  src = assert (lib.hasAttr arch attrs); fetchurl {
+    url = "https://developer.download.nvidia.com/compute/cuda/redist/${attrs.${arch}.relative_path}";
+    inherit (attrs.${arch}) sha256;
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    # This hook will make sure libcuda can be found
+    # in typically /lib/opengl-driver by adding that
+    # directory to the rpath of all ELF binaries.
+    # Check e.g. with `patchelf --print-rpath path/to/my/binary
+    autoAddOpenGLRunpathHook
+  ];
+
+  buildInputs = [
+    stdenv.cc.cc.lib
+  ];
+
+  dontBuild = true;
+
+  # TODO: choose whether to install static/dynamic libs
+  installPhase = ''
+    runHook preInstall
+    rm LICENSE
+    mkdir -p $out
+    mv * $out
+    runHook postInstall
+  '';
+
+  meta = {
+    description = attrs.name;
+    license = lib.licenses.unfree;
+    platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix
new file mode 100644
index 000000000000..65057b90a03c
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix
@@ -0,0 +1,32 @@
+final: prev: let
+
+  inherit (final) callPackage;
+  inherit (prev) cudaVersion lib pkgs;
+
+  ### Cuda Toolkit Redist
+
+  # Manifest files for redist cudatoolkit. These can be found at
+  # https://developer.download.nvidia.com/compute/cuda/redist/
+  cudaToolkitRedistManifests = {
+    "11.4" = ./manifests/redistrib_11.4.4.json;
+    "11.5" = ./manifests/redistrib_11.5.2.json;
+    "11.6" = ./manifests/redistrib_11.6.2.json;
+  };
+
+  # Function to build a single cudatoolkit redist package
+  buildCudaToolkitRedistPackage = callPackage ./build-cuda-redist-package.nix { };
+
+  # Function that builds all cudatoolkit redist packages given a cuda version and manifest file
+  buildCudaToolkitRedistPackages = { version, manifest }: let
+    attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest);
+  in lib.mapAttrs buildCudaToolkitRedistPackage attrs;
+
+  redistExists = cudaToolkitRedistManifests ? "${cudaVersion}";
+
+  # All cudatoolkit redist packages for the current cuda version
+  cudaToolkitRedistPackages = if
+    lib.hasAttr cudaVersion cudaToolkitRedistManifests
+  then buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }
+  else {};
+
+in cudaToolkitRedistPackages
diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json
new file mode 100644
index 000000000000..374079b2bcb3
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json
@@ -0,0 +1,862 @@
+{
+    "release_date": "2022-02-01",
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "version": "11.4.122",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.4.122-archive.tar.xz",
+            "sha256": "150b163bde4975154d6238ae1272c74df81b303dccca1f7637bd91027b65afc5",
+            "md5": "e0e41040716a4d6113410d7cb25c7906",
+            "size": "951832"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.4.122-archive.tar.xz",
+            "sha256": "0d1d729ac3f52bdd04f197a6cef295b3463c4975d70dbd97f4e1b08a4857f488",
+            "md5": "f615eccb3b8d694f4c7aa864c93959d7",
+            "size": "951780"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.4.122-archive.tar.xz",
+            "sha256": "98f495b99c68fae54fe728e72aa3b8e2e5b1d77c9fd4946370cec3b063a7fcf3",
+            "md5": "28692dd487b5936dbfac70ac56b65561",
+            "size": "951340"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.4.122-archive.zip",
+            "sha256": "d721c4bcc5bf8054eb944b7c3203ce5f593523f798559f3f4c1effdd8ed36f48",
+            "md5": "fa6bbf1291ebdd8f63f4f5176be4ae9c",
+            "size": "2422426"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "version": "11.4.148",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.4.148-archive.tar.xz",
+            "sha256": "36bd6f1ea8711f69405ebd0b26d1f791a6ef6eb01cc3f01ba4231eb8ec09c208",
+            "md5": "b98036aa5e633eb19b7ef2e32e8811a7",
+            "size": "828732"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.4.148-archive.tar.xz",
+            "sha256": "fb70c6477dce2cfc3ee13d361b76453ad92671be36f98fab50e2510f657eb00e",
+            "md5": "594855b91ad5e9aa674d3a93d741431e",
+            "size": "777952"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.4.148-archive.tar.xz",
+            "sha256": "d013448f76c22614e458de94b5289807d2d0934b3a5deb073b621401a222c16f",
+            "md5": "2bcac7ef368ebeb804e33c4c7920ff78",
+            "size": "783344"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.4.148-archive.zip",
+            "sha256": "e889e38929a95845409ed7dcdb0e6189343af5d17442a3b8c9f2ba297f0d262e",
+            "md5": "c2fcccb16eec0cf4ed5807fcba2bd745",
+            "size": "2898471"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "dd9d51ca6d1772545ba77640f74bd1162ea4ffe223e17c8faa6e0a11ec9b5e2a",
+            "md5": "0a28c3ee87dbe294afc73b90ff0c8101",
+            "size": "110008"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "3f5013ecd3ad3ef1f90f981189826ae9e5aadb7549a99e834c0f6d77c897a7ff",
+            "md5": "56cabd1ef862f62c10a6fc9e47186797",
+            "size": "115060"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "7f5c5e38780d9d44084f05ae091be1ad8672f370a6da17cc3f0a9a55e998163a",
+            "md5": "5df0f75608960c20f5c2b3b11cb9a2d3",
+            "size": "99752"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "e371440535fae634c625a5dd02d18cd4accd11b9166703f9d5a95f7b721f09b0",
+            "md5": "2d8a519c9ebe674a624b3b4cbfe91be3",
+            "size": "2535529"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "e589bd0955dc59cf7871dad3446e583316623dd899b67c34b808fbe14cde0209",
+            "md5": "e80232b5629d4c26376411f28ec41b05",
+            "size": "15499004"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "24687d171f15101109dc428bd2236889bda617377b2a29bdfc0173095bcf28a8",
+            "md5": "8a0aef6d201a0bb79af677d3aba9c790",
+            "size": "8092764"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "d66367c166d27ddd6d7ed07f7a492dfed77b6eae505a7037a29537ce3e15eeb3",
+            "md5": "81b11a7aac656df569ba5ab909d114c7",
+            "size": "7301688"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "74545a99d9a35c53790003006b29b9af5ca52b48f8703fdbc003665b42f5ec39",
+            "md5": "745b2b131e2f421e65c7792547792b12",
+            "size": "10080557"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "8dc88e398f976d20540e7c7b4f004f158b12cd9edf59a9ab988abbacc3e1452c",
+            "md5": "2bc240881b64f762b053a6284a2f3c04",
+            "size": "176072"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "943e23feafe86b9b83441a51ada152b110031f7891dfa531d2ef85657360f70e",
+            "md5": "eed7b9a4008d6d18a2cc3d1630169fb9",
+            "size": "172424"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "50808b530cab8d37bfb73683c36afb9da843c6ca18d0394c1ce636ab4594ec9e",
+            "md5": "f5f79636b09d840234f7b54a10e6245a",
+            "size": "162820"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "471a6106789596ac7f5de8bc9326b4a0193ecc35f7e5831fb32827a8cecaa2d0",
+            "md5": "76ff5d04e065ab466b607d16019f01bd",
+            "size": "166494"
+        }
+    },
+    "cuda_demo_suite": {
+        "name": "CUDA Demo Suite",
+        "license": "CUDA Toolkit",
+        "version": "11.4.100",
+        "linux-x86_64": {
+            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.4.100-archive.tar.xz",
+            "sha256": "8cd9ffeb7742f4714166731ce8cbf74e2d2c8171d6b7091e0041816d47a7fd0c",
+            "md5": "9327079f165128a1b6346c32b61088e3",
+            "size": "3965292"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.4.100-archive.zip",
+            "sha256": "0ac19c9efa634042e1d38d97b75a656d9c0038219bdc5098a28d388ca7c427f2",
+            "md5": "8b97b7acba08bbbbbf122f2e0d81bc21",
+            "size": "5014818"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "version": "11.4.126",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.4.126-archive.tar.xz",
+            "sha256": "2db25b21a6687803d146d34df0005f7d784ebd9303fbbd48d21f4508aedeb3fd",
+            "md5": "107cb0150f83da7ebec6e118e4522498",
+            "size": "61960"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.4.126-archive.tar.xz",
+            "sha256": "85719df5828ef91205353dab12085707e0f29c188aea41afe91b36f86ec9b338",
+            "md5": "afb21df7f560fa012593ff31021490a7",
+            "size": "61912"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.4.126-archive.tar.xz",
+            "sha256": "94c9bc3ab45b1e951570d4312fbb3627ac8cedb88d1da4a57fbfd1677a03f2c8",
+            "md5": "d05e8ec60b4aa7e494a960a32d18c7fa",
+            "size": "61944"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.4.126-archive.zip",
+            "sha256": "a02dc2be494f4429ee5d183c218d5b27744f3daf0d29b50516dd501491a42f5a",
+            "md5": "4e14de4b3f89d9ef951e8ea35ff810fe",
+            "size": "99427"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "ce9748c224b2163dba84cc9e0ebbd7ea29217eb4674bd9e7892290c7eaae372b",
+            "md5": "e0de9ddbf59cfa699f4a1eb16961463e",
+            "size": "64086980"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "5084eee5c04c6a823e6e0f8c30eb2587b5ab31a949d21818ce769cd22191896e",
+            "md5": "562494875b8b8ccc345b146f3894288b",
+            "size": "63994280"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "c9f18f6f7262b39df76830798aa4dda5fbf455b95bd4af2eb5ae25ce77e3848c",
+            "md5": "cbf494bf0bc03c39106825333ff777b0",
+            "size": "63856896"
+        }
+    },
+    "cuda_memcheck": {
+        "name": "CUDA Memcheck",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "6e1d64a2b31fec96a5eeb1d6ea914cfe83c671c3de4f987b6b5cda65d6e3b9e7",
+            "md5": "5b70e9b1eb50d0fff5b5d56ae76b358d",
+            "size": "139580"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "3a4d4c876bbb032c1e611b22a79e2cdce44cc6691ed519a63886a06094385ab4",
+            "md5": "97aa39e782ac0d935fa25dbad41274bd",
+            "size": "148128"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "d3357d2a41143f8007c17af45b7e5733e0ec4c0c1185322739232c7603221b88",
+            "md5": "82ad9ae4d123a3666177f326b88fbacb",
+            "size": "181182"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "b2b54743ad4f8bbd812548a26be40f561f6fda0f0ab01df4e630ef30af7bfd7a",
+            "md5": "5981def738578dfe6f6166abe943f178",
+            "size": "118598236"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "c8cfb7300dba923acfdd5e7b2d32f7a576b7d6d954fc71a3896aba0226b00f81",
+            "md5": "8b78eed909b09f80d91548f28a622b43",
+            "size": "118598240"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "version": "11.4.152",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.4.152-archive.tar.xz",
+            "sha256": "7250fc83b54f9089e67f3b506648fd8e70a9107baed968cb5de169c05831d5e5",
+            "md5": "fae82c384d46626a2f2e69fd98f0034d",
+            "size": "35931152"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.4.152-archive.tar.xz",
+            "sha256": "a53c8d2e4454be0e899986a1585f8b1eddf874aac165716d6f98989e53f971d3",
+            "md5": "1b74e7951c76119a03b805bde8d42fc9",
+            "size": "33718168"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.4.152-archive.tar.xz",
+            "sha256": "c0743a099bfb8c840a20317559668777e9a8ac9664dc121bcd22d76cee08416d",
+            "md5": "8982bd399b169d45717763cae36f4bc3",
+            "size": "31676392"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.4.152-archive.zip",
+            "sha256": "460c9e54bd0b99f4f63243eeb6b2090d17193361575b189c050faa10d465d4a9",
+            "md5": "c9cae278599871aea78aa4584c24bbb1",
+            "size": "45724284"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "version": "11.4.152",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.4.152-archive.tar.xz",
+            "sha256": "6ab9bd7c31a54529762fddc9ebfc4d331a912bf97b47318b0b75bfbd3b8a5551",
+            "md5": "e4d610b84f47026baa4c0603b007a778",
+            "size": "32847928"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.4.152-archive.tar.xz",
+            "sha256": "6cd970a59ba219c5da1ce39dbf08d7ba491ea17849adfed4ad83cc8409624348",
+            "md5": "a0870567d10771c7b3319880743e5a21",
+            "size": "32770452"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.4.152-archive.tar.xz",
+            "sha256": "68743913c877014b4f9a6d7267cc117d443c9990ea583ea837a1c51df1676d7d",
+            "md5": "204674baa498d7ebef702b73733b001f",
+            "size": "32729816"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.4.152-archive.zip",
+            "sha256": "9fa3a5a1248ad1247ee78a3d9627f1b2d7173cbde5bdb1635a853624f3f8137e",
+            "md5": "68ac6d501a93683e6faaab5ec4e59e4c",
+            "size": "33052575"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "f722199f9cc101c97c6fc809745076645064d36558a5aab56bba5529716e0fe9",
+            "md5": "1262ec1a15eeb4f2c7158192f580804f",
+            "size": "71964"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "08a763906637778d1c85455bdad4f2c0cb15d4cb0ae1c088dc474cb7ff78af81",
+            "md5": "bae7ce5fda7a60e4f05219d8a0b8944c",
+            "size": "71564"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "61c93230ea9fd9ae657c57954294380b5e8ee1688778f519ce5d43b728a04b9d",
+            "md5": "91ba0d30c5ef440a1ffe115e5f5b6fb7",
+            "size": "72120"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "d97d1266345bcaf4212132bbc19270ee9c10bae37b29647ff5f40620f83fa3ce",
+            "md5": "928f18b29e00a1a342119dddc1e0a0da",
+            "size": "100022"
+        }
+    },
+    "cuda_nvprof": {
+        "name": "CUDA nvprof",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "bcf705c8f25f3423014b4182741e91676c4858b1b055a314911e24787a2d3129",
+            "md5": "cc266f0a2c9e05ac34105fc084b54b9e",
+            "size": "1938384"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "398dd3c6f04b712f7ed0e70ee3d56ee04e0b9fa249cc0a655b9263a24dca7d8c",
+            "md5": "e1e6ef34ffefaf4e9bc5d34f34777427",
+            "size": "1594396"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "e87eceb2da015262ca57f7200c8ca96251dd11161afcdeea9a080fce06e90730",
+            "md5": "95260289dd9f07abd0013b0b82c2aa79",
+            "size": "16124"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "826b85be249e8a518f58b3fdaf36f52871e96e6fe0e86f7fc6facbc619405e81",
+            "md5": "a25a3b9d2710e7e9f09492492fe09777",
+            "size": "1610917"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "3e0ae31117c82f5e0220662a9ee1df15d2aa79bf6a53bc627ee5898a3e9719ef",
+            "md5": "8b64523c53e6587c17c6c621ddf8a632",
+            "size": "52772"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "a8f62ffd30747f5481c6abb11a924dd68b8da9b4a72a0821a411d545fd79ebbf",
+            "md5": "eb0ba8fd0b6f8daeb6cc8d50f7344fff",
+            "size": "54280"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "da4078a81d0af984bd42f23c584091968454a0e925c64289f2e5922e02c76131",
+            "md5": "89c50bee0950223a4dc194726ed908fc",
+            "size": "46000"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "ec5e1975147a83da707a1803c1e9af93b02ff8af246d23b733bd5a1662c708a9",
+            "md5": "8c22f5bb3b3bdbb0421b07b988e5ce3e",
+            "size": "143427"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "version": "11.4.152",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.4.152-archive.tar.xz",
+            "sha256": "5b7e491b583d1914c591447b9cf1b4c02dc33b222874eb89eee4ea8f87929396",
+            "md5": "60aa9f569c86f41519a5d0a222f09109",
+            "size": "14691116"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.4.152-archive.tar.xz",
+            "sha256": "917d9e0f050bd140e279b6e063af3ab92e443572e6baf840e2c1ed6cb5b8e765",
+            "md5": "84ceac397b7172f94485065e42da41fd",
+            "size": "13608340"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.4.152-archive.tar.xz",
+            "sha256": "d82eb049e72545239c6d64e6bf5afd06b89df06f338165fc5a68a2bf3143472e",
+            "md5": "01b483fcf81c794266dce6d2b8b39a17",
+            "size": "13550244"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.4.152-archive.zip",
+            "sha256": "48e3def76ff1842d00051fd035e6487be711ac4019e9dc43f5db3f9e14363f91",
+            "md5": "4fa6b0fb01c359360ab9352dacace716",
+            "size": "16299675"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "e50bd973d6b33f3b9a405a96ad04f62482e94bbbadfdc971ea1bb5d723c98c52",
+            "md5": "e62f8df47a1d8c47568c948b8d4789f8",
+            "size": "48148"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "fb89733ad6d46522a7e944c42df4127a6f87c38f0c4caa6b069669ef65a1c562",
+            "md5": "ff407300bcb5f8acac30fbda02fe7da3",
+            "size": "48152"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "95677940f19a12b82037958415efecc18c511c6480800c4df6d82bd5c3ba28b0",
+            "md5": "1d0f72f8a04df9ad7face3af3169c44d",
+            "size": "48676"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "13bacfd087cc1d11759705bc9a04647201f5f1c49103ba2ac233981c305143ec",
+            "md5": "26de9a2dcb6ba9a920fd58cbf9dd19f2",
+            "size": "65720"
+        }
+    },
+    "cuda_nvvp": {
+        "name": "CUDA NVVP",
+        "license": "CUDA Toolkit",
+        "version": "11.4.193",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.4.193-archive.tar.xz",
+            "sha256": "4c7dd6fe52fd90aabfb9c4afa7a65302546ac8212e62c1d9e1d370ec9756d7e5",
+            "md5": "8d321f064b8c1bf4a9641694fae7c2bc",
+            "size": "112249072"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.4.193-archive.tar.xz",
+            "sha256": "4952683d2b158a2c507b3c1f968ad5fdb6d3421429832cb300c02733f775986e",
+            "md5": "fa0e0023ff79698989070754e2f6ab7d",
+            "size": "111627960"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.4.193-archive.zip",
+            "sha256": "0659bebb271a566e1a5e75659043632398d42b37413df879293da4c077472720",
+            "md5": "c5b3cdcedec6655ca69bf7083e9150f1",
+            "size": "120334859"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.4.120-archive.tar.xz",
+            "sha256": "75044d837ef848460037fc16abe4f2f265791c3888c6d1f7e63366a466b2aee7",
+            "md5": "aa46c3b0ed1d16a75b489c75f067772e",
+            "size": "7092964"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.4.120-archive.tar.xz",
+            "sha256": "825d5f72fbcc4ed04bce016009fbe5881fb138b14d55df7190121fb34b7d2845",
+            "md5": "0557a1dd8c0b9e8a854ed09357053143",
+            "size": "5831356"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.4.120-archive.tar.xz",
+            "sha256": "a241a68429a1c33fdd0ba335d81c246079086552c56abb08033dd3dc85c576ad",
+            "md5": "3a8de05d46d603136ac33ac6511dd454",
+            "size": "5648592"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "9fdb78035542c4eb9a8e881b8ced959eabfa04894ce2b847d54741120b5f1aaa",
+            "md5": "ccd5b8f2656334b040a513c418408091",
+            "size": "12062745"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "version": "470.82.01",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-470.82.01-archive.tar.xz",
+            "sha256": "b039435622c14b2b1071aaabc0b63b04f21ec17564c1629a89e7cd25da8673fc",
+            "md5": "4d3782e2354cfe0d70c84e79aaf5e5a2",
+            "size": "1199624"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "version": "11.6.5.2",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.6.5.2-archive.tar.xz",
+            "sha256": "751c585c062f6e1dfcb1bca5898de48d4a247edad478de37eda0c7c62038379a",
+            "md5": "9d36ade70e3d9c0059441fc59018d42e",
+            "size": "397289908"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.6.5.2-archive.tar.xz",
+            "sha256": "0bbb8a8db38a3a0b97bfc879046dc42dca3defb0f82b1424e23c49bdcc6f26d0",
+            "md5": "9135c14acbcecd545578cc08642c6e53",
+            "size": "396612488"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.6.5.2-archive.tar.xz",
+            "sha256": "7325d4fe77567ee69799902eae7479b8d6518c7722882d683a41b1ebdd8f676d",
+            "md5": "75989e41f24bff9fbff1aaef7231b1aa",
+            "size": "396559712"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.6.5.2-archive.zip",
+            "sha256": "7ebcfcd9cc327a020f156d9a9f7607ea6a563038834991324230102915bef47c",
+            "md5": "1d69e9103b52557b6cb49cfdc5ae5709",
+            "size": "290453672"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "version": "10.5.2.100",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.5.2.100-archive.tar.xz",
+            "sha256": "0e3ec55be39db99c8769a3f297d190b93c8281afb5b3bc2ca1966ae94d42255f",
+            "md5": "08023fd6700cb0f324421af5cdc4e1df",
+            "size": "215214100"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.5.2.100-archive.tar.xz",
+            "sha256": "b73d5a8a5a3a9497189b340001a0547d60b6971e42d60aa6d8ca0ae3ec1b0818",
+            "md5": "712c0cfb1c74439bb581d36fc9c1bb24",
+            "size": "214860644"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.5.2.100-archive.tar.xz",
+            "sha256": "49b7d658dc84fd6669a27907d403b4c93d82f9cc10670e9c990eed29ae6e5ee8",
+            "md5": "c652700572c72b422727fb3a9db5dfa2",
+            "size": "214998656"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.5.2.100-archive.zip",
+            "sha256": "eaf957a481d0c361724cf796b6bc105e36f9a3d17b7525107a78ff15ea3ddc6c",
+            "md5": "37d169ea81f44c4caca0bb1dcc527549",
+            "size": "287129611"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "version": "1.0.2.10",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.0.2.10-archive.tar.xz",
+            "sha256": "6f9d83ff112d81dbf36317c5140e063d4750debbebc17ffeab3ad934dbc845f1",
+            "md5": "41929b0ff024c53033a705f29bc7e573",
+            "size": "45641384"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "version": "10.2.5.120",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.5.120-archive.tar.xz",
+            "sha256": "0f741c8c74bc19ea03a3a19a6d858d364d86d806fa5941763cafb181d4f9b2f0",
+            "md5": "5a87e0cef68405a1e4777b76d0db7fed",
+            "size": "79315612"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.5.120-archive.tar.xz",
+            "sha256": "14589b5f7d7e4e283552a82ea9f7ffc6504e95c10dc33a5834a2aa75bcccb208",
+            "md5": "012f3f367e15dd623de41dfa9cd5c695",
+            "size": "79373580"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.5.120-archive.tar.xz",
+            "sha256": "834b508e8979c3f4751a0ddbc62e9c8bc113844e4f82326e73cc42da4adabad9",
+            "md5": "c76e1c5544208c0372848965b0aec0a1",
+            "size": "79304900"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.5.120-archive.zip",
+            "sha256": "35108db3e9afaac017e1d3460313632850e3627520cf2213b987fa3d4cf6a8ce",
+            "md5": "dff8fe892d9551a11d366f57a3f32ad5",
+            "size": "53518206"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "version": "11.2.0.120",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.2.0.120-archive.tar.xz",
+            "sha256": "5bae164a8a6969a374f6abe33cc71462e714538c2a818228cf401d0fa6c3c1b7",
+            "md5": "198eb0679c8e81b9cb82107370bf1ee6",
+            "size": "113793268"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.2.0.120-archive.tar.xz",
+            "sha256": "0e2671cbe1cdb8cf4eb11698131c4ef4ce9ae58623595e623bbb3a492d7abe99",
+            "md5": "9a10d6dddcd66a095d1f5dc47f7c4924",
+            "size": "113397472"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.2.0.120-archive.tar.xz",
+            "sha256": "a53d4d80240702a8216903798ced8449f690379b785cc5fee21aeff5e0241dc4",
+            "md5": "07d5e61eac9f304ff2eec374f7674711",
+            "size": "112947208"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.2.0.120-archive.zip",
+            "sha256": "72e456cc8d7e79f514eae95ac9a4acb269e66344d67c5913370a3f0367a1f862",
+            "md5": "c8097d4d1473b354b6570d9d9f788991",
+            "size": "175875554"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "version": "11.6.0.120",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.6.0.120-archive.tar.xz",
+            "sha256": "00bef20a412c9b099e7e48477804ed4c2bda8581b101d19c50559efff79bf269",
+            "md5": "0aaa13f7c89ce128a2321ad4ed0fc45f",
+            "size": "205850728"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.6.0.120-archive.tar.xz",
+            "sha256": "79721331edb5e17028273cf2280b2e3aedd11c4c8145c2fbd16afeb8c37f74b9",
+            "md5": "12525f41737ba7066427a946f546b73b",
+            "size": "205966724"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.6.0.120-archive.tar.xz",
+            "sha256": "93f7fbb8191e4af59aac32adb8ac06d6501bf90ca97e3e01f400314bc320c852",
+            "md5": "37aa8d11916834daf765f385417a1d23",
+            "size": "205713852"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.6.0.120-archive.zip",
+            "sha256": "bd995a141da804fa0d2c3bce1c6d575e862877e1356041dae326825e5194c176",
+            "md5": "63fa77c71d4c5f93e5f97dd03bbb31bb",
+            "size": "165699705"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "version": "11.4.0.110",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.4.0.110-archive.tar.xz",
+            "sha256": "2e65c5b8d8aabf5521faf8daab170ddef27d795f61ded58343a9070dffd2ebff",
+            "md5": "c8cce28919ab1b87952f657883ad2019",
+            "size": "149105144"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.4.0.110-archive.tar.xz",
+            "sha256": "7cb571fb26fa5ae3c85489a45eb088ade9f6bf01105d651d7eaee9857085b368",
+            "md5": "794acd28cb9f8a741557bd3c2b6168fd",
+            "size": "149486332"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.4.0.110-archive.tar.xz",
+            "sha256": "c722734c0b36702a549a3796e76461376ae471d7af7729c1d59565cb08c95ed5",
+            "md5": "f97cc0df88a8000340d397f902d7d0a4",
+            "size": "148458280"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.4.0.110-archive.zip",
+            "sha256": "6e1a90494f93db97687b8f2b216da0ab3ca4677640c856a35e7d3b12c46c4223",
+            "md5": "57f29f491747786ef1392435502da28d",
+            "size": "111941586"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "version": "11.5.2.120",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.5.2.120-archive.tar.xz",
+            "sha256": "b664c4cec5bf0518c83c5568fb9bc36d202dff67fce4ee12657043f45b431347",
+            "md5": "3f8670cb77f6d11219e485aa28ff3b34",
+            "size": "1906200"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.5.2.120-archive.tar.xz",
+            "sha256": "c0e5fe1dc9c45e71fde99071deac6a48a94515b79e59cb0fab4412060b6bac95",
+            "md5": "8cce374dc46360952ef14e19902d240e",
+            "size": "1925636"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.5.2.120-archive.tar.xz",
+            "sha256": "0e7f4360e75a6f880b2accbfd7dd0cc91e850014ee42ff1c5fcd5060fb14beec",
+            "md5": "1c8275903175d8f63dfef2b50c752bb4",
+            "size": "1764008"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.5.2.120-archive.zip",
+            "sha256": "45d894a95aa26e125f5d002d138c6d9a2f2568edf809fea86d7782657bdec5fc",
+            "md5": "ad0b579ee7817a42c813f5424c53019e",
+            "size": "1951350"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "version": "2021.2.2.1",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2021.2.2.1-archive.tar.xz",
+            "sha256": "9baed2f77b341f6953a7de1f93c0a939c9a08884edbe0b30b0887e9d81960b39",
+            "md5": "c3d6baccc29b24dc0f48a45454f61dad",
+            "size": "284793108"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2021.2.2.1-archive.tar.xz",
+            "sha256": "07980f3c1bcf1256bdcc86a8cd61fda1214af39f1a2b27d7e249a0f97c9f68c7",
+            "md5": "f1ae025d30e3b6602ee922db46b2cea6",
+            "size": "57790468"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2021.2.2.1-archive.tar.xz",
+            "sha256": "21458456d17779c8c686055cd202414bdeb2445daae480311c428fe69e1649fe",
+            "md5": "6a3229e361f0d4dd1b6cd47a26a692cc",
+            "size": "56717204"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2021.2.2.1-archive.zip",
+            "sha256": "dcc1f9b2cbdcfebcfcacd1acf522145e3335349139da6994d2b6e7610a43eecf",
+            "md5": "21e5ef7a02a83748aed68fdf4765ff7a",
+            "size": "253104502"
+        }
+    },
+    "nsight_nvtx": {
+        "name": "Nsight NVTX",
+        "license": "CUDA Toolkit",
+        "version": "1.21018621",
+        "windows-x86_64": {
+            "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip",
+            "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1",
+            "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80",
+            "size": "315692"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "version": "2021.3.2.4",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2021.3.2.4-archive.tar.xz",
+            "sha256": "317dcd4a3d78c7d916924f6433cb93415f19e16e4688413e4692180e37f7f87a",
+            "md5": "572fb66e9bd39406222eae7f3389794a",
+            "size": "174858452"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2021.3.2.4-archive.tar.xz",
+            "sha256": "45c874f923af9fc6247058ce3324322593a7367edc4b105280d017970d5def69",
+            "md5": "4bacedaccacc5bb9cffe6b13f2502586",
+            "size": "21385068"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2021.3.2.4-archive.tar.xz",
+            "sha256": "76ce8ed29e4f8d8d472f702b9e14543f4c4e7b8f27a90079d8c3e6580db6cb16",
+            "md5": "f2b7b464fab05c73872b1ccfc8f433ea",
+            "size": "33097032"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2021.3.2.4-archive.zip",
+            "sha256": "1002ea5ef56ae5f458101af04252190e8873f950389f6c8f78cd475bd71b6efe",
+            "md5": "8e9e44e9e3ec526f1378d1e0d0423bff",
+            "size": "226086324"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "version": "2021.2.1.21205",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2021.2.1.21205-archive.zip",
+            "sha256": "116fb34fc90cd13cf17649931be0af756930da98bbd5339b44b6cbd2d1e42453",
+            "md5": "1ff5d4397b22ed55be7c7d2a5a594a2a",
+            "size": "284584707"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "version": "470.82.01",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-470.82.01-archive.tar.xz",
+            "sha256": "aa8edae8b40ee2c6808fd59220e81f46f2ccf8bd1ec184eb8dc83ddabba139db",
+            "md5": "9fd218a52ee6620319a4c77176dd7145",
+            "size": "269972368"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-470.82.01-archive.tar.xz",
+            "sha256": "eb521f9d849d05500f793915f0f455fe95ed0f515078081ea9e7903a0ca08957",
+            "md5": "c56d1492bcb7d65222f9dca907bf0c14",
+            "size": "67098452"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-470.82.01-archive.tar.xz",
+            "sha256": "4d8fa4bef4037b249f4da083796a213d3e6701e683784e75122b326ab7130625",
+            "md5": "2e3059458ca28211195801da983e424c",
+            "size": "183043372"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "version": "2.7.53",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.7.53-archive.tar.xz",
+            "sha256": "9fa17e62079fc1fadd1046b8a99dad39d1813cbc70c08bad8f30dc7946ba6894",
+            "md5": "4b4cc07a2aaf8562b1f658522613600a",
+            "size": "67712"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "version": "11.4.120",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.4.120-archive.zip",
+            "sha256": "a97171f455c7c3e938958ee02deddf264c63dd9f10197d07954917c04b444ff2",
+            "md5": "8f19de4992331ac5a877b3d3ccff25da",
+            "size": "387698"
+        }
+    }
+}
diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json
new file mode 100644
index 000000000000..94335065c8a7
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json
@@ -0,0 +1,873 @@
+{
+    "release_date": "2022-02-02",
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "version": "11.5.62",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.5.62-archive.tar.xz",
+            "sha256": "bbe633d6603d5a96a214dcb9f3f6f6fd2fa04d62e53694af97ae0c7afe0121b0",
+            "md5": "e5deef4f6cb71f14aac5be5d5745dafe",
+            "size": "960968"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.5.62-archive.tar.xz",
+            "sha256": "f5301a213878c7afbc67da03b09b27e1cb92178483042538f1585df09407214a",
+            "md5": "9c3200a20b10bebcdde87367128d36d9",
+            "size": "960940"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.5.62-archive.tar.xz",
+            "sha256": "a4faf04025bdaf5b7871ad43f50cbe2ca10baf8665b17b78d32c50aa8ba7ae8b",
+            "md5": "229a13fbe8426da383addf9ee9168984",
+            "size": "960660"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.5.62-archive.zip",
+            "sha256": "2a44c359d523317d1c93ba6568ace3c088c83026e2e40d34a97fccd876466b4b",
+            "md5": "93604e9c00b8fbc31827c7a82c0894c2",
+            "size": "2459582"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "version": "11.5.117",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.5.117-archive.tar.xz",
+            "sha256": "c01bfcfca22063c99fd50122d39383433f4f789e021c7785cd555f59c2632a2c",
+            "md5": "7549121367907b56af18e5806e8244bc",
+            "size": "836276"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.5.117-archive.tar.xz",
+            "sha256": "8f412376f4951df52380d87bb6c22704cb930ac6cef0fe92f2f31604ef744ce7",
+            "md5": "dab60517ad1e6018c009305025158860",
+            "size": "782660"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.5.117-archive.tar.xz",
+            "sha256": "550f8dfdce3fb6ca723d716abff81e1fd55132a130d284ae2050a0f09f40c93f",
+            "md5": "c1c0c65dce9da1105d812d0b08d99108",
+            "size": "783804"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.5.117-archive.zip",
+            "sha256": "02cd427306ada807c9a8a1f16dd34ddeb58f35c7932bcbe13e1ee2afa882332c",
+            "md5": "b8c4d1288f5918d67777192abd627238",
+            "size": "2915733"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "798fa7124d56661d7a211900266f658d4303931936157e863c82cf31aeb27b09",
+            "md5": "1d965f0f33b751d050ac8238a7a350a3",
+            "size": "112864"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "04845b4feb728840823b17aadc2fb579bd8be4e04f1cfe25bb78e8724794cdfa",
+            "md5": "391d5e1b42899f34125793096f01bdbb",
+            "size": "117636"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "1ae185d861f7075046e53e8ec69d4b650eef1bc09fdb0c89adf69e48f9b13d57",
+            "md5": "19359104b424b6033b77c6b2984fc06f",
+            "size": "101836"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "2b059697dcc5b3df8ca527612893905cfb91f52fef4988388458060d038d86a9",
+            "md5": "8f8ac819425d7e92a4bcb2e940eaeaad",
+            "size": "2538559"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "1ab09d29571a80f5c26187e78419b424a041ade7c9c108523aad26d6711eb222",
+            "md5": "1adc2bcb044a372317103ad44e60f73b",
+            "size": "15910648"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "5739768e55551b131fd2bd0ef41806f70400e767cb520c511f11ea33ac940eb6",
+            "md5": "320d9f4904723fb3ea3d95c7ea736998",
+            "size": "8454516"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "05926807291609f643d4b92706a9ab627f4dd32e4f0c5779b58ba5c737453c43",
+            "md5": "6cd4c658b0e30704bb3f21cb861c16ab",
+            "size": "7827648"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "56948dab7b3d39bc9d8231a277a051e57f95efe73f9f6bfeb9f66df2be3d2208",
+            "md5": "fcb8bbf96ad9258fc0771dd59ddbab25",
+            "size": "11262366"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "46e3adabbf6a3e7920f054b0e16b8555606798453d5abb004cc4f82df20cf093",
+            "md5": "dc9e194c4c82ea3f3e2b5ac96b26355f",
+            "size": "185608"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "f7e3345c3545f72c3ef0020403463a72a21444b2e11f3d5a5e1c1a65e10c6f5b",
+            "md5": "7316d577039df32a4bc556b5c7f13140",
+            "size": "182008"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "7ef895dd76f2222d19344cadf32c84f8963c11a7773ceb73c7d9be4eb286576a",
+            "md5": "85bd622ebac9a567f88302f53f893391",
+            "size": "172336"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "7820a76ffced4194ff09a910c70cfd5ab917e67be3a0371da4e25ed000346595",
+            "md5": "dbf1c3108e731c13466180709335e702",
+            "size": "168667"
+        }
+    },
+    "cuda_demo_suite": {
+        "name": "CUDA Demo Suite",
+        "license": "CUDA Toolkit",
+        "version": "11.5.50",
+        "linux-x86_64": {
+            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.5.50-archive.tar.xz",
+            "sha256": "0dc6fd4d8ab3a0a5ff1d5cbd9a5a6a970f2d01097c31903afcf733d36b67f884",
+            "md5": "da6c44696dada9f1adeb3234cfcdd9f1",
+            "size": "3976764"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.5.50-archive.zip",
+            "sha256": "c81ecafd4e0c6ec137f582720f94e8ac2295e673063755c551c6866e2c3ba190",
+            "md5": "39f63b4b72ba724454f679af3e351735",
+            "size": "5015382"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "338466042a594f37996d7f50543096f0e1dc644f43319ff886e2496c339f4346",
+            "md5": "c54ab14d9bdc53b03eb927cf50b1ae6e",
+            "size": "62456"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "69478f98bf8467843d5b6c3ae8163e082e89b9a6eb8061c900e1bbe76d570a03",
+            "md5": "3c93062774f05facc809047af4721017",
+            "size": "62516"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "ff6f44549650db44b0a6726b0ce1bc9b325d629190c6b17d35a2b99d36434678",
+            "md5": "54afce3c11863b2e515719325a3a05f4",
+            "size": "62452"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "ec7ff829ce1717a88c54dbb15739e46f5d876e9ef32cc911fc66e2b78f3b286e",
+            "md5": "d84ba6f46eda183231a01523eb8a0593",
+            "size": "100197"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "a590393cdbfb6620053075d9eebb18abcaedfd8ccdec2e4c8f4631080e7eaa31",
+            "md5": "3e9ecd9834eb282d6ea55cf61765c01a",
+            "size": "64086136"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "564c2ff35bf3f76c60f57c9669d4a1b8312f6fedb0fa08c16178634a451fef72",
+            "md5": "779ce7f3fd7b623c8cd12f822848c273",
+            "size": "63889192"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "482d8ad678e00a562b087a0e6d988ca92a83a3aefccf8a9166390956739637a6",
+            "md5": "bdc885a67bd000b44ea0f2ee46ab74f0",
+            "size": "63816804"
+        }
+    },
+    "cuda_memcheck": {
+        "name": "CUDA Memcheck",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "d13f915017ce2e4b6ed58b112fb831e07a638fa26cb73cd5501e330321048975",
+            "md5": "584bcd833078f505b6f4c96b32cb8f45",
+            "size": "139756"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "43baae7eb977d265bd4763c10e5b5d2594a70dacabc00904468aa84c2ce13b82",
+            "md5": "02a82840a71a889bcbdf655d41704b20",
+            "size": "148096"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "79193c8cf3a2d63cb182aea57aa54e705f49cc606cf13213439709b317fd9051",
+            "md5": "06d2c5975482a2d266c40baae8e94448",
+            "size": "172699"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "a4a512d806cce1ce73c87c0b996eddbfebc735d6b749915c870907f347de1840",
+            "md5": "70bcbc9042f7757b34c1e7dbff56c719",
+            "size": "118606516"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "1ad8e934acd5563ce23f40359f3515fa1344ed6cfa6e8ea37e7c9ed51c52ddcf",
+            "md5": "e58439f4b05a43a1e29cbe971228e1f8",
+            "size": "118606504"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "4072592764717f5c3ac53b95f0bb5f2bf427294b94aa9abda125e51b4fca9e0a",
+            "md5": "272cd495f19864fab9e0b8c6a4d70a4d",
+            "size": "36316988"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "1dd811c9e8e6bb219a7e0ef63514665f8d7e6253ad93474b5b3594fce85cb191",
+            "md5": "af5523c22de1667aece90f23dbe9a51a",
+            "size": "34137608"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "21e9d7941a62806331e94eff3ba22b4bcace3f8227e133580f0367343eb3f3a4",
+            "md5": "a7c7797e5d7a586d7e74cc3e70bda731",
+            "size": "31876488"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "477ca5d096c2e5a87480cae24951b54e641030cfc3c75ce869e0656e4fcb2142",
+            "md5": "657fb06f0e06a16ee936aa22e7a3dd27",
+            "size": "46379856"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "7b5055db4fbc270a49d69dae6320331d16b3d50f828a9b155e7bf2abe138f273",
+            "md5": "0405b49d574e4fd5783a1bfba9228966",
+            "size": "32786096"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "10e7d0794c8efd42fd345355e9ae8680b767b1b8d004c9e9baf2b4ad9b993b59",
+            "md5": "11af2b0e169436278538d063370fc04f",
+            "size": "32776804"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "698ccf414b9a7d823dc8d9818df72cac0a10d618ab143b221bbf321ada96ef08",
+            "md5": "345f1c616a294ec7c70b1f881542a894",
+            "size": "32729044"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "f8dee0ae12696a02a01e95083e1fde8222018f641f7ebf712985fc6c1716f217",
+            "md5": "f375afe649b16160af3ace6237d241cc",
+            "size": "32996636"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "version": "11.5.50",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.5.50-archive.tar.xz",
+            "sha256": "e7a03b5c0324ccb5040cd494d2e3f1fba508cc437d666f112a6702d75bd80891",
+            "md5": "53f9279a45cb1bb6c1993e7245a38a74",
+            "size": "72176"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.5.50-archive.tar.xz",
+            "sha256": "753ac81cde5a58b7bd4b59d56ab5e0ba973f96d6ffe95c447eb47f170d0c74be",
+            "md5": "f08c23cf9598624799c19e628c6d91f8",
+            "size": "71972"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.5.50-archive.tar.xz",
+            "sha256": "d3f913393ec4a1648fc5230c766606e1c8a7ca31f7595fd149f5cbeea63bd01a",
+            "md5": "090c36b75393eef09d3b527521fa3791",
+            "size": "72472"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.5.50-archive.zip",
+            "sha256": "ccd320d7b4aa8c7006085e003b9763a20a37e101e59dde8bcaf13f1e3b5ec04c",
+            "md5": "b36dc6c87730612d3c538aacb10e89a8",
+            "size": "100572"
+        }
+    },
+    "cuda_nvprof": {
+        "name": "CUDA nvprof",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "611984e6ce96f216da0d5e3f72584b8e89512a712baf8faa5cc95f14be44ce51",
+            "md5": "3146cddf336fc73e4348018058c57c70",
+            "size": "1940688"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "24c238e26fe49489d3aee0429e629eadc24122a93e5935758c97dab91f2a59b3",
+            "md5": "685eed537cd8f9271d30a1d6a64d2643",
+            "size": "1597248"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "b1c7b2498665c70e7d675170f1309f19ec86a55d284fcac6c7e2337c07a565af",
+            "md5": "e26370530b986512b219f99fe707c57f",
+            "size": "16196"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "6274433235b2b61aac7333b9a7472893c6b7ca53e34a9a96ca197e46e925d394",
+            "md5": "5d47af0e512563b484d3270a9225fad0",
+            "size": "1599403"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "f66c2632dbbdc6153aed2ae8bbf3291de258f7be5fd53350d469cf6f894aaa5c",
+            "md5": "737a4e6b4ba979934f22cd9ff932f47d",
+            "size": "55228"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "209ddd276e857cb41e162f3748778dceb224bbab445469480f6578d1b8a199ad",
+            "md5": "47f52a330781b2c5e6094ed309043faf",
+            "size": "55760"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "57429ab14f4a99fcc2f7160a9d93f39358a4cf0f8e0d0996973883b1f5c1d520",
+            "md5": "8b3d84b2e114e53b00e6fc6dd514750d",
+            "size": "47580"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "89a883eee3d6931e9b071c19a9ef07368429b8008fcb0f392229baa3d21b6cc2",
+            "md5": "3e23701483da9ac6910a52dbcdb48ff0",
+            "size": "144817"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "version": "11.5.119",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.5.119-archive.tar.xz",
+            "sha256": "78aa426f8d1bd6a309582268045e92d798dea84ab17b0e41bbf81ed4c6c51c37",
+            "md5": "a14c3f9a30ca27f0a975b6995b440927",
+            "size": "27772396"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.5.119-archive.tar.xz",
+            "sha256": "bd10849b493902487660d3216a9b1de2c687d0d013085a7194925ff0a8d0461a",
+            "md5": "b3e11ca277f1c92e8adf8056ee759fc2",
+            "size": "25932956"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.5.119-archive.tar.xz",
+            "sha256": "c924444459eca0ee5f5748cc80628c0e8759d6cf70c55b5ce2e1b4b37a46d3cd",
+            "md5": "31900a4918e162377e634dbc9d01ccba",
+            "size": "25787560"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.5.119-archive.zip",
+            "sha256": "e6c7312b4b8f678828dca2b2e29bd8a1afee83709885bffe0115743219e092ae",
+            "md5": "39a1fb1c6514e7a13d8822fef1fb6e95",
+            "size": "92408767"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "201b000020db8e296f526dbc1bedf6f0d2eb901e6add9d95a8badfaf8708bc7c",
+            "md5": "fa5a8ec26505381bff0d513c3219b4b6",
+            "size": "48196"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "b188a8b413c2f8502c4ac6bd22a8c4d60279f704682a0582e71cb045817c08bc",
+            "md5": "f51ac28484f7001ee7c10f37d5e98e38",
+            "size": "48180"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "9caf957366bc723e53de7189112bd04d99300932061a2c3590e26215d0a39a04",
+            "md5": "36e5d0c4a142260d1c5364733ce296cd",
+            "size": "48740"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "4d60f65ef83bcf36d549095350097c4198f78a968452b1fff0f1dabbe96a633b",
+            "md5": "da8c51d38126ec2541c0f87dfd40aefe",
+            "size": "65783"
+        }
+    },
+    "cuda_nvvp": {
+        "name": "CUDA NVVP",
+        "license": "CUDA Toolkit",
+        "version": "11.5.126",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.5.126-archive.tar.xz",
+            "sha256": "453884ffe6732c0e1d19a17944dbdbb948a24ed2980acc67620bc0c160c4e023",
+            "md5": "9d89a2f1c793736e329a8b0b5176616a",
+            "size": "117592064"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.5.126-archive.tar.xz",
+            "sha256": "ebb5b6849b4c014b9eeebcaf0f8e333ee8ab4a65cac8ed401a6a31604d7435d6",
+            "md5": "6d621d6e56884143ac48910950dbc5f5",
+            "size": "116958804"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.5.126-archive.zip",
+            "sha256": "3e88475b6ce923c736e49f659717ee0cbb0551c5e30f9cb8256ebf740d02f457",
+            "md5": "4f8b8c7a3cafbdac8dfe3f9507c92d10",
+            "size": "120342187"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.5.114-archive.tar.xz",
+            "sha256": "35d13fdeae94b2294c4d83661a663b5bae98e3f9b4aae00be101140a32409047",
+            "md5": "52719791f4361ee001bd6327d79dcb2b",
+            "size": "6818460"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.5.114-archive.tar.xz",
+            "sha256": "b5353633dcc09e6360e9da14636774eee8cd9db90dd3ca93b77b1a95b104740c",
+            "md5": "3f79dbebc1b88b552da041ccb7921ac3",
+            "size": "7324744"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.5.114-archive.tar.xz",
+            "sha256": "3ce2d4421f9d8547bedb25c0ae8054ab0bb755384a33eea79dd036a8d4658a7f",
+            "md5": "7585db5187b4fcbb713ff89eaf877389",
+            "size": "5391196"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "b216d0292002b4cc673a374f06576bc062e6566062a32edcdca60716e98f6587",
+            "md5": "eccae888d8ee4264f8b5517f9af7fbc3",
+            "size": "12199859"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "version": "495.29.05",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-495.29.05-archive.tar.xz",
+            "sha256": "36966ebf7951dbd77fefb95b326b9084948ac8d03fbb6e8997e90c0fe8f74c9d",
+            "md5": "4c4f119d897a77448f989534aa453a79",
+            "size": "1521552"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "version": "11.7.4.6",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.7.4.6-archive.tar.xz",
+            "sha256": "1ba27f135e2f920bb47e22c05e4ef2e0a75e21d9306f5062e44c3d705150a3a9",
+            "md5": "878826ff2c817a35a335f5e6ff4c5153",
+            "size": "427700280"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.7.4.6-archive.tar.xz",
+            "sha256": "061cdbeb437510437b4dfcd053834932e60943be996aea0187f6ba36b7cf614f",
+            "md5": "fb760e547e07904d0e52578b01326219",
+            "size": "427200296"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.7.4.6-archive.tar.xz",
+            "sha256": "38d7045310487b6f3dad4c6f8c5f6420b4dcf9dbf0171f3ef5f48f3e2f0024f9",
+            "md5": "0c5411a296b474cd02a57de4b8cf4d0d",
+            "size": "427180072"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.7.4.6-archive.zip",
+            "sha256": "a5b2c090e7b3da7b9823aa71ecf76a07344846daf8d26b13a06dba2d8a572c79",
+            "md5": "071e96d21a31393cfef5dd263d2eb90b",
+            "size": "317995451"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "version": "10.6.0.107",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.6.0.107-archive.tar.xz",
+            "sha256": "e2e51dc75c9c5b4476624bf683d50afbcc611f88361392625f017bd3efc545b9",
+            "md5": "abcd6e63926592b1d8de9a90e9953b44",
+            "size": "213873928"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.6.0.107-archive.tar.xz",
+            "sha256": "5e0e004e33a148bf543fd69df8ad7fcd14ae72c60676679908a6cf164a065651",
+            "md5": "34042143bf1179bde112cee7237d149a",
+            "size": "214892660"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.6.0.107-archive.tar.xz",
+            "sha256": "e5ea473699697bcfd2a0ab7b807dbc5dd713bfe40221f7356097fb6e2577d73a",
+            "md5": "e800a93f81fdb7e95d31a14b7a215138",
+            "size": "213119620"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.6.0.107-archive.zip",
+            "sha256": "f6b846a79772640585cbfc35746ededa1210e1ba7005e075d678a4d84ffd93ec",
+            "md5": "7ec0315c986911ad1ea1cfd1705bc57a",
+            "size": "287130074"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "version": "1.1.1.25",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.1.1.25-archive.tar.xz",
+            "sha256": "b4f4321f4fd249a2f4d68b3cf396a9e5891e33d73a297e21eea0ed9417340808",
+            "md5": "dae59d20c2f51dc90fb18d017a17664e",
+            "size": "45837600"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "version": "10.2.7.107",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.7.107-archive.tar.xz",
+            "sha256": "9dd3bfa212a4c8e58a6869c4992e710409d34c46d5a683cf99670d5ef5b1f8de",
+            "md5": "58f7993190fce602ea7e68aab7912774",
+            "size": "82066560"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.7.107-archive.tar.xz",
+            "sha256": "67d0759b1252d9df7953932ed58d01c05a4861121c19bafbb544b585113552ab",
+            "md5": "368e13f6b9eb6e72fbc852d6dcfc4b6f",
+            "size": "82116948"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.7.107-archive.tar.xz",
+            "sha256": "e8f2cc5e786812cf70bd7bd37a9c78e3341e602c402177d44e7bf07fe7e85142",
+            "md5": "97065efb1e5fb99589540a45711eb2f3",
+            "size": "82051480"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.7.107-archive.zip",
+            "sha256": "fa74020026d1cf81b0a3004c823ae40a4f0a02df34041438b992e6058ff97cd2",
+            "md5": "df2a95194669cc02d987ee6527c5c6e3",
+            "size": "53627481"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "version": "11.3.2.107",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.3.2.107-archive.tar.xz",
+            "sha256": "4c9e3fec211fa6cc6dd14a7d09237c56f43789e498817cd0839b0e6ef9c498fa",
+            "md5": "19b927da5bb8c6fc28b2667e57eda7eb",
+            "size": "69221812"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.3.2.107-archive.tar.xz",
+            "sha256": "1f216cdda56463d333ffe4d52cf18283b3a8d917737698f5c8ed5851120f119a",
+            "md5": "6b3ac8f0889f968c34e6fe903340ff5c",
+            "size": "69348116"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.3.2.107-archive.tar.xz",
+            "sha256": "6feba029d8838d17345c38d77b6cd0e7853934106edcc5d5f6ec57646b499d28",
+            "md5": "55492c175f1a152df54365544e2b582d",
+            "size": "68661512"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.3.2.107-archive.zip",
+            "sha256": "325684ebefb24f7a47c5868a87f8dc38c88812c12f113bd57029b3a715c95405",
+            "md5": "8936a0967f4178e7170f9e55fa4e6cd3",
+            "size": "98405802"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "version": "11.7.0.107",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.0.107-archive.tar.xz",
+            "sha256": "9e768d6278df1b2323e2708bbf53af0bdb2955c0c4688eb69d5e418aea3a9b41",
+            "md5": "c7653a07b2388d887c4e6b3ac1afafb4",
+            "size": "181259248"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.0.107-archive.tar.xz",
+            "sha256": "f01d662635d7b2001ace6122058159c9583c61db3fc5849a8ae025b9963657ec",
+            "md5": "91b9e100ce9bae17ea08d97152184e44",
+            "size": "181408304"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.0.107-archive.tar.xz",
+            "sha256": "88de7ce848b929439ba1fa1baf487ec56fedc39f8042a862c2f5522fbc1e82a2",
+            "md5": "aec6e62aeff853dff5a150e2d0ca8aa1",
+            "size": "181074920"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.0.107-archive.zip",
+            "sha256": "365a0316da888e0b8cc17b3e958b24b9faefa35e6b5fded7d9083483c1f0c097",
+            "md5": "3c870ec7f8fc23130c66f989afd16a8e",
+            "size": "149810382"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "version": "11.5.1.107",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.5.1.107-archive.tar.xz",
+            "sha256": "5c6bcb73d6e2426e7369e5157387e02f70db3e94b2351c447ce559cba57e36f4",
+            "md5": "762faaa53a62272ba508188779fc43f6",
+            "size": "156693812"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.5.1.107-archive.tar.xz",
+            "sha256": "cf2cbc740d9c111d9d266737f62ba4b44cfc84590fe1f9f4bf848b0908296971",
+            "md5": "e284bab2afa99d9654c1b97ae407434f",
+            "size": "156937760"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.5.1.107-archive.tar.xz",
+            "sha256": "cd86f76d41010e7fd37804ba102ec6896de4e51a2724cf44b9e7b22c1aa86429",
+            "md5": "037ada0cfe8cb4885ceb07eb3423f789",
+            "size": "156056260"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.5.1.107-archive.zip",
+            "sha256": "3ef847675b5cecdd70ede5216b91530bff152478441dc4b1e0d73bfcdb586a06",
+            "md5": "d04eed9ff4432bc48f0afae802841793",
+            "size": "121933476"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "version": "495.29.05",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-495.29.05-archive.tar.xz",
+            "sha256": "19e036898474c89697c4adf4958daa241c07b6d9c9f6623190dd7a3b667a4c6b",
+            "md5": "733c3a1ef5c33e4b4ccfaad11b514a98",
+            "size": "316860"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "version": "11.5.4.107",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.5.4.107-archive.tar.xz",
+            "sha256": "3943941f449e8a9aea465e26a25f3d0315e45a57c5ab993f1d15dac7453dcffc",
+            "md5": "6459aa39efda628e4de36caafc938158",
+            "size": "1902936"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.5.4.107-archive.tar.xz",
+            "sha256": "760295c056951752ba7f4a5a56f4e5afe1538eafbc8ea01c21abe9b8bbd3f09e",
+            "md5": "ee70cf1d8888bd696b34eb9981c865af",
+            "size": "1924452"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.5.4.107-archive.tar.xz",
+            "sha256": "4dbc3c0da37ce108faadcaebbe72335984a60ed055b29fa56edfd89aad9d89cc",
+            "md5": "54f25526b1d95a5e2a02ddc33eaf1ada",
+            "size": "1735520"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.5.4.107-archive.zip",
+            "sha256": "50bb7bdd84a8ec74d4b2e2a133d8dd0474aa4224c3e7643ed75a7864cf705df6",
+            "md5": "ef86aa6770eba3dc31a33698b600507b",
+            "size": "1941889"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "version": "2021.3.1.4",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2021.3.1.4-archive.tar.xz",
+            "sha256": "75cd4ca50472c8e4d6729e2f319a2e2f225c21450e868169608eaf1651de7cfd",
+            "md5": "d4de103a4cce16501323ab22da3a5d3f",
+            "size": "409065700"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2021.3.1.4-archive.tar.xz",
+            "sha256": "326be8ea63091f14e7de7cf11d5c8e465200770518dccafc45ade7583e42e049",
+            "md5": "0a34928121b5518075a3a50919f94999",
+            "size": "123353872"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2021.3.1.4-archive.tar.xz",
+            "sha256": "f846e7f443df58dd03ad7da27483dc159715bdf1e260200499bc1ba4f9e2ab17",
+            "md5": "6a22972b8771101d334cdd0f65785727",
+            "size": "120013812"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2021.3.1.4-archive.zip",
+            "sha256": "6bb1bb69aa8976e8d60a23e25784967628a19622b779b4c5f44a1a5b10b6b312",
+            "md5": "b3f1e03bf4b2b054287ae3ac9b693052",
+            "size": "347770366"
+        }
+    },
+    "nsight_nvtx": {
+        "name": "Nsight NVTX",
+        "license": "CUDA Toolkit",
+        "version": "1.21018621",
+        "windows-x86_64": {
+            "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip",
+            "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1",
+            "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80",
+            "size": "315692"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "version": "2021.3.3.2",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2021.3.3.2-archive.tar.xz",
+            "sha256": "89833f6e45c16c46612ec8ef2b7eab4a949ed86f0a75ebd673548d2ec15bf5bb",
+            "md5": "4e42508a7365bffca7c574afc1095fb2",
+            "size": "177789420"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2021.3.3.2-archive.tar.xz",
+            "sha256": "39e59ff32decff6032df0d735dfe6004e5d543d52d212cd2743e5941900c1a52",
+            "md5": "56f46452fef6ddceb91121c6a3da78af",
+            "size": "22565096"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2021.3.3.2-archive.tar.xz",
+            "sha256": "292bf43aac5c870be38c28aa536c01b6692ede682b9790622fc7a8862b143b0d",
+            "md5": "33aead87216f96a372db125f67e6f675",
+            "size": "34536232"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2021.3.3.2-archive.zip",
+            "sha256": "c9c67a83bbfc0bbdcd30391cf3fa285f813f3b8d6dc088c4225a5ca7ccac38a2",
+            "md5": "ab69a73835e658ac2871160daa01fa50",
+            "size": "229359100"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "version": "2021.3.1.21308",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2021.3.1.21308-archive.zip",
+            "sha256": "ba659a0071bac9a2218c3b5f504c8fbe961f828df27361ed897c0dd41b53f71a",
+            "md5": "720962c80b8aa09fb496014eb7f25e41",
+            "size": "284695569"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "version": "495.29.05",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-495.29.05-archive.tar.xz",
+            "sha256": "6a0675a60fde511573362490c290ca71b2bf111dd85c9ca16a7ed9786c15961f",
+            "md5": "04805f93ad0db2b845584c65aea21f3c",
+            "size": "280281252"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-495.29.05-archive.tar.xz",
+            "sha256": "70c99be31356f0620971f335cfc9886fe3d6097182c5b823c85ec15758e08933",
+            "md5": "9ed9d400e2ef25b321a4709052b436e4",
+            "size": "69613620"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-495.29.05-archive.tar.xz",
+            "sha256": "625c72d1d1e14d97c90b3fb8c6d5f7ac3d1649caa10cef1aa13239163672046e",
+            "md5": "dbc65a82959790a387b1f343481101b4",
+            "size": "210257752"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "version": "2.9.5",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.9.5-archive.tar.xz",
+            "sha256": "fd31bcf21b2244f217f9ffaa64cda9c066ed06d68b30925d520f2096a0400b2c",
+            "md5": "8d66bf76c611305a54e03a0a75ecdcda",
+            "size": "68004"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "version": "11.5.114",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.5.114-archive.zip",
+            "sha256": "fecbef30b4af477da75087f5bdd70dfc6ae4d821ac2bda3f0a50c058fe71813b",
+            "md5": "15a9e0f0ec782b7ba70b564e27e8c264",
+            "size": "387859"
+        }
+    }
+}
diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json
new file mode 100644
index 000000000000..3de6bb9f6efb
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json
@@ -0,0 +1,873 @@
+{
+    "release_date": "2022-03-24",
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "version": "11.6.55",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.6.55-archive.tar.xz",
+            "sha256": "14aee04c86a47321b9fee1c86c9a640be7729ed8063663ed0c7dafdd77fb18f5",
+            "md5": "e90bbf846f635ea84290fb518e62e838",
+            "size": "1002296"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.6.55-archive.tar.xz",
+            "sha256": "cdaa96fc3afe7c552ce31d5b2328072edfbce6c85018455c9e90a572187e84eb",
+            "md5": "c2178d1d3557c0801c654ff8a9cd2261",
+            "size": "1002552"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.6.55-archive.tar.xz",
+            "sha256": "6de184be2cee64b278befc0839d0b08104f19f6d15358e3bd8a92cefca552e20",
+            "md5": "78244bc649923a7bdf13ae43391d57a3",
+            "size": "1001980"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.6.55-archive.zip",
+            "sha256": "badc95a0e47e9c2866ebf970dae757c827b91c27820fc75dc28a459c0014bb2f",
+            "md5": "b3a7384be4e8096125956cbb2d5b8406",
+            "size": "2559109"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "version": "11.6.55",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.6.55-archive.tar.xz",
+            "sha256": "734a77b3a26a9d08489d43afb74bad230c7c4a0ed2d17a6317a47cf363dca521",
+            "md5": "7bfd91b0267ce3cebf56bdba03bd99a9",
+            "size": "841896"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.6.55-archive.tar.xz",
+            "sha256": "96b9b708bd9f636fe60ae811a09a6bbb0d66c72045eb82dff7f4bbf7b6714110",
+            "md5": "67b819cb88f54a3133bc44f35b94e5b8",
+            "size": "786292"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.6.55-archive.tar.xz",
+            "sha256": "ae0ba7295280c4b2f2a217bc79cc604a3beb20484011dd2db604507f31fde0a7",
+            "md5": "3db43585c175429e7670592684500df3",
+            "size": "785420"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.6.55-archive.zip",
+            "sha256": "d73be9aa0d66b282e94c75032763249a753efb9d63de891ae9a1c4a62ed1aca1",
+            "md5": "35057ff81c5ff246c2198c18476c36ea",
+            "size": "2938345"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "625c7ce21089a52ae6b0a9a6b7d112b98f219cdcf451b94e6f7e523c437d5db1",
+            "md5": "973f41a831d158256b19b6768e4d0331",
+            "size": "112708"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "36c51224b98b7d040f41240cb12f6b43f61f334de3d6cc26d8ca3f35b50df68e",
+            "md5": "5f773be10cc49868534eccaf9bb98f86",
+            "size": "117668"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "1ea90073f8769a8e5a16b4b18245c77fd217ff8d5d484f33475bebda046e5ff5",
+            "md5": "548c27670912ae14840d897ffb8b2ecb",
+            "size": "101720"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "609599e7fc20e20cf53e2cf4f2618e467cb1bc00dcb9d09520cd2251bd3056a7",
+            "md5": "5def9ac8588bcb15eeed361f2bdd78db",
+            "size": "2539928"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "e56a68900e08dc1165cc8efabba1073087ebd5d8742cd16ef463cb3638b5d1a8",
+            "md5": "1c7d94a562519c1b92b8640606fc1ca4",
+            "size": "16027484"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "aac47225b052fd5c316816400a0e4470a8257e3894526e85c1155c81088314e5",
+            "md5": "cc15ff34145b7ad8d7b0a7fd9ef0ae28",
+            "size": "8532396"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "8e45eac6e94938de807c44d2f846a0e8996a065b0817c2119948193fec279ca6",
+            "md5": "fc9530922d0adafcea054efcdaf7579e",
+            "size": "8370644"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "ff7d4d4d7a83b2fe1bb3b964a44fdc29261470b239fc9c113e91e6b1bf1e9707",
+            "md5": "ac8391077028cc3eb3775d3eb4099865",
+            "size": "11384612"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "3233b1dc13802701821a2cdebdcee5908ae03c63f457b8574ae1798c75245375",
+            "md5": "cbef12e45924009f5a6160fcc438fe42",
+            "size": "185732"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "1f9d5f7093b6738452bc8311ce6fb13b9a59ede1c6f5476166237a3338002cc4",
+            "md5": "4dddd337619ee17921f1562a7d98b7d1",
+            "size": "182032"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "89aea00186991c56d4acc6e9ced0f3e8d9eeca991c8fc1fbc6db1ffc8be17f36",
+            "md5": "7f9874d247e48d29778e2750be23b1f1",
+            "size": "172524"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "b1e3ce998310240e60355e75aa3ad6b166fda5cae2c9e59573691f3f6b125ed8",
+            "md5": "2941018da652cbdb255c644532d00e50",
+            "size": "168845"
+        }
+    },
+    "cuda_demo_suite": {
+        "name": "CUDA Demo Suite",
+        "license": "CUDA Toolkit",
+        "version": "11.6.55",
+        "linux-x86_64": {
+            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.6.55-archive.tar.xz",
+            "sha256": "82da6b7346257c94bf5ad25c93d5bf54eaf97a224b212bd166179a2e3d93f8a1",
+            "md5": "8330c6571b66865c587755e6c922c213",
+            "size": "3996208"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.6.55-archive.zip",
+            "sha256": "0c4c3be4f185fb9ddf2bb3f012ad506e7a23e39634f685ffe59fac01435b4eef",
+            "md5": "0e536ea97e3e685e9a73170ca1e693f1",
+            "size": "5021636"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "75a2082caebc02b82ac899c354abd810f2bcd012476ace25fbe56ad78c5bd566",
+            "md5": "a7eade47d3e3821d7b1a67c9afc1f490",
+            "size": "66348"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "a51b38d9925ec6564b26b922f3ef15b3781b9017c056beaa589d9e15384e9994",
+            "md5": "4d906f72e586f8ca216118730e9880be",
+            "size": "66572"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "78f6d84ea1cba3547c3f094873062d18d30a1a45cf0af8d89b3dd4c4b03f111e",
+            "md5": "0af218b799f48e8469fad088cd2c9017",
+            "size": "66404"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "a4e0d6fc04ead69db208912487303a996dea1f37eeb7b3caff664dca10cf42a8",
+            "md5": "f055cb3244441fb9785cb38354d22af8",
+            "size": "104626"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "95dd2cbf756a2fd3bcb8c9aa71b6ba4ee385430749b9c626849f7cc4ec6e8f29",
+            "md5": "ba6a284942d5c1d977fc08eb28bff3f9",
+            "size": "64257284"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "4aaf9142728e8908db14b23af9e8bcdd77825a80e628ca8be9e0392c997ecf0a",
+            "md5": "30c6bac5a3c72d7f503c7cd98d644b3b",
+            "size": "64138892"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "5206bb2a6eb4978ddc7732689d3b94e6b1dd2d655ed6d95a514dd67404d727a4",
+            "md5": "647cc2598ee0a2d42993b31318c5fc25",
+            "size": "64040212"
+        }
+    },
+    "cuda_memcheck": {
+        "name": "CUDA Memcheck",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "5f0983c0945315d4a7beea92793aae4ffac72832870857345e9645edddc2f35b",
+            "md5": "8db021e48b154f9194f280728b41512e",
+            "size": "139868"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "67cb7a5ef1b411864f0af3fc429e74570f8920c3883ee80e1b1989746ffa11cc",
+            "md5": "af50c409bb97fc1b724b1129bd823fda",
+            "size": "147996"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "58844652c2ddfe700348b08ef04c8385d8bbf36b89a421ecdcc774667ad04a0d",
+            "md5": "dcc37dfd92fe296f1563e6b519872725",
+            "size": "172867"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "771511b1fedd8b0d684b1fa6c6ff8feacaa0e38010a3f0fba4a02087e0756cbf",
+            "md5": "51dd87c3625354ef7c7f73689d06c5d4",
+            "size": "118602976"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "07b28f88581db1ea1769a89d5fa23af298a385ff4feb14f8dbe801d9cb05a098",
+            "md5": "418edda7b00500c49cf0731f5ae75c2b",
+            "size": "118602980"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "8c81199c5a096869a10c284197cefc1a958df8bf482322a0a48dff9cc82291b8",
+            "md5": "c05aebe81d33e6850bceee7a36f8f2a5",
+            "size": "36764236"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "d63f1cf84896e16e0a90c97bab56f77a88449233025299ee96a7997b9522fb0f",
+            "md5": "2dfc257209fcb7773b8f0664abf3d0af",
+            "size": "34593028"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "cdca0d230967ccf227063841ae984704a1812663bd0074e400eee57ba47d99a9",
+            "md5": "24cd10d3274df8ca62297a097b9edf92",
+            "size": "32366400"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "ab39ba1495ebe474fb74cea2b520bc4a3c80e6953ebf774c6cd4058c50be94e1",
+            "md5": "5f85971067866e0c8c8af33fb2e4c432",
+            "size": "46956615"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "1645505394a9d186741c7c2e07dea05fc1852bfa6a0663fdc53176ffaedff548",
+            "md5": "55d1a19ce1ad9de70ea6e620fff8c3d2",
+            "size": "32786504"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "972744cd85dcb48fb0d313c7deabee246702e7d35443f96503a56ddee1904d00",
+            "md5": "9690d65addaa1a6c43800570e15d9645",
+            "size": "32788856"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "d4e5e3eef98659f3d1464576d3ec715469918def222cf7f84851ba06716fa8dd",
+            "md5": "b5430097ec81b02d7e5c1e6eabd3c801",
+            "size": "32715804"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "e318fc6ae9b33e6cc657c655a0c1eff5f56828abbea208728619c9bdfc59eb7d",
+            "md5": "ca2d64b77bcbf3c6aa9fa53b552ca63b",
+            "size": "32999132"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "version": "11.6.55",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.6.55-archive.tar.xz",
+            "sha256": "12cbd1279ffe240396cba3c7d8e27fe9b4ee0e0db81850b29462544d83ca23c0",
+            "md5": "e91c008f71ee4eda2dc32c9a51e6b479",
+            "size": "74380"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.6.55-archive.tar.xz",
+            "sha256": "6134b127d84ec38c3d496d34214500e22bc455dd13677a957d6d1e2787a27950",
+            "md5": "56adc2658a5d9e7ac72be9769b0b4d96",
+            "size": "73936"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.6.55-archive.tar.xz",
+            "sha256": "72dbcd80bb8acf675c924fbafa9462122743e37aa51a147f3e07cf0d34044292",
+            "md5": "491a21dab70c5d4b3dc8145df7737b1b",
+            "size": "74440"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.6.55-archive.zip",
+            "sha256": "35dbf8f8f2974973a52b3363fa3936ce952ce94dc2aabca9aaf1f79039a633b9",
+            "md5": "4dec589b69ec53618f86d35418b0edb5",
+            "size": "103281"
+        }
+    },
+    "cuda_nvprof": {
+        "name": "CUDA nvprof",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "2c05600562bcbe4841cd0d86fdbf2fecba36c54ad393979cb22653dd45487a9b",
+            "md5": "e22c5dd6199769553ef43ce71e4dae0d",
+            "size": "1943508"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "39d891bc85c431551d039a23d249f0c87b723a0d0683a5bf689f2fa4b3cdffd8",
+            "md5": "faf88332bafdfece1c5e63001271dc9e",
+            "size": "1598652"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "3e3275bd148fa1c3a73ef468c2a1e633fe736cb1b1c834a2693a177be9e3cbc9",
+            "md5": "abd2a3edafc9e1a069844559ca0b6352",
+            "size": "16148"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "4c965334058241f8d3cff2d1d8f37d8745796c0913e8fc440673dcc55c630808",
+            "md5": "85f85e5eb14b46756f67413e45237a8c",
+            "size": "1603422"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "0b1f79447efedef09c54d517eff994995b36d486f642379fd278ddbb4d29f5ea",
+            "md5": "644603927c6d326fb5fd4e6e3e23aa67",
+            "size": "55168"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "5c6bd788e9575fc09f9e687b15123ad4bdde25008425c7f0108e319a952f5273",
+            "md5": "065bc537a28f5b8ccf546af677391e7a",
+            "size": "55876"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "6b9c0df46418b682497feeac9cf56edfc5679e06d60a94158732aac125aa560d",
+            "md5": "e547bc9e771de95ccac8f5945a7c6ed9",
+            "size": "47532"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "991f7574ef06eef1f63e94af188d48e360b7ffcebe6fe5b9e088d91b6579009e",
+            "md5": "cb3517ad769c0b0935a76fac1a976f91",
+            "size": "144822"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "9086e9f0ac56337d8e80d3cd1d78f79633f8725cdd0bb5a9864311a2ba95c1e0",
+            "md5": "01bf28fce5c9140190d9750e1585e7a8",
+            "size": "27889392"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "68b89b68b820c87e32c830b95c7496f814854d213997701f6c0abe78827aa184",
+            "md5": "ab3a2658922c08ed944889f61d634224",
+            "size": "26054036"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "140d6587924f95fa6a9fbd7ad9a2d57b276ae71f1738b2b6bebfd0a8317b7e6d",
+            "md5": "b29a768f5bcbf995e8ee1e8bc6c6fd34",
+            "size": "25908284"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "ea5d8de24af80840bcf7d8f91ab1385366ca736485c52910fe269f845711b28f",
+            "md5": "dc650c5a417e7532633408809c10900a",
+            "size": "92877744"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "02a4fe16e715f6f9d3d6e25a5504c8a2cccab52da40ebbcf21919f002a0ac951",
+            "md5": "f9b29c3d4034abb5316220674ad3796c",
+            "size": "48124"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "fc65a9caca20c892b4bd4f2b6e635e501582fe10474cb3d2ba6f7ed50b2860c1",
+            "md5": "52a5a1846fc0c83072712e969329af75",
+            "size": "48140"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "f0e7d4f1824ff125b23cb48d37d76034c9daff787cef08316188219269df8220",
+            "md5": "a67329ea6a2171272a9d1bd36933977f",
+            "size": "48708"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "9e82e18c38ed82aa5beb8aedf4a04770b59ad73113ac9e4e5c4e1e68dc999dad",
+            "md5": "853296d1ab5efa56a0290c1fc18ff82f",
+            "size": "65732"
+        }
+    },
+    "cuda_nvvp": {
+        "name": "CUDA NVVP",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "bc7ec46b93ce7f8c2399a4d8840e7ed7961a784ef462eaa94c66d81e9725286b",
+            "md5": "892580326407fc2b16abaa72d05f27e9",
+            "size": "114308284"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "672e016a3127ec28d4ddf063bd91baab482c34dd073d839e45fc3c50c1466705",
+            "md5": "c6eb99303f62d4c3c6d240b8f00f2f0f",
+            "size": "113832776"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "374c183ddd5a127a0973fbf2e3dd0cb89d9968ca77bfeab8a3f44529fdc326a4",
+            "md5": "9f00a05cd166bd92a0ae5cc051540e55",
+            "size": "120342885"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.6.124-archive.tar.xz",
+            "sha256": "a6d81ec79be73fe23c7cd16054e9f0494e82dd14ee77ef07c4819af6248c5bfa",
+            "md5": "31816ee26b4fdd9c0c4f8e85cf723868",
+            "size": "7988992"
+        },
+        "linux-ppc64le": {
+            "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.6.124-archive.tar.xz",
+            "sha256": "3c39b6e7a23c19f91f5d25a2a2d752a15407eddc460c1c56a8e7ae7f8864ec4f",
+            "md5": "266196017ee59c3058c6c0ffc035ebe0",
+            "size": "7404564"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.6.124-archive.tar.xz",
+            "sha256": "d7c55c5a600782d3aa10b5a3a898445a57997394ea626e2e4789f7923a927334",
+            "md5": "4f3a68e4fa789ba3dcbb7e12bd77abf7",
+            "size": "6123224"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "24d24151b77b1051be2035176475f33d2b260c8a20a3fe1af99ca312490721a8",
+            "md5": "dc713ceb5f52e2936df2146693e2bdde",
+            "size": "13126684"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "version": "510.47.03",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-510.47.03-archive.tar.xz",
+            "sha256": "d5c7204160f7b2c688932f90648995bd3bf3a821d99161cefb7e7a9539e22a6f",
+            "md5": "43dc2904ab88fba0739c8265466f0972",
+            "size": "1528776"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "version": "11.9.2.110",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.9.2.110-archive.tar.xz",
+            "sha256": "ea2395ea76a811498863774491721d5c4b491fd1498221ef7cb1ae514e6518cb",
+            "md5": "e46be77087fc85134fb7c85a158f6964",
+            "size": "434133064"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.9.2.110-archive.tar.xz",
+            "sha256": "81c729d78ef775958a0aadf2a02ee7f56d826e9b4130d564b9ea92aed6f2998d",
+            "md5": "658162cbc2982de03d0703400ee8a2b8",
+            "size": "434108428"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.9.2.110-archive.tar.xz",
+            "sha256": "8201009b6df0924d599731bcf309190b8e8e3c1eebff0226f12107ca3f5f86dd",
+            "md5": "56278d0d28664be11c1e53074cf13432",
+            "size": "434332668"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.9.2.110-archive.zip",
+            "sha256": "13f5119c43128ccda66ab092bad4435313cf06cb892247e38cb2ec1d8bc96c90",
+            "md5": "52b685ec11fd3384e49e84243627a0aa",
+            "size": "324277131"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "version": "10.7.2.124",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.7.2.124-archive.tar.xz",
+            "sha256": "95397578c2d18d5df17dafa42cf34d47821953c6d5c9bdba45c7b673ba07276a",
+            "md5": "e4b681b1a42bfbbfae92995a244d0f23",
+            "size": "214961728"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.7.2.124-archive.tar.xz",
+            "sha256": "db425ae3fccbb68a28f0f461a6a022856081d16d06da3a99e903975a89a5d4b1",
+            "md5": "e0ffc2b9175cefb33b3df4fc6623d882",
+            "size": "214897136"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.7.2.124-archive.tar.xz",
+            "sha256": "b132fc468d46a90baac45f8f0484675cc4552120d5912c9c7612d7346c7db9bf",
+            "md5": "639a4f80a557168fc7ae222fec491e50",
+            "size": "214000212"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.7.2.124-archive.zip",
+            "sha256": "d7a613f9bb647695947cdd0514abed09fb82c0934461cedab629f6471f4adaf7",
+            "md5": "83aeb1b3eaa9246b2f06f37d94e9f07f",
+            "size": "287132168"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "version": "1.2.1.4",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.2.1.4-archive.tar.xz",
+            "sha256": "ebc164ebffee7dbe87ae8cc3e37fcf6499750aa9f7003ea0cc4f3bc7c7f3a56d",
+            "md5": "ae8cd1900e9947cdb8acdd9726befe29",
+            "size": "46744444"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "version": "10.2.9.124",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.9.124-archive.tar.xz",
+            "sha256": "87b1d70ec749db31cabb79ae5034b05883666e1848aa3feca643ea4a68dea47e",
+            "md5": "e7657f67965d162b519c2471ca0f7c08",
+            "size": "82095344"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.9.124-archive.tar.xz",
+            "sha256": "162a42c9e98fd3809541a04dc67933b43f2a85d8d9a749ca247d2be049b7c4d8",
+            "md5": "ba67c380f521a245192fb589cc208edd",
+            "size": "82140836"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.9.124-archive.tar.xz",
+            "sha256": "c084db363510f6a2f628401494372edc1a841b0fabf95d80e86b852b27a299f5",
+            "md5": "5021f94b32de1099a52bbfd02d08be17",
+            "size": "82081332"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.9.124-archive.zip",
+            "sha256": "6bbb3c33f76813a96b1cec51d723d0d53704f3b7fedaf6c29f4c84f1bcb73a4e",
+            "md5": "4914ba32fc23a9076f51f8755909c258",
+            "size": "53645700"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "version": "11.3.4.124",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.3.4.124-archive.tar.xz",
+            "sha256": "adbd0af1f84aea29859c217e028c1a74a5b3a90acce7d679790efd73aff28462",
+            "md5": "1f7211cc6ae6e8afd1387469a5e9a9a9",
+            "size": "77918104"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.3.4.124-archive.tar.xz",
+            "sha256": "6b9ab64258e970f6966c133dab767db03dac038cf047641fb677ce9334e53262",
+            "md5": "f8b2f8280e8863de318212199fe72494",
+            "size": "78066772"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.3.4.124-archive.tar.xz",
+            "sha256": "bb0dcef4d8c4e076a724d1a0a7258bffb6e9a9c49357716ed70466b3403eb4e3",
+            "md5": "8fced4d6324195575d28464026d26125",
+            "size": "77371768"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.3.4.124-archive.zip",
+            "sha256": "80d602eef188a19779b0beabb6f3fd9f8eb52ce8c8c61d31a792351d85053996",
+            "md5": "123c3e9a0e0933e4c414a28fd382ea7d",
+            "size": "110462365"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "version": "11.7.2.124",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.2.124-archive.tar.xz",
+            "sha256": "744affcbe5ecc8ca9438f20cf93e43a1648d682f6badfa4494f76ae26a350edc",
+            "md5": "b663b089be7b8dba687da98ed9fcf1dd",
+            "size": "218747728"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.2.124-archive.tar.xz",
+            "sha256": "97a3abd633cb0c7ce941fdb4f98e82ddd064605c2a864ad4c35eabcca1bfe7c4",
+            "md5": "6468ea649e2cd9be3541abc0b5a9d7a9",
+            "size": "218901148"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.2.124-archive.tar.xz",
+            "sha256": "4962d79be52338c911fb5612bb2f7562aa41bda0ec474fc096524bf9dd762922",
+            "md5": "1c49c2c1b950b4c874f4254490da1b82",
+            "size": "218441052"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.2.124-archive.zip",
+            "sha256": "4c33673bb1de12005b26fbf5139b6b9e25fbf4490839205036e060af27c1f789",
+            "md5": "f32317cca576ab805ec381be38ef225c",
+            "size": "180394097"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "version": "11.6.3.124",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.6.3.124-archive.tar.xz",
+            "sha256": "be4afe097cc38eea91ef02aea233db9fa3ba7a31bc115fc287e10812441ee5c2",
+            "md5": "8300ad8d28a906c386f5338187aee660",
+            "size": "165187052"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.6.3.124-archive.tar.xz",
+            "sha256": "b55dc9d7e32319a007374cbb191dba1bce1973857a0ae0cc684a4c87e39ac23a",
+            "md5": "86e2f863047db392473fb438a9112206",
+            "size": "165756596"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.6.3.124-archive.tar.xz",
+            "sha256": "dd3fbe515b0bca6393de5829fb675f8fae9bfa23f0cd5e94a87643088935aa32",
+            "md5": "e62dd0d88f234764c097f8a112f61d35",
+            "size": "164248860"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.6.3.124-archive.zip",
+            "sha256": "647e78458636d462698fbdbd26c99d4956c917a25a7fd6d2e516a7035a52c857",
+            "md5": "bf43f99df8934740762e5dd6e1419198",
+            "size": "125797073"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "version": "510.47.03",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-510.47.03-archive.tar.xz",
+            "sha256": "187b07fc6dae26f43bd23276acaf8177f15b32831cde4d21df6abfd6915d30c4",
+            "md5": "d13ca7a0403dd22e9441434b617a2d5f",
+            "size": "316976"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "version": "11.6.2.124",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.6.2.124-archive.tar.xz",
+            "sha256": "ed9f4be96412134195aecbe15b281f3ac8e9b954e0fc62df9279169cf0e0f50b",
+            "md5": "dffc64101ced535bf63604421c4afaa8",
+            "size": "2045660"
+        },
+        "linux-ppc64le": {
+            "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.6.2.124-archive.tar.xz",
+            "sha256": "377f5acfc5c25a983b0c3043b6fb9da7077d4d571481b62b091e162d8d8fe3c5",
+            "md5": "04f6a60f6c53ce31671e2eeda8f0638e",
+            "size": "2077792"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.6.2.124-archive.tar.xz",
+            "sha256": "badbe50dab52403cd152c907c9be7271a25c7e0b2bf7377a1cee13bd63f6c008",
+            "md5": "7c7fa8c7ca5d129b2f7d775cb4ac96a1",
+            "size": "1864404"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.6.2.124-archive.zip",
+            "sha256": "9a04433b80bb5374c0dcf21e1988a66d6d61009dd431668e5ef412baf1167796",
+            "md5": "99d01192cc9c040b7d2a54ae2b7ea2a3",
+            "size": "2050577"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "version": "2022.1.1.2",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.1.1.2-archive.tar.xz",
+            "sha256": "ce3248dc64ec05ad1eb174c7114dda02e3023a4ee9adfe457b662289e3134140",
+            "md5": "c1d851ebf7528107555861b4fbc83948",
+            "size": "410930844"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.1.1.2-archive.tar.xz",
+            "sha256": "84c9fdad8865c2c3f505ee781f95b546a8ce5ef712cb43fc856c0c62be9bab24",
+            "md5": "4e0660c401e2861bd3a5fa81a44c6fbf",
+            "size": "123752204"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.1.1.2-archive.tar.xz",
+            "sha256": "5016436938039b284d422a27a954e7483cc15a5d33c512525c2ded860c062747",
+            "md5": "241420674893c0dd375847ece4fa4abc",
+            "size": "121981328"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.1.1.2-archive.zip",
+            "sha256": "4f709728da79048cc50c6079a5f5dd3b7e35c363163484e7f89f8a2595b8d633",
+            "md5": "27cdc4affc4d3227905901ae5895e0b4",
+            "size": "348353793"
+        }
+    },
+    "nsight_nvtx": {
+        "name": "Nsight NVTX",
+        "license": "CUDA Toolkit",
+        "version": "1.21018621",
+        "windows-x86_64": {
+            "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip",
+            "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1",
+            "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80",
+            "size": "315692"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "version": "2021.5.2.53",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2021.5.2.53-archive.tar.xz",
+            "sha256": "27b8c6a171efc5b815035f7e9c9229bdc2c239c1da1956df687f80f78c03c70c",
+            "md5": "20dcf79c9b387fcc66956182d56fa7ef",
+            "size": "161956304"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2021.5.2.53-archive.tar.xz",
+            "sha256": "7c76f0b6e35add162be0a55cb8b673960e2d6e9907875379fd70345c6fbb05d4",
+            "md5": "5bc90d4adc83492fc65191c9a1e33d41",
+            "size": "47184992"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2021.5.2.53-archive.tar.xz",
+            "sha256": "22bd8ec797d2734b701e5bf62ec095d82687a3eb5daf01a7657cd1aab896fc6d",
+            "md5": "1a4e2b8212f8cef37d16c23c9440f680",
+            "size": "47348636"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2021.5.2.53-archive.zip",
+            "sha256": "6cd2caa431d703f1c54eb65cba2508c150ae115c0b20a58f6c96839bcbc23406",
+            "md5": "07582800aee2a476463f866aa25f8a0a",
+            "size": "304567470"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "version": "2022.1.1.22006",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.1.1.22006-archive.zip",
+            "sha256": "92c0a591401e085a2ade6688866fa93fb1562d98e4d8321a252b1143e364192a",
+            "md5": "67304f264ab92d5ac6706fb0bf3f6eac",
+            "size": "455973381"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "version": "510.47.03",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-510.47.03-archive.tar.xz",
+            "sha256": "668a653cb4e9b89279a31c2fac23306c80b8f2b4b27b4e066cfe322d9347e1b7",
+            "md5": "b9a80476a86e6186645c37b7a9a7791a",
+            "size": "327247384"
+        },
+        "linux-ppc64le": {
+            "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-510.47.03-archive.tar.xz",
+            "sha256": "28c278660d10ba63420990e164aafd866a9907a66323db9570ad1a9ada37ae0f",
+            "md5": "0a3f82d50ea4ac361eb2def1d763947f",
+            "size": "73666716"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-510.47.03-archive.tar.xz",
+            "sha256": "1f2e0b90621f67477d5bfcd8ff28b01eca9cdb79a2ba911b07671953e44618ad",
+            "md5": "d555c62d414121623b4906ecb3de06e8",
+            "size": "211721052"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "version": "2.11.0",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.11.0-archive.tar.xz",
+            "sha256": "ea260e5e8c9df3d4f1448684350a0fa7931dd45918329bda96378b173ea63b24",
+            "md5": "676b88c768132bd4775c91291af90b55",
+            "size": "69588"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "version": "11.6.124",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.6.124-archive.zip",
+            "sha256": "0a8e288bb604dc2af766f65042aeb4675a7b15629e71c7c3341d0fd8aab2de91",
+            "md5": "248f627cccca3ee81c561aaea5193271",
+            "size": "517139"
+        }
+    }
+}
diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix
new file mode 100644
index 000000000000..588f2f2a0867
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix
@@ -0,0 +1,72 @@
+final: prev: let
+  inherit (prev) lib pkgs;
+in (lib.filterAttrs (attr: _: (prev ? "${attr}")) {
+  ### Overrides to fix the components of cudatoolkit-redist
+
+  # Attributes that don't exist in the previous set are removed.
+  # That means only overrides can go here, and not new expressions!
+
+  libcufile = prev.libcufile.overrideAttrs (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [
+      prev.libcublas
+      pkgs.numactl
+      pkgs.rdma-core
+    ];
+    # libcuda needs to be resolved during runtime
+    autoPatchelfIgnoreMissingDeps = true;
+  });
+
+  libcusolver = final.addBuildInputs prev.libcusolver [
+    prev.libcublas
+  ];
+
+  cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: {
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ];
+    buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ];
+    # libcuda needs to be resolved during runtime
+    autoPatchelfIgnoreMissingDeps = true;
+  });
+
+  cuda_demo_suite = final.addBuildInputs prev.cuda_demo_suite [
+    pkgs.freeglut
+    pkgs.libGLU
+    pkgs.libglvnd
+    pkgs.mesa
+    prev.libcufft
+    prev.libcurand
+  ];
+
+  nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: {
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ];
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ];
+  });
+
+  nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: {
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
+      pkgs.addOpenGLRunpath
+      pkgs.qt5.wrapQtAppsHook
+    ];
+    buildInputs = oldAttrs.buildInputs ++ [
+      pkgs.alsa-lib
+      pkgs.e2fsprogs
+      pkgs.nss
+      pkgs.numactl
+      pkgs.pulseaudio
+      pkgs.wayland
+      pkgs.xorg.libXcursor
+      pkgs.xorg.libXdamage
+      pkgs.xorg.libXrandr
+      pkgs.xorg.libXtst
+    ];
+    # libcuda needs to be resolved during runtime
+    autoPatchelfIgnoreMissingDeps = true;
+  });
+
+  nvidia_driver = prev.nvidia_driver.overrideAttrs (oldAttrs: {
+    # libcuda needs to be resolved during runtime
+    autoPatchelfIgnoreMissingDeps = true;
+    # No need to support this package as we have drivers already
+    # in linuxPackages.
+    meta.broken = true;
+  });
+})
diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml
new file mode 100644
index 000000000000..aba6281af09d
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/versions.toml
@@ -0,0 +1,59 @@
+["10.0"]
+version = "10.0.130"
+url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"
+sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj"
+gcc = "gcc7"
+
+["10.1"]
+version = "10.1.243"
+url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run"
+sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7"
+gcc = "gcc7"
+
+["10.2"]
+version = "10.2.89"
+url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run"
+sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an"
+gcc = "gcc7"
+
+["11.0"]
+version = "11.0.3"
+url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run"
+sha256 = "1h4c69nfrgm09jzv8xjnjcvpq8n4gnlii17v3wzqry5d13jc8ydh"
+gcc = "gcc9"
+
+["11.1"]
+version = "11.1.1"
+url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run"
+sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy"
+gcc = "gcc9"
+
+["11.2"]
+version = "11.2.1"
+url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"
+sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="
+gcc = "gcc9"
+
+["11.3"]
+version = "11.3.1"
+url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run"
+sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd"
+gcc = "gcc9"
+
+["11.4"]
+version = "11.4.2"
+url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run"
+sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo="
+gcc = "gcc10" # can bump to 11 along with stdenv.cc
+
+["11.5"]
+version = "11.5.0"
+url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run"
+sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw="
+gcc = "gcc10" # can bump to 11 along with stdenv.cc
+
+["11.6"]
+version = "11.6.1"
+url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"
+sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="
+gcc = "gcc10" # can bump to 11 along with stdenv.cc
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 0011dc2f6e11..5b1673ae3729 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -8,11 +8,11 @@
 , ninja
 , pkg-config
 , gcc
-, cudaSupport ? config.cudaSupport or false, cudatoolkit
+, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
 , enablePython ? false, pythonPackages ? null
 }:
 
-assert cudaSupport -> cudatoolkit != null;
+assert cudaSupport -> (cudaPackages?cudatoolkit && cudaPackages.cudatoolkit != null);
 assert enablePython -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libusb1
     gcc.cc.lib
-  ] ++ lib.optional cudaSupport cudatoolkit
+  ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit
     ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]);
 
   patches = [
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 202903b9aa18..9333d5cdfe89 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -5,8 +5,8 @@
 , python, future, six, python-protobuf, numpy, pydot
 , eigen
 , doxygen
-, useCuda ? (config.cudaSupport or false), cudatoolkit ? null
-, useCudnn ? (config.cudnnSupport or false), cudnn ? null
+, useCuda ? (config.cudaSupport or false), cudaPackages ? {}
+, useCudnn ? (config.cudnnSupport or false)
 , useOpenmp ? false, openmp ? null
 , useOpencv3 ? true, opencv3 ? null
 , useLeveldb ? false, leveldb ? null
@@ -20,6 +20,10 @@
 #, useNnpack ? false
 }:
 
+let
+   inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 assert useCuda -> cudatoolkit != null;
 assert useCudnn -> (useCuda && cudnn != null);
 assert useOpencv3 -> opencv3 != null;
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
deleted file mode 100644
index a3f785c5b38f..000000000000
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-# The following version combinations are supported:
-#  * cuDNN 7.4.2, cudatoolkit 10.0
-#  * cuDNN 7.6.5, cudatoolkit 10.0-10.1
-#  * cuDNN 8.1.1, cudatoolkit 10.2-11.2
-#  * cuDNN 8.3.2, cudatoolkit 10.2-11.5
-{ callPackage
-, cudatoolkit_10
-, cudatoolkit_10_0
-, cudatoolkit_10_1
-, cudatoolkit_10_2
-, cudatoolkit_11
-, cudatoolkit_11_0
-, cudatoolkit_11_1
-, cudatoolkit_11_2
-, cudatoolkit_11_3
-, cudatoolkit_11_4
-, cudatoolkit_11_5
-, fetchurl
-, lib
-}:
-
-let
-  generic = args: callPackage (import ./generic.nix (removeAttrs args [ "cudatoolkit" ])) {
-    inherit (args) cudatoolkit;
-  };
-  urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn";
-in
-rec {
-  # cuDNN 7.x
-  # Still used by libtensorflow-bin. It should be upgraded at some point.
-  cudnn_7_4_cudatoolkit_10_0 = generic rec {
-    version = "7.4.2";
-    cudatoolkit = cudatoolkit_10_0;
-    # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_742/cudnn-support-matrix/index.html#cudnn-cuda-hardware-versions__table-cudnn-cuda-hardware-versions.
-    minCudaVersion = "9.2.88";
-    maxCudaVersion = "10.0.99999";
-    mkSrc = _: fetchurl {
-      url = "${urlPrefix}/v${version}/cudnn-10.0-linux-x64-v7.4.2.24.tgz";
-      hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM=";
-    };
-  };
-  # The only overlap between supported and packaged CUDA versions is 10.0.
-
-  cudnn_7_6_cudatoolkit_10_0 = generic rec {
-    version = "7.6.5";
-    cudatoolkit = cudatoolkit_10_0;
-    # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_765/cudnn-support-matrix/index.html#cudnn-versions-763-765.
-    minCudaVersion = "9.2.148";
-    maxCudaVersion = "10.1.243";
-    mkSrc = cudatoolkit: fetchurl {
-      url = "${urlPrefix}/v${version}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz";
-      hash = {
-        "10.0" = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro=";
-        "10.1" = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM=";
-      }."${cudatoolkit.majorVersion}";
-    };
-  };
-  cudnn_7_6_cudatoolkit_10_1 = cudnn_7_6_cudatoolkit_10_0.override { cudatoolkit = cudatoolkit_10_1; };
-
-  # cuDNN 8.x
-  # cuDNN 8.1 is still used by tensorflow at the time of writing (2022-02-17).
-  # See https://github.com/NixOS/nixpkgs/pull/158218 for more info.
-  cudnn_8_1_cudatoolkit_10_2 = generic rec {
-    version = "8.1.1";
-    cudatoolkit = cudatoolkit_10_2;
-    # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811.
-    minCudaVersion = "10.2.00000";
-    maxCudaVersion = "11.2.99999";
-    mkSrc = cudatoolkit:
-      let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.2"; in
-      fetchurl {
-        url = "${urlPrefix}/v${version}/cudnn-${v}-linux-x64-v8.1.1.33.tgz";
-        hash = {
-          "10.2" = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0=";
-          "11.2" = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
-        }."${v}";
-      };
-  };
-  cudnn_8_1_cudatoolkit_11_0 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; };
-  cudnn_8_1_cudatoolkit_11_1 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; };
-  cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; };
-
-  cudnn_8_1_cudatoolkit_10 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; };
-
-  # cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See
-  # https://github.com/google/jax/discussions/9455 for more info.
-  cudnn_8_3_cudatoolkit_10_2 = generic rec {
-    version = "8.3.2";
-    cudatoolkit = cudatoolkit_10_2;
-    # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-832/support-matrix/index.html#cudnn-cuda-hardware-versions.
-    minCudaVersion = "10.2.00000";
-    maxCudaVersion = "11.5.99999";
-    mkSrc = cudatoolkit:
-      let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.5"; in
-      fetchurl {
-        # Starting at version 8.3.1 there's a new directory layout including
-        # a subdirectory `local_installers`.
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/local_installers/${v}/cudnn-linux-x86_64-8.3.2.44_cuda${v}-archive.tar.xz";
-        hash = {
-          "10.2" = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw=";
-          "11.5" = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc=";
-        }."${v}";
-      };
-  };
-  cudnn_8_3_cudatoolkit_11_0 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; };
-  cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; };
-  cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; };
-  cudnn_8_3_cudatoolkit_11_3 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_3; };
-  cudnn_8_3_cudatoolkit_11_4 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_4; };
-  cudnn_8_3_cudatoolkit_11_5 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_5; };
-
-  cudnn_8_3_cudatoolkit_10 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; };
-  cudnn_8_3_cudatoolkit_11 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; };
-}
diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix
new file mode 100644
index 000000000000..263310f3d7c4
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cudnn/extension.nix
@@ -0,0 +1,112 @@
+final: prev: let
+
+  inherit (final) callPackage;
+  inherit (prev) cudatoolkit cudaVersion lib pkgs;
+
+  ### CuDNN
+
+  buildCuDnnPackage = args: callPackage ./generic.nix {} args;
+
+  toUnderscore = str: lib.replaceStrings ["."] ["_"] str;
+
+  majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str));
+
+  cuDnnPackages = with lib; let
+    # Check whether a file is supported for our cuda version
+    isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions;
+    # Return the first file that is supported. In practice there should only ever be one anyway.
+    supportedFile = files: findFirst isSupported null files;
+    # Supported versions with versions as keys and file as value
+    supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) cuDnnVersions);
+    # Compute versioned attribute name to be used in this package set
+    computeName = version: "cudnn_${toUnderscore version}";
+    # Add all supported builds as attributes
+    allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildCuDnnPackage (removeAttrs file ["fileVersion"]))) supportedVersions;
+    # Set the default attributes, e.g. cudnn = cudnn_8_3_1;
+    defaultBuild = { "cudnn" = allBuilds.${computeName cuDnnDefaultVersion}; };
+  in allBuilds // defaultBuild;
+
+  cuDnnVersions = let
+    urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn";
+  in {
+    "7.4.2" = [
+      rec {
+        fileVersion = "10.0";
+        fullVersion = "7.4.2.24";
+        sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-10.0-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "10.0" ];
+      }
+    ];
+    "7.6.5" = [
+      rec {
+        fileVersion = "10.0";
+        fullVersion = "7.6.5.32";
+        hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "10.0" ];
+      }
+      rec {
+        fileVersion = "10.1";
+        fullVersion = "7.6.5.32";
+        hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "10.1" ];
+      }
+      rec {
+        fileVersion = "10.2";
+        fullVersion = "7.6.5.32";
+        hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "10.2" ];
+      }
+    ];
+    "8.1.1" = [
+      rec {
+        fileVersion = "10.2";
+        fullVersion = "8.1.1.33";
+        hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "10.2" ];
+      }
+      rec {
+        fileVersion = "11.2";
+        fullVersion = "8.1.1.33";
+        hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz";
+        supportedCudaVersions = [ "11.2" ];
+      }
+    ];
+    "8.3.2" = [
+      rec {
+        fileVersion = "10.2";
+        fullVersion = "8.3.2.44";
+        hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
+        supportedCudaVersions = [ "10.2" ];
+      }
+      rec {
+        fileVersion = "11.5";
+        fullVersion = "8.3.2.44";
+        hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc=";
+        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";
+        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ];
+      }
+    ];
+  };
+
+  # Default attributes
+  cuDnnDefaultVersion = {
+    "10.0" = "7.4.2";
+    "10.1" = "7.6.5";
+    "10.2" = "8.3.2";
+    "11.0" = "8.3.2";
+    "11.1" = "8.3.2";
+    "11.2" = "8.3.2";
+    "11.3" = "8.3.2";
+    "11.4" = "8.3.2";
+    "11.5" = "8.3.2";
+    "11.6" = "8.3.2";
+  }.${cudaVersion};
+
+in cuDnnPackages
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index a5272e56ab6d..2e53bdcdfc4e 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -1,9 +1,3 @@
-{ minCudaVersion
-, maxCudaVersion
-, mkSrc
-, version
-}:
-
 { stdenv
 , lib
 , cudatoolkit
@@ -19,13 +13,27 @@
   removeStatic ? false
 }:
 
-stdenv.mkDerivation {
+{ fullVersion
+, url
+, hash ? null
+, sha256 ? null
+, supportedCudaVersions ? []
+}:
+
+assert (hash != null) || (sha256 != null);
+
+let
+  majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));
+  version = majorMinorPatch fullVersion;
+in stdenv.mkDerivation {
   name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
 
   inherit version;
   # It's often the case that the src depends on the version of cudatoolkit it's
   # being linked against, so we pass in `cudatoolkit` as an argument to `mkSrc`.
-  src = mkSrc cudatoolkit;
+  src = fetchurl {
+    inherit url hash sha256;
+  };
 
   nativeBuildInputs = [ addOpenGLRunpath ];
 
@@ -81,12 +89,7 @@ stdenv.mkDerivation {
     # official version constraints (as recorded in default.nix). In some cases
     # you _may_ be able to smudge version constraints, just know that you're
     # embarking into unknown and unsupported territory when doing so.
-    broken = let cudaVer = lib.getVersion cudatoolkit; in
-      !(
-        lib.versionAtLeast cudaVer minCudaVersion
-        && lib.versionAtLeast maxCudaVersion cudaVer
-      );
-
+    broken = !(elem cudatoolkit.majorMinorVersion supportedCudaVersions);
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
     homepage = "https://developer.nvidia.com/cudnn";
     license = licenses.unfree;
diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix
deleted file mode 100644
index d0d24bd1adbe..000000000000
--- a/pkgs/development/libraries/science/math/cutensor/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ callPackage
-, cudatoolkit_10_1
-, cudatoolkit_10_2
-, cudatoolkit_11
-, cudatoolkit_11_0
-, cudatoolkit_11_1
-, cudatoolkit_11_2
-, cudatoolkit_11_3
-, cudatoolkit_11_4
-, cudatoolkit_11_5
-, cudatoolkit_11_6
-}:
-
-rec {
-  cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec {
-    version = "1.2.2.5";
-    libPath = "lib/10.1";
-    cudatoolkit = cudatoolkit_10_1;
-    # 1.2.2 is compatible with CUDA 10.1, 10.2, and 11.x.
-    # See https://docs.nvidia.com/cuda/cutensor/release_notes.html#cutensor-v1-2-2.
-    hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY=";
-  };
-
-  cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
-    version = "1.3.1.3";
-    libPath = "lib/10.2";
-    cudatoolkit = cudatoolkit_10_2;
-    # 1.3.1 is compatible with CUDA 10.2 and 11.x.
-    # See https://docs.nvidia.com/cuda/cutensor/release_notes.html#cutensor-v1-3-1.
-    hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8=";
-  };
-
-  cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
-
-  cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override {
-    libPath = "lib/11";
-    cudatoolkit = cudatoolkit_11_0;
-  };
-
-  cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; };
-  cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; };
-  cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_3; };
-  cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_4; };
-  cutensor_cudatoolkit_11_5 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_5; };
-  cutensor_cudatoolkit_11_6 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_6; };
-
-  cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11; };
-}
diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix
index eaea649d4340..a7940cd1db8d 100644
--- a/pkgs/development/libraries/science/math/libtorch/test/default.nix
+++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix
@@ -6,10 +6,11 @@
 , symlinkJoin
 
 , cudaSupport
-, cudatoolkit
-, cudnn
+, cudaPackages ? {}
 }:
 let
+  inherit (cudaPackages) cudatoolkit cudnn;
+
   cudatoolkit_joined = symlinkJoin {
     name = "${cudatoolkit.name}-unsplit";
     paths = [ cudatoolkit.out cudatoolkit.lib ];
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index c5960dddf517..a1e0d908d510 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
+{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudaPackages, libpthreadstubs, lapack, blas }:
+
+let
+  inherit (cudaPackages) cudatoolkit;
+in
 
 assert let majorIs = lib.versions.major cudatoolkit.version;
        in majorIs == "9" || majorIs == "10" || majorIs == "11";
diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix
index b57d1191933b..e084fce9e9ec 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix
@@ -1,13 +1,16 @@
 { lib, stdenv
 , fetchurl
 , addOpenGLRunpath
-, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn
+, cudaSupport ? false, cudaPackages ? {}
+, symlinkJoin
 }:
 
 with lib;
 let
   broken = !stdenv.isLinux && !stdenv.isDarwin;
 
+  inherit (cudaPackages) cudatoolkit cudnn;
+
   tfType = if cudaSupport then "gpu" else "cpu";
 
   system =
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 480970f04a11..cd4c81056d5a 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -11,10 +11,14 @@
 , setuptools
 , six
 , libgpuarray
-, cudaSupport ? false, cudatoolkit
-, cudnnSupport ? false, cudnn
+, cudaSupport ? false, cudaPackages ? {}
+, cudnnSupport ? false
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 assert cudnnSupport -> cudaSupport;
 
 let
@@ -39,7 +43,9 @@ let
     (    lib.optional cudaSupport libgpuarray_
       ++ lib.optional cudnnSupport cudnn );
 
-  libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; };
+  # We need to be careful with overriding Python packages within the package set
+  # as this can lead to collisions!
+  libgpuarray_ = libgpuarray.override { inherit cudaSupport cudaPackages; };
 
 in buildPythonPackage rec {
   pname = "Theano";
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index a798920ef7a8..beba7d21e0c6 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,15 +1,13 @@
 { lib, buildPythonPackage
 , fetchPypi, isPy3k, cython
 , fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools
-, cudatoolkit, cudnn, cutensor, nccl
+, cudaPackages
 , addOpenGLRunpath
 }:
 
-assert cudnn.cudatoolkit == cudatoolkit;
-assert cutensor.cudatoolkit == cudatoolkit;
-assert nccl.cudatoolkit == cudatoolkit;
-
-buildPythonPackage rec {
+let
+  inherit (cudaPackages) cudatoolkit cudnn cutensor nccl;
+in buildPythonPackage rec {
   pname = "cupy";
   version = "10.2.0";
   disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 0929831e32a4..1eb4cc18ed06 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,6 @@
 , autoPatchelfHook
 , buildPythonPackage
 , config
-, cudatoolkit_11
 , cudnn
 , fetchurl
 , flatbuffers
@@ -29,11 +28,16 @@
 , stdenv
   # Options:
 , cudaSupport ? config.cudaSupport or false
+, cudaPackages ? {}
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 # There are no jaxlib wheels targeting cudnn <8.0.5, and although there are
 # wheels for cudatoolkit <11.1, we don't support them.
-assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1";
+assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1";
 assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5";
 
 let
@@ -116,7 +120,7 @@ buildPythonPackage rec {
       rpath=$(patchelf --print-rpath $file)
       # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to
       # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib.
-      patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file
+      patchelf --set-rpath "$rpath:${cudatoolkit}/lib:${lib.makeLibraryPath [ cudatoolkit.lib cudnn ]}" $file
     done
   '';
 
@@ -127,7 +131,7 @@ buildPythonPackage rec {
   # more info.
   postInstall = lib.optional cudaSupport ''
     mkdir -p $out/bin
-    ln -s ${cudatoolkit_11}/bin/ptxas $out/bin/ptxas
+    ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas
   '';
 
   pythonImportsCheck = [ "jaxlib" ];
diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index 363bfe561346..3ecad5e4c7ad 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -18,11 +18,6 @@
 , wheel
 , which
 
-  # Build-time and runtime CUDA dependencies:
-, cudatoolkit ? null
-, cudnn ? null
-, nccl ? null
-
   # Python dependencies:
 , absl-py
 , flatbuffers
@@ -42,6 +37,7 @@
   # CUDA flags:
 , cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ]
 , cudaSupport ? false
+, cudaPackages ? {}
 
   # MKL:
 , mklSupport ? true
@@ -49,6 +45,8 @@
 
 let
 
+  inherit (cudaPackages) cudatoolkit cudnn nccl;
+
   pname = "jaxlib";
   version = "0.3.0";
 
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 2be115ae3658..89a83df42684 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -9,7 +9,7 @@
 , six
 , nose
 , Mako
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudaPackages
 , openclSupport ? true, ocl-icd, clblas
 }:
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   configurePhase = "cmakeConfigurePhase";
 
   libraryPath = lib.makeLibraryPath (
-    lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ]
+    lib.optionals cudaSupport (with cudaPackages; [ cudatoolkit.lib cudatoolkit.out ])
     ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
   );
 
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 0219300f1fdf..d656a56e3c17 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -13,12 +13,15 @@
 
 # CUDA-only dependencies:
 , addOpenGLRunpath ? null
-, cudatoolkit ? null
+, cudaPackages ? {}
 
 # CUDA flags:
 , cudaSupport ? false
 }:
-buildPythonPackage rec {
+
+let
+  inherit (cudaPackages) cudatoolkit;
+in buildPythonPackage rec {
   version = "0.55.1";
   pname = "numba";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index cdd07e86110b..1c443712db76 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -10,7 +10,7 @@
 , decorator
 , appdirs
 , six
-, cudatoolkit
+, cudaPackages
 , python
 , mkDerivation
 , lib
@@ -19,6 +19,8 @@ let
   compyte = import ./compyte.nix {
     inherit mkDerivation fetchFromGitHub;
   };
+
+  inherit (cudaPackages) cudatoolkit;
 in
 buildPythonPackage rec {
   pname = "pycuda";
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 24ba74a1013b..810460a30ade 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
-  cudaSupport ? false, cudatoolkit, cudnn, nccl, magma,
+  cudaSupport ? false, cudaPackages, magma,
   mklDnnSupport ? true, useSystemNccl ? true,
   MPISupport ? false, mpi,
   buildDocs ? false,
@@ -29,6 +29,10 @@
 
   isPy3k, pythonOlder }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn nccl;
+in
+
 # assert that everything needed for cuda is present and that the correct cuda versions are used
 assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
                         in majorIs == "9" || majorIs == "10" || majorIs == "11");
@@ -300,7 +304,7 @@ in buildPythonPackage rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   passthru = {
-    inherit cudaSupport;
+    inherit cudaSupport cudaPackages;
     cudaArchList = final_cudaArchList;
     # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
     blasProvider = blas.provider;
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 2c47f8674e0e..5a35fb8ded4d 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -20,8 +20,7 @@
 , tensorflow-estimator
 , tensorboard
 , cudaSupport ? false
-, cudatoolkit
-, cudnn
+, cudaPackages ? {}
 , patchelfUnstable
 , zlib
 , python
@@ -43,6 +42,7 @@ assert ! (stdenv.isDarwin && cudaSupport);
 
 let
   packages = import ./binary-hashes.nix;
+  inherit (cudaPackages) cudatoolkit cudnn;
 in buildPythonPackage {
   pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
   inherit (packages) version;
@@ -182,6 +182,10 @@ in buildPythonPackage {
     "tensorflow.python.framework"
   ];
 
+  passthru = {
+    inherit cudaPackages;
+  };
+
   meta = with lib; {
     description = "Computation using data flow graphs for scalable machine learning";
     homepage = "http://tensorflow.org";
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 2d5a302521b4..3a8eba3ba97f 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -17,7 +17,7 @@
 # that in nix as well. It would make some things easier and less confusing, but
 # it would also make the default tensorflow package unfree. See
 # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
-, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null
+, cudaSupport ? false, cudaPackages ? {}
 , mklSupport ? false, mkl ? null
 , tensorboardSupport ? true
 # XLA without CUDA is broken
@@ -31,6 +31,10 @@
 , Foundation, Security, cctools, llvmPackages_11
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn nccl;
+in
+
 assert cudaSupport -> cudatoolkit != null
                    && cudnn != null;
 
@@ -514,6 +518,7 @@ in buildPythonPackage {
   # Regression test for #77626 removed because not more `tensorflow.contrib`.
 
   passthru = {
+    inherit cudaPackages;
     deps = bazel-build.deps;
     libtensorflow = bazel-build.out;
   };
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 7b6384966ab1..0cb280af6748 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -11,12 +11,12 @@
 , pillow
 , pytorch
 , pytest
-, cudatoolkit
-, cudnn
 , cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch
 }:
 
 let
+  inherit (pytorch.cudaPackages) cudatoolkit cudnn;
+
   cudatoolkit_joined = symlinkJoin {
     name = "${cudatoolkit.name}-unsplit";
     paths = [ cudatoolkit.out cudatoolkit.lib ];
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix
index 3265f3d63382..6328b3f9bc82 100644
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@@ -1,8 +1,7 @@
 { stdenv
 , boost
 , cmake
-, cudatoolkit
-, cudnn
+, cudaPackages
 , eigen
 , fetchFromGitHub
 , gperftools
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (!enableGPU) [
     eigen
   ] ++ lib.optionals (enableGPU && enableCuda) [
-    cudnn
+    cudaPackages.cudnn
     mesa.drivers
   ] ++ lib.optionals (enableGPU && !enableCuda) [
     opencl-headers
@@ -86,7 +85,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cd cpp/
   '' + lib.optionalString enableCuda ''
-    export CUDA_PATH="${cudatoolkit}"
+    export CUDA_PATH="${cudaPackages.cudatoolkit}"
     export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
   '';
 
diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix
deleted file mode 100644
index ff256028cdf0..000000000000
--- a/pkgs/test/cuda/cuda-library-samples/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ callPackage
-, cudatoolkit_10_1, cudatoolkit_10_2
-, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
-, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
-, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2, cutensor_cudatoolkit_11_3, cutensor_cudatoolkit_11_4
-}:
-
-rec {
-
-  cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_10_1;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_10_1;
-  };
-
-  cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_10_2;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_10_2;
-  };
-
-  cuda-library-samples_cudatoolkit_10 =
-    cuda-library-samples_cudatoolkit_10_2;
-
-  ##
-
-  cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_0;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_11_0;
-  };
-
-  cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_1;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_11_1;
-  };
-
-  cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_2;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
-  };
-
-  cuda-library-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_3;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_11_3;
-  };
-
-  cuda-library-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_4;
-    cutensor_cudatoolkit = cutensor_cudatoolkit_11_4;
-  };
-
-  cuda-library-samples_cudatoolkit_11 =
-    cuda-library-samples_cudatoolkit_11_4;
-}
diff --git a/pkgs/test/cuda/cuda-library-samples/extension.nix b/pkgs/test/cuda/cuda-library-samples/extension.nix
new file mode 100644
index 000000000000..4c721a9e9e1b
--- /dev/null
+++ b/pkgs/test/cuda/cuda-library-samples/extension.nix
@@ -0,0 +1,3 @@
+final: prev: {
+  cuda-library-samples = final.callPackage ./generic.nix { };
+}
diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix
index 350decef22dc..f0c30d801a1c 100644
--- a/pkgs/test/cuda/cuda-library-samples/generic.nix
+++ b/pkgs/test/cuda/cuda-library-samples/generic.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub
 , cmake, addOpenGLRunpath
 , cudatoolkit
-, cutensor_cudatoolkit
+, cutensor
 }:
 
 let
@@ -61,9 +61,9 @@ in
     # CUTENSOR_ROOT is double escaped
     postPatch = ''
       substituteInPlace CMakeLists.txt \
-        --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include"
+        --replace "\''${CUTENSOR_ROOT}/include" "${cutensor.dev}/include"
     '';
 
-    CUTENSOR_ROOT = cutensor_cudatoolkit;
+    CUTENSOR_ROOT = cutensor;
   });
 }
diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix
deleted file mode 100644
index 5b46a0651eba..000000000000
--- a/pkgs/test/cuda/cuda-samples/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ callPackage
-, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
-, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
-}:
-
-rec {
-  ##
-
-  cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_10_0;
-    sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw";
-  };
-
-  cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_10_1;
-    sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd";
-  };
-
-  cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_10_2;
-    sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94";
-  };
-
-  cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2;
-
-  ##
-
-  cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_0;
-    sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705";
-  };
-
-  cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_1;
-    sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh";
-  };
-
-  cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_2;
-    sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
-  };
-
-  cuda-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_3;
-    sha256 = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz";
-  };
-
-  cuda-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
-    cudatoolkit = cudatoolkit_11_4;
-    sha256 = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
-  };
-
-  cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_4;
-}
diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix
new file mode 100644
index 000000000000..4c93845d1db6
--- /dev/null
+++ b/pkgs/test/cuda/cuda-samples/extension.nix
@@ -0,0 +1,20 @@
+final: prev: let
+
+  sha256 = {
+    "10.0" = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw";
+    "10.1" = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd";
+    "10.2" = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94";
+    "11.0" = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705";
+    "11.1" = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh";
+    "11.2" = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
+    "11.3" = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz";
+    "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
+    "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI=";
+    "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE=";
+  }.${prev.cudaVersion};
+
+in {
+  cuda-samples = final.callPackage ./generic.nix {
+    inherit sha256;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7b6b4f3e3d4f..09208dd45f3f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -195,7 +195,6 @@ mapAliases ({
   cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21
 
   # CUDA Toolkit
-
   cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14
   cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14
   cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14
@@ -205,15 +204,56 @@ mapAliases ({
   cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
   cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
   cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
+  cudatoolkit_10 = throw "cudatoolkit_10 has been renamed to cudaPackages_10.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_10_0 = throw "cudatoolkit_10_0 has been renamed to cudaPackages_10_0.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_10_1 = throw "cudatoolkit_10_1 has been renamed to cudaPackages_10_1.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_10_2 = throw "cudatoolkit_10_2 has been renamed to cudaPackages_10_2.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_0 = throw "cudatoolkit_11_0 has been renamed to cudaPackages_11_0.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_1 = throw "cudatoolkit_11_1 has been renamed to cudaPackages_11_1.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_2 = throw "cudatoolkit_11_2 has been renamed to cudaPackages_11_2.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_3 = throw "cudatoolkit_11_3 has been renamed to cudaPackages_11_3.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_4 = throw "cudatoolkit_11_4 has been renamed to cudaPackages_11_4.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_5 = throw "cudatoolkit_11_5 has been renamed to cudaPackages_11_5.cudatoolkit"; # Added 2022-04-04
+  cudatoolkit_11_6 = throw "cudatoolkit_11_6 has been renamed to cudaPackages_11_6.cudatoolkit"; # Added 2022-04-04
+
+  cudnn = throw "cudnn is now part of cudaPackages*"; # Added 2022-04-04
   cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14
   cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14
+  cudnn_7_4_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
   cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14
+  cudnn_7_6_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_7_6_cudatoolkit_10_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
   cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14
+  cudnn_8_1_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_1_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_1_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_1_cudatoolkit_11_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_1_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_3 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_4 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11_5 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
+  cudnn_8_3_cudatoolkit_11 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04
   cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18
   cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
   cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
   cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
 
+  cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_10_2 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11_0 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11_2 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11_3 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+  cutensor_cudatoolkit_11_4 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
+
   cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
   cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead"; # Added 2020-06-15
   cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
@@ -782,6 +822,10 @@ mapAliases ({
 
   ### N ###
 
+  nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04
+  nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04
+  nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04
+
   net_snmp = net-snmp; # Added 2019-12-21
   nagiosPluginsOfficial = monitoring-plugins;
   navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ef3b1095633..e2035dd2b2ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2360,8 +2360,7 @@ with pkgs;
 
   libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
     cudaSupport = config.cudaSupport or false;
-    cudatoolkit = cudatoolkit_10_0;
-    cudnn = cudnn_7_4_cudatoolkit_10_0;
+    cudaPackages = cudaPackages_10_0;
   };
 
   libtensorflow =
@@ -4619,59 +4618,24 @@ with pkgs;
 
   snooze = callPackage ../tools/system/snooze { };
 
-  cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {});
-  inherit (cudaPackages)
-    cudatoolkit_10
-    cudatoolkit_10_0
-    cudatoolkit_10_1
-    cudatoolkit_10_2
-    cudatoolkit_11
-    cudatoolkit_11_0
-    cudatoolkit_11_1
-    cudatoolkit_11_2
-    cudatoolkit_11_3
-    cudatoolkit_11_4
-    cudatoolkit_11_5
-    cudatoolkit_11_6;
+  cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; };
+  cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; };
+  cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; };
+  cudaPackages_10 = cudaPackages_10_2;
 
-  cudatoolkit = cudatoolkit_11;
+  cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaVersion = "11.0"; };
+  cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaVersion = "11.1"; };
+  cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaVersion = "11.2"; };
+  cudaPackages_11_3 = callPackage ./cuda-packages.nix { cudaVersion = "11.3"; };
+  cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; };
+  cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; };
+  cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
+  cudaPackages_11 = cudaPackages_11_5;
+  cudaPackages = cudaPackages_11;
 
-  cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
-  inherit (cudnnPackages)
-    cudnn_7_4_cudatoolkit_10_0
-    cudnn_7_6_cudatoolkit_10_0
-    cudnn_7_6_cudatoolkit_10_1
-    cudnn_8_1_cudatoolkit_10_2
-    cudnn_8_1_cudatoolkit_11_0
-    cudnn_8_1_cudatoolkit_11_1
-    cudnn_8_1_cudatoolkit_11_2
-    cudnn_8_1_cudatoolkit_10
-    cudnn_8_3_cudatoolkit_10_2
-    cudnn_8_3_cudatoolkit_11_0
-    cudnn_8_3_cudatoolkit_11_1
-    cudnn_8_3_cudatoolkit_11_2
-    cudnn_8_3_cudatoolkit_11_3
-    cudnn_8_3_cudatoolkit_11_4
-    cudnn_8_3_cudatoolkit_11_5
-    cudnn_8_3_cudatoolkit_10
-    cudnn_8_3_cudatoolkit_11;
-
-  # Make sure to keep this in sync with the `cudatoolkit` version!
-  cudnn = cudnn_8_3_cudatoolkit_11;
-
-  cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
-  inherit (cutensorPackages)
-    cutensor_cudatoolkit_10
-    cutensor_cudatoolkit_10_1
-    cutensor_cudatoolkit_10_2
-    cutensor_cudatoolkit_11
-    cutensor_cudatoolkit_11_0
-    cutensor_cudatoolkit_11_1
-    cutensor_cudatoolkit_11_2
-    cutensor_cudatoolkit_11_3
-    cutensor_cudatoolkit_11_4;
-
-  cutensor = cutensor_cudatoolkit_11;
+  # TODO: move to alias
+  cudatoolkit = cudaPackages.cudatoolkit;
+  cudatoolkit_11 = cudaPackages_11.cudatoolkit;
 
   curie = callPackage ../data/fonts/curie { };
 
@@ -8184,10 +8148,6 @@ with pkgs;
   nbd = callPackage ../tools/networking/nbd { };
   xnbd = callPackage ../tools/networking/xnbd { };
 
-  nccl = callPackage ../development/libraries/science/math/nccl { };
-  nccl_cudatoolkit_10 = nccl.override { cudatoolkit = cudatoolkit_10; };
-  nccl_cudatoolkit_11 = nccl.override { cudatoolkit = cudatoolkit_11; };
-
   ndjbdns = callPackage ../tools/networking/ndjbdns { };
 
   ndppd = callPackage ../applications/networking/ndppd { };
@@ -26411,7 +26371,7 @@ with pkgs;
 
   gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder {
     # rm me as soon as this package gains the support for cuda 11
-    cudatoolkit = cudatoolkit_10;
+    inherit (cudaPackages_10) cudatoolkit;
   };
 
   gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
@@ -31325,8 +31285,6 @@ with pkgs;
 
   katagoWithCuda = katago.override {
     enableCuda = true;
-    cudnn = cudnn_8_3_cudatoolkit_11;
-    cudatoolkit = cudatoolkit_11;
   };
 
   katagoCPU = katago.override {
@@ -32930,8 +32888,7 @@ with pkgs;
 
   caffe = callPackage ../applications/science/math/caffe ({
     cudaSupport = config.cudaSupport or false;
-    cudatoolkit = cudatoolkit_10_1;
-    cudnn = cudnn_7_6_cudatoolkit_10_1;
+    cudaPackages = cudaPackages_10_1;
     opencv3 = opencv3WithoutCuda; # Used only for image loading.
     blas = openblas;
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
new file mode 100644
index 000000000000..211540260d10
--- /dev/null
+++ b/pkgs/top-level/cuda-packages.nix
@@ -0,0 +1,72 @@
+{ lib
+, pkgs
+, cudaVersion
+}:
+
+with lib;
+
+let
+
+  scope = makeScope pkgs.newScope (final: {
+    # Here we put package set configuration and utility functions.
+    inherit cudaVersion;
+    cudaMajorVersion = versions.major final.cudaVersion;
+    cudaMajorMinorVersion = lib.versions.majorMinor final.cudaVersion;
+    inherit lib pkgs;
+
+    addBuildInputs = drv: buildInputs: drv.overrideAttrs (oldAttrs: {
+      buildInputs = (oldAttrs.buildInputs or []) ++ buildInputs;
+    });
+  });
+
+  cutensorExtension = final: prev: let
+    ### CuTensor
+
+    buildCuTensorPackage = final.callPackage ../development/libraries/science/math/cutensor/generic.nix;
+
+    cuTensorVersions = {
+      "1.2.2.5" = {
+        hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY=";
+      };
+      "1.3.1.3" = {
+        hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8=";
+      };
+    };
+
+    inherit (final) cudaMajorMinorVersion cudaMajorVersion;
+
+    cutensor = buildCuTensorPackage rec {
+      version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.3.1.3";
+      inherit (cuTensorVersions.${version}) hash;
+      # This can go into generic.nix
+      libPath = "lib/${if cudaMajorVersion == "10" then cudaMajorMinorVersion else cudaMajorVersion}";
+    };
+  in { inherit cutensor; };
+
+  extraPackagesExtension = final: prev: {
+
+    nccl = final.callPackage ../development/libraries/science/math/nccl { };
+
+    autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }:
+      makeSetupHook {
+        name = "auto-add-opengl-runpath-hook";
+        deps = [
+          addOpenGLRunpath
+        ];
+      } ../development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh
+    ) {};
+
+  };
+
+  composedExtension = composeManyExtensions [
+    extraPackagesExtension
+    (import ../development/compilers/cudatoolkit/extension.nix)
+    (import ../development/compilers/cudatoolkit/redist/extension.nix)
+    (import ../development/compilers/cudatoolkit/redist/overrides.nix)
+    (import ../development/libraries/science/math/cudnn/extension.nix)
+    (import ../test/cuda/cuda-samples/extension.nix)
+    (import ../test/cuda/cuda-library-samples/extension.nix)
+    cutensorExtension
+  ];
+
+in (scope.overrideScope' composedExtension)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1cab3948c617..ad2f91731238 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -94,12 +94,6 @@ let
 
   disabledIf = x: drv: if x then disabled drv else drv;
 
-  # CUDA-related packages that are compatible with the currently packaged version
-  # of TensorFlow, used to keep these versions in sync in related packages like `jaxlib`.
-  tensorflow_compat_cudatoolkit = pkgs.cudatoolkit_11_2;
-  tensorflow_compat_cudnn = pkgs.cudnn_8_1_cudatoolkit_11_2;
-  tensorflow_compat_nccl = pkgs.nccl_cudatoolkit_11;
-
 in {
 
   inherit pkgs stdenv;
@@ -1959,12 +1953,7 @@ in {
 
   cufflinks = callPackage ../development/python-modules/cufflinks { };
 
-  cupy = callPackage ../development/python-modules/cupy {
-    cudatoolkit = pkgs.cudatoolkit_11;
-    cudnn = pkgs.cudnn_8_3_cudatoolkit_11;
-    nccl = pkgs.nccl_cudatoolkit_11;
-    cutensor = pkgs.cutensor_cudatoolkit_11;
-  };
+  cupy = callPackage ../development/python-modules/cupy { };
 
   curio = callPackage ../development/python-modules/curio { };
 
@@ -4231,22 +4220,20 @@ in {
 
   jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix {
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit_11 = tensorflow_compat_cudatoolkit;
-    cudnn = tensorflow_compat_cudnn;
+    inherit (self.tensorflow) cudaPackages;
   };
 
   jaxlib-build = callPackage ../development/python-modules/jaxlib {
     # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = tensorflow_compat_cudatoolkit;
-    cudnn = tensorflow_compat_cudnn;
-    nccl = tensorflow_compat_nccl;
+    inherit (self.tensorflow) cudaPackages;
   };
 
   jaxlib = self.jaxlib-build;
 
   jaxlibWithCuda = self.jaxlib-build.override {
     cudaSupport = true;
+
   };
 
   jaxlibWithoutCuda = self.jaxlib-build.override {
@@ -5681,7 +5668,6 @@ in {
 
   numba = callPackage ../development/python-modules/numba {
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = tensorflow_compat_cudatoolkit;
   };
 
   numbaWithCuda = self.numba.override {
@@ -6876,7 +6862,6 @@ in {
   pyctr = callPackage ../development/python-modules/pyctr { };
 
   pycuda = callPackage ../development/python-modules/pycuda {
-    inherit (pkgs) cudatoolkit;
     inherit (pkgs.stdenv) mkDerivation;
   };
 
@@ -7596,6 +7581,7 @@ in {
   });
 
   pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override {
+    cudaSupport = true;
     enablePython = true;
     pythonPackages = self;
   });
@@ -9894,18 +9880,21 @@ in {
 
   tensorboardx = callPackage ../development/python-modules/tensorboardx { };
 
-  tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
+  tensorflow-bin = let
+    # CUDA-related packages that are compatible with the currently packaged version
+    # of TensorFlow, used to keep these versions in sync in related packages like `jaxlib`.
+    cudaPackages = pkgs.cudaPackages_11_2.overrideScope' (final: prev: {
+      cudnn = prev.cudnn_8_1_1;
+    });
+  in callPackage ../development/python-modules/tensorflow/bin.nix {
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = tensorflow_compat_cudatoolkit;
-    cudnn = tensorflow_compat_cudnn;
+    inherit cudaPackages;
   };
 
   tensorflow-build = callPackage ../development/python-modules/tensorflow {
     inherit (pkgs.darwin) cctools;
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = tensorflow_compat_cudatoolkit;
-    cudnn = tensorflow_compat_cudnn;
-    nccl = tensorflow_compat_nccl;
+    inherit (self.tensorflow-bin) cudaPackages;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
     flatbuffers-core = pkgs.flatbuffers;
     flatbuffers-python = self.flatbuffers;
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
new file mode 100644
index 000000000000..6cc149936ac8
--- /dev/null
+++ b/pkgs/top-level/release-cuda.nix
@@ -0,0 +1,55 @@
+/*
+    Test CUDA packages.
+
+    This release file will not be tested on hydra.nixos.org
+    because it requires unfree software.
+
+    Test for example like this:
+
+        $ hydra-eval-jobs pkgs/top-level/release-cuda.nix --option restrict-eval false -I foo=. --arg nixpkgs '{ outPath = ./.; revCount = 0; shortRev = "aabbcc"; }'
+
+*/
+
+{ # The platforms for which we build Nixpkgs.
+  supportedSystems ? [
+    "x86_64-linux"
+  ]
+, # Attributes passed to nixpkgs.
+  nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; }
+}:
+
+with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; };
+with lib;
+
+let
+  # Package sets to evaluate
+  packageSets = [
+    "cudaPackages_10_0"
+    "cudaPackages_10_1"
+    "cudaPackages_10_2"
+    "cudaPackages_10"
+    "cudaPackages_11_0"
+    "cudaPackages_11_1"
+    "cudaPackages_11_2"
+    "cudaPackages_11_3"
+    "cudaPackages_11_4"
+    "cudaPackages_11_5"
+    "cudaPackages_11_6"
+    "cudaPackages_11"
+    "cudaPackages"
+  ];
+
+  evalPackageSet = pset: mapTestOn { ${pset} = packagePlatforms pkgs.${pset}; };
+
+  jobs = (mapTestOn ({
+    # Packages to evaluate
+    python3.pkgs.caffeWithCuda = linux;
+    python3.pkgs.jaxlibWithCuda = linux;
+    python3.pkgs.libgpuarray = linux;
+    python3.pkgs.tensorflowWithCuda = linux;
+    python3.pkgs.pyrealsense2WithCuda = linux;
+    python3.pkgs.pytorchWithCuda = linux;
+    python3.pkgs.jaxlib = linux;
+  }) // (genAttrs packageSets evalPackageSet));
+
+in jobs

From 81e9dbc4cf05615bd3101561decff4e4b3c01fe9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Apr 2022 06:59:18 +0000
Subject: [PATCH 60/67] python310Packages.stripe: 2.70.0 -> 2.71.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 6580e245866f..7b817adb33e8 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "2.70.0";
+  version = "2.71.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7YiX9o5rrDOYzJmOtWNFUYQGMNZQTAAm/P0K2RyadKQ=";
+    hash = "sha256-38AE/EOfylmYsVVBTyq46Ou3WJ5LdJJlP0usgQCDYcM=";
   };
 
   propagatedBuildInputs = [

From 84b890e86117849e0fb20dbd85ba7a164c1461db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Apr 2022 07:45:31 +0000
Subject: [PATCH 61/67] python310Packages.sabyenc3: 5.1.6 -> 5.1.7

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

diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix
index 831680670d1f..8b0b0a9e2448 100644
--- a/pkgs/development/python-modules/sabyenc3/default.nix
+++ b/pkgs/development/python-modules/sabyenc3/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "sabyenc3";
-  version = "5.1.6";
+  version = "5.1.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DHHil9ZQsrKLgw5dje0Yo1J5FZAFrY1tn5y3mdBJHWg=";
+    hash = "sha256-pewB7JAQ/4KitGFrHX52Gn02my/bOcQCz79cwh6vElk=";
   };
 
   # Tests are not included in pypi distribution

From 375eaf2b4fce26764ccddf347a0b422a82fe8e2b Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Sat, 9 Apr 2022 11:04:53 +0200
Subject: [PATCH 62/67] terraform-full: Fix eval (#167857)

https://github.com/NixOS/nixpkgs/pull/166792 made the
aliases work, which was unexpected for terraform-full.

Thanks to zowoq for reporting
https://github.com/NixOS/nixpkgs/pull/166792#issuecomment-1092742313
---
 .../networking/cluster/terraform-providers/default.nix       | 5 ++++-
 pkgs/applications/networking/cluster/terraform/default.nix   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 0bdb6289a611..01c7a0a91983 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -104,5 +104,8 @@ let
       ultradns = archived "2022/01";
       vthunder = throw "provider was renamed to thunder on 2022/01";
     };
+
+  # excluding aliases, used by terraform-full
+  actualProviders = automated-providers // special-providers;
 in
-automated-providers // special-providers // removed-providers // { inherit mkProvider; }
+actualProviders // removed-providers // { inherit actualProviders mkProvider; }
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index e6fa464df6b6..39283a8646e9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -85,7 +85,7 @@ let
           passthru = {
             withPlugins = newplugins:
               withPlugins (x: newplugins x ++ actualPlugins);
-            full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p));
+            full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
 
             # Expose wrappers around the override* functions of the terraform
             # derivation.

From 5dadb0d98b87d903f9c4eecd0b37a34e6c00561e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 9 Apr 2022 11:18:30 +0200
Subject: [PATCH 63/67] wstunnel: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 +++++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml  | 1 -
 .../haskell-modules/configuration-hackage2nix/main.yaml    | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6c9f7499ce33..22bfcf0c8517 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2593,4 +2593,11 @@ self: super: {
     aeson = self.aeson_1_5_6_0;
   });
 
+  # Support network >= 3.1.2
+  # https://github.com/erebe/wstunnel/pull/107
+  wstunnel = appendPatch (fetchpatch {
+    url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch";
+    sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0=";
+  }) super.wstunnel;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 31a401ac8cc3..7e21b7e07621 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5595,7 +5595,6 @@ broken-packages:
   - wsdl
   - wsedit
   - wsjtx-udp
-  - wstunnel
   - wtk
   - wumpus-core
   - wxdirect
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index bdd8a6e71ade..ecdae328277c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -233,6 +233,8 @@ package-maintainers:
     - total
     - turtle
     - typed-spreadsheet
+  gebner:
+    - wstunnel
   gridaphobe:
     - located-base
   jb55:

From e8e1cccd58436917e7f5082797bccb577f2ce592 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Apr 2022 12:25:00 +0200
Subject: [PATCH 64/67] python3Packages.python-binance: add format

---
 .../development/python-modules/python-binance/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index bea6492be0dc..f5cd9b29f520 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -15,13 +15,15 @@
 buildPythonPackage rec {
   pname = "python-binance";
   version = "1.0.16";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "sammchardy";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-2v3qeykjQR/CUOC6F0Xomm49Q+wrYJS8vmL3+u6ew0M=";
+    hash = "sha256-2v3qeykjQR/CUOC6F0Xomm49Q+wrYJS8vmL3+u6ew0M=";
   };
 
   propagatedBuildInputs = [
@@ -44,7 +46,9 @@ buildPythonPackage rec {
     "tests/test_historical_klines.py"
   ];
 
-  pythonImportsCheck = [ "binance" ];
+  pythonImportsCheck = [
+    "binance"
+  ];
 
   meta = with lib; {
     description = "Binance Exchange API python implementation for automated trading";

From eca01bff99ffbc88b30078d291b5ae997769b076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 7 Apr 2022 21:02:46 +0000
Subject: [PATCH 65/67] deltachat-desktop: 1.28.1 -> 1.28.2

https://github.com/deltachat/deltachat-desktop/releases/tag/v1.28.2
---
 .../deltachat-desktop/default.nix             |    4 +-
 .../deltachat-desktop/package.json            |    4 +-
 .../node-packages/node-packages.nix           | 2930 ++++++++---------
 3 files changed, 1430 insertions(+), 1508 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 03d1d74305e6..266f3958adfd 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -47,13 +47,13 @@ let
   });
 in nodejs-14_x.pkgs.deltachat-desktop.override rec {
   pname = "deltachat-desktop";
-  version = "1.28.1";
+  version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     rev = "v${version}";
-    hash = "sha256-i2Cb2HfapYTaxg5IUl4pGWYUM6o/4mWgMO7QsBqDHoU=";
+    hash = "sha256-jhtriDnt8Yl8eCmUTEyoPjccZV8RNAchMykkkiRpF60=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
index 0f4e421a762a..4455868fe0b0 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deltachat-desktop",
-  "version": "1.28.1",
+  "version": "1.28.2",
   "dependencies": {
     "@blueprintjs/core": "^3.22.3",
     "@deltachat/message_parser_wasm": "^0.3.0",
@@ -51,7 +51,7 @@
     "@types/react-window": "^1.8.4",
     "@types/react-window-infinite-loader": "^1.0.4",
     "@types/url-parse": "^1.4.3",
-    "electron": "^14.2.6",
+    "electron": "^14.2.9",
     "esbuild": "^0.12.29",
     "glob-watcher": "^5.0.5",
     "sass": "^1.26.5",
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 64400c47fc20..b92ef79406f5 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -58,6 +58,15 @@ let
         sha512 = "7rHvIQLvfBYatq+oAy4dvi6Vf00gNVnvdhqR5a7gpav7qEPDpwOFY1pW5T9tKr32KZd4rcCwqVZgygEewnaP2A==";
       };
     };
+    "@alexbosworth/fiat-1.0.2" = {
+      name = "_at_alexbosworth_slash_fiat";
+      packageName = "@alexbosworth/fiat";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.2.tgz";
+        sha512 = "gouPoWdQ6NyIqsISkx526taLlnPB13SPJji4qRZ+MWf8Z60Bn6lF0xmoIEn+hpkTrSH+k9P9HvC2ENqfhq1YdQ==";
+      };
+    };
     "@alexbosworth/html2unicode-1.1.5" = {
       name = "_at_alexbosworth_slash_html2unicode";
       packageName = "@alexbosworth/html2unicode";
@@ -103,58 +112,40 @@ let
         sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==";
       };
     };
-    "@angular-devkit/architect-0.1303.1" = {
+    "@angular-devkit/architect-0.1303.2" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1303.1";
+      version = "0.1303.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.1.tgz";
-        sha512 = "ppaLzNZPrqrI96ddgm1RuEALVpWZsmHbIPLDd0GBwhF6aOkwF0LpZHd5XyS4ktGFZPReiFIjWSVtqV5vaBdRsw==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.2.tgz";
+        sha512 = "aywsRuucfZ4Tu68wtYI8ItWVbsbc9wc0xm4DB+ROtkAcmuuk4aiLgSqW2Eux6QxmGnq9U/yjFMLASOhFB8qDlw==";
       };
     };
-    "@angular-devkit/core-13.3.0" = {
+    "@angular-devkit/core-13.3.2" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.0.tgz";
-        sha512 = "8YrreVbWlJVZnk5zs4vfkRItrPEtWhUcxWOBfYT/Kwu4FwJVAnNuhJAxxXOAQ2Ckd7cv30Idh/RFVLbTZ5Gs9w==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.2.tgz";
+        sha512 = "wav5plcnlxQAfZ+0EUt3dvVTJnJ1au2TlKVQ0jSQJdR1LA6N7QUI49N2Ua6ZnDMwruQaQkoynitMW2l1it3qYQ==";
       };
     };
-    "@angular-devkit/core-13.3.1" = {
-      name = "_at_angular-devkit_slash_core";
-      packageName = "@angular-devkit/core";
-      version = "13.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.1.tgz";
-        sha512 = "eXAcQaP1mn6rnQb+5bv5NsamY6b34UYM7G+S154Hnma6CTTSGBtcmoNAJs8cekuFqWlw7YgpB/e15jR5OLPkDA==";
-      };
-    };
-    "@angular-devkit/schematics-13.3.0" = {
+    "@angular-devkit/schematics-13.3.2" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.0.tgz";
-        sha512 = "hq7tqnB3uVT/iDgqWWZ4kvnijeAcgd4cfLzZiCPaYn1nuhZf0tWsho6exhJ/odMZHvVp7w8OibqWiUKxNY9zHA==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.2.tgz";
+        sha512 = "XCLb23jmqHN0gJg9ZlICaFgfpfnCufIQp5SOsRKMKRkhjKycvDmKnfBTKDlkzb1IaUl6wQwP5k7Z69b9EX+CQw==";
       };
     };
-    "@angular-devkit/schematics-13.3.1" = {
-      name = "_at_angular-devkit_slash_schematics";
-      packageName = "@angular-devkit/schematics";
-      version = "13.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.1.tgz";
-        sha512 = "DxXMjlq/sALcHuONZRMTBX5k30XPfN4b6Ue4k7Xl8JKZqyHhEzfXaZzgD9u2cwb7wybKEeF/BZ5eJd8JG525og==";
-      };
-    };
-    "@angular-devkit/schematics-cli-13.3.0" = {
+    "@angular-devkit/schematics-cli-13.3.2" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.3.0.tgz";
-        sha512 = "DXT+k4228Ke1zCoU9QxPhXm1xzeYBs5aqgMWhyjXdkfDokJcjQM79CSVLHdKX/OLgR51qhnQ5qVFEHHhVV40EQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.3.2.tgz";
+        sha512 = "cUHZFNq2kaCaReJAU28MSu2D+WDFTqt2v03U79TryOutYdF8BV4FyfvKqCSW6WXna219GXSXPepVqDYcjvn7/w==";
       };
     };
     "@antora/asciidoc-loader-3.0.1" = {
@@ -1210,13 +1201,13 @@ let
         sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==";
       };
     };
-    "@babel/core-7.17.8" = {
+    "@babel/core-7.17.9" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.17.8";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz";
-        sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz";
+        sha512 = "5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==";
       };
     };
     "@babel/core-7.9.0" = {
@@ -1228,13 +1219,13 @@ let
         sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
       };
     };
-    "@babel/generator-7.17.7" = {
+    "@babel/generator-7.17.9" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.17.7";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz";
-        sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz";
+        sha512 = "rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==";
       };
     };
     "@babel/helper-annotate-as-pure-7.16.7" = {
@@ -1264,13 +1255,13 @@ let
         sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.17.6" = {
+    "@babel/helper-create-class-features-plugin-7.17.9" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.17.6";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz";
-        sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz";
+        sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==";
       };
     };
     "@babel/helper-create-regexp-features-plugin-7.17.0" = {
@@ -1309,22 +1300,13 @@ let
         sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==";
       };
     };
-    "@babel/helper-function-name-7.16.7" = {
+    "@babel/helper-function-name-7.17.9" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.16.7";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz";
-        sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==";
-      };
-    };
-    "@babel/helper-get-function-arity-7.16.7" = {
-      name = "_at_babel_slash_helper-get-function-arity";
-      packageName = "@babel/helper-get-function-arity";
-      version = "7.16.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz";
-        sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz";
+        sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==";
       };
     };
     "@babel/helper-hoist-variables-7.16.7" = {
@@ -1453,22 +1435,22 @@ let
         sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==";
       };
     };
-    "@babel/helpers-7.17.8" = {
+    "@babel/helpers-7.17.9" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.17.8";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz";
-        sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz";
+        sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==";
       };
     };
-    "@babel/highlight-7.16.10" = {
+    "@babel/highlight-7.17.9" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.16.10";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz";
-        sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz";
+        sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==";
       };
     };
     "@babel/node-7.16.8" = {
@@ -1489,13 +1471,13 @@ let
         sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==";
       };
     };
-    "@babel/parser-7.17.8" = {
+    "@babel/parser-7.17.9" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.17.8";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz";
-        sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz";
+        sha512 = "vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==";
       };
     };
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = {
@@ -1993,13 +1975,13 @@ let
         sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.17.7" = {
+    "@babel/plugin-transform-modules-commonjs-7.17.9" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.17.7";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz";
-        sha512 = "ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz";
+        sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==";
       };
     };
     "@babel/plugin-transform-modules-systemjs-7.17.8" = {
@@ -2101,13 +2083,13 @@ let
         sha512 = "hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==";
       };
     };
-    "@babel/plugin-transform-regenerator-7.16.7" = {
+    "@babel/plugin-transform-regenerator-7.17.9" = {
       name = "_at_babel_slash_plugin-transform-regenerator";
       packageName = "@babel/plugin-transform-regenerator";
-      version = "7.16.7";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz";
-        sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz";
+        sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==";
       };
     };
     "@babel/plugin-transform-reserved-words-7.16.7" = {
@@ -2281,13 +2263,13 @@ let
         sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==";
       };
     };
-    "@babel/runtime-7.17.8" = {
+    "@babel/runtime-7.17.9" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.17.8";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz";
-        sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz";
+        sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==";
       };
     };
     "@babel/runtime-7.9.0" = {
@@ -2299,13 +2281,13 @@ let
         sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==";
       };
     };
-    "@babel/runtime-corejs3-7.17.8" = {
+    "@babel/runtime-corejs3-7.17.9" = {
       name = "_at_babel_slash_runtime-corejs3";
       packageName = "@babel/runtime-corejs3";
-      version = "7.17.8";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz";
-        sha512 = "ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz";
+        sha512 = "WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw==";
       };
     };
     "@babel/template-7.16.7" = {
@@ -2317,13 +2299,13 @@ let
         sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==";
       };
     };
-    "@babel/traverse-7.17.3" = {
+    "@babel/traverse-7.17.9" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.17.3";
+      version = "7.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz";
-        sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz";
+        sha512 = "PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==";
       };
     };
     "@babel/types-7.16.0" = {
@@ -2344,13 +2326,13 @@ let
         sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==";
       };
     };
-    "@blueprintjs/colors-4.0.2" = {
+    "@blueprintjs/colors-4.0.5" = {
       name = "_at_blueprintjs_slash_colors";
       packageName = "@blueprintjs/colors";
-      version = "4.0.2";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.2.tgz";
-        sha512 = "+luoTHBcdUD5y5SGCxk9CAHPfa9WeGdHuTRGABFanoyXZwrtzh5a8hlN/g3B5xeseGdoz50uMtmeanF8Atx0fg==";
+        url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.5.tgz";
+        sha512 = "5ewWnDdUzyP7hnfidIPyAykGmjHAY2xjcUPM3J2hmnAQ4FORWPv7Mr3PJ9D0D7GfZV/ACx3URRclE1MXfvVlGA==";
       };
     };
     "@blueprintjs/core-3.54.0" = {
@@ -2695,13 +2677,13 @@ let
         sha512 = "NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ==";
       };
     };
-    "@cspell/dict-bash-2.0.1" = {
+    "@cspell/dict-bash-2.0.2" = {
       name = "_at_cspell_slash_dict-bash";
       packageName = "@cspell/dict-bash";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.1.tgz";
-        sha512 = "pBx3T/5w7fPF8XD5cx3NwtRFvNpQYmYqzM043NKP2hDmlx4uFwbH599Lvt5mwCMZKfIoRXaNUQvq7se2gstQjw==";
+        url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.2.tgz";
+        sha512 = "ASIgI/LmV2TYrD4mtk+gm4XmUSTRomOyRt7NDWyBpEww/AeawC2O2NH6FosyUT6dUU3GaXt2wgJRN7R78n1SGg==";
       };
     };
     "@cspell/dict-companies-2.0.3" = {
@@ -2713,13 +2695,13 @@ let
         sha512 = "O622rMAaHm85AmqNyMki5je8HB/1XlTKbGOXh2UUhooI5qdgdfrjTQ6VBuHwHrfEfuODBHYTNYXVB2m23XqHCg==";
       };
     };
-    "@cspell/dict-cpp-2.0.0" = {
+    "@cspell/dict-cpp-2.0.1" = {
       name = "_at_cspell_slash_dict-cpp";
       packageName = "@cspell/dict-cpp";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-2.0.0.tgz";
-        sha512 = "EflHLs2pHEEXZM6jPfTGR/KHZKQtJlvzqgkg1zaA1YKv5HQNw9Wy5KVPGEV2bjPcFsZJO3xXjO1KBZcoOPjPmA==";
+        url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-2.0.1.tgz";
+        sha512 = "M7ILooLd8qpAEk2Mr8QG/f5hMSaswKXu10Z4u7bmWJNUutPEMrliFvfY/HoYJoE0zX980wRhZg3UqZYKWjJ2bA==";
       };
     };
     "@cspell/dict-cryptocurrencies-2.0.0" = {
@@ -3694,13 +3676,13 @@ let
         sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw==";
       };
     };
-    "@fluentui/react-8.64.0" = {
+    "@fluentui/react-8.64.1" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "8.64.0";
+      version = "8.64.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.0.tgz";
-        sha512 = "ykO3VHQVQL6IUAXnp5No38fMqG5XOqjP0bNOv5klCYelfF0bnDdbzmT+nHMorq+SKqaHnbnryO+OQuXDmyujCQ==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.1.tgz";
+        sha512 = "2xk+LqUwn7Xp3eDIgeLInX4f6hgdie6RGcZo7D1nGSIB0p5EOR8IcwhataYs3HMte3WFWBRJhYbEXYZVfCfvfA==";
       };
     };
     "@fluentui/react-focus-8.5.6" = {
@@ -3883,13 +3865,13 @@ let
         sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg==";
       };
     };
-    "@graphql-tools/batch-execute-8.4.1" = {
+    "@graphql-tools/batch-execute-8.4.2" = {
       name = "_at_graphql-tools_slash_batch-execute";
       packageName = "@graphql-tools/batch-execute";
-      version = "8.4.1";
+      version = "8.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.1.tgz";
-        sha512 = "63+lNWrwXmofjZVa7ML+n9CBviClF3K+RP3Xx3hxGQ8BrhvB1pWS1yzaUZqrkiiKdTu1v3mJGVfmooHwzlyPwQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.2.tgz";
+        sha512 = "5/el640oG/jfjQCjCRDdtIALyUib8YPONM2NSmckp2g1nOrPTAx/isz3Uptp9y5OI1UXXhONiKy5euTbgsGoXw==";
       };
     };
     "@graphql-tools/delegate-7.1.5" = {
@@ -3901,13 +3883,13 @@ let
         sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g==";
       };
     };
-    "@graphql-tools/delegate-8.7.1" = {
+    "@graphql-tools/delegate-8.7.2" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "8.7.1";
+      version = "8.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.1.tgz";
-        sha512 = "e98/NRaOH5wQy624bRd5i5qUKz5tCs8u4xBmxW89d7t6V6CveXj7pvAgmnR9DbwOkO6IA3P799p/aa/YG/pWTA==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.2.tgz";
+        sha512 = "SSmx5N6Cq23KRT0YepdmcYugey7MDZSXxtJ8KHHdc5eW9IAHXZWsJWdVnI9woU9omsnE6svnxblZb1UUBl7AUg==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -3919,22 +3901,22 @@ let
         sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
       };
     };
-    "@graphql-tools/graphql-file-loader-7.3.7" = {
+    "@graphql-tools/graphql-file-loader-7.3.8" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "7.3.7";
+      version = "7.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.7.tgz";
-        sha512 = "fwXLycYvabPhusGtYuFrOPbjeIvLWr6viGkQc9KmiBm2Z2kZrlNRNUlYkXXRzMoiqRkzqFJYhOgWDE7LsOnbjw==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.8.tgz";
+        sha512 = "SpQZQ0klbox/kxYCLFBTmhLuQFm7P6usWVIqwROK4JSomwCuccc2zDsr1H7ayDpanD3yfkzMsl6gPkOkAo52pA==";
       };
     };
-    "@graphql-tools/import-6.6.9" = {
+    "@graphql-tools/import-6.6.10" = {
       name = "_at_graphql-tools_slash_import";
       packageName = "@graphql-tools/import";
-      version = "6.6.9";
+      version = "6.6.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.9.tgz";
-        sha512 = "sKaLqvPmNLQlY4te+nnBhRrf5WBISoiyVkbriCLz0kHw805iHdJaU2KxUoHsRTR7WlYq0g9gzB0oVaRh99Q5aA==";
+        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.10.tgz";
+        sha512 = "yHdlEPTvIjrngtQFNgkMQJt/DjG3hQKvc6Mb8kaatFV4yERN5zx+0vpdrwxTwRNG1N7bI/YCkbrc7PXOb+g89Q==";
       };
     };
     "@graphql-tools/json-file-loader-6.2.6" = {
@@ -3946,13 +3928,13 @@ let
         sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA==";
       };
     };
-    "@graphql-tools/json-file-loader-7.3.7" = {
+    "@graphql-tools/json-file-loader-7.3.8" = {
       name = "_at_graphql-tools_slash_json-file-loader";
       packageName = "@graphql-tools/json-file-loader";
-      version = "7.3.7";
+      version = "7.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.7.tgz";
-        sha512 = "dm0LcfiWYin7cUR4RWC33C9bNppujvSU7hwTH+sHmSguNnat9Kn8dBntVSgrY3qCbKuGfz/PshQHIODXrRwAKg==";
+        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.8.tgz";
+        sha512 = "W3nVLAp8m787A17wja7ysayij7WMRu+lF8LeCWr9eoyiCuw65i63y0G4eqZ5+Q0+E2BYWlKJyk/Z0vsFVJGMUA==";
       };
     };
     "@graphql-tools/load-6.2.4" = {
@@ -3964,13 +3946,13 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/load-7.5.6" = {
+    "@graphql-tools/load-7.5.7" = {
       name = "_at_graphql-tools_slash_load";
       packageName = "@graphql-tools/load";
-      version = "7.5.6";
+      version = "7.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.6.tgz";
-        sha512 = "IocEP4METGdbDzV44VaeiXO387NOYSW4cTuBP8qybHZX0XlIp8bEv7c8GKS3m8DeRop/9SnOL7HyiAfNMA4Chg==";
+        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.7.tgz";
+        sha512 = "Z4oKf4MdBvl0EyubmvPL14ldhovKz8C61rQPHD8pjnC8Z0RbvW0a/sns/yuHuCVZoJMsSboU65DPzPTIoQUM4w==";
       };
     };
     "@graphql-tools/merge-6.2.17" = {
@@ -3982,13 +3964,13 @@ let
         sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow==";
       };
     };
-    "@graphql-tools/merge-8.2.6" = {
+    "@graphql-tools/merge-8.2.7" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "8.2.6";
+      version = "8.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.6.tgz";
-        sha512 = "dkwTm4czMISi/Io47IVvq2Fl9q4TIGKpJ0VZjuXYdEFkECyH6A5uwxZfPVandZG+gQs8ocFFoa6RisiUJLZrJw==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.7.tgz";
+        sha512 = "rKxjNogqu1UYAG/y5FOb6lJsmSQbWA+jq4inWjNEVX54VGGE7/WGnmPaqcsyomNOfS3vIRS6NnG+DxiQSqetjg==";
       };
     };
     "@graphql-tools/schema-7.1.5" = {
@@ -4000,13 +3982,13 @@ let
         sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA==";
       };
     };
-    "@graphql-tools/schema-8.3.6" = {
+    "@graphql-tools/schema-8.3.7" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "8.3.6";
+      version = "8.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.6.tgz";
-        sha512 = "7tWYRQ8hB/rv2zAtv2LtnQl4UybyJPtRz/VLKRmgi7+F5t8iYBahmmsxMDAYMWMmWMqEDiKk54TvAes+J069rQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.7.tgz";
+        sha512 = "7byr9J6rfMPFPfiR4u65dy20xHATTvbgOY7KYd1sYPnMKKfRZe0tUgpnE+noXcfob7N8s366WaVh7bEoztQMwg==";
       };
     };
     "@graphql-tools/url-loader-6.10.1" = {
@@ -4018,13 +4000,13 @@ let
         sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw==";
       };
     };
-    "@graphql-tools/url-loader-7.9.8" = {
+    "@graphql-tools/url-loader-7.9.9" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "7.9.8";
+      version = "7.9.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.8.tgz";
-        sha512 = "nRMXwwoIDLt7ohBWvKKjEEH61YS1nnWs6BVgGStePfmRGrhxECpLWmfAmKLNXPqDJN7Nu6ykFJYjt65j5l6qsw==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.9.tgz";
+        sha512 = "qhjBJ3oCXZrzvJchVwtrahr48TXOHPYZ4YXklGrbJVoJs3LP0a7CYUwuXeiNuN+dpgaxkb175sIEN9m0FadGRw==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -4054,13 +4036,13 @@ let
         sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==";
       };
     };
-    "@graphql-tools/utils-8.6.5" = {
+    "@graphql-tools/utils-8.6.6" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "8.6.5";
+      version = "8.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.5.tgz";
-        sha512 = "mjOtaWiS2WIqRz/cq5gaeM3sVrllcu2xbtHROw1su1v3xWa3D3dKgn8Lrl7+tvWs5WUVySsBss/VZ3WdoPkCrA==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.6.tgz";
+        sha512 = "wjY2ljKLCnnbRrDNPPgPNqCujou0LFSOWcxAjV6DYUlfFWTsAEvlYmsmY4T+K12wI/fnqoJ2bUwIlap1plFDMg==";
       };
     };
     "@graphql-tools/wrap-7.0.8" = {
@@ -4072,22 +4054,13 @@ let
         sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg==";
       };
     };
-    "@graphql-tools/wrap-8.4.10" = {
+    "@graphql-tools/wrap-8.4.11" = {
       name = "_at_graphql-tools_slash_wrap";
       packageName = "@graphql-tools/wrap";
-      version = "8.4.10";
+      version = "8.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.10.tgz";
-        sha512 = "1/pcKRDTGIUspUl6uhlfQ0u1l4j15TVGkOkijI+gX25Q9sfAJclT0bovKBksP39G6v4hZnolpOU2txJ47MxxEg==";
-      };
-    };
-    "@grpc/grpc-js-1.4.4" = {
-      name = "_at_grpc_slash_grpc-js";
-      packageName = "@grpc/grpc-js";
-      version = "1.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.4.tgz";
-        sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA==";
+        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.11.tgz";
+        sha512 = "bif9yNZCoG1fFTGuIV4UblsJI95VSufl0RReXdr6f2yNbnqjSzgoDMB17WQlLrNOBrXa7r8N5aWBr5hBGhtGig==";
       };
     };
     "@grpc/grpc-js-1.5.10" = {
@@ -4099,15 +4072,6 @@ let
         sha512 = "++oAubX/7rJzlqH0ShyzDENNNDHYrlttdc3NM40KlaVQDcgGqQknuPoavmyTC+oNUDyxPCX5dHceKhfcgN3tiw==";
       };
     };
-    "@grpc/grpc-js-1.5.4" = {
-      name = "_at_grpc_slash_grpc-js";
-      packageName = "@grpc/grpc-js";
-      version = "1.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.4.tgz";
-        sha512 = "+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw==";
-      };
-    };
     "@grpc/grpc-js-1.5.7" = {
       name = "_at_grpc_slash_grpc-js";
       packageName = "@grpc/grpc-js";
@@ -4126,13 +4090,13 @@ let
         sha512 = "ix3rQS64rKL1s6CfIaRgnts+RNYZZ2NaYyTK7iimai6an/0GGDbukzy990hJ5vtKHjhaqJxJMB6Qq7BMZ0zZSQ==";
       };
     };
-    "@grpc/proto-loader-0.6.6" = {
-      name = "_at_grpc_slash_proto-loader";
-      packageName = "@grpc/proto-loader";
-      version = "0.6.6";
+    "@grpc/grpc-js-1.6.2" = {
+      name = "_at_grpc_slash_grpc-js";
+      packageName = "@grpc/grpc-js";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.6.tgz";
-        sha512 = "cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ==";
+        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.2.tgz";
+        sha512 = "9+89Ne1K8F9u86T+l1yIV2DS+dWHYVK61SsDZN4MFTFehOOaJ4rHxa1cW8Lwdn2/6tOx7N3+SY/vfcjztOHopA==";
       };
     };
     "@grpc/proto-loader-0.6.9" = {
@@ -5755,13 +5719,13 @@ let
         sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.250" = {
+    "@microsoft/load-themed-styles-1.10.251" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.250";
+      version = "1.10.251";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.250.tgz";
-        sha512 = "uxn8ho0Wlc+JL8epCErwKIBK5ulva33VrabPbqPM1A770RGdxfW0J9PhnaIDOlz9p2w4DeyNhcLXIZry2eOaBg==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.251.tgz";
+        sha512 = "Ro0EiAwOIwC6YP00Fw8ixY2xWDQmV+HdfMskcrCfEUZidwBBEt7wlWnjx4SnaJH+sdDTlnnHzuERE2lzH9IvPA==";
       };
     };
     "@mitmaro/errors-1.0.0" = {
@@ -5818,13 +5782,13 @@ let
         sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==";
       };
     };
-    "@nestjs/schematics-8.0.9" = {
+    "@nestjs/schematics-8.0.10" = {
       name = "_at_nestjs_slash_schematics";
       packageName = "@nestjs/schematics";
-      version = "8.0.9";
+      version = "8.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.9.tgz";
-        sha512 = "2YNRFWyQCxKaK7XTKBRKecERKQj2cg9FLxsHwAf9beryXxVmciTmHV0gHCW7Pfatj38R50QFGPN71wuyyZIC5g==";
+        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.10.tgz";
+        sha512 = "gQq/8TYjtgum+5+QuPfHHKgKxDgNLGh8mH+EJ1skOKX+GTxgt5jmg1GFmwEfiOXZUcF9thT6GsOVNKWrdO3YMg==";
       };
     };
     "@netflix/nerror-1.1.3" = {
@@ -6106,13 +6070,13 @@ let
         sha512 = "/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==";
       };
     };
-    "@npmcli/git-3.0.0" = {
+    "@npmcli/git-3.0.1" = {
       name = "_at_npmcli_slash_git";
       packageName = "@npmcli/git";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/git/-/git-3.0.0.tgz";
-        sha512 = "xfSBJ+KBMZWWqRHFbEgIaXG/LtELHrQZMJ72Gkb3yWdHysu/7+VGOs8ME0c3td7QNQX57Ggo3kYL6ylcd70/kA==";
+        url = "https://registry.npmjs.org/@npmcli/git/-/git-3.0.1.tgz";
+        sha512 = "UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==";
       };
     };
     "@npmcli/installed-package-contents-1.0.7" = {
@@ -6151,6 +6115,15 @@ let
         sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==";
       };
     };
+    "@npmcli/move-file-2.0.0" = {
+      name = "_at_npmcli_slash_move-file";
+      packageName = "@npmcli/move-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.0.tgz";
+        sha512 = "UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==";
+      };
+    };
     "@npmcli/name-from-folder-1.0.1" = {
       name = "_at_npmcli_slash_name-from-folder";
       packageName = "@npmcli/name-from-folder";
@@ -6169,6 +6142,15 @@ let
         sha512 = "fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==";
       };
     };
+    "@npmcli/node-gyp-2.0.0" = {
+      name = "_at_npmcli_slash_node-gyp";
+      packageName = "@npmcli/node-gyp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz";
+        sha512 = "doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==";
+      };
+    };
     "@npmcli/package-json-1.0.1" = {
       name = "_at_npmcli_slash_package-json";
       packageName = "@npmcli/package-json";
@@ -6187,6 +6169,15 @@ let
         sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
       };
     };
+    "@npmcli/promise-spawn-3.0.0" = {
+      name = "_at_npmcli_slash_promise-spawn";
+      packageName = "@npmcli/promise-spawn";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz";
+        sha512 = "s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==";
+      };
+    };
     "@npmcli/run-script-1.8.6" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
@@ -6205,13 +6196,13 @@ let
         sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==";
       };
     };
-    "@npmcli/run-script-3.0.1" = {
+    "@npmcli/run-script-3.0.2" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz";
-        sha512 = "o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg==";
+        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.2.tgz";
+        sha512 = "vdjD/PMBl+OX9j9C9irx5sCCIKfp2PWkpPNH9zxvlJAfSZ3Qp5aU412v+O3PFJl3R1PFNwuyChCqHg4ma6ci2Q==";
       };
     };
     "@oclif/command-1.8.0" = {
@@ -6925,85 +6916,85 @@ let
         sha512 = "h2FvqLA75ZQdIXX1y+ylGjIIi7YtbAUJyIapxaO081h3EsYG2jr9sRL4sym5ECgmvbyua/DEgtMLX3eGYn09FA==";
       };
     };
-    "@parcel/css-1.7.4" = {
+    "@parcel/css-1.8.0" = {
       name = "_at_parcel_slash_css";
       packageName = "@parcel/css";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css/-/css-1.7.4.tgz";
-        sha512 = "K1N9mxEkWQQmSINMNuGvlyPq7yCY+AtHskGxWav97lhu2i8GMMXRV9kc8/x/jkZh5KDBWO5vHhdQiujRBrgR8g==";
+        url = "https://registry.npmjs.org/@parcel/css/-/css-1.8.0.tgz";
+        sha512 = "l6+gGOIk+JEZ+RuqsGzl4yDFKfSC8Uq+FaHzJgwIuIcdHip8ENMr8HMHiOPeO3VSo1JRn3yt5+MIntm2GIzAIA==";
       };
     };
-    "@parcel/css-darwin-arm64-1.7.4" = {
+    "@parcel/css-darwin-arm64-1.8.0" = {
       name = "_at_parcel_slash_css-darwin-arm64";
       packageName = "@parcel/css-darwin-arm64";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.7.4.tgz";
-        sha512 = "fA+aBZAAgXSV7jUQFRYuKpJr5EEqNq++mFu4o/pU/lBFMJhL6Z11aqzrBecC1JziWT3t/BgryWdznf1QkNtM4w==";
+        url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.8.0.tgz";
+        sha512 = "A9taXLx12UTgyH/UGD9KMDNTXmLuH51h5g+AV4ZVo8vUZHSofP/Sb+zphOikdHn+K5gzVai1a06N92F2G8xJGw==";
       };
     };
-    "@parcel/css-darwin-x64-1.7.4" = {
+    "@parcel/css-darwin-x64-1.8.0" = {
       name = "_at_parcel_slash_css-darwin-x64";
       packageName = "@parcel/css-darwin-x64";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.7.4.tgz";
-        sha512 = "qx/+vEXSmed7eeBgVvV/1lrEjk8KnKUiAN+CCes8d6ddJJzK5evTKQsWkywe1jNdHC33d2mlLlhLFmC2+2IPOw==";
+        url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.8.0.tgz";
+        sha512 = "SWmB7fnD0USm9AHZBHx9EJBo1c2dwLFuA/HBD3in4yDPGS5kSqfIJTfux3NO/aySsy7NAC3FOgK/L2A2PdtpGQ==";
       };
     };
-    "@parcel/css-linux-arm-gnueabihf-1.7.4" = {
+    "@parcel/css-linux-arm-gnueabihf-1.8.0" = {
       name = "_at_parcel_slash_css-linux-arm-gnueabihf";
       packageName = "@parcel/css-linux-arm-gnueabihf";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.7.4.tgz";
-        sha512 = "+Qf+j8dqJ+t7V/w9LnyWBzNcMG/GnlzjlWNQhiUkt1aYFYPr5i/eRWuWLYxVlz8EGQOUbYlinDGLXTUJDt31gA==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.8.0.tgz";
+        sha512 = "66ACZD3bnotyLAgJ/D93R28ipFomvxlsMszxv+U45GiSLBwmjKZ7VkTnMHC2/kmQ0NVdlUKh4WqjL/PB4PLkzg==";
       };
     };
-    "@parcel/css-linux-arm64-gnu-1.7.4" = {
+    "@parcel/css-linux-arm64-gnu-1.8.0" = {
       name = "_at_parcel_slash_css-linux-arm64-gnu";
       packageName = "@parcel/css-linux-arm64-gnu";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.7.4.tgz";
-        sha512 = "ITP0HZT/Ay6JCgH3W7JpoRUYfciW+jBVBTjglZjYgyYPLLWk2J1kXB+qC3jHp5XCeH4feh7eFB1pyQcE7kqCjA==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.8.0.tgz";
+        sha512 = "oH00san3byQnx2dWp6gsIvbZNonSQ1S+nNsTLjA/Riy2sVYTxYDsLOiNS+ryJwBKchOYSZ5PiMDgJaw7KmgIgg==";
       };
     };
-    "@parcel/css-linux-arm64-musl-1.7.4" = {
+    "@parcel/css-linux-arm64-musl-1.8.0" = {
       name = "_at_parcel_slash_css-linux-arm64-musl";
       packageName = "@parcel/css-linux-arm64-musl";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.7.4.tgz";
-        sha512 = "or61QRhhpsDlHfrc73KP4bPwnnVZWni1jkuRv1mCi+0SzYzoaO190JEaj7VWh/boUvjGiIl//FsLoZleQIWKNA==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.8.0.tgz";
+        sha512 = "0p0AJ3QypEC0NwFWbzy5JbI8ZDLUED3BGXvqdD7jfOx14qCW2apq7OKBSwSCS8ZvBo8G2tkss7nbyOG5NbIjUQ==";
       };
     };
-    "@parcel/css-linux-x64-gnu-1.7.4" = {
+    "@parcel/css-linux-x64-gnu-1.8.0" = {
       name = "_at_parcel_slash_css-linux-x64-gnu";
       packageName = "@parcel/css-linux-x64-gnu";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.7.4.tgz";
-        sha512 = "GHGsM06F26FAkvPcnsGw7NHxPVD7TQvg7OC7cVAYmETccO8mqs9DyRzBTevk+1kl7EQXNnHDojn7VpVN6q+phg==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.8.0.tgz";
+        sha512 = "nXWRN7LSXZPic0B8F77AQe7CIqYi4+nD5QVpABX0j7s/UO2BAcfN0vpI0CNAuErX4QOSs3AIWo1XF0qL/mH9DQ==";
       };
     };
-    "@parcel/css-linux-x64-musl-1.7.4" = {
+    "@parcel/css-linux-x64-musl-1.8.0" = {
       name = "_at_parcel_slash_css-linux-x64-musl";
       packageName = "@parcel/css-linux-x64-musl";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.7.4.tgz";
-        sha512 = "H/9wvQ7LNqng9yIwulpfUUhs6zm9+vLCzri2qnC4vm8geyTjA0W0H5fphV8IlzNJ/DfHmoesJ+TXw5NG+QC9hg==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.8.0.tgz";
+        sha512 = "5Q5SQREh1tSOjvIu55acqEzWDdZJZiwlgdoC8nTYmIRsyFn4SVibVMDau5qWmb3Xtswr/hm41xesG3nIBXCX+Q==";
       };
     };
-    "@parcel/css-win32-x64-msvc-1.7.4" = {
+    "@parcel/css-win32-x64-msvc-1.8.0" = {
       name = "_at_parcel_slash_css-win32-x64-msvc";
       packageName = "@parcel/css-win32-x64-msvc";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.7.4.tgz";
-        sha512 = "xmg18iISCn1f9IyYUif6yR8FuEmi93qzH55oUiri5vZWuCY8xfraHsRA6i8yLWnxgDmVeHyiN0IICl7rgZo10A==";
+        url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.8.0.tgz";
+        sha512 = "IHFRdgsLHUuXIREtnRE/yNjNyRofySyLvG4lx8sfbBYQFIdelplw6V74kQ/u2iNt4MIOP69CkJxUuF+uX//ooQ==";
       };
     };
     "@parcel/diagnostic-2.4.1" = {
@@ -7780,13 +7771,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-13.3.1" = {
+    "@schematics/angular-13.3.2" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "13.3.1";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.1.tgz";
-        sha512 = "+lrK/d1eJsAK6d6E9TDeg3Vc71bDy1KsE8M+lEINdX9Wax22mAz4pw20X9RSCw5RHgn+XcNUuMsgRJAwVhDNpg==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.2.tgz";
+        sha512 = "ycTrPEsaSEtJ/CR8MVBrU6jaxcdBSy1lGUW8qSElsGS0OkHFKaV7fkzS9h0gPK9ANp6grZn0Ms3Hy3gAKQkiiQ==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -9436,24 +9427,6 @@ let
         sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==";
       };
     };
-    "@types/node-16.11.7" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "16.11.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz";
-        sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==";
-      };
-    };
-    "@types/node-17.0.15" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "17.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz";
-        sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA==";
-      };
-    };
     "@types/node-17.0.21" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
@@ -9553,13 +9526,13 @@ let
         sha512 = "Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==";
       };
     };
-    "@types/prop-types-15.7.4" = {
+    "@types/prop-types-15.7.5" = {
       name = "_at_types_slash_prop-types";
       packageName = "@types/prop-types";
-      version = "15.7.4";
+      version = "15.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz";
-        sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==";
+        url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz";
+        sha512 = "JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==";
       };
     };
     "@types/pug-2.0.6" = {
@@ -9652,15 +9625,6 @@ let
         sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q==";
       };
     };
-    "@types/request-2.48.7" = {
-      name = "_at_types_slash_request";
-      packageName = "@types/request";
-      version = "2.48.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.7.tgz";
-        sha512 = "GWP9AZW7foLd4YQxyFZDBepl0lPsWLMEXDZUjQ/c1gqVPDPECrRZyEzuhJdnPWioFCq3Tv0qoGpMD6U+ygd4ZA==";
-      };
-    };
     "@types/request-2.48.8" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
@@ -10075,24 +10039,6 @@ let
         sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==";
       };
     };
-    "@types/ws-8.2.0" = {
-      name = "_at_types_slash_ws";
-      packageName = "@types/ws";
-      version = "8.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.0.tgz";
-        sha512 = "cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg==";
-      };
-    };
-    "@types/ws-8.2.2" = {
-      name = "_at_types_slash_ws";
-      packageName = "@types/ws";
-      version = "8.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz";
-        sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==";
-      };
-    };
     "@types/ws-8.5.2" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
@@ -11110,15 +11056,6 @@ let
         sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==";
       };
     };
-    "@xmldom/xmldom-0.8.1" = {
-      name = "_at_xmldom_slash_xmldom";
-      packageName = "@xmldom/xmldom";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.1.tgz";
-        sha512 = "4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ==";
-      };
-    };
     "@xmldom/xmldom-0.8.2" = {
       name = "_at_xmldom_slash_xmldom";
       packageName = "@xmldom/xmldom";
@@ -13936,15 +13873,6 @@ let
         sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==";
       };
     };
-    "async-3.2.2" = {
-      name = "async";
-      packageName = "async";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-3.2.2.tgz";
-        sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==";
-      };
-    };
     "async-3.2.3" = {
       name = "async";
       packageName = "async";
@@ -14107,15 +14035,6 @@ let
         sha1 = "1e762817d849ce44bfac07925a42036787061b15";
       };
     };
-    "asyncjs-util-1.2.7" = {
-      name = "asyncjs-util";
-      packageName = "asyncjs-util";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.7.tgz";
-        sha512 = "+NoBU9in09GHOWgRv+HhF3kDxqgJ6KowRA7xwHZKxajnh+ybBJhp24i2nOyulZtpdn+4eyrfLvTD6VoRk7TWyQ==";
-      };
-    };
     "asyncjs-util-1.2.8" = {
       name = "asyncjs-util";
       packageName = "asyncjs-util";
@@ -14125,6 +14044,15 @@ let
         sha512 = "wUcEKoAxBWWNE1wXkoIvIyM1vVDfvItYXANYTgwemeRL8FgV6z70XdLGLBMty0WiQSub0fBuKIyF+Hz3DCahOg==";
       };
     };
+    "asyncjs-util-1.2.9" = {
+      name = "asyncjs-util";
+      packageName = "asyncjs-util";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.9.tgz";
+        sha512 = "U9imS8ehJA6DPNdBdvoLcIRDFh7yzI9J93CC8/2obk8gUSIy8KKhmCqYe+3NlISJhxLLi8aWmVL1Gkb3dz1xhg==";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -14305,22 +14233,13 @@ let
         sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag==";
       };
     };
-    "aws-sdk-2.1107.0" = {
+    "aws-sdk-2.1110.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1107.0";
+      version = "2.1110.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1107.0.tgz";
-        sha512 = "gZaCm+zSSwjUYSa/cVg63uXhq5w9coT9yA8aTDOYzFkyl19b9H2CCixPeyf7KHtZdGwe3QAG2Oe6Rw0xtoCs+Q==";
-      };
-    };
-    "aws-sdk-2.1108.0" = {
-      name = "aws-sdk";
-      packageName = "aws-sdk";
-      version = "2.1108.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1108.0.tgz";
-        sha512 = "BpoHW6vk8cXQDf0M+j7LSti7db4vIWocfUDTFbmkOT0hH9pR3f4IDzbnGzGmlka6IOFWkb9sVHl+P5S2meswOg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1110.0.tgz";
+        sha512 = "qxHqzE2ikGNRzhajcmWIBuptML3LBwz9TMnS0jLQjXOP54fZYW6EEKy2Dy7MKjHKeo8QQy/EWtDdWfH9Fu5UIA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -14728,13 +14647,13 @@ let
         sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==";
       };
     };
-    "babel-plugin-styled-components-2.0.6" = {
+    "babel-plugin-styled-components-2.0.7" = {
       name = "babel-plugin-styled-components";
       packageName = "babel-plugin-styled-components";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz";
-        sha512 = "Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg==";
+        url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz";
+        sha512 = "i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==";
       };
     };
     "babel-plugin-syntax-flow-6.18.0" = {
@@ -15754,13 +15673,13 @@ let
         sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==";
       };
     };
-    "bipf-1.6.1" = {
+    "bipf-1.6.2" = {
       name = "bipf";
       packageName = "bipf";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bipf/-/bipf-1.6.1.tgz";
-        sha512 = "wsn3ickoiYgUn9Bd0JUTPnpJemEcjWtXkMLLQyNVhrnKhRxKhma8Gq/DoB1Di8GUcHhgeEVH+PQT2C/JRFpOgw==";
+        url = "https://registry.npmjs.org/bipf/-/bipf-1.6.2.tgz";
+        sha512 = "Bp6Wo3VVrsVxGwXuRuzca78mYxyTHs0MJz1cZRNhEJPb1KBh7J/2k5ixG35qmDyKscJeCM8+wx20lvBN26ueCg==";
       };
     };
     "bit-field-1.5.3" = {
@@ -15790,15 +15709,6 @@ let
         sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ==";
       };
     };
-    "bitcoinjs-lib-6.0.0" = {
-      name = "bitcoinjs-lib";
-      packageName = "bitcoinjs-lib";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.0.tgz";
-        sha512 = "KYx81rVE4LDbZcHfE375NCX4CDeZuz7HECZm/KAmqKMY2jpD3ZcUnI7Fm+QX5EMF/xmtzzfrNL/BNxo8o0iOQg==";
-      };
-    };
     "bitcoinjs-lib-6.0.1" = {
       name = "bitcoinjs-lib";
       packageName = "bitcoinjs-lib";
@@ -16285,22 +16195,22 @@ let
         sha512 = "zEvNSymgMeMMeFwWmwpklFoN/OJA3YO/pVgFTBV3TVq5ulfS0+mVKEGfeInEQESoaSVK1dsVPGr2RLD22uH/aQ==";
       };
     };
-    "bolt03-1.2.13" = {
-      name = "bolt03";
-      packageName = "bolt03";
-      version = "1.2.13";
+    "bolt01-1.2.4" = {
+      name = "bolt01";
+      packageName = "bolt01";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.13.tgz";
-        sha512 = "7KfDXG9JsWwMWZxYSYkP9Ga9vC3JQHvEcIZio4m/edNPAvgSiUCadNPaEjUI9gGeGaRa1RatYg33arBKr4Y3+A==";
+        url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.4.tgz";
+        sha512 = "384VACEF6DSao3ffTeD19rgsaYXIQ1UtHUSZf2KAKRYe0i4Amu05E7aNRzymNAB9VapL3nCu5ehR130InCRFCA==";
       };
     };
-    "bolt07-1.7.4" = {
-      name = "bolt07";
-      packageName = "bolt07";
-      version = "1.7.4";
+    "bolt03-1.2.14" = {
+      name = "bolt03";
+      packageName = "bolt03";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.4.tgz";
-        sha512 = "y82Na9vEBY+rqjJhjYMFAch70nWvbL5OiEPFqNf7cGTtQfG7g/Vui2KnemrX1mxEw2SgccF+Rn1NSRm9HFtu3w==";
+        url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.14.tgz";
+        sha512 = "LhBa/3hqtSY7fBgE4FzoJXNPtE1tzxEfuWc32LQXNAwvgeWJP3tlQtNqhfPwfDFflSIysSe5N/yK/ybgd/oniA==";
       };
     };
     "bolt07-1.8.0" = {
@@ -16312,13 +16222,13 @@ let
         sha512 = "UJq+p94UK9QsU3P1npJyWF3r8TuJd6kv6P4m656VQK/m5ifw0bWCkYF0ngcHbFGq3j8u3gP8/tkGtB8WwPPRbQ==";
       };
     };
-    "bolt09-0.2.0" = {
-      name = "bolt09";
-      packageName = "bolt09";
-      version = "0.2.0";
+    "bolt07-1.8.1" = {
+      name = "bolt07";
+      packageName = "bolt07";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.0.tgz";
-        sha512 = "s6QWo7qqu6fKGLISGMSG+vFxIRzeUT3KQHDiHpvhflyI3TQD6zdaMu4fEpP7PoyMFJt2Ve26SBvvRP3MM7V0bw==";
+        url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.1.tgz";
+        sha512 = "vgh796VOdJBunZZZX0YuW1DmkS9SbW93rCLPOmWPsAHS/mStEs4+5d0KM1bYX6QBHshY9ecg4kgJaB18jrZsIA==";
       };
     };
     "bolt09-0.2.1" = {
@@ -16339,6 +16249,15 @@ let
         sha512 = "m533YWZ/R/p1buxEK/19v94Ay1vS1PJNwfP30BCVj6l96NGpOa9t40HYuMpoX+xFYwOx8kZs+GGTb9TbJund0w==";
       };
     };
+    "bolt09-0.2.3" = {
+      name = "bolt09";
+      packageName = "bolt09";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.3.tgz";
+        sha512 = "xEt5GE6pXB8wMIWHAoyF28k0Yt2rFqIou1LCyIeNadAOQhu/F7GTjZwreFwLl07YYkhOH23avewRt5PD8JnKKg==";
+      };
+    };
     "bonjour-3.5.0" = {
       name = "bonjour";
       packageName = "bonjour";
@@ -17600,13 +17519,13 @@ let
         sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==";
       };
     };
-    "cacache-16.0.3" = {
+    "cacache-16.0.4" = {
       name = "cacache";
       packageName = "cacache";
-      version = "16.0.3";
+      version = "16.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz";
-        sha512 = "eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-16.0.4.tgz";
+        sha512 = "U0D4wF3/W8ZgK4qDA5fTtOVSr0gaDfd5aa7tUdAV0uukVWKsAIn6SzXQCoVlg7RWZiJa+bcsM3/pXLumGaL2Ug==";
       };
     };
     "cache-base-1.0.1" = {
@@ -18167,22 +18086,22 @@ let
         sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
       };
     };
-    "cdk8s-1.5.62" = {
+    "cdk8s-1.5.64" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "1.5.62";
+      version = "1.5.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.62.tgz";
-        sha512 = "zspC9PLbuRVlDp+D9mhnqiBD3d4TAcgiIU0E12B6paJUM9gZaJEOi5q/DQcoGXa0AbnnGbSjmd+b0BgHFQJTGg==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.64.tgz";
+        sha512 = "HogF9VmYgTucZV1jvEujVYe6U1lkHr18Lz5HmcUTLhgGBU+h3XfIWabfpnRgiNn0pWfINvM/WowHZEBL8f8+Tw==";
       };
     };
-    "cdk8s-plus-22-1.0.0-beta.180" = {
+    "cdk8s-plus-22-1.0.0-beta.181" = {
       name = "cdk8s-plus-22";
       packageName = "cdk8s-plus-22";
-      version = "1.0.0-beta.180";
+      version = "1.0.0-beta.181";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.180.tgz";
-        sha512 = "7jZonUlzpGSyY7v9TWk42lznAh5GSNKRE/Xq0S4kRsZYMePCDNMgxyodlNp0Yd5mhPZYHAy/D7Rm7V3miuEvLg==";
+        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.181.tgz";
+        sha512 = "IFjdHKx+WlpLjazfpVCPUPkZtTMPKngm2XtajLGp8rvswxNuH6PbekUuT3TnnjXflvSrItQLOs+zbc7SViH3ow==";
       };
     };
     "cdktf-0.10.1" = {
@@ -20831,22 +20750,22 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-10.0.106" = {
+    "constructs-10.0.108" = {
       name = "constructs";
       packageName = "constructs";
-      version = "10.0.106";
+      version = "10.0.108";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-10.0.106.tgz";
-        sha512 = "6k8z7O3q6UigE62QW/z34YcSqa1elCDEGz1rTwaMkiVjdL93mB6YLNCpC21FYVUbx+rauTdsQCD3ejVxdAmazg==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-10.0.108.tgz";
+        sha512 = "A5sZMVWEblwtPBAOScOt8lBn2epTUljGy/sVfHi7juLnSNSZd2qaO7t62qvbIWJEpH047uYGd755PomB+sXeHA==";
       };
     };
-    "constructs-3.3.259" = {
+    "constructs-3.3.261" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.3.259";
+      version = "3.3.261";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.259.tgz";
-        sha512 = "hI++shPkBPk8yPD/Af48B6nPmnZIXsKx2dnqDiqadoU0i7Z75/G/TqtLVF96h8XC4A6JkzQ89+CxJLpRTqwy8w==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.261.tgz";
+        sha512 = "WAcluBHRkIlTIW0jXOhp9Fm8ZtjS2cF3MbAxN6/VEdAVtjuXlHqKmrBOVIp8V5L26ze/xuMz3mDhq1CrC2pjsw==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -21498,6 +21417,15 @@ let
         sha512 = "waKkgHU2P19huhuMjCqCDWTYjxCIHoB+nnYjI7pVMUOC1giWxMNDrXkPw9QjWY+PWCFm49bD3wA/J+c7BGZ+og==";
       };
     };
+    "core_d-4.0.0" = {
+      name = "core_d";
+      packageName = "core_d";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core_d/-/core_d-4.0.0.tgz";
+        sha512 = "dBxd0Ocxj3D3K+rJxutTAZ9LQHkuMZoc9HPWYwYRYK7swou5wuIRXxgJ39YLNDvFHfHyV3JbxVYluF/AOhcRnw==";
+      };
+    };
     "corestore-5.8.2" = {
       name = "corestore";
       packageName = "corestore";
@@ -22623,13 +22551,13 @@ let
         sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==";
       };
     };
-    "d3-7.4.2" = {
+    "d3-7.4.3" = {
       name = "d3";
       packageName = "d3";
-      version = "7.4.2";
+      version = "7.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/d3/-/d3-7.4.2.tgz";
-        sha512 = "7VK+QBAWtNDbP2EU/ThkXgjd0u1MsXYYgCK2ElQ4BBWh0usE75tHVVeYx47m2pqQEy4isYKAA0tAFSln0l+9EQ==";
+        url = "https://registry.npmjs.org/d3/-/d3-7.4.3.tgz";
+        sha512 = "x5cxHjtlXjtCzzaFv23mk6JKHKJzkYm/ePygQdeztcwYVedTHVQ7INyuAmRfjO7d4HTzQuofxzqva/d06Nh++Q==";
       };
     };
     "d3-array-1.2.4" = {
@@ -22650,13 +22578,13 @@ let
         sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ==";
       };
     };
-    "d3-array-3.1.4" = {
+    "d3-array-3.1.5" = {
       name = "d3-array";
       packageName = "d3-array";
-      version = "3.1.4";
+      version = "3.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.4.tgz";
-        sha512 = "H8lM97Gr9+LAR4WVHETCMt6LlWtLJVMCKsz1ojors+/PvAs2QqdLa20BuYvU11/DU+nLF0GVWL5Rv3jSgo2KmA==";
+        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.5.tgz";
+        sha512 = "Rs6syGyepVjAYXWvhiFiVWUM8l4B/0p33tvlS+eXCVOaFrbz1dU7t+T16SJx/frnaLMXmFmKoXg/5aUVXxmMKQ==";
       };
     };
     "d3-axis-1.0.12" = {
@@ -24810,13 +24738,13 @@ let
         sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==";
       };
     };
-    "dezalgo-1.0.3" = {
+    "dezalgo-1.0.4" = {
       name = "dezalgo";
       packageName = "dezalgo";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz";
-        sha1 = "7f742de066fc748bc8db820569dddce49bf0d456";
+        url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz";
+        sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==";
       };
     };
     "dht-rpc-4.9.6" = {
@@ -25350,13 +25278,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.2.0" = {
+    "domelementtype-2.3.0" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz";
-        sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz";
+        sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==";
       };
     };
     "domexception-1.0.1" = {
@@ -25890,15 +25818,6 @@ let
         sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
       };
     };
-    "ecpair-1.0.1" = {
-      name = "ecpair";
-      packageName = "ecpair";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecpair/-/ecpair-1.0.1.tgz";
-        sha512 = "5qPa0GVZJI1FAMS+4GZBWXS/bzY7/p2ehuGuHPqvsRWe2yXDc4Bgvf89BMJz87pqcW7+ogGQkLZfwflMr/RPgQ==";
-      };
-    };
     "ecpair-2.0.1" = {
       name = "ecpair";
       packageName = "ecpair";
@@ -26034,13 +25953,13 @@ let
         sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==";
       };
     };
-    "electron-to-chromium-1.4.103" = {
+    "electron-to-chromium-1.4.106" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.4.103";
+      version = "1.4.106";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz";
-        sha512 = "c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz";
+        sha512 = "ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -26792,13 +26711,13 @@ let
         sha1 = "5dae3e650e5be3684b88066513d528d092629862";
       };
     };
-    "es5-ext-0.10.59" = {
+    "es5-ext-0.10.60" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.59";
+      version = "0.10.60";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.59.tgz";
-        sha512 = "cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw==";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.60.tgz";
+        sha512 = "jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==";
       };
     };
     "es6-error-4.1.1" = {
@@ -28700,13 +28619,13 @@ let
         sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==";
       };
     };
-    "fast-equals-3.0.0" = {
+    "fast-equals-3.0.1" = {
       name = "fast-equals";
       packageName = "fast-equals";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.0.tgz";
-        sha512 = "Af7nSOpf7617idrFg0MJY6x7yVDPoO80aSwtKTC0afT8B/SsmvTpA+2a+uPLmhVF5IHmY5NPuBAA3dJrp55rJA==";
+        url = "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.1.tgz";
+        sha512 = "J9FxqqC9E/ja0C+SYhoG3Jl6pQuhP92HNcVC75xDEhB+GUzPnjEp3vMfPIxPprYZFfXS5hpVvvPCWUMiDSMS8Q==";
       };
     };
     "fast-fifo-1.1.0" = {
@@ -29861,13 +29780,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.175.0" = {
+    "flow-parser-0.175.1" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.175.0";
+      version = "0.175.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.175.0.tgz";
-        sha512 = "9XG5JGOjhODF+OQF5ufCw8XiGi+8B46scjr3Q49JxN7IDRdT2W+1AOuvKKd6j766/5E7qSuCn/dsq1y3hihntg==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.175.1.tgz";
+        sha512 = "gYes5/nxeLYiu02MMb+WH4KaOIYrVcTVIuV9M4aP/4hqJ+zULxxS/In+WEj/tEBsQ+8/wSHo9IDWKQL1FhrLmA==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -30149,13 +30068,13 @@ let
         sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==";
       };
     };
-    "fork-ts-checker-webpack-plugin-7.2.1" = {
+    "fork-ts-checker-webpack-plugin-7.2.3" = {
       name = "fork-ts-checker-webpack-plugin";
       packageName = "fork-ts-checker-webpack-plugin";
-      version = "7.2.1";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.1.tgz";
-        sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw==";
+        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.3.tgz";
+        sha512 = "9v308zIFTIFkWJBN/4N1A5oqm/ed9hWG6GH+KYTCBjYCEJOmHoVtDIWpfrJ0eD6cPB7V53HEVoJ6bL2In8QRaw==";
       };
     };
     "fork-ts-checker-webpack-plugin-v5-5.2.1" = {
@@ -32040,15 +31959,6 @@ let
         sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777";
       };
     };
-    "goldengate-10.4.2" = {
-      name = "goldengate";
-      packageName = "goldengate";
-      version = "10.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/goldengate/-/goldengate-10.4.2.tgz";
-        sha512 = "VZ0VPPIuiSO5/ZZr/UqFP3X3Yv04/TZxIe+SO+Ceqy43ulthPZcnrWsB8hYW2gqZzOPJeVJaYaX9FmL70kYITw==";
-      };
-    };
     "goldengate-11.1.0" = {
       name = "goldengate";
       packageName = "goldengate";
@@ -32058,6 +31968,15 @@ let
         sha512 = "nwrFxarqF2kxQXEzgcfvfqh64eokhcfyPl5i/RXGueRwUUSV7XW64A4BehcPcjKMKMxPM9RZarBTwa4vdnSZMA==";
       };
     };
+    "goldengate-11.1.1" = {
+      name = "goldengate";
+      packageName = "goldengate";
+      version = "11.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/goldengate/-/goldengate-11.1.1.tgz";
+        sha512 = "mxP1gmk5Bg72biHUgH7RYAQAjqX16/e5npGYPeBScspNYdwxqK87PDkZADy3p26dlOnbZN3G7tP06xzASKb7/g==";
+      };
+    };
     "gonzales-pe-4.3.0" = {
       name = "gonzales-pe";
       packageName = "gonzales-pe";
@@ -33867,22 +33786,22 @@ let
         sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98";
       };
     };
-    "html-tags-3.1.0" = {
+    "html-tags-3.2.0" = {
       name = "html-tags";
       packageName = "html-tags";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz";
-        sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==";
+        url = "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz";
+        sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==";
       };
     };
-    "html-to-text-8.1.0" = {
+    "html-to-text-8.1.1" = {
       name = "html-to-text";
       packageName = "html-to-text";
-      version = "8.1.0";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.0.tgz";
-        sha512 = "Z9iYAqYK2c18GswSbnxJSeMs7lyJgwR2oIkDOyOHGBbYsPsG4HvT379jj3Lcbfko8A5ceyyMHAfkmp/BiXA9/Q==";
+        url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.1.tgz";
+        sha512 = "uHdOmIGMy0Z1tJdcJzhbUQm3+V+6Q8YmFYCr1+SxjjwlO2Ha9S/D2eq1P8NLjH5fTzJCLQTL9xCXZNuIwraipw==";
       };
     };
     "html-void-elements-1.0.5" = {
@@ -33939,13 +33858,13 @@ let
         sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg==";
       };
     };
-    "htmlnano-2.0.1" = {
+    "htmlnano-2.0.2" = {
       name = "htmlnano";
       packageName = "htmlnano";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.1.tgz";
-        sha512 = "SIe/X2W5/9hmB4sFSw4HxQEMR1ERq+GXvasJQiatjKWEv6QCuvNHfPqeW8DRNtuGHOPlsfuFz0SbAStv63ZMvw==";
+        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.2.tgz";
+        sha512 = "+ZrQFS4Ub+zd+/fWwfvoYCEGNEa0/zrpys6CyXxvZDwtL7Pl+pOtRkiujyvBQ7Lmfp7/iEPxtOFgxWA16Gkj3w==";
       };
     };
     "htmlparser2-3.10.1" = {
@@ -34794,6 +34713,15 @@ let
         sha512 = "rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==";
       };
     };
+    "ignore-walk-5.0.1" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz";
+        sha512 = "yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==";
+      };
+    };
     "image-data-uri-2.0.1" = {
       name = "image-data-uri";
       packageName = "image-data-uri";
@@ -35253,6 +35181,15 @@ let
         sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==";
       };
     };
+    "ini-3.0.0" = {
+      name = "ini";
+      packageName = "ini";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-3.0.0.tgz";
+        sha512 = "TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==";
+      };
+    };
     "init-package-json-2.0.5" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -35757,33 +35694,6 @@ let
         sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==";
       };
     };
-    "invoices-2.0.1" = {
-      name = "invoices";
-      packageName = "invoices";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invoices/-/invoices-2.0.1.tgz";
-        sha512 = "qd6Os70iotC/P09ArTWsXB3/G8MJRYMkrJQ1k2983kzdKVlROgWobKmdvrA/IFmjg0Ztg/wDkhx49dIQqT8PzQ==";
-      };
-    };
-    "invoices-2.0.2" = {
-      name = "invoices";
-      packageName = "invoices";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invoices/-/invoices-2.0.2.tgz";
-        sha512 = "d1PX0ivZUw5u5kqIZ4bEajzTmKMe6EHXry4ZypsKT6SuvG4bTmn3sdCz867EhuMNZY2/Yj3/R1LXqCVTtsDPmA==";
-      };
-    };
-    "invoices-2.0.3" = {
-      name = "invoices";
-      packageName = "invoices";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invoices/-/invoices-2.0.3.tgz";
-        sha512 = "yCAFA3CtbRIiLOdybrZhV1UQ4Rjy20dXBL/5PzlqaZjDbz+RFWtuk3BWsUF12WJo1ikSeVhFXjp6hGAGIG690g==";
-      };
-    };
     "invoices-2.0.4" = {
       name = "invoices";
       packageName = "invoices";
@@ -35793,6 +35703,15 @@ let
         sha512 = "+Np4KWjNSlYm7Qp12zkRN5eu9tkA7FAFIP60bmpbMbwQbgz5gV9go3bkY8CpGj+Z1zifw5N8U+pH+wko/XSjpw==";
       };
     };
+    "invoices-2.0.5" = {
+      name = "invoices";
+      packageName = "invoices";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invoices/-/invoices-2.0.5.tgz";
+        sha512 = "097isfZK3qaDJXQOEqTr3IfnrFZnGCAsbyqWNHAESdG12vBC39dprZWFwPLtnv7I8exhJG6WFFlaC51qaJan/w==";
+      };
+    };
     "iota-array-1.0.0" = {
       name = "iota-array";
       packageName = "iota-array";
@@ -38494,13 +38413,13 @@ let
         sha512 = "ZUzuO2JgnxE01tgIdZorsUZj5jiHP8uxeLDU/vsnmnAU2ZbMHFDT1cWacoAKESDnCyFF8VRCuPXHx8e5/SOXig==";
       };
     };
-    "jsii-srcmak-0.1.521" = {
+    "jsii-srcmak-0.1.523" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.521";
+      version = "0.1.523";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.521.tgz";
-        sha512 = "cZv5C7kMUz+UZqZsZpmz+xDWZCC8VNJNRo/nO+1uuzKuBk1XRAvKOEiMI5E//tZqRuv2BXuyGIhyJOMrOpP4dg==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.523.tgz";
+        sha512 = "b7vkOZnBcDYl/32tPn0cSPetl4znNTXP7AHDDi9rhP7rgIQx8YWDaPHZsGSpA6RgvC7aGBgHVVYLsC6qPeLJ7w==";
       };
     };
     "json-bigint-1.0.0" = {
@@ -38791,22 +38710,22 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "json2csv-5.0.6" = {
+    "json2csv-5.0.7" = {
       name = "json2csv";
       packageName = "json2csv";
-      version = "5.0.6";
+      version = "5.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.6.tgz";
-        sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
+        url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz";
+        sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==";
       };
     };
-    "json2jsii-0.2.181" = {
+    "json2jsii-0.2.183" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.2.181";
+      version = "0.2.183";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.181.tgz";
-        sha512 = "pFUtkCYepbjES8GBuxzkHXEuQyx7CE2VZp6OouvjbrFYJTx3SbbDXmyPuk/ytiD2pPBblwlpb+9VOohxBxXZsQ==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.183.tgz";
+        sha512 = "Xd8EZ7c0JQ27mqXV4uCSwoRMUjNBnTrEkXOhrd8b0hlJoG4WmUFJRAHanPgfsiMwDJVWHMxss11euEfnYqfe7g==";
       };
     };
     "json3-3.2.6" = {
@@ -39160,13 +39079,13 @@ let
         sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0";
       };
     };
-    "jszip-3.9.0" = {
+    "jszip-3.9.1" = {
       name = "jszip";
       packageName = "jszip";
-      version = "3.9.0";
+      version = "3.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jszip/-/jszip-3.9.0.tgz";
-        sha512 = "Vb3SMfASUN1EKrFzv5A5+lTaZnzLzT5E6A9zyT7WFqMSfhT2Z7iS5FgSOjx2Olm3MDj8OqKj6GHyP2kMt1Ir6w==";
+        url = "https://registry.npmjs.org/jszip/-/jszip-3.9.1.tgz";
+        sha512 = "H9A60xPqJ1CuC4Ka6qxzXZeU8aNmgOeP5IFqwJbQQwtu2EUYxota3LdsiZWplF7Wgd9tkAd0mdu36nceSaPuYw==";
       };
     };
     "junk-3.1.0" = {
@@ -39475,13 +39394,13 @@ let
         sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
       };
     };
-    "keyv-4.2.1" = {
+    "keyv-4.2.2" = {
       name = "keyv";
       packageName = "keyv";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz";
-        sha512 = "cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==";
+        url = "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz";
+        sha512 = "uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==";
       };
     };
     "khroma-1.4.1" = {
@@ -40339,22 +40258,13 @@ let
         sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==";
       };
     };
-    "lightning-4.14.3" = {
+    "lightning-5.10.1" = {
       name = "lightning";
       packageName = "lightning";
-      version = "4.14.3";
+      version = "5.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lightning/-/lightning-4.14.3.tgz";
-        sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA==";
-      };
-    };
-    "lightning-5.6.2" = {
-      name = "lightning";
-      packageName = "lightning";
-      version = "5.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lightning/-/lightning-5.6.2.tgz";
-        sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog==";
+        url = "https://registry.npmjs.org/lightning/-/lightning-5.10.1.tgz";
+        sha512 = "dIrN4vPzmzq9DaMD6c+9DqQwJCMl1lOleWrhIrv+HIpzq6rdNJvUXaVJOFz1OV8P3zy2Q3+s9VxnzeN70ee+ow==";
       };
     };
     "lightning-5.8.2" = {
@@ -40375,6 +40285,15 @@ let
         sha512 = "qiKxXH81vfxJdR1TbY095IKjD7kwbiWbdGcGHs1GMaAxxcGo/iqf5F+VDWHwGjSlPMohMI827vN0JHqZQKcojA==";
       };
     };
+    "lightning-5.9.0" = {
+      name = "lightning";
+      packageName = "lightning";
+      version = "5.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lightning/-/lightning-5.9.0.tgz";
+        sha512 = "o084Z7QAUaxR7+nLgr+DlL2XiMJGHDq/SRhKcanP10qR0irTK1oSHDyaFmrwz33y5V/d6Tla+5yjdD217LMWAA==";
+      };
+    };
     "lilconfig-2.0.5" = {
       name = "lilconfig";
       packageName = "lilconfig";
@@ -40573,31 +40492,31 @@ let
         sha512 = "UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ==";
       };
     };
-    "ln-accounting-5.0.5" = {
+    "ln-accounting-5.0.6" = {
       name = "ln-accounting";
       packageName = "ln-accounting";
-      version = "5.0.5";
+      version = "5.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.5.tgz";
-        sha512 = "WPAdlGE9byTrL79U4PrSV19fbOCmvWlRlGydt52qPy6CSrY1xkGe2s736ge3tjwNmcFDf4XSrxq7xn/oyF658w==";
+        url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.6.tgz";
+        sha512 = "ep+JDvgqQTINsUskIAlLgXE2mVsR01Atl0kFbd5D41RjCvr6tnTGocKG5CSxmp5USIpQnY2Jan1VQkXjrLukBg==";
       };
     };
-    "ln-service-52.16.0" = {
+    "ln-service-53.10.0" = {
       name = "ln-service";
       packageName = "ln-service";
-      version = "52.16.0";
+      version = "53.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-service/-/ln-service-52.16.0.tgz";
-        sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ==";
+        url = "https://registry.npmjs.org/ln-service/-/ln-service-53.10.0.tgz";
+        sha512 = "YXpywZVf/oSWiuntp5v6IRPYNCCMlsGkWkFsX4eygnXqZnKDOaBSgvBHYJ871C0SJuyQD4oN0wazTYD+PhQUGA==";
       };
     };
-    "ln-service-53.7.3" = {
+    "ln-service-53.11.0" = {
       name = "ln-service";
       packageName = "ln-service";
-      version = "53.7.3";
+      version = "53.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-service/-/ln-service-53.7.3.tgz";
-        sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw==";
+        url = "https://registry.npmjs.org/ln-service/-/ln-service-53.11.0.tgz";
+        sha512 = "qdsgLRFGdn8+zfSDgbGw584fS2QQromxp4VRXzj9nk3qveTD6IwBjaEhC1xtY73MQCHQ3ALkWVn3aYMoy5erFw==";
       };
     };
     "ln-service-53.9.3" = {
@@ -40627,13 +40546,31 @@ let
         sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA==";
       };
     };
-    "ln-telegram-3.21.0" = {
+    "ln-sync-3.11.1" = {
+      name = "ln-sync";
+      packageName = "ln-sync";
+      version = "3.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.11.1.tgz";
+        sha512 = "KTMnSjKN5g4fE3M+axLWLJO6DGyzZ/UroKaV4fNxjqvKJrBY9XpXhHqJCAbzzJiN4Ff3CjoSUCjiDqJdDe1A4w==";
+      };
+    };
+    "ln-sync-3.12.0" = {
+      name = "ln-sync";
+      packageName = "ln-sync";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.12.0.tgz";
+        sha512 = "+TFRyMVvUU9jAqRGPiawPY8cGSmfd2bKfofGsH95zTlQ4DeQLYyEPFxzqJZrkmddqdohfuF0XVW9y7+4v4eq5A==";
+      };
+    };
+    "ln-telegram-3.21.1" = {
       name = "ln-telegram";
       packageName = "ln-telegram";
-      version = "3.21.0";
+      version = "3.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.21.0.tgz";
-        sha512 = "a1MvI5yMUStDZ7tOnPeh3nz6yftIESRw/R79oeh2eSvYbS6AGel35pKJ5E+aXVWuQR+0jeA3uGKKBBI1LGc9mw==";
+        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.21.1.tgz";
+        sha512 = "xvTNSaM8fG/jnORTPnpU6+righKsqaYNyS1NR4NseqnS3fM5vshsCb+do5mY1R3BNh8Fp6CDT+agakF7hVlFDg==";
       };
     };
     "load-bmfont-1.4.1" = {
@@ -42553,13 +42490,13 @@ let
         sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
       };
     };
-    "lru-cache-7.7.3" = {
+    "lru-cache-7.8.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "7.7.3";
+      version = "7.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz";
-        sha512 = "WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.0.tgz";
+        sha512 = "AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==";
       };
     };
     "lru-queue-0.1.0" = {
@@ -42824,15 +42761,6 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "make-fetch-happen-10.1.1" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "10.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz";
-        sha512 = "3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==";
-      };
-    };
     "make-fetch-happen-10.1.2" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
@@ -45866,13 +45794,13 @@ let
         sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA==";
       };
     };
-    "msgpackr-extract-1.1.0" = {
+    "msgpackr-extract-1.1.3" = {
       name = "msgpackr-extract";
       packageName = "msgpackr-extract";
-      version = "1.1.0";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.0.tgz";
-        sha512 = "9QxKc4KYr7bNV0/2JPDbRIxCgMEYhDiZtOszvA+eH8Rx8IOOSv3bzP95RoxREwgekdXej+/GhA2Y6paSNBYsgA==";
+        url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.3.tgz";
+        sha512 = "eFFRviOsqjfr6tOBwuccUdTaTPWn3Rb/Kf5zjoz5IZJMpQD4ZeLecDcRzuze+jzlqQ2cJo1gyuV8dCFEojWkjg==";
       };
     };
     "msgpackr-extract-darwin-arm64-1.1.0" = {
@@ -46757,13 +46685,13 @@ let
         sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==";
       };
     };
-    "needle-3.0.0" = {
+    "needle-3.1.0" = {
       name = "needle";
       packageName = "needle";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-3.0.0.tgz";
-        sha512 = "eGr0qnfHxAjr+Eptl1zr2lgUQUPC1SZfTkg2kFi0kxr1ChJonHUVYobkug8siBKMlyUVVp56MSkp6CSeXH/jgw==";
+        url = "https://registry.npmjs.org/needle/-/needle-3.1.0.tgz";
+        sha512 = "gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==";
       };
     };
     "negotiator-0.3.0" = {
@@ -47433,14 +47361,13 @@ let
         sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==";
       };
     };
-    "node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages" = {
-      name = "node-gyp-build";
-      packageName = "node-gyp-build";
-      version = "4.3.0";
-      src = fetchgit {
-        url = "git://github.com/kriszyp/node-gyp-build";
-        rev = "c9952cb77e89d2cd8b6c2d4d056a06d41834b305";
-        sha256 = "c94d85ea73a0770f4e6c6af7967d19ddf09dd721fb0d6d097a0124e976df6487";
+    "node-gyp-build-optional-packages-4.3.1" = {
+      name = "node-gyp-build-optional-packages";
+      packageName = "node-gyp-build-optional-packages";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.1.tgz";
+        sha512 = "pxljizahvoXKVtlo+D+YOcHYG2931/aBdNoqfynHDNwWRIe94CgkIUZfeOOFaHY+hl5lYkyI9RzGfr/gWxlR4Q==";
       };
     };
     "node-hid-2.1.1" = {
@@ -48199,13 +48126,13 @@ let
         sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==";
       };
     };
-    "npm-packlist-4.0.0" = {
+    "npm-packlist-5.0.0" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "4.0.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-4.0.0.tgz";
-        sha512 = "gL6XC/iw9YSmqArmZOGSkyy+yIZf2f7uH0p4Vmxef/irn73vd9/rDkCtvm+a9rh/QK2xGYfCAMOghM06ymzC0A==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.0.0.tgz";
+        sha512 = "uU20UwM4Hogfab1Q7htJbhcyafM9lGHxOrDjkKvR2S3z7Ds0uRaESk0cXctczk+ABT4DZWNwjB10xlurFdEwZg==";
       };
     };
     "npm-pick-manifest-6.1.1" = {
@@ -50324,6 +50251,15 @@ let
         sha512 = "LdnkVwu808S7ngeKpUjJZDWXsWXqMLYtTGE2pXtKjpIs5Nn2qL6d84Sh+/gxyeJHtTz0qmOEuYnFfn61/TuU0A==";
       };
     };
+    "p2tr-1.3.1" = {
+      name = "p2tr";
+      packageName = "p2tr";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.1.tgz";
+        sha512 = "gwfolcu1fmuXy2muugnXub05PuwMYzvQH1rcksd5HRCY+QS7WgJCs+01kWoqioKXuXWPMqy3HEU/hfH0Cvf3cQ==";
+      };
+    };
     "pac-proxy-agent-4.1.0" = {
       name = "pac-proxy-agent";
       packageName = "pac-proxy-agent";
@@ -50468,13 +50404,13 @@ let
         sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==";
       };
     };
-    "pacote-13.0.5" = {
+    "pacote-13.1.1" = {
       name = "pacote";
       packageName = "pacote";
-      version = "13.0.5";
+      version = "13.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-13.0.5.tgz";
-        sha512 = "6CYfot3/rUAn3qqzF2d/jrrXm5HlBtvaSgfmg0VtOUAdJ8fbSq21BJwftMGArkL71yXHIbUJ7Bt5B04547HELA==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-13.1.1.tgz";
+        sha512 = "MTT3k1OhUo+IpvoHGp25OwsRU0L+kJQM236OCywxvY4OIJ/YfloNW2/Yc3HMASH10BkfZaGMVK/pxybB7fWcLw==";
       };
     };
     "pad-0.0.5" = {
@@ -50495,15 +50431,6 @@ let
         sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
       };
     };
-    "paid-services-3.14.4" = {
-      name = "paid-services";
-      packageName = "paid-services";
-      version = "3.14.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.4.tgz";
-        sha512 = "DLmutrDtOoxgcaiyZcdzD6nIVFwMwnkcriJhZEvVNeyzXlB+aNySn5MpB4YPlDtxKuSd6use+JZxQ5RzifcJ4g==";
-      };
-    };
     "paid-services-3.14.5" = {
       name = "paid-services";
       packageName = "paid-services";
@@ -52250,13 +52177,13 @@ let
         sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==";
       };
     };
-    "polished-4.2.1" = {
+    "polished-4.2.2" = {
       name = "polished";
       packageName = "polished";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/polished/-/polished-4.2.1.tgz";
-        sha512 = "vRkUnHBwVX7kIeCzCghcLCWoDenV+sV7lkItnmTc7bb6Uzbe8ogU1FxqEW8+dXCxUX8YW8vusQ0HTk2yES7bfQ==";
+        url = "https://registry.npmjs.org/polished/-/polished-4.2.2.tgz";
+        sha512 = "Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==";
       };
     };
     "polyraf-1.1.0" = {
@@ -53583,13 +53510,13 @@ let
         sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA==";
       };
     };
-    "probing-2.0.3" = {
+    "probing-2.0.5" = {
       name = "probing";
       packageName = "probing";
-      version = "2.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/probing/-/probing-2.0.3.tgz";
-        sha512 = "6PuKCNitH3pjTjHndVtSkb300EQCiYPKJCxfDHlu9uwEcjDc7Fipee8U9fTm5W8frVCB7Vo4V4dlwGL9WVL2OQ==";
+        url = "https://registry.npmjs.org/probing/-/probing-2.0.5.tgz";
+        sha512 = "vlE0H17RSL3WkZVYtCyoMivLKmtp5ZMwMaSMvCiwE894iPAfNS4p4dgHk2My0tqhfRsHLebgn2p5Tq39Ik2Llw==";
       };
     };
     "proc-log-1.0.0" = {
@@ -54195,15 +54122,6 @@ let
         sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==";
       };
     };
-    "psbt-1.1.10" = {
-      name = "psbt";
-      packageName = "psbt";
-      version = "1.1.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/psbt/-/psbt-1.1.10.tgz";
-        sha512 = "LLyJcNVKRK8AUXKcpCrZA21+mlrjzlzTLQZp/Yu279hqqQrakAu9IusT7zEddhhkQrzm6UQ9cER3nhrIZqh0hw==";
-      };
-    };
     "psbt-2.0.0" = {
       name = "psbt";
       packageName = "psbt";
@@ -54213,6 +54131,15 @@ let
         sha512 = "V3RueLeXhP/WZETCtUxFn9aaEjHKdJIp2jir1rgK3iU0fV4hC0f45wDRDrrtcFHIUyvudgzhg6Bcgr8cGaWXlA==";
       };
     };
+    "psbt-2.0.1" = {
+      name = "psbt";
+      packageName = "psbt";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psbt/-/psbt-2.0.1.tgz";
+        sha512 = "4s5DSXDJ9xAYjuRJXf8rEuqs+Leyl11TE3y98xzlhMJN2UYXSLkAW1KSUdm/gdu1cSTcdcicIFZscNXmxFko+w==";
+      };
+    };
     "pseudomap-1.0.2" = {
       name = "pseudomap";
       packageName = "pseudomap";
@@ -57030,13 +56957,13 @@ let
         sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==";
       };
     };
-    "regenerator-transform-0.14.5" = {
+    "regenerator-transform-0.15.0" = {
       name = "regenerator-transform";
       packageName = "regenerator-transform";
-      version = "0.14.5";
+      version = "0.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz";
-        sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==";
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz";
+        sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==";
       };
     };
     "regex-cache-0.4.4" = {
@@ -59541,13 +59468,13 @@ let
         sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==";
       };
     };
-    "sass-1.49.11" = {
+    "sass-1.50.0" = {
       name = "sass";
       packageName = "sass";
-      version = "1.49.11";
+      version = "1.50.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz";
-        sha512 = "wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz";
+        sha512 = "cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==";
       };
     };
     "sass-loader-10.2.0" = {
@@ -59703,15 +59630,6 @@ let
         sha512 = "jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==";
       };
     };
-    "secp256k1-4.0.2" = {
-      name = "secp256k1";
-      packageName = "secp256k1";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz";
-        sha512 = "UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==";
-      };
-    };
     "secp256k1-4.0.3" = {
       name = "secp256k1";
       packageName = "secp256k1";
@@ -59973,6 +59891,15 @@ let
         sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
       };
     };
+    "semver-7.3.6" = {
+      name = "semver";
+      packageName = "semver";
+      version = "7.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz";
+        sha512 = "HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==";
+      };
+    };
     "semver-compare-1.0.0" = {
       name = "semver-compare";
       packageName = "semver-compare";
@@ -61710,13 +61637,13 @@ let
         sha512 = "zlOmAKFLJzTI+MbvmkWhnOOJ++NYo0Iy7F93ARNPmvZvpWG2l8Ff3uwM3CkpHqRw8v3pcRROScM5E+vbeTeOKw==";
       };
     };
-    "sonic-boom-2.6.0" = {
+    "sonic-boom-2.7.0" = {
       name = "sonic-boom";
       packageName = "sonic-boom";
-      version = "2.6.0";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.6.0.tgz";
-        sha512 = "6xYZFRmDEtxGqfOKcDQ4cPLrNa0SPEDI+wlzDAHowXE6YV42NeXqg9mP2KkiM8JVu3lHfZ2iQKYlGOz+kTpphg==";
+        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.7.0.tgz";
+        sha512 = "Ynxp0OGQG91wvDjCbFlRMHbSUmDq7dE/EgDeUJ/j+Q9x1FVkFry20cjLykxRSmlm3QS0B4JYAKE8239XKN4SHQ==";
       };
     };
     "sorcery-0.10.0" = {
@@ -62844,13 +62771,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.248" = {
+    "sscaff-1.2.250" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.248";
+      version = "1.2.250";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.248.tgz";
-        sha512 = "rHpwuR6VXLYvHowk/AZTNbTbhnxQ20+G6izyrdCXH7qxIcU05sbo328b8WdglFi3ncm6FF9Rn2PmGEc2HGaY/Q==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.250.tgz";
+        sha512 = "J9asMSddhWmXhjcpm6THvrOgWliXPKmjr6Yzpto64cNPrQOI0RYd8pVTuQNg5bZPDM1/4XM4ywzFcBM7vjeilw==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -64401,13 +64328,13 @@ let
         sha1 = "3a26ab96e06f78cf4ace8d083f6227fa55970947";
       };
     };
-    "sucrase-3.20.3" = {
+    "sucrase-3.21.0" = {
       name = "sucrase";
       packageName = "sucrase";
-      version = "3.20.3";
+      version = "3.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sucrase/-/sucrase-3.20.3.tgz";
-        sha512 = "azqwq0/Bs6RzLAdb4dXxsCgMtAaD2hzmUr4UhSfsxO46JFPAwMnnb441B/qsudZiS6Ylea3JXZe3Q497lsgXzQ==";
+        url = "https://registry.npmjs.org/sucrase/-/sucrase-3.21.0.tgz";
+        sha512 = "FjAhMJjDcifARI7bZej0Bi1yekjWQHoEvWIXhLPwDhC6O4iZ5PtGb86WV56riW87hzpgB13wwBKO9vKAiWu5VQ==";
       };
     };
     "sudo-block-1.2.0" = {
@@ -64500,13 +64427,13 @@ let
         sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==";
       };
     };
-    "supercluster-7.1.4" = {
+    "supercluster-7.1.5" = {
       name = "supercluster";
       packageName = "supercluster";
-      version = "7.1.4";
+      version = "7.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.4.tgz";
-        sha512 = "GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==";
+        url = "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz";
+        sha512 = "EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==";
       };
     };
     "superstatic-7.1.0" = {
@@ -64671,13 +64598,13 @@ let
         sha512 = "VKXPRScCzAZqeBZOGq4LLwtNrAu++mVn7XvQox3eFDV7Ciq0Lg70Q8QWjH9iXF7J+pMlXhPsSFwpCb2E+hoeyA==";
       };
     };
-    "svelte2tsx-0.5.6" = {
+    "svelte2tsx-0.5.7" = {
       name = "svelte2tsx";
       packageName = "svelte2tsx";
-      version = "0.5.6";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.6.tgz";
-        sha512 = "B4WZUtoTdVD+F73H1RQEH3Hrv7m2/ahThmAUkjT5CTWRigQaJqYQpSjisCH1Pzfi9B37YikDnAi4u4uxwYM+iw==";
+        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.7.tgz";
+        sha512 = "rekPWR5at7DNvIlJRSCyKFZ6Go/KyqjDRL/zRWQSNMbvTIocsm/gDtSbLz64ZP5Qz3tUeod7QzDqX13lF60kCg==";
       };
     };
     "sver-compat-1.5.0" = {
@@ -67039,13 +66966,13 @@ let
         sha1 = "5f4278e701800967a8fc383fd19648878f2a6e3a";
       };
     };
-    "tsconfig-paths-3.14.0" = {
+    "tsconfig-paths-3.14.1" = {
       name = "tsconfig-paths";
       packageName = "tsconfig-paths";
-      version = "3.14.0";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz";
-        sha512 = "cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==";
+        url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz";
+        sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==";
       };
     };
     "tsconfig-paths-webpack-plugin-3.5.2" = {
@@ -67525,15 +67452,6 @@ let
         sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==";
       };
     };
-    "type-fest-2.11.1" = {
-      name = "type-fest";
-      packageName = "type-fest";
-      version = "2.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-2.11.1.tgz";
-        sha512 = "fPcV5KLAqFfmhHobtAUwEpbpfYhVF7wSLVgbG/7mIGe/Pete7ky/bPAPRkzbWdrj0/EkswFAAR2feJCgigkUKg==";
-      };
-    };
     "type-fest-2.12.0" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -71846,6 +71764,15 @@ let
         sha512 = "EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==";
       };
     };
+    "web-streams-polyfill-3.2.1" = {
+      name = "web-streams-polyfill";
+      packageName = "web-streams-polyfill";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz";
+        sha512 = "e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==";
+      };
+    };
     "web-streams-polyfill-4.0.0-beta.1" = {
       name = "web-streams-polyfill";
       packageName = "web-streams-polyfill";
@@ -71981,15 +71908,6 @@ let
         sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==";
       };
     };
-    "webpack-5.70.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "5.70.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz";
-        sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==";
-      };
-    };
     "webpack-5.71.0" = {
       name = "webpack";
       packageName = "webpack";
@@ -71999,6 +71917,15 @@ let
         sha512 = "g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==";
       };
     };
+    "webpack-5.72.0" = {
+      name = "webpack";
+      packageName = "webpack";
+      version = "5.72.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz";
+        sha512 = "qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==";
+      };
+    };
     "webpack-bundle-analyzer-3.9.0" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
@@ -73133,15 +73060,6 @@ let
         sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==";
       };
     };
-    "ws-8.4.2" = {
-      name = "ws";
-      packageName = "ws";
-      version = "8.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz";
-        sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==";
-      };
-    };
     "ws-8.5.0" = {
       name = "ws";
       packageName = "ws";
@@ -74445,15 +74363,15 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "13.3.1";
+    version = "13.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.1.tgz";
-      sha512 = "0uwU8v3V/2s95X4cZT582J6upReT/ZNw/VAf4p4q51JN+BBvdCEb251xTF+TcOojyToFyJYvg8T28XSrsNsmTQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.2.tgz";
+      sha512 = "sfhMbm0wBAYmG+8YEYYZ5QkFyv2TJmMua/LbGoJE/y5UKBN+zLsMO3G/CW3D6pWThbgf04qQpi2LHonbPC/Bkg==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1303.1"
-      sources."@angular-devkit/core-13.3.1"
-      sources."@angular-devkit/schematics-13.3.1"
+      sources."@angular-devkit/architect-0.1303.2"
+      sources."@angular-devkit/core-13.3.2"
+      sources."@angular-devkit/schematics-13.3.2"
       sources."@gar/promisify-1.1.3"
       sources."@npmcli/fs-1.1.1"
       sources."@npmcli/git-2.1.0"
@@ -74462,7 +74380,7 @@ in
       sources."@npmcli/node-gyp-1.0.3"
       sources."@npmcli/promise-spawn-1.3.2"
       sources."@npmcli/run-script-2.0.0"
-      sources."@schematics/angular-13.3.1"
+      sources."@schematics/angular-13.3.2"
       sources."@tootallnate/once-1.1.2"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-1.1.1"
@@ -74587,15 +74505,17 @@ in
       (sources."npm-registry-fetch-12.0.2" // {
         dependencies = [
           sources."@npmcli/fs-2.1.0"
+          sources."@npmcli/move-file-2.0.0"
           sources."@tootallnate/once-2.0.0"
-          sources."cacache-16.0.3"
+          sources."cacache-16.0.4"
           sources."http-proxy-agent-5.0.0"
-          sources."lru-cache-7.7.3"
-          (sources."make-fetch-happen-10.1.1" // {
+          sources."lru-cache-7.8.0"
+          (sources."make-fetch-happen-10.1.2" // {
             dependencies = [
               sources."minipass-fetch-2.1.0"
             ];
           })
+          sources."ssri-9.0.0"
         ];
       })
       sources."npmlog-6.0.1"
@@ -75040,7 +74960,7 @@ in
       sources."pascal-case-3.1.2"
       sources."source-map-0.7.3"
       sources."svelte-3.46.6"
-      sources."svelte2tsx-0.5.6"
+      sources."svelte2tsx-0.5.7"
       sources."tslib-2.3.1"
       sources."typescript-4.6.3"
       sources."vscode-css-languageservice-5.4.1"
@@ -75199,7 +75119,7 @@ in
         ];
       })
       sources."json-stringify-safe-5.0.1"
-      sources."jszip-3.9.0"
+      sources."jszip-3.9.1"
       sources."keygrip-1.1.0"
       (sources."koa-2.13.4" // {
         dependencies = [
@@ -75340,7 +75260,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -75592,7 +75512,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -75736,7 +75656,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."lines-and-columns-1.2.4"
       sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
@@ -75760,7 +75680,8 @@ in
       sources."normalize-newline-4.1.0"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."normalize-path-3.0.0"
@@ -76256,7 +76177,7 @@ in
       sha512 = "hV1PG20mLFmYbSJvV+JIGVLUT3zzDt2snR9T7tKMBAVvGQBAfzodylbTZe+b20hNz3Max2Z4zsKVksRu71x1+A==";
     };
     dependencies = [
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@medable/mdctl-api-1.0.64"
       sources."@medable/mdctl-api-driver-1.0.64"
       sources."@medable/mdctl-axon-tools-1.0.64"
@@ -77286,15 +77207,15 @@ in
   "@nestjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_nestjs_slash_cli";
     packageName = "@nestjs/cli";
-    version = "8.2.4";
+    version = "8.2.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.4.tgz";
-      sha512 = "9zNV9oMtaz1vwLO3WXviD0wzRpyiaLWJZ7KCIZLk62U22RDNRsbtLLDS52Wkig5L8UU7Z1xRfrEv+s3f9keysQ==";
+      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.5.tgz";
+      sha512 = "b5DzZ08q/6iWvLz+n2DhEyZ3rsOurN1ec1jYQaWC5DCVQoZCwyOew48bVf01kevTK4eZyQxPwuErf7HnFAc0oQ==";
     };
     dependencies = [
-      sources."@angular-devkit/core-13.3.0"
-      sources."@angular-devkit/schematics-13.3.0"
-      (sources."@angular-devkit/schematics-cli-13.3.0" // {
+      sources."@angular-devkit/core-13.3.2"
+      sources."@angular-devkit/schematics-13.3.2"
+      (sources."@angular-devkit/schematics-cli-13.3.2" // {
         dependencies = [
           sources."chalk-4.1.2"
           sources."inquirer-8.2.0"
@@ -77304,7 +77225,7 @@ in
       })
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -77314,12 +77235,7 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@nestjs/schematics-8.0.9" // {
-        dependencies = [
-          sources."@angular-devkit/core-13.3.1"
-          sources."@angular-devkit/schematics-13.3.1"
-        ];
-      })
+      sources."@nestjs/schematics-8.0.10"
       sources."@types/eslint-8.4.1"
       sources."@types/eslint-scope-3.7.3"
       sources."@types/estree-0.0.51"
@@ -77348,7 +77264,7 @@ in
       sources."acorn-import-assertions-1.8.0"
       sources."ajv-8.9.0"
       sources."ajv-formats-2.1.1"
-      sources."ajv-keywords-5.1.0"
+      sources."ajv-keywords-3.5.2"
       sources."ansi-colors-4.1.1"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.1"
@@ -77383,7 +77299,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-5.9.2"
@@ -77405,7 +77321,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."figures-3.2.0"
       sources."fill-range-7.0.1"
-      (sources."fork-ts-checker-webpack-plugin-7.2.1" // {
+      (sources."fork-ts-checker-webpack-plugin-7.2.3" // {
         dependencies = [
           sources."chalk-4.1.2"
         ];
@@ -77465,7 +77381,7 @@ in
           sources."chalk-4.1.2"
         ];
       })
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."macos-release-2.5.0"
       sources."magic-string-0.25.7"
       sources."memfs-3.4.1"
@@ -77474,7 +77390,7 @@ in
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.1.2"
-      sources."minimist-1.2.5"
+      sources."minimist-1.2.6"
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.11.0"
@@ -77514,8 +77430,13 @@ in
       sources."rxjs-6.6.7"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."schema-utils-4.0.0"
-      sources."semver-7.3.5"
+      (sources."schema-utils-3.1.1" // {
+        dependencies = [
+          sources."ajv-6.12.6"
+          sources."json-schema-traverse-0.4.1"
+        ];
+      })
+      sources."semver-7.3.6"
       sources."serialize-javascript-6.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -77544,10 +77465,6 @@ in
       })
       (sources."terser-webpack-plugin-5.3.1" // {
         dependencies = [
-          sources."ajv-6.12.6"
-          sources."ajv-keywords-3.5.2"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.1.1"
           sources."source-map-0.6.1"
         ];
       })
@@ -77555,7 +77472,7 @@ in
       sources."tmp-0.0.33"
       sources."to-regex-range-5.0.1"
       sources."tree-kill-1.2.2"
-      sources."tsconfig-paths-3.14.0"
+      sources."tsconfig-paths-3.14.1"
       (sources."tsconfig-paths-webpack-plugin-3.5.2" // {
         dependencies = [
           sources."chalk-4.1.2"
@@ -77569,20 +77486,12 @@ in
       sources."util-deprecate-1.0.2"
       sources."watchpack-2.3.1"
       sources."wcwidth-1.0.1"
-      (sources."webpack-5.70.0" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."ajv-keywords-3.5.2"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.1.1"
-        ];
-      })
+      sources."webpack-5.71.0"
       sources."webpack-node-externals-3.0.0"
       sources."webpack-sources-3.2.3"
       sources."which-2.0.2"
       sources."windows-release-4.0.0"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
       sources."yaml-1.10.2"
     ];
     buildInputs = globalBuildInputs;
@@ -77774,7 +77683,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1107.0" // {
+      (sources."aws-sdk-2.1110.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -78064,12 +77973,12 @@ in
       sources."@apollographql/graphql-upload-8-fork-8.1.3"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      (sources."@babel/generator-7.17.7" // {
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -78081,7 +77990,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-create-regexp-features-plugin-7.17.0"
       (sources."@babel/helper-define-polyfill-provider-0.3.1" // {
         dependencies = [
@@ -78090,8 +77999,7 @@ in
       })
       sources."@babel/helper-environment-visitor-7.16.7"
       sources."@babel/helper-explode-assignable-expression-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -78106,8 +78014,8 @@ in
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
       sources."@babel/helper-wrap-function-7.16.8"
-      sources."@babel/helpers-7.17.8"
-      (sources."@babel/highlight-7.16.10" // {
+      sources."@babel/helpers-7.17.9"
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -78117,7 +78025,7 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -78167,7 +78075,7 @@ in
       sources."@babel/plugin-transform-literals-7.16.7"
       sources."@babel/plugin-transform-member-expression-literals-7.16.7"
       sources."@babel/plugin-transform-modules-amd-7.16.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.17.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.17.9"
       sources."@babel/plugin-transform-modules-systemjs-7.17.8"
       sources."@babel/plugin-transform-modules-umd-7.16.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8"
@@ -78175,7 +78083,7 @@ in
       sources."@babel/plugin-transform-object-super-7.16.7"
       sources."@babel/plugin-transform-parameters-7.16.7"
       sources."@babel/plugin-transform-property-literals-7.16.7"
-      sources."@babel/plugin-transform-regenerator-7.16.7"
+      sources."@babel/plugin-transform-regenerator-7.17.9"
       sources."@babel/plugin-transform-reserved-words-7.16.7"
       sources."@babel/plugin-transform-shorthand-properties-7.16.7"
       sources."@babel/plugin-transform-spread-7.16.7"
@@ -78200,9 +78108,9 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@hapi/hoek-9.2.1"
       sources."@hapi/topo-5.1.0"
@@ -78499,7 +78407,7 @@ in
       sources."easy-stack-1.0.1"
       sources."ee-first-1.1.1"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -78604,7 +78512,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."flow-parser-0.175.0"
+      sources."flow-parser-0.175.1"
       sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forwarded-0.2.0"
@@ -78939,7 +78847,7 @@ in
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
-      sources."regenerator-transform-0.14.5"
+      sources."regenerator-transform-0.15.0"
       sources."regex-not-1.0.2"
       sources."regexpu-core-5.0.1"
       sources."regjsgen-0.6.0"
@@ -78972,7 +78880,11 @@ in
           sources."commander-2.20.3"
         ];
       })
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."send-0.17.2" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -79342,10 +79254,10 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/template-7.16.7"
       sources."@babel/types-7.17.0"
       sources."@webassemblyjs/ast-1.11.1"
@@ -79423,7 +79335,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/acorn-4.0.6"
@@ -79761,7 +79673,11 @@ in
       sources."retext-profanities-7.1.0"
       sources."sade-1.8.1"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -79912,16 +79828,15 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      sources."@babel/core-7.17.8"
-      (sources."@babel/generator-7.17.7" // {
+      sources."@babel/core-7.17.9"
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-compilation-targets-7.17.7"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
@@ -79929,16 +79844,16 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
       sources."@jridgewell/trace-mapping-0.3.4"
-      sources."@xmldom/xmldom-0.8.1"
+      sources."@xmldom/xmldom-0.8.2"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -79956,7 +79871,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."debug-4.3.4"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -80333,7 +80248,7 @@ in
     dependencies = [
       sources."browserslist-4.20.2"
       sources."caniuse-lite-1.0.30001325"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."escalade-3.1.1"
       sources."fraction.js-4.2.0"
       sources."node-releases-2.0.2"
@@ -80368,7 +80283,7 @@ in
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.1107.0" // {
+      (sources."aws-sdk-2.1110.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -80410,7 +80325,7 @@ in
       sources."depd-2.0.0"
       sources."devtools-protocol-0.0.901419"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."emoji-regex-8.0.0"
@@ -80576,7 +80491,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -80761,7 +80676,8 @@ in
       sources."nice-try-1.0.5"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."normalize-url-4.5.1"
@@ -80986,10 +80902,10 @@ in
   balanceofsatoshis = nodeEnv.buildNodePackage {
     name = "balanceofsatoshis";
     packageName = "balanceofsatoshis";
-    version = "11.64.1";
+    version = "11.64.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.64.1.tgz";
-      sha512 = "k8ft+Al3mYVW9hfQ2JjkKIrbUmIyhZzjUqHz16ieo/4ggWMPr8WxKiiz7ZuPgG/kog8XY0RlkFT2F0/9Ej9gdg==";
+      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.64.2.tgz";
+      sha512 = "sYju0HhL1tlxwa85jBioJZ7Cgbzbuy8Xx2MrE084KZ/00KEfVOMEEKoAjtKIK4BanQCeDA/EzuBjEksDx8K9Ag==";
     };
     dependencies = [
       (sources."@alexbosworth/caporal-1.4.1" // {
@@ -80998,7 +80914,7 @@ in
         ];
       })
       sources."@alexbosworth/cli-table3-0.6.1"
-      sources."@alexbosworth/fiat-1.0.1"
+      sources."@alexbosworth/fiat-1.0.2"
       sources."@alexbosworth/html2unicode-1.1.5"
       sources."@alexbosworth/node-fetch-2.6.2"
       (sources."@alexbosworth/prettyjson-1.2.2" // {
@@ -81014,7 +80930,7 @@ in
         ];
       })
       sources."@grammyjs/types-2.6.0"
-      sources."@grpc/grpc-js-1.5.7"
+      sources."@grpc/grpc-js-1.6.1"
       sources."@grpc/proto-loader-0.6.9"
       sources."@handsontable/formulajs-2.0.2"
       sources."@mitmaro/errors-1.0.0"
@@ -81044,7 +80960,7 @@ in
       sources."@types/request-2.48.8"
       sources."@types/serve-static-1.13.10"
       sources."@types/tough-cookie-4.0.1"
-      sources."@types/ws-8.5.2"
+      sources."@types/ws-8.5.3"
       sources."abort-controller-3.0.0"
       sources."accepts-1.3.8"
       (sources."agent-base-6.0.2" // {
@@ -81064,22 +80980,14 @@ in
       sources."asciichart-1.5.25"
       sources."astral-regex-2.0.0"
       sources."async-3.2.3"
-      sources."asyncjs-util-1.2.8"
+      sources."asyncjs-util-1.2.9"
       sources."asynckit-0.4.0"
       sources."base-x-3.0.9"
       sources."base64-js-1.5.1"
       sources."basic-auth-2.0.1"
       sources."bech32-2.0.0"
       sources."bessel-1.0.2"
-      sources."bindings-1.5.0"
       sources."bip174-2.0.1"
-      (sources."bip32-2.0.6" // {
-        dependencies = [
-          sources."@types/node-10.12.18"
-          sources."bn.js-4.12.0"
-          sources."tiny-secp256k1-1.1.6"
-        ];
-      })
       sources."bip65-1.0.3"
       sources."bip66-1.1.5"
       sources."bip68-1.0.4"
@@ -81092,11 +81000,11 @@ in
       })
       sources."bluebird-3.7.2"
       sources."bn.js-5.2.0"
-      sources."body-parser-1.19.2"
-      sources."bolt01-1.2.3"
-      sources."bolt03-1.2.13"
-      sources."bolt07-1.8.0"
-      sources."bolt09-0.2.2"
+      sources."body-parser-1.20.0"
+      sources."bolt01-1.2.4"
+      sources."bolt03-1.2.14"
+      sources."bolt07-1.8.1"
+      sources."bolt09-0.2.1"
       (sources."boxen-5.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -81105,7 +81013,6 @@ in
           sources."type-fest-0.20.2"
         ];
       })
-      sources."brorand-1.1.0"
       sources."bs58-4.0.1"
       sources."bs58check-2.1.2"
       sources."buffer-5.7.1"
@@ -81118,6 +81025,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."cbor-8.1.0"
       (sources."chalk-1.1.3" // {
@@ -81156,7 +81064,6 @@ in
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
       sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
       sources."crypto-js-4.1.1"
       sources."crypto-random-string-2.0.0"
       sources."csv-parse-5.0.4"
@@ -81169,17 +81076,12 @@ in
       sources."define-property-1.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
       sources."ecpair-2.0.1"
       sources."ee-first-1.1.1"
-      (sources."elliptic-6.5.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -81192,7 +81094,14 @@ in
       sources."exit-hook-1.1.1"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       sources."extend-3.0.2"
@@ -81201,18 +81110,34 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-levenshtein-2.0.6"
       sources."figures-1.7.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."form-data-2.5.1"
       sources."forwarded-0.2.0"
       sources."fresh-0.5.2"
+      sources."function-bind-1.1.1"
       sources."gauge-1.2.7"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
-      sources."global-dirs-3.0.0"
-      (sources."goldengate-11.1.0" // {
+      (sources."global-dirs-3.0.0" // {
         dependencies = [
-          sources."ln-service-53.9.3"
+          sources."ini-2.0.0"
+        ];
+      })
+      (sources."goldengate-11.1.1" // {
+        dependencies = [
+          sources."bolt07-1.8.0"
+          (sources."invoices-2.0.4" // {
+            dependencies = [
+              sources."tiny-secp256k1-2.2.0"
+            ];
+          })
+          sources."ln-service-53.10.0"
         ];
       })
       sources."got-9.6.0"
@@ -81223,12 +81148,14 @@ in
           sources."ms-2.1.2"
         ];
       })
+      sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
         ];
       })
       sources."has-flag-4.0.0"
+      sources."has-symbols-1.0.3"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
       (sources."hash-base-3.1.0" // {
@@ -81237,17 +81164,15 @@ in
           sources."safe-buffer-5.2.1"
         ];
       })
-      sources."hash.js-1.1.7"
-      sources."hmac-drbg-1.0.1"
       sources."hot-formula-parser-4.0.0"
       sources."http-cache-semantics-4.1.0"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."import-lazy-4.0.0"
       sources."imurmurhash-0.1.4"
       sources."inherits-2.0.4"
-      sources."ini-2.0.0"
+      sources."ini-3.0.0"
       (sources."inquirer-8.2.2" // {
         dependencies = [
           sources."ansi-escapes-4.3.2"
@@ -81265,11 +81190,9 @@ in
           sources."type-fest-0.21.3"
         ];
       })
-      (sources."invoices-2.0.4" // {
+      (sources."invoices-2.0.5" // {
         dependencies = [
-          sources."bolt09-0.2.1"
-          sources."tiny-secp256k1-2.2.0"
-          sources."uint8array-tools-0.0.6"
+          sources."bolt09-0.2.2"
         ];
       })
       sources."ip-1.1.5"
@@ -81297,100 +81220,133 @@ in
       sources."isstream-0.1.2"
       sources."json-buffer-3.0.0"
       sources."json-schema-traverse-1.0.0"
-      sources."json2csv-5.0.6"
+      sources."json2csv-5.0.7"
       sources."jsonparse-1.3.1"
       sources."jstat-1.9.5"
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
       sources."latest-version-5.1.0"
-      (sources."lightning-5.8.2" // {
+      (sources."lightning-5.9.0" // {
         dependencies = [
+          sources."asyncjs-util-1.2.8"
+          sources."body-parser-1.19.2"
+          sources."bolt07-1.8.0"
+          sources."bolt09-0.2.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          (sources."invoices-2.0.4" // {
+            dependencies = [
+              sources."bolt09-0.2.1"
+              sources."tiny-secp256k1-2.2.0"
+            ];
+          })
+          sources."on-finished-2.3.0"
+          sources."psbt-2.0.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
+          sources."statuses-1.5.0"
+        ];
+      })
+      (sources."ln-accounting-5.0.6" // {
+        dependencies = [
+          sources."@grpc/grpc-js-1.5.7"
           sources."@types/node-17.0.21"
-        ];
-      })
-      (sources."ln-accounting-5.0.5" // {
-        dependencies = [
-          sources."@grpc/grpc-js-1.4.4"
-          sources."@grpc/proto-loader-0.6.6"
-          sources."@types/node-16.11.7"
-          sources."@types/request-2.48.7"
-          sources."@types/ws-8.2.0"
-          sources."async-3.2.2"
-          sources."asyncjs-util-1.2.7"
-          sources."bech32-1.1.4"
-          sources."bitcoinjs-lib-6.0.0"
-          sources."bn.js-4.12.0"
-          sources."body-parser-1.19.0"
-          (sources."bolt07-1.7.4" // {
+          sources."@types/ws-8.5.2"
+          sources."body-parser-1.19.2"
+          sources."bolt07-1.8.0"
+          sources."bolt09-0.2.2"
+          sources."depd-1.1.2"
+          (sources."goldengate-11.1.0" // {
             dependencies = [
-              sources."bn.js-5.2.0"
+              sources."asyncjs-util-1.2.8"
+              sources."ln-service-53.9.3"
             ];
           })
-          sources."bolt09-0.2.0"
-          sources."bytes-3.1.0"
-          sources."content-disposition-0.5.3"
-          sources."cookie-0.4.0"
-          sources."ecpair-1.0.1"
-          sources."express-4.17.1"
-          sources."goldengate-10.4.2"
-          sources."http-errors-1.7.2"
-          sources."inherits-2.0.3"
-          (sources."invoices-2.0.2" // {
+          sources."http-errors-1.8.1"
+          sources."invoices-2.0.4"
+          (sources."lightning-5.8.2" // {
             dependencies = [
-              sources."bech32-2.0.0"
-              sources."bn.js-5.2.0"
+              sources."asyncjs-util-1.2.8"
+              sources."tiny-secp256k1-2.2.1"
             ];
           })
-          (sources."lightning-4.14.3" // {
+          (sources."ln-service-53.10.0" // {
             dependencies = [
-              sources."bech32-2.0.0"
-              sources."bn.js-5.2.0"
-              (sources."invoices-2.0.1" // {
-                dependencies = [
-                  (sources."bitcoinjs-lib-5.2.0" // {
-                    dependencies = [
-                      sources."bech32-1.1.4"
-                    ];
-                  })
-                ];
-              })
+              sources."@grpc/grpc-js-1.6.1"
+              sources."@types/node-17.0.23"
+              sources."@types/ws-8.5.3"
+              sources."asyncjs-util-1.2.8"
+              sources."lightning-5.9.0"
+              sources."tiny-secp256k1-2.2.1"
+              sources."type-fest-2.12.2"
             ];
           })
-          sources."ln-service-52.16.0"
-          sources."ms-2.1.1"
-          (sources."psbt-1.1.10" // {
+          sources."on-finished-2.3.0"
+          (sources."p2tr-1.3.0" // {
             dependencies = [
-              sources."bitcoinjs-lib-5.2.0"
-              sources."bn.js-5.2.0"
+              sources."tiny-secp256k1-2.2.1"
             ];
           })
-          sources."qs-6.7.0"
-          sources."raw-body-2.4.0"
-          sources."send-0.17.1"
-          sources."serve-static-1.14.1"
-          sources."setprototypeof-1.1.1"
-          sources."tiny-secp256k1-1.1.6"
-          sources."toidentifier-1.0.0"
-          sources."ws-8.2.3"
+          sources."psbt-2.0.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
+          sources."statuses-1.5.0"
+          sources."tiny-secp256k1-2.2.0"
+          sources."type-fest-2.12.0"
+          sources."uint8array-tools-0.0.7"
         ];
       })
-      (sources."ln-service-53.9.4" // {
+      (sources."ln-service-53.11.0" // {
         dependencies = [
-          sources."@grpc/grpc-js-1.6.1"
-          sources."@types/ws-8.5.3"
-          sources."lightning-5.8.6"
-          sources."type-fest-2.12.2"
+          sources."@grpc/grpc-js-1.6.2"
+          sources."bolt09-0.2.3"
+          sources."lightning-5.10.1"
         ];
       })
-      (sources."ln-sync-3.11.0" // {
+      (sources."ln-sync-3.12.0" // {
         dependencies = [
-          sources."ln-service-53.9.3"
+          (sources."invoices-2.0.4" // {
+            dependencies = [
+              sources."bolt07-1.8.0"
+              sources."tiny-secp256k1-2.2.0"
+            ];
+          })
+          (sources."ln-service-53.10.0" // {
+            dependencies = [
+              sources."bolt07-1.8.0"
+            ];
+          })
         ];
       })
-      (sources."ln-telegram-3.21.0" // {
+      (sources."ln-telegram-3.21.1" // {
         dependencies = [
-          sources."ln-service-53.9.3"
-          sources."paid-services-3.14.4"
+          sources."body-parser-1.19.2"
+          sources."bolt07-1.8.0"
+          sources."bolt09-0.2.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."invoices-2.0.4"
+          (sources."lightning-5.8.6" // {
+            dependencies = [
+              sources."asyncjs-util-1.2.8"
+              sources."tiny-secp256k1-2.2.1"
+            ];
+          })
+          sources."ln-service-53.10.0"
+          (sources."ln-sync-3.11.1" // {
+            dependencies = [
+              sources."asyncjs-util-1.2.8"
+              sources."ln-service-53.9.4"
+              sources."tiny-secp256k1-2.2.1"
+            ];
+          })
+          sources."on-finished-2.3.0"
+          sources."psbt-2.0.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
+          sources."statuses-1.5.0"
+          sources."tiny-secp256k1-2.2.0"
+          sources."uint8array-tools-0.0.7"
         ];
       })
       sources."lodash-4.17.21"
@@ -81411,7 +81367,7 @@ in
       })
       sources."long-4.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."luxon-2.3.1"
       sources."macaroon-3.0.4"
       (sources."make-dir-3.1.0" // {
@@ -81422,7 +81378,6 @@ in
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
-      sources."merkle-lib-2.0.10"
       sources."methods-1.1.2"
       sources."micromist-1.1.0"
       sources."mime-1.6.0"
@@ -81430,29 +81385,25 @@ in
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       (sources."morgan-1.10.0" // {
         dependencies = [
-          sources."depd-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.6"
-      sources."nan-2.15.0"
       sources."negotiator-0.6.3"
-      sources."node-addon-api-2.0.2"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.4.0"
       sources."nofilter-3.1.0"
       sources."normalize-url-4.5.1"
       sources."npmlog-2.0.4"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-1.1.0"
@@ -81469,54 +81420,65 @@ in
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
-      sources."p2tr-1.3.0"
+      sources."p2tr-1.3.1"
       (sources."package-json-6.5.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      sources."paid-services-3.14.5"
+      (sources."paid-services-3.14.5" // {
+        dependencies = [
+          sources."@alexbosworth/fiat-1.0.1"
+          sources."@grpc/grpc-js-1.5.7"
+          sources."@types/node-17.0.21"
+          sources."@types/ws-8.5.2"
+          sources."asyncjs-util-1.2.8"
+          sources."body-parser-1.19.2"
+          sources."bolt01-1.2.3"
+          sources."bolt07-1.8.0"
+          sources."bolt09-0.2.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          (sources."invoices-2.0.4" // {
+            dependencies = [
+              sources."tiny-secp256k1-2.2.0"
+            ];
+          })
+          sources."lightning-5.8.6"
+          sources."ln-service-53.9.4"
+          (sources."ln-sync-3.11.0" // {
+            dependencies = [
+              sources."lightning-5.8.2"
+              sources."ln-service-53.9.3"
+            ];
+          })
+          sources."on-finished-2.3.0"
+          sources."psbt-2.0.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
+          sources."statuses-1.5.0"
+          sources."type-fest-2.12.0"
+        ];
+      })
       sources."parseurl-1.3.3"
       sources."path-to-regexp-0.1.7"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-2.0.0"
-      (sources."probing-2.0.3" // {
-        dependencies = [
-          sources."@grpc/grpc-js-1.5.4"
-          sources."@types/node-17.0.15"
-          sources."@types/ws-8.2.2"
-          sources."body-parser-1.19.1"
-          sources."bolt09-0.2.1"
-          sources."bytes-3.1.1"
-          sources."cookie-0.4.1"
-          sources."express-4.17.2"
-          sources."invoices-2.0.3"
-          sources."lightning-5.6.2"
-          sources."ln-service-53.7.3"
-          sources."qs-6.9.6"
-          sources."raw-body-2.4.2"
-          sources."safe-buffer-5.2.1"
-          sources."secp256k1-4.0.3"
-          sources."tiny-secp256k1-2.2.0"
-          sources."type-fest-2.11.1"
-          sources."uint8array-tools-0.0.6"
-          sources."ws-8.4.2"
-        ];
-      })
+      sources."probing-2.0.5"
       sources."process-nextick-args-2.0.1"
       sources."protobufjs-6.11.2"
       sources."proxy-addr-2.0.7"
-      sources."psbt-2.0.0"
+      sources."psbt-2.0.1"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."pupa-2.1.1"
       sources."pushdata-bitcoin-1.0.1"
       sources."qrcode-terminal-0.12.0"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."ini-1.3.8"
@@ -81536,8 +81498,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sanitize-filename-1.6.3"
-      sources."secp256k1-4.0.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -81545,12 +81506,18 @@ in
       })
       (sources."send-0.17.2" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."serve-static-1.14.2"
       sources."setprototypeof-1.2.0"
       sources."sha.js-2.4.11"
+      sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
       sources."sjcl-1.0.8"
       (sources."slice-ansi-4.0.0" // {
@@ -81568,7 +81535,7 @@ in
       })
       sources."spawn-sync-1.0.15"
       sources."stack-trace-0.0.10"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."string-width-4.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.1"
@@ -81586,7 +81553,11 @@ in
       })
       sources."through-2.3.8"
       sources."tiny-emitter-2.1.0"
-      sources."tiny-secp256k1-2.2.1"
+      (sources."tiny-secp256k1-2.2.1" // {
+        dependencies = [
+          sources."uint8array-tools-0.0.7"
+        ];
+      })
       sources."tmp-0.0.29"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.1"
@@ -81595,12 +81566,12 @@ in
       sources."tslib-2.3.1"
       sources."tweetnacl-1.0.3"
       sources."tweetnacl-util-0.15.1"
-      sources."type-fest-2.12.0"
+      sources."type-fest-2.12.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
       sources."typeforce-1.18.0"
-      sources."uint8array-tools-0.0.7"
+      sources."uint8array-tools-0.0.6"
       sources."unique-string-2.0.0"
       sources."unpipe-1.0.0"
       (sources."update-notifier-5.1.0" // {
@@ -81640,7 +81611,6 @@ in
       sources."ws-8.5.0"
       sources."xdg-basedir-4.0.0"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-16.2.0"
       sources."yargs-parser-20.2.9"
     ];
@@ -81838,7 +81808,7 @@ in
           sources."domhandler-4.3.1"
         ];
       })
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-3.3.0"
       (sources."domutils-2.8.0" // {
         dependencies = [
@@ -82586,8 +82556,8 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@kwsites/file-exists-1.1.1"
       sources."@kwsites/promise-deferred-1.1.1"
@@ -82946,7 +82916,11 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."send-0.17.2" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -84085,7 +84059,7 @@ in
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@types/node-12.20.47"
-      sources."@xmldom/xmldom-0.8.1"
+      sources."@xmldom/xmldom-0.8.2"
       sources."ajv-8.11.0"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
@@ -84095,8 +84069,8 @@ in
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdk8s-1.5.62"
-      sources."cdk8s-plus-22-1.0.0-beta.180"
+      sources."cdk8s-1.5.64"
+      sources."cdk8s-plus-22-1.0.0-beta.181"
       sources."chalk-4.1.2"
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
@@ -84109,7 +84083,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.30.0"
-      sources."constructs-3.3.259"
+      sources."constructs-3.3.261"
       sources."date-format-4.0.6"
       sources."debug-4.3.4"
       sources."decamelize-5.0.1"
@@ -84196,20 +84170,20 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.521" // {
+      (sources."jsii-srcmak-0.1.523" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.4.0"
       sources."json-schema-traverse-1.0.0"
-      sources."json2jsii-0.2.181"
+      sources."json2jsii-0.2.183"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
       sources."log4js-6.4.4"
       sources."lower-case-2.0.2"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."mdurl-1.0.1"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
@@ -84236,7 +84210,7 @@ in
       sources."reusify-1.0.4"
       sources."rfdc-1.3.0"
       sources."run-parallel-1.2.0"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -84247,7 +84221,7 @@ in
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.1"
       sources."spdx-license-list-6.5.0"
-      sources."sscaff-1.2.248"
+      sources."sscaff-1.2.250"
       (sources."streamroller-3.0.6" // {
         dependencies = [
           sources."fs-extra-10.0.1"
@@ -84273,7 +84247,6 @@ in
       sources."wrap-ansi-7.0.0"
       sources."xmlbuilder-15.1.1"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yaml-2.0.0-11"
       (sources."yargs-15.4.1" // {
         dependencies = [
@@ -84306,10 +84279,10 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/template-7.16.7"
       sources."@babel/types-7.17.0"
       sources."@cdktf/hcl2cdk-0.10.1"
@@ -84331,7 +84304,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       sources."@types/node-17.0.23"
       sources."@types/node-fetch-2.6.1"
-      sources."@xmldom/xmldom-0.8.1"
+      sources."@xmldom/xmldom-0.8.2"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-3.2.1"
       sources."arr-rotate-1.0.0"
@@ -84358,7 +84331,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commonmark-0.30.0"
       sources."concat-map-0.0.1"
-      sources."constructs-10.0.106"
+      sources."constructs-10.0.108"
       sources."date-format-4.0.6"
       sources."debug-4.3.4"
       sources."decamelize-1.2.0"
@@ -84501,7 +84474,7 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-srcmak-0.1.521" // {
+      (sources."jsii-srcmak-0.1.523" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -84514,7 +84487,7 @@ in
       sources."locate-path-5.0.0"
       sources."lodash.isequal-4.5.0"
       sources."log4js-6.4.4"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."mdurl-1.0.1"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
@@ -84554,7 +84527,7 @@ in
       sources."rfdc-1.3.0"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -84602,7 +84575,6 @@ in
       sources."wrappy-1.0.2"
       sources."xmlbuilder-15.1.1"
       sources."y18n-4.0.3"
-      sources."yallist-4.0.0"
       (sources."yargs-17.4.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -84691,7 +84663,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@types/minimist-1.2.2"
       sources."@types/normalize-package-data-2.4.1"
       sources."ansi-styles-3.2.1"
@@ -84755,7 +84727,11 @@ in
       sources."read-pkg-6.0.0"
       sources."read-pkg-up-8.0.0"
       sources."redent-4.0.0"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
@@ -85339,7 +85315,7 @@ in
       })
       sources."lodash-4.17.21"
       sources."log4js-6.4.4"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."metals-languageclient-0.4.2"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
@@ -85381,7 +85357,7 @@ in
       sources."rfdc-1.3.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."setimmediate-1.0.5"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -85633,12 +85609,11 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      sources."@babel/core-7.17.8"
-      sources."@babel/generator-7.17.7"
+      sources."@babel/core-7.17.9"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-compilation-targets-7.17.7"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
@@ -85646,15 +85621,15 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      (sources."@babel/highlight-7.16.10" // {
+      sources."@babel/helpers-7.17.9"
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
@@ -85722,14 +85697,14 @@ in
       sources."dir-glob-3.0.1"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."entities-2.2.0"
         ];
       })
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -85763,7 +85738,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-4.1.0"
-      sources."html-tags-3.1.0"
+      sources."html-tags-3.2.0"
       sources."htmlparser2-3.10.1"
       sources."ignore-5.2.0"
       (sources."import-fresh-3.3.0" // {
@@ -85828,7 +85803,8 @@ in
       sources."node-releases-2.0.2"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."normalize-range-0.1.2"
@@ -86013,7 +85989,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.2"
@@ -86100,10 +86076,10 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.9.15";
+    version = "1.9.16";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.15.tgz";
-      sha512 = "7mvLHnOqiXl0sk6mq78SmdIYL0nouIzejpTDgRlRjUrAXTCqXfpFVqfJg+2xASpcGTR5nH1lYMk/LXRrnFltIw==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.16.tgz";
+      sha512 = "aTEVdLHrxbvlw1EctzSIzATXk10NBskOXk15LA6gCFsLC8sctzf437BHr+IfW5Le4kCTb4+Nrr+RYMl2+i7EAw==";
     };
     dependencies = [
       sources."typescript-4.6.3"
@@ -86147,7 +86123,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.12.11"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
           sources."escape-string-regexp-1.0.5"
@@ -86259,7 +86235,7 @@ in
       sources."lodash-4.17.21"
       sources."lodash.merge-4.6.2"
       sources."lodash.truncate-4.4.2"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
@@ -86283,7 +86259,7 @@ in
       sources."resolve-1.22.0"
       sources."resolve-from-4.0.0"
       sources."rimraf-3.0.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       (sources."slice-ansi-4.0.0" // {
@@ -86331,7 +86307,6 @@ in
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -86787,7 +86762,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@hutson/parse-repository-url-3.0.2"
       sources."@types/minimist-1.2.2"
       sources."@types/normalize-package-data-2.4.1"
@@ -86918,7 +86893,8 @@ in
       sources."neo-async-2.6.2"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."p-limit-1.3.0"
@@ -87480,7 +87456,11 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -87613,7 +87593,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -87686,7 +87666,8 @@ in
       sources."nested-error-stacks-2.1.1"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."p-event-4.2.0"
@@ -87783,7 +87764,7 @@ in
       sources."debug-3.2.7"
       sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
       (sources."es6-set-0.1.5" // {
@@ -87939,7 +87920,7 @@ in
       sources."isexe-2.0.0"
       sources."jsonfile-6.1.0"
       sources."kleur-3.0.3"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
@@ -87952,7 +87933,7 @@ in
       sources."readable-stream-1.1.14"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."sisteransi-1.0.5"
@@ -87983,7 +87964,6 @@ in
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -88024,7 +88004,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -88039,9 +88019,9 @@ in
       sources."@cspell/cspell-types-5.19.5"
       sources."@cspell/dict-ada-2.0.0"
       sources."@cspell/dict-aws-2.0.0"
-      sources."@cspell/dict-bash-2.0.1"
+      sources."@cspell/dict-bash-2.0.2"
       sources."@cspell/dict-companies-2.0.3"
-      sources."@cspell/dict-cpp-2.0.0"
+      sources."@cspell/dict-cpp-2.0.1"
       sources."@cspell/dict-cryptocurrencies-2.0.0"
       sources."@cspell/dict-csharp-2.0.1"
       sources."@cspell/dict-css-2.0.0"
@@ -88104,7 +88084,7 @@ in
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."fast-equals-3.0.0"
+      sources."fast-equals-3.0.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."file-entry-cache-6.0.1"
       sources."fill-range-7.0.1"
@@ -88139,7 +88119,7 @@ in
       sources."jsonfile-6.1.0"
       sources."lines-and-columns-1.2.4"
       sources."locate-path-6.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -88160,7 +88140,7 @@ in
       sources."resolve-from-5.0.0"
       sources."resolve-global-1.0.0"
       sources."rimraf-3.0.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."signal-exit-3.0.7"
       sources."strip-ansi-6.0.1"
       sources."supports-color-7.2.0"
@@ -88173,7 +88153,6 @@ in
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
-      sources."yallist-4.0.0"
       sources."yaml-1.10.2"
       sources."yocto-queue-0.1.0"
     ];
@@ -88855,14 +88834,14 @@ in
   "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage {
     name = "deltachat-desktop";
     packageName = "deltachat-desktop";
-    version = "1.28.1";
+    version = "1.28.2";
     src = ../../applications/networking/instant-messengers/deltachat-desktop;
     dependencies = [
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      sources."@babel/core-7.17.8"
-      (sources."@babel/generator-7.17.7" // {
+      sources."@babel/core-7.17.9"
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -88870,13 +88849,12 @@ in
       sources."@babel/helper-annotate-as-pure-7.16.7"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7"
       sources."@babel/helper-compilation-targets-7.17.7"
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-create-regexp-features-plugin-7.17.0"
       sources."@babel/helper-define-polyfill-provider-0.3.1"
       sources."@babel/helper-environment-visitor-7.16.7"
       sources."@babel/helper-explode-assignable-expression-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -88891,9 +88869,9 @@ in
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
       sources."@babel/helper-wrap-function-7.16.8"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -88941,7 +88919,7 @@ in
       sources."@babel/plugin-transform-literals-7.16.7"
       sources."@babel/plugin-transform-member-expression-literals-7.16.7"
       sources."@babel/plugin-transform-modules-amd-7.16.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.17.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.17.9"
       sources."@babel/plugin-transform-modules-systemjs-7.17.8"
       sources."@babel/plugin-transform-modules-umd-7.16.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8"
@@ -88953,7 +88931,7 @@ in
       sources."@babel/plugin-transform-react-jsx-7.17.3"
       sources."@babel/plugin-transform-react-jsx-development-7.16.7"
       sources."@babel/plugin-transform-react-pure-annotations-7.16.7"
-      sources."@babel/plugin-transform-regenerator-7.16.7"
+      sources."@babel/plugin-transform-regenerator-7.17.9"
       sources."@babel/plugin-transform-reserved-words-7.16.7"
       sources."@babel/plugin-transform-shorthand-properties-7.16.7"
       sources."@babel/plugin-transform-spread-7.16.7"
@@ -88965,11 +88943,11 @@ in
       sources."@babel/preset-env-7.16.11"
       sources."@babel/preset-modules-0.1.5"
       sources."@babel/preset-react-7.16.7"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
-      sources."@blueprintjs/colors-4.0.2"
+      sources."@blueprintjs/colors-4.0.5"
       sources."@blueprintjs/core-3.54.0"
       sources."@blueprintjs/icons-3.33.0"
       sources."@deltachat/message_parser_wasm-0.3.0"
@@ -89003,7 +88981,7 @@ in
       sources."@types/minimist-1.2.2"
       sources."@types/node-14.18.12"
       sources."@types/node-fetch-2.6.1"
-      sources."@types/prop-types-15.7.4"
+      sources."@types/prop-types-15.7.5"
       sources."@types/rc-1.2.1"
       sources."@types/react-16.14.24"
       sources."@types/react-dom-16.9.14"
@@ -89125,7 +89103,7 @@ in
       sources."duplexer3-0.1.4"
       sources."earcut-2.2.3"
       sources."electron-14.2.9"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-js-clean-4.0.0"
       sources."emoji-mart-3.0.1"
       sources."emoji-regex-9.2.2"
@@ -89206,7 +89184,7 @@ in
       sources."glob-watcher-5.0.5"
       (sources."global-agent-3.0.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."global-tunnel-ng-2.7.1"
@@ -89272,7 +89250,7 @@ in
       sources."lodash.debounce-4.0.8"
       sources."loose-envify-1.4.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       (sources."mapbox-gl-1.13.2" // {
@@ -89380,7 +89358,7 @@ in
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
-      sources."regenerator-transform-0.14.5"
+      sources."regenerator-transform-0.15.0"
       sources."regex-not-1.0.2"
       sources."regexp.prototype.flags-1.4.1"
       sources."regexpu-core-5.0.1"
@@ -89404,7 +89382,7 @@ in
       sources."rw-0.1.4"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
-      (sources."sass-1.49.11" // {
+      (sources."sass-1.50.0" // {
         dependencies = [
           sources."anymatch-3.1.2"
           sources."binary-extensions-2.2.0"
@@ -89495,7 +89473,7 @@ in
       sources."string_decoder-1.3.0"
       sources."strip-json-comments-2.0.1"
       sources."sumchecker-3.0.1"
-      sources."supercluster-7.1.4"
+      sources."supercluster-7.1.5"
       sources."supports-color-5.5.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."temp-dir-1.0.0"
@@ -89549,7 +89527,6 @@ in
       sources."whatwg-url-5.0.0"
       sources."wrappy-1.0.2"
       sources."xml-js-1.6.11"
-      sources."yallist-4.0.0"
       sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -90171,7 +90148,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jsprim-1.4.2"
       sources."junk-3.1.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
       sources."lodash-4.17.21"
@@ -90316,7 +90293,11 @@ in
       sources."rxjs-7.5.5"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."semver-compare-1.0.0"
       sources."serialize-error-7.0.1"
       sources."set-blocking-2.0.0"
@@ -90458,12 +90439,12 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-annotate-as-pure-7.16.7"
       (sources."@babel/helper-compilation-targets-7.17.7" // {
         dependencies = [
@@ -90471,8 +90452,7 @@ in
         ];
       })
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
@@ -90481,9 +90461,9 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-proposal-object-rest-spread-7.17.3"
       sources."@babel/plugin-syntax-jsx-7.16.7"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -90491,7 +90471,7 @@ in
       sources."@babel/plugin-transform-parameters-7.16.7"
       sources."@babel/plugin-transform-react-jsx-7.17.3"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
@@ -90534,7 +90514,7 @@ in
       sources."concat-map-0.0.1"
       (sources."conf-7.1.2" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."convert-source-map-1.8.0"
@@ -90549,7 +90529,7 @@ in
         ];
       })
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -90618,7 +90598,7 @@ in
       sources."locate-path-3.0.0"
       sources."lodash-4.17.21"
       sources."loose-envify-1.4.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -90744,7 +90724,6 @@ in
       })
       sources."wrappy-1.0.2"
       sources."ws-7.5.7"
-      sources."yallist-4.0.0"
       sources."yargs-parser-18.1.3"
       sources."yoga-layout-prebuilt-1.10.0"
     ];
@@ -90783,7 +90762,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.12.11"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -90817,7 +90796,7 @@ in
       sources."@fluentui/foundation-legacy-8.2.5"
       sources."@fluentui/keyboard-key-0.4.0"
       sources."@fluentui/merge-styles-8.5.0"
-      sources."@fluentui/react-8.64.0"
+      sources."@fluentui/react-8.64.1"
       sources."@fluentui/react-focus-8.5.6"
       sources."@fluentui/react-hooks-8.5.3"
       sources."@fluentui/react-window-provider-2.2.0"
@@ -90844,7 +90823,7 @@ in
         ];
       })
       sources."@humanwhocodes/object-schema-1.2.1"
-      sources."@microsoft/load-themed-styles-1.10.250"
+      sources."@microsoft/load-themed-styles-1.10.251"
       sources."@node-rs/crc32-1.5.0"
       sources."@node-rs/crc32-android-arm-eabi-1.5.0"
       sources."@node-rs/crc32-android-arm64-1.5.0"
@@ -91247,7 +91226,7 @@ in
       sources."enhanced-resolve-5.9.2"
       sources."enquirer-2.3.6"
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
@@ -91648,7 +91627,7 @@ in
       })
       sources."loose-envify-1.4.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."lru-queue-0.1.0"
       sources."make-error-1.3.6"
       sources."make-iterator-1.0.1"
@@ -91681,11 +91660,7 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.5"
-      (sources."minipass-2.9.0" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       (sources."mirakurun-3.9.0-beta.26" // {
         dependencies = [
@@ -92032,7 +92007,7 @@ in
       sources."saslprep-1.0.3"
       sources."sax-1.2.4"
       sources."scheduler-0.20.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."semver-greatest-satisfied-range-1.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -92177,7 +92152,6 @@ in
           sources."minimist-1.2.6"
           sources."mkdirp-0.5.6"
           sources."safe-buffer-5.2.1"
-          sources."yallist-3.1.1"
         ];
       })
       sources."text-table-0.2.0"
@@ -92319,7 +92293,7 @@ in
       sources."xmlbuilder-11.0.1"
       sources."xtend-4.0.2"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
+      sources."yallist-3.1.1"
       (sources."yargonaut-1.1.4" // {
         dependencies = [
           sources."ansi-styles-2.2.1"
@@ -92360,7 +92334,7 @@ in
       sources."@achrinza/node-ipc-9.2.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       (sources."@eslint/eslintrc-0.4.3" // {
         dependencies = [
           sources."acorn-7.4.1"
@@ -92536,7 +92510,6 @@ in
         dependencies = [
           sources."lru-cache-5.1.1"
           sources."semver-6.3.0"
-          sources."yallist-3.1.1"
         ];
       })
       (sources."@vue/component-compiler-utils-3.3.0" // {
@@ -92695,7 +92668,6 @@ in
       (sources."cacache-12.0.4" // {
         dependencies = [
           sources."lru-cache-5.1.1"
-          sources."yallist-3.1.1"
         ];
       })
       sources."cache-base-1.0.1"
@@ -92946,14 +92918,14 @@ in
       sources."dom-converter-0.2.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       (sources."domhandler-4.3.1" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domutils-1.7.0"
@@ -92966,7 +92938,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -93257,7 +93229,7 @@ in
       (sources."htmlparser2-6.1.0" // {
         dependencies = [
           sources."dom-serializer-1.3.2"
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."domutils-2.8.0"
         ];
       })
@@ -93403,7 +93375,7 @@ in
       sources."log-symbols-2.2.0"
       sources."loglevel-1.8.0"
       sources."lower-case-1.1.4"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-2.1.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -93446,7 +93418,11 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
-      sources."minipass-3.1.6"
+      (sources."minipass-3.1.6" // {
+        dependencies = [
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -93760,7 +93736,7 @@ in
           sources."css-select-4.3.0"
           sources."css-what-6.1.0"
           sources."dom-serializer-1.3.2"
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."domutils-2.8.0"
           sources."nth-check-2.0.1"
           sources."strip-ansi-3.0.1"
@@ -93810,7 +93786,7 @@ in
       sources."schema-utils-1.0.0"
       sources."select-hose-2.0.0"
       sources."selfsigned-1.10.14"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."send-0.17.2" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -94280,7 +94256,7 @@ in
       sources."xmlhttprequest-ssl-2.0.0"
       sources."xtend-4.0.2"
       sources."y18n-4.0.3"
-      sources."yallist-4.0.0"
+      sources."yallist-3.1.1"
       sources."yaml-1.10.2"
       (sources."yargs-16.2.0" // {
         dependencies = [
@@ -94433,80 +94409,50 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "11.1.1";
+    version = "12.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.1.1.tgz";
-      sha512 = "PaNWblwIa10KZUt9EObGBzrsaxB+CPtk5d99sTveXmAtQrPSmrntKpWqxN/Mwot0qnI5gCllzkPZi6tO710KUA==";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-12.0.0.tgz";
+      sha512 = "jSueemgxyOsxVLOWkJuBbJfQB1vt9rjCqAbht51W/2982VcDxQ3ywjUaEvWTF+oTFWe2M1ER+d54kFgoZCGevg==";
     };
     dependencies = [
-      sources."@babel/code-frame-7.12.11"
-      sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
-        dependencies = [
-          sources."chalk-2.4.2"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@eslint/eslintrc-0.4.3"
-      sources."@humanwhocodes/config-array-0.5.0"
+      sources."@eslint/eslintrc-1.2.1"
+      sources."@humanwhocodes/config-array-0.9.5"
       sources."@humanwhocodes/object-schema-1.2.1"
-      sources."acorn-7.4.1"
+      sources."acorn-8.7.0"
       sources."acorn-jsx-5.3.2"
       sources."ajv-6.12.6"
-      sources."ansi-colors-4.1.1"
       sources."ansi-regex-5.0.1"
-      sources."ansi-styles-3.2.1"
-      sources."argparse-1.0.10"
-      sources."astral-regex-2.0.0"
+      sources."ansi-styles-4.3.0"
+      sources."argparse-2.0.1"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."callsites-3.1.0"
       (sources."chalk-4.1.2" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
           sources."supports-color-7.2.0"
         ];
       })
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."concat-map-0.0.1"
-      sources."core_d-3.2.0"
+      sources."core_d-4.0.0"
       sources."cross-spawn-7.0.3"
       sources."debug-4.3.4"
       sources."deep-is-0.1.4"
       sources."doctrine-3.0.0"
-      sources."emoji-regex-8.0.0"
-      sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
-      sources."eslint-7.32.0"
-      sources."eslint-scope-5.1.1"
-      (sources."eslint-utils-2.1.0" // {
+      sources."eslint-8.12.0"
+      sources."eslint-scope-7.1.1"
+      (sources."eslint-utils-3.0.0" // {
         dependencies = [
-          sources."eslint-visitor-keys-1.3.0"
+          sources."eslint-visitor-keys-2.1.0"
         ];
       })
-      sources."eslint-visitor-keys-2.1.0"
-      (sources."espree-7.3.1" // {
-        dependencies = [
-          sources."eslint-visitor-keys-1.3.0"
-        ];
-      })
-      sources."esprima-4.0.1"
-      (sources."esquery-1.4.0" // {
-        dependencies = [
-          sources."estraverse-5.3.0"
-        ];
-      })
-      (sources."esrecurse-4.3.0" // {
-        dependencies = [
-          sources."estraverse-5.3.0"
-        ];
-      })
-      sources."estraverse-4.3.0"
+      sources."eslint-visitor-keys-3.3.0"
+      sources."espree-9.3.1"
+      sources."esquery-1.4.0"
+      sources."esrecurse-4.3.0"
+      sources."estraverse-5.3.0"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -94517,26 +94463,22 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.2.0"
-      sources."glob-parent-5.1.2"
+      sources."glob-parent-6.0.2"
       sources."globals-13.13.0"
       sources."has-flag-4.0.0"
-      sources."ignore-4.0.6"
+      sources."ignore-5.2.0"
       sources."import-fresh-3.3.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."isexe-2.0.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-4.1.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.4.1"
       sources."lodash.merge-4.6.2"
-      sources."lodash.truncate-4.4.2"
-      sources."lru-cache-6.0.0"
       sources."minimatch-3.1.2"
       sources."ms-2.1.2"
       sources."nanolru-1.0.0"
@@ -94547,33 +94489,15 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."prelude-ls-1.2.1"
-      sources."progress-2.0.3"
       sources."punycode-2.1.1"
       sources."regexpp-3.2.0"
-      sources."require-from-string-2.0.2"
       sources."resolve-from-4.0.0"
       sources."rimraf-3.0.2"
-      sources."semver-7.3.5"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
-      (sources."slice-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
-      sources."sprintf-js-1.0.3"
-      sources."string-width-4.2.3"
       sources."strip-ansi-6.0.1"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-8.1.1"
-      (sources."table-6.8.0" // {
-        dependencies = [
-          sources."ajv-8.11.0"
-          sources."json-schema-traverse-1.0.0"
-        ];
-      })
       sources."text-table-0.2.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.20.2"
@@ -94582,7 +94506,6 @@ in
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -94627,30 +94550,29 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
       sources."@babel/helper-simple-access-7.17.7"
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      (sources."@babel/highlight-7.16.10" // {
+      sources."@babel/helpers-7.17.9"
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/runtime-7.9.0"
       (sources."@babel/template-7.16.7" // {
         dependencies = [
           sources."@babel/code-frame-7.16.7"
         ];
       })
-      (sources."@babel/traverse-7.17.3" // {
+      (sources."@babel/traverse-7.17.9" // {
         dependencies = [
           sources."@babel/code-frame-7.16.7"
         ];
@@ -94661,7 +94583,7 @@ in
       sources."@expo/config-6.0.19"
       (sources."@expo/config-plugins-4.1.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."@expo/config-types-44.0.0"
@@ -94720,7 +94642,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       (sources."@npmcli/fs-1.1.1" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."@npmcli/move-file-1.1.2" // {
@@ -94945,6 +94867,7 @@ in
       sources."bytes-3.0.0"
       (sources."cacache-15.3.0" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
           sources."minipass-3.1.6"
           sources."mkdirp-1.0.4"
           sources."rimraf-3.0.2"
@@ -95206,7 +95129,7 @@ in
         ];
       })
       sources."domain-browser-1.2.0"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-3.3.0"
       sources."domino-2.1.6"
       (sources."domutils-2.8.0" // {
@@ -95224,7 +95147,7 @@ in
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -95460,7 +95383,11 @@ in
       sources."he-1.2.0"
       sources."hex-color-regex-1.1.0"
       sources."hmac-drbg-1.0.1"
-      sources."hosted-git-info-3.0.8"
+      (sources."hosted-git-info-3.0.8" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
       sources."hpack.js-2.1.6"
       sources."hsl-regex-1.0.0"
       sources."hsla-regex-1.0.0"
@@ -95637,7 +95564,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jsonify-0.0.0"
       sources."keychain-1.3.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."killable-1.0.1"
       sources."kind-of-6.0.3"
       sources."kleur-3.0.3"
@@ -95670,7 +95597,7 @@ in
         ];
       })
       sources."lowercase-keys-2.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-2.1.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -96393,7 +96320,7 @@ in
           sources."ws-3.3.3"
         ];
       })
-      (sources."sucrase-3.20.3" // {
+      (sources."sucrase-3.21.0" // {
         dependencies = [
           sources."commander-4.1.1"
         ];
@@ -96414,7 +96341,7 @@ in
           sources."css-what-3.4.2"
           (sources."dom-serializer-0.2.2" // {
             dependencies = [
-              sources."domelementtype-2.2.0"
+              sources."domelementtype-2.3.0"
             ];
           })
           sources."domelementtype-1.3.1"
@@ -96782,13 +96709,12 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      sources."@babel/core-7.17.8"
-      sources."@babel/generator-7.17.7"
+      sources."@babel/core-7.17.9"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-annotate-as-pure-7.16.7"
       sources."@babel/helper-compilation-targets-7.17.7"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
@@ -96797,9 +96723,9 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-proposal-object-rest-spread-7.17.3"
       sources."@babel/plugin-syntax-jsx-7.16.7"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -96807,7 +96733,7 @@ in
       sources."@babel/plugin-transform-parameters-7.16.7"
       sources."@babel/plugin-transform-react-jsx-7.17.3"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
@@ -96865,7 +96791,7 @@ in
       })
       sources."delay-5.0.0"
       sources."devtools-protocol-0.0.969999"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -96935,7 +96861,8 @@ in
       sources."node-releases-2.0.2"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."lru-cache-7.8.0"
+          sources."semver-7.3.6"
         ];
       })
       sources."object-assign-4.1.1"
@@ -97307,7 +97234,7 @@ in
       sources."lodash.templatesettings-4.2.0"
       sources."log-symbols-4.1.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
       sources."mime-db-1.52.0"
@@ -97372,7 +97299,7 @@ in
       sources."rxjs-7.5.5"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.7"
@@ -97428,7 +97355,6 @@ in
       sources."widest-line-3.1.0"
       sources."word-wrap-1.2.3"
       sources."wrap-ansi-7.0.0"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -97467,7 +97393,7 @@ in
       sources."@jsdevtools/ono-7.1.3"
       (sources."@npmcli/fs-1.1.1" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."@npmcli/move-file-1.1.2" // {
@@ -97578,6 +97504,7 @@ in
       sources."bytes-3.1.2"
       (sources."cacache-15.3.0" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
           sources."mkdirp-1.0.4"
         ];
       })
@@ -97710,7 +97637,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."env-paths-2.2.1"
       sources."err-code-2.0.3"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
@@ -97730,7 +97657,7 @@ in
         dependencies = [
           sources."ajv-8.11.0"
           sources."json-schema-traverse-1.0.0"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."exegesis-express-4.0.0"
@@ -97829,7 +97756,11 @@ in
       sources."glob-slash-1.0.0"
       sources."glob-slasher-1.0.1"
       sources."global-dirs-2.1.0"
-      sources."google-auth-library-7.14.1"
+      (sources."google-auth-library-7.14.1" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
       sources."google-gax-2.29.6"
       sources."google-p12-pem-3.1.3"
       sources."got-9.6.0"
@@ -97956,7 +97887,7 @@ in
       sources."logform-2.4.0"
       sources."long-4.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."lru-queue-0.1.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
@@ -97965,6 +97896,7 @@ in
       })
       (sources."make-fetch-happen-9.1.0" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
           sources."socks-proxy-agent-6.1.1"
         ];
       })
@@ -98023,7 +97955,7 @@ in
       sources."node-forge-1.3.1"
       (sources."node-gyp-8.4.1" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."which-2.0.2"
         ];
       })
@@ -98270,7 +98202,7 @@ in
           sources."ini-2.0.0"
           sources."is-installed-globally-0.4.0"
           sources."is-npm-5.0.0"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."type-fest-0.20.2"
         ];
       })
@@ -98380,7 +98312,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -98539,7 +98471,11 @@ in
       sources."rxjs-7.5.5"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
@@ -99339,12 +99275,12 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      (sources."@babel/generator-7.17.7" // {
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -99355,10 +99291,9 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -99370,19 +99305,19 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      (sources."@babel/highlight-7.16.10" // {
+      sources."@babel/helpers-7.17.9"
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-syntax-typescript-7.16.7"
       sources."@babel/plugin-transform-typescript-7.16.8"
       sources."@babel/preset-typescript-7.16.7"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@hapi/hoek-9.2.1"
       sources."@hapi/topo-5.1.0"
@@ -99491,12 +99426,12 @@ in
       sources."delayed-stream-1.0.0"
       sources."dom-converter-0.2.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-2.2.0"
@@ -99596,7 +99531,7 @@ in
       sources."json-buffer-3.0.1"
       sources."json5-2.2.1"
       sources."jsonfile-6.1.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."kleur-3.0.3"
       sources."latest-version-5.1.0"
       sources."lmdb-2.2.6"
@@ -99620,11 +99555,7 @@ in
       sources."minimist-1.2.6"
       sources."ms-2.1.2"
       sources."msgpackr-1.5.5"
-      (sources."msgpackr-extract-1.1.0" // {
-        dependencies = [
-          sources."node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages"
-        ];
-      })
+      sources."msgpackr-extract-1.1.3"
       sources."msgpackr-extract-darwin-arm64-1.1.0"
       sources."msgpackr-extract-darwin-x64-1.1.0"
       sources."msgpackr-extract-linux-arm-1.1.0"
@@ -99636,6 +99567,7 @@ in
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.7"
       sources."node-gyp-build-4.4.0"
+      sources."node-gyp-build-optional-packages-4.3.1"
       sources."node-object-hash-2.3.10"
       sources."node-releases-2.0.2"
       sources."normalize-url-6.1.0"
@@ -99724,7 +99656,11 @@ in
       sources."rxjs-6.6.7"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -99827,7 +99763,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -99897,7 +99833,7 @@ in
       sources."lines-and-columns-1.2.4"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.21"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.1.2"
@@ -99934,7 +99870,7 @@ in
       sources."resolve-1.22.0"
       sources."run-async-2.4.1"
       sources."sanitize-filename-1.6.3"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."shelljs-0.8.5"
@@ -99972,7 +99908,6 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
       sources."yeoman-generator-5.6.1"
       (sources."yosay-2.0.2" // {
         dependencies = [
@@ -100333,7 +100268,7 @@ in
       sources."is-interactive-2.0.0"
       sources."is-unicode-supported-1.2.0"
       sources."json-buffer-3.0.1"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."li-1.3.0"
       (sources."log-symbols-5.1.0" // {
         dependencies = [
@@ -100399,7 +100334,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -100521,7 +100456,11 @@ in
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-4.1.0"
+      (sources."hosted-git-info-4.1.0" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
       sources."http-cache-semantics-4.1.0"
       sources."http-errors-2.0.0"
       sources."http-proxy-agent-4.0.1"
@@ -100576,7 +100515,7 @@ in
       sources."lodash-4.17.21"
       sources."log-symbols-4.1.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -100674,7 +100613,7 @@ in
       sources."rxjs-7.5.5"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -100945,7 +100884,7 @@ in
       sources."@ardatan/aggregate-error-0.0.6"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -100986,9 +100925,9 @@ in
           sources."tslib-2.1.0"
         ];
       })
-      (sources."@graphql-tools/import-6.6.9" // {
+      (sources."@graphql-tools/import-6.6.10" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.6.5"
+          sources."@graphql-tools/utils-8.6.6"
           sources."tslib-2.3.1"
         ];
       })
@@ -101013,10 +100952,10 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@graphql-tools/schema-8.3.6" // {
+      (sources."@graphql-tools/schema-8.3.7" // {
         dependencies = [
-          sources."@graphql-tools/merge-8.2.6"
-          sources."@graphql-tools/utils-8.6.5"
+          sources."@graphql-tools/merge-8.2.7"
+          sources."@graphql-tools/utils-8.6.6"
           sources."tslib-2.3.1"
         ];
       })
@@ -101524,7 +101463,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -101537,15 +101476,15 @@ in
       })
       sources."@cronvel/get-pixels-3.4.0"
       sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2"
-      sources."@graphql-tools/batch-execute-8.4.1"
-      sources."@graphql-tools/delegate-8.7.1"
-      sources."@graphql-tools/graphql-file-loader-7.3.7"
-      sources."@graphql-tools/import-6.6.9"
-      sources."@graphql-tools/json-file-loader-7.3.7"
-      sources."@graphql-tools/load-7.5.6"
-      sources."@graphql-tools/merge-8.2.6"
-      sources."@graphql-tools/schema-8.3.6"
-      (sources."@graphql-tools/url-loader-7.9.8" // {
+      sources."@graphql-tools/batch-execute-8.4.2"
+      sources."@graphql-tools/delegate-8.7.2"
+      sources."@graphql-tools/graphql-file-loader-7.3.8"
+      sources."@graphql-tools/import-6.6.10"
+      sources."@graphql-tools/json-file-loader-7.3.8"
+      sources."@graphql-tools/load-7.5.7"
+      sources."@graphql-tools/merge-8.2.7"
+      sources."@graphql-tools/schema-8.3.7"
+      (sources."@graphql-tools/url-loader-7.9.9" // {
         dependencies = [
           (sources."subscriptions-transport-ws-0.11.0" // {
             dependencies = [
@@ -101555,8 +101494,8 @@ in
           sources."ws-8.5.0"
         ];
       })
-      sources."@graphql-tools/utils-8.6.5"
-      sources."@graphql-tools/wrap-8.4.10"
+      sources."@graphql-tools/utils-8.6.6"
+      sources."@graphql-tools/wrap-8.4.11"
       sources."@iarna/toml-2.2.5"
       sources."@n1ru4l/graphql-live-query-0.9.0"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -101758,7 +101697,7 @@ in
       sources."lodash.get-4.4.2"
       sources."lodash.template-4.5.0"
       sources."lodash.templatesettings-4.2.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."make-error-1.3.6"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -101811,7 +101750,7 @@ in
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.1.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."send-0.16.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -101875,7 +101814,6 @@ in
       sources."widest-line-3.1.0"
       sources."wrap-ansi-7.0.0"
       sources."ws-7.4.2"
-      sources."yallist-4.0.0"
       sources."yaml-1.10.2"
       sources."yn-3.1.1"
       sources."yocto-queue-0.1.0"
@@ -102324,7 +102262,7 @@ in
       sources."each-props-1.3.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
@@ -102744,7 +102682,7 @@ in
         ];
       })
       sources."error-ex-1.3.2"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       (sources."expand-brackets-2.1.4" // {
@@ -103382,7 +103320,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.1107.0"
+      sources."aws-sdk-2.1110.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
@@ -104066,7 +104004,7 @@ in
       sources."diagnostic-channel-publishers-0.4.4"
       sources."discontinuous-range-1.0.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."ecc-jsbn-0.1.2"
@@ -104096,7 +104034,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."he-1.2.0"
-      sources."html-to-text-8.1.0"
+      sources."html-to-text-8.1.1"
       sources."htmlparser2-6.1.0"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
@@ -104152,7 +104090,11 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."selderee-0.6.0"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."shimmer-1.2.1"
       sources."sigmund-1.0.1"
       sources."sshpk-1.17.0"
@@ -104636,9 +104578,9 @@ in
       sources."resumer-0.0.0"
       sources."safer-buffer-2.1.2"
       sources."semaphore-async-await-1.5.1"
-      (sources."semver-7.3.5" // {
+      (sources."semver-7.3.6" // {
         dependencies = [
-          sources."lru-cache-6.0.0"
+          sources."lru-cache-7.8.0"
         ];
       })
       sources."seq-0.3.5"
@@ -104669,7 +104611,6 @@ in
       sources."wrap-ansi-7.0.0"
       sources."xpath-0.0.32"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-16.2.0"
       sources."yargs-parser-20.2.9"
     ];
@@ -104989,7 +104930,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1108.0" // {
+      (sources."aws-sdk-2.1110.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -105054,8 +104995,8 @@ in
         ];
       })
       sources."cwise-compiler-1.1.3"
-      sources."d3-7.4.2"
-      sources."d3-array-3.1.4"
+      sources."d3-7.4.3"
+      sources."d3-array-3.1.5"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
@@ -105147,7 +105088,7 @@ in
           sources."domhandler-4.3.1"
         ];
       })
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domexception-1.0.1"
       sources."domhandler-3.3.0"
       sources."dompurify-2.3.5"
@@ -105339,7 +105280,7 @@ in
           sources."highlight.js-9.12.0"
         ];
       })
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."magicli-0.0.8"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
@@ -105370,11 +105311,7 @@ in
       sources."mimic-response-3.1.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
-      (sources."minipass-2.9.0" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.6"
       sources."mkdirp-classic-0.5.3"
@@ -105507,7 +105444,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."saxes-3.1.11"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
@@ -105585,11 +105522,7 @@ in
       sources."symbol-observable-1.2.0"
       sources."symbol-tree-3.2.4"
       sources."table-layout-0.4.5"
-      (sources."tar-4.4.19" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."tar-4.4.19"
       sources."tar-fs-2.1.1"
       (sources."tar-stream-2.2.0" // {
         dependencies = [
@@ -105671,7 +105604,7 @@ in
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xmlchars-2.2.0"
-      sources."yallist-4.0.0"
+      sources."yallist-3.1.1"
       sources."yargs-parser-7.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -105757,7 +105690,7 @@ in
       sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg==";
     };
     dependencies = [
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@types/linkify-it-3.0.2"
       sources."@types/markdown-it-12.2.3"
       sources."@types/mdurl-1.0.2"
@@ -105810,7 +105743,7 @@ in
       sources."date-now-0.1.4"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."entities-2.2.0"
         ];
       })
@@ -105874,7 +105807,7 @@ in
       sources."d-1.0.1"
       sources."difflib-0.2.4"
       sources."dreamopt-0.8.0"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
@@ -106099,7 +106032,7 @@ in
       sources."lodash-id-0.14.1"
       sources."lowdb-1.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -106161,7 +106094,7 @@ in
       sources."responselike-1.0.2"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."semver-compare-1.0.0"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
@@ -106206,7 +106139,6 @@ in
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-17.4.0"
       sources."yargs-parser-21.0.1"
     ];
@@ -106933,7 +106865,7 @@ in
       sources."dotenv-8.6.0"
       sources."emoji-regex-8.0.0"
       sources."env-paths-2.2.1"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."escape-string-regexp-4.0.0"
@@ -106986,7 +106918,7 @@ in
       sources."jsonfile-4.0.0"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.21"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -107035,7 +106967,7 @@ in
         ];
       })
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."side-channel-1.0.4"
@@ -107061,7 +106993,6 @@ in
       sources."widest-line-3.1.0"
       sources."wrap-ansi-7.0.0"
       sources."write-file-atomic-3.0.3"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -107284,12 +107215,12 @@ in
       sources."@babel/cli-7.17.6"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-annotate-as-pure-7.16.7"
       (sources."@babel/helper-compilation-targets-7.17.7" // {
         dependencies = [
@@ -107297,8 +107228,7 @@ in
         ];
       })
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-module-transforms-7.17.7"
@@ -107307,15 +107237,15 @@ in
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
       sources."@babel/node-7.16.8"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-syntax-jsx-7.16.7"
       sources."@babel/plugin-transform-react-jsx-7.17.3"
       sources."@babel/register-7.17.7"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
@@ -107475,7 +107405,7 @@ in
       })
       sources."dotenv-8.6.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -107628,7 +107558,7 @@ in
       sources."levn-0.3.0"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.21"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."ltx-3.0.0"
       sources."make-dir-2.1.0"
       sources."md5.js-1.3.5"
@@ -107702,7 +107632,7 @@ in
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."supports-color-7.2.0"
         ];
       })
@@ -107838,7 +107768,6 @@ in
       sources."xml-name-validator-3.0.0"
       sources."xmlchars-2.2.0"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       (sources."yargs-16.2.0" // {
         dependencies = [
           sources."is-fullwidth-code-point-3.0.0"
@@ -108467,7 +108396,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -108721,7 +108650,7 @@ in
       sources."depd-1.1.2"
       sources."deprecation-2.3.1"
       sources."detect-indent-5.0.0"
-      sources."dezalgo-1.0.3"
+      sources."dezalgo-1.0.4"
       sources."dir-glob-3.0.1"
       sources."dot-prop-6.0.1"
       sources."duplexer-0.1.2"
@@ -109094,7 +109023,11 @@ in
       sources."rxjs-6.6.7"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."shallow-clone-3.0.1"
       sources."shebang-command-2.0.0"
@@ -110162,18 +110095,17 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      sources."@babel/core-7.17.8"
-      sources."@babel/generator-7.17.7"
+      sources."@babel/core-7.17.9"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-annotate-as-pure-7.16.7"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7"
       sources."@babel/helper-compilation-targets-7.17.7"
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-create-regexp-features-plugin-7.17.0"
       sources."@babel/helper-define-polyfill-provider-0.3.1"
       sources."@babel/helper-environment-visitor-7.16.7"
       sources."@babel/helper-explode-assignable-expression-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -110188,13 +110120,13 @@ in
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
       sources."@babel/helper-wrap-function-7.16.8"
-      sources."@babel/helpers-7.17.8"
-      (sources."@babel/highlight-7.16.10" // {
+      sources."@babel/helpers-7.17.9"
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.17.8"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
       sources."@babel/plugin-external-helpers-7.8.3"
@@ -110244,7 +110176,7 @@ in
       sources."@babel/plugin-transform-literals-7.16.7"
       sources."@babel/plugin-transform-member-expression-literals-7.16.7"
       sources."@babel/plugin-transform-modules-amd-7.16.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.17.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.17.9"
       sources."@babel/plugin-transform-modules-systemjs-7.17.8"
       sources."@babel/plugin-transform-modules-umd-7.16.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8"
@@ -110252,7 +110184,7 @@ in
       sources."@babel/plugin-transform-object-super-7.16.7"
       sources."@babel/plugin-transform-parameters-7.16.7"
       sources."@babel/plugin-transform-property-literals-7.16.7"
-      sources."@babel/plugin-transform-regenerator-7.16.7"
+      sources."@babel/plugin-transform-regenerator-7.17.9"
       sources."@babel/plugin-transform-reserved-words-7.16.7"
       sources."@babel/plugin-transform-runtime-7.17.0"
       sources."@babel/plugin-transform-shorthand-properties-7.16.7"
@@ -110265,9 +110197,9 @@ in
       sources."@babel/preset-env-7.16.11"
       sources."@babel/preset-modules-0.1.5"
       sources."@babel/preset-stage-2-7.8.3"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
@@ -110588,7 +110520,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -110982,7 +110914,7 @@ in
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
-      sources."regenerator-transform-0.14.5"
+      sources."regenerator-transform-0.15.0"
       sources."regex-not-1.0.2"
       sources."regexpu-core-5.0.1"
       sources."regjsgen-0.6.0"
@@ -111686,7 +111618,7 @@ in
       sources."commander-6.2.1"
       sources."debug-3.2.7"
       sources."has-flag-4.0.0"
-      sources."iconv-lite-0.4.24"
+      sources."iconv-lite-0.6.3"
       sources."is-absolute-url-3.0.3"
       sources."is-relative-url-3.0.0"
       sources."isemail-3.2.0"
@@ -111695,7 +111627,7 @@ in
       sources."markdown-link-extractor-2.0.1"
       sources."marked-4.0.12"
       sources."ms-2.1.3"
-      sources."needle-3.0.0"
+      sources."needle-3.1.0"
       sources."progress-2.0.3"
       sources."punycode-2.1.1"
       sources."safer-buffer-2.1.2"
@@ -111899,7 +111831,7 @@ in
       })
       sources."ecc-jsbn-0.1.2"
       sources."entities-1.1.2"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
       (sources."es6-set-0.1.5" // {
@@ -112210,8 +112142,8 @@ in
       sources."commander-9.1.0"
       sources."concat-map-0.0.1"
       sources."cross-fetch-3.1.5"
-      sources."d3-7.4.2"
-      sources."d3-array-3.1.4"
+      sources."d3-7.4.3"
+      sources."d3-array-3.1.5"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
@@ -112622,7 +112554,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -112819,7 +112751,7 @@ in
       sources."latest-version-5.1.0"
       sources."lodash-4.17.21"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -112893,7 +112825,7 @@ in
       sources."ripemd160-2.0.2"
       sources."rxjs-6.6.7"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -112963,7 +112895,6 @@ in
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-16.2.0"
       sources."yargs-parser-20.2.9"
     ];
@@ -113003,13 +112934,13 @@ in
       sources."is-stream-2.0.1"
       sources."kuler-2.0.0"
       sources."logform-2.4.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."ms-2.1.3"
       sources."one-time-1.0.0"
       sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.1"
       sources."safe-stable-stringify-2.3.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."simple-swizzle-0.2.2"
       sources."stack-trace-0.0.10"
       sources."string_decoder-1.3.0"
@@ -113018,7 +112949,6 @@ in
       sources."util-deprecate-1.0.2"
       sources."winston-3.3.3"
       sources."winston-transport-4.5.0"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -113063,7 +112993,7 @@ in
     dependencies = [
       sources."@gar/promisify-1.1.3"
       sources."@npmcli/fs-2.1.0"
-      sources."@npmcli/move-file-1.1.2"
+      sources."@npmcli/move-file-2.0.0"
       sources."@tootallnate/once-2.0.0"
       sources."abbrev-1.1.1"
       sources."agent-base-6.0.2"
@@ -113074,11 +113004,7 @@ in
       sources."are-we-there-yet-3.0.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      (sources."cacache-16.0.3" // {
-        dependencies = [
-          sources."ssri-8.0.1"
-        ];
-      })
+      sources."cacache-16.0.4"
       sources."chownr-2.0.0"
       sources."clean-stack-2.2.0"
       sources."color-support-1.1.3"
@@ -113111,7 +113037,7 @@ in
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-lambda-1.0.1"
       sources."isexe-2.0.0"
-      sources."lru-cache-7.7.3"
+      sources."lru-cache-7.8.0"
       sources."make-fetch-happen-10.1.2"
       sources."minimatch-3.1.2"
       sources."minipass-3.1.6"
@@ -113136,11 +113062,7 @@ in
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      (sources."semver-7.3.5" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."smart-buffer-4.2.0"
@@ -113593,7 +113515,7 @@ in
       sha512 = "DAx4v9/W2MEBb/tHNO94bmjeELdAg7CVZlPJX+UBH1RsmXB0q/3ZYW1Zi55NVMVN/0sBBO1g+dI/L0NWCG8s9A==";
     };
     dependencies = [
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@mapbox/node-pre-gyp-1.0.9"
       sources."@node-red/editor-api-2.2.2"
       sources."@node-red/editor-client-2.2.2"
@@ -113718,7 +113640,7 @@ in
       sources."detect-libc-2.0.1"
       sources."dicer-0.2.5"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       (sources."duplexify-4.1.2" // {
@@ -113800,7 +113722,7 @@ in
           sources."universalify-2.0.0"
         ];
       })
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."leven-2.1.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lowercase-keys-2.0.0"
@@ -114059,7 +113981,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.2"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."minimatch-3.1.2"
@@ -114120,7 +114042,7 @@ in
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."slasp-0.0.4"
@@ -114262,7 +114184,7 @@ in
       sources."keyv-3.1.0"
       sources."latest-version-5.1.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -114316,7 +114238,7 @@ in
       sources."unique-string-2.0.0"
       (sources."update-notifier-5.1.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."url-parse-lax-3.0.0"
@@ -114325,7 +114247,6 @@ in
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -114348,7 +114269,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -114578,7 +114499,7 @@ in
       sources."js-tokens-4.0.0"
       sources."json-buffer-3.0.1"
       sources."json-parse-even-better-errors-2.3.1"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."kind-of-6.0.3"
       sources."latest-version-5.1.0"
       sources."lines-and-columns-1.2.4"
@@ -114792,7 +114713,11 @@ in
       sources."rxjs-6.6.7"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-2.1.0"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -114887,10 +114812,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "12.5.7";
+    version = "12.5.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.7.tgz";
-      sha512 = "WDkqPBevmgphV1UH3FImsDEpTAq2UFvnMZC3GdXPknE2VL701kfKylnae8IA9ZeYfm/uU0249N9gjMXqA/9y3w==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.8.tgz";
+      sha512 = "8SDZ6qYXI0aKf63zSbByqB9QmK8ygrZ+UVcXg9kGQyvH7dGIcFauFF0ksC0NdThHkU/5QhowJVSHXva9zujkJg==";
     };
     dependencies = [
       sources."@gar/promisify-1.1.3"
@@ -114898,12 +114823,12 @@ in
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@npmcli/fs-2.1.0"
-      sources."@npmcli/git-3.0.0"
+      sources."@npmcli/git-3.0.1"
       sources."@npmcli/installed-package-contents-1.0.7"
-      sources."@npmcli/move-file-1.1.2"
-      sources."@npmcli/node-gyp-1.0.3"
-      sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-3.0.1"
+      sources."@npmcli/move-file-2.0.0"
+      sources."@npmcli/node-gyp-2.0.0"
+      sources."@npmcli/promise-spawn-3.0.0"
+      sources."@npmcli/run-script-3.0.2"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tootallnate/once-2.0.0"
@@ -114924,7 +114849,7 @@ in
       sources."braces-3.0.2"
       sources."buffer-from-1.1.2"
       sources."builtins-5.0.0"
-      sources."cacache-16.0.3"
+      sources."cacache-16.0.4"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."get-stream-5.2.0"
@@ -115003,12 +114928,7 @@ in
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.3"
       sources."ignore-5.2.0"
-      (sources."ignore-walk-4.0.1" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."minimatch-3.1.2"
-        ];
-      })
+      sources."ignore-walk-5.0.1"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
@@ -115054,17 +114974,13 @@ in
       sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-7.7.3"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      (sources."make-fetch-happen-10.1.2" // {
-        dependencies = [
-          sources."ssri-9.0.0"
-        ];
-      })
+      sources."make-fetch-happen-10.1.2"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
       sources."mimic-response-1.0.1"
@@ -115089,7 +115005,7 @@ in
       sources."npm-install-checks-5.0.0"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-package-arg-9.0.2"
-      sources."npm-packlist-4.0.0"
+      sources."npm-packlist-5.0.0"
       sources."npm-pick-manifest-7.0.1"
       sources."npm-registry-fetch-13.1.0"
       sources."npmlog-6.0.1"
@@ -115104,7 +115020,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."pacote-13.0.5"
+      sources."pacote-13.1.1"
       sources."parse-github-url-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -115135,11 +115051,7 @@ in
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      (sources."semver-7.3.5" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
+      sources."semver-7.3.6"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -115160,7 +115072,7 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.11"
-      sources."ssri-8.0.1"
+      sources."ssri-9.0.0"
       sources."string-width-4.2.3"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-6.0.1"
@@ -115511,13 +115423,13 @@ in
       sources."@ampproject/remapping-2.1.2"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."json5-2.2.1"
           sources."semver-6.3.0"
         ];
       })
-      (sources."@babel/generator-7.17.7" // {
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -115529,7 +115441,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-create-regexp-features-plugin-7.17.0"
       (sources."@babel/helper-define-polyfill-provider-0.3.1" // {
         dependencies = [
@@ -115538,8 +115450,7 @@ in
       })
       sources."@babel/helper-environment-visitor-7.16.7"
       sources."@babel/helper-explode-assignable-expression-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -115554,9 +115465,9 @@ in
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
       sources."@babel/helper-wrap-function-7.16.8"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -115606,7 +115517,7 @@ in
       sources."@babel/plugin-transform-literals-7.16.7"
       sources."@babel/plugin-transform-member-expression-literals-7.16.7"
       sources."@babel/plugin-transform-modules-amd-7.16.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.17.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.17.9"
       sources."@babel/plugin-transform-modules-systemjs-7.17.8"
       sources."@babel/plugin-transform-modules-umd-7.16.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8"
@@ -115615,7 +115526,7 @@ in
       sources."@babel/plugin-transform-parameters-7.16.7"
       sources."@babel/plugin-transform-property-literals-7.16.7"
       sources."@babel/plugin-transform-react-jsx-7.17.3"
-      sources."@babel/plugin-transform-regenerator-7.16.7"
+      sources."@babel/plugin-transform-regenerator-7.17.9"
       sources."@babel/plugin-transform-reserved-words-7.16.7"
       sources."@babel/plugin-transform-shorthand-properties-7.16.7"
       sources."@babel/plugin-transform-spread-7.16.7"
@@ -115630,9 +115541,9 @@ in
         ];
       })
       sources."@babel/preset-modules-0.1.5"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@iarna/toml-2.2.5"
       sources."@jridgewell/resolve-uri-3.0.5"
@@ -115877,7 +115788,7 @@ in
       })
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domain-browser-1.2.0"
@@ -115885,7 +115796,7 @@ in
       sources."domexception-1.0.1"
       (sources."domhandler-4.3.1" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domutils-1.7.0"
@@ -115895,7 +115806,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -116012,7 +115923,7 @@ in
       (sources."htmlparser2-6.1.0" // {
         dependencies = [
           sources."dom-serializer-1.3.2"
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."domutils-2.8.0"
         ];
       })
@@ -116312,7 +116223,7 @@ in
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
-      sources."regenerator-transform-0.14.5"
+      sources."regenerator-transform-0.15.0"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -116544,7 +116455,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
@@ -116555,15 +116466,15 @@ in
       sources."@parcel/compressor-raw-2.4.1"
       sources."@parcel/config-default-2.4.1"
       sources."@parcel/core-2.4.1"
-      sources."@parcel/css-1.7.4"
-      sources."@parcel/css-darwin-arm64-1.7.4"
-      sources."@parcel/css-darwin-x64-1.7.4"
-      sources."@parcel/css-linux-arm-gnueabihf-1.7.4"
-      sources."@parcel/css-linux-arm64-gnu-1.7.4"
-      sources."@parcel/css-linux-arm64-musl-1.7.4"
-      sources."@parcel/css-linux-x64-gnu-1.7.4"
-      sources."@parcel/css-linux-x64-musl-1.7.4"
-      sources."@parcel/css-win32-x64-msvc-1.7.4"
+      sources."@parcel/css-1.8.0"
+      sources."@parcel/css-darwin-arm64-1.8.0"
+      sources."@parcel/css-darwin-x64-1.8.0"
+      sources."@parcel/css-linux-arm-gnueabihf-1.8.0"
+      sources."@parcel/css-linux-arm64-gnu-1.8.0"
+      sources."@parcel/css-linux-arm64-musl-1.8.0"
+      sources."@parcel/css-linux-x64-gnu-1.8.0"
+      sources."@parcel/css-linux-x64-musl-1.8.0"
+      sources."@parcel/css-win32-x64-msvc-1.8.0"
       sources."@parcel/diagnostic-2.4.1"
       sources."@parcel/events-2.4.1"
       sources."@parcel/fs-2.4.1"
@@ -116658,12 +116569,12 @@ in
           sources."entities-2.2.0"
         ];
       })
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."dotenv-7.0.0"
       sources."dotenv-expand-5.1.0"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."entities-3.0.1"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
@@ -116671,7 +116582,7 @@ in
       sources."get-port-4.2.0"
       sources."globals-13.13.0"
       sources."has-flag-3.0.0"
-      sources."htmlnano-2.0.1"
+      sources."htmlnano-2.0.2"
       sources."htmlparser2-7.2.0"
       sources."import-fresh-3.3.0"
       sources."is-arrayish-0.2.1"
@@ -116684,11 +116595,7 @@ in
       sources."lmdb-2.2.4"
       sources."mdn-data-2.0.14"
       sources."msgpackr-1.5.5"
-      (sources."msgpackr-extract-1.1.0" // {
-        dependencies = [
-          sources."node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages"
-        ];
-      })
+      sources."msgpackr-extract-1.1.3"
       sources."msgpackr-extract-darwin-arm64-1.1.0"
       sources."msgpackr-extract-darwin-x64-1.1.0"
       sources."msgpackr-extract-linux-arm-1.1.0"
@@ -116698,6 +116605,7 @@ in
       sources."nan-2.15.0"
       sources."node-addon-api-3.2.1"
       sources."node-gyp-build-4.4.0"
+      sources."node-gyp-build-optional-packages-4.3.1"
       sources."node-releases-2.0.2"
       sources."nth-check-2.0.1"
       sources."nullthrows-1.1.1"
@@ -116900,7 +116808,7 @@ in
       sources."lodash-4.17.21"
       sources."lodash.clone-4.5.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."media-typer-0.3.0"
       sources."mediawiki-title-0.6.5"
       sources."merge-descriptors-1.0.1"
@@ -116980,7 +116888,7 @@ in
       sources."serve-static-1.14.2"
       (sources."service-runner-2.9.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."yargs-14.2.3"
         ];
       })
@@ -117023,7 +116931,6 @@ in
       sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."y18n-4.0.3"
-      sources."yallist-4.0.0"
       (sources."yargs-13.3.2" // {
         dependencies = [
           sources."yargs-parser-13.1.2"
@@ -117932,7 +117839,7 @@ in
       sources."isarray-1.0.0"
       sources."jsonfile-6.1.0"
       sources."levn-0.3.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
       sources."mimic-response-2.1.0"
@@ -117974,7 +117881,7 @@ in
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."simple-concat-1.0.1"
@@ -118009,7 +117916,6 @@ in
       sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-16.2.0"
       sources."yargs-parser-20.2.9"
     ];
@@ -118209,10 +118115,9 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      (sources."semver-7.3.5" // {
+      (sources."semver-7.3.6" // {
         dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."yallist-4.0.0"
+          sources."lru-cache-7.8.0"
         ];
       })
       sources."setprototypeof-1.2.0"
@@ -118450,7 +118355,7 @@ in
       sources."ini-1.3.8"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."mimic-response-3.1.0"
       sources."minimist-1.2.6"
       sources."mkdirp-classic-0.5.3"
@@ -118465,7 +118370,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."simple-concat-1.0.1"
@@ -118484,7 +118389,6 @@ in
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.5"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -119470,12 +119374,12 @@ in
       sources."@babel/cli-7.17.6"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.7"
-      (sources."@babel/core-7.17.8" // {
+      (sources."@babel/core-7.17.9" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/generator-7.17.7"
+      sources."@babel/generator-7.17.9"
       sources."@babel/helper-annotate-as-pure-7.16.7"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7"
       (sources."@babel/helper-compilation-targets-7.17.7" // {
@@ -119483,7 +119387,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.17.6"
+      sources."@babel/helper-create-class-features-plugin-7.17.9"
       sources."@babel/helper-create-regexp-features-plugin-7.17.0"
       (sources."@babel/helper-define-polyfill-provider-0.3.1" // {
         dependencies = [
@@ -119492,8 +119396,7 @@ in
       })
       sources."@babel/helper-environment-visitor-7.16.7"
       sources."@babel/helper-explode-assignable-expression-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-member-expression-to-functions-7.17.7"
       sources."@babel/helper-module-imports-7.16.7"
@@ -119508,9 +119411,9 @@ in
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/helper-validator-option-7.16.7"
       sources."@babel/helper-wrap-function-7.16.8"
-      sources."@babel/helpers-7.17.8"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
+      sources."@babel/helpers-7.17.9"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -119560,7 +119463,7 @@ in
       sources."@babel/plugin-transform-literals-7.16.7"
       sources."@babel/plugin-transform-member-expression-literals-7.16.7"
       sources."@babel/plugin-transform-modules-amd-7.16.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.17.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.17.9"
       sources."@babel/plugin-transform-modules-systemjs-7.17.8"
       sources."@babel/plugin-transform-modules-umd-7.16.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8"
@@ -119572,7 +119475,7 @@ in
       sources."@babel/plugin-transform-react-jsx-7.17.3"
       sources."@babel/plugin-transform-react-jsx-development-7.16.7"
       sources."@babel/plugin-transform-react-pure-annotations-7.16.7"
-      sources."@babel/plugin-transform-regenerator-7.16.7"
+      sources."@babel/plugin-transform-regenerator-7.17.9"
       sources."@babel/plugin-transform-reserved-words-7.16.7"
       (sources."@babel/plugin-transform-runtime-7.17.0" // {
         dependencies = [
@@ -119595,9 +119498,9 @@ in
       sources."@babel/preset-react-7.16.7"
       sources."@babel/preset-stage-0-7.8.3"
       sources."@babel/register-7.17.7"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@jridgewell/resolve-uri-3.0.5"
       sources."@jridgewell/sourcemap-codec-1.4.11"
@@ -120005,14 +119908,14 @@ in
       sources."dom-converter-0.2.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       (sources."domhandler-4.3.1" // {
         dependencies = [
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
         ];
       })
       sources."domutils-1.7.0"
@@ -120029,7 +119932,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -120260,7 +120163,7 @@ in
       (sources."htmlparser2-6.1.0" // {
         dependencies = [
           sources."dom-serializer-1.3.2"
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."domutils-2.8.0"
         ];
       })
@@ -120748,7 +120651,7 @@ in
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
-      sources."regenerator-transform-0.14.5"
+      sources."regenerator-transform-0.15.0"
       sources."regex-not-1.0.2"
       sources."regexp.prototype.flags-1.4.1"
       sources."regexpu-core-5.0.1"
@@ -120768,7 +120671,7 @@ in
           sources."css-select-4.3.0"
           sources."css-what-6.1.0"
           sources."dom-serializer-1.3.2"
-          sources."domelementtype-2.2.0"
+          sources."domelementtype-2.3.0"
           sources."domutils-2.8.0"
           sources."nth-check-2.0.1"
           sources."strip-ansi-3.0.1"
@@ -121408,24 +121311,23 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
-      (sources."@babel/generator-7.17.7" // {
+      (sources."@babel/generator-7.17.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.16.7"
       sources."@babel/helper-environment-visitor-7.16.7"
-      sources."@babel/helper-function-name-7.16.7"
-      sources."@babel/helper-get-function-arity-7.16.7"
+      sources."@babel/helper-function-name-7.17.9"
       sources."@babel/helper-hoist-variables-7.16.7"
       sources."@babel/helper-module-imports-7.16.7"
       sources."@babel/helper-split-export-declaration-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
-      sources."@babel/parser-7.17.8"
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/highlight-7.17.9"
+      sources."@babel/parser-7.17.9"
+      sources."@babel/runtime-7.17.9"
       sources."@babel/template-7.16.7"
-      sources."@babel/traverse-7.17.3"
+      sources."@babel/traverse-7.17.9"
       sources."@babel/types-7.17.0"
       sources."@emotion/is-prop-valid-1.1.2"
       sources."@emotion/memoize-0.7.5"
@@ -121451,7 +121353,7 @@ in
           sources."util-0.10.3"
         ];
       })
-      sources."babel-plugin-styled-components-2.0.6"
+      sources."babel-plugin-styled-components-2.0.7"
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
@@ -121607,7 +121509,7 @@ in
       sources."perfect-scrollbar-1.5.5"
       sources."picomatch-2.3.1"
       sources."pluralize-8.0.0"
-      sources."polished-4.2.1"
+      sources."polished-4.2.2"
       sources."postcss-value-parser-4.2.0"
       sources."prismjs-1.27.0"
       sources."process-0.11.10"
@@ -122030,7 +121932,7 @@ in
       sources."livereload-js-3.3.3"
       sources."lodash-4.17.21"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -122100,7 +122002,7 @@ in
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -122158,7 +122060,6 @@ in
       sources."write-file-atomic-3.0.3"
       sources."ws-7.5.7"
       sources."xdg-basedir-4.0.0"
-      sources."yallist-4.0.0"
       sources."yaml-front-matter-4.1.1"
       sources."yargs-parser-20.2.9"
       sources."yauzl-2.10.0"
@@ -122298,8 +122199,8 @@ in
       sources."cross-spawn-7.0.3"
       sources."css-select-4.3.0"
       sources."css-what-6.1.0"
-      sources."d3-7.4.2"
-      sources."d3-array-3.1.4"
+      sources."d3-7.4.3"
+      sources."d3-array-3.1.5"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
@@ -122354,7 +122255,7 @@ in
       sources."dir-glob-3.0.1"
       sources."doctrine-3.0.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."duplexer2-0.1.4"
@@ -122363,7 +122264,6 @@ in
           sources."commander-2.20.3"
           sources."lru-cache-4.1.5"
           sources."semver-5.7.1"
-          sources."yallist-2.1.2"
         ];
       })
       sources."emoji-regex-8.0.0"
@@ -122438,7 +122338,12 @@ in
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-4.1.0"
+      (sources."hosted-git-info-4.1.0" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."htmlparser2-6.1.0"
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.0"
@@ -122466,7 +122371,7 @@ in
       sources."linkify-it-3.0.3"
       sources."listenercount-1.0.1"
       sources."lodash.merge-4.6.2"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."markdown-it-12.3.2" // {
         dependencies = [
           sources."entities-2.1.0"
@@ -122533,7 +122438,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
       sources."shebang-command-2.0.0"
@@ -122604,7 +122509,7 @@ in
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
+      sources."yallist-2.1.2"
       sources."yargs-17.4.0"
       sources."yargs-parser-21.0.1"
       sources."yauzl-2.10.0"
@@ -122747,10 +122652,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.49.11";
+    version = "1.50.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz";
-      sha512 = "wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.50.0.tgz";
+      sha512 = "cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==";
     };
     dependencies = [
       sources."anymatch-3.1.2"
@@ -122784,14 +122689,13 @@ in
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
-    version = "7.3.5";
+    version = "7.3.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
-      sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
+      url = "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz";
+      sha512 = "HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==";
     };
     dependencies = [
-      sources."lru-cache-6.0.0"
-      sources."yallist-4.0.0"
+      sources."lru-cache-7.8.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -122927,10 +122831,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "3.11.0";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-3.11.0.tgz";
-      sha512 = "v4yfKOK46ri12TkiuNfUrLo+PrfR4BI9WkrUxPF66Cst7Kdu1RH0qiCA6Gxpibauox++gnbxCdgoJ+XKw9nv1g==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-3.12.0.tgz";
+      sha512 = "CKpJGnKYxfxCYw0IojoidfZiueOl0bhbzTcRcHDVDPJLi3DYMQ+o6EwWtF7m36Nkw6FXT36Wot7pmljHoXYrQQ==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -122985,7 +122889,7 @@ in
       sources."async-3.2.3"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.1108.0" // {
+      (sources."aws-sdk-2.1110.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -123127,7 +123031,7 @@ in
       sources."duration-0.2.2"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
-      sources."es5-ext-0.10.59"
+      sources."es5-ext-0.10.60"
       sources."es6-iterator-2.0.3"
       (sources."es6-set-0.1.5" // {
         dependencies = [
@@ -123225,9 +123129,9 @@ in
       })
       sources."json-schema-traverse-1.0.0"
       sources."jsonfile-6.1.0"
-      sources."jszip-3.9.0"
+      sources."jszip-3.9.1"
       sources."jwt-decode-2.2.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."lazystream-1.0.1"
       sources."lie-3.3.0"
       sources."lodash-4.17.21"
@@ -123240,7 +123144,7 @@ in
       sources."log-node-8.0.3"
       sources."log-symbols-4.1.0"
       sources."lowercase-keys-2.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."lru-queue-0.1.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
@@ -123325,7 +123229,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
       sources."seek-bzip-1.0.6"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-immediate-shim-1.0.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -124050,10 +123954,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.895.0";
+    version = "1.898.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.895.0.tgz";
-      sha512 = "8/1P6Hx5aiDzTYKCC+yPg5ZhKf4gflodohaQc8/852ftUkCZ58UJopaYkiBTXbN51OTLRIK/TLGfPY0DpVUe+w==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.898.0.tgz";
+      sha512 = "FwBO3h3RFJuUVtH8zs6xyca6SsFmp+qDHkOubak6hhsL1SIp2t9Rvpjv8S6+S6S3hktK3KVecKlYhFdmVAK5CA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -124117,7 +124021,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -124216,7 +124120,11 @@ in
       sources."round-to-6.0.0"
       sources."safe-buffer-5.2.1"
       sources."sax-1.2.4"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."signal-exit-3.0.7"
       (sources."slice-ansi-5.0.0" // {
         dependencies = [
@@ -124349,7 +124257,7 @@ in
       sources."binary-search-1.3.6"
       sources."binary-search-bounds-2.0.5"
       sources."bindings-1.5.0"
-      sources."bipf-1.6.1"
+      sources."bipf-1.6.2"
       sources."blake2s-1.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
@@ -125313,7 +125221,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.1108.0" // {
+      (sources."aws-sdk-2.1110.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -126121,7 +126029,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -126187,7 +126095,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-4.1.0"
-      sources."html-tags-3.1.0"
+      sources."html-tags-3.2.0"
       sources."ignore-5.2.0"
       (sources."import-fresh-3.3.0" // {
         dependencies = [
@@ -126273,7 +126181,11 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."run-parallel-1.2.0"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.6" // {
+        dependencies = [
+          sources."lru-cache-7.8.0"
+        ];
+      })
       sources."signal-exit-3.0.7"
       sources."slash-3.0.0"
       (sources."slice-ansi-4.0.0" // {
@@ -126467,10 +126379,10 @@ in
   svelte-check = nodeEnv.buildNodePackage {
     name = "svelte-check";
     packageName = "svelte-check";
-    version = "2.4.6";
+    version = "2.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.4.6.tgz";
-      sha512 = "luzdly7RJhyXucQe8ID/7CqDgXdMrPYXmyZBjCbp+cixzTopZotuWevrB5hWDOnOU19m2cyetigIIa7WDHnCmQ==";
+      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.5.0.tgz";
+      sha512 = "/laO032JQ1TpmYHgaaLndHNPeWW3VSL3liMB97sA9fYTEzlIy3jIo4Rgr7EzjNvieiNWG73C5voOAeNHlrwbpg==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.5"
@@ -126549,10 +126461,10 @@ in
   svelte-language-server = nodeEnv.buildNodePackage {
     name = "svelte-language-server";
     packageName = "svelte-language-server";
-    version = "0.14.23";
+    version = "0.14.24";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.23.tgz";
-      sha512 = "/k/Py3fr5Dq7OncbktZUpE/fgMy503hArv41nOa6NLoMbnB3/Lqz7onOKo/K+fyfvWUkHF+Wklz6PZcaNPE8/A==";
+      url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.24.tgz";
+      sha512 = "SwRYWCSA9hb6W5VX7zO7CF9+Va31boaei69mq3Z2HatxPZ9FRh1gebCuYZOfHdSKtSgc3BK9uCmyoaLRjUUHIg==";
     };
     dependencies = [
       sources."@emmetio/abbreviation-2.2.3"
@@ -126621,7 +126533,7 @@ in
       sources."strip-indent-3.0.0"
       sources."svelte-3.46.6"
       sources."svelte-preprocess-4.10.5"
-      sources."svelte2tsx-0.5.6"
+      sources."svelte2tsx-0.5.7"
       sources."to-regex-range-5.0.1"
       sources."tslib-2.3.1"
       sources."typescript-4.6.3"
@@ -126677,7 +126589,7 @@ in
       sources."css-what-6.1.0"
       sources."csso-4.2.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."entities-2.2.0"
@@ -127355,7 +127267,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -127969,7 +127881,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/hast-2.3.4"
@@ -128849,7 +128761,7 @@ in
       sources."detect-libc-1.0.3"
       sources."dicer-0.3.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."duplexer3-0.1.4"
@@ -128969,7 +128881,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.3.1"
       sources."linkify-it-3.0.3"
@@ -129324,7 +129236,7 @@ in
       sources."detect-libc-1.0.3"
       sources."dicer-0.3.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."duplexer3-0.1.4"
@@ -129444,7 +129356,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.3.1"
       sources."linkify-it-3.0.3"
@@ -130590,7 +130502,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.1.1"
       sources."linkify-it-3.0.2"
@@ -131057,7 +130969,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.1.1"
       sources."linkify-it-3.0.2"
@@ -131804,7 +131716,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jsprim-1.4.2"
       sources."keypress-0.2.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."minimatch-3.1.2"
@@ -131828,7 +131740,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."sprintf-0.1.5"
       sources."sshpk-1.17.0"
       sources."stack-trace-0.0.10"
@@ -131851,7 +131763,6 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
       sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -132200,7 +132111,7 @@ in
       sources."isexe-2.0.0"
       sources."jsonfile-6.1.0"
       sources."locate-path-3.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
       sources."minimatch-3.1.2"
@@ -132219,7 +132130,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."run-parallel-1.2.0"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."slash-3.0.0"
       sources."temp-dir-2.0.0"
       sources."tempy-1.0.1"
@@ -132235,7 +132146,6 @@ in
       sources."vscode-uri-3.0.3"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -132429,7 +132339,7 @@ in
       sources."jquery-ui-1.13.1"
       sources."json-buffer-3.0.1"
       sources."just-detect-adblock-1.1.0"
-      sources."keyv-4.2.1"
+      sources."keyv-4.2.2"
       sources."knockout-3.5.1"
       sources."kuler-2.0.0"
       sources."latest-version-6.0.0"
@@ -132507,10 +132417,9 @@ in
       sources."safe-buffer-5.2.1"
       sources."safe-stable-stringify-2.3.1"
       sources."safer-buffer-2.1.2"
-      (sources."semver-7.3.5" // {
+      (sources."semver-7.3.6" // {
         dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."yallist-4.0.0"
+          sources."lru-cache-7.8.0"
         ];
       })
       (sources."send-0.17.2" // {
@@ -132615,7 +132524,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@types/concat-stream-2.0.0"
       sources."@types/debug-4.1.7"
       sources."@types/is-empty-1.2.1"
@@ -132664,7 +132573,7 @@ in
       sources."lines-and-columns-2.0.3"
       sources."load-plugin-4.0.1"
       sources."locate-path-3.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."minimatch-3.1.2"
       sources."ms-2.1.2"
       sources."once-1.4.0"
@@ -132676,7 +132585,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."string-width-5.1.2"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-7.0.1"
@@ -132703,7 +132612,6 @@ in
       sources."vscode-languageserver-textdocument-1.0.4"
       sources."vscode-languageserver-types-3.16.0"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -132743,7 +132651,7 @@ in
       sources."commander-7.2.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
-      sources."d3-array-3.1.4"
+      sources."d3-array-3.1.5"
       sources."d3-color-3.1.0"
       sources."d3-delaunay-6.0.2"
       sources."d3-dispatch-3.0.1"
@@ -132780,7 +132688,7 @@ in
       sources."inherits-2.0.4"
       sources."internmap-2.0.3"
       sources."is-fullwidth-code-point-3.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -132806,7 +132714,7 @@ in
       sources."rw-1.3.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."simple-concat-1.0.1"
@@ -133071,7 +132979,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.12.11"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."chalk-2.4.2"
           sources."escape-string-regexp-1.0.5"
@@ -133183,7 +133091,7 @@ in
       sources."lodash-4.17.21"
       sources."lodash.merge-4.6.2"
       sources."lodash.truncate-4.4.2"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
@@ -133207,7 +133115,7 @@ in
       sources."resolve-1.22.0"
       sources."resolve-from-4.0.0"
       sources."rimraf-3.0.2"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       (sources."slice-ansi-4.0.0" // {
@@ -133254,7 +133162,6 @@ in
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -133558,10 +133465,10 @@ in
       sources."denodeify-1.2.1"
       sources."diff-5.0.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.9.2"
@@ -133633,7 +133540,7 @@ in
       sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
       sources."log-symbols-4.0.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
           sources."argparse-1.0.10"
@@ -133743,7 +133650,7 @@ in
       (sources."ts-loader-8.3.0" // {
         dependencies = [
           sources."enhanced-resolve-4.5.0"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."tapable-1.1.3"
         ];
       })
@@ -133770,7 +133677,7 @@ in
       sources."vscode-debugadapter-testsupport-1.51.0"
       sources."vscode-debugprotocol-1.51.0"
       sources."watchpack-2.3.1"
-      sources."webpack-5.71.0"
+      sources."webpack-5.72.0"
       (sources."webpack-cli-4.9.2" // {
         dependencies = [
           sources."commander-7.2.0"
@@ -133792,7 +133699,6 @@ in
       })
       sources."wrappy-1.0.2"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yaml-1.10.2"
       (sources."yargs-16.2.0" // {
         dependencies = [
@@ -134120,7 +134026,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      sources."@babel/highlight-7.16.10"
+      sources."@babel/highlight-7.17.9"
       sources."@emmetio/extract-abbreviation-0.1.6"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -135062,7 +134968,7 @@ in
       sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg==";
     };
     dependencies = [
-      sources."@babel/runtime-corejs3-7.17.8"
+      sources."@babel/runtime-corejs3-7.17.9"
       sources."@mapbox/node-pre-gyp-1.0.9"
       sources."@tootallnate/once-1.1.2"
       sources."@types/raf-3.4.0"
@@ -135159,7 +135065,7 @@ in
       sources."levn-0.3.0"
       sources."lodash-4.17.21"
       sources."logidrom-0.3.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -135198,7 +135104,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."saxes-5.0.1"
-      sources."semver-7.3.5"
+      sources."semver-7.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."simple-concat-1.0.1"
@@ -135262,7 +135168,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
-      (sources."@babel/highlight-7.16.10" // {
+      (sources."@babel/highlight-7.17.9" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -135390,7 +135296,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."doctrine-3.0.0"
       sources."dom-serializer-1.3.2"
-      sources."domelementtype-2.2.0"
+      sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."dot-prop-5.3.0"
@@ -135553,7 +135459,7 @@ in
         ];
       })
       sources."jsprim-1.4.2"
-      (sources."jszip-3.9.0" // {
+      (sources."jszip-3.9.1" // {
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
@@ -135717,7 +135623,7 @@ in
         ];
       })
       sources."signal-exit-3.0.7"
-      sources."sonic-boom-2.6.0"
+      sources."sonic-boom-2.7.0"
       sources."source-map-0.6.1"
       sources."source-map-js-1.0.2"
       sources."source-map-support-0.5.20"
@@ -135810,10 +135716,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.71.0";
+    version = "5.72.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz";
-      sha512 = "g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz";
+      sha512 = "qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==";
     };
     dependencies = [
       sources."@types/eslint-8.4.1"
@@ -135847,7 +135753,7 @@ in
       sources."caniuse-lite-1.0.30001325"
       sources."chrome-trace-event-1.0.3"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.4.103"
+      sources."electron-to-chromium-1.4.106"
       sources."enhanced-resolve-5.9.2"
       sources."es-module-lexer-0.9.3"
       sources."escalade-3.1.1"
@@ -135975,10 +135881,10 @@ in
   webpack-dev-server = nodeEnv.buildNodePackage {
     name = "webpack-dev-server";
     packageName = "webpack-dev-server";
-    version = "4.8.0";
+    version = "4.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.8.0.tgz";
-      sha512 = "yZ7OWVP1nOtv8s10R/ZCsH6zf6QKkNusMRBE9DsQbOknRzKaFYYrbwVPCXp8ynUOTt3RlD9szM8H0pUlrJ6wcw==";
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz";
+      sha512 = "dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==";
     };
     dependencies = [
       sources."@leichtgewicht/ip-codec-2.0.3"
@@ -136798,7 +136704,7 @@ in
       sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ==";
     };
     dependencies = [
-      sources."@babel/runtime-7.17.8"
+      sources."@babel/runtime-7.17.9"
       sources."@gar/promisify-1.1.3"
       sources."@isaacs/string-locale-compare-1.1.0"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -136807,19 +136713,25 @@ in
       (sources."@npmcli/arborist-4.3.1" // {
         dependencies = [
           sources."mkdirp-1.0.4"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."@npmcli/fs-1.1.1" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."@npmcli/git-2.1.0" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
           sources."mkdirp-1.0.4"
-          sources."semver-7.3.5"
+          (sources."semver-7.3.6" // {
+            dependencies = [
+              sources."lru-cache-7.8.0"
+            ];
+          })
           sources."which-2.0.2"
+          sources."yallist-4.0.0"
         ];
       })
       sources."@npmcli/installed-package-contents-1.0.7"
@@ -136831,7 +136743,7 @@ in
       })
       (sources."@npmcli/metavuln-calculator-2.0.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."@npmcli/move-file-1.1.2" // {
@@ -136918,7 +136830,9 @@ in
       sources."builtins-1.0.3"
       (sources."cacache-15.3.0" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
           sources."mkdirp-1.0.4"
+          sources."yallist-4.0.0"
         ];
       })
       (sources."cacheable-request-2.1.4" // {
@@ -136985,7 +136899,7 @@ in
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."detect-node-2.1.0"
-      sources."dezalgo-1.0.3"
+      sources."dezalgo-1.0.4"
       sources."diff-5.0.0"
       sources."dir-glob-3.0.1"
       sources."dot-prop-4.2.1"
@@ -137043,7 +136957,7 @@ in
       sources."glob-parent-5.1.2"
       (sources."global-agent-2.2.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       sources."global-dirs-0.1.1"
@@ -137196,12 +137110,14 @@ in
       sources."log-symbols-2.2.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.8.0"
       sources."macos-release-2.5.0"
       sources."make-dir-1.3.0"
       (sources."make-fetch-happen-9.1.0" // {
         dependencies = [
           sources."http-cache-semantics-4.1.0"
+          sources."lru-cache-6.0.0"
+          sources."yallist-4.0.0"
         ];
       })
       sources."map-age-cleaner-0.1.3"
@@ -137230,14 +137146,22 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
-      sources."minipass-3.1.6"
+      (sources."minipass-3.1.6" // {
+        dependencies = [
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."minipass-collect-1.0.2"
       sources."minipass-fetch-1.4.1"
       sources."minipass-flush-1.0.5"
       sources."minipass-json-stream-1.0.1"
       sources."minipass-pipeline-1.2.4"
       sources."minipass-sized-1.0.3"
-      sources."minizlib-2.1.2"
+      (sources."minizlib-2.1.2" // {
+        dependencies = [
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."mkdirp-0.5.6"
       (sources."mkdirp-infer-owner-2.0.0" // {
         dependencies = [
@@ -137258,7 +137182,7 @@ in
           sources."is-fullwidth-code-point-3.0.0"
           sources."npmlog-6.0.1"
           sources."readable-stream-3.6.0"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."string-width-4.2.3"
           sources."strip-ansi-6.0.1"
           sources."which-2.0.2"
@@ -137272,7 +137196,7 @@ in
       sources."npm-conf-1.1.3"
       (sources."npm-install-checks-4.0.0" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."npm-keyword-5.0.0" // {
@@ -137289,28 +137213,30 @@ in
       (sources."npm-package-arg-8.1.5" // {
         dependencies = [
           sources."hosted-git-info-4.1.0"
-          sources."semver-7.3.5"
+          sources."lru-cache-6.0.0"
+          (sources."semver-7.3.6" // {
+            dependencies = [
+              sources."lru-cache-7.8.0"
+            ];
+          })
+          sources."yallist-4.0.0"
         ];
       })
       sources."npm-packlist-3.0.0"
       (sources."npm-pick-manifest-6.1.1" // {
         dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
         ];
       })
       (sources."npm-registry-fetch-12.0.2" // {
         dependencies = [
           sources."@npmcli/fs-2.1.0"
+          sources."@npmcli/move-file-2.0.0"
           sources."@tootallnate/once-2.0.0"
-          (sources."cacache-16.0.3" // {
-            dependencies = [
-              sources."ssri-8.0.1"
-            ];
-          })
+          sources."cacache-16.0.4"
           sources."debug-4.3.4"
           sources."http-cache-semantics-4.1.0"
           sources."http-proxy-agent-5.0.0"
-          sources."lru-cache-7.7.3"
           (sources."make-fetch-happen-10.1.2" // {
             dependencies = [
               sources."minipass-fetch-2.1.0"
@@ -137318,11 +137244,7 @@ in
           })
           sources."mkdirp-1.0.4"
           sources."ms-2.1.2"
-          (sources."semver-7.3.5" // {
-            dependencies = [
-              sources."lru-cache-6.0.0"
-            ];
-          })
+          sources."semver-7.3.6"
           sources."ssri-9.0.0"
         ];
       })
@@ -137599,6 +137521,7 @@ in
       (sources."tar-6.1.11" // {
         dependencies = [
           sources."mkdirp-1.0.4"
+          sources."yallist-4.0.0"
         ];
       })
       (sources."term-size-1.2.0" // {
@@ -137607,7 +137530,6 @@ in
           sources."execa-0.7.0"
           sources."get-stream-3.0.0"
           sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
         ];
       })
       sources."text-table-0.2.0"
@@ -137683,7 +137605,7 @@ in
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
       sources."xdg-basedir-3.0.0"
-      sources."yallist-4.0.0"
+      sources."yallist-2.1.2"
       (sources."yeoman-character-1.1.0" // {
         dependencies = [
           sources."has-flag-1.0.0"
@@ -137732,7 +137654,7 @@ in
           sources."readable-stream-3.6.0"
           sources."restore-cursor-3.1.0"
           sources."rxjs-7.5.5"
-          sources."semver-7.3.5"
+          sources."semver-7.3.6"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
           sources."string-width-4.2.3"
@@ -137824,7 +137746,7 @@ in
       sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
       sources."universalify-2.0.0"
-      sources."web-streams-polyfill-3.2.0"
+      sources."web-streams-polyfill-3.2.1"
       sources."which-2.0.2"
       sources."yaml-1.10.2"
     ];

From d0fb4235c4312f31a770f200be15fd56dda92693 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 9 Apr 2022 13:55:15 +0200
Subject: [PATCH 66/67] xgboost: fix eval without aliases

See https://github.com/NixOS/nixpkgs/pull/167016#issuecomment-1093953843
---
 pkgs/development/libraries/xgboost/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 6186661a12c2..7d50d2b53b1d 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -6,9 +6,8 @@
 , gtest
 , doCheck ? true
 , cudaSupport ? config.cudaSupport or false
-, cudatoolkit
 , ncclSupport ? false
-, nccl
+, cudaPackages
 , llvmPackages
 }:
 
@@ -28,12 +27,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
 
-  buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit
-                ++ lib.optional ncclSupport nccl;
+  buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit
+                ++ lib.optional ncclSupport cudaPackages.nccl;
 
   cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ]
-    ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]
-    ++ lib.optionals (cudaSupport && lib.versionAtLeast cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ]
+    ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ]
+    ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ]
     ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ];
 
   inherit doCheck;

From 5e868ecb7fbc77859afcc6eea4de3d0ba4a679d6 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 9 Apr 2022 11:20:35 +0200
Subject: [PATCH 67/67] haskellPackages: regenerate package set based on
 current config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 pkgs/development/haskell-modules/hackage-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 86637a302b07..1d3b1f488740 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -295744,8 +295744,7 @@ self: {
        ];
        description = "Tunneling program over websocket protocol";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
+       maintainers = with lib.maintainers; [ gebner ];
      }) {};
 
   "wtk" = callPackage