From 4dbac40f65f70f67bbe37346febfcb430e652098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= <denny.schaefer@tuxinaut.de>
Date: Mon, 30 Jan 2023 09:20:33 +0100
Subject: [PATCH 001/191] musikcube: activate portaudio, pipewire, sndio, core
 audio plugins

---
 pkgs/applications/audio/musikcube/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index 706a36b5327f..a73703ddc904 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -15,13 +15,18 @@
 , libopenmpt
 , mpg123
 , ncurses
+, portaudio
 , taglib
 # Linux Dependencies
 , alsa-lib
+, pipewireSupport ? true, pipewire
 , pulseaudio
+, sndioSupport ? true, sndio
+
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
 , systemd
 # Darwin Dependencies
+, coreaudioSupport ? stdenv.hostPlatform.isDarwin
 , Cocoa
 , SystemConfiguration
 }:
@@ -50,6 +55,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     gnutls
     lame
+    portaudio
     libev
     game-music-emu
     libmicrohttpd
@@ -62,7 +68,11 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isLinux [
     alsa-lib pulseaudio
   ] ++ lib.optionals stdenv.isDarwin [
-    Cocoa SystemConfiguration
+    Cocoa coreaudioSupport SystemConfiguration
+  ] ++ lib.optionals sndioSupport [
+    sndio
+  ] ++ lib.optionals pipewireSupport [
+    pipewire
   ];
 
   cmakeFlags = [

From 2f6d2e99866cb816f2b401596996021d20048bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= <denny.schaefer@tuxinaut.de>
Date: Mon, 30 Jan 2023 09:22:23 +0100
Subject: [PATCH 002/191] musikcube: order dependencies A-Z

---
 pkgs/applications/audio/musikcube/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index a73703ddc904..4f158879557c 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -1,34 +1,33 @@
-{ lib
-, stdenv
+{ asio
 , cmake
-, pkg-config
 , curl
-, asio
 , fetchFromGitHub
 , fetchpatch
 , ffmpeg
 , gnutls
 , lame
+, lib
 , libev
 , game-music-emu
 , libmicrohttpd
 , libopenmpt
 , mpg123
 , ncurses
+, pkg-config
 , portaudio
+, stdenv
 , taglib
 # Linux Dependencies
 , alsa-lib
 , pipewireSupport ? true, pipewire
 , pulseaudio
 , sndioSupport ? true, sndio
-
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
 , systemd
+, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
 # Darwin Dependencies
-, coreaudioSupport ? stdenv.hostPlatform.isDarwin
 , Cocoa
 , SystemConfiguration
+, coreaudioSupport ? stdenv.hostPlatform.isDarwin
 }:
 
 stdenv.mkDerivation rec {
@@ -55,13 +54,13 @@ stdenv.mkDerivation rec {
     ffmpeg
     gnutls
     lame
-    portaudio
     libev
     game-music-emu
     libmicrohttpd
     libopenmpt
     mpg123
     ncurses
+    portaudio
     taglib
   ] ++ lib.optionals systemdSupport [
     systemd
@@ -69,9 +68,9 @@ stdenv.mkDerivation rec {
     alsa-lib pulseaudio
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa coreaudioSupport SystemConfiguration
-  ] ++ lib.optionals sndioSupport [
+  ] ++ lib.optional sndioSupport [
     sndio
-  ] ++ lib.optionals pipewireSupport [
+  ] ++ lib.optional pipewireSupport [
     pipewire
   ];
 

From 3cb385953bcdd0dc8676efd5dd28c520457ca549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20Holl=C3=BD?=
 <1708197+j2ghz@users.noreply.github.com>
Date: Sun, 6 Nov 2022 02:16:51 +0100
Subject: [PATCH 003/191] mimir: add package override

---
 nixos/modules/services/monitoring/mimir.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/mimir.nix b/nixos/modules/services/monitoring/mimir.nix
index 568066990f23..edca9b7be4ff 100644
--- a/nixos/modules/services/monitoring/mimir.nix
+++ b/nixos/modules/services/monitoring/mimir.nix
@@ -25,6 +25,13 @@ in {
         Specify a configuration file that Mimir should use.
       '';
     };
+
+    package = mkOption {
+      default = pkgs.mimir;
+      defaultText = lib.literalExpression "pkgs.mimir";
+      type = types.package;
+      description = lib.mdDoc ''Mimir package to use.'';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -53,7 +60,7 @@ in {
                else cfg.configFile;
       in
       {
-        ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}";
+        ExecStart = "${cfg.package}/bin/mimir --config.file=${conf}";
         DynamicUser = true;
         Restart = "always";
         ProtectSystem = "full";

From 43ce59c656ee25643335da4729110ea817bafa5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 8 Feb 2023 20:53:28 +0100
Subject: [PATCH 004/191] ustream-ssl*: init at unstable-2022-12-08

---
 .../libraries/ustream-ssl/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/ustream-ssl/default.nix

diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix
new file mode 100644
index 000000000000..27b40d0a7ce5
--- /dev/null
+++ b/pkgs/development/libraries/ustream-ssl/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchgit, cmake, pkg-config, libubox, ssl_implementation }:
+
+stdenv.mkDerivation {
+  pname = "ustream-ssl";
+  version = "unstable-2022-12-08";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/ustream-ssl.git";
+    rev = "9217ab46536353c7c792951b57163063f5ec7a3b";
+    sha256 = "1ldyyb3is213iljyccx98f56rb69rfpgdcb1kjxw9a176hvpipdd";
+  };
+
+  preConfigure = ''
+    sed -r \
+        -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox}/include|g" \
+        -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g" \
+        -e "s|^  FIND_LIBRARY\((.+)\)|  FIND_LIBRARY\(\1 HINTS ${if ssl_implementation ? lib then ssl_implementation.lib else ssl_implementation.out}\)|g" \
+        -i CMakeLists.txt
+  '';
+
+  cmakeFlags = [ "-D${lib.toUpper ssl_implementation.pname}=ON" ];
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ ssl_implementation ];
+
+  meta = with lib; {
+    description = "ustream SSL wrapper";
+    homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary";
+    license = licenses.isc;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24181c424147..aa5aabd12f46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19299,6 +19299,12 @@ with pkgs;
 
   uci = callPackage ../development/libraries/uci { };
 
+  ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
+
+  ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; };
+
+  ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; };
+
   uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; };
 
   cppcms = callPackage ../development/libraries/cppcms { };

From e0fbf34964af9eaa3e68204e14137ad9a49b640c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 8 Feb 2023 21:24:06 +0100
Subject: [PATCH 005/191] libubox: add ssl flavours

---
 pkgs/development/libraries/libubox/default.nix     | 13 ++++++++++---
 pkgs/development/libraries/ustream-ssl/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix                    |  8 +++++++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index cd8790c0e88e..0a1e1e7f0a21 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchgit, cmake, pkg-config, json_c, with_lua ? false, lua5_1 }:
+{ stdenv, lib, fetchgit, cmake, pkg-config, json_c, with_lua ? false, lua5_1, with_ustream_ssl ? false, ustream-ssl }:
 
 stdenv.mkDerivation {
   pname = "libubox";
-  version = "unstable-2023-01-03";
+  version = "unstable-2023-01-03${lib.optionalString with_ustream_ssl "-${ustream-ssl.ssl_implementation.pname}"}";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libubox.git";
@@ -13,7 +13,14 @@ stdenv.mkDerivation {
   cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ];
 
   nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ json_c ] ++ lib.optional with_lua lua5_1;
+  buildInputs = [ json_c ] ++ lib.optional with_lua lua5_1 ++ lib.optional with_ustream_ssl ustream-ssl;
+
+  postInstall = lib.optionalString with_ustream_ssl ''
+    for fin in $(find ${ustream-ssl} -type f); do
+      fout="''${fin/"${ustream-ssl}"/"''${out}"}"
+      ln -s "$fin" "$fout"
+    done
+  '';
 
   meta = with lib; {
     description = "C utility functions for OpenWrt";
diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix
index 27b40d0a7ce5..007ebc9c4573 100644
--- a/pkgs/development/libraries/ustream-ssl/default.nix
+++ b/pkgs/development/libraries/ustream-ssl/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchgit, cmake, pkg-config, libubox, ssl_implementation }:
+{ stdenv, lib, fetchgit, cmake, pkg-config, libubox-nossl, ssl_implementation }:
 
 stdenv.mkDerivation {
   pname = "ustream-ssl";
-  version = "unstable-2022-12-08";
+  version = "unstable-2022-12-08-${ssl_implementation.pname}";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/ustream-ssl.git";
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     sed -r \
-        -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox}/include|g" \
-        -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g" \
+        -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox-nossl}/include|g" \
+        -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox-nossl}/lib|g" \
         -e "s|^  FIND_LIBRARY\((.+)\)|  FIND_LIBRARY\(\1 HINTS ${if ssl_implementation ? lib then ssl_implementation.lib else ssl_implementation.out}\)|g" \
         -i CMakeLists.txt
   '';
@@ -23,6 +23,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ ssl_implementation ];
 
+  passthru = {
+    inherit ssl_implementation;
+  };
+
   meta = with lib; {
     description = "ustream SSL wrapper";
     homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa5aabd12f46..141617f13a97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21751,7 +21751,13 @@ with pkgs;
 
   libu2f-server = callPackage ../development/libraries/libu2f-server { };
 
-  libubox = callPackage ../development/libraries/libubox { };
+  libubox-nossl = callPackage ../development/libraries/libubox { };
+
+  libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; };
+
+  libubox-wolfssl = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-wolfssl; };
+
+  libubox-mbedtls = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-mbedtls; };
 
   libudev-zero = callPackage ../development/libraries/libudev-zero { };
 

From f3ba738bfe13f22543ea4d69f874c2b220eacb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 8 Feb 2023 21:32:58 +0100
Subject: [PATCH 006/191] libnl-tiny: init at unstable-2022-12-13

---
 pkgs/os-specific/linux/libnl-tiny/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/libnl-tiny/default.nix

diff --git a/pkgs/os-specific/linux/libnl-tiny/default.nix b/pkgs/os-specific/linux/libnl-tiny/default.nix
new file mode 100644
index 000000000000..fc520830f6a2
--- /dev/null
+++ b/pkgs/os-specific/linux/libnl-tiny/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchgit, cmake, pkg-config }:
+
+stdenv.mkDerivation {
+  pname = "libnl-tiny";
+  version = "unstable-2022-12-13";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/libnl-tiny.git";
+    rev = "f5d9b7e4f534a69cbd35c3f150fa6d57b9d631e4";
+    sha256 = "0c5ycsdas8rr5c33gd0mnmm515dq631fmdjn5mp2j1m0j1bk7hc0";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  preConfigure = ''
+    sed -e 's|''${prefix}/@CMAKE_INSTALL_LIBDIR@|@CMAKE_INSTALL_FULL_LIBDIR@|g' \
+        -e 's|''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@|@CMAKE_INSTALL_FULL_INCLUDEDIR@|g' \
+        -i libnl-tiny.pc.in
+  '';
+
+  meta = with lib; {
+    description = "Tiny OpenWrt fork of libnl";
+    homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary";
+    license = licenses.isc;
+    maintainers = with maintainers; [ mkg20001 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 141617f13a97..86a4cd7068fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25926,6 +25926,8 @@ with pkgs;
 
   libnl = callPackage ../os-specific/linux/libnl { };
 
+  libnl-tiny = callPackage ../os-specific/linux/libnl-tiny { };
+
   libtraceevent = callPackage ../os-specific/linux/libtraceevent {};
 
   libtracefs = callPackage ../os-specific/linux/libtracefs {};

From 965ceadeb5e87eb851953733f2d450b57b5b79c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 8 Feb 2023 21:39:21 +0100
Subject: [PATCH 007/191] uclient-fetch: init at unstable-2022-02-24

---
 .../development/libraries/uclient/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/uclient/default.nix

diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/development/libraries/uclient/default.nix
new file mode 100644
index 000000000000..458d726f2ca6
--- /dev/null
+++ b/pkgs/development/libraries/uclient/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchgit, cmake, pkg-config, libubox }:
+
+stdenv.mkDerivation {
+  pname = "uclient";
+  version = "unstable-2022-02-24";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/uclient.git";
+    rev = "644d3c7e13c6a64bf5cb628137ee5bd4dada4b74";
+    sha256 = "0vy4whs64699whp92d1zl7a8kh16yrfywqq0yp2y809l9z19sw22";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buidInputs = [ libubox ];
+
+  preConfigure = ''
+    sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \
+        -e 's|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g' \
+        -i CMakeLists.txt
+  '';
+
+  meta = with lib; {
+    description = "Tiny OpenWrt fork of libnl";
+    homepage = "https://git.openwrt.org/?p=project/uclient.git;a=summary";
+    license = licenses.isc;
+    maintainers = with maintainers; [ mkg20001 ];
+    mainProgram = "uclient-fetch";
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86a4cd7068fb..87bf4c1ea13d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19299,6 +19299,8 @@ with pkgs;
 
   uci = callPackage ../development/libraries/uci { };
 
+  uclient = callPackage ../development/libraries/uclient { };
+
   ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
 
   ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; };

From b15ffddd9cbbda2848bc7820e0f552713f6a4a74 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Feb 2023 21:28:36 +0100
Subject: [PATCH 008/191] pdm: 2.3.4 -> 2.4.3

https://github.com/pdm-project/pdm/releases/tag/2.4.3
https://github.com/pdm-project/pdm/releases/tag/2.4.2
https://github.com/pdm-project/pdm/releases/tag/2.4.1
https://github.com/pdm-project/pdm/releases/tag/2.4.0
---
 pkgs/tools/package-management/pdm/default.nix | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index dd11549663c9..2decec7a2ca4 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -24,15 +24,19 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "2.3.4";
+  version = "2.4.3";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ=";
+    hash = "sha256-Gp8ju26XX0A2+LX+7b9OuEBJx4qUwR2tNUq+Chj56q4=";
   };
 
+  nativeBuildInputs = [
+    pdm-pep517
+  ];
+
   propagatedBuildInputs = [
     blinker
     cachecontrol
@@ -40,9 +44,6 @@ buildPythonApplication rec {
     findpython
     installer
     packaging
-    pdm-pep517
-    pep517
-    pip
     platformdirs
     pyproject-hooks
     python-dotenv
@@ -50,20 +51,22 @@ buildPythonApplication rec {
     resolvelib
     rich
     shellingham
-    tomli
     tomlkit
     unearth
     virtualenv
   ]
   ++ cachecontrol.optional-dependencies.filecache
-  ++ lib.optionals (pythonOlder "3.8") [
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ]
+  ++ lib.optionals (pythonOlder "3.10") [
     importlib-metadata
-    typing-extensions
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mock
+    pytest-rerunfailures
     pytest-xdist
   ];
 
@@ -85,6 +88,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://pdm.fming.dev";
+    changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}";
     description = "A modern Python package manager with PEP 582 support";
     license = licenses.mit;
     maintainers = with maintainers; [ cpcloud ];

From c8d7452cedaca6f50e2dd846ac6d41ac8ad268f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Feb 2023 18:10:15 -0800
Subject: [PATCH 009/191] python310Packages.pytest-forked: 1.4.0 -> 1.6.0

Diff: https://github.com/pytest-dev/pytest-forked/compare/refs/tags/v1.4.0...v1.6.0

Changelog: https://github.com/pytest-dev/pytest-forked/blob/refs/tags/v1.6.0/CHANGELOG.rst
---
 .../python-modules/pytest-forked/default.nix  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 80b294445f7a..e4727abadb7c 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -1,9 +1,10 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
-, fetchpatch
+, fetchFromGitHub
+, setuptools
 , setuptools-scm
+, wheel
 , py
 , pytest
 , pytestCheckHook
@@ -11,28 +12,26 @@
 
 buildPythonPackage rec {
   pname = "pytest-forked";
-  version = "1.4.0";
+  version = "1.6.0";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4=";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-forked";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-owkGwF5WQ17/CXwTsIYJ2AgktekRB4qhtsDxR0LCI/k=";
   };
 
-  patches = [
-    # pytest 7.2.0 compat, remove after 1.4.0
-    (fetchpatch {
-      url = "https://github.com/pytest-dev/pytest-forked/commit/c3c753e96916a4bc5a8a37699e75c6cbbd653fa2.patch";
-      hash = "sha256-QPgxBeMQ0eKJyHXYZyBicVbE+JyKPV/Kbjsb8gNJBGA=";
-    })
-    (fetchpatch {
-      url = "https://github.com/pytest-dev/pytest-forked/commit/de584eda15df6db7912ab6197cfb9ff23024ef23.patch";
-      hash = "sha256-VLE32xZRwFK0nEgCWuSoMW/yyFHEURtNFU9Aa9haLhk=";
-    })
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   buildInputs = [
     pytest
@@ -50,6 +49,7 @@ buildPythonPackage rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
+    changelog = "https://github.com/pytest-dev/pytest-forked/blob/${src.rev}/CHANGELOG.rst";
     description = "Run tests in isolated forked subprocesses";
     homepage = "https://github.com/pytest-dev/pytest-forked";
     license = lib.licenses.mit;

From 3d695ad7a256ef92b60b80b18662f43bddc8473d Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Mon, 13 Feb 2023 19:41:42 +0100
Subject: [PATCH 010/191] libressl_3_6: 3.6.1 -> 3.6.2

This release contains a security fix. Release notes:
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.2-relnotes.txt
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index e9f1a2d4bbdf..ce5b2be990b2 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -104,7 +104,7 @@ in {
   };
 
   libressl_3_6 = generic {
-    version = "3.6.1";
-    hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q=";
+    version = "3.6.2";
+    hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
   };
 }

From cae86017b1e51d60c828b0cbcae9b52104dddde1 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Mon, 13 Feb 2023 19:43:54 +0100
Subject: [PATCH 011/191] libressl_3_5: 3.5.3 -> 3.5.4

This release includes a security fix. Release notes:
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.4-relnotes.txt
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index ce5b2be990b2..2ee9601fcbb7 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -90,8 +90,8 @@ in {
   };
 
   libressl_3_5 = generic {
-    version = "3.5.3";
-    hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg=";
+    version = "3.5.4";
+    hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w=";
 
     patches = [
       # Fix endianness detection on aarch64-darwin, issue #181187

From 9fc6149defc78ed3b459194b9acb7d53ace95aa3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 14 Feb 2023 17:44:32 +0100
Subject: [PATCH 012/191] python310Packages.django_4: 4.1.6 -> 4.1.7

https://docs.djangoproject.com/en/4.1/releases/4.1.7/
https://www.djangoproject.com/weblog/2023/feb/14/security-releases/

Fixes: CVE=2023=24580
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 91c83942be8c..db702d0ed7a6 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "4.1.6";
+  version = "4.1.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vOsP4aOGeBrweIyuQQhiJ1bNBed3VEje7ASnHd+HaF0=";
+    hash = "sha256-RPcUuBxfGQ2dLdrQGlMv5QL6AcTLj68dCB9CZO0V3Ng=";
   };
 
   patches = [

From cb8d827b9a4c1863c37c0b124f78da93b3b5cb05 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 14 Feb 2023 20:32:58 +0100
Subject: [PATCH 013/191] libressl_3_4: add knownVulnerabilities

---
 pkgs/development/libraries/libressl/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 2ee9601fcbb7..658eaed36e63 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -12,7 +12,13 @@ let
     then "DYLD_LIBRARY_PATH"
     else "LD_LIBRARY_PATH";
 
-  generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec {
+  generic =
+    { version
+    , hash
+    , patches ? []
+    , knownVulnerabilities ? []
+    }: stdenv.mkDerivation rec
+  {
     pname = "libressl";
     inherit version;
 
@@ -80,6 +86,7 @@ let
       license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice fpletz ];
+      knownVulnerabilities = knownVulnerabilities;
     };
   };
 
@@ -87,6 +94,10 @@ in {
   libressl_3_4 = generic {
     version = "3.4.3";
     hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
+    knownVulnerabilities = [
+      "Support ended 2022-10-14."
+      "https://marc.info/?l=libressl&m=167582148932407&w=2"
+    ];
   };
 
   libressl_3_5 = generic {

From b958f017b7f27de0064cbc3e1a16e2020f2acce3 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 14 Feb 2023 21:00:47 +0100
Subject: [PATCH 014/191] libressl_3_4: backport security fix

---
 pkgs/development/libraries/libressl/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 658eaed36e63..bb8271cfb44e 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -86,7 +86,7 @@ let
       license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice fpletz ];
-      knownVulnerabilities = knownVulnerabilities;
+      inherit knownVulnerabilities;
     };
   };
 
@@ -94,9 +94,16 @@ in {
   libressl_3_4 = generic {
     version = "3.4.3";
     hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
-    knownVulnerabilities = [
-      "Support ended 2022-10-14."
-      "https://marc.info/?l=libressl&m=167582148932407&w=2"
+    knownVulnerabilities = [ "Support ended 2022-10-14." ];
+    patches = [
+      (fetchpatch {
+        # https://marc.info/?l=libressl&m=167582148932407&w=2
+        name = "backport-type-confusion-fix.patch";
+        url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff";
+        sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M=";
+        stripLen = 2;
+        extraPrefix = "crypto/";
+      })
     ];
   };
 

From 93aba2c96d34e84e543ed608b3e1b7322a4bc783 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 12 Feb 2023 00:22:30 -0300
Subject: [PATCH 015/191] 2048-cli: init at 0.9.1

Also, mark as broken on SDL.
---
 pkgs/games/2048-cli/default.nix | 64 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  5 +++
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/games/2048-cli/default.nix

diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix
new file mode 100644
index 000000000000..dc428f53a6ad
--- /dev/null
+++ b/pkgs/games/2048-cli/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, SDL2
+, SDL2_ttf
+, installShellFiles
+, ncurses
+, pkg-config
+, ui ? "terminal"
+}:
+
+assert lib.elem ui [ "terminal" "curses" "sdl" ];
+stdenv.mkDerivation (self: {
+  pname = "2048-cli";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "tiehuis";
+    repo = "2048-cli";
+    rev = "v${self.version}";
+    hash = "sha256-pLOrUilIrA+wo3iePhSXSK1UhbcjKyAx4SpKcC0I2yY=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "-lcurses" "-lncurses"
+  '';
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
+
+  buildInputs =
+    (lib.optional (ui == "curses") ncurses)
+    ++ (lib.optionals (ui == "sdl") [ SDL2 SDL2_ttf ]);
+
+  dontConfigure = true;
+
+  NIX_CFLAGS_COMPILE = lib.optionalString (ui == "sdl") "-I${SDL2_ttf}/include/SDL2";
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    ui
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin 2048
+    installManPage man/2048.1
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/tiehuis/2048-cli";
+    description = "The game 2048 for your Linux terminal";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    platforms = lib.platforms.unix;
+    broken = (ui == "sdl"); # segmentation fault
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a657e77af38..62519d283bd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34745,6 +34745,11 @@ with pkgs;
 
   _2048-in-terminal = callPackage ../games/2048-in-terminal { };
 
+  _2048-cli = _2048-cli-terminal;
+  _2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; };
+  _2048-cli-sdl = callPackage ../games/2048-cli { ui = "sdl"; };
+  _2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; };
+
   _20kly = callPackage ../games/20kly { };
 
   _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };

From f445f928f4edd24ceffab951ba013b66e7d7ad23 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 12 Feb 2023 15:55:14 -0300
Subject: [PATCH 016/191] 2048-cli: 0.9.1 -> unstable-2019-12-10

---
 pkgs/games/2048-cli/default.nix | 25 +++++++++++--------------
 pkgs/top-level/all-packages.nix |  5 ++---
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix
index dc428f53a6ad..947973c0fb31 100644
--- a/pkgs/games/2048-cli/default.nix
+++ b/pkgs/games/2048-cli/default.nix
@@ -1,24 +1,22 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, SDL2
-, SDL2_ttf
+, gettext
 , installShellFiles
 , ncurses
-, pkg-config
 , ui ? "terminal"
 }:
 
-assert lib.elem ui [ "terminal" "curses" "sdl" ];
+assert lib.elem ui [ "terminal" "curses" ];
 stdenv.mkDerivation (self: {
   pname = "2048-cli";
-  version = "0.9.1";
+  version = "unstable-2019-12-10";
 
   src = fetchFromGitHub {
     owner = "tiehuis";
     repo = "2048-cli";
-    rev = "v${self.version}";
-    hash = "sha256-pLOrUilIrA+wo3iePhSXSK1UhbcjKyAx4SpKcC0I2yY=";
+    rev = "67439255df7d4f70209ca628d65128cd41d33e8d";
+    hash = "sha256-U7g2wCZgR7Lp/69ktQIZZ1cScll2baCequemTl3Mc3I=";
   };
 
   postPatch = ''
@@ -28,16 +26,16 @@ stdenv.mkDerivation (self: {
 
   nativeBuildInputs = [
     installShellFiles
-    pkg-config
   ];
 
-  buildInputs =
-    (lib.optional (ui == "curses") ncurses)
-    ++ (lib.optionals (ui == "sdl") [ SDL2 SDL2_ttf ]);
+  buildInputs = [
+    gettext
+  ]
+  ++ (lib.optional (ui == "curses") ncurses);
 
   dontConfigure = true;
 
-  NIX_CFLAGS_COMPILE = lib.optionalString (ui == "sdl") "-I${SDL2_ttf}/include/SDL2";
+  NIX_CFLAGS_COMPILE="-I${lib.getDev gettext}/share/gettext/";
 
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
@@ -48,7 +46,7 @@ stdenv.mkDerivation (self: {
     runHook preInstall
 
     install -Dm755 -t $out/bin 2048
-    installManPage man/2048.1
+    installManPage man/2048.6
 
     runHook postInstall
   '';
@@ -59,6 +57,5 @@ stdenv.mkDerivation (self: {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.unix;
-    broken = (ui == "sdl"); # segmentation fault
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62519d283bd3..af4aeec39d04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34743,13 +34743,12 @@ with pkgs;
 
   _1oom = callPackage ../games/1oom { };
 
-  _2048-in-terminal = callPackage ../games/2048-in-terminal { };
-
   _2048-cli = _2048-cli-terminal;
   _2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; };
-  _2048-cli-sdl = callPackage ../games/2048-cli { ui = "sdl"; };
   _2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; };
 
+  _2048-in-terminal = callPackage ../games/2048-in-terminal { };
+
   _20kly = callPackage ../games/20kly { };
 
   _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };

From 024cab5905e49bb16bbdeae315580e920e726c30 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 12 Feb 2023 17:11:12 -0300
Subject: [PATCH 017/191] gavin-bc: init at 6.2.4

This is an implementation of the bc calculator by Gavin Howard.
---
 pkgs/tools/misc/gavin-bc/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/gavin-bc/default.nix

diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix
new file mode 100644
index 000000000000..0ccfbc2f9dfc
--- /dev/null
+++ b/pkgs/tools/misc/gavin-bc/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, stdenv
+, fetchFromGitea
+}:
+
+stdenv.mkDerivation (self: {
+  pname = "gavin-bc";
+  version = "6.2.4";
+
+  src = fetchFromGitea {
+    domain = "git.gavinhoward.com";
+    owner = "gavin";
+    repo = "bc";
+    rev = self.version;
+    hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw=";
+  };
+
+  meta = {
+    homepage = "https://git.gavinhoward.com/gavin/bc";
+    description = "Gavin Howard's BC calculator implementation";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a657e77af38..1513ae7436e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3658,6 +3658,8 @@ with pkgs;
 
   bc = callPackage ../tools/misc/bc { };
 
+  gavin-bc = callPackage ../tools/misc/gavin-bc { };
+
   bdf2psf = callPackage ../tools/misc/bdf2psf { };
 
   bdf2sfd = callPackage ../tools/misc/bdf2sfd { };

From 98157f131dac8d56997673abd69d9f154d35e00e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 12 Feb 2023 19:38:54 -0300
Subject: [PATCH 018/191] gavin-bc: mark as broken on Darwin

---
 pkgs/tools/misc/gavin-bc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix
index 0ccfbc2f9dfc..a5a7e64d27a7 100644
--- a/pkgs/tools/misc/gavin-bc/default.nix
+++ b/pkgs/tools/misc/gavin-bc/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation (self: {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.unix;
+    broken = stdenv.isDarwin;
   };
 })

From d37bd519ba0dffd075dfd4b67b5caec0d020ef0f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 12 Feb 2023 18:03:44 -0300
Subject: [PATCH 019/191] gavin-bc: enable extra options

---
 pkgs/tools/misc/gavin-bc/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix
index a5a7e64d27a7..ade42a7d0d3a 100644
--- a/pkgs/tools/misc/gavin-bc/default.nix
+++ b/pkgs/tools/misc/gavin-bc/default.nix
@@ -1,8 +1,14 @@
 { lib
 , stdenv
 , fetchFromGitea
+, editline
+, readline
+, historyType ? "internal"
+, predefinedBuildType ? "BSD"
 }:
 
+assert lib.elem historyType [ "editline" "readline" "internal" ];
+assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ];
 stdenv.mkDerivation (self: {
   pname = "gavin-bc";
   version = "6.2.4";
@@ -15,6 +21,17 @@ stdenv.mkDerivation (self: {
     hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw=";
   };
 
+  buildInputs =
+    (lib.optional (historyType == "editline") editline)
+    ++ (lib.optional (historyType == "readline") readline);
+
+  configureFlags = [
+    "--disable-nls"
+    "--predefined-build-type=${historyType}"
+  ]
+  ++ (lib.optional (historyType == "editline") "--enable-editline")
+  ++ (lib.optional (historyType == "readline") "--enable-readline");
+
   meta = {
     homepage = "https://git.gavinhoward.com/gavin/bc";
     description = "Gavin Howard's BC calculator implementation";

From 32e59366dbc261fd8c08f8fcc8e6433273ef3b1d Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 16 Feb 2023 22:18:35 +0100
Subject: [PATCH 020/191] mariadb: add more precise EOLs + link

---
 pkgs/servers/sql/mariadb/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 11ab668d6378..34c3de338313 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -239,6 +239,7 @@ let
     };
 in
   self: {
+    # see https://mariadb.org/about/#maintenance-policy for EOLs
     mariadb_104 = self.callPackage generic {
       # Supported until 2024-06-18
       version = "10.4.28";
@@ -254,28 +255,28 @@ in
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_106 = self.callPackage generic {
-      # Supported until 2026-07
+      # Supported until 2026-07-06
       version = "10.6.12";
       hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_108 = self.callPackage generic {
-      # Supported until 2023-05. TODO: remove ahead of 23.05 branchoff
+      # Supported until 2023-05-20. TODO: remove ahead of 23.05 branchoff
       version = "10.8.7";
       hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_109 = self.callPackage generic {
-      # Supported until 2023-08. TODO: remove ahead of 23.05 branchoff?
+      # Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff?
       version = "10.9.5";
       hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw=";
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_1010 = self.callPackage generic {
-      # Supported until 2023-11
+      # Supported until 2023-11-17
       version = "10.10.3";
       hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130=";
       inherit (self.darwin) cctools;

From 351e8a51c490befe7d623a0c178b0b9aa928c439 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 16 Feb 2023 22:21:08 +0100
Subject: [PATCH 021/191] mariadb_1011: init at 10.11.2

https://mariadb.org/mariadb-10-11-2-ga-now-available/
new LTS release!
---
 pkgs/servers/sql/mariadb/default.nix | 7 +++++++
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 34c3de338313..4f3a19db7fea 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -282,4 +282,11 @@ in
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
+    mariadb_1011 = self.callPackage generic {
+      # Supported until 2028-02-16
+      version = "10.11.2";
+      hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw=";
+      inherit (self.darwin) cctools;
+      inherit (self.darwin.apple_sdk.frameworks) CoreServices;
+    };
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84007288e933..719a0eab4804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24907,6 +24907,7 @@ with pkgs;
     mariadb_108
     mariadb_109
     mariadb_1010
+    mariadb_1011
   ;
   mariadb = mariadb_106;
   mariadb-embedded = mariadb.override { withEmbedded = true; };

From ff494a0c1b2c6d841514122450397ea42efbbd00 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 17 Feb 2023 01:57:28 +0400
Subject: [PATCH 022/191] helix: add desktop item and icon

---
 pkgs/applications/editors/helix/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index 55135c255bfb..5c450e21748c 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec {
     mkdir -p $out/lib
     cp -r runtime $out/lib
     installShellCompletion contrib/completion/hx.{bash,fish,zsh}
+    mkdir -p $out/share/{applications,icons}
+    cp contrib/Helix.desktop $out/share/applications
+    cp contrib/helix.png $out/share/icons
   '';
   postFixup = ''
     wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime

From 5e0646d8dbf265677b221715d40152d39e889246 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 17 Feb 2023 04:20:00 +0000
Subject: [PATCH 023/191] squawk: 0.20.0 -> 0.21.0

https://github.com/sbdchd/squawk/releases/tag/v0.21.0
---
 pkgs/development/tools/squawk/correct-Cargo.lock.patch | 4 ++--
 pkgs/development/tools/squawk/default.nix              | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/squawk/correct-Cargo.lock.patch b/pkgs/development/tools/squawk/correct-Cargo.lock.patch
index 431f004d2d75..410c92a1c3b2 100644
--- a/pkgs/development/tools/squawk/correct-Cargo.lock.patch
+++ b/pkgs/development/tools/squawk/correct-Cargo.lock.patch
@@ -6,8 +6,8 @@ index d5803a8..384224d 100644
  
  [[package]]
  name = "squawk"
--version = "0.19.0"
-+version = "0.20.0"
+-version = "0.20.0"
++version = "0.21.0"
  dependencies = [
   "atty",
   "base64 0.12.3",
diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix
index 9649625c1737..9d3526ee9d53 100644
--- a/pkgs/development/tools/squawk/default.nix
+++ b/pkgs/development/tools/squawk/default.nix
@@ -23,16 +23,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "squawk";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "sbdchd";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-v9F+HfscX4dIExIP1YvxOldZPPtmxh8lO3SREu6M+C0=";
+    hash = "sha256-ObaYGGTAGGLOAji86Q5R9fqbCGg6GP0A3iheNLgzezY=";
   };
 
-  cargoHash = "sha256-kSaQxqom8LSCOQBoIZ1iv+q2+Ih8l61L97xXv5c4a0k=";
+  cargoHash = "sha256-VOGgwBKcJK7x+PwvzvuVu9Zd1G8t9UoC/Me3G6bdtrk=";
 
   cargoPatches = [
     ./correct-Cargo.lock.patch
@@ -55,6 +55,8 @@ rustPlatform.buildRustPackage rec {
     Security
   ]);
 
+  OPENSSL_NO_VENDOR = 1;
+
   LIBPG_QUERY_PATH = libpg_query13;
 
   meta = with lib; {

From 8467c637493595a2023a1285100c7636c89f9217 Mon Sep 17 00:00:00 2001
From: R-VdP <141248+R-VdP@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:56:51 +0100
Subject: [PATCH 024/191] flashrom: use a udev uaccess tag instead of
 introducing a custom flashrom group

See https://wiki.archlinux.org/title/Udev#Allowing_regular_users_to_use_devices for more info about the uaccess tag. The udev-acl tag is a legacy implementation, we add it purely for backwards compatibility.
---
 nixos/modules/programs/flashrom.nix  | 1 -
 pkgs/tools/misc/flashrom/default.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/programs/flashrom.nix b/nixos/modules/programs/flashrom.nix
index 294b208a3720..9f8faff14e47 100644
--- a/nixos/modules/programs/flashrom.nix
+++ b/nixos/modules/programs/flashrom.nix
@@ -22,6 +22,5 @@ in
   config = mkIf cfg.enable {
     services.udev.packages = [ cfg.package ];
     environment.systemPackages = [ cfg.package ];
-    users.groups.flashrom = { };
   };
 }
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 615cca201814..a76074918a66 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace util/flashrom_udev.rules \
-      --replace "plugdev" "flashrom"
+      --replace 'GROUP="plugdev"' 'TAG+="uaccess", TAG+="udev-acl"'
   '';
 
   makeFlags = [ "PREFIX=$(out)" "libinstall" ]

From 7ae4cc2a21b155518bd57e899d17687efa656c39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Feb 2023 00:29:17 +0000
Subject: [PATCH 025/191] edencommon: 2023.01.30.00 -> 2023.02.13.00

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

diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix
index bd61fb603f8b..c30f7392bb52 100644
--- a/pkgs/development/libraries/edencommon/default.nix
+++ b/pkgs/development/libraries/edencommon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "edencommon";
-  version = "2023.01.30.00";
+  version = "2023.02.13.00";
 
   src = fetchFromGitHub {
     owner = "facebookexperimental";
     repo = "edencommon";
     rev = "v${version}";
-    sha256 = "sha256-N3/Ey0zrfOfuAaS6qIpEgUUL5GkCZrqpAspJ7OprLPk=";
+    sha256 = "sha256-WxxE7ePZuNkSKRQG5Vni51xrrZT6BsKwwvhzykQf9X4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 949b1df785df8b7db59e780c49d9f1abb56c2b3c Mon Sep 17 00:00:00 2001
From: Emily Trau <me@angus.ws>
Date: Sat, 18 Feb 2023 13:28:04 +1100
Subject: [PATCH 026/191] nixos/tailscale: fix config priority conflict

---
 nixos/modules/services/networking/tailscale.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 233bfdf9ebf5..c81cf293ab6d 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -82,8 +82,8 @@ in {
     };
 
     boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {
-      "net.ipv4.conf.all.forwarding" = mkDefault true;
-      "net.ipv6.conf.all.forwarding" = mkDefault true;
+      "net.ipv4.conf.all.forwarding" = mkOverride 97 true;
+      "net.ipv6.conf.all.forwarding" = mkOverride 97 true;
     };
 
     networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose";

From 482dfddc233f5aecefbdb8f5d50cfc3f5fbdae36 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 18 Feb 2023 15:30:15 +0100
Subject: [PATCH 027/191] thrift: 0.17.0 -> 0.18.0

---
 pkgs/development/libraries/thrift/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 92063eb1400a..fd6b21a94f72 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "thrift";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchurl {
     url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-snLBeIuxZdmVIaJZmzG5f6aeWTHQmQFdka4QegsMxY8=";
+    hash = "sha256-fBk4nLeRCiDli45GkDyMGjY1MAj5/MGwP3SKzPm18+E=";
   };
 
   # Workaround to make the Python wrapper not drop this package:
@@ -74,6 +74,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff";
       hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY=";
     })
+    (fetchpatch {
+      name = "thrift-fix-tests-OpenSSL3.patch"; # https://github.com/apache/thrift/pull/2760
+      url = "https://github.com/apache/thrift/commit/eae3ac418f36c73833746bcd53e69ed8a12f0e1a.diff";
+      hash = "sha256-0jlN4fo94cfGFUKcLFQgVMI/x7uxn5OiLiFk6txVPzs=";
+    })
   ];
 
   cmakeFlags = [
@@ -90,6 +95,7 @@ stdenv.mkDerivation rec {
 
   disabledTests = [
     "PythonTestSSLSocket"
+    "PythonThriftTNonblockingServer"
   ] ++ lib.optionals stdenv.isDarwin [
     # Tests that hang up in the Darwin sandbox
     "SecurityTest"
@@ -106,7 +112,6 @@ stdenv.mkDerivation rec {
     "StressTest"
     "StressTestConcurrent"
     "StressTestNonBlocking"
-    "PythonThriftTNonblockingServer"
   ];
 
   doCheck = !static;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f46e94edd40..e215807969d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23517,9 +23517,7 @@ with pkgs;
 
   theft = callPackage ../development/libraries/theft { };
 
-  thrift = callPackage ../development/libraries/thrift {
-    openssl = openssl_1_1;
-  };
+  thrift = callPackage ../development/libraries/thrift { };
 
   thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };
 

From ca2ce98720afc154a78c8e47d441c28ac42be864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 18 Feb 2023 15:39:54 +0100
Subject: [PATCH 028/191] steam-fhs: remove deprecated options

---
 pkgs/games/steam/fhsenv.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 7d496a5ec969..d31f33779961 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -1,16 +1,9 @@
-{ config, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686
+{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
 , extraProfile ? "" # string to append to profile
 , extraArgs ? "" # arguments to always pass to steam
-, runtimeOnly ? false
-, runtimeShell
-, stdenv
-
-# DEPRECATED
-, withJava ? config.steam.java or false
-, withPrimus ? config.steam.primus or false
 }:
 
 let
@@ -38,9 +31,7 @@ let
       # electron based launchers need newer versions of these libraries than what runtime provides
       mesa
       sqlite
-    ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
-      ++ lib.optional withPrimus primus
-      ++ extraPkgs pkgs;
+    ] ++ extraPkgs pkgs;
 
   ldPath = lib.optionals stdenv.is64bit [ "/lib64" ]
   ++ [ "/lib32" ]

From ad815aebfbfe1415ff6436521d545029c803c3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 18 Feb 2023 16:02:22 +0100
Subject: [PATCH 029/191] steam: cleanup

---
 pkgs/games/steam/fhsenv.nix | 48 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index d31f33779961..5ffa4c826287 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -7,31 +7,30 @@
 }:
 
 let
-  commonTargetPkgs = pkgs: with pkgs;
-    [
-      # Needed for operating system detection until
-      # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
-      lsb-release
-      # Errors in output without those
-      pciutils
-      # Games' dependencies
-      xorg.xrandr
-      which
-      # Needed by gdialog, including in the steam-runtime
-      perl
-      # Open URLs
-      xdg-utils
-      iana-etc
-      # Steam Play / Proton
-      python3
-      # Steam VR
-      procps
-      usbutils
+  commonTargetPkgs = pkgs: with pkgs; [
+    # Needed for operating system detection until
+    # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
+    lsb-release
+    # Errors in output without those
+    pciutils
+    # Games' dependencies
+    xorg.xrandr
+    which
+    # Needed by gdialog, including in the steam-runtime
+    perl
+    # Open URLs
+    xdg-utils
+    iana-etc
+    # Steam Play / Proton
+    python3
+    # Steam VR
+    procps
+    usbutils
 
-      # electron based launchers need newer versions of these libraries than what runtime provides
-      mesa
-      sqlite
-    ] ++ extraPkgs pkgs;
+    # electron based launchers need newer versions of these libraries than what runtime provides
+    mesa
+    sqlite
+  ] ++ extraPkgs pkgs;
 
   ldPath = lib.optionals stdenv.is64bit [ "/lib64" ]
   ++ [ "/lib32" ]
@@ -273,7 +272,6 @@ in buildFHSUserEnv rec {
 
     targetPkgs = commonTargetPkgs;
     inherit multiPkgs profile extraInstallCommands;
-
     inherit unshareIpc unsharePid;
 
     runScript = writeScript "steam-run" ''

From a62d444697933940052260f1fe86ace6df52c14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 18 Feb 2023 16:02:35 +0100
Subject: [PATCH 030/191] steam-small: init

A steam variant without game specific libraries to have a smaller
footprint on systems where people don't need or want the full blown fhs.
---
 pkgs/games/steam/default.nix    |   3 +-
 pkgs/games/steam/fhsenv.nix     | 114 ++++++++++++++++----------------
 pkgs/top-level/all-packages.nix |   1 +
 3 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 9dfb239620e4..9e7b815661c9 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -5,7 +5,7 @@
 let
   steamPackagesFun = self: let
     inherit (self) callPackage;
-  in {
+  in rec {
     steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
                 else if stdenv.hostPlatform.system == "i686-linux" then "i386"
                 else throw "Unsupported platform: ${stdenv.hostPlatform.system}";
@@ -21,6 +21,7 @@ let
         else null;
       inherit buildFHSUserEnv;
     };
+    steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; };
     steamcmd = callPackage ./steamcmd.nix { };
   };
   keep = self: { };
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 5ffa4c826287..c50176dce790 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -4,6 +4,7 @@
 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
 , extraProfile ? "" # string to append to profile
 , extraArgs ? "" # arguments to always pass to steam
+, withGameSpecificLibraries ? true # exclude game specific libraries
 }:
 
 let
@@ -77,52 +78,8 @@ in buildFHSUserEnv rec {
     libthai
     pango
 
-    # Not formally in runtime but needed by some games
-    at-spi2-atk
-    at-spi2-core   # CrossCode
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-ugly
-    gst_all_1.gst-plugins-base
-    json-glib # paradox launcher (Stellaris)
-    libdrm
-    libxkbcommon # paradox launcher
-    libvorbis # Dead Cells
-    libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
-    mono
-    xorg.xkeyboardconfig
-    xorg.libpciaccess
-    xorg.libXScrnSaver # Dead Cells
-    udev # shadow of the tomb raider
-    icu # dotnet runtime, e.g. stardew valley
-
-    # screeps dependencies
-    gtk3
-    dbus
-    zlib
-    atk
-    cairo
-    freetype
-    gdk-pixbuf
-    fontconfig
-
-    # friends options won't display "Launch Game" without it
-    lsof
-
-    # called by steam's setup.sh
-    file
-
-    # Prison Architect
-    libGLU
-    libuuid
-    libbsd
-    alsa-lib
-
-    # Loop Hero
-    libidn2
-    libpsl
-    nghttp2.lib
-    openssl_1_1
-    rtmpdump
+    lsof # friends options won't display "Launch Game" without it
+    file # called by steam's setup.sh
 
     # dependencies for mesa drivers, needed inside pressure-vessel
     mesa.llvmPackages.llvm.lib
@@ -134,14 +91,7 @@ in buildFHSUserEnv rec {
     xorg.libxshmfence
     xorg.libXxf86vm
     libelf
-
-    # pressure-vessel (required for mangohud and possibly more)
-    elfutils.out
-
-    # Required
-    glib
-    gtk2
-    bzip2
+    (lib.getLib elfutils)
 
     # Without these it silently fails
     xorg.libXinerama
@@ -161,10 +111,11 @@ in buildFHSUserEnv rec {
     libusb1
     dbus-glib
     ffmpeg
-    # Only libraries are needed from those two
     libudev0-shim
 
     # Verified games requirements
+    fontconfig
+    freetype
     xorg.libXt
     xorg.libXmu
     libogg
@@ -172,10 +123,15 @@ in buildFHSUserEnv rec {
     SDL
     SDL2_image
     glew110
+    libdrm
     libidn
     tbb
+    zlib
 
     # Other things from runtime
+    glib
+    gtk2
+    bzip2
     flac
     freeglut
     libjpeg
@@ -202,8 +158,48 @@ in buildFHSUserEnv rec {
     librsvg
     xorg.libXft
     libvdpau
-  ]
-  ++ steamPackages.steam-runtime-wrapped.overridePkgs
+  ] ++ lib.optionals withGameSpecificLibraries [
+    # Not formally in runtime but needed by some games
+    at-spi2-atk
+    at-spi2-core   # CrossCode
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-base
+    json-glib # paradox launcher (Stellaris)
+    libdrm
+    libxkbcommon # paradox launcher
+    libvorbis # Dead Cells
+    libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
+    mono
+    xorg.xkeyboardconfig
+    xorg.libpciaccess
+    xorg.libXScrnSaver # Dead Cells
+    udev # Shadow of the Tomb Raider
+    icu # dotnet runtime, e.g. Stardew Valley
+
+    # screeps dependencies
+    gtk3
+    dbus
+    zlib
+    atk
+    cairo
+    freetype
+    gdk-pixbuf
+    fontconfig
+
+    # Prison Architect
+    libGLU
+    libuuid
+    libbsd
+    alsa-lib
+
+    # Loop Hero
+    libidn2
+    libpsl
+    nghttp2.lib
+    openssl_1_1
+    rtmpdump
+  ] ++ steamPackages.steam-runtime-wrapped.overridePkgs
   ++ extraLibraries pkgs;
 
   extraInstallCommands = ''
@@ -256,7 +252,9 @@ in buildFHSUserEnv rec {
     exec steam ${extraArgs} "$@"
   '';
 
-  inherit (steam) meta;
+  meta = steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) {
+    description = steam.meta.description + " (without game specific libraries)";
+  };
 
   # allows for some gui applications to share IPC
   # this fixes certain issues where they don't render correctly
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f46e94edd40..148c545d0623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35759,6 +35759,7 @@ with pkgs;
   });
 
   steam = steamPackages.steam-fhsenv;
+  steam-small = steamPackages.steam-fhsenv-small;
 
   steam-run = steam.run;
 

From 6c7d4d4f9d4fe9bff6264890e4c3e09e96591305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Sat, 18 Feb 2023 18:13:11 +0100
Subject: [PATCH 031/191] lib/options: update showOption comment

---
 lib/options.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 5e8f4ca4bb95..b88af070513c 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -337,19 +337,17 @@ rec {
 
   # Helper functions.
 
-  /* Convert an option, described as a list of the option parts in to a
-     safe, human readable version.
+  /* Convert an option, described as a list of the option parts to a
+     human-readable version.
 
      Example:
        (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
-       (showOption ["foo" "bar.baz" "tux"]) == "foo.bar.baz.tux"
+       (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+       (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.\"2bwm\".enable"
 
      Placeholders will not be quoted as they are not actual values:
        (showOption ["foo" "*" "bar"]) == "foo.*.bar"
        (showOption ["foo" "<name>" "bar"]) == "foo.<name>.bar"
-
-     Unlike attributes, options can also start with numbers:
-       (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.2bwm.enable"
   */
   showOption = parts: let
     escapeOptionPart = part:

From d768db189f6def6238ef3a7aae27dd6cc0c932fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Feb 2023 01:00:58 +0000
Subject: [PATCH 032/191] i2pd: 2.45.1 -> 2.46.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 041fe636bd96..e734027b2208 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.45.1";
+  version = "2.46.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg=";
+    sha256 = "sha256-KK4fYMcLkmdZxLkNloVvkYoFrWDi8N5rRmsSGxUxwC4=";
   };
 
   buildInputs = [ boost zlib openssl ]

From a3cad255d864d9e041fcfddb094b452172dffdf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Feb 2023 02:40:20 +0000
Subject: [PATCH 033/191] discord: 0.0.24 -> 0.0.25

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 87eb241686c6..184000c6bf19 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,7 +1,7 @@
 { branch ? "stable", callPackage, fetchurl, lib, stdenv }:
 let
   versions = if stdenv.isLinux then {
-    stable = "0.0.24";
+    stable = "0.0.25";
     ptb = "0.0.38";
     canary = "0.0.148";
   } else {
@@ -14,7 +14,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        sha256 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc=";
+        sha256 = "sha256-WBcmy9fwGPq3Vs1+7lIOR7OiW/d0kZNIKp4Q5NRYBCw=";
       };
       ptb = fetchurl {
         url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From efe1c91cc1d68025c5d6bfebb408b722fddc2d66 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 19 Feb 2023 12:04:13 +0800
Subject: [PATCH 034/191] jami: 20221220.0956.79e1207 -> 20230206.0

---
 .../instant-messengers/jami/client.nix        |  77 ------
 .../instant-messengers/jami/daemon.nix        |  89 -------
 .../instant-messengers/jami/default.nix       | 222 +++++++++++++-----
 .../instant-messengers/jami/update.sh         |  61 -----
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   3 +-
 6 files changed, 172 insertions(+), 282 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/jami/client.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/jami/daemon.nix
 delete mode 100755 pkgs/applications/networking/instant-messengers/jami/update.sh

diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix
deleted file mode 100644
index 80efff68e65f..000000000000
--- a/pkgs/applications/networking/instant-messengers/jami/client.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ version
-, src
-, jami-meta
-, lib
-, stdenv
-, pkg-config
-, cmake
-, networkmanager # for libnm
-, python3
-, qttools # for translations
-, wrapQtAppsHook
-, ffmpeg_5
-, jami-daemon
-, libnotify
-, qt5compat
-, qtbase
-, qtdeclarative
-, qrencode
-, qtmultimedia
-, qtnetworkauth
-, qtsvg
-, qtwebengine
-, qtwebchannel
-, withWebengine ? true
-}:
-
-stdenv.mkDerivation {
-  pname = "jami-client";
-  inherit version src;
-
-  sourceRoot = "source/client-qt";
-
-  preConfigure = ''
-    echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
-  '';
-
-  nativeBuildInputs = [
-    wrapQtAppsHook
-    pkg-config
-    cmake
-    python3
-    qttools
-  ];
-
-  buildInputs = [
-    ffmpeg_5
-    jami-daemon
-    libnotify
-    networkmanager
-    qtbase
-    qt5compat
-    qrencode
-    qtnetworkauth
-    qtdeclarative
-    qtmultimedia
-    qtsvg
-    qtwebchannel
-  ] ++ lib.optionals withWebengine [
-    qtwebengine
-  ];
-
-  cmakeFlags = [
-    "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami"
-    "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"
-  ] ++ lib.optionals (!withWebengine) [
-    "-DWITH_WEBENGINE=false"
-  ];
-
-  qtWrapperArgs = [
-    # With wayland the titlebar is not themed and the wmclass is wrong.
-    "--set-default QT_QPA_PLATFORM xcb"
-  ];
-
-  meta = jami-meta // {
-    description = "The client based on QT" + jami-meta.description;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
deleted file mode 100644
index bf2392f63153..000000000000
--- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ src
-, version
-, jami-meta
-, stdenv
-, autoreconfHook
-, pkg-config
-, perl # for pod2man
-, alsa-lib
-, asio
-, dbus
-, dbus_cplusplus
-, ffmpeg_5
-, fmt
-, gmp
-, gnutls
-, http-parser
-, jack
-, jsoncpp
-, libarchive
-, libgit2
-, libnatpmp
-, libpulseaudio
-, libupnp
-, yaml-cpp
-, msgpack
-, opendht-jami
-, openssl
-, pjsip-jami
-, restinio
-, secp256k1
-, speex
-, udev
-, webrtc-audio-processing
-, zlib
-}:
-
-stdenv.mkDerivation {
-  pname = "jami-daemon";
-  inherit src version;
-  sourceRoot = "source/daemon";
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    perl
-  ];
-
-  buildInputs = [
-    alsa-lib
-    asio
-    dbus
-    dbus_cplusplus
-    fmt
-    ffmpeg_5
-    gmp
-    gnutls
-    http-parser
-    jack
-    jsoncpp
-    libarchive
-    libgit2
-    libnatpmp
-    libpulseaudio
-    libupnp
-    yaml-cpp
-    msgpack
-    opendht-jami
-    openssl
-    pjsip-jami
-    restinio
-    secp256k1
-    speex
-    udev
-    webrtc-audio-processing
-    zlib
-  ];
-
-  doCheck = false; # The tests fail to compile due to missing headers.
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    updateScript = ./update.sh;
-  };
-
-  meta = jami-meta // {
-    description = "The daemon" + jami-meta.description;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index 497616a6c038..1c9f581d463b 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -1,73 +1,95 @@
 { stdenv
 , lib
-, callPackage
-, fetchFromGitHub
-, fetchzip
-, fetchpatch
-, pjsip
-, opendht
+, pkg-config
+, fetchFromGitLab
+, gitUpdater
+, ffmpeg_5
+
+# for daemon
+, autoreconfHook
+, perl # for pod2man
+, alsa-lib
+, asio
+, dbus
+, dbus_cplusplus
+, fmt
+, gmp
+, gnutls
+, http-parser
 , jack
+, jsoncpp
+, libarchive
+, libgit2
+, libnatpmp
+, libpulseaudio
+, libupnp
+, yaml-cpp
+, msgpack
+, openssl
+, restinio
+, secp256k1
+, speex
 , udev
-, qt6Packages
+, webrtc-audio-processing
+, zlib
+
+# for client
+, cmake
+, networkmanager # for libnm
+, python3
+, qttools # for translations
+, wrapQtAppsHook
+, libnotify
+, qt5compat
+, qtbase
+, qtdeclarative
+, qrencode
+, qtmultimedia
+, qtnetworkauth
+, qtsvg
+, qtwebengine
+, qtwebchannel
+, withWebengine ? true
+
+# for pjsip
+, fetchFromGitHub
+, pjsip
+
+# for opendht
+, opendht
 }:
 
 let
-  version = "20221220.0956.79e1207";
-
-  src = fetchzip {
-    url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
-    hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8=";
-
-    stripRoot = false;
-    postFetch = ''
-      cd $out
-      mv jami-project/daemon ./
-      mv jami-project/client-qt ./
-      mv jami-project/COPYING ./
-      rm -r jami-project.rst jami-project
-      rm daemon/contrib/tarballs/*
-    '';
-  };
-
-  jami-meta = with lib; {
-    homepage = "https://jami.net/";
-    description = " for Jami, the free and universal communication platform that respects the privacy and freedoms of its users";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.linsui ];
-  };
-
   readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file));
 in
-rec {
+stdenv.mkDerivation rec {
+  pname = "jami";
+  version = "20230206.0";
+
+  src = fetchFromGitLab {
+    domain = "git.jami.net";
+    owner = "savoirfairelinux";
+    repo = "jami-client-qt";
+    rev = "stable/${version}";
+    hash = "sha256-MQ28UJUvgJoPk65neUgMrG+SxOcfnUl803urEFQ7468=";
+    fetchSubmodules = true;
+  };
+
   pjsip-jami = pjsip.overrideAttrs (old:
     let
       patch-src = src + "/daemon/contrib/src/pjproject/";
     in
     rec {
-      version = "eae25732568e600d248aa8c226271ff6b81df170";
+      version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f";
 
       src = fetchFromGitHub {
         owner = "savoirfairelinux";
         repo = "pjproject";
         rev = version;
-        sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc=";
+        hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ=";
       };
 
-      patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [
-        (fetchpatch {
-          name = "CVE-2022-23537.patch";
-          url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
-          sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
-        })
-        (fetchpatch {
-          name = "CVE-2022-23547.patch";
-          url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
-          sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
-        })
-      ];
-
-      patchFlags = [ "-p1" "-l" ];
+      patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
 
       configureFlags = (readLinesToList ./config/pjsip_args_common)
         ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
@@ -78,11 +100,105 @@ rec {
     enablePushNotifications = true;
   };
 
-  jami-daemon = callPackage ./daemon.nix {
-    inherit version src udev jack jami-meta pjsip-jami opendht-jami;
+  daemon = stdenv.mkDerivation {
+    pname = "jami-daemon";
+    inherit src version meta;
+    sourceRoot = "source/daemon";
+
+    nativeBuildInputs = [
+      autoreconfHook
+      pkg-config
+      perl
+    ];
+
+    buildInputs = [
+      alsa-lib
+      asio
+      dbus
+      dbus_cplusplus
+      fmt
+      ffmpeg_5
+      gmp
+      gnutls
+      http-parser
+      jack
+      jsoncpp
+      libarchive
+      libgit2
+      libnatpmp
+      libpulseaudio
+      libupnp
+      yaml-cpp
+      msgpack
+      opendht-jami
+      openssl
+      pjsip-jami
+      restinio
+      secp256k1
+      speex
+      udev
+      webrtc-audio-processing
+      zlib
+    ];
+
+    enableParallelBuilding = true;
   };
 
-  jami-client = qt6Packages.callPackage ./client.nix {
-    inherit version src jami-meta;
+  preConfigure = ''
+    echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
+  '';
+
+  nativeBuildInputs = [
+    wrapQtAppsHook
+    pkg-config
+    cmake
+    python3
+    qttools
+  ];
+
+  buildInputs = [
+    daemon
+    ffmpeg_5
+    libnotify
+    networkmanager
+    qtbase
+    qt5compat
+    qrencode
+    qtnetworkauth
+    qtdeclarative
+    qtmultimedia
+    qtsvg
+    qtwebchannel
+  ] ++ lib.optionals withWebengine [
+    qtwebengine
+  ];
+
+  cmakeFlags = [
+    "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami"
+    "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces"
+  ] ++ lib.optionals (!withWebengine) [
+    "-DWITH_WEBENGINE=false"
+  ];
+
+  qtWrapperArgs = [
+    # With wayland the titlebar is not themed and the wmclass is wrong.
+    "--set-default QT_QPA_PLATFORM xcb"
+  ];
+
+  postInstall = ''
+    # Make the jamid d-bus services available
+    ln -s ${daemon}/share/dbus-1 $out/share
+  '';
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "stable/";
+  };
+
+  meta = with lib; {
+    homepage = "https://jami.net/";
+    description = "The free and universal communication platform that respects the privacy and freedoms of its users";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.linsui ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh
deleted file mode 100755
index 27472d568c28..000000000000
--- a/pkgs/applications/networking/instant-messengers/jami/update.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch
-
-set -e
-
-jami_dir=$(readlink -e $(dirname "${BASH_SOURCE[0]}"))
-
-cd $jami_dir/../../../../..
-
-# Update src version and hash
-version=$(curl -s 'https://dl.jami.net/release/tarballs/?C=M;O=D' | sed -n -E 's/^.*jami_([0-9.a-f]+)\.tar\.gz.*$/\1/p' | head -n 1)
-echo "Latest version: ${version}"
-
-update-source-version jami-daemon "$version" --file=$jami_dir/default.nix
-
-src=$(nix-build --no-out-link -A jami-daemon.src)
-
-config_dir="$jami_dir/config"
-mkdir -p $config_dir
-
-ffmpeg_rules="${src}/daemon/contrib/src/ffmpeg/rules.mak"
-
-# Update FFmpeg patches
-ffmpeg_patches=$(sed -n '/^ffmpeg:/,/^$/p' ${ffmpeg_rules} | sed -n -E 's/.*ffmpeg\/(.*patch).*/\1/p')
-echo -e "Patches for FFmpeg:\n${ffmpeg_patches}\n"
-echo "${ffmpeg_patches}" > "$config_dir/ffmpeg_patches"
-
-# Update FFmpeg args
-ffmpeg_args_common=$(sed -n '/#disable everything/,/#platform specific options/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p')
-echo -e "Common args for FFmpeg:\n${ffmpeg_args_common}\n"
-echo "${ffmpeg_args_common}" > "$config_dir/ffmpeg_args_common"
-
-ffmpeg_args_linux1=$(sed -n '/ifdef HAVE_LINUX/,/ifdef HAVE_ANDROID/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p')
-ffmpeg_args_linux2=$(sed -n '/# Desktop Linux/,/i386 x86_64/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p')
-echo -e "Linux args for FFmpeg:\n${ffmpeg_args_linux1}\n${ffmpeg_args_linux2}\n"
-echo "${ffmpeg_args_linux1}" > "$config_dir/ffmpeg_args_linux"
-echo "${ffmpeg_args_linux2}" >> "$config_dir/ffmpeg_args_linux"
-
-ffmpeg_args_x86=$(sed -n '/i386 x86_64/,/# End Desktop Linux:/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p')
-echo -e "x86 args for FFmpeg:\n${ffmpeg_args_x86}\n"
-echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86"
-
-# Update pjsip patches
-pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p')
-echo -e "Patches for pjsip:\n${pjsip_patches}\n"
-echo "${pjsip_patches}" > "$config_dir/pjsip_patches"
-
-# Update pjsip version
-pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)
-update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix
-
-pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak"
-
-# Update pjsip args
-pjsip_args_common=$(sed -n '/PJPROJECT_OPTIONS :=/,/with-gnutls/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*\\/\1/p')
-echo -e "Common args for pjsip:\n${pjsip_args_common}\n"
-echo "${pjsip_args_common}" > "$config_dir/pjsip_args_common"
-
-pjsip_args_linux=$(sed -n '/HAVE_LINUX/,/endif/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p')
-echo -e "Linux args for pjsip:\n${pjsip_args_linux}\n"
-echo "${pjsip_args_linux}" > "$config_dir/pjsip_args_linux"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d091a2eecc77..4424c811632f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -693,6 +693,8 @@ mapAliases ({
   jack2Full = jack2; # moved from top-level 2021-03-14
   jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15
   jami-client-qt = jami-client; # Added 2022-11-06
+  jami-client = jami; # Added 2023-02-10
+  jami-daemon = jami.daemon; # Added 2023-02-10
   jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29
   jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21
   jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a9a91a045bb..ee76e771dff0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39107,12 +39107,11 @@ with pkgs;
 
   btcdeb = callPackage ../applications/blockchains/btcdeb { };
 
-  jami = callPackages ../applications/networking/instant-messengers/jami {
+  jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
     # TODO: remove once `udev` is `systemdMinimal` everywhere.
     udev = systemdMinimal;
     jack = libjack2;
   };
-  inherit (jami) jami-daemon jami-client;
 
   jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
 

From 9156d02e924661d9f5c574fe33cb940c5ebbf692 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 19 Feb 2023 12:17:11 +0800
Subject: [PATCH 035/191] waydroid: fix icon, shell and iptables

---
 pkgs/os-specific/linux/waydroid/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix
index 8955bcfa5126..d01759e8ed69 100644
--- a/pkgs/os-specific/linux/waydroid/default.nix
+++ b/pkgs/os-specific/linux/waydroid/default.nix
@@ -9,11 +9,12 @@
 , kmod
 , lxc
 , iproute2
-, nftables
+, iptables
 , util-linux
 , which
 , wrapGAppsHook
 , xclip
+, runtimeShell
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -50,14 +51,15 @@ python3Packages.buildPythonApplication rec {
   dontWrapGApps = true;
 
   installPhase = ''
-    make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1
+    make install PREFIX=$out USE_SYSTEMD=0
   '';
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
 
+    patchShebangs --host $out/lib/waydroid/data/scripts
     wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
-       --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]}
+      --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]}
 
     wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
       "$out"
@@ -71,6 +73,12 @@ python3Packages.buildPythonApplication rec {
       which
       xclip
     ]}"
+
+    substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
+      --replace '"sh"' '"${runtimeShell}"'
+
+    substituteInPlace $out/share/applications/*.desktop \
+      --replace  "/usr" "$out"
   '';
 
   meta = with lib; {

From a0f8ef409ac6186b84dc593c9c00318724eff5c2 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 7 Jan 2023 15:07:28 -0800
Subject: [PATCH 036/191] python-language-server: remove

---
 .../python-language-server/default.nix        |  46 --------
 .../python-language-server/deps.nix           | 107 ------------------
 .../python-language-server/updater.sh         |  23 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 1 insertion(+), 178 deletions(-)
 delete mode 100644 pkgs/development/dotnet-modules/python-language-server/default.nix
 delete mode 100644 pkgs/development/dotnet-modules/python-language-server/deps.nix
 delete mode 100755 pkgs/development/dotnet-modules/python-language-server/updater.sh

diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix
deleted file mode 100644
index 3044e884e3c6..000000000000
--- a/pkgs/development/dotnet-modules/python-language-server/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, buildDotnetModule
-, dotnetCorePackages
-, stdenvNoCC
-, autoPatchelfHook
-, openssl
-, icu
-}:
-
-buildDotnetModule rec {
-  pname = "python-language-server";
-  version = "2022-02-18";
-
-  src = fetchFromGitHub {
-    owner = "microsoft";
-    repo = "python-language-server";
-    rev = "52c1afd34b5acb0b44597bb8681232876fe94084";
-    sha256 = "05s8mwi3dqzjghgpr1mfs1b7cgrq818bbj1v7aly6axc8c2n4gny";
-  };
-
-  projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj";
-  nugetDeps = ./deps.nix;
-
-  dotnet-sdk = dotnetCorePackages.sdk_3_1;
-  dotnet-runtime = dotnetCorePackages.runtime_3_1;
-
-  nativeBuildInputs = [ autoPatchelfHook ];
-  buildInputs = [ stdenv.cc.cc.lib ];
-  runtimeDeps = [ openssl icu ];
-
-  postFixup = ''
-    mv $out/bin/Microsoft.Python.LanguageServer $out/bin/python-language-server
-  '';
-
-  passthru.updateScript = ./updater.sh;
-
-  meta = with lib; {
-    description = "Microsoft Language Server for Python";
-    homepage = "https://github.com/microsoft/python-language-server";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ thomasjm ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix
deleted file mode 100644
index de012bfb0abb..000000000000
--- a/pkgs/development/dotnet-modules/python-language-server/deps.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-# This file was automatically generated by passthru.fetch-deps.
-# Please dont edit it manually, your changes might get overwritten!
-
-{ fetchNuGet }: [
-  (fetchNuGet { pname = "MessagePack"; version = "2.1.90"; sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; })
-  (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.90"; sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; })
-  (fetchNuGet { pname = "MicroBuild.Core"; version = "0.3.0"; sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.8"; sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.6.13"; sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.6.13"; sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; })
-  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.5.76"; sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; })
-  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
-  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
-  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; })
-  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
-  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; })
-  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
-  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
-  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
-  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
-  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
-  (fetchNuGet { pname = "StreamJsonRpc"; version = "2.5.46"; sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
-  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
-  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
-  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
-  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
-  (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.0"; sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
-  (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; })
-  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
-  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; })
-  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
-]
diff --git a/pkgs/development/dotnet-modules/python-language-server/updater.sh b/pkgs/development/dotnet-modules/python-language-server/updater.sh
deleted file mode 100755
index 33ab153aee26..000000000000
--- a/pkgs/development/dotnet-modules/python-language-server/updater.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p gnused jq common-updater-scripts nix-prefetch-git
-set -eo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-deps_file="$(realpath ./deps.nix)"
-
-nix-prefetch-git https://github.com/microsoft/python-language-server --quiet > repo_info
-new_version="$(jq -r ".date" < repo_info | cut -d"T" -f1)"
-new_hash="$(jq -r ".sha256" < repo_info)"
-new_rev="$(jq -r ".rev" < repo_info)"
-rm repo_info
-
-old_rev="$(sed -nE 's/\s*rev = "(.*)".*/\1/p' ./default.nix)"
-
-if [[ $new_rev == $old_rev ]]; then
-  echo "Already up to date!"
-  exit 0
-fi
-
-pushd ../../../..
-update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev"
-$(nix-build -A python-language-server.fetch-deps --no-out-link) "$deps_file"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d091a2eecc77..80a8f286a646 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1293,6 +1293,7 @@ mapAliases ({
   pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12
   pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-01
   python = python2; # Added 2022-01-11
+  python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07
   python-swiftclient = swiftclient; # Added 2021-09-09
   python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead"; # Added 2021-03-08
   pythonFull = python2Full; # Added 2022-01-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9b992838fd2..0a6976039c75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18204,8 +18204,6 @@ with pkgs;
 
   mdl = callPackage ../development/tools/misc/mdl { };
 
-  python-language-server = callPackage ../development/dotnet-modules/python-language-server { };
-
   python-matter-server = with python3Packages; toPythonApplication python-matter-server;
 
   minify = callPackage ../development/web/minify { };

From 54e37e1a1d05226761bfc604db8da15b70ea5097 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Feb 2023 08:03:24 +0000
Subject: [PATCH 037/191] freerdpUnstable: 2.9.0 -> 2.10.0

---
 pkgs/applications/networking/remote/freerdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index a35e5b03f4a9..840cd97cda27 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -70,13 +70,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "freerdp";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = version;
-    sha256 = "sha256-I9xJWHoY8fZ5T9zca77gFciC+7JdD6fMwV16giiY4FU=";
+    sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg=";
   };
 
   postPatch = ''

From 4813c90dcf8398fcb38ba40e8ee640205b3ec928 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 19 Feb 2023 12:18:09 +0300
Subject: [PATCH 038/191] nchat: init at 3.17

---
 .../instant-messengers/nchat/default.nix      | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/nchat/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix
new file mode 100644
index 000000000000..43d2d7e37455
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv,  fetchFromGitHub, cmake, gperf
+, file, ncurses, openssl, readline, sqlite, zlib
+, AppKit, Cocoa, Foundation
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nchat";
+  version = "3.17";
+
+  src = fetchFromGitHub {
+    owner = "d99kris";
+    repo = "nchat";
+    rev = "v${version}";
+    hash = "sha256-BtWKt8paI0gCGSzLYN8x3Yp5MUpwCb2vBGcGQG2aumY=";
+  };
+
+  postPatch = ''
+    substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \
+      --replace "get_git_head_revision" "#get_git_head_revision"
+  '';
+
+  nativeBuildInputs = [ cmake gperf ];
+
+  buildInputs = [
+    file # for libmagic
+    ncurses
+    openssl
+    readline
+    sqlite
+    zlib
+  ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ];
+
+  cmakeFlags = [
+    "-DHAS_WHATSAPP=OFF" # go module build required
+  ];
+
+  meta = with lib; {
+    description = "Terminal-based chat client with support for Telegram and WhatsApp";
+    homepage = "https://github.com/d99kris/nchat";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9b992838fd2..f2c0412ea8ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31970,6 +31970,10 @@ with pkgs;
 
   ngt = callPackage ../development/libraries/ngt { };
 
+  nchat = callPackage ../applications/networking/instant-messengers/nchat {
+    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
+  };
+
   nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko {
     # https://github.com/NixOS/nixpkgs/issues/201254
     stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;

From b8701174d480381223c582cb8b449b6ed612a8ad Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Wed, 15 Feb 2023 17:23:58 +0700
Subject: [PATCH 039/191] =?UTF-8?q?amdvlk:=202022.Q4.4=20=E2=86=92=202023.?=
 =?UTF-8?q?Q1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tag: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2023.Q1.2
---
 pkgs/development/libraries/amdvlk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 4fd87c69d71d..0f85c0f3bc4b 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -25,13 +25,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2022.Q4.4";
+  version = "2023.Q1.2";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc=";
+    sha256 = "sha256-QNjBLOnSfCTA+5qLqejAqJv9eIWAEVNc/VrhidGjmTc=";
   };
 
   buildInputs = [

From 1e75de336c3eca39b23d55ca696528c0c0a16a37 Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Sun, 19 Feb 2023 16:55:04 +0300
Subject: [PATCH 040/191] nixos/mbpfan: add aggressive option

---
 nixos/modules/services/misc/mbpfan.nix | 39 ++++++++++++--------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index d467aa879767..1a6b54854d1c 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-
 with lib;
 
 let
@@ -16,17 +15,19 @@ in {
       type = types.package;
       default = pkgs.mbpfan;
       defaultText = literalExpression "pkgs.mbpfan";
-      description = lib.mdDoc ''
-        The package used for the mbpfan daemon.
-      '';
+      description = lib.mdDoc "The package used for the mbpfan daemon.";
     };
 
     verbose = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
-        If true, sets the log level to verbose.
-      '';
+      description = lib.mdDoc "If true, sets the log level to verbose.";
+    };
+
+    aggressive = mkOption {
+      type = types.bool;
+      default = false;
+      description = lib.mdDoc "If true, favors higher default fan speeds.";
     };
 
     settings = mkOption {
@@ -35,24 +36,14 @@ in {
       type = types.submodule {
         freeformType = settingsFormat.type;
 
-        options.general.min_fan1_speed = mkOption {
-          type = types.nullOr types.int;
-          default = 2000;
-          description = lib.mdDoc ''
-            You can check minimum and maximum fan limits with
-            `cat /sys/devices/platform/applesmc.768/fan*_min` and
-            `cat /sys/devices/platform/applesmc.768/fan*_max` respectively.
-            Setting to null implies using default value from applesmc.
-          '';
-        };
         options.general.low_temp = mkOption {
           type = types.int;
-          default = 55;
+          default = 63;
           description = lib.mdDoc "If temperature is below this, fans will run at minimum speed.";
         };
         options.general.high_temp = mkOption {
           type = types.int;
-          default = 58;
+          default = 66;
           description = lib.mdDoc "If temperature is above this, fan speed will gradually increase.";
         };
         options.general.max_temp = mkOption {
@@ -79,10 +70,16 @@ in {
   ];
 
   config = mkIf cfg.enable {
-    boot.kernelModules = [ "coretemp" "applesmc" ];
+    services.mbpfan.settings = mkIf cfg.aggressive {
+      general.min_fan1_speed = mkDefault 2000;
+      general.low_temp = mkDefault 55;
+      general.high_temp = mkDefault 58;
+      general.max_temp = mkDefault 70;
+    };
 
-    environment.etc."mbpfan.conf".source = settingsFile;
+    boot.kernelModules = [ "coretemp" "applesmc" ];
     environment.systemPackages = [ cfg.package ];
+    environment.etc."mbpfan.conf".source = settingsFile;
 
     systemd.services.mbpfan = {
       description = "A fan manager daemon for MacBook Pro";

From 0a2dd8fb201118549841c98edd1d84bf33a1cf8f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Feb 2023 21:31:04 +0100
Subject: [PATCH 041/191] python310Packages.testcontainers: 3.7.0 -> 3.7.1

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

diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix
index 20c52fd686a0..2b94a34989fc 100644
--- a/pkgs/development/python-modules/testcontainers/default.nix
+++ b/pkgs/development/python-modules/testcontainers/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "testcontainers";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "testcontainers";
     repo = "testcontainers-python";
     rev = "v${version}";
-    sha256 = "sha256-t6W5A877bSPcbKVzCLEhjPzOPwF8ZTGjlvnwt1CwWCE=";
+    sha256 = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM=";
   };
 
   buildInputs = [

From 0382f94f0463af1d322b0f29007497c04c15d493 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 19 Feb 2023 22:03:09 +0100
Subject: [PATCH 042/191] python310Packages.qiling: add changelog to emta

---
 pkgs/development/python-modules/qiling/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix
index e47d0b9fbf29..42247e4b33ef 100644
--- a/pkgs/development/python-modules/qiling/default.nix
+++ b/pkgs/development/python-modules/qiling/default.nix
@@ -49,6 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Qiling Advanced Binary Emulation Framework";
     homepage = "https://qiling.io/";
+    changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}";
     license = licenses.gpl2Only;
     maintainers = teams.determinatesystems.members;
   };

From 10b858a0222157b5bccf8b8d096997a3c4e017fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 00:44:21 +0100
Subject: [PATCH 043/191] appdaemon: 4.0.8 -> 4.2.1

https://github.com/AppDaemon/appdaemon/blob/4.2.1/docs/HISTORY.rst
---
 pkgs/servers/home-assistant/appdaemon.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 7af675de41fe..d44145dfecc3 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -5,21 +5,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "4.0.8";
-  disabled = python3.pythonOlder "3.6";
+  version = "4.2.1";
+  format = "setuptools";
+
+  disabled = python3.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "AppDaemon";
-    repo = pname;
-    rev = version;
-    sha256 = "04a4qx0rbx2vpkzpibmwkpy7fawa6dbgqlrllryrl7dchbrf703q";
+    repo = "appdaemon";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY=";
   };
 
-  # relax dependencies
   postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "deepdiff==5.2.3" "deepdiff" \
-      --replace "pygments==2.8.1" "pygments"
+    # relax dependencies
     sed -i 's/==/>=/' requirements.txt
   '';
 
@@ -63,6 +62,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
     homepage = "https://github.com/AppDaemon/appdaemon";
+    changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst";
     license = licenses.mit;
     maintainers = teams.home-assistant.members;
   };

From 2cf29e463524e46d0aa34f3aac26bd628ef1166f Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Sat, 18 Feb 2023 22:05:10 +0800
Subject: [PATCH 044/191] mfoc-hardnested: init at unstable-2021-08-14

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

diff --git a/pkgs/tools/security/mfoc-hardnested/default.nix b/pkgs/tools/security/mfoc-hardnested/default.nix
new file mode 100644
index 000000000000..ee6d5a3dd30f
--- /dev/null
+++ b/pkgs/tools/security/mfoc-hardnested/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnfc, xz }:
+
+stdenv.mkDerivation rec {
+  pname = "mfoc-hardnested";
+  version = "unstable-2021-08-14";
+
+  src = fetchFromGitHub {
+    owner = "nfc-tools";
+    repo = pname;
+    rev = "2c25bf05a0b13827b9d06382c5d384b2e5c88238";
+    hash = "sha256-fhfevQCw0E5TorHx61Vltpmv7DAjgH73i27O7aBKxz4=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  buildInputs = [ libnfc xz ];
+
+  meta = with lib; {
+    description = "A fork of mfoc integrating hardnested code from the proxmark";
+    license = licenses.gpl2;
+    homepage = "https://github.com/nfc-tools/mfoc-hardnested";
+    maintainers = with maintainers; [ azuwis ];
+    platforms = platforms.unix;
+    broken = (stdenv.isDarwin && stdenv.isAarch64); # Undefined symbols "_memalign" referenced
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f46e94edd40..774be54e0ca0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9762,6 +9762,8 @@ with pkgs;
 
   mfoc = callPackage ../tools/security/mfoc { };
 
+  mfoc-hardnested = callPackage ../tools/security/mfoc-hardnested { };
+
   microbin = callPackage ../servers/microbin { };
 
   microdnf = callPackage ../tools/package-management/microdnf { };

From 50bfecb5bc311222c2e7acdbeb94a85710755d1a Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Mon, 20 Feb 2023 04:58:10 +0100
Subject: [PATCH 045/191] streamlink: 5.2.1 -> 5.3.0

https://github.com/streamlink/streamlink/releases/tag/5.3.0
---
 pkgs/applications/video/streamlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index d10fd2e21a79..664cbcf2db3f 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "5.2.1";
+  version = "5.3.0";
   format = "pyproject";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw=";
+    hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE=";
   };
 
   nativeCheckInputs = with python3Packages; [

From a3a92e390132607721ecb77250488bbc16ad1b49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 07:47:54 +0000
Subject: [PATCH 046/191] python310Packages.ipydatawidgets: 4.3.2 -> 4.3.3

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

diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix
index edfbc49d776b..88c426870c34 100644
--- a/pkgs/development/python-modules/ipydatawidgets/default.nix
+++ b/pkgs/development/python-modules/ipydatawidgets/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "ipydatawidgets";
-  version = "4.3.2";
+  version = "4.3.3";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LyuZf2Vp0+4fT3412wyx2gjAd7IaiPHAHFn1uYajGqY=";
+    sha256 = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y=";
   };
 
   nativeBuildInputs = [

From a0343b268a128abb3d3a0788b3b4f2cfc5d00005 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 08:56:11 +0100
Subject: [PATCH 047/191] python310Packages.first: add changelog to meta

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

diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index 491fcd398053..df9eb0af5038 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
 
 buildPythonPackage rec {
   pname = "first";
@@ -6,7 +9,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gykyrm6zlrbf9iz318p57qwk594mx1jf0d79v79g32zql45na7z";
+    sha256 = "1gykyrm6zlrbf0iz318p57qwk594mx1jf0d79v79g32zql45na7z";
   };
 
   doCheck = false; # no tests
@@ -14,6 +17,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "The function you always missed in Python";
     homepage = "https://github.com/hynek/first/";
+    changelog = "https://github.com/hynek/first/blob/${version}/HISTORY.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
   };

From c1cf12166281741e877e4c33f2c9f6c440ef3ae4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 08:58:27 +0100
Subject: [PATCH 048/191] python310Packages.first: add pythonImportsCheck

- disable on unsupported Pythpn releases
---
 pkgs/development/python-modules/first/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index df9eb0af5038..0e75f61a9f70 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -1,19 +1,27 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "first";
   version = "2.0.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gykyrm6zlrbf0iz318p57qwk594mx1jf0d79v79g32zql45na7z";
+    hash = "sha256-/yhbCMVfjJfOTqcBJ0OvJJXJ8SkXhfFjcivTb2r2078=";
   };
 
   doCheck = false; # no tests
 
+  pythonImportsCheck = [
+    "first"
+  ];
+
   meta = with lib; {
     description = "The function you always missed in Python";
     homepage = "https://github.com/hynek/first/";

From 0978541585d2c9fec1bbdc46df3d3633f0c09565 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 09:04:30 +0100
Subject: [PATCH 049/191] python310Packages.overrides: init at 7.3.1

---
 .../python-modules/overrides/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/overrides/default.nix

diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix
new file mode 100644
index 000000000000..6d916ffa639d
--- /dev/null
+++ b/pkgs/development/python-modules/overrides/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "overrides";
+  version = "7.3.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "mkorpela";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-mxMh1ifOnii2SqxYjupDKvslHVGwClGtRgyoJSCGfZo=";
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "overrides"
+  ];
+
+  meta = with lib; {
+    description = "Decorator to automatically detect mismatch when overriding a method";
+    homepage = "https://github.com/mkorpela/overrides";
+    changelog = "https://github.com/mkorpela/overrides/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 988f7e71981c..483937c1d623 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7068,6 +7068,8 @@ self: super: with self; {
 
   overpy = callPackage ../development/python-modules/overpy { };
 
+  overrides = callPackage ../development/python-modules/overrides { };
+
   pandas-stubs = callPackage ../development/python-modules/pandas-stubs { };
 
   pdunehd = callPackage ../development/python-modules/pdunehd { };

From 51094d7cf348e96852cd0c88c1a68918f8f9d261 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:41:20 +0200
Subject: [PATCH 050/191] nvc: 1.8.1 -> 1.8.2

---
 pkgs/applications/science/electronics/nvc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix
index 638c07b8d692..cff9809b0306 100644
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = pname;
     rev = "r${version}";
-    hash = "sha256-9ziGNAZgUYnBofx7YwSzAgL4zIAwoPYMsGWBYs+xtg0=";
+    hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk=";
   };
 
   nativeBuildInputs = [

From e04006869b09a3beb45fb7825282a043a6bedd82 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 09:48:09 +0100
Subject: [PATCH 051/191] python310Packages.python-fx: init at 0.2.0

---
 .../python-modules/python-fx/default.nix      | 100 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-fx/default.nix

diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix
new file mode 100644
index 000000000000..729c5ed9a180
--- /dev/null
+++ b/pkgs/development/python-modules/python-fx/default.nix
@@ -0,0 +1,100 @@
+{ lib
+, antlr4-python3-runtime
+, asciimatics
+, buildPythonPackage
+, click
+, dacite
+, decorator
+, fetchFromGitHub
+, future
+, first
+, jsonpath-ng
+, loguru
+, overrides
+, pillow
+, ply
+, pyfiglet
+, pyperclip
+, pytestCheckHook
+, pythonOlder
+, antlr4
+, pythonRelaxDepsHook
+, pyyaml
+, setuptools
+, six
+, urwid
+, parameterized
+, wcwidth
+, yamale
+}:
+
+buildPythonPackage rec {
+  pname = "python-fx";
+  version = "0.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "cielong";
+    repo = "pyfx";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so=";
+  };
+
+  postPatch = ''
+    rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens}
+    antlr -Dlanguage=Python3 -visitor -o src/pyfx/model/common/jsonpath/ *.g4
+  '';
+
+  pythonRelaxDeps = true;
+
+  nativeBuildInputs = [
+    antlr4
+    pythonRelaxDepsHook
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    antlr4-python3-runtime
+    asciimatics
+    click
+    dacite
+    decorator
+    first
+    future
+    jsonpath-ng
+    loguru
+    overrides
+    pillow
+    ply
+    pyfiglet
+    pyperclip
+    pyyaml
+    six
+    urwid
+    wcwidth
+    yamale
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    parameterized
+  ];
+
+  # antlr4 issue prevents us from running the tests
+  # https://github.com/antlr/antlr4/issues/4041
+  doCheck = false;
+
+  # pythonImportsCheck = [
+  #   "pyfx"
+  # ];
+
+  meta = with lib; {
+    description = "Module to view JSON in a TUI";
+    homepage = "https://github.com/cielong/pyfx";
+    changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 483937c1d623..4afee569903a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7300,6 +7300,8 @@ self: super: with self; {
 
   python-fullykiosk = callPackage ../development/python-modules/python-fullykiosk { };
 
+  python-fx = callPackage ../development/python-modules/python-fx { };
+
   python-glanceclient = callPackage ../development/python-modules/python-glanceclient { };
 
   python-google-nest = callPackage ../development/python-modules/python-google-nest { };

From 2da2df387370a860fb8aeb34c03485f12fb19d64 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 09:50:02 +0100
Subject: [PATCH 052/191] python310Packages.qiling: 1.4.4 -> 1.4.5

Changelog: https://github.com/qilingframework/qiling/releases/tag/1.4.5
---
 pkgs/development/python-modules/qiling/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix
index 42247e4b33ef..0b008f86f884 100644
--- a/pkgs/development/python-modules/qiling/default.nix
+++ b/pkgs/development/python-modules/qiling/default.nix
@@ -9,21 +9,24 @@
 , pefile
 , pyelftools
 , pythonOlder
+, python-fx
 , python-registry
 , pyyaml
+, questionary
+, termcolor
 , unicorn
 }:
 
 buildPythonPackage rec {
   pname = "qiling";
-  version = "1.4.4";
+  version = "1.4.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gtPYwmQ96+jz6XrqU0ufaN7Ht6gqrtxGrDoaTWce7/U=";
+    hash = "sha256-MEafxry/ewqlzOMu9TJMQodXLChGMYjS2jX3yv7FZJk=";
   };
 
   propagatedBuildInputs = [
@@ -33,8 +36,11 @@ buildPythonPackage rec {
     multiprocess
     pefile
     pyelftools
+    python-fx
     python-registry
     pyyaml
+    termcolor
+    questionary
     unicorn
   ];
 

From 0b286bd6ef4276af6e415dfa598ff6266056821f Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Sat, 18 Feb 2023 20:20:53 +0100
Subject: [PATCH 053/191] ntfy-sh: 1.31.0 -> 2.0.1

Diff: https://github.com/binwiederhier/ntfy/compare/v1.31.0...v2.0.1

Release notes: https://docs.ntfy.sh/releases/#ntfy-server-v201
---
 pkgs/tools/misc/ntfy-sh/default.nix           |    6 +-
 .../misc/ntfy-sh/generate-dependencies.sh     |    3 +-
 pkgs/tools/misc/ntfy-sh/node-packages.nix     | 1719 ++++++++++-------
 pkgs/tools/misc/ntfy-sh/package.json          |    1 +
 4 files changed, 978 insertions(+), 751 deletions(-)

diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix
index 0909e0059c9a..4f7536312a03 100644
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@@ -10,16 +10,16 @@ let
 in
 buildGoModule rec {
   pname = "ntfy-sh";
-  version = "1.31.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
     rev = "v${version}";
-    sha256 = "sha256-SQOiVHhdwOmzWVPtr1hw9oz8G/xjz5HghYcNN/u3ITo=";
+    sha256 = "sha256-r5MAffvQVya6VWzdO3NPVBAekeZQllxtpS5A06EQnI4=";
   };
 
-  vendorSha256 = "sha256-Ffmz7c/FMtXjmanZYp8vquxUu+eSTqtR5nesNdN/F0c=";
+  vendorSha256 = "sha256-QUUZX9UnLnhyYrbws9pGfN/gqbwt7CeJNYlsPsLRb6g=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh b/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh
index a7cafab319ee..83e2e2b7b420 100755
--- a/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh
+++ b/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh
@@ -6,6 +6,7 @@ $(nix-build $ROOT -A  nodePackages.node2nix --no-out-link)/bin/node2nix \
   --nodejs-14 \
   --node-env ../../../development/node-packages/node-env.nix \
   --development \
-  --lock ./package-lock-temp.json \
   --output node-packages.nix \
   --composition node-composition.nix
+# removed temporarily because of https://github.com/svanderburg/node2nix/issues/312
+# --lock ./package-lock-temp.json \
diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix
index 2ce76e5ababf..b0f7e33dcdc2 100644
--- a/pkgs/tools/misc/ntfy-sh/node-packages.nix
+++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix
@@ -31,22 +31,22 @@ let
         sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==";
       };
     };
-    "@babel/compat-data-7.20.10" = {
+    "@babel/compat-data-7.20.14" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.20.10";
+      version = "7.20.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz";
-        sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz";
+        sha512 = "0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==";
       };
     };
-    "@babel/core-7.20.7" = {
+    "@babel/core-7.20.12" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.20.7";
+      version = "7.20.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz";
-        sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz";
+        sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==";
       };
     };
     "@babel/eslint-parser-7.19.1" = {
@@ -58,13 +58,13 @@ let
         sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==";
       };
     };
-    "@babel/generator-7.20.7" = {
+    "@babel/generator-7.20.14" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.20.7";
+      version = "7.20.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz";
-        sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz";
+        sha512 = "AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==";
       };
     };
     "@babel/helper-annotate-as-pure-7.18.6" = {
@@ -94,13 +94,13 @@ let
         sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.20.7" = {
+    "@babel/helper-create-class-features-plugin-7.20.12" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.20.7";
+      version = "7.20.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.7.tgz";
-        sha512 = "LtoWbDXOaidEf50hmdDqn9g8VEzsorMexoWMQdQODbvmqYmaF23pBP5VNPAGIFHsFQCIeKokDiz3CH5Y2jlY6w==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz";
+        sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==";
       };
     };
     "@babel/helper-create-regexp-features-plugin-7.20.5" = {
@@ -175,13 +175,13 @@ let
         sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==";
       };
     };
-    "@babel/helper-module-transforms-7.20.7" = {
+    "@babel/helper-module-transforms-7.20.11" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.20.7";
+      version = "7.20.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz";
-        sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz";
+        sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==";
       };
     };
     "@babel/helper-optimise-call-expression-7.18.6" = {
@@ -283,13 +283,13 @@ let
         sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==";
       };
     };
-    "@babel/helpers-7.20.7" = {
+    "@babel/helpers-7.20.13" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.20.7";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz";
-        sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz";
+        sha512 = "nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==";
       };
     };
     "@babel/highlight-7.18.6" = {
@@ -301,13 +301,13 @@ let
         sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==";
       };
     };
-    "@babel/parser-7.20.7" = {
+    "@babel/parser-7.20.15" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.20.7";
+      version = "7.20.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz";
-        sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz";
+        sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==";
       };
     };
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = {
@@ -355,13 +355,13 @@ let
         sha512 = "AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==";
       };
     };
-    "@babel/plugin-proposal-decorators-7.20.7" = {
+    "@babel/plugin-proposal-decorators-7.20.13" = {
       name = "_at_babel_slash_plugin-proposal-decorators";
       packageName = "@babel/plugin-proposal-decorators";
-      version = "7.20.7";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz";
-        sha512 = "JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.13.tgz";
+        sha512 = "7T6BKHa9Cpd7lCueHBBzP0nkXNina+h5giOZw+a8ZpMfPFY19VjJAjIxyFHuWkhCWgL6QMqRiY/wB1fLXzm6Mw==";
       };
     };
     "@babel/plugin-proposal-dynamic-import-7.18.6" = {
@@ -688,13 +688,13 @@ let
         sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.20.9" = {
+    "@babel/plugin-transform-block-scoping-7.20.15" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.20.9";
+      version = "7.20.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.9.tgz";
-        sha512 = "hwZN0kr16UkIF/kR9F9x8gd1kTkQl1vyAF2lkUmlTuCtTKOGLE5blQctuxEeKXwz0dkArQ9RYL8+HLb/75KGMA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz";
+        sha512 = "Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==";
       };
     };
     "@babel/plugin-transform-classes-7.20.7" = {
@@ -796,31 +796,31 @@ let
         sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.20.7" = {
+    "@babel/plugin-transform-modules-amd-7.20.11" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.20.7";
+      version = "7.20.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.7.tgz";
-        sha512 = "+1IVLD+dHOzRZWNFFSoyPZz4ffsVmOP+OhhjeahLKpU97v/52LcCb9RabRl5eHM1/HAuH5Dl0q9Pyzrq1v2otQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz";
+        sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.20.7" = {
+    "@babel/plugin-transform-modules-commonjs-7.20.11" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.20.7";
+      version = "7.20.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.7.tgz";
-        sha512 = "76jqqFiFdCD+RJwEdtBHUG2/rEKQAmpejPbAKyQECEE3/y4U5CMPc9IXvipS990vgQhzq+ZRw6WJ+q4xJ/P24w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz";
+        sha512 = "S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.19.6" = {
+    "@babel/plugin-transform-modules-systemjs-7.20.11" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.19.6";
+      version = "7.20.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz";
-        sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz";
+        sha512 = "vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==";
       };
     };
     "@babel/plugin-transform-modules-umd-7.18.6" = {
@@ -895,13 +895,13 @@ let
         sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.20.7" = {
+    "@babel/plugin-transform-react-jsx-7.20.13" = {
       name = "_at_babel_slash_plugin-transform-react-jsx";
       packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.20.7";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz";
-        sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz";
+        sha512 = "MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==";
       };
     };
     "@babel/plugin-transform-react-jsx-development-7.18.6" = {
@@ -994,13 +994,13 @@ let
         sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==";
       };
     };
-    "@babel/plugin-transform-typescript-7.20.7" = {
+    "@babel/plugin-transform-typescript-7.20.13" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.20.7";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz";
-        sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz";
+        sha512 = "O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA==";
       };
     };
     "@babel/plugin-transform-unicode-escapes-7.18.10" = {
@@ -1057,22 +1057,22 @@ let
         sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==";
       };
     };
-    "@babel/runtime-7.20.7" = {
-      name = "_at_babel_slash_runtime";
-      packageName = "@babel/runtime";
-      version = "7.20.7";
+    "@babel/regjsgen-0.8.0" = {
+      name = "_at_babel_slash_regjsgen";
+      packageName = "@babel/regjsgen";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz";
-        sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==";
+        url = "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz";
+        sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==";
       };
     };
-    "@babel/runtime-corejs3-7.20.7" = {
-      name = "_at_babel_slash_runtime-corejs3";
-      packageName = "@babel/runtime-corejs3";
-      version = "7.20.7";
+    "@babel/runtime-7.20.13" = {
+      name = "_at_babel_slash_runtime";
+      packageName = "@babel/runtime";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz";
-        sha512 = "jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz";
+        sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==";
       };
     };
     "@babel/template-7.20.7" = {
@@ -1084,13 +1084,13 @@ let
         sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==";
       };
     };
-    "@babel/traverse-7.20.10" = {
+    "@babel/traverse-7.20.13" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.20.10";
+      version = "7.20.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.10.tgz";
-        sha512 = "oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz";
+        sha512 = "kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==";
       };
     };
     "@babel/types-7.20.7" = {
@@ -1246,22 +1246,22 @@ let
         sha512 = "c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==";
       };
     };
-    "@csstools/selector-specificity-2.0.2" = {
+    "@csstools/selector-specificity-2.1.1" = {
       name = "_at_csstools_slash_selector-specificity";
       packageName = "@csstools/selector-specificity";
-      version = "2.0.2";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz";
-        sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==";
+        url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz";
+        sha512 = "jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==";
       };
     };
-    "@emotion/babel-plugin-11.10.5" = {
+    "@emotion/babel-plugin-11.10.6" = {
       name = "_at_emotion_slash_babel-plugin";
       packageName = "@emotion/babel-plugin";
-      version = "11.10.5";
+      version = "11.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz";
-        sha512 = "xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==";
+        url = "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.6.tgz";
+        sha512 = "p2dAqtVrkhSa7xz1u/m9eHYdLi+en8NowrmXeF/dKtJpU8lCWli8RUAati7NcSl0afsBott48pdnANuD0wh9QQ==";
       };
     };
     "@emotion/cache-11.10.5" = {
@@ -1300,13 +1300,13 @@ let
         sha512 = "G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==";
       };
     };
-    "@emotion/react-11.10.5" = {
+    "@emotion/react-11.10.6" = {
       name = "_at_emotion_slash_react";
       packageName = "@emotion/react";
-      version = "11.10.5";
+      version = "11.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz";
-        sha512 = "TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==";
+        url = "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz";
+        sha512 = "6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw==";
       };
     };
     "@emotion/serialize-1.1.1" = {
@@ -1327,13 +1327,13 @@ let
         sha512 = "zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==";
       };
     };
-    "@emotion/styled-11.10.5" = {
+    "@emotion/styled-11.10.6" = {
       name = "_at_emotion_slash_styled";
       packageName = "@emotion/styled";
-      version = "11.10.5";
+      version = "11.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz";
-        sha512 = "8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==";
+        url = "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.6.tgz";
+        sha512 = "OXtBzOmDSJo5Q0AFemHCfl+bUueT8BIcPSxu0EGTpGk6DmI5dnhSzQANm1e1ze0YZL7TDyAyy6s/b/zmGOS3Og==";
       };
     };
     "@emotion/unitless-0.8.0" = {
@@ -1372,13 +1372,13 @@ let
         sha512 = "AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==";
       };
     };
-    "@eslint/eslintrc-1.4.0" = {
+    "@eslint/eslintrc-1.4.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz";
-        sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz";
+        sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==";
       };
     };
     "@humanwhocodes/config-array-0.11.8" = {
@@ -1633,67 +1633,67 @@ let
         sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==";
       };
     };
-    "@mui/base-5.0.0-alpha.111" = {
+    "@mui/base-5.0.0-alpha.118" = {
       name = "_at_mui_slash_base";
       packageName = "@mui/base";
-      version = "5.0.0-alpha.111";
+      version = "5.0.0-alpha.118";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.111.tgz";
-        sha512 = "2wfIPpl97S4dPzD0QOM3UIzQ/EuXCYQvHmXxTpfKxev/cfkzOe7Ik/McoYUBbtM1bSOqH3W276R/L2LF9cyXqQ==";
+        url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.118.tgz";
+        sha512 = "GAEpqhnuHjRaAZLdxFNuOf2GDTp9sUawM46oHZV4VnYPFjXJDkIYFWfIQLONb0nga92OiqS5DD/scGzVKCL0Mw==";
       };
     };
-    "@mui/core-downloads-tracker-5.11.1" = {
+    "@mui/core-downloads-tracker-5.11.9" = {
       name = "_at_mui_slash_core-downloads-tracker";
       packageName = "@mui/core-downloads-tracker";
-      version = "5.11.1";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.1.tgz";
-        sha512 = "QVqVNlZ2K+LqUDE5kFgYd0r4KekR/dv2cNYbAutQWbfOA8VPVUVrDz0ELrEcoe8TjM/CwnsmGvaDh/YSNl/ALA==";
+        url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.9.tgz";
+        sha512 = "YGEtucQ/Nl91VZkzYaLad47Cdui51n/hW+OQm4210g4N3/nZzBxmGeKfubEalf+ShKH4aYDS86XTO6q/TpZnjQ==";
       };
     };
-    "@mui/icons-material-5.11.0" = {
+    "@mui/icons-material-5.11.9" = {
       name = "_at_mui_slash_icons-material";
       packageName = "@mui/icons-material";
-      version = "5.11.0";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.0.tgz";
-        sha512 = "I2LaOKqO8a0xcLGtIozC9xoXjZAto5G5gh0FYUMAlbsIHNHIjn4Xrw9rvjY20vZonyiGrZNMAlAXYkY6JvhF6A==";
+        url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.9.tgz";
+        sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw==";
       };
     };
-    "@mui/material-5.11.1" = {
+    "@mui/material-5.11.9" = {
       name = "_at_mui_slash_material";
       packageName = "@mui/material";
-      version = "5.11.1";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/material/-/material-5.11.1.tgz";
-        sha512 = "yaZiXvcrl2vgUK+VO24780BWRgwdAMmAyuMVZnRTts1Yu0tWd6PjIYq2ZtaOlpj6/LbaSS+Q2kSfxYnDQ20CEQ==";
+        url = "https://registry.npmjs.org/@mui/material/-/material-5.11.9.tgz";
+        sha512 = "Wb3WzjzYyi/WKSl/XlF7aC8kk2NE21IoHMF7hNQMkPb0GslbWwR4OUjlBpxtG+RSZn44wMZkEDNB9Hw0TDsd8g==";
       };
     };
-    "@mui/private-theming-5.11.1" = {
+    "@mui/private-theming-5.11.9" = {
       name = "_at_mui_slash_private-theming";
       packageName = "@mui/private-theming";
-      version = "5.11.1";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.1.tgz";
-        sha512 = "nnHg7kA5RwFRhy0wiDYe59sLCVGORpPypL1JcEdhv0+N0Zbmc2E/y4z2zqMRZ62MAEscpro7cQbvv244ThA84A==";
+        url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.9.tgz";
+        sha512 = "XMyVIFGomVCmCm92EvYlgq3zrC9K+J6r7IKl/rBJT2/xVYoRY6uM7jeB+Wxh7kXxnW9Dbqsr2yL3cx6wSD1sAg==";
       };
     };
-    "@mui/styled-engine-5.11.0" = {
+    "@mui/styled-engine-5.11.9" = {
       name = "_at_mui_slash_styled-engine";
       packageName = "@mui/styled-engine";
-      version = "5.11.0";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.0.tgz";
-        sha512 = "AF06K60Zc58qf0f7X+Y/QjaHaZq16znliLnGc9iVrV/+s8Ln/FCoeNuFvhlCbZZQ5WQcJvcy59zp0nXrklGGPQ==";
+        url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.9.tgz";
+        sha512 = "bkh2CjHKOMy98HyOc8wQXEZvhOmDa/bhxMUekFX5IG0/w4f5HJ8R6+K6nakUUYNEgjOWPYzNPrvGB8EcGbhahQ==";
       };
     };
-    "@mui/system-5.11.1" = {
+    "@mui/system-5.11.9" = {
       name = "_at_mui_slash_system";
       packageName = "@mui/system";
-      version = "5.11.1";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/system/-/system-5.11.1.tgz";
-        sha512 = "BEA2S0hay8n8CcZftkeAVsi0nsb5ZjdnZRCahv5lX7QJYwDjO4ucJ6lnvxHe2v/9Te1LLjTO7ojxu/qM6CE5Cg==";
+        url = "https://registry.npmjs.org/@mui/system/-/system-5.11.9.tgz";
+        sha512 = "h6uarf+l3FO6l75Nf7yO+qDGrIoa1DM9nAMCUFZQsNCDKOInRzcptnm8M1w/Z3gVetfeeGoIGAYuYKbft6KZZA==";
       };
     };
     "@mui/types-7.2.3" = {
@@ -1705,13 +1705,13 @@ let
         sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==";
       };
     };
-    "@mui/utils-5.11.1" = {
+    "@mui/utils-5.11.9" = {
       name = "_at_mui_slash_utils";
       packageName = "@mui/utils";
-      version = "5.11.1";
+      version = "5.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.1.tgz";
-        sha512 = "lMAPgIJoil8V9ZxsMbEflMsvZmWcHbRVMc4JDY9jPO9V4welpF43h/O267b1RqlcRnC5MEbVQV605GYkTZY29Q==";
+        url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.9.tgz";
+        sha512 = "eOJaqzcEs4qEwolcvFAmXGpln+uvouvOS9FUX6Wkrte+4I8rZbjODOBDVNlK+V6/ziTfD4iNKC0G+KfOTApbqg==";
       };
     };
     "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = {
@@ -1768,13 +1768,13 @@ let
         sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==";
       };
     };
-    "@remix-run/router-1.2.0" = {
+    "@remix-run/router-1.3.2" = {
       name = "_at_remix-run_slash_router";
       packageName = "@remix-run/router";
-      version = "1.2.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@remix-run/router/-/router-1.2.0.tgz";
-        sha512 = "GO82KYYTWPRCgdNtnheaZG3LcViUlxRFlHM7ykh7N+ufoXi6PVIHoP+9RUG/vuzl2hr9i/h6EA1Eq+2HpqJ0gQ==";
+        url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz";
+        sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA==";
       };
     };
     "@rollup/plugin-babel-5.3.1" = {
@@ -2002,13 +2002,13 @@ let
         sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==";
       };
     };
-    "@types/babel__core-7.1.20" = {
+    "@types/babel__core-7.20.0" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.20";
+      version = "7.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz";
-        sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz";
+        sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==";
       };
     };
     "@types/babel__generator-7.6.4" = {
@@ -2074,13 +2074,13 @@ let
         sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==";
       };
     };
-    "@types/eslint-8.4.10" = {
+    "@types/eslint-8.21.1" = {
       name = "_at_types_slash_eslint";
       packageName = "@types/eslint";
-      version = "8.4.10";
+      version = "8.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz";
-        sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==";
+        url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz";
+        sha512 = "rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ==";
       };
     };
     "@types/eslint-scope-3.7.4" = {
@@ -2119,31 +2119,31 @@ let
         sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==";
       };
     };
-    "@types/express-4.17.15" = {
+    "@types/express-4.17.17" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.15";
+      version = "4.17.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz";
-        sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz";
+        sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==";
       };
     };
-    "@types/express-serve-static-core-4.17.31" = {
+    "@types/express-serve-static-core-4.17.33" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.31";
+      version = "4.17.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz";
-        sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz";
+        sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==";
       };
     };
-    "@types/graceful-fs-4.1.5" = {
+    "@types/graceful-fs-4.1.6" = {
       name = "_at_types_slash_graceful-fs";
       packageName = "@types/graceful-fs";
-      version = "4.1.5";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz";
-        sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==";
+        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz";
+        sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==";
       };
     };
     "@types/html-minifier-terser-6.1.0" = {
@@ -2218,13 +2218,13 @@ let
         sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==";
       };
     };
-    "@types/node-18.11.17" = {
+    "@types/node-18.14.0" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "18.11.17";
+      version = "18.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz";
-        sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==";
+        url = "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz";
+        sha512 = "5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==";
       };
     };
     "@types/parse-json-4.0.0" = {
@@ -2281,13 +2281,13 @@ let
         sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==";
       };
     };
-    "@types/react-18.0.26" = {
+    "@types/react-18.0.28" = {
       name = "_at_types_slash_react";
       packageName = "@types/react";
-      version = "18.0.26";
+      version = "18.0.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz";
-        sha512 = "hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==";
+        url = "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz";
+        sha512 = "RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==";
       };
     };
     "@types/react-is-17.0.3" = {
@@ -2380,40 +2380,40 @@ let
         sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==";
       };
     };
-    "@types/trusted-types-2.0.2" = {
+    "@types/trusted-types-2.0.3" = {
       name = "_at_types_slash_trusted-types";
       packageName = "@types/trusted-types";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz";
-        sha512 = "F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==";
+        url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz";
+        sha512 = "NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==";
       };
     };
-    "@types/ws-8.5.3" = {
+    "@types/ws-8.5.4" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "8.5.3";
+      version = "8.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz";
-        sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz";
+        sha512 = "zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==";
       };
     };
-    "@types/yargs-16.0.4" = {
+    "@types/yargs-16.0.5" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "16.0.4";
+      version = "16.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz";
-        sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz";
+        sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==";
       };
     };
-    "@types/yargs-17.0.17" = {
+    "@types/yargs-17.0.22" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "17.0.17";
+      version = "17.0.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz";
-        sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz";
+        sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==";
       };
     };
     "@types/yargs-parser-21.0.0" = {
@@ -2425,85 +2425,85 @@ let
         sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==";
       };
     };
-    "@typescript-eslint/eslint-plugin-5.47.0" = {
+    "@typescript-eslint/eslint-plugin-5.52.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz";
-        sha512 = "AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz";
+        sha512 = "lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg==";
       };
     };
-    "@typescript-eslint/experimental-utils-5.47.0" = {
+    "@typescript-eslint/experimental-utils-5.52.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.47.0.tgz";
-        sha512 = "DAP8xOaTAJLxouU0QrATiw8o/OHxxbUBXtkf9v+bCCU6tbJUn24xwB1dHFw3b5wYq4XvC1z5lYEN0g/Rx1sjzA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.52.0.tgz";
+        sha512 = "kd8CRr04mNE3hw4et6+0T0NI5vli2H6dJCGzjX1r12s/FXUehLVadmvo2Nl3DN80YqAh1cVC6zYZAkpmGiVJ5g==";
       };
     };
-    "@typescript-eslint/parser-5.47.0" = {
+    "@typescript-eslint/parser-5.52.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz";
-        sha512 = "udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.52.0.tgz";
+        sha512 = "e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA==";
       };
     };
-    "@typescript-eslint/scope-manager-5.47.0" = {
+    "@typescript-eslint/scope-manager-5.52.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz";
-        sha512 = "dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.52.0.tgz";
+        sha512 = "AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw==";
       };
     };
-    "@typescript-eslint/type-utils-5.47.0" = {
+    "@typescript-eslint/type-utils-5.52.0" = {
       name = "_at_typescript-eslint_slash_type-utils";
       packageName = "@typescript-eslint/type-utils";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz";
-        sha512 = "1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.52.0.tgz";
+        sha512 = "tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw==";
       };
     };
-    "@typescript-eslint/types-5.47.0" = {
+    "@typescript-eslint/types-5.52.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz";
-        sha512 = "eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.52.0.tgz";
+        sha512 = "oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ==";
       };
     };
-    "@typescript-eslint/typescript-estree-5.47.0" = {
+    "@typescript-eslint/typescript-estree-5.52.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz";
-        sha512 = "LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.52.0.tgz";
+        sha512 = "WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ==";
       };
     };
-    "@typescript-eslint/utils-5.47.0" = {
+    "@typescript-eslint/utils-5.52.0" = {
       name = "_at_typescript-eslint_slash_utils";
       packageName = "@typescript-eslint/utils";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz";
-        sha512 = "U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz";
+        sha512 = "As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==";
       };
     };
-    "@typescript-eslint/visitor-keys-5.47.0" = {
+    "@typescript-eslint/visitor-keys-5.52.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "5.47.0";
+      version = "5.52.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz";
-        sha512 = "ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.52.0.tgz";
+        sha512 = "qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA==";
       };
     };
     "@webassemblyjs/ast-1.11.1" = {
@@ -2686,13 +2686,13 @@ let
         sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
-    "acorn-8.8.1" = {
+    "acorn-8.8.2" = {
       name = "acorn";
       packageName = "acorn";
-      version = "8.8.1";
+      version = "8.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz";
-        sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz";
+        sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==";
       };
     };
     "acorn-globals-6.0.0" = {
@@ -2776,13 +2776,13 @@ let
         sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
-    "ajv-8.11.2" = {
+    "ajv-8.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "8.11.2";
+      version = "8.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz";
-        sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz";
+        sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==";
       };
     };
     "ajv-formats-2.1.1" = {
@@ -2911,13 +2911,13 @@ let
         sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==";
       };
     };
-    "aria-query-4.2.2" = {
+    "aria-query-5.1.3" = {
       name = "aria-query";
       packageName = "aria-query";
-      version = "4.2.2";
+      version = "5.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz";
-        sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==";
+        url = "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz";
+        sha512 = "R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==";
       };
     };
     "array-flatten-1.1.1" = {
@@ -3046,22 +3046,31 @@ let
         sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==";
       };
     };
-    "axe-core-4.6.1" = {
-      name = "axe-core";
-      packageName = "axe-core";
-      version = "4.6.1";
+    "available-typed-arrays-1.0.5" = {
+      name = "available-typed-arrays";
+      packageName = "available-typed-arrays";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz";
-        sha512 = "lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w==";
+        url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz";
+        sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==";
       };
     };
-    "axobject-query-2.2.0" = {
+    "axe-core-4.6.3" = {
+      name = "axe-core";
+      packageName = "axe-core";
+      version = "4.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz";
+        sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==";
+      };
+    };
+    "axobject-query-3.1.1" = {
       name = "axobject-query";
       packageName = "axobject-query";
-      version = "2.2.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz";
-        sha512 = "Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==";
+        url = "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz";
+        sha512 = "goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==";
       };
     };
     "babel-jest-27.5.1" = {
@@ -3244,13 +3253,13 @@ let
         sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==";
       };
     };
-    "bonjour-service-1.0.14" = {
+    "bonjour-service-1.1.0" = {
       name = "bonjour-service";
       packageName = "bonjour-service";
-      version = "1.0.14";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz";
-        sha512 = "HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==";
+        url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz";
+        sha512 = "LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==";
       };
     };
     "boolbase-1.0.0" = {
@@ -3298,13 +3307,13 @@ let
         sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
-    "browserslist-4.21.4" = {
+    "browserslist-4.21.5" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.21.4";
+      version = "4.21.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz";
-        sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz";
+        sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==";
       };
     };
     "bser-2.1.1" = {
@@ -3415,13 +3424,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001441" = {
+    "caniuse-lite-1.0.30001456" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001441";
+      version = "1.0.30001456";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz";
-        sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz";
+        sha512 = "XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==";
       };
     };
     "case-sensitive-paths-webpack-plugin-2.4.0" = {
@@ -3496,13 +3505,13 @@ let
         sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==";
       };
     };
-    "ci-info-3.7.0" = {
+    "ci-info-3.8.0" = {
       name = "ci-info";
       packageName = "ci-info";
-      version = "3.7.0";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz";
-        sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==";
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz";
+        sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==";
       };
     };
     "cjs-module-lexer-1.2.2" = {
@@ -3514,13 +3523,13 @@ let
         sha512 = "cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==";
       };
     };
-    "clean-css-5.3.1" = {
+    "clean-css-5.3.2" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "5.3.1";
+      version = "5.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz";
-        sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz";
+        sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==";
       };
     };
     "cliui-7.0.4" = {
@@ -3739,13 +3748,13 @@ let
         sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==";
       };
     };
-    "content-type-1.0.4" = {
+    "content-type-1.0.5" = {
       name = "content-type";
       packageName = "content-type";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
-        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz";
+        sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==";
       };
     };
     "convert-source-map-1.9.0" = {
@@ -3775,31 +3784,31 @@ let
         sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
       };
     };
-    "core-js-3.26.1" = {
+    "core-js-3.28.0" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.26.1";
+      version = "3.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz";
-        sha512 = "21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.28.0.tgz";
+        sha512 = "GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw==";
       };
     };
-    "core-js-compat-3.26.1" = {
+    "core-js-compat-3.28.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.26.1";
+      version = "3.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.1.tgz";
-        sha512 = "622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.28.0.tgz";
+        sha512 = "myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==";
       };
     };
-    "core-js-pure-3.26.1" = {
+    "core-js-pure-3.28.0" = {
       name = "core-js-pure";
       packageName = "core-js-pure";
-      version = "3.26.1";
+      version = "3.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz";
-        sha512 = "VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==";
+        url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.28.0.tgz";
+        sha512 = "DSOVleA9/v3LNj/vFxAPfUHttKTzrB2RXhAPvR5TPXn4vrra3Z2ssytvRyt8eruJwAfwAiFADEbrjcRdcvPLQQ==";
       };
     };
     "core-util-is-1.0.3" = {
@@ -3973,13 +3982,13 @@ let
         sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
       };
     };
-    "cssdb-7.2.0" = {
+    "cssdb-7.4.1" = {
       name = "cssdb";
       packageName = "cssdb";
-      version = "7.2.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz";
-        sha512 = "JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==";
+        url = "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz";
+        sha512 = "0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ==";
       };
     };
     "cssesc-3.0.0" = {
@@ -3991,22 +4000,22 @@ let
         sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==";
       };
     };
-    "cssnano-5.1.14" = {
+    "cssnano-5.1.15" = {
       name = "cssnano";
       packageName = "cssnano";
-      version = "5.1.14";
+      version = "5.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz";
-        sha512 = "Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==";
+        url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz";
+        sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==";
       };
     };
-    "cssnano-preset-default-5.2.13" = {
+    "cssnano-preset-default-5.2.14" = {
       name = "cssnano-preset-default";
       packageName = "cssnano-preset-default";
-      version = "5.2.13";
+      version = "5.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz";
-        sha512 = "PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==";
+        url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz";
+        sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==";
       };
     };
     "cssnano-utils-3.1.0" = {
@@ -4126,6 +4135,15 @@ let
         sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==";
       };
     };
+    "deep-equal-2.2.0" = {
+      name = "deep-equal";
+      packageName = "deep-equal";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz";
+        sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==";
+      };
+    };
     "deep-is-0.1.4" = {
       name = "deep-is";
       packageName = "deep-is";
@@ -4135,13 +4153,13 @@ let
         sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==";
       };
     };
-    "deepmerge-4.2.2" = {
+    "deepmerge-4.3.0" = {
       name = "deepmerge";
       packageName = "deepmerge";
-      version = "4.2.2";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz";
-        sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==";
+        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz";
+        sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==";
       };
     };
     "default-gateway-6.0.3" = {
@@ -4162,13 +4180,13 @@ let
         sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==";
       };
     };
-    "define-properties-1.1.4" = {
+    "define-properties-1.2.0" = {
       name = "define-properties";
       packageName = "define-properties";
-      version = "1.1.4";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz";
-        sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==";
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz";
+        sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==";
       };
     };
     "defined-1.0.1" = {
@@ -4252,13 +4270,13 @@ let
         sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==";
       };
     };
-    "dexie-3.2.2" = {
+    "dexie-3.2.3" = {
       name = "dexie";
       packageName = "dexie";
-      version = "3.2.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz";
-        sha512 = "q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg==";
+        url = "https://registry.npmjs.org/dexie/-/dexie-3.2.3.tgz";
+        sha512 = "iHayBd4UYryDCVUNa3PMsJMEnd8yjyh5p7a+RFeC8i8n476BC9wMhVvqiImq5zJZJf5Tuer+s4SSj+AA3x+ZbQ==";
       };
     };
     "dexie-react-hooks-1.1.1" = {
@@ -4486,13 +4504,13 @@ let
         sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==";
       };
     };
-    "electron-to-chromium-1.4.284" = {
+    "electron-to-chromium-1.4.302" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.4.284";
+      version = "1.4.302";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz";
-        sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz";
+        sha512 = "Uk7C+7aPBryUR1Fwvk9VmipBcN9fVsqBO57jV2ZjTm+IZ6BMNqu7EDVEg2HxCNufk6QcWlFsBkhQyQroB2VWKw==";
       };
     };
     "emittery-0.10.2" = {
@@ -4585,13 +4603,13 @@ let
         sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==";
       };
     };
-    "es-abstract-1.20.5" = {
+    "es-abstract-1.21.1" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.20.5";
+      version = "1.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz";
-        sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz";
+        sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==";
       };
     };
     "es-array-method-boxes-properly-1.0.0" = {
@@ -4603,6 +4621,15 @@ let
         sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==";
       };
     };
+    "es-get-iterator-1.1.3" = {
+      name = "es-get-iterator";
+      packageName = "es-get-iterator";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz";
+        sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==";
+      };
+    };
     "es-module-lexer-0.9.3" = {
       name = "es-module-lexer";
       packageName = "es-module-lexer";
@@ -4612,6 +4639,15 @@ let
         sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==";
       };
     };
+    "es-set-tostringtag-2.0.1" = {
+      name = "es-set-tostringtag";
+      packageName = "es-set-tostringtag";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz";
+        sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==";
+      };
+    };
     "es-shim-unscopables-1.0.0" = {
       name = "es-shim-unscopables";
       packageName = "es-shim-unscopables";
@@ -4684,13 +4720,13 @@ let
         sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==";
       };
     };
-    "eslint-8.30.0" = {
+    "eslint-8.34.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "8.30.0";
+      version = "8.34.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz";
-        sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz";
+        sha512 = "1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==";
       };
     };
     "eslint-config-react-app-7.0.1" = {
@@ -4702,13 +4738,13 @@ let
         sha512 = "K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==";
       };
     };
-    "eslint-import-resolver-node-0.3.6" = {
+    "eslint-import-resolver-node-0.3.7" = {
       name = "eslint-import-resolver-node";
       packageName = "eslint-import-resolver-node";
-      version = "0.3.6";
+      version = "0.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz";
-        sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==";
+        url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz";
+        sha512 = "gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==";
       };
     };
     "eslint-module-utils-2.7.4" = {
@@ -4729,13 +4765,13 @@ let
         sha512 = "dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==";
       };
     };
-    "eslint-plugin-import-2.26.0" = {
+    "eslint-plugin-import-2.27.5" = {
       name = "eslint-plugin-import";
       packageName = "eslint-plugin-import";
-      version = "2.26.0";
+      version = "2.27.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz";
-        sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==";
+        url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz";
+        sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==";
       };
     };
     "eslint-plugin-jest-25.7.0" = {
@@ -4747,22 +4783,22 @@ let
         sha512 = "PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==";
       };
     };
-    "eslint-plugin-jsx-a11y-6.6.1" = {
+    "eslint-plugin-jsx-a11y-6.7.1" = {
       name = "eslint-plugin-jsx-a11y";
       packageName = "eslint-plugin-jsx-a11y";
-      version = "6.6.1";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz";
-        sha512 = "sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==";
+        url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz";
+        sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==";
       };
     };
-    "eslint-plugin-react-7.31.11" = {
+    "eslint-plugin-react-7.32.2" = {
       name = "eslint-plugin-react";
       packageName = "eslint-plugin-react";
-      version = "7.31.11";
+      version = "7.32.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz";
-        sha512 = "TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==";
+        url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz";
+        sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==";
       };
     };
     "eslint-plugin-react-hooks-4.6.0" = {
@@ -4774,13 +4810,13 @@ let
         sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==";
       };
     };
-    "eslint-plugin-testing-library-5.9.1" = {
+    "eslint-plugin-testing-library-5.10.2" = {
       name = "eslint-plugin-testing-library";
       packageName = "eslint-plugin-testing-library";
-      version = "5.9.1";
+      version = "5.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.9.1.tgz";
-        sha512 = "6BQp3tmb79jLLasPHJmy8DnxREe+2Pgf7L+7o09TSWPfdqqtQfRZmZNetr5mOs3yqZk/MRNxpN3RUpJe0wB4LQ==";
+        url = "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.10.2.tgz";
+        sha512 = "f1DmDWcz5SDM+IpCkEX0lbFqrrTs8HRsEElzDEqN/EBI0hpRj8Cns5+IVANXswE8/LeybIJqPAOQIFu2j5Y5sw==";
       };
     };
     "eslint-scope-5.1.1" = {
@@ -4855,13 +4891,13 @@ let
         sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
-    "esquery-1.4.0" = {
+    "esquery-1.4.2" = {
       name = "esquery";
       packageName = "esquery";
-      version = "1.4.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz";
-        sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==";
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz";
+        sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==";
       };
     };
     "esrecurse-4.3.0" = {
@@ -5008,13 +5044,13 @@ let
         sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==";
       };
     };
-    "fastq-1.14.0" = {
+    "fastq-1.15.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.14.0";
+      version = "1.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz";
-        sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz";
+        sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==";
       };
     };
     "faye-websocket-0.11.4" = {
@@ -5161,6 +5197,15 @@ let
         sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==";
       };
     };
+    "for-each-0.3.3" = {
+      name = "for-each";
+      packageName = "for-each";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz";
+        sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==";
+      };
+    };
     "fork-ts-checker-webpack-plugin-6.5.2" = {
       name = "fork-ts-checker-webpack-plugin";
       packageName = "fork-ts-checker-webpack-plugin";
@@ -5296,13 +5341,13 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-intrinsic-1.1.3" = {
+    "get-intrinsic-1.2.0" = {
       name = "get-intrinsic";
       packageName = "get-intrinsic";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz";
-        sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==";
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz";
+        sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==";
       };
     };
     "get-own-enumerable-property-symbols-3.0.2" = {
@@ -5404,13 +5449,22 @@ let
         sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     };
-    "globals-13.19.0" = {
+    "globals-13.20.0" = {
       name = "globals";
       packageName = "globals";
-      version = "13.19.0";
+      version = "13.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz";
-        sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==";
+        url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz";
+        sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==";
+      };
+    };
+    "globalthis-1.0.3" = {
+      name = "globalthis";
+      packageName = "globalthis";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz";
+        sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==";
       };
     };
     "globby-11.1.0" = {
@@ -5521,6 +5575,15 @@ let
         sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==";
       };
     };
+    "has-proto-1.0.1" = {
+      name = "has-proto";
+      packageName = "has-proto";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz";
+        sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==";
+      };
+    };
     "has-symbols-1.0.3" = {
       name = "has-symbols";
       packageName = "has-symbols";
@@ -5719,6 +5782,15 @@ let
         sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==";
       };
     };
+    "humanize-duration-3.28.0" = {
+      name = "humanize-duration";
+      packageName = "humanize-duration";
+      version = "3.28.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz";
+        sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A==";
+      };
+    };
     "i18next-21.10.0" = {
       name = "i18next";
       packageName = "i18next";
@@ -5800,13 +5872,13 @@ let
         sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==";
       };
     };
-    "immer-9.0.16" = {
+    "immer-9.0.19" = {
       name = "immer";
       packageName = "immer";
-      version = "9.0.16";
+      version = "9.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/immer/-/immer-9.0.16.tgz";
-        sha512 = "qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==";
+        url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz";
+        sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ==";
       };
     };
     "import-fresh-3.3.0" = {
@@ -5872,13 +5944,13 @@ let
         sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
-    "internal-slot-1.0.4" = {
+    "internal-slot-1.0.5" = {
       name = "internal-slot";
       packageName = "internal-slot";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz";
-        sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==";
+        url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz";
+        sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==";
       };
     };
     "ipaddr.js-1.9.1" = {
@@ -5899,6 +5971,24 @@ let
         sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==";
       };
     };
+    "is-arguments-1.1.1" = {
+      name = "is-arguments";
+      packageName = "is-arguments";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz";
+        sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==";
+      };
+    };
+    "is-array-buffer-3.0.1" = {
+      name = "is-array-buffer";
+      packageName = "is-array-buffer";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz";
+        sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==";
+      };
+    };
     "is-arrayish-0.2.1" = {
       name = "is-arrayish";
       packageName = "is-arrayish";
@@ -6007,6 +6097,15 @@ let
         sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
       };
     };
+    "is-map-2.0.2" = {
+      name = "is-map";
+      packageName = "is-map";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz";
+        sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==";
+      };
+    };
     "is-module-1.0.0" = {
       name = "is-module";
       packageName = "is-module";
@@ -6106,6 +6205,15 @@ let
         sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==";
       };
     };
+    "is-set-2.0.2" = {
+      name = "is-set";
+      packageName = "is-set";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz";
+        sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==";
+      };
+    };
     "is-shared-array-buffer-1.0.2" = {
       name = "is-shared-array-buffer";
       packageName = "is-shared-array-buffer";
@@ -6142,6 +6250,15 @@ let
         sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==";
       };
     };
+    "is-typed-array-1.1.10" = {
+      name = "is-typed-array";
+      packageName = "is-typed-array";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz";
+        sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==";
+      };
+    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -6151,6 +6268,15 @@ let
         sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==";
       };
     };
+    "is-weakmap-2.0.1" = {
+      name = "is-weakmap";
+      packageName = "is-weakmap";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz";
+        sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==";
+      };
+    };
     "is-weakref-1.0.2" = {
       name = "is-weakref";
       packageName = "is-weakref";
@@ -6160,6 +6286,15 @@ let
         sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==";
       };
     };
+    "is-weakset-2.0.2" = {
+      name = "is-weakset";
+      packageName = "is-weakset";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz";
+        sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==";
+      };
+    };
     "is-wsl-2.2.0" = {
       name = "is-wsl";
       packageName = "is-wsl";
@@ -6178,6 +6313,15 @@ let
         sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
       };
     };
+    "isarray-2.0.5" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz";
+        sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
+      };
+    };
     "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
@@ -6565,22 +6709,22 @@ let
         sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==";
       };
     };
-    "js-base64-3.7.3" = {
+    "js-base64-3.7.5" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "3.7.3";
+      version = "3.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.3.tgz";
-        sha512 = "PAr6Xg2jvd7MCR6Ld9Jg3BmTcjYsHEBx1VlwEwULb/qowPf5VD9kEMagj23Gm7JRnSvE/Da/57nChZjnvL8v6A==";
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz";
+        sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==";
       };
     };
-    "js-sdsl-4.2.0" = {
+    "js-sdsl-4.3.0" = {
       name = "js-sdsl";
       packageName = "js-sdsl";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz";
-        sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==";
+        url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz";
+        sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==";
       };
     };
     "js-tokens-4.0.0" = {
@@ -6682,22 +6826,22 @@ let
         sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
       };
     };
-    "json5-1.0.1" = {
+    "json5-1.0.2" = {
       name = "json5";
       packageName = "json5";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
-        sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+        url = "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz";
+        sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==";
       };
     };
-    "json5-2.2.2" = {
+    "json5-2.2.3" = {
       name = "json5";
       packageName = "json5";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz";
-        sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==";
+        url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz";
+        sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
       };
     };
     "jsonfile-6.1.0" = {
@@ -6745,13 +6889,13 @@ let
         sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
       };
     };
-    "klona-2.0.5" = {
+    "klona-2.0.6" = {
       name = "klona";
       packageName = "klona";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz";
-        sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==";
+        url = "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz";
+        sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==";
       };
     };
     "language-subtag-registry-0.3.22" = {
@@ -6763,13 +6907,13 @@ let
         sha512 = "tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==";
       };
     };
-    "language-tags-1.0.7" = {
+    "language-tags-1.0.5" = {
       name = "language-tags";
       packageName = "language-tags";
-      version = "1.0.7";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.7.tgz";
-        sha512 = "bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw==";
+        url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz";
+        sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==";
       };
     };
     "leven-3.1.0" = {
@@ -7015,13 +7159,13 @@ let
         sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==";
       };
     };
-    "memfs-3.4.12" = {
+    "memfs-3.4.13" = {
       name = "memfs";
       packageName = "memfs";
-      version = "3.4.12";
+      version = "3.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz";
-        sha512 = "BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==";
+        url = "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz";
+        sha512 = "omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -7132,22 +7276,22 @@ let
         sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
       };
     };
-    "minimatch-5.1.2" = {
+    "minimatch-5.1.6" = {
       name = "minimatch";
       packageName = "minimatch";
-      version = "5.1.2";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz";
-        sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz";
+        sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==";
       };
     };
-    "minimist-1.2.7" = {
+    "minimist-1.2.8" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz";
-        sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz";
+        sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
       };
     };
     "mkdirp-0.5.6" = {
@@ -7276,13 +7420,13 @@ let
         sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==";
       };
     };
-    "node-releases-2.0.8" = {
+    "node-releases-2.0.10" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "2.0.8";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz";
-        sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz";
+        sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==";
       };
     };
     "normalize-path-3.0.0" = {
@@ -7366,13 +7510,22 @@ let
         sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==";
       };
     };
-    "object-inspect-1.12.2" = {
+    "object-inspect-1.12.3" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.12.2";
+      version = "1.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz";
-        sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz";
+        sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==";
+      };
+    };
+    "object-is-1.1.5" = {
+      name = "object-is";
+      packageName = "object-is";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz";
+        sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -7483,13 +7636,13 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
-    "open-8.4.0" = {
+    "open-8.4.1" = {
       name = "open";
       packageName = "open";
-      version = "8.4.0";
+      version = "8.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz";
-        sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==";
+        url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz";
+        sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==";
       };
     };
     "optionator-0.8.3" = {
@@ -7771,13 +7924,13 @@ let
         sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==";
       };
     };
-    "postcss-8.4.20" = {
+    "postcss-8.4.21" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.4.20";
+      version = "8.4.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz";
-        sha512 = "6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz";
+        sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==";
       };
     };
     "postcss-attribute-case-insensitive-5.0.2" = {
@@ -7843,13 +7996,13 @@ let
         sha512 = "pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==";
       };
     };
-    "postcss-colormin-5.3.0" = {
+    "postcss-colormin-5.3.1" = {
       name = "postcss-colormin";
       packageName = "postcss-colormin";
-      version = "5.3.0";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz";
-        sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==";
+        url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz";
+        sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==";
       };
     };
     "postcss-convert-values-5.1.3" = {
@@ -8023,13 +8176,13 @@ let
         sha512 = "0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==";
       };
     };
-    "postcss-js-4.0.0" = {
+    "postcss-js-4.0.1" = {
       name = "postcss-js";
       packageName = "postcss-js";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz";
-        sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==";
+        url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz";
+        sha512 = "dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==";
       };
     };
     "postcss-lab-function-4.2.1" = {
@@ -8086,13 +8239,13 @@ let
         sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==";
       };
     };
-    "postcss-merge-rules-5.1.3" = {
+    "postcss-merge-rules-5.1.4" = {
       name = "postcss-merge-rules";
       packageName = "postcss-merge-rules";
-      version = "5.1.3";
+      version = "5.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz";
-        sha512 = "LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==";
+        url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz";
+        sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==";
       };
     };
     "postcss-minify-font-values-5.1.0" = {
@@ -8338,13 +8491,13 @@ let
         sha512 = "9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==";
       };
     };
-    "postcss-reduce-initial-5.1.1" = {
+    "postcss-reduce-initial-5.1.2" = {
       name = "postcss-reduce-initial";
       packageName = "postcss-reduce-initial";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz";
-        sha512 = "//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==";
+        url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz";
+        sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==";
       };
     };
     "postcss-reduce-transforms-5.1.0" = {
@@ -8518,13 +8671,13 @@ let
         sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==";
       };
     };
-    "punycode-2.1.1" = {
+    "punycode-2.3.0" = {
       name = "punycode";
       packageName = "punycode";
-      version = "2.1.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz";
+        sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==";
       };
     };
     "q-1.5.1" = {
@@ -8707,22 +8860,22 @@ let
         sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==";
       };
     };
-    "react-router-6.6.0" = {
+    "react-router-6.8.1" = {
       name = "react-router";
       packageName = "react-router";
-      version = "6.6.0";
+      version = "6.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-router/-/react-router-6.6.0.tgz";
-        sha512 = "+VPfCIaFbkW7BAiB/2oeprxKAt1KLbl+zXZ10CXOYezKWgBmTKyh8XjI53eLqY5kd7uY+V4rh3UW44FclwUU+Q==";
+        url = "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz";
+        sha512 = "Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==";
       };
     };
-    "react-router-dom-6.6.0" = {
+    "react-router-dom-6.8.1" = {
       name = "react-router-dom";
       packageName = "react-router-dom";
-      version = "6.6.0";
+      version = "6.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.6.0.tgz";
-        sha512 = "qC4jnvpfCPKVle1mKLD75IvZLcbVJyFMlSn16WY9ZiOed3dgSmqhslCf/u3tmSccWOujkdsT/OwGq12bELmvjg==";
+        url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz";
+        sha512 = "67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==";
       };
     };
     "react-scripts-5.0.1" = {
@@ -8851,22 +9004,13 @@ let
         sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==";
       };
     };
-    "regexpu-core-5.2.2" = {
+    "regexpu-core-5.3.1" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "5.2.2";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz";
-        sha512 = "T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==";
-      };
-    };
-    "regjsgen-0.7.1" = {
-      name = "regjsgen";
-      packageName = "regjsgen";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz";
-        sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz";
+        sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==";
       };
     };
     "regjsparser-0.9.1" = {
@@ -8977,13 +9121,13 @@ let
         sha512 = "05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==";
       };
     };
-    "resolve.exports-1.1.0" = {
+    "resolve.exports-1.1.1" = {
       name = "resolve.exports";
       packageName = "resolve.exports";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz";
-        sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==";
+        url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz";
+        sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==";
       };
     };
     "retry-0.13.1" = {
@@ -9211,13 +9355,13 @@ let
         sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==";
       };
     };
-    "serialize-javascript-6.0.0" = {
+    "serialize-javascript-6.0.1" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz";
-        sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz";
+        sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==";
       };
     };
     "serve-index-1.9.1" = {
@@ -9274,13 +9418,13 @@ let
         sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
       };
     };
-    "shell-quote-1.7.4" = {
+    "shell-quote-1.8.0" = {
       name = "shell-quote";
       packageName = "shell-quote";
-      version = "1.7.4";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz";
-        sha512 = "8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==";
+        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz";
+        sha512 = "QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==";
       };
     };
     "side-channel-1.0.4" = {
@@ -9526,6 +9670,15 @@ let
         sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
       };
     };
+    "stop-iteration-iterator-1.0.0" = {
+      name = "stop-iteration-iterator";
+      packageName = "stop-iteration-iterator";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz";
+        sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==";
+      };
+    };
     "string-length-4.0.2" = {
       name = "string-length";
       packageName = "string-length";
@@ -9598,15 +9751,6 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "string_decoder-1.3.0" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
-      };
-    };
     "stringify-object-3.3.0" = {
       name = "stringify-object";
       packageName = "stringify-object";
@@ -9787,13 +9931,13 @@ let
         sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
       };
     };
-    "tailwindcss-3.2.4" = {
+    "tailwindcss-3.2.7" = {
       name = "tailwindcss";
       packageName = "tailwindcss";
-      version = "3.2.4";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz";
-        sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==";
+        url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz";
+        sha512 = "B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ==";
       };
     };
     "tapable-1.1.3" = {
@@ -9841,13 +9985,13 @@ let
         sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==";
       };
     };
-    "terser-5.16.1" = {
+    "terser-5.16.4" = {
       name = "terser";
       packageName = "terser";
-      version = "5.16.1";
+      version = "5.16.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz";
-        sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.16.4.tgz";
+        sha512 = "5yEGuZ3DZradbogeYQ1NaGz7rXVBDWujWlx1PT8efXO6Txn+eWbfKqB2bTDVmFXmePFkoLU6XI8UektMIEA0ug==";
       };
     };
     "terser-webpack-plugin-5.3.6" = {
@@ -9877,13 +10021,13 @@ let
         sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==";
       };
     };
-    "throat-6.0.1" = {
+    "throat-6.0.2" = {
       name = "throat";
       packageName = "throat";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz";
-        sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==";
+        url = "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz";
+        sha512 = "WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==";
       };
     };
     "throttle-debounce-2.3.0" = {
@@ -10003,13 +10147,13 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tslib-2.4.1" = {
+    "tslib-2.5.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "2.4.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz";
-        sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz";
+        sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==";
       };
     };
     "tsutils-3.21.0" = {
@@ -10084,6 +10228,15 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
+    "typed-array-length-1.0.4" = {
+      name = "typed-array-length";
+      packageName = "typed-array-length";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz";
+        sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==";
+      };
+    };
     "typedarray-to-buffer-3.1.5" = {
       name = "typedarray-to-buffer";
       packageName = "typedarray-to-buffer";
@@ -10093,15 +10246,6 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-4.9.4" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "4.9.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz";
-        sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==";
-      };
-    };
     "unbox-primitive-1.0.2" = {
       name = "unbox-primitive";
       packageName = "unbox-primitive";
@@ -10543,6 +10687,24 @@ let
         sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==";
       };
     };
+    "which-collection-1.0.1" = {
+      name = "which-collection";
+      packageName = "which-collection";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz";
+        sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==";
+      };
+    };
+    "which-typed-array-1.1.9" = {
+      name = "which-typed-array";
+      packageName = "which-typed-array";
+      version = "1.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz";
+        sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==";
+      };
+    };
     "word-wrap-1.2.3" = {
       name = "word-wrap";
       packageName = "word-wrap";
@@ -10741,13 +10903,13 @@ let
         sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==";
       };
     };
-    "ws-8.11.0" = {
+    "ws-8.12.1" = {
       name = "ws";
       packageName = "ws";
-      version = "8.11.0";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz";
-        sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==";
+        url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz";
+        sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==";
       };
     };
     "xml-name-validator-3.0.0" = {
@@ -10848,32 +11010,46 @@ let
     src = ./.;
     dependencies = [
       sources."@ampproject/remapping-2.2.0"
+      sources."@apideck/better-ajv-errors-0.3.6"
       sources."@babel/code-frame-7.18.6"
-      sources."@babel/compat-data-7.20.10"
-      sources."@babel/core-7.20.7"
+      sources."@babel/compat-data-7.20.14"
+      (sources."@babel/core-7.20.12" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       (sources."@babel/eslint-parser-7.19.1" // {
         dependencies = [
           sources."eslint-visitor-keys-2.1.0"
+          sources."semver-6.3.0"
         ];
       })
-      (sources."@babel/generator-7.20.7" // {
+      (sources."@babel/generator-7.20.14" // {
         dependencies = [
           sources."@jridgewell/gen-mapping-0.3.2"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.18.6"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9"
-      sources."@babel/helper-compilation-targets-7.20.7"
-      sources."@babel/helper-create-class-features-plugin-7.20.7"
+      (sources."@babel/helper-compilation-targets-7.20.7" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."@babel/helper-create-class-features-plugin-7.20.12"
       sources."@babel/helper-create-regexp-features-plugin-7.20.5"
-      sources."@babel/helper-define-polyfill-provider-0.3.3"
+      (sources."@babel/helper-define-polyfill-provider-0.3.3" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."@babel/helper-environment-visitor-7.18.9"
       sources."@babel/helper-explode-assignable-expression-7.18.6"
       sources."@babel/helper-function-name-7.19.0"
       sources."@babel/helper-hoist-variables-7.18.6"
       sources."@babel/helper-member-expression-to-functions-7.20.7"
       sources."@babel/helper-module-imports-7.18.6"
-      sources."@babel/helper-module-transforms-7.20.7"
+      sources."@babel/helper-module-transforms-7.20.11"
       sources."@babel/helper-optimise-call-expression-7.18.6"
       sources."@babel/helper-plugin-utils-7.20.2"
       sources."@babel/helper-remap-async-to-generator-7.18.9"
@@ -10885,15 +11061,15 @@ let
       sources."@babel/helper-validator-identifier-7.19.1"
       sources."@babel/helper-validator-option-7.18.6"
       sources."@babel/helper-wrap-function-7.20.5"
-      sources."@babel/helpers-7.20.7"
+      sources."@babel/helpers-7.20.13"
       sources."@babel/highlight-7.18.6"
-      sources."@babel/parser-7.20.7"
+      sources."@babel/parser-7.20.15"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.20.7"
       sources."@babel/plugin-proposal-class-properties-7.18.6"
       sources."@babel/plugin-proposal-class-static-block-7.20.7"
-      sources."@babel/plugin-proposal-decorators-7.20.7"
+      sources."@babel/plugin-proposal-decorators-7.20.13"
       sources."@babel/plugin-proposal-dynamic-import-7.18.6"
       sources."@babel/plugin-proposal-export-namespace-from-7.18.9"
       sources."@babel/plugin-proposal-json-strings-7.18.6"
@@ -10930,7 +11106,7 @@ let
       sources."@babel/plugin-transform-arrow-functions-7.20.7"
       sources."@babel/plugin-transform-async-to-generator-7.20.7"
       sources."@babel/plugin-transform-block-scoped-functions-7.18.6"
-      sources."@babel/plugin-transform-block-scoping-7.20.9"
+      sources."@babel/plugin-transform-block-scoping-7.20.15"
       sources."@babel/plugin-transform-classes-7.20.7"
       sources."@babel/plugin-transform-computed-properties-7.20.7"
       sources."@babel/plugin-transform-destructuring-7.20.7"
@@ -10942,9 +11118,9 @@ let
       sources."@babel/plugin-transform-function-name-7.18.9"
       sources."@babel/plugin-transform-literals-7.18.9"
       sources."@babel/plugin-transform-member-expression-literals-7.18.6"
-      sources."@babel/plugin-transform-modules-amd-7.20.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.20.7"
-      sources."@babel/plugin-transform-modules-systemjs-7.19.6"
+      sources."@babel/plugin-transform-modules-amd-7.20.11"
+      sources."@babel/plugin-transform-modules-commonjs-7.20.11"
+      sources."@babel/plugin-transform-modules-systemjs-7.20.11"
       sources."@babel/plugin-transform-modules-umd-7.18.6"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5"
       sources."@babel/plugin-transform-new-target-7.18.6"
@@ -10953,28 +11129,36 @@ let
       sources."@babel/plugin-transform-property-literals-7.18.6"
       sources."@babel/plugin-transform-react-constant-elements-7.20.2"
       sources."@babel/plugin-transform-react-display-name-7.18.6"
-      sources."@babel/plugin-transform-react-jsx-7.20.7"
+      sources."@babel/plugin-transform-react-jsx-7.20.13"
       sources."@babel/plugin-transform-react-jsx-development-7.18.6"
       sources."@babel/plugin-transform-react-pure-annotations-7.18.6"
       sources."@babel/plugin-transform-regenerator-7.20.5"
       sources."@babel/plugin-transform-reserved-words-7.18.6"
-      sources."@babel/plugin-transform-runtime-7.19.6"
+      (sources."@babel/plugin-transform-runtime-7.19.6" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."@babel/plugin-transform-shorthand-properties-7.18.6"
       sources."@babel/plugin-transform-spread-7.20.7"
       sources."@babel/plugin-transform-sticky-regex-7.18.6"
       sources."@babel/plugin-transform-template-literals-7.18.9"
       sources."@babel/plugin-transform-typeof-symbol-7.18.9"
-      sources."@babel/plugin-transform-typescript-7.20.7"
+      sources."@babel/plugin-transform-typescript-7.20.13"
       sources."@babel/plugin-transform-unicode-escapes-7.18.10"
       sources."@babel/plugin-transform-unicode-regex-7.18.6"
-      sources."@babel/preset-env-7.20.2"
+      (sources."@babel/preset-env-7.20.2" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."@babel/preset-modules-0.1.5"
       sources."@babel/preset-react-7.18.6"
       sources."@babel/preset-typescript-7.18.6"
-      sources."@babel/runtime-7.20.7"
-      sources."@babel/runtime-corejs3-7.20.7"
+      sources."@babel/regjsgen-0.8.0"
+      sources."@babel/runtime-7.20.13"
       sources."@babel/template-7.20.7"
-      sources."@babel/traverse-7.20.10"
+      sources."@babel/traverse-7.20.13"
       sources."@babel/types-7.20.7"
       sources."@bcoe/v8-coverage-0.2.3"
       sources."@csstools/normalize.css-12.0.0"
@@ -10992,26 +11176,25 @@ let
       sources."@csstools/postcss-text-decoration-shorthand-1.0.0"
       sources."@csstools/postcss-trigonometric-functions-1.0.2"
       sources."@csstools/postcss-unset-value-1.0.2"
-      sources."@csstools/selector-specificity-2.0.2"
-      sources."@emotion/babel-plugin-11.10.5"
+      sources."@csstools/selector-specificity-2.1.1"
+      sources."@emotion/babel-plugin-11.10.6"
       sources."@emotion/cache-11.10.5"
       sources."@emotion/hash-0.9.0"
       sources."@emotion/is-prop-valid-1.2.0"
       sources."@emotion/memoize-0.8.0"
-      sources."@emotion/react-11.10.5"
+      sources."@emotion/react-11.10.6"
       sources."@emotion/serialize-1.1.1"
       sources."@emotion/sheet-1.2.1"
-      sources."@emotion/styled-11.10.5"
+      sources."@emotion/styled-11.10.6"
       sources."@emotion/unitless-0.8.0"
       sources."@emotion/use-insertion-effect-with-fallbacks-1.0.0"
       sources."@emotion/utils-1.2.0"
       sources."@emotion/weak-memoize-0.3.0"
-      (sources."@eslint/eslintrc-1.4.0" // {
+      (sources."@eslint/eslintrc-1.4.1" // {
         dependencies = [
           sources."argparse-2.0.1"
-          sources."globals-13.19.0"
+          sources."globals-13.20.0"
           sources."js-yaml-4.1.0"
-          sources."type-fest-0.20.2"
         ];
       })
       sources."@humanwhocodes/config-array-0.11.8"
@@ -11102,15 +11285,27 @@ let
       sources."@jridgewell/sourcemap-codec-1.4.14"
       sources."@jridgewell/trace-mapping-0.3.17"
       sources."@leichtgewicht/ip-codec-2.0.4"
-      sources."@mui/base-5.0.0-alpha.111"
-      sources."@mui/core-downloads-tracker-5.11.1"
-      sources."@mui/icons-material-5.11.0"
-      sources."@mui/material-5.11.1"
-      sources."@mui/private-theming-5.11.1"
-      sources."@mui/styled-engine-5.11.0"
-      sources."@mui/system-5.11.1"
+      (sources."@mui/base-5.0.0-alpha.118" // {
+        dependencies = [
+          sources."react-is-18.2.0"
+        ];
+      })
+      sources."@mui/core-downloads-tracker-5.11.9"
+      sources."@mui/icons-material-5.11.9"
+      (sources."@mui/material-5.11.9" // {
+        dependencies = [
+          sources."react-is-18.2.0"
+        ];
+      })
+      sources."@mui/private-theming-5.11.9"
+      sources."@mui/styled-engine-5.11.9"
+      sources."@mui/system-5.11.9"
       sources."@mui/types-7.2.3"
-      sources."@mui/utils-5.11.1"
+      (sources."@mui/utils-5.11.9" // {
+        dependencies = [
+          sources."react-is-18.2.0"
+        ];
+      })
       (sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" // {
         dependencies = [
           sources."eslint-scope-5.1.1"
@@ -11126,7 +11321,7 @@ let
         ];
       })
       sources."@popperjs/core-2.11.6"
-      sources."@remix-run/router-1.2.0"
+      sources."@remix-run/router-1.3.2"
       sources."@rollup/plugin-babel-5.3.1"
       sources."@rollup/plugin-node-resolve-11.2.1"
       sources."@rollup/plugin-replace-2.4.2"
@@ -11156,7 +11351,7 @@ let
       sources."@svgr/webpack-5.5.0"
       sources."@tootallnate/once-1.1.2"
       sources."@trysound/sax-0.2.0"
-      sources."@types/babel__core-7.1.20"
+      sources."@types/babel__core-7.20.0"
       sources."@types/babel__generator-7.6.4"
       sources."@types/babel__template-7.4.1"
       sources."@types/babel__traverse-7.18.3"
@@ -11164,12 +11359,12 @@ let
       sources."@types/bonjour-3.5.10"
       sources."@types/connect-3.4.35"
       sources."@types/connect-history-api-fallback-1.3.5"
-      sources."@types/eslint-8.4.10"
+      sources."@types/eslint-8.21.1"
       sources."@types/eslint-scope-3.7.4"
       sources."@types/estree-1.0.0"
-      sources."@types/express-4.17.15"
-      sources."@types/express-serve-static-core-4.17.31"
-      sources."@types/graceful-fs-4.1.5"
+      sources."@types/express-4.17.17"
+      sources."@types/express-serve-static-core-4.17.33"
+      sources."@types/graceful-fs-4.1.6"
       sources."@types/html-minifier-terser-6.1.0"
       sources."@types/http-proxy-1.17.9"
       sources."@types/istanbul-lib-coverage-2.0.4"
@@ -11178,14 +11373,14 @@ let
       sources."@types/json-schema-7.0.11"
       sources."@types/json5-0.0.29"
       sources."@types/mime-3.0.1"
-      sources."@types/node-18.11.17"
+      sources."@types/node-18.14.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/prettier-2.7.2"
       sources."@types/prop-types-15.7.5"
       sources."@types/q-1.5.5"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
-      sources."@types/react-18.0.26"
+      sources."@types/react-18.0.28"
       sources."@types/react-is-17.0.3"
       sources."@types/react-transition-group-4.4.5"
       sources."@types/resolve-1.17.1"
@@ -11196,39 +11391,24 @@ let
       sources."@types/serve-static-1.15.0"
       sources."@types/sockjs-0.3.33"
       sources."@types/stack-utils-2.0.1"
-      sources."@types/trusted-types-2.0.2"
-      sources."@types/ws-8.5.3"
-      sources."@types/yargs-16.0.4"
+      sources."@types/trusted-types-2.0.3"
+      sources."@types/ws-8.5.4"
+      sources."@types/yargs-16.0.5"
       sources."@types/yargs-parser-21.0.0"
-      (sources."@typescript-eslint/eslint-plugin-5.47.0" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
-        ];
-      })
-      sources."@typescript-eslint/experimental-utils-5.47.0"
-      sources."@typescript-eslint/parser-5.47.0"
-      sources."@typescript-eslint/scope-manager-5.47.0"
-      sources."@typescript-eslint/type-utils-5.47.0"
-      sources."@typescript-eslint/types-5.47.0"
-      (sources."@typescript-eslint/typescript-estree-5.47.0" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
-        ];
-      })
-      (sources."@typescript-eslint/utils-5.47.0" // {
+      sources."@typescript-eslint/eslint-plugin-5.52.0"
+      sources."@typescript-eslint/experimental-utils-5.52.0"
+      sources."@typescript-eslint/parser-5.52.0"
+      sources."@typescript-eslint/scope-manager-5.52.0"
+      sources."@typescript-eslint/type-utils-5.52.0"
+      sources."@typescript-eslint/types-5.52.0"
+      sources."@typescript-eslint/typescript-estree-5.52.0"
+      (sources."@typescript-eslint/utils-5.52.0" // {
         dependencies = [
           sources."eslint-scope-5.1.1"
           sources."estraverse-4.3.0"
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
         ];
       })
-      sources."@typescript-eslint/visitor-keys-5.47.0"
+      sources."@typescript-eslint/visitor-keys-5.52.0"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
       sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -11248,7 +11428,7 @@ let
       sources."@xtuc/long-4.2.2"
       sources."abab-2.0.6"
       sources."accepts-1.3.8"
-      sources."acorn-8.8.1"
+      sources."acorn-8.8.2"
       (sources."acorn-globals-6.0.0" // {
         dependencies = [
           sources."acorn-7.4.1"
@@ -11268,19 +11448,23 @@ let
       sources."ajv-6.12.6"
       (sources."ajv-formats-2.1.1" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."json-schema-traverse-1.0.0"
         ];
       })
       sources."ajv-keywords-3.5.2"
-      sources."ansi-escapes-4.3.2"
+      (sources."ansi-escapes-4.3.2" // {
+        dependencies = [
+          sources."type-fest-0.21.3"
+        ];
+      })
       sources."ansi-html-community-0.0.8"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.3"
       sources."arg-5.0.2"
       sources."argparse-1.0.10"
-      sources."aria-query-4.2.2"
+      sources."aria-query-5.1.3"
       sources."array-flatten-2.1.2"
       sources."array-includes-3.1.6"
       sources."array-union-2.1.0"
@@ -11294,8 +11478,9 @@ let
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."autoprefixer-10.4.13"
-      sources."axe-core-4.6.1"
-      sources."axobject-query-2.2.0"
+      sources."available-typed-arrays-1.0.5"
+      sources."axe-core-4.6.3"
+      sources."axobject-query-3.1.1"
       (sources."babel-jest-27.5.1" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -11315,7 +11500,11 @@ let
       sources."babel-plugin-jest-hoist-27.5.1"
       sources."babel-plugin-macros-3.1.0"
       sources."babel-plugin-named-asset-import-0.3.8"
-      sources."babel-plugin-polyfill-corejs2-0.3.3"
+      (sources."babel-plugin-polyfill-corejs2-0.3.3" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."babel-plugin-polyfill-corejs3-0.6.0"
       sources."babel-plugin-polyfill-regenerator-0.4.1"
       sources."babel-plugin-transform-react-remove-prop-types-0.4.24"
@@ -11332,27 +11521,30 @@ let
         dependencies = [
           sources."bytes-3.1.2"
           sources."debug-2.6.9"
-          sources."iconv-lite-0.4.24"
           sources."ms-2.0.0"
         ];
       })
-      sources."bonjour-service-1.0.14"
+      sources."bonjour-service-1.1.0"
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.21.4"
+      sources."browserslist-4.21.5"
       sources."bser-2.1.1"
       sources."buffer-from-1.1.2"
       sources."builtin-modules-3.3.0"
       sources."bytes-3.0.0"
       sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
-      sources."camel-case-4.1.2"
+      (sources."camel-case-4.1.2" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."camelcase-6.3.0"
       sources."camelcase-css-2.0.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001441"
+      sources."caniuse-lite-1.0.30001456"
       sources."case-sensitive-paths-webpack-plugin-2.4.0"
       (sources."chalk-2.4.2" // {
         dependencies = [
@@ -11367,9 +11559,9 @@ let
         ];
       })
       sources."chrome-trace-event-1.0.3"
-      sources."ci-info-3.7.0"
+      sources."ci-info-3.8.0"
       sources."cjs-module-lexer-1.2.2"
-      (sources."clean-css-5.3.1" // {
+      (sources."clean-css-5.3.2" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -11384,7 +11576,7 @@ let
       sources."colord-2.9.3"
       sources."colorette-2.0.19"
       sources."combined-stream-1.0.8"
-      sources."commander-8.3.0"
+      sources."commander-7.2.0"
       sources."common-path-prefix-3.0.0"
       sources."common-tags-1.8.2"
       sources."commondir-1.0.1"
@@ -11400,13 +11592,13 @@ let
       sources."confusing-browser-globals-1.0.11"
       sources."connect-history-api-fallback-2.0.0"
       sources."content-disposition-0.5.4"
-      sources."content-type-1.0.4"
+      sources."content-type-1.0.5"
       sources."convert-source-map-1.9.0"
       sources."cookie-0.5.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.26.1"
-      sources."core-js-compat-3.26.1"
-      sources."core-js-pure-3.26.1"
+      sources."core-js-3.28.0"
+      sources."core-js-compat-3.28.0"
+      sources."core-js-pure-3.28.0"
       sources."core-util-is-1.0.3"
       sources."cosmiconfig-7.1.0"
       sources."cross-fetch-3.1.5"
@@ -11415,16 +11607,10 @@ let
       sources."css-blank-pseudo-3.0.3"
       sources."css-declaration-sorter-6.3.1"
       sources."css-has-pseudo-3.0.4"
-      (sources."css-loader-6.7.3" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."css-loader-6.7.3"
       (sources."css-minimizer-webpack-plugin-3.4.1" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."ajv-keywords-5.1.0"
           sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.0.0"
@@ -11432,18 +11618,18 @@ let
         ];
       })
       sources."css-prefers-color-scheme-6.0.3"
-      sources."css-select-4.3.0"
+      sources."css-select-2.1.0"
       sources."css-select-base-adapter-0.1.1"
       (sources."css-tree-1.0.0-alpha.37" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."css-what-6.1.0"
-      sources."cssdb-7.2.0"
+      sources."css-what-3.4.2"
+      sources."cssdb-7.4.1"
       sources."cssesc-3.0.0"
-      sources."cssnano-5.1.14"
-      sources."cssnano-preset-default-5.2.13"
+      sources."cssnano-5.1.15"
+      sources."cssnano-preset-default-5.2.14"
       sources."cssnano-utils-3.1.0"
       (sources."csso-4.2.0" // {
         dependencies = [
@@ -11463,17 +11649,19 @@ let
       (sources."data-urls-2.0.0" // {
         dependencies = [
           sources."tr46-2.1.0"
+          sources."webidl-conversions-6.1.0"
           sources."whatwg-url-8.7.0"
         ];
       })
       sources."debug-4.3.4"
       sources."decimal.js-10.4.3"
       sources."dedent-0.7.0"
+      sources."deep-equal-2.2.0"
       sources."deep-is-0.1.4"
-      sources."deepmerge-4.2.2"
+      sources."deepmerge-4.3.0"
       sources."default-gateway-6.0.3"
       sources."define-lazy-prop-2.0.0"
-      sources."define-properties-1.1.4"
+      sources."define-properties-1.2.0"
       sources."defined-1.0.1"
       sources."delayed-stream-1.0.0"
       sources."depd-2.0.0"
@@ -11487,7 +11675,7 @@ let
         ];
       })
       sources."detective-5.2.1"
-      sources."dexie-3.2.2"
+      sources."dexie-3.2.3"
       sources."dexie-react-hooks-1.1.1"
       sources."didyoumean-1.2.2"
       sources."diff-sequences-27.5.1"
@@ -11498,22 +11686,34 @@ let
       sources."doctrine-3.0.0"
       sources."dom-converter-0.2.0"
       sources."dom-helpers-5.2.1"
-      sources."dom-serializer-1.4.1"
-      sources."domelementtype-2.3.0"
+      (sources."dom-serializer-0.2.2" // {
+        dependencies = [
+          sources."domelementtype-2.3.0"
+        ];
+      })
+      sources."domelementtype-1.3.1"
       (sources."domexception-2.0.1" // {
         dependencies = [
           sources."webidl-conversions-5.0.0"
         ];
       })
-      sources."domhandler-4.3.1"
-      sources."domutils-2.8.0"
-      sources."dot-case-3.0.4"
+      (sources."domhandler-4.3.1" // {
+        dependencies = [
+          sources."domelementtype-2.3.0"
+        ];
+      })
+      sources."domutils-1.7.0"
+      (sources."dot-case-3.0.4" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."dotenv-10.0.0"
       sources."dotenv-expand-5.1.0"
       sources."duplexer-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-3.1.8"
-      sources."electron-to-chromium-1.4.284"
+      sources."electron-to-chromium-1.4.302"
       sources."emittery-0.8.1"
       sources."emoji-regex-9.2.2"
       sources."emojis-list-3.0.0"
@@ -11522,9 +11722,11 @@ let
       sources."entities-2.2.0"
       sources."error-ex-1.3.2"
       sources."error-stack-parser-2.1.4"
-      sources."es-abstract-1.20.5"
+      sources."es-abstract-1.21.1"
       sources."es-array-method-boxes-properly-1.0.0"
+      sources."es-get-iterator-1.1.3"
       sources."es-module-lexer-0.9.3"
+      sources."es-set-tostringtag-2.0.1"
       sources."es-shim-unscopables-1.0.0"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -11539,22 +11741,21 @@ let
           sources."type-check-0.3.2"
         ];
       })
-      (sources."eslint-8.30.0" // {
+      (sources."eslint-8.34.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."argparse-2.0.1"
           sources."chalk-4.1.2"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."globals-13.19.0"
+          sources."globals-13.20.0"
           sources."has-flag-4.0.0"
           sources."js-yaml-4.1.0"
           sources."supports-color-7.2.0"
-          sources."type-fest-0.20.2"
         ];
       })
       sources."eslint-config-react-app-7.0.1"
-      (sources."eslint-import-resolver-node-0.3.6" // {
+      (sources."eslint-import-resolver-node-0.3.7" // {
         dependencies = [
           sources."debug-3.2.7"
         ];
@@ -11565,23 +11766,28 @@ let
         ];
       })
       sources."eslint-plugin-flowtype-8.0.3"
-      (sources."eslint-plugin-import-2.26.0" // {
+      (sources."eslint-plugin-import-2.27.5" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."debug-3.2.7"
           sources."doctrine-2.1.0"
-          sources."ms-2.0.0"
+          sources."semver-6.3.0"
         ];
       })
       sources."eslint-plugin-jest-25.7.0"
-      sources."eslint-plugin-jsx-a11y-6.6.1"
-      (sources."eslint-plugin-react-7.31.11" // {
+      (sources."eslint-plugin-jsx-a11y-6.7.1" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      (sources."eslint-plugin-react-7.32.2" // {
         dependencies = [
           sources."doctrine-2.1.0"
           sources."resolve-2.0.0-next.4"
+          sources."semver-6.3.0"
         ];
       })
       sources."eslint-plugin-react-hooks-4.6.0"
-      sources."eslint-plugin-testing-library-5.9.1"
+      sources."eslint-plugin-testing-library-5.10.2"
       sources."eslint-scope-7.1.1"
       (sources."eslint-utils-3.0.0" // {
         dependencies = [
@@ -11591,7 +11797,7 @@ let
       sources."eslint-visitor-keys-3.3.0"
       (sources."eslint-webpack-plugin-3.2.0" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."ajv-keywords-5.1.0"
           sources."has-flag-4.0.0"
           sources."jest-worker-28.1.3"
@@ -11602,7 +11808,7 @@ let
       })
       sources."espree-9.4.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.4.0"
+      sources."esquery-1.4.2"
       sources."esrecurse-4.3.0"
       sources."estraverse-5.3.0"
       sources."estree-walker-1.0.1"
@@ -11628,7 +11834,7 @@ let
       })
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.14.0"
+      sources."fastq-1.15.0"
       sources."faye-websocket-0.11.4"
       sources."fb-watchman-2.0.2"
       sources."file-entry-cache-6.0.1"
@@ -11636,7 +11842,7 @@ let
       (sources."filelist-1.0.4" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
-          sources."minimatch-5.1.2"
+          sources."minimatch-5.1.6"
         ];
       })
       sources."filesize-8.0.7"
@@ -11653,6 +11859,7 @@ let
       sources."flat-cache-3.0.4"
       sources."flatted-3.2.7"
       sources."follow-redirects-1.15.2"
+      sources."for-each-0.3.3"
       (sources."fork-ts-checker-webpack-plugin-6.5.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -11662,12 +11869,9 @@ let
           sources."cosmiconfig-6.0.0"
           sources."fs-extra-9.1.0"
           sources."has-flag-4.0.0"
-          sources."lru-cache-6.0.0"
           sources."schema-utils-2.7.0"
-          sources."semver-7.3.8"
           sources."supports-color-7.2.0"
           sources."tapable-1.1.3"
-          sources."yallist-4.0.0"
         ];
       })
       sources."form-data-3.0.1"
@@ -11683,7 +11887,7 @@ let
       sources."functions-have-names-1.2.3"
       sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.1.3"
+      sources."get-intrinsic-1.2.0"
       sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-package-type-0.1.0"
       sources."get-stream-6.0.1"
@@ -11698,6 +11902,7 @@ let
         ];
       })
       sources."globals-11.12.0"
+      sources."globalthis-1.0.3"
       sources."globby-11.1.0"
       sources."gopd-1.0.1"
       sources."graceful-fs-4.2.10"
@@ -11709,29 +11914,36 @@ let
       sources."has-bigints-1.0.2"
       sources."has-flag-3.0.0"
       sources."has-property-descriptors-1.0.0"
+      sources."has-proto-1.0.1"
       sources."has-symbols-1.0.3"
       sources."has-tostringtag-1.0.0"
       sources."he-1.2.0"
-      (sources."hoist-non-react-statics-3.3.2" // {
-        dependencies = [
-          sources."react-is-16.13.1"
-        ];
-      })
+      sources."hoist-non-react-statics-3.3.2"
       sources."hoopy-0.1.4"
       (sources."hpack.js-2.1.6" // {
         dependencies = [
+          sources."isarray-1.0.0"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."html-encoding-sniffer-2.0.1"
       sources."html-entities-2.3.3"
       sources."html-escaper-2.0.2"
-      sources."html-minifier-terser-6.1.0"
+      (sources."html-minifier-terser-6.1.0" // {
+        dependencies = [
+          sources."commander-8.3.0"
+        ];
+      })
       sources."html-parse-stringify-3.0.1"
       sources."html-webpack-plugin-5.5.0"
-      sources."htmlparser2-6.1.0"
+      (sources."htmlparser2-6.1.0" // {
+        dependencies = [
+          sources."dom-serializer-1.4.1"
+          sources."domelementtype-2.3.0"
+          sources."domutils-2.8.0"
+        ];
+      })
       sources."http-deceiver-1.2.7"
       sources."http-errors-2.0.0"
       sources."http-parser-js-0.5.8"
@@ -11740,23 +11952,26 @@ let
       sources."http-proxy-middleware-2.0.6"
       sources."https-proxy-agent-5.0.1"
       sources."human-signals-2.1.0"
+      sources."humanize-duration-3.28.0"
       sources."i18next-21.10.0"
       sources."i18next-browser-languagedetector-6.1.8"
       sources."i18next-http-backend-1.4.5"
-      sources."iconv-lite-0.6.3"
+      sources."iconv-lite-0.4.24"
       sources."icss-utils-5.1.0"
       sources."idb-7.1.1"
       sources."identity-obj-proxy-3.0.0"
       sources."ignore-5.2.4"
-      sources."immer-9.0.16"
+      sources."immer-9.0.19"
       sources."import-fresh-3.3.0"
       sources."import-local-3.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
-      sources."internal-slot-1.0.4"
+      sources."internal-slot-1.0.5"
       sources."ipaddr.js-2.0.1"
+      sources."is-arguments-1.1.1"
+      sources."is-array-buffer-3.0.1"
       sources."is-arrayish-0.2.1"
       sources."is-bigint-1.0.4"
       sources."is-binary-path-2.1.0"
@@ -11769,6 +11984,7 @@ let
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-generator-fn-2.1.0"
       sources."is-glob-4.0.3"
+      sources."is-map-2.0.2"
       sources."is-module-1.0.0"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
@@ -11780,17 +11996,25 @@ let
       sources."is-regex-1.1.4"
       sources."is-regexp-1.0.0"
       sources."is-root-2.1.0"
+      sources."is-set-2.0.2"
       sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-2.0.1"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
+      sources."is-typed-array-1.1.10"
       sources."is-typedarray-1.0.0"
+      sources."is-weakmap-2.0.1"
       sources."is-weakref-1.0.2"
+      sources."is-weakset-2.0.2"
       sources."is-wsl-2.2.0"
-      sources."isarray-1.0.0"
+      sources."isarray-2.0.5"
       sources."isexe-2.0.0"
       sources."istanbul-lib-coverage-3.2.0"
-      sources."istanbul-lib-instrument-5.2.1"
+      (sources."istanbul-lib-instrument-5.2.1" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       (sources."istanbul-lib-report-3.0.0" // {
         dependencies = [
           sources."has-flag-4.0.0"
@@ -11932,6 +12156,7 @@ let
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
+          sources."strip-bom-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
@@ -11943,10 +12168,7 @@ let
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
           sources."supports-color-7.2.0"
-          sources."yallist-4.0.0"
         ];
       })
       (sources."jest-util-27.5.1" // {
@@ -11978,9 +12200,11 @@ let
           })
           sources."@jest/test-result-28.1.3"
           sources."@jest/types-28.1.3"
-          sources."@types/yargs-17.0.17"
+          sources."@types/yargs-17.0.22"
+          sources."ansi-regex-6.0.1"
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.2"
+          sources."char-regex-2.0.1"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."emittery-0.10.2"
@@ -12003,17 +12227,10 @@ let
               sources."ansi-styles-5.2.0"
             ];
           })
+          sources."react-is-18.2.0"
           sources."slash-4.0.0"
-          (sources."string-length-5.0.1" // {
-            dependencies = [
-              sources."char-regex-2.0.1"
-            ];
-          })
-          (sources."strip-ansi-7.0.1" // {
-            dependencies = [
-              sources."ansi-regex-6.0.1"
-            ];
-          })
+          sources."string-length-5.0.1"
+          sources."strip-ansi-7.0.1"
           sources."supports-color-7.2.0"
         ];
       })
@@ -12033,13 +12250,14 @@ let
           sources."supports-color-8.1.1"
         ];
       })
-      sources."js-base64-3.7.3"
-      sources."js-sdsl-4.2.0"
+      sources."js-base64-3.7.5"
+      sources."js-sdsl-4.3.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
       (sources."jsdom-16.7.0" // {
         dependencies = [
           sources."tr46-2.1.0"
+          sources."webidl-conversions-6.1.0"
           sources."whatwg-url-8.7.0"
         ];
       })
@@ -12048,15 +12266,15 @@ let
       sources."json-schema-0.4.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json5-2.2.2"
+      sources."json5-2.2.3"
       sources."jsonfile-6.1.0"
       sources."jsonpointer-5.0.1"
       sources."jsx-ast-utils-3.3.3"
       sources."kind-of-6.0.3"
       sources."kleur-3.0.3"
-      sources."klona-2.0.5"
+      sources."klona-2.0.6"
       sources."language-subtag-registry-0.3.22"
-      sources."language-tags-1.0.7"
+      sources."language-tags-1.0.5"
       sources."leven-3.1.0"
       sources."levn-0.4.1"
       sources."lilconfig-2.0.6"
@@ -12071,14 +12289,22 @@ let
       sources."lodash.sortby-4.7.0"
       sources."lodash.uniq-4.5.0"
       sources."loose-envify-1.4.0"
-      sources."lower-case-2.0.2"
+      (sources."lower-case-2.0.2" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."lru-cache-5.1.1"
       sources."magic-string-0.25.9"
-      sources."make-dir-3.1.0"
+      (sources."make-dir-3.1.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."makeerror-1.0.12"
       sources."mdn-data-2.0.4"
       sources."media-typer-0.3.0"
-      sources."memfs-3.4.12"
+      sources."memfs-3.4.13"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
@@ -12090,7 +12316,7 @@ let
       sources."mimic-fn-2.1.0"
       (sources."mini-css-extract-plugin-2.7.2" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."ajv-keywords-5.1.0"
           sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.0.0"
@@ -12098,7 +12324,7 @@ let
       })
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.1.2"
-      sources."minimist-1.2.7"
+      sources."minimist-1.2.8"
       sources."mkdirp-0.5.6"
       sources."ms-2.1.2"
       sources."multicast-dns-7.2.5"
@@ -12107,20 +12333,25 @@ let
       sources."natural-compare-lite-1.4.0"
       sources."negotiator-0.6.3"
       sources."neo-async-2.6.2"
-      sources."no-case-3.0.4"
+      (sources."no-case-3.0.4" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."node-fetch-2.6.7"
       sources."node-forge-1.3.1"
       sources."node-int64-0.4.0"
-      sources."node-releases-2.0.8"
+      sources."node-releases-2.0.10"
       sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
       sources."normalize-url-6.1.0"
       sources."npm-run-path-4.0.1"
-      sources."nth-check-2.1.1"
+      sources."nth-check-1.0.2"
       sources."nwsapi-2.2.2"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
-      sources."object-inspect-1.12.2"
+      sources."object-inspect-1.12.3"
+      sources."object-is-1.1.5"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.4"
       sources."object.entries-1.1.6"
@@ -12133,18 +12364,26 @@ let
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-8.4.0"
+      sources."open-8.4.1"
       sources."optionator-0.9.1"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-retry-4.6.2"
       sources."p-try-2.2.0"
-      sources."param-case-3.0.4"
+      (sources."param-case-3.0.4" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."parent-module-1.0.1"
       sources."parse-json-5.2.0"
       sources."parse5-6.0.1"
       sources."parseurl-1.3.3"
-      sources."pascal-case-3.1.2"
+      (sources."pascal-case-3.1.2" // {
+        dependencies = [
+          sources."tslib-2.5.0"
+        ];
+      })
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
@@ -12173,7 +12412,7 @@ let
           sources."path-exists-3.0.0"
         ];
       })
-      sources."postcss-8.4.20"
+      sources."postcss-8.4.21"
       sources."postcss-attribute-case-insensitive-5.0.2"
       sources."postcss-browser-comments-4.0.0"
       sources."postcss-calc-8.2.4"
@@ -12181,7 +12420,7 @@ let
       sources."postcss-color-functional-notation-4.2.4"
       sources."postcss-color-hex-alpha-8.0.4"
       sources."postcss-color-rebeccapurple-7.1.1"
-      sources."postcss-colormin-5.3.0"
+      sources."postcss-colormin-5.3.1"
       sources."postcss-convert-values-5.1.3"
       sources."postcss-custom-media-8.0.2"
       sources."postcss-custom-properties-12.1.11"
@@ -12201,20 +12440,14 @@ let
       sources."postcss-image-set-function-4.0.7"
       sources."postcss-import-14.1.0"
       sources."postcss-initial-4.0.1"
-      sources."postcss-js-4.0.0"
+      sources."postcss-js-4.0.1"
       sources."postcss-lab-function-4.2.1"
       sources."postcss-load-config-3.1.4"
-      (sources."postcss-loader-6.2.1" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."postcss-loader-6.2.1"
       sources."postcss-logical-5.0.4"
       sources."postcss-media-minmax-5.0.0"
       sources."postcss-merge-longhand-5.1.7"
-      sources."postcss-merge-rules-5.1.3"
+      sources."postcss-merge-rules-5.1.4"
       sources."postcss-minify-font-values-5.1.0"
       sources."postcss-minify-gradients-5.1.1"
       sources."postcss-minify-params-5.1.4"
@@ -12242,16 +12475,21 @@ let
       sources."postcss-place-7.0.5"
       sources."postcss-preset-env-7.8.3"
       sources."postcss-pseudo-class-any-link-7.1.6"
-      sources."postcss-reduce-initial-5.1.1"
+      sources."postcss-reduce-initial-5.1.2"
       sources."postcss-reduce-transforms-5.1.0"
       sources."postcss-replace-overflow-wrap-4.0.0"
       sources."postcss-selector-not-6.0.1"
       sources."postcss-selector-parser-6.0.11"
       (sources."postcss-svgo-5.1.0" // {
         dependencies = [
-          sources."commander-7.2.0"
+          sources."css-select-4.3.0"
           sources."css-tree-1.1.3"
+          sources."css-what-6.1.0"
+          sources."dom-serializer-1.4.1"
+          sources."domelementtype-2.3.0"
+          sources."domutils-2.8.0"
           sources."mdn-data-2.0.14"
+          sources."nth-check-2.1.1"
           sources."source-map-0.6.1"
           sources."svgo-2.8.0"
         ];
@@ -12270,18 +12508,14 @@ let
       sources."process-nextick-args-2.0.1"
       sources."promise-8.3.0"
       sources."prompts-2.4.2"
-      (sources."prop-types-15.8.1" // {
-        dependencies = [
-          sources."react-is-16.13.1"
-        ];
-      })
+      sources."prop-types-15.8.1"
       (sources."proxy-addr-2.0.7" // {
         dependencies = [
           sources."ipaddr.js-1.9.1"
         ];
       })
       sources."psl-1.9.0"
-      sources."punycode-2.1.1"
+      sources."punycode-2.3.0"
       sources."q-1.5.1"
       sources."qs-6.11.0"
       sources."querystringify-2.2.0"
@@ -12293,7 +12527,6 @@ let
       (sources."raw-body-2.5.1" // {
         dependencies = [
           sources."bytes-3.1.2"
-          sources."iconv-lite-0.4.24"
         ];
       })
       sources."react-18.2.0"
@@ -12313,17 +12546,11 @@ let
       sources."react-error-overlay-6.0.11"
       sources."react-i18next-11.18.6"
       sources."react-infinite-scroll-component-6.1.0"
-      sources."react-is-18.2.0"
+      sources."react-is-16.13.1"
       sources."react-refresh-0.11.0"
-      sources."react-router-6.6.0"
-      sources."react-router-dom-6.6.0"
-      (sources."react-scripts-5.0.1" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.8"
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."react-router-6.8.1"
+      sources."react-router-dom-6.8.1"
+      sources."react-scripts-5.0.1"
       sources."react-transition-group-4.4.5"
       sources."read-cache-1.0.0"
       sources."readable-stream-3.6.0"
@@ -12336,15 +12563,23 @@ let
       sources."regex-parser-2.2.11"
       sources."regexp.prototype.flags-1.4.3"
       sources."regexpp-3.2.0"
-      sources."regexpu-core-5.2.2"
-      sources."regjsgen-0.7.1"
+      sources."regexpu-core-5.3.1"
       (sources."regjsparser-0.9.1" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
       })
       sources."relateurl-0.2.7"
-      sources."renderkid-3.0.0"
+      (sources."renderkid-3.0.0" // {
+        dependencies = [
+          sources."css-select-4.3.0"
+          sources."css-what-6.1.0"
+          sources."dom-serializer-1.4.1"
+          sources."domelementtype-2.3.0"
+          sources."domutils-2.8.0"
+          sources."nth-check-2.1.1"
+        ];
+      })
       sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
       sources."requires-port-1.0.0"
@@ -12362,7 +12597,7 @@ let
           sources."source-map-0.6.1"
         ];
       })
-      sources."resolve.exports-1.1.0"
+      sources."resolve.exports-1.1.1"
       sources."retry-0.13.1"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
@@ -12387,7 +12622,12 @@ let
       sources."schema-utils-3.1.1"
       sources."select-hose-2.0.0"
       sources."selfsigned-2.1.1"
-      sources."semver-6.3.0"
+      (sources."semver-7.3.8" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+          sources."yallist-4.0.0"
+        ];
+      })
       (sources."send-0.18.0" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -12398,7 +12638,7 @@ let
           sources."ms-2.1.3"
         ];
       })
-      sources."serialize-javascript-6.0.0"
+      sources."serialize-javascript-6.0.1"
       (sources."serve-index-1.9.1" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -12414,7 +12654,7 @@ let
       sources."setprototypeof-1.2.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
-      sources."shell-quote-1.7.4"
+      sources."shell-quote-1.8.0"
       sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
       sources."sisteransi-1.0.5"
@@ -12423,7 +12663,11 @@ let
       sources."source-list-map-2.0.1"
       sources."source-map-0.5.7"
       sources."source-map-js-1.0.2"
-      sources."source-map-loader-3.0.2"
+      (sources."source-map-loader-3.0.2" // {
+        dependencies = [
+          sources."iconv-lite-0.6.3"
+        ];
+      })
       (sources."source-map-support-0.5.21" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -12448,6 +12692,7 @@ let
       })
       sources."stacktrace-js-2.0.2"
       sources."statuses-2.0.1"
+      sources."stop-iteration-iterator-1.0.0"
       sources."string-length-4.0.2"
       sources."string-natural-compare-3.0.1"
       (sources."string-width-4.2.3" // {
@@ -12458,10 +12703,14 @@ let
       sources."string.prototype.matchall-4.0.8"
       sources."string.prototype.trimend-1.0.6"
       sources."string.prototype.trimstart-1.0.6"
-      sources."string_decoder-1.3.0"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."stringify-object-3.3.0"
       sources."strip-ansi-6.0.1"
-      sources."strip-bom-4.0.0"
+      sources."strip-bom-3.0.0"
       sources."strip-comments-2.0.1"
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-3.1.1"
@@ -12477,21 +12726,9 @@ let
       })
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."svg-parser-2.0.4"
-      (sources."svgo-1.3.2" // {
-        dependencies = [
-          sources."css-select-2.1.0"
-          sources."css-what-3.4.2"
-          sources."dom-serializer-0.2.2"
-          (sources."domutils-1.7.0" // {
-            dependencies = [
-              sources."domelementtype-1.3.1"
-            ];
-          })
-          sources."nth-check-1.0.2"
-        ];
-      })
+      sources."svgo-1.3.2"
       sources."symbol-tree-3.2.4"
-      (sources."tailwindcss-3.2.4" // {
+      (sources."tailwindcss-3.2.7" // {
         dependencies = [
           sources."color-name-1.1.4"
         ];
@@ -12504,7 +12741,7 @@ let
         ];
       })
       sources."terminal-link-2.1.1"
-      (sources."terser-5.16.1" // {
+      (sources."terser-5.16.4" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
@@ -12512,7 +12749,7 @@ let
       sources."terser-webpack-plugin-5.3.6"
       sources."test-exclude-6.0.0"
       sources."text-table-0.2.0"
-      sources."throat-6.0.1"
+      sources."throat-6.0.2"
       sources."throttle-debounce-2.3.0"
       sources."thunky-1.1.0"
       sources."tmpl-1.0.5"
@@ -12528,22 +12765,17 @@ let
       sources."tryer-1.0.1"
       (sources."tsconfig-paths-3.14.1" // {
         dependencies = [
-          sources."json5-1.0.1"
-          sources."strip-bom-3.0.0"
-        ];
-      })
-      sources."tslib-2.4.1"
-      (sources."tsutils-3.21.0" // {
-        dependencies = [
-          sources."tslib-1.14.1"
+          sources."json5-1.0.2"
         ];
       })
+      sources."tslib-1.14.1"
+      sources."tsutils-3.21.0"
       sources."type-check-0.4.0"
       sources."type-detect-4.0.8"
-      sources."type-fest-0.21.3"
+      sources."type-fest-0.20.2"
       sources."type-is-1.6.18"
+      sources."typed-array-length-1.0.4"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-4.9.4"
       sources."unbox-primitive-1.0.2"
       sources."unicode-canonical-property-names-ecmascript-2.0.0"
       sources."unicode-match-property-ecmascript-2.0.0"
@@ -12574,7 +12806,7 @@ let
       sources."walker-1.0.8"
       sources."watchpack-2.4.0"
       sources."wbuf-1.7.3"
-      sources."webidl-conversions-6.1.0"
+      sources."webidl-conversions-3.0.1"
       (sources."webpack-5.75.0" // {
         dependencies = [
           sources."@types/estree-0.0.51"
@@ -12584,7 +12816,7 @@ let
       })
       (sources."webpack-dev-middleware-5.3.3" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."ajv-keywords-5.1.0"
           sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.0.0"
@@ -12592,11 +12824,11 @@ let
       })
       (sources."webpack-dev-server-4.11.1" // {
         dependencies = [
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."ajv-keywords-5.1.0"
           sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.0.0"
-          sources."ws-8.11.0"
+          sources."ws-8.12.1"
         ];
       })
       (sources."webpack-manifest-plugin-4.1.1" // {
@@ -12608,27 +12840,20 @@ let
       sources."webpack-sources-3.2.3"
       sources."websocket-driver-0.7.4"
       sources."websocket-extensions-0.1.4"
-      (sources."whatwg-encoding-1.0.5" // {
-        dependencies = [
-          sources."iconv-lite-0.4.24"
-        ];
-      })
+      sources."whatwg-encoding-1.0.5"
       sources."whatwg-fetch-3.6.2"
       sources."whatwg-mimetype-2.3.0"
-      (sources."whatwg-url-5.0.0" // {
-        dependencies = [
-          sources."webidl-conversions-3.0.1"
-        ];
-      })
+      sources."whatwg-url-5.0.0"
       sources."which-2.0.2"
       sources."which-boxed-primitive-1.0.2"
+      sources."which-collection-1.0.1"
+      sources."which-typed-array-1.1.9"
       sources."word-wrap-1.2.3"
       sources."workbox-background-sync-6.5.4"
       sources."workbox-broadcast-update-6.5.4"
       (sources."workbox-build-6.5.4" // {
         dependencies = [
-          sources."@apideck/better-ajv-errors-0.3.6"
-          sources."ajv-8.11.2"
+          sources."ajv-8.12.0"
           sources."fs-extra-9.1.0"
           sources."json-schema-traverse-1.0.0"
           sources."source-map-0.8.0-beta.0"
@@ -12681,7 +12906,7 @@ let
     };
     production = false;
     bypassCache = true;
-    reconstructLock = false;
+    reconstructLock = true;
   };
 in
 {
diff --git a/pkgs/tools/misc/ntfy-sh/package.json b/pkgs/tools/misc/ntfy-sh/package.json
index e97191b004bc..9e919ef74b70 100644
--- a/pkgs/tools/misc/ntfy-sh/package.json
+++ b/pkgs/tools/misc/ntfy-sh/package.json
@@ -15,6 +15,7 @@
     "@mui/material": "latest",
     "dexie": "^3.2.1",
     "dexie-react-hooks": "^1.1.1",
+    "humanize-duration": "^3.27.3",
     "i18next": "^21.6.14",
     "i18next-browser-languagedetector": "^6.1.4",
     "i18next-http-backend": "^1.4.0",

From 72a48aaacd4523fd7d5829cc549f6add32ec6cf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 10:17:18 +0000
Subject: [PATCH 054/191] v2ray-geoip: 202302160443 -> 202302200325

---
 pkgs/data/misc/v2ray-geoip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 7cf3ea02e192..3801389de901 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "v2ray-geoip";
-  version = "202302160443";
+  version = "202302200325";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "geoip";
-    rev = "f8fbab498f52848317db703f57f0c839e81cd587";
-    sha256 = "sha256-9LZxVNhigy2cO41d8nZtFrfDoCjJTdzrGUZpmjcpje8=";
+    rev = "c642604d56dbe9b426871e3a47e18eba3d3d3850";
+    sha256 = "sha256-tsDoz/2b0InjLWfgi2Jcs8BpscQ0SFA6+tVZIw6JQGA=";
   };
 
   installPhase = ''

From 433e205e25ae5d8e9e2dfa4f05c31faac67c3847 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 15:24:59 +0000
Subject: [PATCH 055/191] firefox-devedition-bin-unwrapped: 110.0b9 -> 111.0b3

---
 .../firefox-bin/devedition_sources.nix        | 806 +++++++++---------
 1 file changed, 413 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index a75607870555..1af2361aee7e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,1005 @@
 {
-  version = "110.0b9";
+  version = "111.0b3";
   sources = [
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ach/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ach/firefox-111.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "cc5d39722e3e98f42ff5c2ccb269b2cde56f207f2d6f53ee87cd1f1df4e0d071";
+      sha256 = "8737b580851f99c6faaee971f324a859e3f3a6ab467e6f725695d17b1e4b6364";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/af/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/af/firefox-111.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "7290b02e275f45a78eab3cd4ca333b06917604336dff966db451d10dddf011e1";
+      sha256 = "499c3904b7c8a4fccf0a2ad3863c0c4ebd5a8a43a4e06a54b938bb43959d96b9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/an/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/an/firefox-111.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "a0320cc31ceb1f0bcad216dfd12953d8b7ae0356236be2223afd79a1f68e52ad";
+      sha256 = "671f11c6abce1b8d4c9481bdd11836151b6451e77969ef3bce34e5705bba2a20";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ar/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ar/firefox-111.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "65c8404b0160ce88ff64076d6f8716f94ad1b7bece3424e2d660049e6dfb8935";
+      sha256 = "ffb1a9250915698e7b96c327ebd86cdab57013bbccca93ecbfe64fad2afdef13";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ast/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ast/firefox-111.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "b535076933c0d6b0ccbc98377fede33a4dc3b177b530b77904b1359b6d4d60ba";
+      sha256 = "1a8e0ae9a45a36da794d86f7d8971aee5b68c397780425fe548ca8a26c3b64df";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/az/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/az/firefox-111.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "5d6d196a7d08fd59d6bde1b8e9adf8f0088011b0348c1755e47be0c5aa5bf221";
+      sha256 = "c0bd4f4e174464198cc2ef0a4cc9f41957c1c14fe4388d6f31026a48bbd41025";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/be/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/be/firefox-111.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7894ff185eac53a496bf1111e940ec53af1989c01f5cfbfb17e30f1be60ca131";
+      sha256 = "352d844f17907e25d427d2fa64734e15a6684282c068001b16a5554187805ead";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bg/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/bg/firefox-111.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "46e9cb6bc007341fb69a4e428ccb531053fc35ade15e73aa859ebda27da460bc";
+      sha256 = "28c9434329d53ec048b956b28f8221dcda5c5959ff88a2af14e7e12e8cf381de";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/bn/firefox-111.0b3.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "8419763e7310b5f7c3ec27e6c0ffb895d5b2c36b3c2cbf5261185e412d23b8f6";
+      sha256 = "3c33be10a853b2653bc48413a86ae153328b3367854eb8b7a31909060cc9c5eb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/br/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/br/firefox-111.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "0995bb17dc38a80398cf4e90a0b238dfeafd5a0d6c7a48251222b9f33c7b57d0";
+      sha256 = "9bb55257962c3ddf265a6df2453123c663d4b0a2db8d16bbf9576521aaa0e08f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/bs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/bs/firefox-111.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "0a4f9be7ef766ea6381e4c66258ae415f45fdd05493d347e9fe602870dd74f43";
+      sha256 = "d4854190ab2bfd94fe475d209d5a0f0c61f1e00c5f7fb9761a00aedac1926c2d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca-valencia/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ca-valencia/firefox-111.0b3.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "3f0d4e7143d9f6f2d9f92dd886bacb7e381dd69623552f299c99668f8cc7f851";
+      sha256 = "ae715d1fe94a13a1481db731f9e0cb836aebf0a83d86751e46de9ecf2c808651";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ca/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ca/firefox-111.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "aa6fc57fc2cfe59f885bdd9fb9ac70a6b1d99f216e9ca59fdde82302a872a931";
+      sha256 = "de2a7fae801db4a134ccad87e9c4c147d5d0ccb5f86ced526bc011347f8e13cc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cak/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/cak/firefox-111.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "2e0ea9547dbbfc73da08f0b25c888ee8a05285c2e1b038facb6b60acd0735b21";
+      sha256 = "d560b0079cec83cbcbe2d8483dd005eda69ec57ddff89786d3246d28fcfb7add";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/cs/firefox-111.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "b3f8300ab4235e5452308a9e61c6f25f3b288e7abc75899c2edfde9bccb71743";
+      sha256 = "3632677061fea31591b50fbea7cece6c293a31f9092e2a2b8bb1f5914c01f45f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/cy/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/cy/firefox-111.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b1ff7f5b50080a0fd587b95855aa4378c77e9c7e9f297c401d7530bf62850897";
+      sha256 = "bb928cbd3d4eb8054630d123f32f84ffbc71557fabdf4d3696a6ed5f360ec70b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/da/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/da/firefox-111.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "7a4b1c42e4a7868b4c7eeb2837ca23bcc98439a9082893c9b6a27aa794db1c3d";
+      sha256 = "25aeba59277b000deb12867e3ca30916c795d3f53076509015154ac6c2c27a23";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/de/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/de/firefox-111.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "ef1d6041e6f259568d0ba689774cc68c93b6657cf482617c2c9b7977aa59fa0f";
+      sha256 = "2d7d9f825722fc6d04d2a9657451543e8c36a04246baad5259fcf22550a170f8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/dsb/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/dsb/firefox-111.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "be491c63b026a99a27f1fc07113cbac53afe2cf74b0c4a14e01b391a9f78afe3";
+      sha256 = "6d09785b9353d5994e8864ec5b3bf739defa940cc8f76764924d125aad262199";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/el/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/el/firefox-111.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "c3a4971667eff47902451e2a4ae61f2360dafedafecbb70d0668021e0136e210";
+      sha256 = "18346402a7e6c17fa2aa87f25504aa59ea264e02319fdc7a7693354afa1dda40";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-CA/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/en-CA/firefox-111.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "1c22322afbcf77b1042a88946313300ffbe28f2d46b9b746091bddc8ab4b9e73";
+      sha256 = "4f6d420ad9a63b2b1c2cfdb4180f61cca268a5a4fb7776dc272feba7f912c98b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-GB/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/en-GB/firefox-111.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "7b52499d9bef9c077411d78c746dd25f28334ba55ee116f04e655b1dfe79d933";
+      sha256 = "c8e7f8e2ddce096b59cbe3742b8e3224d9ef532074246d4341e1ca435918445b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/en-US/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/en-US/firefox-111.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "6f9a54afd92e9e4a7e28d9b2c98b9143c85e7756cc99814a6eec8eccc946ff0f";
+      sha256 = "2b84db1d2393712324c8b90372255add1c867863f8dcd4eb23c386fc360574be";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eo/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/eo/firefox-111.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "8d233b59c6efac13a5df6e49d75cfe1d8c583e6fd480c7f3cd14a854d93cf520";
+      sha256 = "e664d25106146fa3aa100097066e51478756a5dea26a140a6811d8716eee74ac";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-AR/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/es-AR/firefox-111.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "96030e4be739bb7ddbf71f1849b698e78de87355506eee026318a3d9e78d5062";
+      sha256 = "881131e387b01eedcc810dde27b5144aff083e8c1bf361ee764fb015cd8b03ac";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-CL/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/es-CL/firefox-111.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "8f1347c15674769afccc4a094366c744ee2e7cd2a72c0313b7472af2256c3192";
+      sha256 = "a6dd0ea30ae4ea01e11829336d7f7b4accf1d44485764d3288e7ffbb1c739c32";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-ES/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/es-ES/firefox-111.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "0380e298dbd24b19748d1c959867e6af16203868ebb46bff1aa45c83dac9d987";
+      sha256 = "3a35f3e828c86015ded80daa1873879adfb95bbe8c36e98e54b7d07243f30fc2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/es-MX/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/es-MX/firefox-111.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "dea1d2ef28f783ab316354a3a6d92309d3906cf55a82e5a7ff7f801c3a512617";
+      sha256 = "7557db5b822d5e67d2e0d73a644fdfca17150676c366c9b0b8aca622be26450b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/et/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/et/firefox-111.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "83ed70566e1a0fb33120d9526ce3b14939077a1048054f59c301b33d07924433";
+      sha256 = "ef1b5d5ad6e588858707ce3735a901661f31ae6ac62f92f84340a2186dff8a91";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/eu/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/eu/firefox-111.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "0273dbea420a77a3f3331f5e80d3302b8d488f5bb421e55d9b3675f80132ddec";
+      sha256 = "cf1b7118c02da5d10d94e1cbdedcb278dadad4ffc21514d0b5fbbb3969ea7897";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fa/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/fa/firefox-111.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "0f5a0f2614dfbf226855d9f1f4ae2b239ff884b7c4bfc4b1ea9f71e5681613db";
+      sha256 = "d3b88b769c2990137a26b0c3de1abf70f3d3b5812e57b0f198c19307d7d6a49d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ff/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ff/firefox-111.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "637152fb27f03ad574db2169ffdebdfc5bf1d7fc8f9b8573994fbd854e8c848b";
+      sha256 = "1d7d35f7c5d37c777d5d32d2e851b2d9c764e201c2e3de519e310206c3a72e98";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fi/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/fi/firefox-111.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "538908abd12b8dfc8beb583811fb1629e496222463f9487ba3e988da2b0d1ddd";
+      sha256 = "aeeb1953246ae2037498892ae86ac24d9e338290f9facffdb833b1e75e337a0f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/fr/firefox-111.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "7ba6d2259d7a33a98834fe7ba3f565ab5a412af0001d83fed5c449089a423fc9";
+      sha256 = "7383a83a8c58dccce891f38565e0549cbce5d98a023520a79cdbe0186d8e5eb8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/fy-NL/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/fur/firefox-111.0b3.tar.bz2";
+      locale = "fur";
+      arch = "linux-x86_64";
+      sha256 = "16d653601c018168794f8efa0ed42cea3f655b99b228b6a9d3caea3e27884926";
+    }
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/fy-NL/firefox-111.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "1ba376f24244dee62fc296ce26e82db4f2dc27a73762a773eae63b24634f7627";
+      sha256 = "e27d1c7dfd39cde1dd3693fb5fd8c16db8c3ee3cdaf529a23247c5ed593809e6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ga-IE/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ga-IE/firefox-111.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "ec0d2db7e771516515014f560635b03519797cf040c9ac53fb0bead6c553dc5a";
+      sha256 = "a31f2890c2ef3eeea4194b1fb9bd9ec157889f12a34959e522e4945747b42aac";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gd/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/gd/firefox-111.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "cb20591866003e56ae1b9c99a0c124754e4a3dc2798596c2629eba16b51ccaaf";
+      sha256 = "09a5e7f4fe6ac010b445c56f984c2492775eefdc814b13e04edad5aa80cf5d4e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/gl/firefox-111.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a29e76b31f75aed4df52dd3fe2f9b5d7a9649e010eee36f7bb964f988d980270";
+      sha256 = "a19b97744326168e403c17a42f71650dde8fa44c110aff8cddcca03477e321ea";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/gn/firefox-111.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "edbdf1000de809a5bdd0350f1c49e505cb593273734d05dd3ddd46710729fc78";
+      sha256 = "992e77f1c796de381982fdf2e501f4acffc8b1c1b99e597445d63df4e89bfd71";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/gu-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/gu-IN/firefox-111.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "570089326d80d06f013111020e6dcb87563b78cf0f5a6cd69552fb6d86255752";
+      sha256 = "974e6c4efc5ae0bdb3e7d5df5a6ac607f7a3f9d7555601d9b9c4f3364484c980";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/he/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/he/firefox-111.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "ce35df979ebd3761619174de68924dff38b4ff65a150167db195f8011bd2923e";
+      sha256 = "c3634ec91631b730b5baf95de7ca214d353f96f44384456767609054be7857dd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hi-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/hi-IN/firefox-111.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "b0793b48235be330e2ed749e152fd4a5f8f76fea88e2b4e192cf2c2c1a3c3c08";
+      sha256 = "93ad34e82a81732f0c12456701ef178be7828a649d258ed5318f263768be5b87";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/hr/firefox-111.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "898793ef521956f564474d490beb0e3a77be2b6c20d790ac14b20e6279075864";
+      sha256 = "8a2b68ef5e35a03c7a28bbba15b4bb8192fd192b52cd6e702ed70521d97f3d3b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hsb/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/hsb/firefox-111.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "bc4dddabb277b88180afec6c956488315e95b4e31a95f0969936f85e3adab5d2";
+      sha256 = "f3d28f86a6f230bc903a4b62e3d932fa8ec6c3f69f0be07ab543b11ac4dd07ac";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hu/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/hu/firefox-111.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "8f9e755fa8c7b9173ec6e6d19fb0195e80e9884434812ec7b4b61f26596a3e95";
+      sha256 = "2bc3df61afc3690b424ea5cca7bd9aeae84961305d1b73b75579b345465822cb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/hy-AM/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/hy-AM/firefox-111.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "db36bfdde0fa2b148c05d6e2ff147f1cdc3adf2bea469bb13057e157fa80c2ce";
+      sha256 = "d7a6c38080f067e166d16f14324d09abb9b909e9666dd037ca7397a0e1f021e1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ia/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ia/firefox-111.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "d2cbf20c9e43d8332c1fb24958e281438be856ccfa7a4b106e2c9bd95e4dc065";
+      sha256 = "036c63b40b937673501d4c8c7589b0ae9556bca9350336058dbf3037fb1da85c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/id/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/id/firefox-111.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "14a10b4dc15d7e910570f941fd146d8e82bad752557e710c8c676f427bd289d7";
+      sha256 = "43220c651f07c00873cfa2759eb53432d5586c952b01aa45cff2b9fecb06d723";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/is/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/is/firefox-111.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "fbbfb16a9525665d9c7212534cab21922f547f0992734fb96ddaa4099914b0ce";
+      sha256 = "3ee83560a8edea3c9a5d6f1754a15ac1991a183bade5ca094da3bc3d7a4d8587";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/it/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/it/firefox-111.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "e8d3c681149aa041480165eafcaba09a6a05fe4f8297d068b97899eabce9c2e2";
+      sha256 = "c049ccde16c6f98c5d16d3a766241c8e121402be7cd5be7bb215b5760a10d04f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ja/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ja/firefox-111.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ca9ed83b48cfb7218b718af754a091d2ff7bba146f76f01181ed4be1b581a9e1";
+      sha256 = "65b92d69bf42f96c0c2f65221938532b83cd006aad9c36b5bb8a05fc4389c66d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ka/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ka/firefox-111.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "cc05de864bc532d9cd659b17b486ae6ff4ecc9f71ccd74d34c51cc35018ddb65";
+      sha256 = "8b377c82d19c30b4802776510bd4650cbcc6b7e8ef62c73c7a30ff9bc389545a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kab/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/kab/firefox-111.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "907b54cf52376a82652926ee91b12db7444e481aec18733d163eb4e9ff29f814";
+      sha256 = "1e5d9c7158c8fd05b9e536453a1f0a3538fcdc9dad57a1f4f791120cc666118b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/kk/firefox-111.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "5547347e1afcb9a65b48be27d44323d104d9bde2b47509e79c264df257cd30bb";
+      sha256 = "c512dcaeeea8b69d026f73c6bd7aafcf87be72197b0bcf69cb3eee2d78887cbc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/km/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/km/firefox-111.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "ea079774e5f57b38e617cd2675a1d4a98bc890b02006a7632914bd91de42f2aa";
+      sha256 = "ba4fd63d665553d1b30a590d6bb485e0d1d2fd5d4fc2c051d210d9a267dd5189";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/kn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/kn/firefox-111.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "32099eb48e8f1365d8a958fdc9acbf9e8f74822289aea5c180ad7cd557095ac3";
+      sha256 = "46616c1466b453822e80382efbcf0fc08c299571bbdf4e61f85ef01e2369b039";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ko/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ko/firefox-111.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "8f0aa7bad3ea61a41b7be760e4d7d720f694a1480f3ed1d7006d96cda65065dd";
+      sha256 = "2ac4f6fe263f45b74ae20174736c27179941d4a56b764929277c5d54eb9341c9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lij/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/lij/firefox-111.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "21348cf4a7808eec0f42cc4afddd01b103d4f289d59b8fe36022a625db89278b";
+      sha256 = "faf305df538fc44cb32f30a9a65a6bae509f67c422b1e1bc394d9dc5f705eaa4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lt/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/lt/firefox-111.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "5a8d6fafd65e90ecde3000a1fb7724ddba69c3f08e86ca2a5ad841994eb4971f";
+      sha256 = "67c9498f5e1ebf05f948e2800b7022e834b233cf2b1cff6e0c4ef6db3b371ce6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/lv/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/lv/firefox-111.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "91758b8b14251fb17bbdfc6ee12dcd1c677c0da8e422eda05ac896e436affccc";
+      sha256 = "85bed9c144ee6e788042b12a2915d4ae1a570d24b756890400cc8721cce49b3a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/mk/firefox-111.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "49c08e7b1a57dfa10325ee65cf155d64f9e08190bae2487431f2a91d64f97446";
+      sha256 = "9c48dbbfee5d350725e3e861ccefa04581c8c3b10018c0a07e134c5d4efc582c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/mr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/mr/firefox-111.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "a11875fdcf2a93dba485e72b1fd908c14b43ec97096dbbe78c37ac5834f06f1e";
+      sha256 = "3208335aa3f70da1d7bcd1de04d0e7b69d5d95fa84246cc80b2fa76e231529f9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ms/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ms/firefox-111.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "b4664837f25808a7e0f9a3e9570e8534f1a5e82fbe51137bcafac91fcb8ca737";
+      sha256 = "27e0dc17c44463cfdf8d3dcbfc4f3411a98752a253ea4c63833d19f2a7cc8938";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/my/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/my/firefox-111.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "f345e87b07fdb431c4c69f96e83fcfd4aaeeabcbb0fca6e6d3a71c263d710b65";
+      sha256 = "b7afb4c70eeea83dba7dd7e0a274de91e32fc238f65fb93abf8835a21682a638";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nb-NO/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/nb-NO/firefox-111.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "006ef1aa2500a795782fa9820886ae7d201ed7380cd488618e9b5eaf3263aeee";
+      sha256 = "e99b919883aadcc025ebd0aaf14d2a87491f2489d52b3badb312e4ca0b3e5426";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ne-NP/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ne-NP/firefox-111.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "dc9a7c502bf5395e7976e3160865fa8360b25af396976ed95c21e8bd84d8226c";
+      sha256 = "27842bfc2eb6de8f00bab156b466b79398ad341bab28d2b9fb8929fb39916b0b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/nl/firefox-111.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "d9753724c425d3c9cadc20436a8995f591720c30668f0453b036fcb65b67c30c";
+      sha256 = "6bb5cae301587da6cc01788b88effa12f6df9448e42a0f6ff270493f93473fdc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/nn-NO/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/nn-NO/firefox-111.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "6e776774da71652b62e4daa4b4e4600ce2ca2eaa68fd41acc127fec17a21e0a0";
+      sha256 = "8209d017a2c73fb07f7fac78c88daf1fa4814f5cab64fe092f6994f436c6d938";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/oc/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/oc/firefox-111.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "5f3405900c6b81198efc3b22ea77318e3fdd8984e0f6410adf3f66f7fb39eda1";
+      sha256 = "b2407f9da40ddac7e3e03ba3d0bfb2ca8a09a838712de5a70345467613920372";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pa-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/pa-IN/firefox-111.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "5efaee9f9eb16fbf1b3d3d0bb4d09c0cf451dbe9dfc27d46e85d2d80c1b838ff";
+      sha256 = "296a7758b056eb454ce417a8dc609912ee3b7a15d75376143f431ace90cdc14a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/pl/firefox-111.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "65b9e3e1155c4325c827871c1a236932ab210fdc0384078dd5f827b7454ec5c8";
+      sha256 = "b9c3858f88744dd8ddb8ba17159105b0ed59b009e506daf63ac0aee5caa0c1c6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-BR/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/pt-BR/firefox-111.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "f23cb718e99fae10967cca330ba6bb6a28293ebdaf9b6681c3eebccbb8555281";
+      sha256 = "b33c4542ce44d18e840cb82fa7bea689c4e7ab6d01c1ff97e913666fb31c9708";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/pt-PT/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/pt-PT/firefox-111.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "c0dcaefbe0a00e2ff8300dc6b23f25cdfcf02b80f43cafd0f5c23db91635a784";
+      sha256 = "2eb23b461caea0052a1f3267736ceb4794aafe72fef878649dc4486101263346";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/rm/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/rm/firefox-111.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "1cfea13a5987f28820caf577927cf464950735ed7fa23c05ba59e0ce41628146";
+      sha256 = "9660ec90e1afb7c3478f1d4d1c63c58d0320a3feb62a8b42220bdcc41ee7fbfd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ro/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ro/firefox-111.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "82c36e3645da1a77917a8ba3ae00ffbbf82094cae66d62740da6d847e3aac9b6";
+      sha256 = "b8e4e8f56af185dc159fb5aac540c98929225010dd2ef0e179af9fc158a49f67";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ru/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ru/firefox-111.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "c48d252b64961ab476ccb8a85cf5802941cbe90448be72d8af69a31a952962ed";
+      sha256 = "93f9e9cc7254d26b7c51d710d7e80a9f4da166da7af467454d4d2f5cacda2ead";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sco/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sc/firefox-111.0b3.tar.bz2";
+      locale = "sc";
+      arch = "linux-x86_64";
+      sha256 = "a3bb6e85fe6b460d5a8d8b30d567fc4165bf1ad63279dab259f765d2d6df1ab0";
+    }
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sco/firefox-111.0b3.tar.bz2";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "8908f00ab128111535f872463fe3a7e63e8bfa6d35af31169d927464fb5097f7";
+      sha256 = "8d44ea325a93b45f7a62f6c5d8324c238f523d5c584f24784469a06dcabca487";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/si/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/si/firefox-111.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "eb069f23422fbca8df06fc1382c684e74c6af5dcd01b58d9d6e190c21a8bc493";
+      sha256 = "a6702447631336e617b35186afe27b077cf67f09b01caf0fe08bad570bc62a43";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sk/firefox-111.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "c485954037807b81acd348083292ae4fdf779727593c9a1fe97ed094a29ddc15";
+      sha256 = "802b6ea2cfa325b13b3520a06e4b1280c54bb79d3251344c815b0686665745a6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sl/firefox-111.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "c6f506b0d14582b2db01e766a9da73c3b9385eb60782e99aadf5807aedb02426";
+      sha256 = "f5df74a31c18a0dff8ee7cc49fd1778b5bb2f788ecc5ab651e2b9b5c34e3b79b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/son/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/son/firefox-111.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "50603367de317c86b042a41996fb47f35cb7758e1cf3c48149c4a892e31d6381";
+      sha256 = "c54955118e5bd6537e5b396c422ecb6447cb547a955dfff3e497fe54fb51c5d9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sq/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sq/firefox-111.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "26b278dc225b3bae852b74f81e8898a2b5f30cfc242971683d4f21a345f2dcd7";
+      sha256 = "22eeb501e51b6e7d86972df349e58f5d364eeb47d9c9c00e0a1f98c50dbdc297";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sr/firefox-111.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "70032ae28bdcdb00d8a2b9528d5d09dcf67316fb91ee411539c59f3b3b6a075a";
+      sha256 = "f708152ec9347b09ba140e64f625f68b7bcac8cc63d44756b0f3d68636d936cf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/sv-SE/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/sv-SE/firefox-111.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "10fb48222a2ffe31576784973c305d02aee180044e11298b2b97e772c8518933";
+      sha256 = "8c82ca145dfe7fe4613ef4c965ad2399ab761a63e40e3523b6fc5e336b68fcfb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/szl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/szl/firefox-111.0b3.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "13039a67c2cea4dd2c128665e25bda28a4334465311417db6ee71846c440e754";
+      sha256 = "46ff50e0729d89a1772831b5a37414a38b0d8949856acdf917b5b34a384f8812";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ta/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ta/firefox-111.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "66aeda2367e34915e9ab8c284ddf4f6d10d217654f0aa6663e50bdcf3f4bc2f1";
+      sha256 = "9d33df8be44b57644be629404acb113f077c240ef46dd9cb5848e4dc510f4f30";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/te/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/te/firefox-111.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "f9a617f3fab610d6600a7cc8b118785ad77b9cc0447f89fd55f2f4acb4444226";
+      sha256 = "3dc2ef49835edc9a6862ac3573e4376fe43bb43094f9def003ec40ce4b6fbc95";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/th/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/th/firefox-111.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "4d4194bc163d7ad55cfde98cf2324a6a719b60c54f27a394c58977582c99989e";
+      sha256 = "5c17d36dc5cdb7d8919190b21da8ebd968d53c8ea15448bf028297d1db619b7e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/tl/firefox-111.0b3.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "fb559731bb3226c4963158b1cb8332dac7e71c0a975429e112e456f2a9f3863c";
+      sha256 = "12c5e5b2d757f969d14b14f9a84a635a3c72ad98f4aa53291a6717d4407918fb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/tr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/tr/firefox-111.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "0d6e05a3993673ab612319e3b287893193480a0a82bd3e1d0f9adde5b7b43c03";
+      sha256 = "6aa491d08f32402ab6541771267f56504ee88ac8fa59307916b8ac9c72abf8ee";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/trs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/trs/firefox-111.0b3.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "2bfaae0ea692e6d65787ba6751e24802dc458e0b17e1972290574d612536a0c8";
+      sha256 = "751b2c5461735c4a6586423f4f0ddfb9fe7951cfe8c0e910eebce3b59b5203bf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/uk/firefox-111.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "410016df2f79e3a14210686ca594f6994bffedf73eeb37d536a9ac206e731e50";
+      sha256 = "8b4243355f8a3ed9aa03ad9e7b118b7c706648f09eba75b18b64dfcaceb75774";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/ur/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/ur/firefox-111.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "cec6bf39cf4893c6430ce679b9f3115308cc846e9008083bc97ffd731885bcb9";
+      sha256 = "66fb89136602321c4ad54f95d3b94dd7970c621fb4eb58f1de239913dec5dbdc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/uz/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/uz/firefox-111.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "8a7d363a41ac5dad399a6215186affc9a4a4e4fd56c75f5ee0d43b0b08eb2739";
+      sha256 = "c4626d72c2de1589772e98d3f817461e0e07b061bf30539bce114c3c66c64d2e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/vi/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/vi/firefox-111.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "187e08e5f39dae028c6b0d819eb570f4881171b6432fed2cbcbc732288a98b96";
+      sha256 = "fbec6f1cd325bdc57077b849ae17c6f3b80734488b2ff219fb178cf2f09f622d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/xh/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/xh/firefox-111.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "1225b62db14ddd681b1aac4b40064c9987a1138551655dbc5c49f12b8e47c80d";
+      sha256 = "a6f77a19247be43d41912460225af259a4aa5ce5b68be0c9a37efbd245777eb3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-CN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/zh-CN/firefox-111.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "2ae18aa0a672b35d15265e26bcd015bfa93ca8fc76911301ac1b0fb214fab1a3";
+      sha256 = "18dacf78af0afcb0269484c2428686787506249219ba275c738377cfd0ecd895";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-x86_64/zh-TW/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-x86_64/zh-TW/firefox-111.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "91a601746d936b09ceb20c6e71b2e66337cf6dcf73a5a8a49e120b242b9fbd09";
+      sha256 = "bc246a18c91b51637263dad1abb2f6e424981b635e1376c5811a49d228da6b0e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ach/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ach/firefox-111.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "4b6c3439750c59a389a92977502b69d21823aaec8a8a369ccec947cc0ecc6e11";
+      sha256 = "f6c3c259a2fec3657c09c9136202568378442f4fde8561d7abe107bae9f503e1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/af/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/af/firefox-111.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "40fe16b22f74bc2b03e46df4845158b6f5da90eedee86a41a2d65e1212bc6f1c";
+      sha256 = "13856f2df3d902b1090a12ce99becfe25a16e8494e21125d5cff6d3dead3a6e9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/an/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/an/firefox-111.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "efd1f055797cf33cafa891ebd6bccf159f65086daa56ef82d43b4db54f37db8b";
+      sha256 = "3c2b7431e2296ce4ed76bd17b5626058ce22336bdcc7ef045c43f864df5d69f1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ar/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ar/firefox-111.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "bd9b5d1e9e7e3abac4db52e0c37456dfd5a4eb56a8ac8b0505fd04c0d30df6a4";
+      sha256 = "dfc31e0171f1167e3910b60c06ad7a66cf960ee86d2cc4053537275739b46c41";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ast/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ast/firefox-111.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "12238eaa1d0b07932dd8ee5a9f80e8997f7ac53dfaac3f444935ae5a6f4642e7";
+      sha256 = "0ff9beab460cebbf4cdcda414fb4da3eb56c6340fa2b8515b2dc6d4ce6100102";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/az/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/az/firefox-111.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "dd97327299ca2972451a94ab969f6242e1ee80b5b5f8b4a8d3afd7a6c4df0ffb";
+      sha256 = "5edff0268de9a05751ee9a17fcce729ff46bc67886d31b09a36ac2f3e021b96c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/be/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/be/firefox-111.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "95c5e5c5dc279301b4110d32f8f6517567986522c7fe5f7b23161a3e8d74d141";
+      sha256 = "e2f26258ddeafb7d9fa652c8f9bebeba00ecaf822fd721032f9a45b38814ddf9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bg/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/bg/firefox-111.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "5733949bfd0a8dcbec55cbcbf2cc8cea9cb06929270559dce8ae0bf04aebb82c";
+      sha256 = "32b64e432397527fda2d37dac4d9ff7138ffedaeae6e66812920e4018327136e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/bn/firefox-111.0b3.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "9a8e143e9038dd6028a7da697d72ed9410cb839e635dbc30b0ecdb11b0759bfb";
+      sha256 = "489f456f873900d79e7beb6a0691d1d733da3d223595f04223ab0ffb15fbaeb9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/br/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/br/firefox-111.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "7d87af6eb4d45bb0c3db1469c000a116a5531ece9767e5d732f5fd5d44873d34";
+      sha256 = "9cb03617b85e3318883d5dc1d2829ad5e87d9857081110cc4f9f9ed771fcc38e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/bs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/bs/firefox-111.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "59958109f2cd19548c76a03450f77737f1e793f1d14490d501990e5243640fd8";
+      sha256 = "bbb2e50724244af8012badc2534f066063ab84907c9cae9ffb727b0a97c1b060";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca-valencia/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ca-valencia/firefox-111.0b3.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "e830fe6e33bf8bd5508d1f31a51b177664897719efee4bd80ad9f1874769c541";
+      sha256 = "fba5962ba0183c8667e15cafe954b379456b8e17f3c992174707ae56f4862447";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ca/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ca/firefox-111.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e5d84bfa1395fdf797f4eddeec0f99fcf6138012afd1ca9c4fbae4031b542130";
+      sha256 = "ae7b451287511d0a98411692e3f57944cce3e9c7b007cc451b6f62c6df7d79c9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cak/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/cak/firefox-111.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d9c5538b25a0c277e61b6ec5bad760c203b45ab8f607de3620de6337678824ef";
+      sha256 = "f566dd5334edc14fd9bbccde9d148e249a218495fe5ed96808418583a25d16d2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/cs/firefox-111.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "bbbe1ac4e17bc1c86cd35e990f30a167ade5d3e50b2b739a35b81ec7ba44315a";
+      sha256 = "84f3413965d8e48b830d4ae140c449fb9bda9d6ed8d0e34676cca8c7f0b4484c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/cy/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/cy/firefox-111.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "b42bf9a0093006a9580a4b7be0d6211fe7d73a4cf92d73d11c8c6f310400abce";
+      sha256 = "46087ff4c78535f230248fa5211f3a665d86875a9a113357ecc5cc253cbbfa11";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/da/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/da/firefox-111.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "c8bae91a80832cda174a9156ce4f5ea8f27d1ee951ec2248c3a14e95814cc4a3";
+      sha256 = "ec0aa80df2f5ddfe516146b13657276f0b2140a7602b06d09dae0d05a5710033";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/de/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/de/firefox-111.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "6363710caa0789a1c09579919a4303f7738b5dd79f4a975f79c8aebcb8ff1c43";
+      sha256 = "78268ff3d4812f2000d449b8baad077908fbf3d2cfb996099fce4d7f8b9fe22c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/dsb/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/dsb/firefox-111.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "f7806c9e4f73bb9176e6f37f00ea945b246b52b13d486819298efb49af5ddde4";
+      sha256 = "df8dee7f15b45369cd6dd9ef2a2d97d11406f1489358ec2796da994a404c6819";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/el/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/el/firefox-111.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a25be78d906d57d759cf8bde280f1ee813c88a2f40b5977de944b40a8a3b1cb1";
+      sha256 = "23f2bc641a5d735e78f59bfadb3266a3eac8e89b0d99b72e5527dea796100089";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-CA/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/en-CA/firefox-111.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "8b21e8635b1e3e747497d431e974e764ca35e662417200120669cc55b22147ec";
+      sha256 = "665db66d6926ef99813f2f1af46a156f34ae9afa4ef1a344ca0855d518ba2645";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-GB/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/en-GB/firefox-111.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "8cbceca22e3a3d3541ac89fce5fccdc1758469258df28e0b271ecbbc162ccf9b";
+      sha256 = "fb55820d0f6adc0e84bb4d2abd2dbdab7c51f6644442f86e1d2e8153c445c9fd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/en-US/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/en-US/firefox-111.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "380e5d288bbe0d33a144ef51059e0dbfa8586b8a17c4084a9c00b11a66aab816";
+      sha256 = "84ecb825b30e451581b63a8f77e308eb8d9b9b22b2fcdb7a7bb6ec5389db6d1d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eo/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/eo/firefox-111.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "d0b7e7a4a5efd7d86eff1f5e5ead40be5c878f1ea72e7ee7d23c385a38a69a64";
+      sha256 = "219d1978af0abc9b834dd2e51554f88aba154a19aedf698fc45975334b752c04";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-AR/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/es-AR/firefox-111.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "2434f4d2522614f2c6e12aceb84a4148577eb0e8f86b55a8fe6b1b39ebb03743";
+      sha256 = "5bd5b90ba90fbd5c94c9fc5664d15d011f6e4a3c573170940ce3c3918c5d6dbc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-CL/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/es-CL/firefox-111.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "f54355926490abb8ba8499563389702dc0ba40c793f7de8da188b47a95f397ce";
+      sha256 = "a1c56f399508fc3f73d3376621253a95c7e08bd275dd76962a103e046c11ecbf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-ES/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/es-ES/firefox-111.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "22aef078ccc04844bbb59de7b1226ed3a4435f2a46448ef0ba7e9796c69ac2f0";
+      sha256 = "6bcb04a9ca2f05620b2d22e0ed0c467ac61ee12fd0fa23b1cd5ea5d907cdbe32";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/es-MX/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/es-MX/firefox-111.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "7ec6a9ebb479adff3fdd894a1992e1377cd8aa898126b7a51d7bd3e8c314a2cf";
+      sha256 = "c7b20afb6776c23c82508578e28dccb8b5eba49631f5acd5f802d031a9451078";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/et/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/et/firefox-111.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "5c6d7c0148d66da0fd6394a38dc1052df059a620285a8277b0b166b57f96e3d4";
+      sha256 = "7df4b0bc91790e9e4024eea666e7c6b40e1108d0eba73cfe6e60c8f60bbee7d4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/eu/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/eu/firefox-111.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "16d393fa5ca5bcf93da4d1e469a025482850b88067c0cb601e1a6e0373bfe4ef";
+      sha256 = "f6264c9cde6f1f08ce84c5660fd7bfc3ededb6889ca947dbfc7c17ba9e6eda3d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fa/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/fa/firefox-111.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "a7b2e5e4b4d3d43757e34ca07de604a94a1bb069e030e3dd5d1e8adfb5446ca1";
+      sha256 = "d3dea0fbc0a2af2ae70db1e328e0f9f5920905752253c5da22574509e9f79da4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ff/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ff/firefox-111.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "a818607d5b9faa7f10f1b887e3d7ab31773e19ac4fe1cdd902d71d93148b9e34";
+      sha256 = "c0d26f989cd2723f6a09c04f9722446fd3b2272b1292b2a06e674a49d3bea355";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fi/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/fi/firefox-111.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c8fa7b5af6b02f9cb4076a0ae213e75d386f0740bf8f4560fcfdfe8b15ee5bd6";
+      sha256 = "a1091f3960792bba9b227e65b3cc330424e0cd70cbd3e09a747af7e356befe00";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/fr/firefox-111.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "8eec0ed9afc6199bdcd7ccd1ad9742c5a06ad74f04c617f828debac47f81b623";
+      sha256 = "0edf041d84ff04676f467a1160ba4fdb220749a52d15e346936cffd9a5f9e84c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/fy-NL/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/fur/firefox-111.0b3.tar.bz2";
+      locale = "fur";
+      arch = "linux-i686";
+      sha256 = "ca834f09b3b367ab7e6bf43bda4db9dcd90926dba63b0745f6966e9c0b856239";
+    }
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/fy-NL/firefox-111.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "a91d8e6b007264530c829ca6d49510f7c452cdfa2cc8bb6939a5ccea1ec2ba44";
+      sha256 = "336f30bde25097500b0012646bff93140f4d6a21cff7a09e7f37ebff77722271";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ga-IE/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ga-IE/firefox-111.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2029d5533e77417d4e696872cdd3f95d06120fea1fb50d350e62d65e85e71765";
+      sha256 = "f40360e1bfd1940debe73a7943abb142b44e66f8a0510313fac5d2288875cd9f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gd/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/gd/firefox-111.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "d85048cef87445e131f0b0cdd25739cc6e792eaa3520b583fc9231182c2a00c7";
+      sha256 = "68e09e2d1942f729c2f63faa3c7e62785b373cd2683d7a4693394cc34dff7436";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/gl/firefox-111.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "3a4ff2e4f8f4bbb83db4dfedbf2584ed1db3250c725d3d834926ff8e1129f3b9";
+      sha256 = "c160074236c13dc340f57db340a466ba56b0cd9737ac22c172273fa4b856cd22";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/gn/firefox-111.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "f0a92cab7f2fe2b81f92d3c17ca43d3a7598f7ed879a7ae4daeb303500a5c5c4";
+      sha256 = "46fae53b6cb4a3987b09d4c7c4d518340bea7a11bea171b78beed693f9e490dc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/gu-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/gu-IN/firefox-111.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "076dd689e5397f0a347db0ea50c328e097e1fc75633ddb65867ea2edd0ec8a4f";
+      sha256 = "b89e7382d78345b158bb876b16048311d502abb76164203ba172fd68a6ccdc57";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/he/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/he/firefox-111.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "8a32c0f4b791f6036e04776229dd4676615acb5778800bc8b227bfcc19b5516b";
+      sha256 = "34d31e5b8abe261fc410a7420993c1817eee28a582da68f8a9ed88fc86544e43";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hi-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/hi-IN/firefox-111.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "cea795afbfc273f27cafc9e57ea2cbd2ff66fd527289a76e606d55bfef1c2c53";
+      sha256 = "062aaf831d92c95aaae88c023adbe6d9c1c84cc1dc01c8c5777963f412945c97";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/hr/firefox-111.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "c6ad7e4b6aa871ab89f6ac9d592fa624f081930f9846e1b26b8b9853161def93";
+      sha256 = "535af06a61a0d8da8d20ffaf9d6465b7e78f244a2bbccadae92673cf38011753";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hsb/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/hsb/firefox-111.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "38bc020e7655190a60ca8b61335c5a17dde9e258a7829e675257e932fda8a98a";
+      sha256 = "71eaae679dafe80476430b9df9ece22195e89438198f1516f30cd2f3f8d3170e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hu/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/hu/firefox-111.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "b09d278de29d76c2165b7c69fccd9841cd4dc8d38f41bd0321f9d19840bcd3c6";
+      sha256 = "cdcb0fc5ba53e717ecba9ada958da8997fa12ab7c28ed8ce728b7e438de54493";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/hy-AM/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/hy-AM/firefox-111.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "3da24edb261b08399afcecb5e7dd87209655bb80e990f31954f211aa214c6682";
+      sha256 = "13143f575abcff9ef6e6b08eb965313eb00f5151dbf0cbcc87c86c1187946581";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ia/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ia/firefox-111.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "d0c176e5ab1cda84944b708c0c82956e244b9fe8fe371976bbc00a752605eae9";
+      sha256 = "b809ffa3833de3d8f97bf6210f773d1bec16da9ab9c5b96ca9d89bb6b3904b71";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/id/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/id/firefox-111.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "191547c29106ded2b7aa4ac8be95d70d6485ed934b7d8f14e92660db413eebe9";
+      sha256 = "fe990a4fc854ba620e7a705212267ff1e56cba4922b1549233410b02be316b9c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/is/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/is/firefox-111.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "d794ff4a91ecd73a199d31392601817108c3e60d7dbb23620abff361b064d2bf";
+      sha256 = "07902247564b55975db24ca785a9899fa7693a715fd07b39a1d89dc81a552ab6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/it/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/it/firefox-111.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "0f2f16a7d4a1f6ae71f403211d9448597fdb6bf179846e425d03d823eac7b995";
+      sha256 = "fbdd0484a12c51b6755a5406efdc973df355ec635003b0bb22f60991d1fc59e3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ja/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ja/firefox-111.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "2ca0bc651b02daa555ca4a065454181e14096da0c375a181d2ff87fb2d2ed1f8";
+      sha256 = "3dfb19116da8599a2dc29886bd55f211ebbfa7ab7133507eb4c6b9b3f05b77af";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ka/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ka/firefox-111.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "4f941d02ddc7a1222418565b243bae82d0d214dbaf2040280632ef2f5c1e734d";
+      sha256 = "22b6138dbe9705561ecabbb9508d74819e07c8f4739b76062302b3ec2c97231d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kab/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/kab/firefox-111.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "6c53d1419966645bcf88ae4aec7cf858b91c1185d5041cdb04e822931dac4bbe";
+      sha256 = "9fda4f527c1ed0dc9c7c633f1c0acd4b06919f45ec41126b53189ad6b903167f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/kk/firefox-111.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "934e6b854b47155cdc46e189442fbf41e1d1de2ba828f3c63009c3a1d43ff29e";
+      sha256 = "ebd6fe7b8d65bb950363bf67b5a3385353e26b7674344f8bd0376b2ce68532bd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/km/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/km/firefox-111.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "6809d8143e23e73861a3ac998aabc12027e91cffd8e963a55da041c3940365e7";
+      sha256 = "00876e1d48e3a72832b99e53540f68d19ea5ab7abc6eeee693391f84475aa5e0";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/kn/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/kn/firefox-111.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "8be5a243efc4887a44a3440bd3c894f0c45a67fa510bf1648f44e5640f0d44c7";
+      sha256 = "fb904702aba9c563538f52ebf13c316b74cc56a5863dd39ff64e9172e72c6f03";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ko/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ko/firefox-111.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b965d61600c1abf44428478f4eb92f7e3e2dd276e79402be0bd4023feba935b1";
+      sha256 = "4a0c3566ce6be29aafed05f621a484a0c5592b32d4f4e17b9a66cacfe80358e9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lij/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/lij/firefox-111.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "bdefa9af4a13b676bf7c818ac4efcb9a5f2a2d12705d7ba36571792be0695f20";
+      sha256 = "c5631f61b6300e89628814cbdc1840892fe240080d904312930d8668981c07c2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lt/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/lt/firefox-111.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "c73514da05816640f9ce48e778814d257a3004e12970f57354454daa89966a73";
+      sha256 = "fdffb9d1e7c464252d8c018421c7d28d40e054fcd1f07ce5f63d764f42f0b920";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/lv/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/lv/firefox-111.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e7d75dc5dcd6e546e180f8652faae7f4a9185ce08988734385baecd405434751";
+      sha256 = "e66ed3a96d3ca20826a7bab4914cc888b7eb4f7f98d26f88889c5261b8d35b9f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/mk/firefox-111.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "ce0be71233cb425fe048733efa8752a97b735f87eacc9745d6876dabb2fb86bc";
+      sha256 = "35ffa52b70319d2b3235944333a4dcbe15983b10929adeab4b6f6f951adf079f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/mr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/mr/firefox-111.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "827c6b9756972ba8d50650b561913942655a8526250729a73f2be1db2b8cce33";
+      sha256 = "b57ff5678f23acabbc196e6c0c3d98ea753dfab98bd0e8e8d550d86f65b54c4f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ms/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ms/firefox-111.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "c6bb360c3c75b120d1b60eb4e0b036fb4b740482279bbbd7901c27fba5c54d4e";
+      sha256 = "452f481ca3ba1d821a3dca733e701de8b85cfc84091f1c3e905d767c37a58d36";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/my/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/my/firefox-111.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "7ca65e1306d0a81cedc065e65974b891dadc8b5a253239c68b92e8356e1e803e";
+      sha256 = "8fb8adeac02c6842ab23fb691d9a76764021a914495d12dbe04a93c69dc86e65";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nb-NO/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/nb-NO/firefox-111.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "168e9939831e146176542fb61d3e86b05a5cfc911143e6f639563f7f0f3e6be1";
+      sha256 = "ec393e9bea1e5ffb1f39429ea4629bb4078db19805cf05cdfc750c674db3b23c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ne-NP/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ne-NP/firefox-111.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "7618535a3942c7cdd9eebd7e07095e70ec8500aec641de7cbe1279cc6a65b5ce";
+      sha256 = "01c3901b2f0205ceb9fd5dab254dff3a96ea5713149000c4565a361f19b2930a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/nl/firefox-111.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "a8232e3ca17a2bc13bc16f44ccaca500005aa8a6ab26302d10af6c7d145a942d";
+      sha256 = "4a0e081f41389ff2ed6d9e8bd76085002044ec43e618c6c922e889eeae650b44";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/nn-NO/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/nn-NO/firefox-111.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b0713aa09bf6329abaa77791777d4a128e20c3279d07665912fc528524e7479f";
+      sha256 = "bfc37b162680d048b6543d380ed8c17e89debf7691b49bc7cccaf0208d21e072";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/oc/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/oc/firefox-111.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "830744f6015dafb560d4e9957467864d91f534c8a6646558bc6391f62f213949";
+      sha256 = "30253632b3576a393e88213d6ba692f0d098bc36da8c7430ea990ac90f99b897";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pa-IN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/pa-IN/firefox-111.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "655100186a68188c159a0927bba75d6534e932dd6ce613c91ca48649eea49aa6";
+      sha256 = "747f386f21c7bc630e0d43d35c5dc7985307d0a0fbe64aed42f2eca804159407";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/pl/firefox-111.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "2ddcc433c1072c76f76601c259063b3e582a690f47ebf79d49186582e6aab3f7";
+      sha256 = "e0ce29ed4ce28ed4bc54ea15f7f2f0298a2c941e3c6b685054695e2ac568e2de";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-BR/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/pt-BR/firefox-111.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "57bc3a85b39d738d54f9326e693c99f0125f8ffe1e380023b55d372afb4c7c80";
+      sha256 = "89bd36b41140b500a7c37266eedf313a412d49adfc3f39d6f39394c4eb453b8c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/pt-PT/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/pt-PT/firefox-111.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "7c6169bebb351077bb7e290d4448eaa97d12c964eacb890d1ede10c2f5d76d8e";
+      sha256 = "db0abd36917a76b3bf3e0e90eb4ce6a4e0d3fd7d3eef31d05f21ccd1d2dd34e5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/rm/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/rm/firefox-111.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "0d870b54174229b3763dcae71b2b3198a426c230d3598cf619505e1ed35d6add";
+      sha256 = "352bb93acfcdc910275e64370e5aeedeadfe109ac2e984d7db79be2a51901e6a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ro/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ro/firefox-111.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "5cf581dbf61a962c255fb52a1072de263c00da1be74771525649469d2a9fd3ee";
+      sha256 = "207a7763b68e3a4f7992758276e96c0010c11cc48e98c5eaf25ff44672a14a37";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ru/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ru/firefox-111.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "852eacf7321fef6bf9ba241028a0026370dd9fbbb0be77e82bb8068a98677aed";
+      sha256 = "3a0da0f512b1e6b89ee974113891d469a85ac4a93a5a9f7a39ee00be58866753";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sco/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sc/firefox-111.0b3.tar.bz2";
+      locale = "sc";
+      arch = "linux-i686";
+      sha256 = "468a8c376ee120534450ca483c646e094d8841640ce802d75323ae9271df0cdc";
+    }
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sco/firefox-111.0b3.tar.bz2";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "0069ed75e547a028f6140678d93356ed2be04e896d502a74c45b4e66e1dfa509";
+      sha256 = "c47ad949856dce41ff0f70d19b4aa788ac388ec5d57f0d7177407d17b31fa470";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/si/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/si/firefox-111.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "9efcd39e2194b5ad1ff94c17d948a293bbede4c8b5eb9dc3b22d79064a93c4d4";
+      sha256 = "7dcc02a5ff101d01c96fb08fa7344f248110070fd4c2bb868d2f1e2cebf09a43";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sk/firefox-111.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "81f963046d3400bcc95ada2c114e0a7a8d852b10a79297d51c42cd4144499ed1";
+      sha256 = "6695db23a9ed8b6c53e80a146e5db71e1af2670ad1eb11f062a521b346ade369";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sl/firefox-111.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "8c18f9736f2c647286f4a594b769364e2f78fbbc60c3ea0d30bba25675f6bbf3";
+      sha256 = "082fa131acfe8d60a591dcff728c256d97623dfd31a0ecf5189dc0112d7e5a72";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/son/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/son/firefox-111.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "dc563e36867cc4b66a644b21b76b39eca8208dbef75dda5591a2cf7fd1d3fd4f";
+      sha256 = "d05484ef274f066f01e2c1263d6107db2fcaf7934fa549980a6706ed0a63b846";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sq/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sq/firefox-111.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "7e6ecb27a4827dcbe8b69a9dd1333e18e059b93134fe09560ad36a7a3cd487cf";
+      sha256 = "edf608e3110ae392bf15b08d10e7281004d2b98fa457c8b0638eef09760651eb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sr/firefox-111.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "25506c620fc67d533d67508431e451fbc966c0f51d0d95fff019e726201d151a";
+      sha256 = "7312ad046627cec3402f1f9ea60dc000cd3daf718fb6d6165e75d0255cb3c854";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/sv-SE/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/sv-SE/firefox-111.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "67a96f19b8abdd776f33e7a7ea6d38325b256930da884e57286df7978868ec0a";
+      sha256 = "295b6cc538454535e755a25f6900266b474271ec98f5525706446fa5b48e8e45";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/szl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/szl/firefox-111.0b3.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "c1cae0cb88b9025fee9a23f1ea6a3654d9c0d81f37e34f6b693f0b79c55e03e7";
+      sha256 = "10bbb8b1b9b4933c46537dc1d1e7da103d896ce4b39289c2af708c86718d36c4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ta/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ta/firefox-111.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "10affe60eae4746154f4659fe0e305f2588d0baafcd898e01bd2031237623060";
+      sha256 = "a79f0e80ffb24778f52d218ea3dd9b222cdce33e4db298d45e0abb99814a3a77";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/te/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/te/firefox-111.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "907f1beeb68fca20a2635e42cd2849f89a828e5033d64a8e6df9f9b99ab5d85b";
+      sha256 = "5034a8cee53b8967e3cc54c5a4a1a590fe29df25fd30f590c4ec195b2cf66d2c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/th/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/th/firefox-111.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "fc3f884d44c2df1c8e78ac21297f8e06dd8d9ae88e6346b318fb1bda8d432c23";
+      sha256 = "676cbe952a0620a3769ffb7bfe0d0db2bcd8394a10a6f975a8d4f0ffee9d96b9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tl/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/tl/firefox-111.0b3.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "ccec6a6f0e0571d0048a137d3a01f3183912740a58ad1d71903eee0b3839e4ba";
+      sha256 = "323368067b830b22d293171bd140528af9a28a60a26515db0f2de05d2894c47b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/tr/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/tr/firefox-111.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "faff586ab4b72727307a0f5d94ac2adefb8e854bf9519b158fc04b61cb03aa96";
+      sha256 = "00409679fb568b5605a49d4bd032f5a4f7c4a729ea08b9f9d1000fbb57ebd555";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/trs/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/trs/firefox-111.0b3.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "1ee44718fbfa37b936f029174deaa809b52a79eebf721da789724cb1fc5d98f1";
+      sha256 = "8c572f81db28a40f2fd57ecec4fb1cb1c0445d7b4bb2dba5e7eb7a7ebd67a46e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uk/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/uk/firefox-111.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "420ec9e9cb8f76f17c35c7fd7ffdfbad9fcd6ee6a99d576c21dbafd729967a8b";
+      sha256 = "c78cd507dbf5db6e0bf8828c0b1ef945a4325cbc98a73f385755ea85be0ec8f8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/ur/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/ur/firefox-111.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "cb9653c4a616f34cb2ae31d48f91d0e129354e0846aeaba200120f1314b13193";
+      sha256 = "48229e3ec20c5a8e35722a3723d95c13840b9ca22c031d8b0c8c8f0597015bd3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/uz/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/uz/firefox-111.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "2197bf705b85a4767ccea51845bb2f79b0b8a3ba6458fa49c8d70673cb9ddfe6";
+      sha256 = "52a57afe7aab3f61ec2a48e1f228fb2e5f9f3c37a9d47c6f501244e0b814ef55";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/vi/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/vi/firefox-111.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "afde552ce97783f075d400ca7703d80f6182ffe96c18ec239bc28917ddf6fb59";
+      sha256 = "716c4bf6d2fb335ed0e550ce54cf215535ee76b73504a2fb546b28f1ef771eec";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/xh/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/xh/firefox-111.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "42dc4fbb837bcf1d206628f8a38f78814aa9b8db992389f98b4dee7cb9e39fb7";
+      sha256 = "9fbe92f113885a2e871310e70ca81764f08369c6b0355d2bf5de07d85d7a3c72";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-CN/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/zh-CN/firefox-111.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "506437149ec7a6ca45b645b8635cedad6c6f540731ff3cba1de8cde944e507c9";
+      sha256 = "3cc1d0cfe663e69054be94da1ea8e2ba58052138e75b3d41d47ab3159d081919";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b9/linux-i686/zh-TW/firefox-110.0b9.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b3/linux-i686/zh-TW/firefox-111.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "ef860460d4322058a70741f32c5b5935ede0e2aee84299d165210ae987e27824";
+      sha256 = "6b130698a404b0318e1a9e774935efaf8b09f07fa0d0a8b01769b4413b061d5b";
     }
     ];
 }

From eaf54489440729d4a84ee684898bbf059e9a7f1c Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Mon, 30 Jan 2023 14:13:56 +0000
Subject: [PATCH 056/191]  cloudlog: add passthru update script

---
 pkgs/applications/radio/cloudlog/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix
index ceb0f7661c8e..429442336fe2 100644
--- a/pkgs/applications/radio/cloudlog/default.nix
+++ b/pkgs/applications/radio/cloudlog/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
+, nix-update-script
 , nixosTests
 , php}:
 
@@ -25,8 +26,11 @@ stdenvNoCC.mkDerivation rec {
     cp -R ./* $out
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) cloudlog;
+  passthru = {
+    tests = {
+      inherit (nixosTests) cloudlog;
+    };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From e69c0d6910fb3299095914f54843a1083f61c0bf Mon Sep 17 00:00:00 2001
From: Matt Melling <mattmelling@fastmail.com>
Date: Mon, 20 Feb 2023 16:12:56 +0000
Subject: [PATCH 057/191]  cloudlog: 2.3.3. -> 2.4

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

diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix
index 429442336fe2..641bda8fb861 100644
--- a/pkgs/applications/radio/cloudlog/default.nix
+++ b/pkgs/applications/radio/cloudlog/default.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation rec {
   name = "cloudlog";
-  version = "2.3.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4=";
+    sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk=";
   };
 
   postPath = ''

From ba3f159cc8261160511b0c7f42446b7d3a66de1b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 16:43:25 +0100
Subject: [PATCH 058/191] nixos/tests/home-assistant: Overhaul and refactor

Prepare the tests for a change in dependency handling, by not relying on
bespoke files dropped into the package output.

Instead we now check the journal log for whether a configured component
was setup, once for the initial specialisation another time for the one
introducing esphome configuration.

Also improve abstractions for getting journal data relative to a cursor
and generally make a few things more concise.
---
 nixos/tests/home-assistant.nix | 91 ++++++++++++++++------------------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 8d58de75eabc..0c2176c261cf 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -22,22 +22,23 @@ in {
       enable = true;
       inherit configDir;
 
-      # tests loading components by overriding the package
+      # provide dependencies through package overrides
       package = (pkgs.home-assistant.override {
         extraPackages = ps: with ps; [
           colorama
         ];
-        extraComponents = [ "zha" ];
-      }).overrideAttrs (oldAttrs: {
-        doInstallCheck = false;
+        extraComponents = [
+          # test char-tty device allow propagation into the service
+          "zha"
+         ];
       });
 
-      # tests loading components from the module
+      # provide component dependencies explicitly from the module
       extraComponents = [
-        "wake_on_lan"
+        "mqtt"
       ];
 
-      # test extra package passing from the module
+      # provide package for postgresql support
       extraPackages = python3Packages: with python3Packages; [
         psycopg2
       ];
@@ -114,33 +115,29 @@ in {
     system = nodes.hass.config.system.build.toplevel;
   in
   ''
-    import re
     import json
 
     start_all()
 
-    # Parse the package path out of the systemd unit, as we cannot
-    # access the final package, that is overridden inside the module,
-    # by any other means.
-    pattern = re.compile(r"path=(?P<path>[\/a-z0-9-.]+)\/bin\/hass")
-    response = hass.execute("systemctl show -p ExecStart home-assistant.service")[1]
-    match = pattern.search(response)
-    assert match
-    package = match.group('path')
 
-
-    def get_journal_cursor(host) -> str:
-        exit, out = host.execute("journalctl -u home-assistant.service -n1 -o json-pretty --output-fields=__CURSOR")
+    def get_journal_cursor() -> str:
+        exit, out = hass.execute("journalctl -u home-assistant.service -n1 -o json-pretty --output-fields=__CURSOR")
         assert exit == 0
         return json.loads(out)["__CURSOR"]
 
 
-    def wait_for_homeassistant(host, cursor):
-        host.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'")
+    def get_journal_since(cursor) -> str:
+        exit, out = hass.execute(f"journalctl --after-cursor='{cursor}' -u home-assistant.service")
+        assert exit == 0
+        return out
+
+
+    def wait_for_homeassistant(cursor):
+        hass.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'")
 
 
     hass.wait_for_unit("home-assistant.service")
-    cursor = get_journal_cursor(hass)
+    cursor = get_journal_cursor()
 
     with subtest("Check that YAML configuration file is in place"):
         hass.succeed("test -L ${configDir}/configuration.yaml")
@@ -148,19 +145,16 @@ in {
     with subtest("Check the lovelace config is copied because lovelaceConfigWritable = true"):
         hass.succeed("test -f ${configDir}/ui-lovelace.yaml")
 
-    with subtest("Check extraComponents and extraPackages are considered from the package"):
-        hass.succeed(f"grep -q 'colorama' {package}/extra_packages")
-        hass.succeed(f"grep -q 'zha' {package}/extra_components")
-
-    with subtest("Check extraComponents and extraPackages are considered from the module"):
-        hass.succeed(f"grep -q 'psycopg2' {package}/extra_packages")
-        hass.succeed(f"grep -q 'wake_on_lan' {package}/extra_components")
-
     with subtest("Check that Home Assistant's web interface and API can be reached"):
-        wait_for_homeassistant(hass, cursor)
+        wait_for_homeassistant(cursor)
         hass.wait_for_open_port(8123)
         hass.succeed("curl --fail http://localhost:8123/lovelace")
 
+    with subtest("Check that declaratively configured components get setup"):
+        journal = get_journal_since(cursor)
+        for domain in ["emulated_hue", "wake_on_lan"]:
+            assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"
+
     with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"):
         hass.wait_for_open_port(80)
         hass.succeed("curl --fail http://localhost:80/description.xml")
@@ -169,25 +163,28 @@ in {
         hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB")
 
     with subtest("Check service reloads when configuration changes"):
-      # store the old pid of the process
-      pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
-      cursor = get_journal_cursor(hass)
-      hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test")
-      new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
-      assert pid == new_pid, "The PID of the process should not change between process reloads"
-      wait_for_homeassistant(hass, cursor)
+        pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
+        cursor = get_journal_cursor()
+        hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test")
+        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
+        assert pid == new_pid, "The PID of the process should not change between process reloads"
+        wait_for_homeassistant(cursor)
 
-    with subtest("check service restarts when package changes"):
-      pid = new_pid
-      cursor = get_journal_cursor(hass)
-      hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test")
-      new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
-      assert pid != new_pid, "The PID of the process shoudl change when the HA binary changes"
-      wait_for_homeassistant(hass, cursor)
+    with subtest("Check service restarts when dependencies change"):
+        pid = new_pid
+        cursor = get_journal_cursor()
+        hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test")
+        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
+        assert pid != new_pid, "The PID of the process should change when its PYTHONPATH changess"
+        wait_for_homeassistant(cursor)
+
+    with subtest("Check that new components get setup after restart"):
+        journal = get_journal_since(cursor)
+        for domain in ["esphome"]:
+            assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"
 
     with subtest("Check that no errors were logged"):
-        output_log = hass.succeed("cat ${configDir}/home-assistant.log")
-        assert "ERROR" not in output_log
+        hass.fail("journalctl -u home-assistant -o cat | grep -q ERROR")
 
     with subtest("Check systemd unit hardening"):
         hass.log(hass.succeed("systemctl cat home-assistant.service"))

From 3fa7dc206a54265f04fc2ea2afd1cf1cdb650c83 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 16:52:22 +0100
Subject: [PATCH 059/191] home-assistant: Stop exposing component & package
 files

These were only ever used in a test, but for an upcoming change in
dependency handling, they mean we need to rebuild home-assistant for
each change in used components for no good reason.

This would mean building two additional home-assistant derivations for
the NixOS test alone.
---
 pkgs/servers/home-assistant/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 4d6e0b6cca62..7ff1473edec3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -265,10 +265,6 @@ let
   # Ensure that we are using a consistent package set
   extraBuildInputs = extraPackages python.pkgs;
 
-  # Create info about included packages and components
-  extraComponentsFile = writeText "home-assistant-components" (lib.concatStringsSep "\n" extraComponents);
-  extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
-
   # Don't forget to run parse-requirements.py after updating
   hassVersion = "2023.2.5";
 
@@ -428,11 +424,6 @@ in python.pkgs.buildPythonApplication rec {
     export PATH=${inetutils}/bin:$PATH
   '';
 
-  postInstall = ''
-    cp -v ${extraComponentsFile} $out/extra_components
-    cp -v ${extraPackagesFile} $out/extra_packages
-  '';
-
   passthru = {
     inherit
       availableComponents

From e01ccd6245fe1fe34aa49aa48fe3d53e3b013c20 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 16:54:37 +0100
Subject: [PATCH 060/191] home-assistant: Inject extra dependencies through
 PYTHONPATH

Injecting configuration specific dependencies into the
propagatedBuildInputs of the home-assistant package forces alot of
rebuilds while setting up home-assistant, which is annoying.

By passing optional dependencies into home-assistant via the systemd
units PYTHONPATH environment variable, only he concatenation of
library paths in the systemd unit requires a rebuild.

This also means users can rely heavily on the cached home-assistant
package and will rarely have to build from source, if ever.
---
 nixos/modules/services/home-automation/home-assistant.nix | 1 +
 pkgs/servers/home-assistant/default.nix                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index 9f6f153a1056..6adc58ec58ec 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -409,6 +409,7 @@ in {
         (optionalString (cfg.config != null) copyConfig) +
         (optionalString (cfg.lovelaceConfig != null) copyLovelaceConfig)
       ;
+      environment.PYTHONPATH = package.pythonPath;
       serviceConfig = let
         # List of capabilities to equip home-assistant with, depending on configured components
         capabilities = lib.unique ([
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 7ff1473edec3..b5e42fca6ae4 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -355,7 +355,7 @@ in python.pkgs.buildPythonApplication rec {
     yarl
     # Implicit dependency via homeassistant/requirements.py
     setuptools
-  ] ++ componentBuildInputs ++ extraBuildInputs;
+  ];
 
   makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
 
@@ -431,6 +431,7 @@ in python.pkgs.buildPythonApplication rec {
       getPackages
       python
       supportedComponentsWithTests;
+    pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);
     intents = python.pkgs.home-assistant-intents;
     tests = {
       nixos = nixosTests.home-assistant;

From 9bf8744a732fad91482a66c28c5462a683be727c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 17:01:02 +0100
Subject: [PATCH 061/191] nixos/tests/home-assistant: Check dependencies arrive
 in the PYTHONPATH

Both extraPackages and derived packages from extraComponents should
be present in the units PYTHONPATH environment variable.
---
 nixos/tests/home-assistant.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 0c2176c261cf..aec4784e9c5f 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -132,6 +132,12 @@ in {
         return out
 
 
+    def get_unit_property(property) -> str:
+        exit, out = hass.execute(f"systemctl show --property={property} home-assistant.service")
+        assert exit == 0
+        return out
+
+
     def wait_for_homeassistant(cursor):
         hass.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'")
 
@@ -150,6 +156,12 @@ in {
         hass.wait_for_open_port(8123)
         hass.succeed("curl --fail http://localhost:8123/lovelace")
 
+    with subtest("Check that optional dependencies are in the PYTHONPATH"):
+        env = get_unit_property("Environment")
+        python_path = env.split("PYTHONPATH=")[1].split()[0]
+        for package in ["colorama", "paho-mqtt", "psycopg2"]:
+            assert package in python_path, f"{package} not in PYTHONPATH"
+
     with subtest("Check that declaratively configured components get setup"):
         journal = get_journal_since(cursor)
         for domain in ["emulated_hue", "wake_on_lan"]:

From f98462a27d097f1b8397ed07ca545b26009bf6c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 17:59:50 +0100
Subject: [PATCH 062/191] nixos/tests/home-assistant: Resolve deprecation
 warning

> trace: warning: Module argument `nodes.hass.config` is deprecated. Use `nodes.hass` instead.
---
 nixos/tests/home-assistant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index aec4784e9c5f..8585cb3585fe 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -112,7 +112,7 @@ in {
   };
 
   testScript = { nodes, ... }: let
-    system = nodes.hass.config.system.build.toplevel;
+    system = nodes.hass.system.build.toplevel;
   in
   ''
     import json

From 143f30987c07bedd593fa2de846b1ebb5d98980c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 17:42:29 +0000
Subject: [PATCH 063/191] polypane: 10.0.1 -> 13.0.2

---
 pkgs/applications/networking/browsers/polypane/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix
index 87dc7dcb1d01..7a4650143ef7 100644
--- a/pkgs/applications/networking/browsers/polypane/default.nix
+++ b/pkgs/applications/networking/browsers/polypane/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "polypane";
-  version = "10.0.1";
+  version = "13.0.2";
 
   src = fetchurl {
     url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q=";
+    sha256 = "sha256-+44a9dPQOV1D2rnsuy+GyJqZz/UCbITmMuunwHc4JFY=";
   };
 
   appimageContents = appimageTools.extractType2 {

From d83759c1af2448a927b45660f02f23452597adf3 Mon Sep 17 00:00:00 2001
From: Luiz Irber <contact+github@luizirber.org>
Date: Sun, 19 Feb 2023 19:28:02 -0800
Subject: [PATCH 064/191] python3Packages.screed: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix
index f21e09d1e581..71e399cb987a 100644
--- a/pkgs/development/python-modules/screed/default.nix
+++ b/pkgs/development/python-modules/screed/default.nix
@@ -2,20 +2,18 @@
 , fetchPypi
 , buildPythonPackage
 , pythonOlder
-, bz2file
-, setuptools
 , setuptools-scm
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "screed";
-  version = "1.1.1";
+  version = "1.1.2";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EB4ZNImNLUoU+dnJd3S4wTyQpmuNK3NLtakPsO1iCbU=";
+    sha256 = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -32,8 +30,6 @@ buildPythonPackage rec {
     "Test_fq_shell_command"
   ];
 
-  propagatedBuildInputs = [ bz2file setuptools ];
-
   meta = with lib; {
     description = "A simple read-only sequence database, designed for short reads";
     homepage = "https://pypi.org/project/screed/";

From 7a76e0a1a83da876114841189f22fd29a72dec41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 19:25:47 +0000
Subject: [PATCH 065/191] datree: 1.8.21 -> 1.8.24

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

diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix
index 13fc840b0c41..04355c82e9ce 100644
--- a/pkgs/development/tools/datree/default.nix
+++ b/pkgs/development/tools/datree/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "datree";
-  version = "1.8.21";
+  version = "1.8.24";
 
   src = fetchFromGitHub {
     owner = "datreeio";
     repo = "datree";
     rev = "refs/tags/${version}";
-    hash = "sha256-OURnQo38ofiDRu01GeEFTNiTYUeiDLMr1j28HzHVxds=";
+    hash = "sha256-C6APYGe0zLj/SYaSOoYKr/4yyAs0EKJmDfcJlqltKdg=";
   };
 
   vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA=";

From 4ca106a6a033ad7acb13c27bf53b5476e8a443fe Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sat, 18 Feb 2023 16:59:52 +0100
Subject: [PATCH 066/191] tor-browser-bundle-bin: 11.5.8 -> 12.0.3

* https://blog.torproject.org/new-release-tor-browser-120/
* https://blog.torproject.org/new-release-tor-browser-1201/
* https://blog.torproject.org/new-release-tor-browser-1202/
* https://blog.torproject.org/new-release-tor-browser-1203/

Fix an issue in 12.0.x where TBB fails to connect to its Tor socket, by
cleaning up $XDG_RUNTIME_DIR/Tor*.
---
 .../tor-browser-bundle-bin/default.nix        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 43865f051ba2..f89fdf417704 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -26,6 +26,7 @@
 , pulseaudioSupport ? mediaSupport
 , libpulseaudio
 , apulse
+, alsa-lib
 
 # Media support (implies audio support)
 , mediaSupport ? true
@@ -57,6 +58,7 @@ let
   libPath = lib.makeLibraryPath libPkgs;
 
   libPkgs = [
+    alsa-lib
     atk
     cairo
     dbus
@@ -85,9 +87,9 @@ let
   fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "11.5.8";
+  version = "12.0.3";
 
-  lang = "en-US";
+  lang = "ALL";
 
   srcs = {
     x86_64-linux = fetchurl {
@@ -97,7 +99,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0=";
+      hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0=";
     };
 
     i686-linux = fetchurl {
@@ -107,7 +109,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc=";
+      hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk=";
     };
   };
 in
@@ -291,13 +293,9 @@ stdenv.mkDerivation rec {
     # TBB will fail if ownership is too permissive
     chmod 0700 "\$HOME/TorBrowser/Data/Tor"
 
-    # Initialize the browser profile state.  Note that the only data
-    # copied from the Store payload is the initial bookmark file, which is
-    # never updated once created.  All other files under user's profile
-    # dir are generated by TBB.
+    # Initialize the browser profile state.
+    # All files under user's profile dir are generated by TBB.
     mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
-    cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \
-      "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html"
 
     # Clear some files if the last known store path is different from the new one
     : "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}"
@@ -325,6 +323,9 @@ stdenv.mkDerivation rec {
     # chance that TBB would continue using old font files.
     rm -rf "\$HOME/.cache/fontconfig"
 
+    # Workaround a bug in 12.0.X that Tor directories are not cleaned up and tor gets confused where its socket is
+    rm -rf \$XDG_RUNTIME_DIR/Tor*
+
     # Manually specify data paths (by default TB attempts to create these in the store)
     {
       echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"

From dbd1ee56b1ad4219d9c2f5568bbac2e57b25f109 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 20 Feb 2023 21:29:50 +0100
Subject: [PATCH 067/191] broot: 1.20.1 -> 1.20.2

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 4daab1ef99c6..c2c60414e981 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W8B4e8x9IoINR4NSm8jVBqXZbe1T/4z3RVmNrLVzV1M=";
+    hash = "sha256-TSaHngDLD2Tit4ixFDT2OhoqLGMIXj5rgxLwX06nHNw=";
   };
 
-  cargoHash = "sha256-XEvIqzSkusOv+boNZbTRxXVN566SduNDcZSkomJRMsk=";
+  cargoHash = "sha256-66iEMcgd3Tx6134ggqckOf61RMn/w5x2a61Dlfs1GUc=";
 
   nativeBuildInputs = [
     installShellFiles

From 4e0aa987626cff278ce995363b6385bfef9c7678 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:10:15 +0100
Subject: [PATCH 068/191] python310Packages.aiocurrencylayer: add changelog to
 meta

---
 pkgs/development/python-modules/aiocurrencylayer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix
index 80144877e141..194e04f19981 100644
--- a/pkgs/development/python-modules/aiocurrencylayer/default.nix
+++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix
@@ -44,6 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API for interacting with currencylayer";
     homepage = "https://github.com/home-assistant-ecosystem/aiocurrencylayer";
+    changelog = "https://github.com/home-assistant-ecosystem/aiocurrencylayer/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 18080bbfd0de49796382fd1ce9a2e2c782314567 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:11:22 +0100
Subject: [PATCH 069/191] python310Packages.aiocurrencylayer: 1.0.4 -> 1.0.5

Diff: https://github.com/home-assistant-ecosystem/aiocurrencylayer/compare/refs/tags/1.0.4...1.0.5

Changelog: https://github.com/home-assistant-ecosystem/aiocurrencylayer/releases/tag/1.0.5
---
 .../python-modules/aiocurrencylayer/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix
index 194e04f19981..39fb1deeb9b3 100644
--- a/pkgs/development/python-modules/aiocurrencylayer/default.nix
+++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix
@@ -11,16 +11,16 @@
 
 buildPythonPackage rec {
   pname = "aiocurrencylayer";
-  version = "1.0.4";
+  version = "1.0.5";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-neWUld/XnF5xTHSrw5EfGfNhpYzZi5TZsWN4+eqsVXs=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-468OBQV7ISnPRUfi/CM3dCh1ez0jwSVnM6DduPvAgPI=";
   };
 
   nativeBuildInputs = [

From 4ebee8a9665f964c6484cdbbd6cc5f1593c0618f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:17:57 +0100
Subject: [PATCH 070/191] python310Packages.wsgidav: add changelog to meta

---
 pkgs/development/python-modules/wsgidav/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix
index b54a351b47de..9ed05e9fdca3 100644
--- a/pkgs/development/python-modules/wsgidav/default.nix
+++ b/pkgs/development/python-modules/wsgidav/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generic and extendable WebDAV server based on WSGI";
     homepage = "https://wsgidav.readthedocs.io/";
+    changelog = "https://github.com/mar10/wsgidav/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From ccf62f5fc6b87ddb0da87511c25f214e60166de0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:19:55 +0100
Subject: [PATCH 071/191] python310Packages.wsgidav: 4.1.0 -> 4.2.0

Diff: https://github.com/mar10/wsgidav/compare/refs/tags/v4.1.0...v4.2.0

Changelog: https://github.com/mar10/wsgidav/blob/v4.2.0/CHANGELOG.md
---
 pkgs/development/python-modules/wsgidav/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix
index 9ed05e9fdca3..f1b81599c396 100644
--- a/pkgs/development/python-modules/wsgidav/default.nix
+++ b/pkgs/development/python-modules/wsgidav/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "wsgidav";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mar10";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-iNyXY0txKX4X1+O27T7my8dfs8wqXoG7Kuo9yN9SRnY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1S3Zi92YRcu/PKNWJIn2ayr5Wbc+/+E7irFBQpMrKW8=";
   };
 
   nativeBuildInputs = [

From 8bcf1c8f3653dff6836c5172417fef8c6baaeeb9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:35:24 +0100
Subject: [PATCH 072/191] python310Packages.pywaterkotte: init at 0.1.2

---
 .../python-modules/pywaterkotte/default.nix   | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/pywaterkotte/default.nix

diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix
new file mode 100644
index 000000000000..43f276a2df82
--- /dev/null
+++ b/pkgs/development/python-modules/pywaterkotte/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, hatchling
+, pytestCheckHook
+, pythonOlder
+, requests
+, responses
+}:
+
+buildPythonPackage rec {
+  pname = "pywaterkotte";
+  version = "0.1.2";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "chboland";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw=";
+  };
+
+  nativeBuildInputs = [
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    responses
+  ];
+
+  pythonImportsCheck = [
+    "pywaterkotte"
+  ];
+
+  meta = with lib; {
+    description = "Library to communicate with Waterkotte heatpumps";
+    homepage = "https://github.com/chboland/pywaterkotte";
+    changelog = "https://github.com/chboland/pywaterkotte/releases/tag/v${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28812e165401..5a2007a40d35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9676,6 +9676,8 @@ self: super: with self; {
 
   pywatchman = callPackage ../development/python-modules/pywatchman { };
 
+  pywaterkotte = callPackage ../development/python-modules/pywaterkotte { };
+
   pywavelets = callPackage ../development/python-modules/pywavelets { };
 
   pywayland = callPackage ../development/python-modules/pywayland { };

From 542393ccd8f0d9dc592a47cd5c619fd503f0d6ba Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 20 Feb 2023 14:13:52 -0500
Subject: [PATCH 073/191] sagoin: 0.2.0 -> 0.2.1

Diff: https://github.com/figsoda/sagoin/compare/v0.2.0...v0.2.1

Changelog: https://github.com/figsoda/sagoin/blob/v0.2.1/CHANGELOG.md
---
 pkgs/tools/misc/sagoin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix
index 638acb962df6..704267da2793 100644
--- a/pkgs/tools/misc/sagoin/default.nix
+++ b/pkgs/tools/misc/sagoin/default.nix
@@ -8,21 +8,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sagoin";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BCsNsBD+ZkxhIy1yC+N0AqbEsQ2ElfWLtnBOG+0hHXk=";
+    sha256 = "sha256-CSkij/3WCeEq26Uhlrgdf503hGf0OwSUQNmx5mspD08=";
   };
 
-  cargoSha256 = "sha256-B8P92utlmZlxNfzBidNUaGw7BhgkOPwD0yahtKZ2yto=";
+  cargoSha256 = "sha256-Zos3ox6VQv9t1KoblAJhVblTOQOn9rJyvaXK48Y/K1c=";
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.CoreServices
   ];
 
   postInstall = ''

From 8e8725cef223e3653f6fe8087cc26841af24e406 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:45:35 +0100
Subject: [PATCH 074/191] python310Packages.pyfibaro: init at 0.6.8

---
 .../python-modules/pyfibaro/default.nix       | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyfibaro/default.nix

diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
new file mode 100644
index 000000000000..759fe47221b7
--- /dev/null
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "pyfibaro";
+  version = "0.6.8";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "rappenze";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-2BDVCukm2y4rZyIWozRWJ+pY2bI2A7Vpitjd8jSJoWQ=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [
+    "pyfibaro"
+  ];
+
+  meta = with lib; {
+    description = "Library to access FIBARO Home center";
+    homepage = "https://github.com/rappenze/pyfibaro";
+    changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28812e165401..4d2677b71551 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7243,6 +7243,8 @@ self: super: with self; {
 
   pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
 
+  pyfibaro = callPackage ../development/python-modules/pyfibaro { };
+
   pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
 
   pyflexit = callPackage ../development/python-modules/pyflexit { };

From fbfda26f7fa8bf621e797003c03944cd7fbd14f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:53:25 +0100
Subject: [PATCH 075/191] python310Packages.yalexs-ble: 2.0.1 -> 2.0.2

Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.0.1...v2.0.2

Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.0.2/CHANGELOG.md
---
 pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix
index 230541176859..6dd20021b743 100644
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs-ble";
-  version = "2.0.1";
+  version = "2.0.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-1BjuFmsd7D9iCjaK5ckXXiU2LQXnIvJoJcu8YLaQe6g=";
+    hash = "sha256-Ev2m3YWiTWOBgK3dr7Gv8Od4tm5Rh4hmB5VJdL7MEOg=";
   };
 
   nativeBuildInputs = [

From adcb364cc59928a7640d7132eead185fa03de66f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 22:54:33 +0100
Subject: [PATCH 076/191] python310Packages.pyswitchbot: 0.37.1 -> 0.37.3

Diff: https://github.com/Danielhiversen/pySwitchbot/compare/refs/tags/0.37.1...0.37.3

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 801dabdf4ead..39bacfa44028 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.37.1";
+  version = "0.37.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-6td0ueo21h3B2ITV6wXehiwDPIB8+4m0K5hnMm8Mu54=";
+    hash = "sha256-0Kzzyzlxs5PaEHKzJLsconUg4zmgPzWI8LD5UIcKwEY=";
   };
 
   propagatedBuildInputs = [

From 9e4cf5648e0f8fd7f200f101393fa52e3d901bee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:07:01 +0100
Subject: [PATCH 077/191] python310Packages.eiswarnung: add changelog to meta

---
 pkgs/development/python-modules/eiswarnung/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index a0ebc7150756..e4f9d1a3ef0b 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -52,6 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module for getting Eiswarning API forecasts";
     homepage = "https://github.com/klaasnicolaas/python-eiswarnung";
+    changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From c04117d475f60154029660d0e52b7b0a4f55bcd8 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 20 Feb 2023 16:58:12 -0500
Subject: [PATCH 078/191] xh: 0.17.0 -> 0.18.0, add figsoda as a maintainer

Diff: https://github.com/ducaale/xh/compare/v0.17.0...v0.18.0

Changelog: https://github.com/ducaale/xh/blob/v0.18.0/CHANGELOG.md
---
 pkgs/tools/networking/xh/default.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
index f806b46b6944..06cda8490021 100644
--- a/pkgs/tools/networking/xh/default.nix
+++ b/pkgs/tools/networking/xh/default.nix
@@ -1,41 +1,40 @@
-{ stdenv
-, lib
-, pkg-config
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , installShellFiles
+, pkg-config
 , withNativeTls ? true
+, stdenv
 , Security
-, libiconv
-, openssl }:
+, openssl
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "xh";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
     rev = "v${version}";
-    sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA=";
+    sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M=";
   };
 
-  cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI=";
+  cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc=";
 
   buildFeatures = lib.optional withNativeTls "native-tls";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
   buildInputs = lib.optionals withNativeTls
-    (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]);
+    (if stdenv.isDarwin then [ Security ] else [ openssl ]);
 
   # Get openssl-sys to use pkg-config
   OPENSSL_NO_VENDOR = 1;
 
   postInstall = ''
-    installShellCompletion --cmd xh \
-      --bash completions/xh.bash \
-      --fish completions/xh.fish \
+    installShellCompletion \
+      completions/xh.{bash,fish} \
       --zsh completions/_xh
 
     installManPage doc/xh.1
@@ -43,7 +42,6 @@ rustPlatform.buildRustPackage rec {
 
     install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md
 
-    # https://github.com/ducaale/xh#xh-and-xhs
     ln -s $out/bin/xh $out/bin/xhs
   '';
 
@@ -61,6 +59,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ducaale/xh";
     changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ payas ];
+    maintainers = with maintainers; [ figsoda payas ];
   };
 }

From cbb8f8533cd1179483780e551052d776972611bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:12:00 +0100
Subject: [PATCH 079/191] python310Packages.eiswarnung: 1.1.1 -> 1.2.0

Diff: https://github.com/klaasnicolaas/python-eiswarnung/compare/refs/tags/v1.1.1...v1.2.0

Changelog: https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v1.2.0
---
 pkgs/development/python-modules/eiswarnung/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index e4f9d1a3ef0b..4e2dc1d6d90f 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -7,12 +7,13 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, pytz
 , yarl
 }:
 
 buildPythonPackage rec {
   pname = "eiswarnung";
-  version = "1.1.1";
+  version = "1.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-eiswarnung";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sMR16if2Q+lK+ilnVNYVootBN2LFwBQLlZFkoX+oS/g=";
+    hash = "sha256-PVFAy34+UfNQNdzVdfvNiySrCTaKGuepnTINZYkOsuo=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +31,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aiohttp
+    pytz
     yarl
   ];
 

From bc9e441d6aee39e9c06c19e59c3dedfdb15fbd67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:17:05 +0100
Subject: [PATCH 080/191] python310Packages.pydeconz: 107 -> 108

Diff: https://github.com/Kane610/deconz/compare/refs/tags/v107...v108

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

diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
index 5a4532c598ef..3ccb8960f5ef 100644
--- a/pkgs/development/python-modules/pydeconz/default.nix
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pydeconz";
-  version = "107";
+  version = "108";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Kane610";
     repo = "deconz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5NR+N2UoWvzD/y1kP08qOS2djMsLIwLDuaIBmt0AV/s=";
+    hash = "sha256-CPFkfVwvk0AO/DoE1Nj1jLdLvuOpRzndmRK/M6SSGtk=";
   };
 
   propagatedBuildInputs = [

From e23e30c9305b13a8f6389fc1dc6444e8a3503826 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:23:50 +0100
Subject: [PATCH 081/191] python310Packages.boltons: 21.0.0 -> 23.0.0

Diff: https://github.com/mahmoud/boltons/compare/refs/tags/21.0.0...23.0.0

Changelog: https://github.com/mahmoud/boltons/blob/23.0.0/CHANGELOG.md
---
 .../python-modules/boltons/default.nix        | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 1c65fed86bbf..770c523e31f9 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -1,15 +1,13 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , pytestCheckHook
-, pythonAtLeast
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "boltons";
-  version = "21.0.0";
+  version = "23.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,22 +16,13 @@ buildPythonPackage rec {
     owner = "mahmoud";
     repo = "boltons";
     rev = "refs/tags/${version}";
-    hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk=";
+    hash = "sha256-NqlCu0W/BQkLiaLYs9DB1RrEya6KGPfNtpAzKXxoRD0=";
   };
 
   nativeCheckInputs = [
     pytestCheckHook
   ];
 
-  patches = lib.optionals (pythonAtLeast "3.10") [
-    # pprint has no attribute _safe_repr, https://github.com/mahmoud/boltons/issues/294
-    (fetchpatch {
-      name = "fix-pprint-attribute.patch";
-      url = "https://github.com/mahmoud/boltons/commit/270e974975984f662f998c8f6eb0ebebd964de82.patch";
-      sha256 = "sha256-pZLfr6SRCw2aLwZeYaX7bzfJeZC4cFUILEmnVsKR6zc=";
-    })
-  ];
-
   # Tests bind to localhost
   __darwinAllowLocalNetworking = true;
 
@@ -41,11 +30,6 @@ buildPythonPackage rec {
     "boltons"
   ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.11") [
-    # https://github.com/mahmoud/boltons/issues/326
-    "test_frozendict_api"
-  ];
-
   meta = with lib; {
     description = "Constructs, recipes, and snippets extending the Python standard library";
     longDescription = ''

From 56945126fe1910453183b22cbaa62a165ebeb6d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:54:33 +0100
Subject: [PATCH 082/191] python310Packages.asyncwhois: add changelog to meta

---
 pkgs/development/python-modules/asyncwhois/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 3ec2635af773..a316716ee0d3 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -61,6 +61,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for retrieving WHOIS information";
     homepage = "https://github.com/pogzyb/asyncwhois";
+    changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 011b7424f07b014ebd98529acabd7dd9c5e749a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Feb 2023 23:58:06 +0100
Subject: [PATCH 083/191] python310Packages.asyncwhois: 1.0.1 -> 1.0.2

Diff: https://github.com/pogzyb/asyncwhois/compare/refs/tags/v1.0.1...v1.0.2

Changelog: https://github.com/pogzyb/asyncwhois/releases/tag/v1.0.2
---
 pkgs/development/python-modules/asyncwhois/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index a316716ee0d3..4d9ed2cccdef 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -1,7 +1,7 @@
 { lib
-, asynctest
 , buildPythonPackage
 , fetchFromGitHub
+, pytest-mock
 , pytestCheckHook
 , python-socks
 , pythonOlder
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "1.0.1";
+  version = "1.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pogzyb";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MYK09kszv7CTvZjdA9YQFfhlJ/A5d/aebLRaiMlnuB0=";
   };
 
   propagatedBuildInputs = [
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    asynctest
+    pytest-mock
     pytestCheckHook
   ];
 

From 7b5e4989ad54386068d6aff48f582ee540a9875e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Feb 2023 13:01:06 +0100
Subject: [PATCH 084/191] prowlarr: 1.2.0.2583 -> 1.2.2.2699

https://github.com/Prowlarr/Prowlarr/releases/tag/v1.2.2.2699

This update adds support for aarch64-darwin systems.

Refactors the url download logic by relying strictly on the system
identifier and using a unified throw that is more informative.

Also prowlarr now seems to be doing releases on the master branch,
instead of develop. I updated the update script accordingly.
---
 pkgs/servers/prowlarr/default.nix | 36 ++++++++++++++++++++-----------
 pkgs/servers/prowlarr/update.sh   | 31 +++++++++++---------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index 12df9c02d071..0e3626228a49 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -1,33 +1,39 @@
 { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
 
 let
+  pname = "prowlarr";
+
+  unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}";
+
   os =
     if stdenv.isDarwin then
       "osx"
     else if stdenv.isLinux then
       "linux"
     else
-      throw "Not supported on ${stdenv.hostPlatform.system}.";
+      unsupported;
 
   arch = {
-    x86_64-linux = "x64";
+    aarch64-darwin = "arm64";
     aarch64-linux = "arm64";
     x86_64-darwin = "x64";
-  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+    x86_64-linux = "x64";
+  }.${stdenv.hostPlatform.system} or unsupported;
 
   hash = {
-    x64-linux_hash = "sha256-Xx2z5aiIKRNbBxBMXCTfm1VacQOLyruC6sXB/+C7knk=";
-    arm64-linux_hash = "sha256-r6WuQhydSRZmsH1hp51gGcQ/7ZruxbEMrbrFps2nmcw=";
-    x64-osx_hash = "sha256-F8bE4lXcqyBVZhgYcQKPrza9cphCuC5j7968jL6qgxM=";
-  }."${arch}-${os}_hash";
+    aarch64-darwin = "sha256-S9CrYDCwIssAtcP4pI1csbOOFKaZgM6UKEDNBp2VwVo=";
+    aarch64-linux = "sha256-UkoTWD4ljSfx/FzH5kQBpp/Bg+xwvc7n9KLBrqNNSR0=";
+    x86_64-darwin = "sha256-Wru+pwISVgjnSVe8HbiwU4M1aIIK5AGzml/2yqMGIlo=";
+    x86_64-linux = "sha256-eJRJ1LvQsmlMeWoUmGrAyLfoebG8g/Kl2lBQxMjIyTY=";
+  }.${stdenv.hostPlatform.system} or unsupported;
 
 in stdenv.mkDerivation rec {
-  pname = "prowlarr";
-  version = "1.2.0.2583";
+  inherit pname;
+  version = "1.2.2.2699";
 
   src = fetchurl {
-    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
-    sha256 = hash;
+    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
+    inherit hash;
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +60,14 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack";
     homepage = "https://wiki.servarr.com/prowlarr";
+    changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ jdreaver ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    platforms = [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
   };
 }
diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh
index d61edda5a0a3..883f299d9aa0 100755
--- a/pkgs/servers/prowlarr/update.sh
+++ b/pkgs/servers/prowlarr/update.sh
@@ -7,17 +7,19 @@ dirname="$(dirname "$0")"
 
 updateHash()
 {
+    # nixos
     version=$1
-    arch=$2
-    os=$3
+    system=$2
 
-    hashKey="${arch}-${os}_hash"
+    # prowlarr
+    arch=$3
+    os=$4
 
-    url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz"
+    url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz"
     hash=$(nix-prefetch-url --type sha256 $url)
     sriHash="$(nix hash to-sri --type sha256 $hash)"
 
-    sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
+    sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix"
 }
 
 updateVersion()
@@ -27,16 +29,8 @@ updateVersion()
 
 currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version)
 
-# N.B. Prowlarr is still in development, so
-# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest
-# returns nothing. Once this endpoint returns something, we should use
-# it. Until then, we use jq to sort releases (N.B. the "sort_by(. |
-# split(".") | map(tonumber))" incantation is to sort the version
-# number properly and not as a string).
-
-# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
-# latestVersion="$(expr $latestTag : 'v\(.*\)')"
-latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r)
+latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr $latestTag : 'v\(.*\)')"
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "Prowlarr is up-to-date: ${currentVersion}"
@@ -45,6 +39,7 @@ fi
 
 updateVersion $latestVersion
 
-updateHash $latestVersion x64 linux
-updateHash $latestVersion arm64 linux
-updateHash $latestVersion x64 osx
+updateHash $latestVersion aarch64-darwin arm64 osx
+updateHash $latestVersion aarch64-linux arm64 linux
+updateHash $latestVersion x86_64-darwin x64 osx
+updateHash $latestVersion x86_64-linux x64 linux

From 43c19a33e1db4eb47a001fa60009e0a0d7617fb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 23:45:26 +0000
Subject: [PATCH 085/191] cve: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix
index 6d9efc36e406..b44c51e4014c 100644
--- a/pkgs/development/python-modules/cvelib/default.nix
+++ b/pkgs/development/python-modules/cvelib/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "cvelib";
-  version = "1.2.0";
+  version = "1.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "RedHatProductSecurity";
     repo = "cvelib";
     rev = "tags/${version}";
-    hash = "sha256-8qlXwEbgLRZ1qYtBJ1c0nv6qfIOW5zAK9eOS+n+afWQ=";
+    hash = "sha256-hJPcxnc4iQzsYNNVJ9fw6yQl+5K7pdtjHT6oMmBx/Zs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";

From 3ddc7b55012960f452a48f7b5e01cf58bf5108c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Feb 2023 23:54:37 +0000
Subject: [PATCH 086/191] ani-cli: 4.0 -> 4.1

---
 pkgs/applications/video/ani-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix
index 03e9996a1004..80da93e5a228 100644
--- a/pkgs/applications/video/ani-cli/default.nix
+++ b/pkgs/applications/video/ani-cli/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ani-cli";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ani-cli";
     rev = "v${version}";
-    hash = "sha256-1yhBlQ/abT+/BKEIskgnAh+cmKCzXuS9hu6apaangVk=";
+    hash = "sha256-8fpOCyv/XafrVy76jtazRoHW2gidjikgnRdaWzh8kY8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a4a9d07c547fb6a74ad5ea7abf1bf81933672884 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Feb 2023 01:14:56 +0100
Subject: [PATCH 087/191] python310Packages.nose_progressive: Drop

Was broken since before the 22.11 release and hasn't seen any upstream
maintenance since 2018.
---
 .../python-modules/clint/default.nix          |  3 +-
 .../nose_progressive/default.nix              | 34 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/python-modules/nose_progressive/default.nix

diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix
index 7e826194de45..6099c3c63591 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/pkgs/development/python-modules/clint/default.nix
@@ -5,7 +5,6 @@
 , mock
 , blessings
 , nose
-, nose_progressive
 , pillow
 , args
 , pkgs
@@ -28,7 +27,7 @@ buildPythonPackage rec {
   # no longer compatible as behavior demand 2to3, which was removed
   # in setuptools>=58
   doCheck  = false;
-  nativeCheckInputs = [ mock nose nose_progressive pkgs.glibcLocales ];
+  nativeCheckInputs = [ mock nose pkgs.glibcLocales ];
   checkPhase = ''
     ${python.interpreter} test_clint.py
   '';
diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix
deleted file mode 100644
index fb9a8e61bdae..000000000000
--- a/pkgs/development/python-modules/nose_progressive/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv
-, lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, pillow
-, blessings
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  pname = "nose-progressive";
-  version = "1.5.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mzmgq0wnfizmg9m2wn0c9g9282rdgv1jnphp8ww5h8kwqrjhvis";
-  };
-
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ pillow blessings ];
-
-  # fails with obscure error
-  doCheck = !isPy3k;
-
-  meta = with lib; {
-    homepage = "https://github.com/erikrose/nose-progressive";
-    description = "A testrunner with a progress bar and smarter tracebacks";
-    license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
-    broken = true; # relies on 2to3 conversion, which was removed from setuptools>=58.0
-  };
-
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b2e8033b97e4..46d3e6deecc3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -133,6 +133,7 @@ mapAliases ({
   mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02
   net2grid = gridnet; # add 2022-04-22
   nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
+  nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21
   notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02
   ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
   pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28812e165401..f09a8eb1a188 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6460,8 +6460,6 @@ self: super: with self; {
 
   nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };
 
-  nose_progressive = callPackage ../development/python-modules/nose_progressive { };
-
   nose-randomly = callPackage ../development/python-modules/nose-randomly { };
 
   nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };

From 7ccc6dd47e68e628a12186f80679e20c5fbc217a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 00:23:11 +0000
Subject: [PATCH 088/191] cudatext-qt: 1.184.0 -> 1.185.0

---
 pkgs/applications/editors/cudatext/default.nix | 4 ++--
 pkgs/applications/editors/cudatext/deps.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index f7af76206976..d5e2f4b6580c 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.184.0";
+  version = "1.185.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    hash = "sha256-bRe9yS9CMsBH04oefImSYkd1jUe3SnJU6JZETLwow/0=";
+    hash = "sha256-hzEDKpH1dShmEZ6EYkA5rLtbJc2ukw7Gs7spMjiocCE=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 7cbb440491ef..65fa153711e5 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2023.02.12",
-    "hash": "sha256-PSRKxKJkX9GlV8JUACYzDZguv8M8jKVxlW7U4Mmla9o="
+    "rev": "2023.02.19",
+    "hash": "sha256-2qNY7xzyJ0rCVNDQcJaJ7qZgOhtBCcuGCxY1BvVAoEs="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",

From a7f7de856a96e8e6d99e83583a31753d721453d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 01:14:03 +0000
Subject: [PATCH 089/191] pueue: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 39a6312103c6..8e4d5cdc0a55 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pueue";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = "pueue";
     rev = "v${version}";
-    hash = "sha256-vJJ3qQb38b0vr7o+7rc3z5wftI6Ko4mJiGLvVzyjTeE=";
+    hash = "sha256-5xHY8DOQnOdYqNyfAS2kMuW2vxAuoSe6RaOItnAJCkQ=";
   };
 
-  cargoHash = "sha256-3taLua69kqPnNraIZIesMkFguCbPWTF5Hu9s2Lc02ZA=";
+  cargoHash = "sha256-3IOtx1aeth6QBjY6aILtzxhjZddovD7KIKzNhVCabfU=";
 
   nativeBuildInputs = [
     installShellFiles

From 88edc0c8601a132941e059af62d09dfc20b6fc10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 01:33:44 +0000
Subject: [PATCH 090/191] python310Packages.google-cloud-language: 2.8.1 ->
 2.9.0

---
 .../python-modules/google-cloud-language/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 5430c4f7abe4..668556d4fc81 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.8.1";
+  version = "2.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-o4o9x7r7HpwzByUijDegzos35FILro0Esr2ugN2nyws=";
+    hash = "sha256-7rKNcG11cgvvwNEYiN9l8h8UR8u6DFfcI+S1QDi+t/c=";
   };
 
   propagatedBuildInputs = [

From 5635c362084ae0ace9687cb77585f6b419d06962 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 20 Feb 2023 18:42:18 -0800
Subject: [PATCH 091/191] pythonPackages.lektor: 3.4.0b2 -> 3.4.0b4

---
 pkgs/development/python-modules/lektor/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index d3c717a7e0c9..875aa4881a30 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -10,6 +10,7 @@
 , importlib-metadata
 , inifile
 , jinja2
+, markupsafe
 , marshmallow
 , marshmallow-dataclass
 , mistune
@@ -19,8 +20,10 @@
 , pytest-mock
 , pytest-pylint
 , pytestCheckHook
+, python
 , pythonOlder
 , python-slugify
+, pytz
 , requests
 , setuptools
 , typing-inspect
@@ -30,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "lektor";
-  version = "3.4.0b2";
+  version = "3.4.0b4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -39,7 +42,7 @@ buildPythonPackage rec {
     owner = "lektor";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5w3tT0celHgjmLlsM3sdBdYlXx57z3kMePVGSQkOP7M=";
+    hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk=";
   };
 
   propagatedBuildInputs = [
@@ -51,12 +54,14 @@ buildPythonPackage rec {
     flask
     inifile
     jinja2
+    markupsafe
     marshmallow
     marshmallow-dataclass
     mistune
     pip
     pyopenssl
     python-slugify
+    pytz
     requests
     setuptools
     typing-inspect
@@ -72,9 +77,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "typing.inspect < 0.8.0" "typing.inspect"
+  postInstall = ''
+    cp -r lektor/translations "$out/${python.sitePackages}/lektor/"
   '';
 
   pythonImportsCheck = [

From 685117273d1e1a41e27c73df0805ca08f38c0fbd Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 20 Feb 2023 21:58:48 -0500
Subject: [PATCH 092/191] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 418 +++++++++---------
 1 file changed, 209 insertions(+), 209 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9c27c7f02790..01645465979f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -173,12 +173,12 @@ final: prev:
 
   LeaderF = buildVimPluginFrom2Nix {
     pname = "LeaderF";
-    version = "2023-02-17";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "86db2ec0d332c125c6c7d726721c613380978e2e";
-      sha256 = "0rp1fhsr0l4986nm6a96nw0612y2xa1d4ckkjxg7ca2nab6q24wj";
+      rev = "0f9606ee3e7c0e2d3437b88b6aad77ed82609e97";
+      sha256 = "0kks1rlblniwimzxdjjqypz4s7l6c6lv0bxhsgkyhl2vw978n2xx";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
   };
@@ -353,12 +353,12 @@ final: prev:
 
   SpaceVim = buildVimPluginFrom2Nix {
     pname = "SpaceVim";
-    version = "2023-01-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "SpaceVim";
       repo = "SpaceVim";
-      rev = "25e2819b0e6ad38f51c918ea09e159c8a09bbdc3";
-      sha256 = "15s0ndfpji3zms2fbijm7ys40x5p8994cdir3a0ya1nksf3yb9jj";
+      rev = "6333a123c8681415ae141edc0943d0f7b377e619";
+      sha256 = "0f2nbcjcsi993c5lf8mvm5ma80clm793iqhwdq4amjmxxqsdipxp";
     };
     meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
   };
@@ -498,12 +498,12 @@ final: prev:
 
   aerial-nvim = buildVimPluginFrom2Nix {
     pname = "aerial.nvim";
-    version = "2023-02-14";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "89031be806abded509a7bafd99bd9944eb5108a5";
-      sha256 = "1xg7ja016qq2r7x22rh77rbjx2qhfyh6bx1px9d8gsgy4zxnr0pg";
+      rev = "faadebfd77f176bd8acfab8bc9decac4abba26b0";
+      sha256 = "0jzbapmrca4pqxl5nwra4wm29hgfcq5v0zng2a5hivbbjqrk7zzs";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -859,12 +859,12 @@ final: prev:
 
   barbecue-nvim = buildVimPluginFrom2Nix {
     pname = "barbecue.nvim";
-    version = "2023-02-16";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "utilyre";
       repo = "barbecue.nvim";
-      rev = "c6cb480f397d19f73cf2ff491c547d751118dbae";
-      sha256 = "0xlqmz0mg9h531a7667sxpr9q1nff525jjyw4fz07xwfs8q47wxr";
+      rev = "55eb481d2554c7e612e52b68aa23be2090dc58cf";
+      sha256 = "1fff73c663z6pcvkic9ngr9hs9vn6fpxw72x2ivwwiz7d983i93q";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
   };
@@ -1027,12 +1027,12 @@ final: prev:
 
   bufferline-nvim = buildVimPluginFrom2Nix {
     pname = "bufferline.nvim";
-    version = "2023-02-11";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "84b0822b2af478d0b4f7b0f9249ca218855331db";
-      sha256 = "0q6y91wpg0znzmr188hk20llaz6cdpbsw0fiazacfj0y5pkgid6w";
+      rev = "cbb798dd2db7841550cd2c6c6dde12dfda055928";
+      sha256 = "0wy8cdrsirk94il9qyv1c29mcysr41mjrr8f595pkb5zyd45lb34";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
@@ -1159,12 +1159,12 @@ final: prev:
 
   clangd_extensions-nvim = buildVimPluginFrom2Nix {
     pname = "clangd_extensions.nvim";
-    version = "2023-01-02";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "clangd_extensions.nvim";
-      rev = "a5c3c8390dfb342d630bdc25941a4d8f433510be";
-      sha256 = "0picfypj5by4zmq37h0dmszwk8vzj5dq04q2jy8lb9p5n36rkwya";
+      rev = "722ee39d4c1b309bef4a6c2da1749c3e3358757f";
+      sha256 = "1wdni05s0d1p5wmzr30sazqm3fi8n178jf1fdwwlbjpvalgjn5kp";
     };
     meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
   };
@@ -1363,24 +1363,24 @@ final: prev:
 
   cmp-fuzzy-buffer = buildVimPluginFrom2Nix {
     pname = "cmp-fuzzy-buffer";
-    version = "2023-02-16";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-fuzzy-buffer";
-      rev = "21d281de0fda5bf4f57920f54eb60e212593ba63";
-      sha256 = "1794rhyf0sjwzw3hbzxv53vispifyxxxp1niv6zw4bmrks3jxdg8";
+      rev = "5da5f20b2b459671c207599404ef8fe3fa0f60f0";
+      sha256 = "08q6i73pp7h03ghd3fpdlfxhz85hrgg5s4cp4f2j4h87sssi5mzw";
     };
     meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/";
   };
 
   cmp-fuzzy-path = buildVimPluginFrom2Nix {
     pname = "cmp-fuzzy-path";
-    version = "2022-11-29";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-fuzzy-path";
-      rev = "28735cebc314f0b080a41350adae8612b6fc7814";
-      sha256 = "0jwr9xb0axs1i3xk0z773jrp77jy1a274pwwd09lradm4rfa052q";
+      rev = "0caa34810c03a94ef01a57c3758fcaeab3130cf3";
+      sha256 = "1axr13kw7g3jmk29s20nyqv153qxfjd4jajwcxw9m184p27nb74z";
     };
     meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/";
   };
@@ -1615,12 +1615,12 @@ final: prev:
 
   cmp-tabnine = buildVimPluginFrom2Nix {
     pname = "cmp-tabnine";
-    version = "2022-12-27";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-tabnine";
-      rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1";
-      sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09";
+      rev = "1b1c0235c54e3fc9e77504ed8d36028f64e6f48d";
+      sha256 = "12ivpbxpqvxb6c2p0snpr65d45ppx57l8aylnb3l39ciabknjhdm";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
   };
@@ -1759,12 +1759,12 @@ final: prev:
 
   coc-lua = buildVimPluginFrom2Nix {
     pname = "coc-lua";
-    version = "2023-02-18";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-lua";
-      rev = "b8aacc44913b4b8de089d067ef6f103512e76e18";
-      sha256 = "10hdrw4yzadggaaz4x3vjpmk8jnalcprp8sn550mxy95al1ip4q8";
+      rev = "bf9bde0a86022c494c995778a5bf7210f2420601";
+      sha256 = "0fyyq22f33q949v5cabjynbj311279cxfm4wb3mi6v1agzpxh8lb";
     };
     meta.homepage = "https://github.com/josa42/coc-lua/";
   };
@@ -2119,24 +2119,24 @@ final: prev:
 
   coq-artifacts = buildVimPluginFrom2Nix {
     pname = "coq.artifacts";
-    version = "2023-02-12";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "6acfe02d3b8057ed9ed5bbd02b1ecc426eb9d97d";
-      sha256 = "16rmmmh34y2pz1iwk8mnk88vs5cdqrm0sw52fnsmg5r82wy1i7y7";
+      rev = "eba0531cea9fe292059dbecf677d36a07f9c28b2";
+      sha256 = "059p1rjjhk4i2fxi9zgd923j7ksj9cfx4f9smhnqdqgmkm57lnwd";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
   };
 
   coq-thirdparty = buildVimPluginFrom2Nix {
     pname = "coq.thirdparty";
-    version = "2023-02-12";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "0b93c482acfc0bcdd760ff431b4d338e19395776";
-      sha256 = "0hns2zvxlxd9wpdkr5cvcgzms6vkcw3h9p8ck1zj6msh0w1pmg67";
+      rev = "531faab60ba9418eb180a4a127a661bed98b46a2";
+      sha256 = "0lkkyd9iz89lnalvf2i8yz9ssiwiavvnmavxzn0siw7p69x2fkr2";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2155,12 +2155,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2023-02-12";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "49189b020236002bae41f823da9ac0f73dca873f";
-      sha256 = "17rmg7b9ibx1d8bb8s9r9zxqxxh206hkb5avykrdbngrg1sy64y6";
+      rev = "272a39c8f483c0bf6137dd382363639aab83a23e";
+      sha256 = "0yy9lyh9wx7wa4s6ishqg3g0lb0z3c6hhywghpvyd16kldf6lrd9";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2227,12 +2227,12 @@ final: prev:
 
   csv-vim = buildVimPluginFrom2Nix {
     pname = "csv.vim";
-    version = "2022-11-23";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
-      rev = "fb159987bb430bb61e07928d132e4487e54a82ef";
-      sha256 = "1c6fas33baabdfsm95icbi8n84ica2hysyvkprx4zpz5zn2b8rk5";
+      rev = "0f6900bf1d0f2ccdbe59ed246db4a82e5cc16e78";
+      sha256 = "0yi9r665xsvp2043mwc58wljfnsp38pzab7j14mb0fcs787r0kq4";
     };
     meta.homepage = "https://github.com/chrisbra/csv.vim/";
   };
@@ -2299,12 +2299,12 @@ final: prev:
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2023-02-16";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "2312a5024748e869a355d91170f2e8fbf2bd5a51";
-      sha256 = "1sg2c2238m6nrmp700b2wvw9g9p1wfc7d1v4ma0lam4d1z0xhwyj";
+      rev = "0d5e201629a85617fb7efef61c3212fb4529f31a";
+      sha256 = "1jylspgsfana9chd5ywx3ylk54fkgj5r2jhy5x7145k1zmwq49qv";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -2987,12 +2987,12 @@ final: prev:
 
   firenvim = buildVimPluginFrom2Nix {
     pname = "firenvim";
-    version = "2023-02-17";
+    version = "2023-02-18";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "07652ec0b659cba53e5dc07eeb660234a7b248ee";
-      sha256 = "1w3l0byhnk873c9qfyp4gna96aff37769l82jqwdcvs7a2dalsz3";
+      rev = "dca3e56021cb5c39f401c9d83531743416c3365f";
+      sha256 = "0hrkidscljbggsvkajvmqn1x79raa1bpjbwiqjgp3b1vckhyzz3h";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
   };
@@ -3096,12 +3096,12 @@ final: prev:
 
   friendly-snippets = buildVimPluginFrom2Nix {
     pname = "friendly-snippets";
-    version = "2023-02-12";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "1645e7cd98ed99e766c84ab3cf13a1612c77dcee";
-      sha256 = "13zvkv7vnfrj0xs31s1gv74amxpdyvc2m2x8br58vxfscy3wbaa4";
+      rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5";
+      sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -3204,12 +3204,12 @@ final: prev:
 
   fzf-lua = buildVimPluginFrom2Nix {
     pname = "fzf-lua";
-    version = "2023-02-18";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "52f0cfd8021404988dc446734711f215bba6a6de";
-      sha256 = "0ypidlvf3fc5nq4s9qz9w7378zzppv7qajwydm84v3g76p1aqm3a";
+      rev = "b15ef042f7006827e7413baad89a0e8541079c9e";
+      sha256 = "0svjfw6nsczqpfqic1zvpnz3bn9iivzp81i5kkq7vqgks11ji0w9";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -3384,12 +3384,12 @@ final: prev:
 
   glance-nvim = buildVimPluginFrom2Nix {
     pname = "glance.nvim";
-    version = "2023-02-15";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "DNLHC";
       repo = "glance.nvim";
-      rev = "24b367dc1678ad3d23b26396a8e06363b32facbe";
-      sha256 = "1x33hn6lk4jlq7h7ss3b29105kbs0l5f2zykn9d9n6rvl5qwdmw1";
+      rev = "bbded06ea23faad779297122e93b1c0dcdb2a770";
+      sha256 = "0sirrb5s3g93a65ygc2s8g481vfgp205vyvsrghml5r93pddvzkc";
     };
     meta.homepage = "https://github.com/DNLHC/glance.nvim/";
   };
@@ -3420,12 +3420,12 @@ final: prev:
 
   go-nvim = buildVimPluginFrom2Nix {
     pname = "go.nvim";
-    version = "2023-02-19";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "c11b8b50f3f4eeef7f7a8f07f697fd67794fd2ac";
-      sha256 = "12r0j62d76m2vh88wv4phc5s2r43scx3j8f814slnyigprdprs9k";
+      rev = "7a6c02dd199f62e4c87c4e9641b0963c6b0ad81f";
+      sha256 = "1jzl73fxpa370jxh9i134jpgnm9badim3i581h5n5id8qgfnibng";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
   };
@@ -3623,12 +3623,12 @@ final: prev:
 
   haskell-tools-nvim = buildVimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-02-17";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "b4a4046d4910b4e7f42de30765ea78c888919757";
-      sha256 = "12sl1yxib33pcpz38yxm8shhw71xkiw1ywlxxv1inph5avsy0ylk";
+      rev = "f95c5b019777768c0498bef05e1ee095f7d9398f";
+      sha256 = "0pz4xma58zwzi1705lmv7q6ijjqcrgydip47cbp6h7si1sl42kl4";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -3671,12 +3671,12 @@ final: prev:
 
   heirline-nvim = buildVimPluginFrom2Nix {
     pname = "heirline.nvim";
-    version = "2023-02-18";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "heirline.nvim";
-      rev = "b2e69dc3385772159b5dffd3a12a7af874692e10";
-      sha256 = "11c5ng73vh9m29g4i3y4pc05pnblb90yggbh96vw5hkkvv0ahg9s";
+      rev = "b69415d912d466db17b8ee1eb777cc7f776a9286";
+      sha256 = "0pv320i23wwp58xy3lpiy4j90y6fl8frmw19nk0c8dy9c10pdg6s";
     };
     meta.homepage = "https://github.com/rebelot/heirline.nvim/";
   };
@@ -3886,12 +3886,12 @@ final: prev:
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline.nvim";
-    version = "2023-01-26";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "8299fe7703dfff4b1752aeed271c3b95281a952d";
-      sha256 = "1z2rnaa9p62yid89n9pni9jzzdlcdc55i95c67yn5qzxd3h637hi";
+      rev = "018bd04d80c9a73d399c1061fa0c3b14a7614399";
+      sha256 = "1ncpar0n8702j5h4a2bv8zx9kcg7gwfhs52qqrcg1yfsgjzb86bl";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -4175,24 +4175,24 @@ final: prev:
 
   lazy-lsp-nvim = buildVimPluginFrom2Nix {
     pname = "lazy-lsp.nvim";
-    version = "2022-11-02";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9";
-      sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga";
+      rev = "d22d54c7558415faf6f518db1e00d995d595a99d";
+      sha256 = "0v7j8bjd5naf5qbr362r82nqa4grwj2r9wk68s5dv9zg576ybm0p";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
   };
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-02-17";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "7339145a223dab7e7ddccf0986ffbf9d2cb804e8";
-      sha256 = "0mw9sxnmyc5wipw7m1ap1s1f1a7mfi2qi9d2ibfibbrwbpx5n0yz";
+      rev = "8077428e63feb0f3bf795d53b23ba1695b28ab0e";
+      sha256 = "12bq0ppdm7frjgd336lvp3crw9ivsl5lj33f7fjvpqgsib7gy87r";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -4439,12 +4439,12 @@ final: prev:
 
   lir-nvim = buildVimPluginFrom2Nix {
     pname = "lir.nvim";
-    version = "2023-02-15";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "lir.nvim";
-      rev = "248f6b1da1f597e51513dd970672c7e57253f92a";
-      sha256 = "0l5xx5n1vzghpp85x7ilw53qz1jcjmm5xjkiiwlg6bpb6shrlnyn";
+      rev = "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7";
+      sha256 = "0vwlp8b4kj0201abq5rh470kf4lsk2pr1207qhjd2ay1wp69ywiq";
     };
     meta.homepage = "https://github.com/tamago324/lir.nvim/";
   };
@@ -4595,12 +4595,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-zero.nvim";
-    version = "2023-02-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "4361fbcb9e56ecd22169865a6588db8b1764c06c";
-      sha256 = "0kac8cc30j8w0d0417wsjdib9jiqbdyavhg34hn0sl3kwyp92nc4";
+      rev = "674a60c7d4f2a90c75d66fe98603d7ca708939dc";
+      sha256 = "1iha7i85bsamnb7gqnnhh784xycfwfg8vbyc93d42wpsksm7yjzr";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
   };
@@ -4702,12 +4702,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2023-02-11";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "58fbfc627a93281a77f7d161d4ff702e639677b1";
-      sha256 = "0vxqy0m1kvd4xfadv6pmx9l9h2pjrk7dsr43av6nf6xn2yrr7sin";
+      rev = "92276ba735056dab04b0508e421a6a5d729e3f81";
+      sha256 = "1vfkra9xygdm6ffdlkdca636i97hazhv1l66zpn3lwlliyqi1pzv";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4799,12 +4799,12 @@ final: prev:
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-02-18";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "4546dec8b56bc56bc1d81e717e4a935bc7cd6477";
-      sha256 = "179mz9pc7qp4vqmlmhd1pz9z0qagfkywb1l2sj7i1039smkf9p9a";
+      rev = "b8a6632a0f2d263199d5d480ca85477fe0f414ab";
+      sha256 = "0622x0k1xi5z6jdz2bpqvym34ysk38axfyjq45m6hhl6qcy0ysxg";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -5231,12 +5231,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-02-18";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "060986ec2fcb27cfa175ac24d6467f46261bc257";
-      sha256 = "0y8lvqfgs3lqd09dmvh04dpj76r5qmjh7q09wblmrc0nf7big3q2";
+      rev = "ca85eea7841f043671ebd6c784771f08b9d34231";
+      sha256 = "0pf44ydg6m70haban92fl7yvl3755jqw6h1icaglci8p198gsvln";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5267,12 +5267,12 @@ final: prev:
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2023-02-04";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81";
-      sha256 = "02f77wwhb1wfk9bcvy5mnc4r2rdgw6b3pdmacizmjnd1a9ajqysn";
+      rev = "16bd62efc3fcdcd0f6682ea47f1f6070850f9963";
+      sha256 = "1d5bqxfdg01hnx239v7bi301325ihvdypy0p4b1ay5py5jckld9h";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
@@ -5291,12 +5291,12 @@ final: prev:
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2023-01-31";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "089d388876a535032ac6a3f80e19420f09e4ddda";
-      sha256 = "0h44l14frinh9mcbjps04d0s853pppw0qlwdjkdg5wrfnh975vya";
+      rev = "bde758e658c1cdc794293afbde698b5aaa93c5de";
+      sha256 = "093gg1k7z0afhg8m2zvpkbf6aqb2ggjz50lrrf3wq0j25qsj1f4i";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -5315,12 +5315,12 @@ final: prev:
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2022-03-19";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "0556893d7fbc1948ac1a82cd0f41023d76a234b2";
-      sha256 = "0dw6miyxbbi71na8qb7nqk20vni1q46lmg51r0h354xcnxn4hyms";
+      rev = "584f882b9f991245374e7e7d7d1f78bae90b7a35";
+      sha256 = "0wywd9s5x70zw7yrid6nvlq1hz406j5j47y011jxan4ra4r9ixvy";
     };
     meta.homepage = "https://github.com/neomake/neomake/";
   };
@@ -5591,12 +5591,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-02-17";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "c3980083e9d0db50e9cc9adf14e930ff0404e845";
-      sha256 = "0jd21zwa2mjxkr3ad7s3w43gzxwdqahhnv3gml5cn9qqncybszgb";
+      rev = "cbe9ee8184e46311efbce79d9806f3ee803a2521";
+      sha256 = "16jv396s6mpk6w9fhrkh1wgc484647x1vs05y05j6smgi5h1hrlg";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5627,12 +5627,12 @@ final: prev:
 
   no-neck-pain-nvim = buildVimPluginFrom2Nix {
     pname = "no-neck-pain.nvim";
-    version = "2023-02-16";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
-      rev = "3ef7e6626825beb08d88747d574d8633e23a805b";
-      sha256 = "0nsgqgm7hqyvhx2bg60zh5rrzcrhcll1lfqaspzkx9cic0yq42as";
+      rev = "c97c44bc86522ceead8c9c9b775b2e1215549158";
+      sha256 = "03zyfnzqj20yv9cy6pvh8r5j5v0mgcay7jv4lmgi3gsp0z4qa8ia";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
   };
@@ -5711,12 +5711,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-02-16";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "a82aa08c0063843926947f3688b0e61fd71db680";
-      sha256 = "14ijkjfbg5dm54wkp34rf6z9p5v2z7psxnfv526rqp9p4qqasghk";
+      rev = "689cdd78f70af20a37b5309ebc287ac645ae4f76";
+      sha256 = "1fja54wrmqafqww1ifkpmidwq52r246sana9j57dm92j3l39fv5q";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -5807,12 +5807,12 @@ final: prev:
 
   nvim-bqf = buildVimPluginFrom2Nix {
     pname = "nvim-bqf";
-    version = "2023-02-08";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-bqf";
-      rev = "7a278012efb0a12bc49ecc3e16ec5591c41fae88";
-      sha256 = "1wykg4d6rx6grfb69svwwhk7f28g2cf87bdb13pwlbxyl7cxw908";
+      rev = "b71e6bc220ea2ef8f09d5e6b39d52609a965f322";
+      sha256 = "0kl2p55vrq1qwbk4r7mrly0gmw794h6nxivb17f4zn8lmvvcbmjc";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
   };
@@ -5847,8 +5847,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "0c6a89af9a62ecc18f7cf89393b077af1063cd6c";
-      sha256 = "1d490dli7r7sb0qviyy2b9n6ssy75iy8pszfbwyanp71v04k5v9w";
+      rev = "8202df9561b90102b41dbc1ad71945534ef4ea39";
+      sha256 = "15mpzg05x36vnbq9gs5q71fw9hin8b635r5lf42v6crdqw8wghmf";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -6131,12 +6131,12 @@ final: prev:
 
   nvim-jqx = buildVimPluginFrom2Nix {
     pname = "nvim-jqx";
-    version = "2023-02-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "gennaro-tedesco";
       repo = "nvim-jqx";
-      rev = "bb9e70fe83f2d176d3fae3234415c50f9231a8e2";
-      sha256 = "1d84hy4vl3jkjzq0ir9p3rgal3nsagq5b9w0r20ql1c9n6cs2lqh";
+      rev = "4c4082cf94ccd32f5780859c875f91ddef763694";
+      sha256 = "0clqgq8whvcnpxlqhyw721kyljhsyvmx8mqfq8qaxys8b6cf8fwy";
     };
     meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/";
   };
@@ -6203,12 +6203,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-02-15";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "649137cbc53a044bffde36294ce3160cb18f32c7";
-      sha256 = "1xy1jzjhjn6m4xy556giiq265flli04csl0c1wf4dgpa03rd0yqf";
+      rev = "b5db147e28337319331d516a826b00976f3584de";
+      sha256 = "14hjgk0g81mn26xwd3hspzi2jqiy1viiyc6pz3zqnmn66g958bfl";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6323,12 +6323,12 @@ final: prev:
 
   nvim-nu = buildVimPluginFrom2Nix {
     pname = "nvim-nu";
-    version = "2023-01-03";
+    version = "2023-02-18";
     src = fetchFromGitHub {
       owner = "LhKipp";
       repo = "nvim-nu";
-      rev = "1aad12e866f6d53dd5ec31ada79767199334a4ca";
-      sha256 = "022gmlrncbs46fqkbcnc4y8jyfasqac5nd09qq1qxdjgkw4924kj";
+      rev = "ebacb8363ed3c21ffd4e47e277dde8f34609585b";
+      sha256 = "0wd9ddyllmrisdcbp6mxl7nhcxs449k0rbwm0vshk3wig1wz4gdi";
     };
     meta.homepage = "https://github.com/LhKipp/nvim-nu/";
   };
@@ -6395,12 +6395,12 @@ final: prev:
 
   nvim-snippy = buildVimPluginFrom2Nix {
     pname = "nvim-snippy";
-    version = "2023-02-12";
+    version = "2023-02-18";
     src = fetchFromGitHub {
       owner = "dcampos";
       repo = "nvim-snippy";
-      rev = "12cb37c1d850365c6d3cb512efff901ae94a6927";
-      sha256 = "077qvj1wy6q3kpadnavsz50y7ba0n1vrv9qdm5v49yj889f5iibc";
+      rev = "80104ebd1e77d019f736bee46de2f1dbfe36f8af";
+      sha256 = "144vv4yggmhsdrzqfrazj9cxm0pqcxlyqc7h535ss8cg0wqgx9bp";
     };
     meta.homepage = "https://github.com/dcampos/nvim-snippy/";
   };
@@ -6467,24 +6467,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2023-02-14";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "08a0aa1a3b7411ee0a7887c8818528b1558cef96";
-      sha256 = "0kgc928nrdjzl0sjm1yqfd489yw36fa4w0vbmp1siwwfrck97l5n";
+      rev = "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c";
+      sha256 = "1qdz4ark1xjwc3xkcc3dm9cxinnfhd8mi0kawb8qjy87gw73i9mz";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-02-18";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "17d7cf6f4b4057a949e86df6fbc2e271ba788823";
-      sha256 = "088vpscxda9vph9ncvspyk51pkbykjmb6d5vrassiy1vpcvpa2bh";
+      rev = "ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a";
+      sha256 = "0hgd2flldhjh38j69mgg5gg7iy8wcg258rhdx46ag8jgxvx31imc";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -6575,11 +6575,11 @@ final: prev:
 
   nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow2";
-    version = "2023-02-17";
+    version = "2023-02-20";
     src = fetchgit {
       url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
-      rev = "352ce3e654cab593586fe02e7ca78c2cab13743d";
-      sha256 = "026xi0grnqpp5j2vqx5n93y0g5avq0yx0qz23h88as5nhfa07wzj";
+      rev = "99768947820b969bcd99c4252c6166a984f99be4";
+      sha256 = "0swhhj6algx9j9020rcwbra8qw0nxk5c2pan0vjv4g18byya7i2y";
     };
     meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
   };
@@ -6598,12 +6598,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPluginFrom2Nix {
     pname = "nvim-web-devicons";
-    version = "2023-02-18";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "53faf5e6d38cb3ca5c7487421524fa2b187b15b2";
-      sha256 = "1ad7x73dnmjzzhkgn6xcb0f4ir5j3zfqmbi1fsxw7ydsb433563j";
+      rev = "4709a504d2cd2680fb511675e64ef2790d491d36";
+      sha256 = "0b3h95x2xhrhwspfazibpknxrli70vjahbf52h74yda4ji0n2x4a";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -6827,12 +6827,12 @@ final: prev:
 
   oxocarbon-nvim = buildVimPluginFrom2Nix {
     pname = "oxocarbon.nvim";
-    version = "2023-02-12";
+    version = "2023-02-18";
     src = fetchFromGitHub {
       owner = "nyoom-engineering";
       repo = "oxocarbon.nvim";
-      rev = "f93de9b8589eda0d1d766cbe3c76ed1e1abc0a71";
-      sha256 = "11yp33398vya0b4ncf2whf5rj42h16kyd2h4xglyl77dixawmvgf";
+      rev = "0dcf03dc2d9c96166d20b82875ce7eea484b5fdc";
+      sha256 = "1qvwcfid1vs9a0k3xn2ki5iiwgv246qkdzsl2pndsrv04gk42j07";
     };
     meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
   };
@@ -6983,12 +6983,12 @@ final: prev:
 
   plenary-nvim = buildNeovimPluginFrom2Nix {
     pname = "plenary.nvim";
-    version = "2023-01-30";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "9a0d3bf7b832818c042aaf30f692b081ddd58bd9";
-      sha256 = "1xy4hs0pckzbxd249zwg2r0vi94fy9arb966nypw1dx4vxw8072z";
+      rev = "253d34830709d690f013daf2853a9d21ad7accab";
+      sha256 = "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -7393,12 +7393,12 @@ final: prev:
 
   rust-tools-nvim = buildVimPluginFrom2Nix {
     pname = "rust-tools.nvim";
-    version = "2023-02-05";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "simrat39";
       repo = "rust-tools.nvim";
-      rev = "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef";
-      sha256 = "0sja04sgpaa30v3ndnffh8n2lx0igicjpmddc7h5v2n62il5z1a8";
+      rev = "71d2cf67b5ed120a0e31b2c8adb210dd2834242f";
+      sha256 = "14vma4r8v20r2ddkhwxs5zhp5lcqa51sxayxdri1z21gvaykzs8a";
     };
     meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
   };
@@ -7610,12 +7610,12 @@ final: prev:
 
   slimv = buildVimPluginFrom2Nix {
     pname = "slimv";
-    version = "2022-05-09";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "kovisoft";
       repo = "slimv";
-      rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c";
-      sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn";
+      rev = "48f21d04dc7f9732d04ffec101dfcf17b7f515cb";
+      sha256 = "01dkvxkh3xpv45cbc4sylw5a1dsipd3841x88cc32nrarafsmgfn";
     };
     meta.homepage = "https://github.com/kovisoft/slimv/";
   };
@@ -7802,12 +7802,12 @@ final: prev:
 
   splitjoin-vim = buildVimPluginFrom2Nix {
     pname = "splitjoin.vim";
-    version = "2022-09-04";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "956d67c88512b91c2938da3a9e0aeeea2b82cd0b";
-      sha256 = "0dlsdb42j4d9q1fcw7jfwks6w516xi8ap1v7kip831bh4p6jyl1w";
+      rev = "cdc1eb05496c2ecdeea7c7bf7ab0b6ab5b421f24";
+      sha256 = "0rm8ml6nxkl0sgwbhsp5xjjjn45dq2pdg8amaywp0vjdnjcq9pi5";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -8201,12 +8201,12 @@ final: prev:
 
   telescope-cheat-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-cheat.nvim";
-    version = "2021-12-05";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-cheat.nvim";
-      rev = "8a169767c19db2f2ef2fb3fffe6adbac5a630282";
-      sha256 = "0x68zb1x1v7dkrbgz88wh9ffij0ngjr23k5axxhhi07ppynmhvag";
+      rev = "5549dfe9207b06eb28bff74af977f078376f9762";
+      sha256 = "0wxdv266fn83yh1dy05pw5xgd0j7gndngk3s3g7lljbj7y0nzy5m";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/";
   };
@@ -8237,12 +8237,12 @@ final: prev:
 
   telescope-file-browser-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-file-browser.nvim";
-    version = "2023-02-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-file-browser.nvim";
-      rev = "ee594419f3bc39b4123ad0cf8e7d4b7d6cad1303";
-      sha256 = "0dyg09nw7kxylplln3p5905rb3y5jl6vzxx5nrix5a3qwfs2ijnl";
+      rev = "6eb6bb45b7a9bed94a464a3e1dadfe870459628c";
+      sha256 = "0b96wrjvy9mp9qpjhi4jb1mrzsfwww21lahjhgx8kk9y4ml503dg";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
   };
@@ -8346,12 +8346,12 @@ final: prev:
 
   telescope-media-files-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-media-files.nvim";
-    version = "2021-10-21";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-media-files.nvim";
-      rev = "513e4ee385edd72bf0b35a217b7e39f84b6fe93c";
-      sha256 = "1ap3ijh64ynyxzbc62ijfkbwasv506i17pc65bh3w4dfpzn6rlpy";
+      rev = "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a";
+      sha256 = "0bvvnflzz1x511fk891mimsfahw843kk4v90l6h4yy1bi9a10qps";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/";
   };
@@ -8370,12 +8370,12 @@ final: prev:
 
   telescope-symbols-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-symbols.nvim";
-    version = "2022-04-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-symbols.nvim";
-      rev = "f7d7c84873c95c7bd5682783dd66f84170231704";
-      sha256 = "1yw09d2snma0vy36nfdswm1snf21w183aji7f6y8jnkx47g6gc37";
+      rev = "f2060117d965df4a626f068a4ebbd8ee051aa076";
+      sha256 = "1g9pj2g8l2rkz6szrijw56l1hd7lfac8i3g4fyvhi3x4xqjnml3h";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
   };
@@ -8454,12 +8454,12 @@ final: prev:
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2023-01-31";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "203bf5609137600d73e8ed82703d6b0e320a5f36";
-      sha256 = "1h64qyvvnzv7ph49vciv2izv9ws7ds1z9cncrmxs7jwlh3vv10ig";
+      rev = "a486ac3e8fb2198f3636da1927ed57a28836fbd8";
+      sha256 = "1a2qdqxvp3d1i1wlc7gac1vqfbp0idcnk6y78vmjgziksamj4579";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -8695,12 +8695,12 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2023-02-17";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "557664818f6af78de6192f0ce8bc2e887bf4943a";
-      sha256 = "1pfr2240cwqjcdza18815lblcsr1ccd63phajcl31izsrx0ba78z";
+      rev = "ecf9dacccbcf0d66d9aa9074fdbb5ed51575399a";
+      sha256 = "12x47qf98lxwvc6hpw60vwax9aw7wnh21y9j2kxzndzjxi7v6lik";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
@@ -8779,12 +8779,12 @@ final: prev:
 
   trouble-nvim = buildVimPluginFrom2Nix {
     pname = "trouble.nvim";
-    version = "2023-02-18";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "247f9eeabae8e1efc0ed5bc613cc1a9c27e91828";
-      sha256 = "174zv283scsv84wbbvm2j24fs0dy5dj5rcpqib3sdyxfydvvc18p";
+      rev = "3b754285635a66a93aeb15fa71a23417d8997217";
+      sha256 = "0bgm93g4yh5f84nf7h2w9gb3glaffk2dl2p5b0cp38x033lz1yk9";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -8971,12 +8971,12 @@ final: prev:
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
     pname = "verilog_systemverilog.vim";
-    version = "2022-11-20";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "5bf36012ecd4f82a987acaee1c8504cbc8711aeb";
-      sha256 = "1v2d2jyp9h2mjrmkmya879ilmsjbwdbpms1lfhiw7gx8bzb5qa62";
+      rev = "b47a3c0e5ace979f67326b82702b9da5acd7efb9";
+      sha256 = "1ig8m86pbvjqvykgi0xm45c0q3h5ibwqjmr3scpqkz2ah6wahpvb";
     };
     meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
   };
@@ -9067,12 +9067,12 @@ final: prev:
 
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
-    version = "2023-01-20";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "d55c90d6c9995ccb79d2152564a4939cd84d73e9";
-      sha256 = "0vfhjv7jpx15lqd6kf7jds5x5x4x5gj9cbr5rgm0cbbcn2734gji";
+      rev = "c164cac033087d73b3a94650c02f6c092ee56115";
+      sha256 = "0n3gj93ankh8nwiwsmydgg0v8vz4bxbymbh551kgj4aigpivip01";
     };
     meta.homepage = "https://github.com/tpope/vim-abolish/";
   };
@@ -10651,12 +10651,12 @@ final: prev:
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2023-02-17";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "819851b6ba8fdcf15454ae3a713622128c795774";
-      sha256 = "0l36zy577zai4qv9327nysyaakbna8rmf6x7sj1h2dqgp7jag3fa";
+      rev = "b8a41085bfd67fee97ad075c6df65590ce7417a7";
+      sha256 = "0m477wpyjxx0g7gdrcwnnhp6s8z23wlb7nljd6lrjkf1lqphb5i7";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -11145,12 +11145,12 @@ final: prev:
 
   vim-jsonnet = buildVimPluginFrom2Nix {
     pname = "vim-jsonnet";
-    version = "2022-10-25";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
-      rev = "f27e1d67dff34ac9cf9c83ea2f2f814e53aa409c";
-      sha256 = "05zlsn7344zffwjsx4f65rp85jrgfm4wi40iqjj137x11jhwb9a2";
+      rev = "4ebc6619ddce5d032a985b42a9864154c3d20e4a";
+      sha256 = "1z2zk2wqfv58qxd8pa4hrpyhi5nlgf8m4gqb9f31pdnb78ci860a";
     };
     meta.homepage = "https://github.com/google/vim-jsonnet/";
   };
@@ -11494,12 +11494,12 @@ final: prev:
 
   vim-matchup = buildVimPluginFrom2Nix {
     pname = "vim-matchup";
-    version = "2023-02-12";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "945e01e39fc137bd74bb3aa8c4f40e6ffb5be2dd";
-      sha256 = "04lzlz7y72nw5in3r46xc8xb1f4avdcjbwl1sic9v0gbr4w3g2hb";
+      rev = "3a48818a8113a502f245c29d894201421727577a";
+      sha256 = "1hxsjs83i2rjkmhvsxrxk1y6as9xi8b5ji9abvwvb90p2a765987";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
   };
@@ -13187,12 +13187,12 @@ final: prev:
 
   vim-tpipeline = buildVimPluginFrom2Nix {
     pname = "vim-tpipeline";
-    version = "2023-02-16";
+    version = "2023-02-18";
     src = fetchFromGitHub {
       owner = "vimpostor";
       repo = "vim-tpipeline";
-      rev = "95a6ccbe9f33bc42dd4cee45731d8bc3fbcd92d1";
-      sha256 = "1nxrva8gs2fq6vi3w26ns6lrfpbyfw495knidpx9pmvcf0ypxcva";
+      rev = "2b61cd2726d2f2cab5ab66761732143268f78b5c";
+      sha256 = "07z5sialjki7w8qipqplpg67jgshgbckv9nmp83x40vrjypsiml9";
     };
     meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
   };
@@ -13427,12 +13427,12 @@ final: prev:
 
   vim-wakatime = buildVimPluginFrom2Nix {
     pname = "vim-wakatime";
-    version = "2023-02-06";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "ee4ab57adf62a309aeef383a2da23b6e48e5ae50";
-      sha256 = "1k5nhwcn7ckn44pzy49fn7i116lydarzn9ks1cczwh9nkmwwwsks";
+      rev = "62113bb063aa1923146e59270d71563441ceabe5";
+      sha256 = "1n5d7jz5d3iamq030dmvb67w06b8ap1nvmj03shbx03i189kp2g1";
     };
     meta.homepage = "https://github.com/wakatime/vim-wakatime/";
   };
@@ -13740,12 +13740,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2023-02-15";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "aa55f528d1a12ba2cdf7953639e5b6ced9aa1999";
-      sha256 = "1f3dcbid27vcxs1r0rhvzm0rfvghianvs03bah5xpxmzj0q5cvnc";
+      rev = "8bbd3b0308ba8238c4d00a24d68a6074e19ccc0a";
+      sha256 = "10ahwp0nzz34iq4i8rv1lx45c87zp87wvwg0fn3rwy9hd35gpnn9";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -14125,12 +14125,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-02-17";
+    version = "2023-02-21";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "60f8f40df0db92b5715642b3ea7074380c4b7995";
-      sha256 = "0hgm542vdav33gj9dacy43anh9ql7x8jr1ihwbx11jlxqr5vhhp7";
+      rev = "22e55672793be043a5ce9790e7617322ef4ab445";
+      sha256 = "0smpk37fiwq4rmgiy2b3f3yyhkwynfy6i70hrxblqn9as5kk7cjc";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -14149,12 +14149,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2023-02-14";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "c37df0dcd9a379fc6e17dfaac42ecf9ce5b25977";
-      sha256 = "0s6jpa5n7h2235x2kx7i7qhrf9zzvqqhc4h8crq62da2qvhhqsqh";
+      rev = "ea91862411d16f4e4bed9c6fef452b8c1b2a662f";
+      sha256 = "0fm3kkfvr816n90pl07wyy8mhzpz4rn93xy61hys7cj53q99fngq";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -14173,12 +14173,12 @@ final: prev:
 
   embark-vim = buildVimPluginFrom2Nix {
     pname = "embark-vim";
-    version = "2023-02-05";
+    version = "2023-02-19";
     src = fetchFromGitHub {
       owner = "embark-theme";
       repo = "vim";
-      rev = "ebcbf51e13a5fea046c784906c149a057ba9d8b6";
-      sha256 = "1hbjwv2chrj310nvikb0pbs5wjj0bicx2874vjn2qh0rfypzqr1b";
+      rev = "d724faa9bfcd37f1995071e678e30af2229eb1a1";
+      sha256 = "0ibcifqm3vrdvq2dzm4qyh7y0i134653irq33jg3kmqijxzzrb58";
     };
     meta.homepage = "https://github.com/embark-theme/vim/";
   };
@@ -14197,12 +14197,12 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-02-18";
+    version = "2023-02-20";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "lspsaga.nvim";
-      rev = "66bb06771789d677ef2b7c9a0bd57941298f6a9f";
-      sha256 = "1rp53hwm19bi53y0vndv2m4222ml7qz2iib23wqdj709azz6sr0j";
+      rev = "73380b25ec27e9df788752174703cfdad98e66dd";
+      sha256 = "0z50c074bk2jsvsglwdw532i8zp0w8yb2sfk5izgm9hk02n2niys";
     };
     meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
   };

From 93b44f49fcccd42f1aa095c477f3772a1ba758e1 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 20 Feb 2023 21:59:41 -0500
Subject: [PATCH 093/191] vimPlugins.nvim-treesitter: update grammars

---
 .../editors/vim/plugins/nvim-treesitter/generated.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 349977368b05..7c9630754e60 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -1203,12 +1203,12 @@
   };
   python = buildGrammar {
     language = "python";
-    version = "9e53981";
+    version = "528855e";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-python";
-      rev = "9e53981ec31b789ee26162ea335de71f02186003";
-      hash = "sha256-D2++Xg7dRfjGM2r4cxaXGQnBOAX5JBREcEAJeNa7Y9M=";
+      rev = "528855eee2665210e1bf5556de48b8d8dacb8932";
+      hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
   };

From 102a31f3771e86f37a98cf1221b64743098f4b68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:18:43 +0000
Subject: [PATCH 094/191] go-tools: 2023.1 -> 2023.1.2

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

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index 5077bc45b82f..0f9f5e03f943 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "go-tools";
-  version = "2023.1";
+  version = "2023.1.2";
 
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
     rev = version;
-    sha256 = "sha256-RzYaaiDu78JVM8G0zJzlZcyCd+1V9KZIyIIyVib0yZc=";
+    sha256 = "sha256-Xnylkv0n3FExQ4e4pmD6DAUqGtud80wHHoVY56UXfOU=";
   };
 
   vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8=";

From c7c8258c27c4b7fb22aa862c016e74f83c4b9812 Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Wed, 15 Feb 2023 01:11:52 +0800
Subject: [PATCH 095/191] uwufetch: 2.0 -> 2.1

---
 pkgs/tools/misc/uwufetch/default.nix     | 32 +++++++++++++++---------
 pkgs/tools/misc/uwufetch/fix-paths.patch | 28 ---------------------
 2 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/misc/uwufetch/fix-paths.patch

diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix
index 03105b13e4ce..f86320a59b32 100644
--- a/pkgs/tools/misc/uwufetch/default.nix
+++ b/pkgs/tools/misc/uwufetch/default.nix
@@ -1,20 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, viu }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, viu }:
 
 stdenv.mkDerivation rec {
   pname = "uwufetch";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "TheDarkBug";
     repo = pname;
     rev = version;
-    hash = "sha256-2kktKdQ1xjQRIQR2auwveHgNWGaX1jdJsdlgWrH6l2g=";
+    hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA=";
   };
 
-  patches = [
-    # cannot find images in /usr
-    ./fix-paths.patch
-  ];
+  postPatch = ''
+    substituteInPlace uwufetch.c \
+      --replace "/usr/lib/uwufetch" "$out/lib/uwufetch" \
+      --replace "/usr/local/lib/uwufetch" "$out/lib/uwufetch" \
+      --replace "/etc/uwufetch/config" "$out/etc/uwufetch/config"
+    # fix command_path for package manager (nix-store)
+    substituteInPlace fetch.c \
+      --replace "/usr/bin" "/run/current-system/sw/bin"
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile \
+      --replace "local/bin" "bin" \
+      --replace "local/lib" "lib" \
+      --replace "local/include" "include" \
+      --replace "local/share" "share"
+  '';
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -24,13 +35,9 @@ stdenv.mkDerivation rec {
 
   installFlags = [
     "DESTDIR=${placeholder "out"}"
-    "ETC_DIR=${placeholder "out"}"
+    "ETC_DIR=${placeholder "out"}/etc"
   ];
 
-  postPatch = ''
-    substituteAllInPlace uwufetch.c
-  '';
-
   postFixup = ''
     wrapProgram $out/bin/uwufetch \
       --prefix PATH ":" ${lib.makeBinPath [ viu ]}
@@ -40,6 +47,7 @@ stdenv.mkDerivation rec {
     description = "A meme system info tool for Linux";
     homepage = "https://github.com/TheDarkBug/uwufetch";
     license = licenses.gpl3Plus;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ lourkeur ];
   };
 }
diff --git a/pkgs/tools/misc/uwufetch/fix-paths.patch b/pkgs/tools/misc/uwufetch/fix-paths.patch
deleted file mode 100644
index 4869104819d6..000000000000
--- a/pkgs/tools/misc/uwufetch/fix-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/uwufetch.c b/uwufetch.c
-index f2d7857..8191888 100644
---- a/uwufetch.c
-+++ b/uwufetch.c
-@@ -160,9 +160,9 @@ void print_image(struct info* user_info) {
- 		if (strcmp(user_info->os_name, "android") == 0)
- 			sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for android
- 		else if (strcmp(user_info->os_name, "macos") == 0)
--			sprintf(command, "viu -t -w 18 -h 8 /usr/local/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name);
-+			sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name);
- 		else
--			sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems
-+			sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems
- 	}
- 	printf("\n");
- 	if (system(command) != 0) // if viu is not installed or the image is missing
-@@ -587,9 +587,9 @@ void print_ascii(struct info* user_info) {
- 		if (strcmp(user_info->os_name, "android") == 0)
- 			sprintf(ascii_file, "/data/data/com.termux/files/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name);
- 		else if (strcmp(user_info->os_name, "macos") == 0)
--			sprintf(ascii_file, "/usr/local/lib/uwufetch/ascii/%s.txt", user_info->os_name);
-+			sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name);
- 		else
--			sprintf(ascii_file, "/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name);
-+			sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name);
- 
- 		file = fopen(ascii_file, "r");
- 		if (!file) {

From 89c3b7644c02922821b100df6abf069b1851087f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:26:19 +0000
Subject: [PATCH 096/191] cozette: 1.19.0 -> 1.19.1

---
 pkgs/data/fonts/cozette/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix
index 35d24db563d1..7eff1c211b90 100644
--- a/pkgs/data/fonts/cozette/default.nix
+++ b/pkgs/data/fonts/cozette/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cozette";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchzip {
     url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip";
-    hash = "sha256-nlEnQjQJAFRvZgdGMiloMs4afugmSFnITTIHD+Qkggg=";
+    hash = "sha256-CpabWJJDCY+mgE+9U8L50MmWVfhkm+LnfMQtOTXyE8s=";
   };
 
   installPhase = ''

From 76305f698e51999b77552935acc2fcd51369d535 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Mon, 20 Feb 2023 22:29:21 -0500
Subject: [PATCH 097/191] libjack2: fix source url

c733f0bf8ad39186b9d14d4fb4d0bc1394b93940 switched JACK to using overlay-style
mkDerivation, but forgot to change a reference to `version` to `finalAttrs.version`.

This wasn't caught at eval time because `with lib` was used, making the
source derivation try to fetch (at the time of writing) tag "23.05pre-git",
which obviously doesn't exist :D

Thanks to V for catching this [0].

[0]: https://github.com/NixOS/nixpkgs/pull/216096#issuecomment-1437763295
---
 pkgs/misc/jackaudio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index fce51aabd263..dd7c05d1ad2c 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "01s8i64qczxqawgrzrw19asaqmcspf5l2h3203xzg56wnnhhzcw7";
   };
 

From d30b3eaecc09fd4ebfb6fa11db900fdc313747fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:33:53 +0000
Subject: [PATCH 098/191] symfony-cli: 5.4.21 -> 5.5.0

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

diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix
index 8de028a4add9..dde6628bc69e 100644
--- a/pkgs/development/tools/symfony-cli/default.nix
+++ b/pkgs/development/tools/symfony-cli/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "symfony-cli";
-  version = "5.4.21";
-  vendorHash = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA=";
+  version = "5.5.0";
+  vendorHash = "sha256-l8h2jHOwxvFEk9v/U8DU8g6La9TyPtpDvQTTSX4BW84=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     rev = "v${version}";
-    sha256 = "sha256-lNEd5mj5K8MhlLkrRiFnEqVLnS+4mx7FNAtYuF5jdC0=";
+    sha256 = "sha256-d/Ld/F1dvwO7/uKLtgQmYhfOoxvIyEbnE3ks6R2412I=";
   };
 
   ldflags = [

From 5045ec5e82e6966b523fae69218e189f07a6bc8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:37:57 +0000
Subject: [PATCH 099/191] ashuffle: 3.13.4 -> 3.13.6

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

diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix
index fa75711acea2..0184b042888b 100644
--- a/pkgs/applications/audio/ashuffle/default.nix
+++ b/pkgs/applications/audio/ashuffle/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ashuffle";
-  version = "3.13.4";
+  version = "3.13.6";
 
   src = fetchFromGitHub {
     owner = "joshkunz";
     repo = "ashuffle";
     rev = "v${version}";
-    sha256 = "sha256-J6NN0Rsc9Zw9gagksDlwpwEErs+4XmrGF9YHKlAE1FA=";
+    sha256 = "sha256-8XjLs4MI5MXvA6veCoTAj8tlYDe7YTggutO3F9eNyMM=";
     fetchSubmodules = true;
   };
 

From ee197b2f3311ba86514e61b2576d70c2ce96eca3 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Mon, 20 Feb 2023 22:35:23 -0500
Subject: [PATCH 100/191] libjack2: don't use `with lib` at top-level

It's bit us once already [0], let's get rid of it before it does it again.

[0]: https://github.com/NixOS/nixpkgs/pull/216096#issuecomment-1437763295
---
 pkgs/misc/jackaudio/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index dd7c05d1ad2c..536c654f0be7 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -14,7 +14,6 @@
 , testers
 }:
 
-with lib;
 let
   inherit (python3Packages) python dbus-python;
   shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
@@ -41,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
   buildInputs = [ libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
-  ] ++ optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     aften AudioUnit CoreAudio Accelerate libobjc
   ];
 
@@ -54,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
   wafConfigureFlags = [
     "--classic"
     "--autostart=${if (optDbus != null) then "dbus" else "classic"}"
-  ] ++ optional (optDbus != null) "--dbus"
-    ++ optional (optLibffado != null) "--firewire"
-    ++ optional (optAlsaLib != null) "--alsa";
+  ] ++ lib.optional (optDbus != null) "--dbus"
+    ++ lib.optional (optLibffado != null) "--firewire"
+    ++ lib.optional (optAlsaLib != null) "--alsa";
 
   postInstall = (if libOnly then ''
     rm -rf $out/{bin,share}
@@ -67,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
-  meta = {
+  meta = with lib; {
     description = "JACK audio connection kit, version 2 with jackdbus";
     homepage = "https://jackaudio.org";
     license = licenses.gpl2Plus;

From 871a81ce40a2f9923ec7baed4ba420eeabb6ef3e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 03:11:44 +0000
Subject: [PATCH 101/191] =?UTF-8?q?terraform-providers.cloudflare:=203.33.?=
 =?UTF-8?q?1=20=E2=86=92=204.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a5b819956275..e6515258140b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -219,13 +219,13 @@
     "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
   },
   "cloudflare": {
-    "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=",
+    "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v3.33.1",
+    "rev": "v4.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8="
+    "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo="
   },
   "cloudfoundry": {
     "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=",

From 05800f53b6c6f86e0f78c50b411d73f7276bb86c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 03:12:49 +0000
Subject: [PATCH 102/191] =?UTF-8?q?terraform-providers.heroku:=205.1.10=20?=
 =?UTF-8?q?=E2=86=92=205.1.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e6515258140b..c7e05e8e6361 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -503,11 +503,11 @@
     "vendorHash": null
   },
   "heroku": {
-    "hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=",
+    "hash": "sha256-Fc8nCrFR3cHEN68y277/eZ6DLVfFxEyliCkii5343MI=",
     "homepage": "https://registry.terraform.io/providers/heroku/heroku",
     "owner": "heroku",
     "repo": "terraform-provider-heroku",
-    "rev": "v5.1.10",
+    "rev": "v5.1.11",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 6b9b4ff80e75f2732fb959b00d9aed4cea6c8d16 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 03:15:09 +0000
Subject: [PATCH 103/191] =?UTF-8?q?terraform-providers.stackpath:=201.4.0?=
 =?UTF-8?q?=20=E2=86=92=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c7e05e8e6361..acea15d34edb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1054,13 +1054,13 @@
     "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU="
   },
   "stackpath": {
-    "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
+    "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
     "homepage": "https://registry.terraform.io/providers/stackpath/stackpath",
     "owner": "stackpath",
     "repo": "terraform-provider-stackpath",
-    "rev": "v1.4.0",
+    "rev": "v1.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ="
+    "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U="
   },
   "statuscake": {
     "hash": "sha256-PcA0t/G11w9ud+56NdiRXi82ubJ+wpL4XcexT1O2ADw=",

From 2a54120d5a64afff854baeeb1db03e2200054c80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:48:05 +0000
Subject: [PATCH 104/191] go-camo: 2.4.2 -> 2.4.3

---
 pkgs/servers/http/go-camo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/go-camo/default.nix b/pkgs/servers/http/go-camo/default.nix
index fcc6c42206b0..d7198f44bb4a 100644
--- a/pkgs/servers/http/go-camo/default.nix
+++ b/pkgs/servers/http/go-camo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-camo";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "cactus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-TW32pzYcSMdtcO3MGxgANCLMLvq7S/Tq3KSimv90PU0=";
+    sha256 = "sha256-GRctsE+uAvyA0pcz+ym4sz3K80pUHoDipVsjFcdrT2A=";
   };
 
-  vendorHash = "sha256-AcSClJwDsM+tUbDE7sQ8LLkxCPTtLEGXsQePqQ6CwMA=";
+  vendorHash = "sha256-C66QxlMBupbHYktyzHapUrl0yk+pvWZN0BLhpjIGVzI=";
 
   ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ];
 

From dffffe517792d4ad845d94b2544ced7eead21c57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 03:54:51 +0000
Subject: [PATCH 105/191] cubiomes-viewer: 3.1.1 -> 3.2.1

---
 pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix
index 1405bc5b90ca..3b2473795088 100644
--- a/pkgs/applications/misc/cubiomes-viewer/default.nix
+++ b/pkgs/applications/misc/cubiomes-viewer/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cubiomes-viewer";
-  version = "3.1.1";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "Cubitect";
     repo = pname;
     rev = version;
-    sha256 = "sha256-5PtMXipULnzAnarESu2biYOeHSlDeKXoX5XnlpvgIAk=";
+    sha256 = "sha256-67augXXZsriXdndrCFUFWZbL+rVKgTPAyqlbZua2Ul4=";
     fetchSubmodules = true;
   };
 

From 8e27bd2543657905e33c36374a13e0657dd1e171 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 04:24:12 +0000
Subject: [PATCH 106/191] esbuild: 0.17.8 -> 0.17.9

---
 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 c204e91b2763..2a4d44c63f43 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.17.8";
+  version = "0.17.9";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-UJIbx0UkpHYMgDr+1dbNoMLrY5hWs0E2Ehu3txG/80E=";
+    hash = "sha256-uYBlBnr7lAlO8WsPZzpQkP47NW0vXui8ri7mYPnFEeI=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

From e685e617900306f5708b0e7ba901ea3ffc2dcaf5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 21 Feb 2023 04:25:00 +0000
Subject: [PATCH 107/191] esbuild: 0.17.9 -> 0.17.10

https://github.com/evanw/esbuild/releases/tag/v0.17.10
---
 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 2a4d44c63f43..3845f18c351d 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.17.9";
+  version = "0.17.10";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-uYBlBnr7lAlO8WsPZzpQkP47NW0vXui8ri7mYPnFEeI=";
+    hash = "sha256-qe7YCOIwp+MSa5VkwImdOea1aMcpWdor/13PIgGEkkw=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

From ca019ad6975a46787717e66fcc0af8f0c08bb3e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 04:49:17 +0000
Subject: [PATCH 108/191] k9s: 0.27.2 -> 0.27.3

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

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 8ac275c1b928..7c57feacfb78 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.27.2";
+  version = "0.27.3";
 
   src = fetchFromGitHub {
     owner  = "derailed";
     repo   = "k9s";
     rev    = "v${version}";
-    sha256 = "sha256-9wdc3Wiqry8+q/60Y7mPzH0k4dp1nKIGinxfkYBaHJY=";
+    sha256 = "sha256-oUn9qQG4rpunfeHgSlY9THkYv1aGWrVmdTZoEWeZJTs=";
   };
 
   ldflags = [
@@ -20,7 +20,7 @@ buildGoModule rec {
 
   tags = [ "netgo" ];
 
-  vendorHash = "sha256-8H7siVl6gXifQOBOLtyCeDbYflhKjaIRmP0KOTWVJk0=";
+  vendorHash = "sha256-sQ3D4JUK9epRkDZ7DC+IH+iMaLN+uKM2hZkhqji+0Zc=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

From cea19f2b1adb86770022b4132398a498df2e8296 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 05:16:07 +0000
Subject: [PATCH 109/191] signal-cli: 0.11.6 -> 0.11.7

---
 .../networking/instant-messengers/signal-cli/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index f8037e1ef47c..4d46c9870f06 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.11.6";
+  version = "0.11.7";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
-    hash = "sha256-DWG67Jr2hDas1aL5Q+9MUjNKNLFpOFLsehYbJfy/rzg=";
+    hash = "sha256-oN80HQkPpJfhM4WBaRm4ytmhLjSokjEpfMhP6/XnQXs=";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

From faeb037d8cf35d436e6a4311619dd65b4339e3f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 05:25:32 +0000
Subject: [PATCH 110/191] uftrace: 0.13 -> 0.13.1

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

diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index 6488ff63d665..4326556f13cb 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "uftrace";
-  version = "0.13";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "namhyung";
     repo = "uftrace";
     rev = "v${version}";
-    sha256 = "sha256-czVKliF9qvA9TG4KJKs2X0VDfJi4vHwbVeuLZViwpdg=";
+    sha256 = "sha256-hpEExyvazCH+lNTK0Ej0zbnWyX0gVLPjM9XfOuAueis=";
   };
 
   postUnpack = ''

From 7cd1e93a0b7579d3738b63d39813aa2f2279d1a9 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@doge-inc.net>
Date: Thu, 15 Dec 2022 14:48:25 -0500
Subject: [PATCH 111/191] packwiz: unstable-2022-10-29 -> unstable-2023-02-13

---
 pkgs/tools/games/minecraft/packwiz/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix
index f7931ded7bb0..59133ab46ef5 100644
--- a/pkgs/tools/games/minecraft/packwiz/default.nix
+++ b/pkgs/tools/games/minecraft/packwiz/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "packwiz";
-  version = "unstable-2022-10-29";
+  version = "unstable-2023-02-13";
 
   src = fetchFromGitHub {
     owner = "packwiz";
     repo = "packwiz";
-    rev = "f00dc9844ffdd6ee5c0526a79b0084429e9cb130";
-    sha256 = "sha256-YpihFWdcKfHJLEs+jHzHH7G+m/E8i5y2yp7IubObNhY=";
+    rev = "4b336e46e277d4b252c11f43080576dc23b001d2";
+    sha256 = "sha256-f6560XrnriKNq89aOxfJjN4mDdtYzMSOUlRWwItLuHk=";
   };
 
-  vendorSha256 = "sha256-09S8RFdCvtE50EICLIKCTnTjG/0XsGf+yq9SNObKmRA=";
+  vendorSha256 = "sha256-yL5pWbVqf6mEpgYsItLnv8nwSmoMP+SE0rX/s7u2vCg=";
 
   nativeBuildInputs = [
     installShellFiles

From 765a1ab24b170cbfa59330ae24a95dc1cf5b5871 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 06:13:01 +0000
Subject: [PATCH 112/191] python310Packages.azure-mgmt-containerregistry:
 10.0.0 -> 10.1.0

---
 .../python-modules/azure-mgmt-containerregistry/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index dc86f5acd738..433635b29e41 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "10.0.0";
+  version = "10.1.0";
   pname = "azure-mgmt-containerregistry";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk=";
+    sha256 = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
     extension = "zip";
   };
 

From 7360d251c779c33bf2812695d1c34a8d09557023 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 06:24:56 +0000
Subject: [PATCH 113/191] python310Packages.gdown: 4.6.3 -> 4.6.4

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

diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix
index 7db92fffc88f..6af750b0bd00 100644
--- a/pkgs/development/python-modules/gdown/default.nix
+++ b/pkgs/development/python-modules/gdown/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "gdown";
-  version = "4.6.3";
+  version = "4.6.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7G6pIu9ONhagVAc2VtmqLNxxf729CpTS931S0yOUMwc=";
+    hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k=";
   };
 
   propagatedBuildInputs = [

From f16a86e1d45fed66b0ce19a45ec7bacd262bf8ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 06:27:26 +0000
Subject: [PATCH 114/191] python310Packages.pipdeptree: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 39bdc6ad44ee..57d3538d68f5 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.4.0";
+  version = "2.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pipdeptree";
     rev = "refs/tags/${version}";
-    hash = "sha256-agjerQTSkrpHCleqNUxg+NFiPnf9u9DQrs3vSR917oE=";
+    hash = "sha256-hAODK7kFCntfKC77VF/KyTk0O/z+bXHixVxQIz8JuDk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From e0b99fe0fe8862bfbbcbe4c9dc013e46cdfecb38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 00:34:29 +0000
Subject: [PATCH 115/191] grails: 5.3.0 -> 5.3.2

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

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 6c76811d0c9f..9f09e1b74aac 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "grails";
-  version = "5.3.0";
+  version = "5.3.2";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "sha256-0Ow3G0QbKXQSpjLf371CYNxC3XoO5sv1SQD4MlHeOQ4=";
+    sha256 = "sha256-UdRtrQiHbBc8VoVUulDCZmAfZ1YTVdgNfeF91HomSqc=";
   };
 
   nativeBuildInputs = [ unzip ];

From ad9c008fd0d32d68b9fb7be05d2e566ccdf27b22 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Feb 2023 13:11:24 +0100
Subject: [PATCH 116/191] =?UTF-8?q?ocamlPackages.sha:=201.15.2=20=E2=86=92?=
 =?UTF-8?q?=201.15.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix
index 4d400d32844a..bdf3b16c4a91 100644
--- a/pkgs/development/ocaml-modules/sha/default.nix
+++ b/pkgs/development/ocaml-modules/sha/default.nix
@@ -2,12 +2,12 @@
 
 buildDunePackage rec {
   pname = "sha";
-  version = "1.15.2";
+  version = "1.15.4";
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz";
-    hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c=";
+    url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    hash = "sha256-beWxITmxmZzp30zHiloxiGwqVHydRIvyhT+LU7zx8bE=";
   };
 
   propagatedBuildInputs = [

From c322b3ea376d0c46014b87b20716134bc3845bc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 05:58:05 +0000
Subject: [PATCH 117/191] python310Packages.insteon-frontend-home-assistant:
 0.3.1 -> 0.3.2

---
 .../insteon-frontend-home-assistant/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
index 4875e94c75f5..6303ec76fe05 100644
--- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
+++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "insteon-frontend-home-assistant";
-  version = "0.3.1";
+  version = "0.3.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gS2jDjgAcY4ve80yOPZcZR1v4c9EISYEoJkIezUQilU=";
+    hash = "sha256-7jRf6fp+5u6qqR5xP1R+kp6LURsBVqfct6yuCkbxBMw=";
   };
 
   nativeBuildInputs = [

From 25aa98a67a2a2c8d2cb13c50b62825dd0e2738bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:12:41 +0100
Subject: [PATCH 118/191] python310Packages.azure-mgmt-containerregistry:
 disable on unsupported Python releases

---
 .../azure-mgmt-containerregistry/default.nix          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 433635b29e41..2d312ba3e7a5 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
 , azure-common
 , azure-mgmt-core
 , msrest
@@ -6,9 +9,11 @@
 }:
 
 buildPythonPackage rec {
-  version = "10.1.0";
   pname = "azure-mgmt-containerregistry";
-  disabled = isPy27;
+  version = "10.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;

From ec0589328603824881ff25181ac749c35709d9b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:15:02 +0100
Subject: [PATCH 119/191] python310Packages.azure-mgmt-containerregistry:
 adjust inputs

---
 .../azure-mgmt-containerregistry/default.nix    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 2d312ba3e7a5..f75b262df3a0 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -5,7 +5,7 @@
 , azure-common
 , azure-mgmt-core
 , msrest
-, msrestazure
+, typing-extensions
 }:
 
 buildPythonPackage rec {
@@ -17,16 +17,25 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
+    hash = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ azure-common azure-mgmt-core msrest msrestazure ];
+  propagatedBuildInputs = [
+    azure-common
+    azure-mgmt-core
+    msrest
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
+  ];
 
   # no tests included
   doCheck = false;
 
-  pythonImportsCheck = [ "azure.common" "azure.mgmt.containerregistry" ];
+  pythonImportsCheck = [
+    "azure.common"
+    "azure.mgmt.containerregistry"
+  ];
 
   meta = with lib; {
     description = "Microsoft Azure Container Registry Client Library for Python";

From 8ee504eb7f7f2fcb08a4c8d8448a227911e9ad2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:17:56 +0100
Subject: [PATCH 120/191] pythonPackages.lektor: add changelog to meta

---
 pkgs/development/python-modules/lektor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index 875aa4881a30..1a3ad1b7f268 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -93,6 +93,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A static content management system";
     homepage = "https://www.getlektor.com/";
+    changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md";
     license = licenses.bsd0;
     maintainers = with maintainers; [ costrouc ];
   };

From eb2c7357bc4d11c44ff02bf164471b4a4a93ac0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:19:38 +0100
Subject: [PATCH 121/191] python310Packages.types-colorama: 0.4.15.7 ->
 0.4.15.8

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

diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix
index 0a059b252b52..19190404a6b6 100644
--- a/pkgs/development/python-modules/types-colorama/default.nix
+++ b/pkgs/development/python-modules/types-colorama/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-colorama";
-  version = "0.4.15.7";
+  version = "0.4.15.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2oToq+lcLhGtKyi6VXq45dyAhjvW+HOefBkWyVB1WvQ=";
+    hash = "sha256-xrskWqhox914w7Fr1ISEzTZhJ9YeTvoVZ26sI6zYK3Y=";
   };
 
   # Module has no tests

From 8533d0146b0d3a02a5c1c6dd706e5b52ce1680ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:20:16 +0100
Subject: [PATCH 122/191] python310Packages.types-decorator: 5.1.8.2 -> 5.1.8.3

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

diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix
index 44389574ce5a..fb046be652ec 100644
--- a/pkgs/development/python-modules/types-decorator/default.nix
+++ b/pkgs/development/python-modules/types-decorator/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-decorator";
-  version = "5.1.8.2";
+  version = "5.1.8.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc=";
+    sha256 = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI=";
   };
 
   # Modules doesn't have tests

From a473344de88bd61b27a18ce57699cba238dda2b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:20:52 +0100
Subject: [PATCH 123/191] python310Packages.types-pytz: 2022.7.1.0 ->
 2022.7.1.1

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

diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index 5968bb38f2e3..41b5baabd7fe 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-pytz";
-  version = "2022.7.1.0";
+  version = "2022.7.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-kY+cPnqVC6fn1vhLGKfKyryIhstxJfsZJ/8cdStLWd4=";
+    sha256 = "sha256-WAELsdb3unKE+6Jks7ycJICrWGIB4lEo7Sqt6kwpizM=";
   };
 
   # Modules doesn't have tests

From d84b42730379bf1acea0f4d7c615816c14dc3a51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:21:16 +0100
Subject: [PATCH 124/191] python310Packages.types-retry: 0.9.9.1 -> 0.9.9.2

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

diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix
index 29652179d2f1..e0953ad7790d 100644
--- a/pkgs/development/python-modules/types-retry/default.nix
+++ b/pkgs/development/python-modules/types-retry/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-retry";
-  version = "0.9.9.1";
+  version = "0.9.9.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NE6tQ4fg6YxtYDdYwTGO5OWwRCnOy5o0Khz4c947UQ0=";
+    hash = "sha256-VEgdUj/nvMXWujndTyBT5XUjoVoW4xK3yP6b5H/EVdU=";
   };
 
   # Modules doesn't have tests

From 589aab59ad86e9f06e52f4fd962fad4a75936830 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:21:45 +0100
Subject: [PATCH 125/191] python310Packages.types-requests: 2.28.11.13 ->
 2.28.11.14

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

diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index a3b6c33d9de3..4268affa9ebe 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.28.11.13";
+  version = "2.28.11.14";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-P9MyhC6HWepffrd4nfiqdyuhVSFszxDvSqOw5bQuG0Y=";
+    sha256 = "sha256-IyeShwtgrbB9IxdUUatOYZACGwxYTt8FLZLZuZMRjwY=";
   };
 
   propagatedBuildInputs = [

From eb4095bc773879e9e0108d73e2085ee764df0bb9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:22:18 +0100
Subject: [PATCH 126/191] python310Packages.types-urllib3: 1.26.25.6 ->
 1.26.25.7

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

diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix
index e60c8a87c676..9e3c4efbab02 100644
--- a/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/pkgs/development/python-modules/types-urllib3/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-urllib3";
-  version = "1.26.25.6";
+  version = "1.26.25.7";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NVhnJ8vXdRrMzywPNKiLr/wJL0NatiRY8Qd2RmWQ8tU=";
+    hash = "sha256-300+VHK/iDC9dOrBLVbmWfiGYroEDH0Qa/OlvuJv/yg=";
   };
 
   # Module doesn't have tests

From 4e64560bfce4e251b4057df5c8a3dacf8699ba80 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:22:53 +0100
Subject: [PATCH 127/191] python310Packages.types-docutils: 0.19.1.4 ->
 0.19.1.5

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

diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix
index a2ca0732797a..409fced16937 100644
--- a/pkgs/development/python-modules/types-docutils/default.nix
+++ b/pkgs/development/python-modules/types-docutils/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-docutils";
-  version = "0.19.1.4";
+  version = "0.19.1.5";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-G2SyG2Cf8fx3kdPZMPFLVrNq0JAp/ZfkXjTMiJ1nG18=";
+    hash = "sha256-uLSJwqDR3T5lu9i0HgX2vxMHVTUV3NowGX1j0bV2pe4=";
   };
 
   # Module doesn't have tests

From 7c6ff50784738e7d42deedefdcca18bf29802bd7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:23:15 +0100
Subject: [PATCH 128/191] python310Packages.types-python-dateutil: 2.8.19.7 ->
 2.8.19.8

---
 .../python-modules/types-python-dateutil/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix
index 81f56cd8040a..27778bfaa712 100644
--- a/pkgs/development/python-modules/types-python-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-python-dateutil/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-python-dateutil";
-  version = "2.8.19.7";
+  version = "2.8.19.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg=";
+    hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY=";
   };
 
   # Modules doesn't have tests

From 94d5d2635ba90a37543239c0bfb069d29a44fc02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:42:28 +0100
Subject: [PATCH 129/191] python310Packages.weconnect: 0.52.0 -> 0.54.0

Diff: https://github.com/tillsteinbach/WeConnect-python/compare/refs/tags/v0.52.0...v0.54.0

Changelog: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.54.0
---
 pkgs/development/python-modules/weconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index 7a8c691a8011..998ae3cf0d6b 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.52.0";
+  version = "0.54.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SfdN/em4NrzNeItcaVuyOcUxmE50n5/jjmY4I5hfpQI=";
+    hash = "sha256-mCUaaWR8jRqm8V8ZQBMgycExkN2zjoJxWIEohVH2K/o=";
   };
 
   propagatedBuildInputs = [

From 55cde64d040aab6d9c8d35cf7bacfd615f6b4cd8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:48:10 +0100
Subject: [PATCH 130/191] python310Packages.ascii-magic: add changelog to meta

---
 pkgs/development/python-modules/ascii-magic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix
index 6a1b617c03ed..821f40440567 100644
--- a/pkgs/development/python-modules/ascii-magic/default.nix
+++ b/pkgs/development/python-modules/ascii-magic/default.nix
@@ -30,6 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to converts pictures into ASCII art";
     homepage = "https://github.com/LeandroBarone/python-ascii_magic";
+    changelog = "https://github.com/LeandroBarone/python-ascii_magic#changelog";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From e96a80e560109342c2ef8b39329e1c867ba41e1b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:51:17 +0100
Subject: [PATCH 131/191] python310Packages.ascii-magic: 1.6 -> 2.1.1

Changelog: https://github.com/LeandroBarone/python-ascii_magic#changelog
---
 pkgs/development/python-modules/ascii-magic/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix
index 821f40440567..d509e0ef4624 100644
--- a/pkgs/development/python-modules/ascii-magic/default.nix
+++ b/pkgs/development/python-modules/ascii-magic/default.nix
@@ -3,16 +3,20 @@
 , colorama
 , fetchPypi
 , pillow
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "ascii-magic";
-  version = "1.6";
+  version = "2.1.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "ascii_magic";
     inherit version;
-    sha256 = "sha256-faVRj3No5z8R4hUaDAYIBKoUniZ7Npt+52U/vXsEalE=";
+    hash = "sha256-YfGa+3nuqAAo69TydxO6uKNMcqZAkOEi/PMP8Frasfw=";
   };
 
   propagatedBuildInputs = [
@@ -21,6 +25,7 @@ buildPythonPackage rec {
   ];
 
   # Project is not tagging releases and tests are not shipped with PyPI source
+  # https://github.com/LeandroBarone/python-ascii_magic/issues/10
   doCheck = false;
 
   pythonImportsCheck = [

From 3644d1e0aa851beb5330eb0398849cdecd7c5948 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 08:51:50 +0100
Subject: [PATCH 132/191] python310Packages.weconnect-mqtt: 0.42.0 -> 0.42.1

Diff: https://github.com/tillsteinbach/WeConnect-mqtt/compare/refs/tags/v0.42.0...v0.42.1

Changelog: https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v0.42.1
---
 pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 7e7517980151..efdf7cb84467 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect-mqtt";
-  version = "0.42.0";
+  version = "0.42.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jxfV2RDyGLugnPae+uNtg/GBsWbKCSbKxuHll10guhU=";
+    hash = "sha256-/YCrnDOJdKc687pRKj1gVTOTj7dEpplN49VuFJOlQIE=";
   };
 
   propagatedBuildInputs = [

From 6f6d61df2bb2a6667f8ec9c703f34bb3441a9b1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 01:16:44 +0000
Subject: [PATCH 133/191] rabbitmq-server: 3.11.8 -> 3.11.9

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index a1cd2719f848..c69fcd641824 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -38,12 +38,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
-  version = "3.11.8";
+  version = "3.11.9";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-sD9E60xXNJQSg98XbMq6xn+nk3uQn1XnrxApAuSaF44=";
+    hash = "sha256-b/SfUyn+x33SnFo/n/zTLxG4PWz34F2qQs4B4p2/Ty4=";
   };
 
   nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];

From beddcca93f45929dfafb5891148937a7dbf1926d Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 18 Feb 2023 21:44:54 +0200
Subject: [PATCH 134/191] keepassxc: fix build on darwin

---
 pkgs/applications/misc/keepassx/community.nix | 5 +++--
 pkgs/top-level/all-packages.nix               | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index bf386c116d48..fd37735c64ce 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , cmake
 , qttools
-, darwin
 
 , asciidoctor
 , botan2
@@ -25,6 +24,8 @@
 , wrapQtAppsHook
 , zlib
 
+, LocalAuthentication
+
 , withKeePassBrowser ? true
 , withKeePassFDOSecrets ? true
 , withKeePassKeeShare ? true
@@ -110,7 +111,7 @@ stdenv.mkDerivation rec {
     readline
     zlib
   ]
-  ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication
+  ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication
   ++ lib.optional stdenv.isDarwin qtmacextras
   ++ lib.optional stdenv.isLinux libusb1
   ++ lib.optional withKeePassX11 qtx11extras;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f7c591eae2b..98c9a3017875 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29285,7 +29285,10 @@ with pkgs;
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };
+  keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix {
+    inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+  };
 
   keepass-diff = callPackage ../applications/misc/keepass-diff { };
 

From 4c164bc42d56b3932a2a6982c0e92921485fdc16 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 20 Feb 2023 19:38:39 +0200
Subject: [PATCH 135/191] keepassxc: fix test timeout

The test was failing because it was timing out. Turns out it was waiting
for `foo.kdbx`, which couldn't be "seen" even if it actually existed
(probably some contrast issues with the theme and OCR couldn't find it).
Fixed it by delegating the check to the next screen, where the full path
to the file is displayed in a bigger size. The test seems to pass.
---
 nixos/tests/keepassxc.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix
index debb469032a6..a4f452412cdf 100644
--- a/nixos/tests/keepassxc.nix
+++ b/nixos/tests/keepassxc.nix
@@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
   name = "keepassxc";
   meta = with pkgs.lib.maintainers; {
     maintainers = [ turion ];
+    timeout = 1800;
   };
 
   nodes.machine = { ... }:
@@ -55,9 +56,12 @@ import ./make-test-python.nix ({ pkgs, ...} :
         machine.sleep(5)
         # Regression #163482: keepassxc did not crash
         machine.succeed("ps -e | grep keepassxc")
-        machine.wait_for_text("foo.kdbx")
+        machine.wait_for_text("Open database")
         machine.send_key("ret")
-        machine.sleep(1)
+
+        # Wait for the enter password screen to appear.
+        machine.wait_for_text("/home/alice/foo.kdbx")
+
         # Click on "Browse" button to select keyfile
         machine.send_key("tab")
         machine.send_chars("/home/alice/foo.keyfile")

From d3f8d98df7e2afb5f264a46f526cf21db0b22b58 Mon Sep 17 00:00:00 2001
From: Etienne Laurin <etienne@atnnn.com>
Date: Tue, 21 Feb 2023 01:35:54 -0700
Subject: [PATCH 136/191] 7zz: cross-compile for mingw

---
 pkgs/tools/archivers/7zz/default.nix | 44 ++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index 150230f775a4..841d2acc2017 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -56,8 +56,45 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-build-on-darwin.patch ];
   patchFlags = [ "-p0" ];
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
+    find . \( -iname '*.cpp' -o -iname '*.h' -o -iname '*.c' -o -iname '*.rc' \) -print0 \
+      | xargs -0 sed -i '
+        s/<Windows.h>/<windows.h>/
+        s/<WinIoCtl.h>/<winioctl.h>/
+        s/<ShlObj.h>/<shlobj.h>/
+        s/<CommCtrl.h>/<commctrl.h>/
+        s/<Shlwapi.h>/<shlwapi.h>/
+        s/<ShObjIdl.h>/<shobjidl.h>/
+        s/<Psapi.h>/<psapi.h>/
+        s/<WindowsX.h>/<windowsx.h>/
+        s/<WinBase.h>/<winbase.h>/
+        s/<TlHelp32.h>/<tlhelp32.h>/
+        s/<PrSht.h>/<prsht.h>/
+        s/<OleCtl.h>/<olectl.h>/
+        s/<NTSecAPI.h>/<ntsecapi.h>/
+        s/<MAPI.h>/<mapi.h>/
+        s/<InitGuid.h>/<initguid.h>/
+        s/<HtmlHelp.h>/<htmlhelp.h>/
+        s/<WinVer.h>/<winver.h>/
+        /#include/ s|\\|/|g
+      '
+    find . -iname '*mak*' -print0 \
+      | xargs -0 sed -i '
+        s/-lUser32/-luser32/g
+        s/-lOle32/-lole32/g
+        s/-lGdi32/-lgdi32/g
+        s/-lComctl32/-lcomctl32/g
+        s/-lComdlg32/-lcomdlg32/g
+      '
+    substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
+      --replace windres.exe ${stdenv.cc.targetPrefix}windres
+  '';
+
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
     "-Wno-deprecated-copy-dtor"
+  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
+    "-Wno-conversion"
+    "-Wno-unused-macros"
   ];
 
   inherit makefile;
@@ -73,7 +110,8 @@ stdenv.mkDerivation rec {
     # aarch64-darwin so we don't need additional changes for it
     ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ]
     # it's the compression code with the restriction, see DOC/License.txt
-    ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ];
+    ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]
+    ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "IS_MINGW=1" "MSYSTEM=1" ];
 
   nativeBuildInputs = lib.optionals useUasm [ uasm ];
 
@@ -84,7 +122,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm555 -t $out/bin b/*/7zz
+    install -Dm555 -t $out/bin b/*/7zz${stdenv.hostPlatform.extensions.executable}
     install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt
 
     runHook postInstall
@@ -109,7 +147,7 @@ stdenv.mkDerivation rec {
       # the unRAR compression code is disabled by default
       lib.optionals enableUnfree [ unfree ];
     maintainers = with maintainers; [ anna328p peterhoeg jk ];
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
     mainProgram = "7zz";
   };
 }

From 4b366751ed3e399d217dcba117ad0f6b7ea3104d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 09:54:42 +0100
Subject: [PATCH 137/191] python310Packages.whodap: 0.1.7 -> 0.1.8

Diff: pogzyb/whodap@refs/tags/v0.1.7...v0.1.8

Changelog: https://github.com/pogzyb/whodap/releases/tag/v0.1.8
---
 pkgs/development/python-modules/whodap/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index 8dd65d11911e..c4b207962987 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -1,7 +1,7 @@
 { lib
-, asynctest
 , buildPythonPackage
 , fetchFromGitHub
+, pytest-asyncio
 , pytestCheckHook
 , pythonOlder
 , httpx
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "whodap";
-  version = "0.1.7";
+  version = "0.1.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "pogzyb";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Aji8OqdcVOHB4TOv4W6x1qIGaJvoDmLGpr/PFz5mZ4w=";
+    hash = "sha256-hAU9143R/LDqDBgX3Y+gBG+dt4dpIIPDdO6HgH0ZTfg=";
   };
 
   propagatedBuildInputs = [
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    asynctest
+    pytest-asyncio
     pytestCheckHook
   ];
 

From 1f64c9ca16c089e28df3cddc9ba795dd2016fcbf Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 21 Feb 2023 08:01:48 +0000
Subject: [PATCH 138/191] =?UTF-8?q?epiphany:=2043.0=20=E2=86=92=2043.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/epiphany/-/compare/43.0...43.1

- Hide bookmark star in application mode.
- Fix type error when displaying about:overview empty state.
- Fix thumbnails when loading about:overview from session state.
- Properly %-encode URLs copied from address bar.
- Fix minor memory leaks.
- Fix double free when file monitor for user JavaScript fails.
- Don't autofill passwords in sandboxed contexts (CVE-2023-26081).
- Updated translations.
---
 pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix
index 2a7c0323e091..8b5f935f4914 100644
--- a/pkgs/desktops/gnome/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome/core/epiphany/default.nix
@@ -38,11 +38,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "43.0";
+  version = "43.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "tm1Jn57nJpbYPPhEElN3GBqVRVSkuzeFtzKTOArAwic=";
+    sha256 = "6G6tJ8uZgoFRUGZN478g+vN193uAZbArMRgMZba767Q=";
   };
 
   patches = lib.optionals withPantheon [

From ea73f76025c5cdf5a541138a7db6b83e4177f64d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 21 Feb 2023 09:21:46 +0000
Subject: [PATCH 139/191] =?UTF-8?q?gnome-firmware:=2043.1=20=E2=86=92=2043?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gnome-firmware/-/compare/43.1...43.2
---
 pkgs/applications/misc/gnome-firmware/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix
index 6d46727d5ab0..c1cd58a50e47 100644
--- a/pkgs/applications/misc/gnome-firmware/default.nix
+++ b/pkgs/applications/misc/gnome-firmware/default.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-firmware";
-  version = "43.1";
+  version = "43.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
     rev = version;
-    sha256 = "9QS6X1Cm9/wToQ8hnGNn3VytSCpZI8StZ3+vf0/wbAw=";
+    sha256 = "oplypNSj028cVBn+eJxNm5pJltp7Cw5Oto/L39pI0vA=";
   };
 
   nativeBuildInputs = [

From 3de008ce1802170c35486297b37294f52b305544 Mon Sep 17 00:00:00 2001
From: Karl Fischer <fishi0x01@gmail.com>
Date: Tue, 21 Feb 2023 10:06:47 +0100
Subject: [PATCH 140/191]  vsh: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix
index 78cf177b3dec..c7f65527e081 100644
--- a/pkgs/tools/misc/vsh/default.nix
+++ b/pkgs/tools/misc/vsh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vsh";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "fishi0x01";
     repo = "vsh";
     rev = "v${version}";
-    sha256 = "0skd16j969mb2kgq503wskaw8clyhkw135ny2nsqv5j2zjpr71ap";
+    sha256 = "13qa9r7kij6aqhackzmsn38vyhmajgmhflnrd9rarfhhyg6ldv4z";
   };
 
   # vendor directory is part of repository

From bad7f1f19e1b0588798a71d57ac18238fb67946c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 09:37:56 +0000
Subject: [PATCH 141/191] andika: 6.101 -> 6.200

---
 pkgs/data/fonts/andika/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix
index 92757d303cec..22900b4b7fcd 100644
--- a/pkgs/data/fonts/andika/default.nix
+++ b/pkgs/data/fonts/andika/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "andika";
-  version = "6.101";
+  version = "6.200";
 
   src = fetchzip {
     url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip";
-    hash = "sha256-LghkGd/cjuXghzsU9X/YneNIdBeDEnu0ARszipANm8w=";
+    hash = "sha256-Ge+Yq3+1IJ+mXhjw7Vtpu5DIWiMfwOdEH/S1RSzYh3A=";
   };
 
   installPhase = ''

From cf07dcc1368d0905d3bb2e3c6e4cecce9dd1d17e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 10:06:27 +0000
Subject: [PATCH 142/191] glooctl: 1.13.6 -> 1.13.7

---
 pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
index 6c71c903bf37..499bfca4a628 100644
--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.13.6";
+  version = "1.13.7";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-CBWKKW5VIkRgl7wY63OCm/CowWHO389se3kEraqaDCI=";
+    hash = "sha256-npp03e5pAir8t9Ej52fafW7Uk24Y+UOFojaNc2MSkVA=";
   };
 
   subPackages = [ "projects/gloo/cli/cmd" ];

From 045e8b36db28f747f1506293825a20a8ef007f71 Mon Sep 17 00:00:00 2001
From: Etienne Laurin <etienne@atnnn.com>
Date: Tue, 21 Feb 2023 03:21:21 -0700
Subject: [PATCH 143/191] 7zz: convert mingw script to patch

---
 pkgs/tools/archivers/7zz/default.nix          |  34 +-
 .../archivers/7zz/fix-cross-mingw-build.patch | 659 ++++++++++++++++++
 2 files changed, 663 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch

diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index 841d2acc2017..9685a3d75824 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -53,39 +53,13 @@ stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  patches = [ ./fix-build-on-darwin.patch ];
+  patches = [
+    ./fix-build-on-darwin.patch
+    ./fix-cross-mingw-build.patch
+  ];
   patchFlags = [ "-p0" ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
-    find . \( -iname '*.cpp' -o -iname '*.h' -o -iname '*.c' -o -iname '*.rc' \) -print0 \
-      | xargs -0 sed -i '
-        s/<Windows.h>/<windows.h>/
-        s/<WinIoCtl.h>/<winioctl.h>/
-        s/<ShlObj.h>/<shlobj.h>/
-        s/<CommCtrl.h>/<commctrl.h>/
-        s/<Shlwapi.h>/<shlwapi.h>/
-        s/<ShObjIdl.h>/<shobjidl.h>/
-        s/<Psapi.h>/<psapi.h>/
-        s/<WindowsX.h>/<windowsx.h>/
-        s/<WinBase.h>/<winbase.h>/
-        s/<TlHelp32.h>/<tlhelp32.h>/
-        s/<PrSht.h>/<prsht.h>/
-        s/<OleCtl.h>/<olectl.h>/
-        s/<NTSecAPI.h>/<ntsecapi.h>/
-        s/<MAPI.h>/<mapi.h>/
-        s/<InitGuid.h>/<initguid.h>/
-        s/<HtmlHelp.h>/<htmlhelp.h>/
-        s/<WinVer.h>/<winver.h>/
-        /#include/ s|\\|/|g
-      '
-    find . -iname '*mak*' -print0 \
-      | xargs -0 sed -i '
-        s/-lUser32/-luser32/g
-        s/-lOle32/-lole32/g
-        s/-lGdi32/-lgdi32/g
-        s/-lComctl32/-lcomctl32/g
-        s/-lComdlg32/-lcomdlg32/g
-      '
     substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
       --replace windres.exe ${stdenv.cc.targetPrefix}windres
   '';
diff --git a/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch
new file mode 100644
index 000000000000..59608b52b793
--- /dev/null
+++ b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch
@@ -0,0 +1,659 @@
+diff --git C/7zVersion.rc C/7zVersion.rc
+index 6ed26de7445..675e9bb0321 100755
+--- C/7zVersion.rc
++++ C/7zVersion.rc
+@@ -5,7 +5,7 @@
+ #define MY_VFT_APP  0x00000001L
+ #define MY_VFT_DLL  0x00000002L
+ 
+-// #include <WinVer.h>
++// #include <winver.h>
+ 
+ #ifndef MY_VERSION
+ #include "7zVersion.h"
+diff --git C/7zip_gcc_c.mak C/7zip_gcc_c.mak
+index d41810478db..43cdd51271e 100755
+--- C/7zip_gcc_c.mak
++++ C/7zip_gcc_c.mak
+@@ -93,7 +93,7 @@ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
+ endif
+ 
+ 
+-LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32
++LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32
+ 
+ CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
+ # -Wno-delete-non-virtual-dtor
+diff --git C/Alloc.c C/Alloc.c
+index 142a1ea2219..0d0107c56f4 100755
+--- C/Alloc.c
++++ C/Alloc.c
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
+ 
+ #ifdef _WIN32
+-#include <Windows.h>
++#include <windows.h>
+ #endif
+ #include <stdlib.h>
+ 
+diff --git C/CpuArch.c C/CpuArch.c
+index a0e93e8b08e..36e0be0b1c8 100755
+--- C/CpuArch.c
++++ C/CpuArch.c
+@@ -217,7 +217,7 @@ BoolInt CPU_Is_InOrder()
+ }
+ 
+ #if !defined(MY_CPU_AMD64) && defined(_WIN32)
+-#include <Windows.h>
++#include <windows.h>
+ static BoolInt CPU_Sys_Is_SSE_Supported()
+ {
+   OSVERSIONINFO vi;
+@@ -275,7 +275,7 @@ BoolInt CPU_IsSupported_SHA()
+ // #include <stdio.h>
+ 
+ #ifdef _WIN32
+-#include <Windows.h>
++#include <windows.h>
+ #endif
+ 
+ BoolInt CPU_IsSupported_AVX2()
+@@ -351,7 +351,7 @@ BoolInt CPU_IsSupported_PageGB()
+ 
+ #ifdef _WIN32
+ 
+-#include <Windows.h>
++#include <windows.h>
+ 
+ BoolInt CPU_IsSupported_CRC32()  { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
+ BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
+diff --git C/DllSecur.c C/DllSecur.c
+index a37c1b3e2c5..16755bba930 100755
+--- C/DllSecur.c
++++ C/DllSecur.c
+@@ -5,7 +5,7 @@
+ 
+ #ifdef _WIN32
+ 
+-#include <Windows.h>
++#include <windows.h>
+ 
+ #include "DllSecur.h"
+ 
+diff --git C/Threads.h C/Threads.h
+index e9493afff62..71972558d48 100755
+--- C/Threads.h
++++ C/Threads.h
+@@ -5,7 +5,7 @@
+ #define __7Z_THREADS_H
+ 
+ #ifdef _WIN32
+-#include <Windows.h>
++#include <windows.h>
+ #else
+ 
+ #if defined(__linux__)
+diff --git C/Util/7zipInstall/7zipInstall.c C/Util/7zipInstall/7zipInstall.c
+index 2c498bb4392..d791bc4181c 100755
+--- C/Util/7zipInstall/7zipInstall.c
++++ C/Util/7zipInstall/7zipInstall.c
+@@ -10,7 +10,7 @@
+ #endif
+ 
+ #include <windows.h>
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../../7z.h"
+ #include "../../7zAlloc.h"
+diff --git C/Util/7zipInstall/resource.rc C/Util/7zipInstall/resource.rc
+index 4d6a91feda1..c19f601f69f 100755
+--- C/Util/7zipInstall/resource.rc
++++ C/Util/7zipInstall/resource.rc
+@@ -1,6 +1,6 @@
+ #include <winnt.h>
+ #include <WinUser.h>
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #define USE_COPYRIGHT_CR
+ #include "../../7zVersion.rc"
+diff --git C/Util/7zipUninstall/7zipUninstall.c C/Util/7zipUninstall/7zipUninstall.c
+index 89cd764dbe9..32ece1c6c14 100755
+--- C/Util/7zipUninstall/7zipUninstall.c
++++ C/Util/7zipUninstall/7zipUninstall.c
+@@ -11,7 +11,7 @@
+ // #define SZ_ERROR_ABORT 100
+ 
+ #include <windows.h>
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../../7zVersion.h"
+ 
+diff --git C/Util/7zipUninstall/resource.rc C/Util/7zipUninstall/resource.rc
+index 506e0665cdd..ae1dfedc83b 100755
+--- C/Util/7zipUninstall/resource.rc
++++ C/Util/7zipUninstall/resource.rc
+@@ -1,6 +1,6 @@
+ #include <winnt.h>
+ #include <WinUser.h>
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #define USE_COPYRIGHT_CR
+ #include "../../7zVersion.rc"
+diff --git CPP/7zip/7zip_gcc.mak CPP/7zip/7zip_gcc.mak
+index 2a24e06aa1f..fb32b933201 100755
+--- CPP/7zip/7zip_gcc.mak
++++ CPP/7zip/7zip_gcc.mak
+@@ -113,8 +113,8 @@ MY_MKDIR=mkdir
+ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
+ endif
+ 
+-LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 $(LIB_HTMLHELP)
+-LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI)
++LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 $(LIB_HTMLHELP)
++LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI)
+ 
+ CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
+ # -Wno-delete-non-virtual-dtor
+diff --git CPP/7zip/Bundles/Fm/StdAfx.h CPP/7zip/Bundles/Fm/StdAfx.h
+index c15e07939da..d1e094cc339 100755
+--- CPP/7zip/Bundles/Fm/StdAfx.h
++++ CPP/7zip/Bundles/Fm/StdAfx.h
+@@ -9,8 +9,8 @@
+ 
+ #include "../../../Common/Common.h"
+ 
+-#include <CommCtrl.h>
+-#include <ShlObj.h>
+-#include <Shlwapi.h>
++#include <commctrl.h>
++#include <shlobj.h>
++#include <shlwapi.h>
+ 
+ #endif
+diff --git CPP/7zip/Bundles/SFXWin/SfxWin.cpp CPP/7zip/Bundles/SFXWin/SfxWin.cpp
+index cf3bad389a0..260484c11e4 100755
+--- CPP/7zip/Bundles/SFXWin/SfxWin.cpp
++++ CPP/7zip/Bundles/SFXWin/SfxWin.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <Shlwapi.h>
++#include <shlwapi.h>
+ 
+ #include "../../../Common/MyInitGuid.h"
+ 
+diff --git CPP/7zip/Bundles/SFXWin/StdAfx.h CPP/7zip/Bundles/SFXWin/StdAfx.h
+index f263ecb77c5..e96640e995c 100755
+--- CPP/7zip/Bundles/SFXWin/StdAfx.h
++++ CPP/7zip/Bundles/SFXWin/StdAfx.h
+@@ -6,7 +6,7 @@
+ #include "../../../Common/Common.h"
+ 
+ #include <commctrl.h>
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ // #define printf(x) NO_PRINTF_(x)
+ // #define sprintf(x) NO_SPRINTF_(x)
+diff --git CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/RandGen.cpp
+index c123109a15b..c3709ccff6b 100755
+--- CPP/7zip/Crypto/RandGen.cpp
++++ CPP/7zip/Crypto/RandGen.cpp
+@@ -19,7 +19,7 @@
+ 
+ #ifdef USE_STATIC_RtlGenRandom
+ 
+-// #include <NTSecAPI.h>
++// #include <ntsecapi.h>
+ 
+ EXTERN_C_BEGIN
+ #ifndef RtlGenRandom
+diff --git CPP/7zip/GuiCommon.rc CPP/7zip/GuiCommon.rc
+index 565ee702ef9..13043ef4c53 100755
+--- CPP/7zip/GuiCommon.rc
++++ CPP/7zip/GuiCommon.rc
+@@ -4,7 +4,7 @@
+ // #include <WinUser.h>
+ 
+ // for Windows CE:
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ 
+ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+diff --git CPP/7zip/MyVersionInfo.rc CPP/7zip/MyVersionInfo.rc
+index eddf8935c84..90e65376be8 100755
+--- CPP/7zip/MyVersionInfo.rc
++++ CPP/7zip/MyVersionInfo.rc
+@@ -1,2 +1,2 @@
+ #include "MyVersion.h"
+-#include "..\..\C\7zVersion.rc"
++#include "../../C/7zVersion.rc"
+diff --git CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/Update.cpp
+index 5490ff445a0..003ee6634ea 100755
+--- CPP/7zip/UI/Common/Update.cpp
++++ CPP/7zip/UI/Common/Update.cpp
+@@ -1163,7 +1163,7 @@ static HRESULT EnumerateInArchiveItems(
+ 
+ #if defined(_WIN32) && !defined(UNDER_CE)
+ 
+-#include <MAPI.h>
++#include <mapi.h>
+ 
+ #endif
+ 
+diff --git CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/Main.cpp
+index 363572cd3dd..765f55293a7 100755
+--- CPP/7zip/UI/Console/Main.cpp
++++ CPP/7zip/UI/Console/Main.cpp
+@@ -5,7 +5,7 @@
+ #include "../../../Common/MyWindows.h"
+ 
+ #ifdef _WIN32
+-#include <Psapi.h>
++#include <psapi.h>
+ #else
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+diff --git CPP/7zip/UI/Explorer/ContextMenu.h CPP/7zip/UI/Explorer/ContextMenu.h
+index e60ffccf11b..aea34e7de07 100755
+--- CPP/7zip/UI/Explorer/ContextMenu.h
++++ CPP/7zip/UI/Explorer/ContextMenu.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "MyExplorerCommand.h"
+ 
+diff --git CPP/7zip/UI/Explorer/DllExportsExplorer.cpp CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
+index 84c92e2e2d3..df126d8d232 100755
+--- CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
++++ CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
+@@ -11,7 +11,7 @@
+ #include "../../../Common/MyWindows.h"
+ // #include "../../../Common/IntToString.h"
+ 
+-#include <OleCtl.h>
++#include <olectl.h>
+ 
+ #include "../../../Common/MyInitGuid.h"
+ 
+diff --git CPP/7zip/UI/Explorer/MyExplorerCommand.h CPP/7zip/UI/Explorer/MyExplorerCommand.h
+index b1997f0da6e..d1d038df11b 100755
+--- CPP/7zip/UI/Explorer/MyExplorerCommand.h
++++ CPP/7zip/UI/Explorer/MyExplorerCommand.h
+@@ -17,7 +17,7 @@
+     ShObjIdl.h      : old Windows SDK
+     ShObjIdl_core.h : new Windows 10 SDK */
+ 
+-#include <ShObjIdl.h>
++#include <shobjidl.h>
+ 
+ #ifndef __IShellItem_INTERFACE_DEFINED__
+ #define __IShellItem_INTERFACE_DEFINED__
+diff --git CPP/7zip/UI/Explorer/StdAfx.h CPP/7zip/UI/Explorer/StdAfx.h
+index 35e8b337d68..16883ceda1b 100755
+--- CPP/7zip/UI/Explorer/StdAfx.h
++++ CPP/7zip/UI/Explorer/StdAfx.h
+@@ -9,6 +9,6 @@
+ 
+ #include "../../../Common/Common.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #endif
+diff --git CPP/7zip/UI/FileManager/BrowseDialog.cpp CPP/7zip/UI/FileManager/BrowseDialog.cpp
+index e43172385b6..286faeeb660 100755
+--- CPP/7zip/UI/FileManager/BrowseDialog.cpp
++++ CPP/7zip/UI/FileManager/BrowseDialog.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #ifndef UNDER_CE
+ #include "../../../Windows/CommonDialog.h"
+diff --git CPP/7zip/UI/FileManager/FM.cpp CPP/7zip/UI/FileManager/FM.cpp
+index b0b3715c9a5..14af8c32288 100755
+--- CPP/7zip/UI/FileManager/FM.cpp
++++ CPP/7zip/UI/FileManager/FM.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <Shlwapi.h>
++#include <shlwapi.h>
+ 
+ #include "../../../../C/Alloc.h"
+ #ifdef _WIN32
+diff --git CPP/7zip/UI/FileManager/FSFolderCopy.cpp CPP/7zip/UI/FileManager/FSFolderCopy.cpp
+index b0e1146816d..16208e58f6b 100755
+--- CPP/7zip/UI/FileManager/FSFolderCopy.cpp
++++ CPP/7zip/UI/FileManager/FSFolderCopy.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <WinBase.h>
++#include <winbase.h>
+ 
+ #include "../../../Common/Defs.h"
+ #include "../../../Common/StringConvert.h"
+diff --git CPP/7zip/UI/FileManager/HelpUtils.cpp CPP/7zip/UI/FileManager/HelpUtils.cpp
+index 94253a70f5c..3f4479dbddd 100755
+--- CPP/7zip/UI/FileManager/HelpUtils.cpp
++++ CPP/7zip/UI/FileManager/HelpUtils.cpp
+@@ -24,7 +24,7 @@ void ShowHelpWindow(LPCSTR)
+ #include "../../../Windows/FileName.h"
+ 
+ #else
+-#include <HtmlHelp.h>
++#include <htmlhelp.h>
+ #endif
+ 
+ #include "../../../Common/StringConvert.h"
+diff --git CPP/7zip/UI/FileManager/MyWindowsNew.h CPP/7zip/UI/FileManager/MyWindowsNew.h
+index c0fe8439b98..ba7d608b90e 100755
+--- CPP/7zip/UI/FileManager/MyWindowsNew.h
++++ CPP/7zip/UI/FileManager/MyWindowsNew.h
+@@ -5,7 +5,7 @@
+ 
+ #ifdef _MSC_VER
+ 
+-#include <ShObjIdl.h>
++#include <shobjidl.h>
+ 
+ #ifndef __ITaskbarList3_INTERFACE_DEFINED__
+ #define __ITaskbarList3_INTERFACE_DEFINED__
+diff --git CPP/7zip/UI/FileManager/Panel.cpp CPP/7zip/UI/FileManager/Panel.cpp
+index f7162e502ac..2eaf9e1266b 100755
+--- CPP/7zip/UI/FileManager/Panel.cpp
++++ CPP/7zip/UI/FileManager/Panel.cpp
+@@ -2,7 +2,7 @@
+ 
+ #include "StdAfx.h"
+ 
+-#include <WindowsX.h>
++#include <windowsx.h>
+ // #include <stdio.h>
+ 
+ #include "../../../Common/IntToString.h"
+diff --git CPP/7zip/UI/FileManager/Panel.h CPP/7zip/UI/FileManager/Panel.h
+index 5a9fef01de2..1f2b86a8e43 100755
+--- CPP/7zip/UI/FileManager/Panel.h
++++ CPP/7zip/UI/FileManager/Panel.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../../../../C/Alloc.h"
+ 
+diff --git CPP/7zip/UI/FileManager/PanelItemOpen.cpp CPP/7zip/UI/FileManager/PanelItemOpen.cpp
+index 6af42c96923..595acdbb563 100755
+--- CPP/7zip/UI/FileManager/PanelItemOpen.cpp
++++ CPP/7zip/UI/FileManager/PanelItemOpen.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <TlHelp32.h>
++#include <tlhelp32.h>
+ 
+ #include "../../../Common/IntToString.h"
+ 
+diff --git CPP/7zip/UI/FileManager/RootFolder.cpp CPP/7zip/UI/FileManager/RootFolder.cpp
+index 6984434026f..d50c1eb832e 100755
+--- CPP/7zip/UI/FileManager/RootFolder.cpp
++++ CPP/7zip/UI/FileManager/RootFolder.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../../../Common/StringConvert.h"
+ 
+diff --git CPP/7zip/UI/FileManager/StdAfx.h CPP/7zip/UI/FileManager/StdAfx.h
+index 74cfbc6deef..88960aa8c58 100755
+--- CPP/7zip/UI/FileManager/StdAfx.h
++++ CPP/7zip/UI/FileManager/StdAfx.h
+@@ -14,8 +14,8 @@
+ 
+ // #include "../../../Common/MyWindows.h"
+ 
+-// #include <CommCtrl.h>
+-// #include <ShlObj.h>
+-// #include <Shlwapi.h>
++// #include <commctrl.h>
++// #include <shlobj.h>
++// #include <shlwapi.h>
+ 
+ #endif
+diff --git CPP/7zip/UI/FileManager/SysIconUtils.cpp CPP/7zip/UI/FileManager/SysIconUtils.cpp
+index 43c613244a8..1cdf1d4c5b3 100755
+--- CPP/7zip/UI/FileManager/SysIconUtils.cpp
++++ CPP/7zip/UI/FileManager/SysIconUtils.cpp
+@@ -10,7 +10,7 @@
+ 
+ #include "SysIconUtils.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #define MY_CAST_FUNC  (void(*)())
+ // #define MY_CAST_FUNC
+diff --git CPP/7zip/UI/FileManager/SysIconUtils.h CPP/7zip/UI/FileManager/SysIconUtils.h
+index ba747d9ded0..2eedc4be403 100755
+--- CPP/7zip/UI/FileManager/SysIconUtils.h
++++ CPP/7zip/UI/FileManager/SysIconUtils.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #include "../../../Common/MyString.h"
+ 
+diff --git CPP/7zip/UI/FileManager/SystemPage.cpp CPP/7zip/UI/FileManager/SystemPage.cpp
+index ff68172e2bf..06025259c85 100755
+--- CPP/7zip/UI/FileManager/SystemPage.cpp
++++ CPP/7zip/UI/FileManager/SystemPage.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../../../Common/Defs.h"
+ #include "../../../Common/StringConvert.h"
+diff --git CPP/7zip/UI/GUI/GUI.cpp CPP/7zip/UI/GUI/GUI.cpp
+index 0cc2ee3afcc..4ffc2384668 100755
+--- CPP/7zip/UI/GUI/GUI.cpp
++++ CPP/7zip/UI/GUI/GUI.cpp
+@@ -8,7 +8,7 @@
+ 
+ #include "../../../Common/MyWindows.h"
+ 
+-#include <Shlwapi.h>
++#include <shlwapi.h>
+ 
+ #include "../../../Common/MyInitGuid.h"
+ 
+diff --git CPP/7zip/UI/GUI/StdAfx.h CPP/7zip/UI/GUI/StdAfx.h
+index 498b2fcbe4b..3c830f6a3d4 100755
+--- CPP/7zip/UI/GUI/StdAfx.h
++++ CPP/7zip/UI/GUI/StdAfx.h
+@@ -11,9 +11,9 @@
+ 
+ // #include "../../../Common/MyWindows.h"
+ 
+-// #include <CommCtrl.h>
+-// #include <ShlObj.h>
+-// #include <Shlwapi.h>
++// #include <commctrl.h>
++// #include <shlobj.h>
++// #include <shlwapi.h>
+ 
+ // #define printf(x) NO_PRINTF_(x)
+ // #define sprintf(x) NO_SPRINTF_(x)
+diff --git CPP/Common/MyInitGuid.h CPP/Common/MyInitGuid.h
+index 6895097371a..6b2f3f35d5a 100755
+--- CPP/Common/MyInitGuid.h
++++ CPP/Common/MyInitGuid.h
+@@ -29,7 +29,7 @@ Also we need IID_IUnknown that is initialized in some file for linking:
+ #include <basetyps.h>
+ #endif
+ 
+-#include <InitGuid.h>
++#include <initguid.h>
+ 
+ #ifdef UNDER_CE
+ DEFINE_GUID(IID_IUnknown,
+diff --git CPP/Common/MyWindows.h CPP/Common/MyWindows.h
+index 69eed8f6446..f48680f9d05 100755
+--- CPP/Common/MyWindows.h
++++ CPP/Common/MyWindows.h
+@@ -5,7 +5,7 @@
+ 
+ #ifdef _WIN32
+ 
+-#include <Windows.h>
++#include <windows.h>
+ 
+ #ifdef UNDER_CE
+   #undef VARIANT_TRUE
+diff --git CPP/Windows/Control/ComboBox.h CPP/Windows/Control/ComboBox.h
+index 8ab9ce5027d..8b12599b785 100755
+--- CPP/Windows/Control/ComboBox.h
++++ CPP/Windows/Control/ComboBox.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../Common/MyWindows.h"
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #include "../Window.h"
+ 
+diff --git CPP/Windows/Control/ImageList.h CPP/Windows/Control/ImageList.h
+index e59443058b8..f72ea0d1990 100755
+--- CPP/Windows/Control/ImageList.h
++++ CPP/Windows/Control/ImageList.h
+@@ -3,7 +3,7 @@
+ #ifndef __WINDOWS_CONTROL_IMAGE_LIST_H
+ #define __WINDOWS_CONTROL_IMAGE_LIST_H
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #include "../Defs.h"
+ 
+diff --git CPP/Windows/Control/ListView.h CPP/Windows/Control/ListView.h
+index 56e1100c726..cbd9cd1e21d 100755
+--- CPP/Windows/Control/ListView.h
++++ CPP/Windows/Control/ListView.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../Common/MyWindows.h"
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #include "../Window.h"
+ 
+diff --git CPP/Windows/Control/ProgressBar.h CPP/Windows/Control/ProgressBar.h
+index 741315dd4dd..f18d89c14f0 100755
+--- CPP/Windows/Control/ProgressBar.h
++++ CPP/Windows/Control/ProgressBar.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../Common/MyWindows.h"
+ 
+-#include <CommCtrl.h>
++#include <commctrl.h>
+ 
+ #include "../Window.h"
+ 
+diff --git CPP/Windows/Control/PropertyPage.h CPP/Windows/Control/PropertyPage.h
+index 97c87b3b453..551c95994c2 100755
+--- CPP/Windows/Control/PropertyPage.h
++++ CPP/Windows/Control/PropertyPage.h
+@@ -5,7 +5,7 @@
+ 
+ #include "../../Common/MyWindows.h"
+ 
+-#include <PrSht.h>
++#include <prsht.h>
+ 
+ #include "Dialog.h"
+ 
+diff --git CPP/Windows/FileIO.h CPP/Windows/FileIO.h
+index 9146491d236..e11022f82d4 100755
+--- CPP/Windows/FileIO.h
++++ CPP/Windows/FileIO.h
+@@ -17,7 +17,7 @@
+ #ifdef _WIN32
+ 
+ #if defined(_WIN32) && !defined(UNDER_CE)
+-#include <WinIoCtl.h>
++#include <winioctl.h>
+ #endif
+ 
+ #else
+diff --git CPP/Windows/ProcessUtils.h CPP/Windows/ProcessUtils.h
+index 64ebe3775e4..de46c6f52a5 100755
+--- CPP/Windows/ProcessUtils.h
++++ CPP/Windows/ProcessUtils.h
+@@ -3,7 +3,7 @@
+ #ifndef __WINDOWS_PROCESS_UTILS_H
+ #define __WINDOWS_PROCESS_UTILS_H
+ 
+-#include <Psapi.h>
++#include <psapi.h>
+ 
+ #include "../Common/MyString.h"
+ 
+diff --git CPP/Windows/SecurityUtils.h CPP/Windows/SecurityUtils.h
+index de62035ec86..18a083fc580 100755
+--- CPP/Windows/SecurityUtils.h
++++ CPP/Windows/SecurityUtils.h
+@@ -3,7 +3,7 @@
+ #ifndef __WINDOWS_SECURITY_UTILS_H
+ #define __WINDOWS_SECURITY_UTILS_H
+ 
+-#include <NTSecAPI.h>
++#include <ntsecapi.h>
+ 
+ #include "Defs.h"
+ 
+diff --git CPP/Windows/Shell.h CPP/Windows/Shell.h
+index 30388bc5a70..dc3daa5e60b 100755
+--- CPP/Windows/Shell.h
++++ CPP/Windows/Shell.h
+@@ -4,7 +4,7 @@
+ #define __WINDOWS_SHELL_H
+ 
+ #include "../Common/MyWindows.h"
+-#include <ShlObj.h>
++#include <shlobj.h>
+ 
+ #include "../Common/MyString.h"
+ 

From a81950b0dd427f1945470d890015dda878856d26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 10:26:00 +0000
Subject: [PATCH 144/191] easeprobe: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix
index b0f85d7fc147..36f0bf6d73a6 100644
--- a/pkgs/tools/misc/easeprobe/default.nix
+++ b/pkgs/tools/misc/easeprobe/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "easeprobe";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "megaease";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-y9R2OgK+slQUvUMS3E6aX8WVCQ1fSMAruGKggxYRniA=";
+    sha256 = "sha256-FBraLP/wsoJiVLjAqNZettMDOd8W8l1j4t8ETyvqrcQ=";
   };
 
-  vendorSha256 = "sha256-ZfqBSPnIm2GHPREowHmEEPnOovYjoarxrkPeYmZBkIc=";
+  vendorHash = "sha256-Z2JLFLVTdPGFFHnjNA1JS1lYjGimdvMLiXQyNi+91Hc=";
 
   subPackages = [ "cmd/easeprobe" ];
 

From b98dcec97fb792686c7d52b92c619a16524ab660 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 10:57:15 +0000
Subject: [PATCH 145/191] python310Packages.dunamai: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index 60e42f5b2fa0..988610a6ca61 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dunamai";
-  version = "1.15.0";
+  version = "1.16.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "dunamai";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc=";
+    sha256 = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs=";
   };
 
   nativeBuildInputs = [

From 198713cf8229eaaa7f41d94b06014c756ee5fa4f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 28 Jan 2023 22:25:26 +0100
Subject: [PATCH 146/191] nixos/tts: init

Provide a module to configure Coqui TTS, available as `tts` in nixpkgs
for a few releases already.

The module supports multiple servers in parallel, so multiple languages
and testing scenarios can be covered, without affecting any production
usage.
---
 .../manual/release-notes/rl-2305.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/audio/tts.nix          | 151 ++++++++++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 nixos/modules/services/audio/tts.nix

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 44e9a68f27e8..bd709d4b1659 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -40,6 +40,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable).
 
+- [tts](https://github.com/coqui-ai/TTS), a battle-tested deep learning toolkit for Text-to-Speech. Mutiple servers may be configured below [services.tts.servers](#opt-services.tts.servers).
+
 - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
 
 - [networkd-dispatcher](https://gitlab.com/craftyguy/networkd-dispatcher), a dispatcher service for systemd-networkd connection status changes. Available as [services.networkd-dispatcher](#opt-services.networkd-dispatcher.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4fa3e8e8acdb..4a0e52f483c2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -314,6 +314,7 @@
   ./services/audio/snapserver.nix
   ./services/audio/spotifyd.nix
   ./services/audio/squeezelite.nix
+  ./services/audio/tts.nix
   ./services/audio/ympd.nix
   ./services/backup/automysqlbackup.nix
   ./services/backup/bacula.nix
diff --git a/nixos/modules/services/audio/tts.nix b/nixos/modules/services/audio/tts.nix
new file mode 100644
index 000000000000..1a355c8ee39f
--- /dev/null
+++ b/nixos/modules/services/audio/tts.nix
@@ -0,0 +1,151 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+
+let
+  cfg = config.services.tts;
+in
+
+{
+  options.services.tts = let
+    inherit (lib) literalExpression mkOption mdDoc mkEnableOption types;
+  in  {
+    servers = mkOption {
+      type = types.attrsOf (types.submodule (
+        { ... }: {
+          options = {
+            enable = mkEnableOption (mdDoc "Coqui TTS server");
+
+            port = mkOption {
+              type = types.port;
+              example = 5000;
+              description = mdDoc ''
+                Port to bind the TTS server to.
+              '';
+            };
+
+            model = mkOption {
+              type = types.nullOr types.str;
+              default = "tts_models/en/ljspeech/tacotron2-DDC";
+              example = null;
+              description = mdDoc ''
+                Name of the model to download and use for speech synthesis.
+
+                Check `tts-server --list_models` for possible values.
+
+                Set to `null` to use a custom model.
+              '';
+            };
+
+            useCuda = mkOption {
+              type = types.bool;
+              default = false;
+              example = true;
+              description = mdDoc ''
+                Whether to offload computation onto a CUDA compatible GPU.
+              '';
+            };
+
+            extraArgs = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              description = mdDoc ''
+                Extra arguments to pass to the server commandline.
+              '';
+            };
+          };
+        }
+      ));
+      default = {};
+      example = literalExpression ''
+        {
+          english = {
+            port = 5300;
+            model = "tts_models/en/ljspeech/tacotron2-DDC";
+          };
+          german = {
+            port = 5301;
+            model = "tts_models/de/thorsten/tacotron2-DDC";
+          };
+          dutch = {
+            port = 5302;
+            model = "tts_models/nl/mai/tacotron2-DDC";
+          };
+        }
+      '';
+      description = mdDoc ''
+        TTS server instances.
+      '';
+    };
+  };
+
+  config = let
+    inherit (lib) mkIf mapAttrs' nameValuePair optionalString concatMapStringsSep escapeShellArgs;
+  in mkIf (cfg.servers != {}) {
+    systemd.services = mapAttrs' (server: options:
+      nameValuePair "tts-${server}" {
+        description = "Coqui TTS server instance ${server}";
+        after = [
+          "network-online.target"
+        ];
+        wantedBy = [
+          "multi-user.target"
+        ];
+        path = with pkgs; [
+          espeak-ng
+        ];
+        environment.HOME = "/var/lib/tts";
+        serviceConfig = {
+          DynamicUser = true;
+          User = "tts";
+          StateDirectory = "tts";
+          ExecStart = "${pkgs.tts}/bin/tts-server --port ${toString options.port}"
+            + optionalString (options.model != null) " --model_name ${options.model}"
+            + optionalString (options.useCuda) " --use_cuda"
+            + (concatMapStringsSep " " escapeShellArgs options.extraArgs);
+          CapabilityBoundingSet = "";
+          DeviceAllow = if options.useCuda then [
+            # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
+            "/dev/nvidia1"
+            "/dev/nvidia2"
+            "/dev/nvidia3"
+            "/dev/nvidia4"
+            "/dev/nvidia-caps/nvidia-cap1"
+            "/dev/nvidia-caps/nvidia-cap2"
+            "/dev/nvidiactl"
+            "/dev/nvidia-modeset"
+            "/dev/nvidia-uvm"
+            "/dev/nvidia-uvm-tools"
+          ] else "";
+          DevicePolicy = "closed";
+          LockPersonality = true;
+          # jit via numba->llvmpipe
+          MemoryDenyWriteExecute = false;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectControlGroups = true;
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ];
+          UMask = "0077";
+        };
+      }) cfg.servers;
+  };
+}

From 6f0616b50fa295ad107c5f31446f19641feaf5cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Jan 2023 13:50:45 +0100
Subject: [PATCH 147/191] tts: Remove usage instructions in favor of module

---
 pkgs/tools/audio/tts/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index d3c10804dedd..cb1880af91c4 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -5,16 +5,6 @@
 , espeak-ng
 }:
 
-# USAGE:
-# $ tts-server --list_models
-# # pick your favorite vocoder/tts model
-# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan
-#
-# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts
-#
-# For now, for deployment check the systemd unit in the pull request:
-#   https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
-
 let
   python = python3.override {
     packageOverrides = self: super: {

From 04f7903bb9cd886a0e2885c728ff735f9248de89 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Feb 2023 13:08:43 +0100
Subject: [PATCH 148/191] python310Packages.torch-bin: Support aarch64-linux

and drop support for Python 3.7, as it was already removed from nixpkgs.
---
 pkgs/development/python-modules/torch/bin.nix |  4 +--
 .../python-modules/torch/binary-hashes.nix    | 25 +++++++++++--------
 .../python-modules/torch/prefetch.sh          | 14 ++++++-----
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index 6e66aa75b068..6847fd7d5889 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -29,7 +29,7 @@ in buildPythonPackage {
 
   format = "wheel";
 
-  disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
+  disabled = !(isPy38 || isPy39 || isPy310);
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
@@ -76,7 +76,7 @@ in buildPythonPackage {
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
+    platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
     hydraPlatforms = []; # output size 3.2G on 1.11.0
     maintainers = with maintainers; [ junjihashimoto ];
   };
diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix
index 46e64ad15fcb..94d7080020be 100644
--- a/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/binary-hashes.nix
@@ -7,11 +7,6 @@
 
 version : builtins.getAttr version {
   "1.13.1" = {
-    x86_64-linux-37 = {
-      name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-bXg6H3mHFyTK2jw3TKUJiGNZqMSseNBT34mxQu6QREA=";
-    };
     x86_64-linux-38 = {
       name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl";
       url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
@@ -27,11 +22,6 @@ version : builtins.getAttr version {
       url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
       hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU=";
     };
-    x86_64-darwin-37 = {
-      name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-DZuAYQSM+3jmdbnS6oUDv+MNtD1YNZmuhiaxJjoME4A=";
-    };
     x86_64-darwin-38 = {
       name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
       url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
@@ -62,5 +52,20 @@ version : builtins.getAttr version {
       url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
       hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU=";
     };
+    aarch64-linux-38 = {
+      name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
+      hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4=";
+    };
+    aarch64-linux-39 = {
+      name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
+      hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw=";
+    };
+    aarch64-linux-310 = {
+      name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
+      hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4=";
+    };
   };
 }
diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh
index 47aab0430a06..4963bd8012c0 100755
--- a/pkgs/development/python-modules/torch/prefetch.sh
+++ b/pkgs/development/python-modules/torch/prefetch.sh
@@ -6,21 +6,23 @@ set -eou pipefail
 version=$1
 
 linux_cuda_version="cu117"
-linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
+linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
+linux_cpu_bucket="https://download.pytorch.org/whl"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-  "x86_64-linux-37 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"
-  "x86_64-linux-38 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
-  "x86_64-linux-39 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
-  "x86_64-linux-310 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
-  "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl"
+  "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
+  "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
+  "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
   "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl"
   "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl"
   "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl"
   "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
   "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
   "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
+  "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl"
+  "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl"
+  "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"

From 78232c4e0387458001e5f667b49cc507371fe1b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 13:28:41 +0100
Subject: [PATCH 149/191] python310Packages.dunamai: add changelog to meta

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

diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index 988610a6ca61..87ff45fb468e 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "dunamai";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs=";
+    hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs=";
   };
 
   nativeBuildInputs = [
@@ -49,11 +49,14 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  pythonImportsCheck = [ "dunamai" ];
+  pythonImportsCheck = [
+    "dunamai"
+  ];
 
   meta = with lib; {
     description = "Dynamic version generation";
     homepage = "https://github.com/mtkennerly/dunamai";
+    changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ jmgilman ];
   };

From c571fd22df5ed40631cf100c5640f1e6ecc1dd80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Feb 2023 13:30:53 +0100
Subject: [PATCH 150/191] python310Packages.torchaudio-bin: Support
 aarch64-linux

and drop support for Python 3.7, as it was already removed from
nixpkgs.
---
 .../python-modules/torchaudio/bin.nix         |  4 +--
 .../torchaudio/binary-hashes.nix              | 25 +++++++++++--------
 .../python-modules/torchaudio/prefetch.sh     | 14 ++++++-----
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index f840b10e2b87..f74ac8082388 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
         srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
     in fetchurl srcs;
 
-  disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
+  disabled = !(isPy38 || isPy39 || isPy310);
 
   propagatedBuildInputs = [
     torch-bin
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "aarch64-linux" "x86_64-linux" ];
     maintainers = with maintainers; [ junjihashimoto ];
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index bbf1e9220b42..c6a903457c01 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,11 +7,6 @@
 
 version : builtins.getAttr version {
   "0.13.1" = {
-    x86_64-linux-37 = {
-      name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
-      hash = "sha256-wQJJ2BPkQAGxXx8H0rt3P39wsl/6KhbF27wYHT5L6/o=";
-    };
     x86_64-linux-38 = {
       name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl";
       url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
@@ -27,11 +22,6 @@ version : builtins.getAttr version {
       url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
       hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY=";
     };
-    x86_64-darwin-37 = {
-      name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";
-      hash = "sha256-D6fMGiswVvxs7ubWDbze9YlVp8pTRmfQ25tPye+gh6E=";
-    };
     x86_64-darwin-38 = {
       name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
       url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
@@ -62,5 +52,20 @@ version : builtins.getAttr version {
       url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";
       hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0=";
     };
+    aarch64-linux-38 = {
+      name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
+      hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c=";
+    };
+    aarch64-linux-39 = {
+      name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
+      hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE=";
+    };
+    aarch64-linux-310 = {
+      name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
+      hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE=";
+    };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index 0807b00142c6..dad401d0d136 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -6,21 +6,23 @@ set -eou pipefail
 version=$1
 
 linux_cuda_version="cu117"
-linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
+linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
+linux_cpu_bucket="https://download.pytorch.org/whl"
 darwin_bucket="https://download.pytorch.org/whl"
 
 url_and_key_list=(
-  "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl"
-  "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
-  "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
-  "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
-  "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"
+  "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
+  "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
+  "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
   "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
   "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
   "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
   "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl"
   "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl"
   "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl"
+  "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl"
+  "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
+  "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
 )
 
 hashfile=binary-hashes-"$version".nix

From 92855d91b1eba54d88f4f4f281cf5c88c5d89761 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 13:00:36 +0000
Subject: [PATCH 151/191] python310Packages.stripe: 5.1.1 -> 5.2.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 b5db5c256440..7085f0fe703b 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 = "5.1.1";
+  version = "5.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wAjdCMWZhtzwWfu3dkhucLgtT6RqY8oQhdlLJojCjhk=";
+    hash = "sha256-pDcrna+DEtgjaaqmSZcpem8Ea8B8oJ91159ayAkztBQ=";
   };
 
   propagatedBuildInputs = [

From bfe882988afe4dc7af815bdafeef0865d3753404 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 13:08:13 +0000
Subject: [PATCH 152/191] python310Packages.types-pyyaml: 6.0.12.6 -> 6.0.12.8

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

diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix
index 25692d5ee8c5..47ef2a0c495d 100644
--- a/pkgs/development/python-modules/types-pyyaml/default.nix
+++ b/pkgs/development/python-modules/types-pyyaml/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "types-pyyaml";
-  version = "6.0.12.6";
+  version = "6.0.12.8";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types-PyYAML";
     inherit version;
-    sha256 = "sha256-JOdrk41Y5oZFJx7rFJr2Ai0dqZeI5IH5Wb0oSxZPOaE=";
+    sha256 = "sha256-GTBIaaidSa8AvmgeeyZ0FN8hP064ljTESV+mLo+UK58=";
   };
 
   # Module doesn't have tests

From 43359990a7c6220fb64a3923b6e4a1817ba725f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 13:09:12 +0000
Subject: [PATCH 153/191] python310Packages.deal: 4.23.4 -> 4.23.7

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

diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index 98981a65adbc..ae92e45e324c 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "deal";
-  version = "4.23.4";
+  version = "4.23.7";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "life4";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-YwozwoTb1JsvrwcTntlpWpQJ9DszH2lmtuKkK8qZiG0=";
+    hash = "sha256-RWbMitgrU8VUsOgarBKYDNPIa/AwifvBURUytiGzeVo=";
   };
 
   postPatch = ''

From c1ed7f0a2e1fc54b58b91d9a206ce66ce4fb4c9d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 21 Feb 2023 09:12:35 -0300
Subject: [PATCH 154/191] dxa: refactor

---
 pkgs/development/compilers/xa/dxa.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix
index 7d83624e8415..bda3653eb0d7 100644
--- a/pkgs/development/compilers/xa/dxa.nix
+++ b/pkgs/development/compilers/xa/dxa.nix
@@ -4,14 +4,14 @@
 , installShellFiles
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
   pname = "dxa";
   version = "0.1.5";
 
   src = fetchurl {
     urls = [
-      "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
-      "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/dxa-${self.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/unsupported/dxa-${self.version}.tar.gz"
     ];
     hash = "sha256-jkDtd4FlgfmtlaysLtaaL7KseFDkM9Gc1oQZOkWCZ5k=";
   };
@@ -27,17 +27,18 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -d $out/bin/
-    install dxa $out/bin/
+
+    install -Dm755 -T dxa $out/bin/dxa
     installManPage dxa.1
+
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.floodgap.com/retrotech/xa/";
     description = "Andre Fachat's open-source 6502 disassembler";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = with lib.platforms; unix;
   };
-}
+})

From 6f4f8617273abd04eb59f8f9a4b65d44689f6e4a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 21 Feb 2023 09:15:55 -0300
Subject: [PATCH 155/191] xa: 2.3.13 -> 2.3.14

---
 pkgs/development/compilers/xa/xa.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix
index db719c8fd23f..9f4d45ba4977 100644
--- a/pkgs/development/compilers/xa/xa.nix
+++ b/pkgs/development/compilers/xa/xa.nix
@@ -4,16 +4,16 @@
 , perl
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (self: {
   pname = "xa";
-  version = "2.3.13";
+  version = "2.3.14";
 
   src = fetchurl {
     urls = [
-      "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
-      "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/xa-${self.version}.tar.gz"
+      "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${self.version}.tar.gz"
     ];
-    hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY=";
+    hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4=";
   };
 
   nativeCheckInputs = [ perl ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.floodgap.com/retrotech/xa/";
     description = "Andre Fachat's open-source 6502 cross assembler";
     longDescription = ''
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
         suite, as well as "bare" plain binary object files
       - block structure for label scoping
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = with lib.platforms; unix;
   };
-}
+})

From f93735d7bd139d1f27106ab2e5fd742bbcf9811c Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Tue, 21 Feb 2023 14:26:31 +0100
Subject: [PATCH 156/191] openmm: use gfortran11 and gcc11Stdenv

openmm: pin stdenv and gfortran
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42895e8977ad..9a5dd2c8d3f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31736,7 +31736,10 @@ with pkgs;
 
   open-policy-agent = callPackage ../development/tools/open-policy-agent { };
 
-  openmm = callPackage ../development/libraries/science/chemistry/openmm { };
+  openmm = callPackage ../development/libraries/science/chemistry/openmm {
+    stdenv = if stdenv.targetPlatform.isAarch64 then gcc9Stdenv else gcc11Stdenv;
+    gfortran = if stdenv.targetPlatform.isAarch64 then gfortran9 else gfortran11;
+  };
 
   openshift = callPackage ../applications/networking/cluster/openshift { };
 

From 2135e32c43e829131a63133760a2cf97825c9643 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 13:36:08 +0000
Subject: [PATCH 157/191] quisk: 4.2.12 -> 4.2.17

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

diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
index bc853ae14fcc..34e83ab95ca2 100644
--- a/pkgs/applications/radio/quisk/default.nix
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -3,11 +3,11 @@
 
 python39Packages.buildPythonApplication rec {
   pname = "quisk";
-  version = "4.2.12";
+  version = "4.2.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "62b017d881139ed38bd906b0467b303fbdae17e5607e93b6b2fe929e26d0551d";
+    sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY=";
   };
 
   buildInputs = [ fftw alsa-lib pulseaudio ];

From 0eb928e7c082e0e008f246c5e0acc522db2c6941 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Dec 2022 02:14:03 +0000
Subject: [PATCH 158/191] shards_0_17: 0.17.1 -> 0.17.2

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

diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 9202543ea904..5fc102546a22 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -37,8 +37,8 @@ let
 in
 rec {
   shards_0_17 = generic {
-    version = "0.17.1";
-    hash = "sha256-YAsFsMoZVUINnIQzYNjE7/hpvipmyU5DrLJJrk9TkHs=";
+    version = "0.17.2";
+    hash = "sha256-2HpoMgyi8jnWYiBHscECYiaRu2g0mAH+dCY1t5m/l1s=";
   };
 
   shards = shards_0_17;

From 3a6307ccdab8fa113cf28c84848f6c46b546a264 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 14:34:16 +0000
Subject: [PATCH 159/191] cargo-watch: 8.3.0 -> 8.4.0

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

diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index c06420d25304..3e2d10e769c1 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-watch";
-  version = "8.3.0";
+  version = "8.4.0";
 
   src = fetchFromGitHub {
     owner = "watchexec";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4=";
+    hash = "sha256-YwiTzIO60ct076vMoK9BHKa65Qet2PAvPRwnZcjDgcM=";
   };
 
-  cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ=";
+  cargoHash = "sha256-BzcKWQSB94H3XOsbwNvJoAHlZwkJvLABIrfFh9Ugfig=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ];
 

From 98e5666672a02e8f48cb348aa94f3a10ed603897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 11 Feb 2023 17:12:53 +0100
Subject: [PATCH 160/191] rofi-bluetooth: unstable-2021-03-05 ->
 unstable-2023-02-03

Update rofi-bluetooth to newest version and give users the option to
use wayland supported rofi fork (disabled by default).
---
 pkgs/applications/misc/rofi-bluetooth/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix
index ed80e5d5af0e..d9824ca9977a 100644
--- a/pkgs/applications/misc/rofi-bluetooth/default.nix
+++ b/pkgs/applications/misc/rofi-bluetooth/default.nix
@@ -2,20 +2,19 @@
 , stdenv
 , fetchFromGitHub
 , makeWrapper
-, rofi-unwrapped
 , bluez
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rofi-bluetooth";
-  version = "unstable-2021-03-05";
+  version = "unstable-2023-02-03";
 
   src = fetchFromGitHub {
     owner = "nickclyde";
-    repo = "rofi-bluetooth";
+    repo = finalAttrs.pname;
     # https://github.com/nickclyde/rofi-bluetooth/issues/19
-    rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2";
-    sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss=";
+    rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb";
+    sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
     install -D --target-directory=$out/bin/ ./rofi-bluetooth
 
     wrapProgram $out/bin/rofi-bluetooth \
-      --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] }
+      --prefix PATH ":" ${lib.makeBinPath [ bluez ] }
 
     runHook postInstall
   '';
@@ -38,4 +37,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ MoritzBoehme ];
     platforms = platforms.linux;
   };
-}
+})

From bdcc0de94ddfa5387b450205b862e99fe0b8c759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 14:48:04 +0000
Subject: [PATCH 161/191] spire: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix
index 7c7562d1adb6..f3cb9e85dcec 100644
--- a/pkgs/tools/security/spire/default.nix
+++ b/pkgs/tools/security/spire/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "spire";
-  version = "1.5.4";
+  version = "1.5.5";
 
   outputs = [ "out" "agent" "server" ];
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "spiffe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY=";
+    sha256 = "sha256-nx4a5VH5UIvvBwwzB77XdBv/2ofoOY7iVgXFYyGclnI=";
   };
 
-  vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo=";
+  vendorHash = "sha256-RRC1eOSJBbaGMoc81OMu4OGDL950L7u1mheQLSpUXJk=";
 
   subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
 

From ca19c433828fb3e194944063ec0cc9197f9219f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 15:07:55 +0000
Subject: [PATCH 162/191] syncstorage-rs: 0.13.1 -> 0.13.2

---
 pkgs/servers/syncstorage-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix
index 359dbfb5979d..65189094d0c7 100644
--- a/pkgs/servers/syncstorage-rs/default.nix
+++ b/pkgs/servers/syncstorage-rs/default.nix
@@ -21,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = pname;
     rev = version;
-    hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU=";
+    hash = "sha256-zxpqQpzmPPU6V5QITK9SgAAI7l3/7+h0u3/bZgiU7y4=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE=";
+  cargoHash = "sha256-U0xHqOh0ii4PE9UYKo+diqSoZ1ZjzBmHILvAhHSZD0A=";
 
   buildFeatures = [ "grpcio/openssl" ];
 

From c17b2d71ea0455f87076bfa46736cec573719497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 17 Feb 2023 14:06:57 -0800
Subject: [PATCH 163/191] txt2tags: unstable-2022-10-17 -> 3.8

Diff: https://github.com/txt2tags/txt2tags/compare/114ab24...3.8

Changelog: https://github.com/txt2tags/txt2tags/blob/refs/tags/3.8/CHANGELOG.md
---
 pkgs/tools/text/txt2tags/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 68bc86f144ab..7c7ddbb1b8ee 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -6,15 +6,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "txt2tags";
-  version = "unstable-2022-10-17";
+  version = "3.8";
 
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "txt2tags";
     repo = "txt2tags";
-    rev = "114ab24ea9111060df136bfc1c8b1a35a59fe0f2";
-    hash = "sha256-h2OtlUMzEHKyJ9AIO1Uo9Lx7jMYZNMtC6U+usBu7gNU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-urLsA2oeQM0WcKNDgaxKJOgBPGohJT6Zq6y6bEYMTxk=";
   };
 
   postPatch = ''

From 030ed6aadb3a5a5fe686ae11e1ccc095f3af2a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 14 Feb 2023 13:40:38 -0800
Subject: [PATCH 164/191] esptool: 4.4 -> 4.5

Diff: https://github.com/espressif/esptool/compare/v4.4...v4.5

Changelog: https://github.com/espressif/esptool/releases/tag/v4.5
---
 pkgs/tools/misc/esptool/default.nix           | 27 ++----
 .../misc/esptool/test-call-bin-directly.patch | 89 -------------------
 2 files changed, 8 insertions(+), 108 deletions(-)
 delete mode 100644 pkgs/tools/misc/esptool/test-call-bin-directly.patch

diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index a62e266874d6..9efa31d36537 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -1,29 +1,19 @@
 { lib
 , fetchFromGitHub
-, fetchpatch
 , python3
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    hash = "sha256-haLwf3loOvqdqQN/iuVBciQ6nCnuc9AqqOGKvDwLBHE=";
+    hash = "sha256-SwMdemCk3e3RyXTzoXIqDRywpg3ogE9nQjXGBz0BjwE=";
   };
 
-  patches = [
-    ./test-call-bin-directly.patch
-    (fetchpatch {
-      name = "bitstring-4-compatibility.patch";
-      url = "https://github.com/espressif/esptool/commit/ee27a6437576797d5f58c31e1c39f3a232a71df0.patch";
-      hash = "sha256-8/AzR3HK79eQQRSaGEKU4YKn/piPCPjm/G9pvizKuUE=";
-    })
-  ];
-
   propagatedBuildInputs = with python3.pkgs; [
     bitstring
     cryptography
@@ -34,19 +24,18 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [
     pyelftools
-    pytest
+    pytestCheckHook
   ];
 
   # tests mentioned in `.github/workflows/test_esptool.yml`
   checkPhase = ''
     runHook preCheck
 
-    export ESPSECURE_PY=$out/bin/espsecure.py
-    export ESPTOOL_PY=$out/bin/esptool.py
-    ${python3.interpreter} test/test_imagegen.py
-    ${python3.interpreter} test/test_espsecure.py
-    ${python3.interpreter} test/test_merge_bin.py
-    ${python3.interpreter} test/test_modules.py
+    pytest test/test_imagegen.py
+    pytest test/test_espsecure.py
+    pytest test/test_merge_bin.py
+    pytest test/test_image_info.py
+    pytest test/test_modules.py
 
     runHook postCheck
   '';
diff --git a/pkgs/tools/misc/esptool/test-call-bin-directly.patch b/pkgs/tools/misc/esptool/test-call-bin-directly.patch
deleted file mode 100644
index b7d772780090..000000000000
--- a/pkgs/tools/misc/esptool/test-call-bin-directly.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/test/test_espsecure.py b/test/test_espsecure.py
-index 25b0b87..627005c 100755
---- a/test/test_espsecure.py
-+++ b/test/test_espsecure.py
-@@ -35,7 +35,7 @@ class EspSecureTestCase:
-         Returns output as a string if there is any,
-         raises an exception if espsecure.py fails
-         """
--        cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
-+        cmd = [ESPSECURE_PY] + args.split(" ")
-         print("\nExecuting {}...".format(" ".join(cmd)))
- 
-         try:
-diff --git a/test/test_esptool.py b/test/test_esptool.py
-index 042a1ce..b294e26 100755
---- a/test/test_esptool.py
-+++ b/test/test_esptool.py
-@@ -57,7 +57,10 @@ try:
-     ESPTOOL_PY = os.environ["ESPTOOL_PY"]
- except KeyError:
-     ESPTOOL_PY = os.path.join(TEST_DIR, "..", "esptool/__init__.py")
--ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
-+try:
-+    ESPSECURE_PY = os.environ["ESPSECURE_PY"]
-+except KeyError:
-+    ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
- ESPRFC2217SERVER_PY = os.path.join(TEST_DIR, "..", "esp_rfc2217_server.py")
- 
- RETURN_CODE_FATAL_ERROR = 2
-@@ -74,7 +77,6 @@ class ESPRFC2217Server(object):
-     def __init__(self, rfc2217_port=None):
-         self.port = rfc2217_port or self.get_free_port()
-         self.cmd = [
--            sys.executable,
-             ESPRFC2217SERVER_PY,
-             "-p",
-             str(self.port),
-@@ -130,7 +132,7 @@ class ESPRFC2217Server(object):
- class EsptoolTestCase:
-     def run_espsecure(self, args):
- 
--        cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
-+        cmd = [ESPSECURE_PY] + args.split(" ")
-         print("\nExecuting {}...".format(" ".join(cmd)))
-         try:
-             output = subprocess.check_output(
-@@ -155,7 +157,7 @@ class EsptoolTestCase:
-         Raises an exception if esptool.py fails.
-         """
-         trace_args = ["--trace"] if arg_trace else []
--        cmd = [sys.executable, ESPTOOL_PY] + trace_args
-+        cmd = [ESPTOOL_PY] + trace_args
-         if chip_name or arg_chip is not None and chip_name != "auto":
-             cmd += ["--chip", chip_name or arg_chip]
-         if rfc2217_port or arg_port is not None:
-diff --git a/test/test_imagegen.py b/test/test_imagegen.py
-index a1feec2..01bd59c 100755
---- a/test/test_imagegen.py
-+++ b/test/test_imagegen.py
-@@ -108,7 +108,7 @@ class BaseTestCase:
-         Run esptool.py image_info on a binary file,
-         assert no red flags about contents.
-         """
--        cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "image_info", binpath]
-+        cmd = [ESPTOOL_PY, "--chip", chip, "image_info", binpath]
-         try:
-             output = subprocess.check_output(cmd)
-             output = output.decode("utf-8")
-@@ -123,7 +123,7 @@ class BaseTestCase:
- 
-     def run_elf2image(self, chip, elf_path, version=None, extra_args=[]):
-         """Run elf2image on elf_path"""
--        cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "elf2image"]
-+        cmd = [ESPTOOL_PY, "--chip", chip, "elf2image"]
-         if version is not None:
-             cmd += ["--version", str(version)]
-         cmd += [elf_path] + extra_args
-diff --git a/test/test_merge_bin.py b/test/test_merge_bin.py
-index 8230069..2df5f8c 100755
---- a/test/test_merge_bin.py
-+++ b/test/test_merge_bin.py
-@@ -39,7 +39,6 @@ class TestMergeBin:
-             output_file.close()
- 
-             cmd = [
--                sys.executable,
-                 ESPTOOL_PY,
-                 "--chip",
-                 chip,

From 0e973e43c040e79f3e95bb2488fea6afd0fb5186 Mon Sep 17 00:00:00 2001
From: Matthew LeVan <matthew@coeli.network>
Date: Thu, 16 Feb 2023 20:46:04 -0500
Subject: [PATCH 165/191] urbit: remove old urbit; init at 1.20

---
 maintainers/maintainer-list.nix |  6 +++++
 pkgs/misc/urbit/default.nix     | 41 +++++++++++++++++++--------------
 pkgs/misc/urbit/update-bin.sh   | 40 ++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 17 deletions(-)
 create mode 100755 pkgs/misc/urbit/update-bin.sh

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6e9e3faf60e6..76d944532001 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9183,6 +9183,12 @@
     githubId = 952712;
     name = "Matt Christ";
   };
+  matthew-levan = {
+    email = "matthew@coeli.network";
+    github = "matthew-levan";
+    githubId = 91502660;
+    name = "Matthew LeVan";
+  };
   matthewcroughan = {
     email = "matt@croughan.sh";
     github = "MatthewCroughan";
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index 9ea1fc64c3f3..0cd7dd7e309d 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,31 +1,38 @@
-{ lib, stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja
-, openssl, pkg-config, re2c, zlib
+{ stdenv
+, lib
+, fetchzip
 }:
 
+let
+  os = if stdenv.isDarwin then "macos" else "linux";
+  arch = if stdenv.isAarch64 then "aarch64" else "x86_64";
+  platform = "${os}-${arch}";
+in
 stdenv.mkDerivation rec {
   pname = "urbit";
-  version = "0.7.3";
+  version = "1.20";
 
-  src = fetchFromGitHub {
-    owner = "urbit";
-    repo = "urbit";
-    rev = "v${version}";
-    sha256 = "192843pjzh8z55fd0x70m3l1vncmixljia3nphgn7j7x4976xkp2";
-    fetchSubmodules = true;
+  src = fetchzip {
+    url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
+    sha256 = {
+      x86_64-linux = "sha256-nBIpf9akK4cXnR5y5Fcl1g7/FxL8BU/CH/WHGhYuP74=";
+      aarch64-linux = "sha256-ERSYXNh/vmAKr4PNonOxTm5/FRLNDWwHSHM6fIeY4Nc=";
+      x86_64-darwin = "sha256-Kk9hNzyWngnyqlyQ9hILFM81WVw1ZYimMj4K3ENtifE=";
+      aarch64-darwin = "sha256-i3ixj04J/fcb396ncINLF8eYw1mpFCYeIM3f74K6tqY=";
+    }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
 
-  nativeBuildInputs = [ pkg-config ninja meson ];
-  buildInputs = [ curl git gmp libsigsegv ncurses openssl re2c zlib ];
-
-  postPatch = ''
-    patchShebangs .
+  postInstall = ''
+    install -m755 -D vere-v${version}-${platform} $out/bin/urbit
   '';
 
+  passthru.updateScript = ./update-bin.sh;
+
   meta = with lib; {
-    description = "An operating function";
     homepage = "https://urbit.org";
+    description = "An operating function";
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
+    maintainers = [ maintainers.matthew-levan ];
     license = licenses.mit;
-    maintainers = with maintainers; [ mudri ];
-    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/misc/urbit/update-bin.sh b/pkgs/misc/urbit/update-bin.sh
new file mode 100755
index 000000000000..b7ee514e10a7
--- /dev/null
+++ b/pkgs/misc/urbit/update-bin.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch
+
+set -euo pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+NIX_DRV="$ROOT/default.nix"
+if [ ! -f "$NIX_DRV" ]; then
+  echo "ERROR: cannot find urbit in $ROOT"
+  exit 1
+fi
+
+fetch_arch() {
+  VER="$1"; ARCH="$2"
+  URL="https://github.com/urbit/vere/releases/download/vere-v${VER}/${ARCH}.tgz";
+  nix-prefetch "{ stdenv, fetchzip }:
+stdenv.mkDerivation rec {
+  pname = \"vere\"; version = \"${VER}\";
+  src = fetchzip { url = \"$URL\"; };
+}
+"
+}
+
+replace_sha() {
+  sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV"
+}
+
+VERE_VER=$(curl https://bootstrap.urbit.org/vere/live/last)
+
+VERE_LINUX_AARCH64_SHA256=$(fetch_arch "$VERE_VER" "linux-aarch64")
+VERE_LINUX_X64_SHA256=$(fetch_arch "$VERE_VER" "linux-x86_64")
+VERE_DARWIN_AARCH64_SHA256=$(fetch_arch "$VERE_VER" "macos-aarch64")
+VERE_DARWIN_X64_SHA256=$(fetch_arch "$VERE_VER" "macos-x86_64")
+
+sed -i "s/version = \".*\"/version = \"$VERE_VER\"/" "$NIX_DRV"
+
+replace_sha "aarch64-linux" "$VERE_LINUX_AARCH64_SHA256"
+replace_sha "x86_64-linux" "$VERE_LINUX_X64_SHA256"
+replace_sha "aarch64-darwin" "$VERE_DARWIN_AARCH64_SHA256"
+replace_sha "x86_64-darwin" "$VERE_DARWIN_X64_SHA256"

From b4e64c895b17665f9ab76c69b28b4972d9a7430f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 16:28:26 +0000
Subject: [PATCH 166/191] flyway: 9.14.1 -> 9.15.0

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

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 2f111370d222..de8e09d3e16b 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,10 +1,10 @@
 { lib, stdenv, fetchurl, jre_headless, makeWrapper }:
 stdenv.mkDerivation rec{
   pname = "flyway";
-  version = "9.14.1";
+  version = "9.15.0";
   src = fetchurl {
     url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-    sha256 = "sha256-a4wApae08oQBVOSvLJFfU0ZB8mOJbjsnD/SgpCq6IYc=";
+    sha256 = "sha256-/rK7Kd1ofz1D7/o/yMFXS2YBklOEA7jExuYPpnX9xko=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;

From 38593bc3c0ee89bbee1ee58519e7585a356850c6 Mon Sep 17 00:00:00 2001
From: Dominic Shelton <frogamic@protonmail.com>
Date: Sun, 19 Feb 2023 18:55:13 +1100
Subject: [PATCH 167/191] nixos/flipperzero: init

---
 nixos/modules/hardware/flipperzero.nix | 18 ++++++++++++++++++
 nixos/modules/module-list.nix          |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 nixos/modules/hardware/flipperzero.nix

diff --git a/nixos/modules/hardware/flipperzero.nix b/nixos/modules/hardware/flipperzero.nix
new file mode 100644
index 000000000000..82f9b76fa3a7
--- /dev/null
+++ b/nixos/modules/hardware/flipperzero.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.hardware.flipperzero;
+
+in
+
+{
+  options.hardware.flipperzero.enable = mkEnableOption (mdDoc "udev rules and software for Flipper Zero devices");
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.qFlipper ];
+    services.udev.packages = [ pkgs.qFlipper ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4a0e52f483c2..a19b0f7ea908 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./hardware/cpu/intel-sgx.nix
   ./hardware/device-tree.nix
   ./hardware/digitalbitbox.nix
+  ./hardware/flipperzero.nix
   ./hardware/flirc.nix
   ./hardware/gkraken.nix
   ./hardware/gpgsmartcards.nix

From cb0581d6608bf251cb08c3915caf3d48a89e10af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 17:11:01 +0000
Subject: [PATCH 168/191] ergo: 5.0.6 -> 5.0.7

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

diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index e65684353642..ae1a60ec1db0 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ergo";
-  version = "5.0.6";
+  version = "5.0.7";
 
   src = fetchurl {
     url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU=";
+    sha256 = "sha256-yxb8cMAokAv0tl9FSjjtdvHkJP/UKlZxLLu/+gx8kyQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 00bffb84dadd93cd3bf92f4235ce5f4dfa17d606 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Sun, 19 Feb 2023 20:51:39 +0100
Subject: [PATCH 169/191] nixos-render-docs: drop frozendict

with mypy type checking and Mapping types this is a lot less useful than
anticipated. let's drop it for simplicity and having fewer dependencies.

frozendict 2.3.5 also broke the mypy checks.
---
 pkgs/tools/nix/nixos-render-docs/default.nix  | 21 ++++++++-----------
 .../src/nixos_render_docs/docbook.py          |  1 -
 .../src/nixos_render_docs/md.py               |  3 +--
 .../src/nixos_render_docs/options.py          |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix
index 312bc8058245..065404f36c20 100644
--- a/pkgs/tools/nix/nixos-render-docs/default.nix
+++ b/pkgs/tools/nix/nixos-render-docs/default.nix
@@ -24,18 +24,15 @@ let
   };
 
   makeDeps = pkgs: small:
-    [ pkgs.frozendict ]
-    ++ (
-      if small
-      then [
-        markdown-it-py-no-tests
-        mdit-py-plugins-no-tests
-      ]
-      else [
-        pkgs.markdown-it-py
-        pkgs.mdit-py-plugins
-      ]
-    );
+    if small
+    then [
+      markdown-it-py-no-tests
+      mdit-py-plugins-no-tests
+    ]
+    else [
+      pkgs.markdown-it-py
+      pkgs.mdit-py-plugins
+    ];
 in
 
 python.pkgs.buildPythonApplication rec {
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
index 28ab53720936..e6a761dcf13f 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
@@ -1,5 +1,4 @@
 from collections.abc import Mapping, MutableMapping, Sequence
-from frozendict import frozendict # type: ignore[attr-defined]
 from typing import Any, cast, Optional, NamedTuple
 
 import markdown_it
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
index 599ee7e91c14..8fa7c547f5d8 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
@@ -1,6 +1,5 @@
 from abc import ABC
 from collections.abc import Mapping, MutableMapping, Sequence
-from frozendict import frozendict # type: ignore[attr-defined]
 from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional
 
 import dataclasses
@@ -458,7 +457,7 @@ class Converter(ABC):
     __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer]
 
     def __init__(self, manpage_urls: Mapping[str, str]):
-        self._manpage_urls = frozendict(manpage_urls)
+        self._manpage_urls = manpage_urls
 
         self._md = markdown_it.MarkdownIt(
             "commonmark",
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index 8282d7493249..28b4120fd7d9 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -204,7 +204,7 @@ class DocBookConverter(BaseConverter):
     __renderer__ = OptionsDocBookRenderer
     __option_block_separator__ = ""
 
-    def __init__(self, manpage_urls: dict[str, str],
+    def __init__(self, manpage_urls: Mapping[str, str],
                  revision: str,
                  markdown_by_default: bool,
                  document_type: str,

From 895d9e69dd93987901bb379af34c0378b21283a3 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Sun, 5 Feb 2023 03:35:31 +0100
Subject: [PATCH 170/191] nixos-render-docs: extract md code block factory

the commonmark exporter can make good use once it appears.
---
 .../nixos-render-docs/src/nixos_render_docs/md.py | 13 +++++++++++++
 .../src/nixos_render_docs/options.py              | 15 ++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
index 8fa7c547f5d8..a8d9cf91d077 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
@@ -27,6 +27,19 @@ _md_escape_table = {
 def md_escape(s: str) -> str:
     return s.translate(_md_escape_table)
 
+def md_make_code(code: str) -> str:
+    # for multi-line code blocks we only have to count ` runs at the beginning
+    # of a line, but this is much easier.
+    multiline = '\n' in code
+    longest, current = (0, 0)
+    for c in code:
+        current = current + 1 if c == '`' else 0
+        longest = max(current, longest)
+    # inline literals need a space to separate ticks from content, code blocks
+    # need newlines. inline literals need one extra tick, code blocks need three.
+    ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ')
+    return f"{ticks}{sep}{code}{sep}{ticks}"
+
 AttrBlockKind = Literal['admonition', 'example']
 
 AdmonitionKind = Literal["note", "caution", "tip", "important", "warning"]
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index 28b4120fd7d9..1c0bb77d876f 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -15,7 +15,7 @@ import markdown_it
 from . import parallel
 from .docbook import DocBookRenderer, make_xml_id
 from .manpage import ManpageRenderer, man_escape
-from .md import Converter, md_escape
+from .md import Converter, md_escape, md_make_code
 from .types import OptionLoc, Option, RenderedOption
 
 def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]:
@@ -95,18 +95,7 @@ class BaseConverter(Converter):
         if lit := option_is(option, key, 'literalMD'):
             return [ self._render(f"*{key.capitalize()}:*\n{lit['text']}") ]
         elif lit := option_is(option, key, 'literalExpression'):
-            code = lit['text']
-            # for multi-line code blocks we only have to count ` runs at the beginning
-            # of a line, but this is much easier.
-            multiline = '\n' in code
-            longest, current = (0, 0)
-            for c in code:
-                current = current + 1 if c == '`' else 0
-                longest = max(current, longest)
-            # inline literals need a space to separate ticks from content, code blocks
-            # need newlines. inline literals need one extra tick, code blocks need three.
-            ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ')
-            code = f"{ticks}{sep}{code}{sep}{ticks}"
+            code = md_make_code(lit['text'])
             return [ self._render(f"*{key.capitalize()}:*\n{code}") ]
         elif key in option:
             raise Exception(f"{key} has unrecognized type", option[key])

From 45619b3c4a4475696ff0f07912cd0aee0bd65a48 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Fri, 10 Feb 2023 07:22:53 +0100
Subject: [PATCH 171/191] nixos-render-docs: extend md_make_code

add the ability to set the info string for a newly created fenced code
block, and a flag to always emit a fenced block. the commonmark
converter will need this to faithfully recreate fenced and indented code
blocks.
---
 .../tools/nix/nixos-render-docs/src/nixos_render_docs/md.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
index a8d9cf91d077..96cc8af69bce 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
@@ -27,10 +27,10 @@ _md_escape_table = {
 def md_escape(s: str) -> str:
     return s.translate(_md_escape_table)
 
-def md_make_code(code: str) -> str:
+def md_make_code(code: str, info: str = "", multiline: Optional[bool] = None) -> str:
     # for multi-line code blocks we only have to count ` runs at the beginning
     # of a line, but this is much easier.
-    multiline = '\n' in code
+    multiline = multiline or info != "" or '\n' in code
     longest, current = (0, 0)
     for c in code:
         current = current + 1 if c == '`' else 0
@@ -38,7 +38,7 @@ def md_make_code(code: str) -> str:
     # inline literals need a space to separate ticks from content, code blocks
     # need newlines. inline literals need one extra tick, code blocks need three.
     ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ')
-    return f"{ticks}{sep}{code}{sep}{ticks}"
+    return f"{ticks}{info}{sep}{code}{sep}{ticks}"
 
 AttrBlockKind = Literal['admonition', 'example']
 

From 82d066ffe3dc263672b8a3fb8178a5294aeb9fb8 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Fri, 10 Feb 2023 07:45:25 +0100
Subject: [PATCH 172/191] nixos-render-docs: refactor option docs restrictions

move the restrictions we care about into a mixin class. a few more
restrictions will appear soon and a few new converters as well, the
renderers of which need not have these restrictions already baked in by
accident (like the manpage renderer does right now).
---
 .../nix/nixos-render-docs/src/nixos_render_docs/options.py   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index 1c0bb77d876f..908c98c8d710 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -171,7 +171,7 @@ class BaseConverter(Converter):
     @abstractmethod
     def finalize(self) -> str: raise NotImplementedError()
 
-class OptionsDocBookRenderer(DocBookRenderer):
+class OptionDocsRestrictions:
     def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
                      env: MutableMapping[str, Any]) -> str:
         raise RuntimeError("md token not supported in options doc", token)
@@ -179,6 +179,7 @@ class OptionsDocBookRenderer(DocBookRenderer):
                       env: MutableMapping[str, Any]) -> str:
         raise RuntimeError("md token not supported in options doc", token)
 
+class OptionsDocBookRenderer(OptionDocsRestrictions, DocBookRenderer):
     # TODO keep optionsDocBook diff small. remove soon if rendering is still good.
     def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
                           env: MutableMapping[str, Any]) -> str:
@@ -287,7 +288,7 @@ class DocBookConverter(BaseConverter):
 
         return "\n".join(result)
 
-class OptionsManpageRenderer(ManpageRenderer):
+class OptionsManpageRenderer(OptionDocsRestrictions, ManpageRenderer):
     pass
 
 class ManpageConverter(BaseConverter):

From 6c182075bb453792683369eca2bdc630cb551a91 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Fri, 10 Feb 2023 07:49:25 +0100
Subject: [PATCH 173/191] nixos-render-docs: forbid attrspans and examples in
 options

inline anchors are not allowed in option docs per the manual, and the
sole class we current have (.keycap) is never used anyway. disallow them
for now to avoid future surprises.

the same goes for examples, which aren't even documented in the manual yet.
---
 .../nix/nixos-render-docs/src/nixos_render_docs/options.py  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index 908c98c8d710..39ea8f8c627f 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -178,6 +178,12 @@ class OptionDocsRestrictions:
     def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
                       env: MutableMapping[str, Any]) -> str:
         raise RuntimeError("md token not supported in options doc", token)
+    def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        raise RuntimeError("md token not supported in options doc", token)
+    def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        raise RuntimeError("md token not supported in options doc", token)
 
 class OptionsDocBookRenderer(OptionDocsRestrictions, DocBookRenderer):
     # TODO keep optionsDocBook diff small. remove soon if rendering is still good.

From 4d3aef762f3c77f0e4040fcc66298b46694a7f6a Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Sat, 4 Feb 2023 23:16:30 +0100
Subject: [PATCH 174/191] nixos-render-docs: add options commonmark converter

the old method of pasting parts of options.json into a markdown document
and hoping for the best no longer works now that options.json contains
more than just docbook. given the infrastructure we have now we can
actually render options.md properly, so we may as well do that.
---
 nixos/lib/make-options-doc/default.nix        |  11 +-
 nixos/lib/make-options-doc/generateDoc.py     |  33 +--
 .../src/nixos_render_docs/commonmark.py       | 231 ++++++++++++++++++
 .../src/nixos_render_docs/options.py          |  76 ++++++
 .../src/tests/test_commonmark.py              |  92 +++++++
 5 files changed, 408 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py
 create mode 100644 pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py

diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index 50fb9ede08de..a0b9136ca7bc 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -98,11 +98,14 @@ in rec {
       > $out
   '';
 
-  optionsCommonMark = pkgs.runCommand "options.md" {} ''
-    ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \
-      --format commonmark \
+  optionsCommonMark = pkgs.runCommand "options.md" {
+    nativeBuildInputs = [ pkgs.nixos-render-docs ];
+  } ''
+    nixos-render-docs -j $NIX_BUILD_CORES options commonmark \
+      --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \
+      --revision ${lib.escapeShellArg revision} \
       ${optionsJSON}/share/doc/nixos/options.json \
-      > $out
+      $out
   '';
 
   optionsJSON = pkgs.runCommand "options.json"
diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py
index 07884ed657e4..a41255067bfb 100644
--- a/nixos/lib/make-options-doc/generateDoc.py
+++ b/nixos/lib/make-options-doc/generateDoc.py
@@ -2,7 +2,7 @@ import argparse
 import json
 import sys
 
-formats = ['commonmark', 'asciidoc']
+formats = ['asciidoc']
 
 parser = argparse.ArgumentParser(
     description = 'Generate documentation for a set of JSON-formatted NixOS options'
@@ -38,33 +38,6 @@ class OptionsEncoder(json.JSONEncoder):
 
         return super().encode(obj)
 
-def generate_commonmark(options):
-    for (name, value) in options.items():
-        print('##', name.replace('<', '&lt;').replace('>', '&gt;'))
-        print(value['description'])
-        print()
-        if 'type' in value:
-            print('*_Type_*')
-            print ('```')
-            print(value['type'])
-            print ('```')
-        print()
-        print()
-        if 'default' in value:
-            print('*_Default_*')
-            print('```')
-            print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
-            print('```')
-        print()
-        print()
-        if 'example' in value:
-            print('*_Example_*')
-            print('```')
-            print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
-            print('```')
-        print()
-        print()
-
 # TODO: declarations: link to github
 def generate_asciidoc(options):
     for (name, value) in options.items():
@@ -103,9 +76,7 @@ def generate_asciidoc(options):
 with open(args.nix_options_path) as nix_options_json:
     options = json.load(nix_options_json)
 
-    if args.format == 'commonmark':
-        generate_commonmark(options)
-    elif args.format == 'asciidoc':
+    if args.format == 'asciidoc':
         generate_asciidoc(options)
     else:
         raise Exception(f'Unsupported documentation format `--format {args.format}`')
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py
new file mode 100644
index 000000000000..4a708b1f92c6
--- /dev/null
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py
@@ -0,0 +1,231 @@
+from collections.abc import Mapping, MutableMapping, Sequence
+from dataclasses import dataclass
+from typing import Any, cast, Optional
+
+from .md import md_escape, md_make_code, Renderer
+
+import markdown_it
+from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
+
+@dataclass(kw_only=True)
+class List:
+    next_idx: Optional[int] = None
+    compact: bool
+    first_item_seen: bool = False
+
+@dataclass
+class Par:
+    indent: str
+    continuing: bool = False
+
+class CommonMarkRenderer(Renderer):
+    __output__ = "commonmark"
+
+    _parstack: list[Par]
+    _link_stack: list[str]
+    _list_stack: list[List]
+
+    def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None):
+        super().__init__(manpage_urls, parser)
+        self._parstack = [ Par("") ]
+        self._link_stack = []
+        self._list_stack = []
+
+    def _enter_block(self, extra_indent: str) -> None:
+        self._parstack.append(Par(self._parstack[-1].indent + extra_indent))
+    def _leave_block(self) -> None:
+        self._parstack.pop()
+        self._parstack[-1].continuing = True
+    def _break(self) -> str:
+        self._parstack[-1].continuing = True
+        return f"\n{self._parstack[-1].indent}"
+    def _maybe_parbreak(self) -> str:
+        result = f"\n{self._parstack[-1].indent}" * 2 if self._parstack[-1].continuing else ""
+        self._parstack[-1].continuing = True
+        return result
+
+    def _admonition_open(self, kind: str) -> str:
+        pbreak = self._maybe_parbreak()
+        self._enter_block("")
+        return f"{pbreak}**{kind}:** "
+    def _admonition_close(self) -> str:
+        self._leave_block()
+        return ""
+
+    def _indent_raw(self, s: str) -> str:
+        if '\n' not in s:
+            return s
+        return f"\n{self._parstack[-1].indent}".join(s.splitlines())
+
+    def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+             env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return self._indent_raw(md_escape(token.content))
+    def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        return self._maybe_parbreak()
+    def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        return ""
+    def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return f"  {self._break()}"
+    def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return self._break()
+    def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                    env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return md_make_code(token.content)
+    def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return self.fence(token, tokens, i, options, env)
+    def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        self._link_stack.append(cast(str, token.attrs['href']))
+        return "["
+    def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return f"]({md_escape(self._link_stack.pop())})"
+    def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        lst = self._list_stack[-1]
+        lbreak = "" if not lst.first_item_seen else self._break() * (1 if lst.compact else 2)
+        lst.first_item_seen = True
+        head = " -"
+        if lst.next_idx is not None:
+            head = f" {lst.next_idx}."
+            lst.next_idx += 1
+        self._enter_block(" " * (len(head) + 1))
+        return f'{lbreak}{head} '
+    def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return ""
+    def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                         env: MutableMapping[str, Any]) -> str:
+        self._list_stack.append(List(compact=bool(token.meta['compact'])))
+        return self._maybe_parbreak()
+    def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                          env: MutableMapping[str, Any]) -> str:
+        self._list_stack.pop()
+        return ""
+    def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        return "*"
+    def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return "*"
+    def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                    env: MutableMapping[str, Any]) -> str:
+        return "**"
+    def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return "**"
+    def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+              env: MutableMapping[str, Any]) -> str:
+        code = token.content
+        if code.endswith('\n'):
+            code = code[:-1]
+        pbreak = self._maybe_parbreak()
+        return pbreak + self._indent_raw(md_make_code(code, info=token.info, multiline=True))
+    def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        pbreak = self._maybe_parbreak()
+        self._enter_block("> ")
+        return pbreak + "> "
+    def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                         env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return ""
+    def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("Note")
+    def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("Caution")
+    def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("Important")
+    def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("Tip")
+    def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("Warning")
+    def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        self._list_stack.append(List(compact=False))
+        return ""
+    def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        self._list_stack.pop()
+        return ""
+    def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        pbreak = self._maybe_parbreak()
+        self._enter_block("   ")
+        # add an opening zero-width non-joiner to separate *our* emphasis from possible
+        # emphasis in the provided term
+        return f'{pbreak} - *{chr(0x200C)}'
+    def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return f"{chr(0x200C)}*"
+    def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return ""
+    def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return ""
+    def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        content = md_make_code(token.content)
+        if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)):
+            return f"[{content}]({url})"
+        return content # no roles in regular commonmark
+    def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        # there's no way we can emit attrspans correctly in all cases. we could use inline
+        # html for ids, but that would not round-trip. same holds for classes. since this
+        # renderer is only used for approximate options export and all of these things are
+        # not allowed in options we can ignore them for now.
+        return ""
+    def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return ""
+    def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return token.markup + " "
+    def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return "\n"
+    def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                          env: MutableMapping[str, Any]) -> str:
+        self._list_stack.append(
+            List(next_idx = cast(int, token.attrs.get('start', 1)),
+                 compact  = bool(token.meta['compact'])))
+        return self._maybe_parbreak()
+    def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                           env: MutableMapping[str, Any]) -> str:
+        self._list_stack.pop()
+        return ""
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index 39ea8f8c627f..d8a24b885f87 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -13,6 +13,7 @@ from xml.sax.saxutils import escape, quoteattr
 import markdown_it
 
 from . import parallel
+from .commonmark import CommonMarkRenderer
 from .docbook import DocBookRenderer, make_xml_id
 from .manpage import ManpageRenderer, man_escape
 from .md import Converter, md_escape, md_make_code
@@ -422,6 +423,59 @@ class ManpageConverter(BaseConverter):
 
         return "\n".join(result)
 
+class OptionsCommonMarkRenderer(OptionDocsRestrictions, CommonMarkRenderer):
+    pass
+
+class CommonMarkConverter(BaseConverter):
+    __renderer__ = OptionsCommonMarkRenderer
+    __option_block_separator__ = ""
+
+    def _parallel_render_prepare(self) -> Any:
+        return (self._manpage_urls, self._revision, self._markdown_by_default)
+    @classmethod
+    def _parallel_render_init_worker(cls, a: Any) -> CommonMarkConverter:
+        return cls(*a)
+
+    def _render_code(self, option: dict[str, Any], key: str) -> list[str]:
+        # NOTE this duplicates the old direct-paste behavior, even if it is somewhat
+        # incorrect, since users rely on it.
+        if lit := option_is(option, key, 'literalDocBook'):
+            return [ f"*{key.capitalize()}:* {lit['text']}" ]
+        else:
+            return super()._render_code(option, key)
+
+    def _render_description(self, desc: str | dict[str, Any]) -> list[str]:
+        # NOTE this duplicates the old direct-paste behavior, even if it is somewhat
+        # incorrect, since users rely on it.
+        if isinstance(desc, str) and not self._markdown_by_default:
+            return [ desc ]
+        else:
+            return super()._render_description(desc)
+
+    def _related_packages_header(self) -> list[str]:
+        return [ "*Related packages:*" ]
+
+    def _decl_def_header(self, header: str) -> list[str]:
+        return [ f"*{header}:*" ]
+
+    def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]:
+        if href is not None:
+            return [ f" - [{md_escape(name)}]({href})" ]
+        return [ f" - {md_escape(name)}" ]
+
+    def _decl_def_footer(self) -> list[str]:
+        return []
+
+    def finalize(self) -> str:
+        result = []
+
+        for (name, opt) in self._sorted_options():
+            result.append(f"## {md_escape(name)}\n")
+            result += opt.lines
+            result.append("\n\n")
+
+        return "\n".join(result)
+
 def _build_cli_db(p: argparse.ArgumentParser) -> None:
     p.add_argument('--manpage-urls', required=True)
     p.add_argument('--revision', required=True)
@@ -437,6 +491,13 @@ def _build_cli_manpage(p: argparse.ArgumentParser) -> None:
     p.add_argument("infile")
     p.add_argument("outfile")
 
+def _build_cli_commonmark(p: argparse.ArgumentParser) -> None:
+    p.add_argument('--manpage-urls', required=True)
+    p.add_argument('--revision', required=True)
+    p.add_argument('--markdown-by-default', default=False, action='store_true')
+    p.add_argument("infile")
+    p.add_argument("outfile")
+
 def _run_cli_db(args: argparse.Namespace) -> None:
     with open(args.manpage_urls, 'r') as manpage_urls:
         md = DocBookConverter(
@@ -464,15 +525,30 @@ def _run_cli_manpage(args: argparse.Namespace) -> None:
     with open(args.outfile, 'w') as f:
         f.write(md.finalize())
 
+def _run_cli_commonmark(args: argparse.Namespace) -> None:
+    with open(args.manpage_urls, 'r') as manpage_urls:
+        md = CommonMarkConverter(
+            json.load(manpage_urls),
+            revision = args.revision,
+            markdown_by_default = args.markdown_by_default)
+
+        with open(args.infile, 'r') as f:
+            md.add_options(json.load(f))
+        with open(args.outfile, 'w') as f:
+            f.write(md.finalize())
+
 def build_cli(p: argparse.ArgumentParser) -> None:
     formats = p.add_subparsers(dest='format', required=True)
     _build_cli_db(formats.add_parser('docbook'))
     _build_cli_manpage(formats.add_parser('manpage'))
+    _build_cli_commonmark(formats.add_parser('commonmark'))
 
 def run_cli(args: argparse.Namespace) -> None:
     if args.format == 'docbook':
         _run_cli_db(args)
     elif args.format == 'manpage':
         _run_cli_manpage(args)
+    elif args.format == 'commonmark':
+        _run_cli_commonmark(args)
     else:
         raise RuntimeError('format not hooked up', args)
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py
new file mode 100644
index 000000000000..5e0d63eb6723
--- /dev/null
+++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py
@@ -0,0 +1,92 @@
+import nixos_render_docs
+
+from sample_md import sample1
+
+from typing import Mapping, Optional
+
+import markdown_it
+
+class Converter(nixos_render_docs.md.Converter):
+    __renderer__ = nixos_render_docs.commonmark.CommonMarkRenderer
+
+# NOTE: in these tests we represent trailing spaces by ` ` and replace them with real space later,
+# since a number of editors will strip trailing whitespace on save and that would break the tests.
+
+def test_indented_fence() -> None:
+    c = Converter({})
+    s = """\
+>  - ```foo
+>    thing
+>      
+>    rest
+>    ```\
+""".replace(' ', ' ')
+    assert c._render(s) == s
+
+def test_full() -> None:
+    c = Converter({ 'man(1)': 'http://example.org' })
+    assert c._render(sample1) == f"""\
+**Warning:** foo
+
+**Note:** nested
+
+[
+multiline
+](link)
+
+[` man(1) `](http://example.org) reference
+
+some nested anchors
+
+*emph* **strong** *nesting emph **and strong** and ` code `*
+
+ - wide bullet
+
+ - list
+
+ 1. wide ordered
+
+ 2. list
+
+ - narrow bullet
+ - list
+
+ 1. narrow ordered
+ 2. list
+
+> quotes
+> 
+> > with *nesting*
+> > 
+> > ```
+> > nested code block
+> > ```
+> 
+>  - and lists
+>  - ```
+>    containing code
+>    ```
+> 
+> and more quote
+
+ 100. list starting at 100
+ 101. goes on
+
+ - *‌deflist‌*
+   
+   > with a quote
+   > and stuff
+   
+   ```
+   code block
+   ```
+   
+   ```
+   fenced block
+   ```
+   
+   text
+
+ - *‌more stuff in same deflist‌*
+   
+   foo""".replace(' ', ' ')

From 417dd2ad16040e43f14705d99298318708848b3e Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Sun, 5 Feb 2023 05:58:14 +0100
Subject: [PATCH 175/191] nixos-render-docs: add options asciidoc converter

same reasoning as for the earlier commonmark converter.
---
 nixos/lib/make-options-doc/default.nix        |  11 +-
 nixos/lib/make-options-doc/generateDoc.py     |  83 ------
 .../src/nixos_render_docs/asciidoc.py         | 262 ++++++++++++++++++
 .../src/nixos_render_docs/options.py          |  77 +++++
 .../src/tests/test_asciidoc.py                | 143 ++++++++++
 5 files changed, 489 insertions(+), 87 deletions(-)
 delete mode 100644 nixos/lib/make-options-doc/generateDoc.py
 create mode 100644 pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py
 create mode 100644 pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py

diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index a0b9136ca7bc..a2385582a014 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -91,11 +91,14 @@ let
 in rec {
   inherit optionsNix;
 
-  optionsAsciiDoc = pkgs.runCommand "options.adoc" {} ''
-    ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \
-      --format asciidoc \
+  optionsAsciiDoc = pkgs.runCommand "options.adoc" {
+    nativeBuildInputs = [ pkgs.nixos-render-docs ];
+  } ''
+    nixos-render-docs -j $NIX_BUILD_CORES options asciidoc \
+      --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \
+      --revision ${lib.escapeShellArg revision} \
       ${optionsJSON}/share/doc/nixos/options.json \
-      > $out
+      $out
   '';
 
   optionsCommonMark = pkgs.runCommand "options.md" {
diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py
deleted file mode 100644
index a41255067bfb..000000000000
--- a/nixos/lib/make-options-doc/generateDoc.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import argparse
-import json
-import sys
-
-formats = ['asciidoc']
-
-parser = argparse.ArgumentParser(
-    description = 'Generate documentation for a set of JSON-formatted NixOS options'
-)
-parser.add_argument(
-    'nix_options_path',
-    help = 'a path to a JSON file containing the NixOS options'
-)
-parser.add_argument(
-    '-f',
-    '--format',
-    choices = formats,
-    required = True,
-    help = f'the documentation format to generate'
-)
-
-args = parser.parse_args()
-
-class OptionsEncoder(json.JSONEncoder):
-    def encode(self, obj):
-        # Unpack literal expressions and other Nix types.
-        # Don't escape the strings: they were escaped when initially serialized to JSON.
-        if isinstance(obj, dict):
-            _type = obj.get('_type')
-            if _type is not None:
-                if _type == 'literalExpression' or _type == 'literalDocBook':
-                    return obj['text']
-
-                if _type == 'derivation':
-                    return obj['name']
-
-                raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}')
-
-        return super().encode(obj)
-
-# TODO: declarations: link to github
-def generate_asciidoc(options):
-    for (name, value) in options.items():
-        print(f'== {name}')
-        print()
-        print(value['description'])
-        print()
-        print('[discrete]')
-        print('=== details')
-        print()
-        print(f'Type:: {value["type"]}')
-        if 'default' in value:
-            print('Default::')
-            print('+')
-            print('----')
-            print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
-            print('----')
-            print()
-        else:
-            print('No Default:: {blank}')
-        if value['readOnly']:
-            print('Read Only:: {blank}')
-        else:
-            print()
-        if 'example' in value:
-            print('Example::')
-            print('+')
-            print('----')
-            print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
-            print('----')
-            print()
-        else:
-            print('No Example:: {blank}')
-        print()
-
-with open(args.nix_options_path) as nix_options_json:
-    options = json.load(nix_options_json)
-
-    if args.format == 'asciidoc':
-        generate_asciidoc(options)
-    else:
-        raise Exception(f'Unsupported documentation format `--format {args.format}`')
-
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py
new file mode 100644
index 000000000000..637185227e83
--- /dev/null
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py
@@ -0,0 +1,262 @@
+from collections.abc import Mapping, MutableMapping, Sequence
+from dataclasses import dataclass
+from typing import Any, cast, Optional
+from urllib.parse import quote
+
+from .md import Renderer
+
+import markdown_it
+from markdown_it.token import Token
+from markdown_it.utils import OptionsDict
+
+_asciidoc_escapes = {
+    # escape all dots, just in case one is pasted at SOL
+    ord('.'): "{zwsp}.",
+    # may be replaced by typographic variants
+    ord("'"): "{apos}",
+    ord('"'): "{quot}",
+    # passthrough character
+    ord('+'): "{plus}",
+    # table marker
+    ord('|'): "{vbar}",
+    # xml entity reference
+    ord('&'): "{amp}",
+    # crossrefs. < needs extra escaping because links break in odd ways if they start with it
+    ord('<'): "{zwsp}+<+{zwsp}",
+    ord('>'): "{gt}",
+    # anchors, links, block attributes
+    ord('['): "{startsb}",
+    ord(']'): "{endsb}",
+    # superscript, subscript
+    ord('^'): "{caret}",
+    ord('~'): "{tilde}",
+    # bold
+    ord('*'): "{asterisk}",
+    # backslash
+    ord('\\'): "{backslash}",
+    # inline code
+    ord('`'): "{backtick}",
+}
+def asciidoc_escape(s: str) -> str:
+    s = s.translate(_asciidoc_escapes)
+    # :: is deflist item, ;; is has a replacement but no idea why
+    return s.replace("::", "{two-colons}").replace(";;", "{two-semicolons}")
+
+@dataclass(kw_only=True)
+class List:
+    head: str
+
+@dataclass()
+class Par:
+    sep: str
+    block_delim: str
+    continuing: bool = False
+
+class AsciiDocRenderer(Renderer):
+    __output__ = "asciidoc"
+
+    _parstack: list[Par]
+    _list_stack: list[List]
+    _attrspans: list[str]
+
+    def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None):
+        super().__init__(manpage_urls, parser)
+        self._parstack = [ Par("\n\n", "====") ]
+        self._list_stack = []
+        self._attrspans = []
+
+    def _enter_block(self, is_list: bool) -> None:
+        self._parstack.append(Par("\n+\n" if is_list else "\n\n", self._parstack[-1].block_delim + "="))
+    def _leave_block(self) -> None:
+        self._parstack.pop()
+    def _break(self, force: bool = False) -> str:
+        result = self._parstack[-1].sep if force or self._parstack[-1].continuing else ""
+        self._parstack[-1].continuing = True
+        return result
+
+    def _admonition_open(self, kind: str) -> str:
+        pbreak = self._break()
+        self._enter_block(False)
+        return f"{pbreak}[{kind}]\n{self._parstack[-2].block_delim}\n"
+    def _admonition_close(self) -> str:
+        self._leave_block()
+        return f"\n{self._parstack[-1].block_delim}\n"
+
+    def _list_open(self, token: Token, head: str) -> str:
+        attrs = []
+        if (idx := token.attrs.get('start')) is not None:
+            attrs.append(f"start={idx}")
+        if token.meta['compact']:
+            attrs.append('options="compact"')
+        if self._list_stack:
+            head *= len(self._list_stack[0].head) + 1
+        self._list_stack.append(List(head=head))
+        return f"{self._break()}[{','.join(attrs)}]"
+    def _list_close(self) -> str:
+        self._list_stack.pop()
+        return ""
+
+    def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+             env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return asciidoc_escape(token.content)
+    def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        return self._break()
+    def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        return ""
+    def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return " +\n"
+    def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return f" "
+    def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                    env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return f"``{asciidoc_escape(token.content)}``"
+    def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return self.fence(token, tokens, i, options, env)
+    def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return f"link:{quote(cast(str, token.attrs['href']), safe='/:')}["
+    def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return "]"
+    def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        self._enter_block(True)
+        # allow the next token to be a block or an inline.
+        return f'\n{self._list_stack[-1].head} {{empty}}'
+    def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return "\n"
+    def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                         env: MutableMapping[str, Any]) -> str:
+        return self._list_open(token, '*')
+    def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                          env: MutableMapping[str, Any]) -> str:
+        return self._list_close()
+    def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        return "__"
+    def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return "__"
+    def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                    env: MutableMapping[str, Any]) -> str:
+        return "**"
+    def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return "**"
+    def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+              env: MutableMapping[str, Any]) -> str:
+        attrs = f"[source,{token.info}]\n" if token.info else ""
+        code = token.content
+        if code.endswith('\n'):
+            code = code[:-1]
+        return f"{self._break(True)}{attrs}----\n{code}\n----"
+    def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        pbreak = self._break(True)
+        self._enter_block(False)
+        return f"{pbreak}[quote]\n{self._parstack[-2].block_delim}\n"
+    def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                         env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return f"\n{self._parstack[-1].block_delim}"
+    def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("NOTE")
+    def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                   env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("CAUTION")
+    def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                       env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("IMPORTANT")
+    def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("TIP")
+    def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return self._admonition_open("WARNING")
+    def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return self._admonition_close()
+    def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        return f"{self._break()}[]"
+    def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        return ""
+    def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        return self._break()
+    def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        self._enter_block(True)
+        return ":: {empty}"
+    def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                env: MutableMapping[str, Any]) -> str:
+        return ""
+    def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                 env: MutableMapping[str, Any]) -> str:
+        self._leave_block()
+        return "\n"
+    def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                  env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        content = asciidoc_escape(token.content)
+        if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)):
+            return f"link:{quote(url, safe='/:')}[{content}]"
+        return f"[.{token.meta['name']}]``{asciidoc_escape(token.content)}``"
+    def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        return f"[[{token.attrs['id']}]]"
+    def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                        env: MutableMapping[str, Any]) -> str:
+        self._parstack[-1].continuing = True
+        (id_part, class_part) = ("", "")
+        if id := token.attrs.get('id'):
+            id_part = f"[[{id}]]"
+        if s := token.attrs.get('class'):
+            if s == 'keycap':
+                class_part = "kbd:["
+                self._attrspans.append("]")
+            else:
+                return super().attr_span_begin(token, tokens, i, options, env)
+        else:
+            self._attrspans.append("")
+        return id_part + class_part
+    def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return self._attrspans.pop()
+    def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                     env: MutableMapping[str, Any]) -> str:
+        return token.markup.replace("#", "=") + " "
+    def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                      env: MutableMapping[str, Any]) -> str:
+        return "\n"
+    def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                          env: MutableMapping[str, Any]) -> str:
+        return self._list_open(token, '.')
+    def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+                           env: MutableMapping[str, Any]) -> str:
+        return self._list_close()
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
index d8a24b885f87..f29d8fdb8968 100644
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
@@ -8,11 +8,13 @@ from collections.abc import Mapping, MutableMapping, Sequence
 from markdown_it.utils import OptionsDict
 from markdown_it.token import Token
 from typing import Any, Optional
+from urllib.parse import quote
 from xml.sax.saxutils import escape, quoteattr
 
 import markdown_it
 
 from . import parallel
+from .asciidoc import AsciiDocRenderer, asciidoc_escape
 from .commonmark import CommonMarkRenderer
 from .docbook import DocBookRenderer, make_xml_id
 from .manpage import ManpageRenderer, man_escape
@@ -476,6 +478,59 @@ class CommonMarkConverter(BaseConverter):
 
         return "\n".join(result)
 
+class OptionsAsciiDocRenderer(OptionDocsRestrictions, AsciiDocRenderer):
+    pass
+
+class AsciiDocConverter(BaseConverter):
+    __renderer__ = AsciiDocRenderer
+    __option_block_separator__ = ""
+
+    def _parallel_render_prepare(self) -> Any:
+        return (self._manpage_urls, self._revision, self._markdown_by_default)
+    @classmethod
+    def _parallel_render_init_worker(cls, a: Any) -> AsciiDocConverter:
+        return cls(*a)
+
+    def _render_code(self, option: dict[str, Any], key: str) -> list[str]:
+        # NOTE this duplicates the old direct-paste behavior, even if it is somewhat
+        # incorrect, since users rely on it.
+        if lit := option_is(option, key, 'literalDocBook'):
+            return [ f"*{key.capitalize()}:* {lit['text']}" ]
+        else:
+            return super()._render_code(option, key)
+
+    def _render_description(self, desc: str | dict[str, Any]) -> list[str]:
+        # NOTE this duplicates the old direct-paste behavior, even if it is somewhat
+        # incorrect, since users rely on it.
+        if isinstance(desc, str) and not self._markdown_by_default:
+            return [ desc ]
+        else:
+            return super()._render_description(desc)
+
+    def _related_packages_header(self) -> list[str]:
+        return [ "__Related packages:__" ]
+
+    def _decl_def_header(self, header: str) -> list[str]:
+        return [ f"__{header}:__\n" ]
+
+    def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]:
+        if href is not None:
+            return [ f"* link:{quote(href, safe='/:')}[{asciidoc_escape(name)}]" ]
+        return [ f"* {asciidoc_escape(name)}" ]
+
+    def _decl_def_footer(self) -> list[str]:
+        return []
+
+    def finalize(self) -> str:
+        result = []
+
+        for (name, opt) in self._sorted_options():
+            result.append(f"== {asciidoc_escape(name)}\n")
+            result += opt.lines
+            result.append("\n\n")
+
+        return "\n".join(result)
+
 def _build_cli_db(p: argparse.ArgumentParser) -> None:
     p.add_argument('--manpage-urls', required=True)
     p.add_argument('--revision', required=True)
@@ -498,6 +553,13 @@ def _build_cli_commonmark(p: argparse.ArgumentParser) -> None:
     p.add_argument("infile")
     p.add_argument("outfile")
 
+def _build_cli_asciidoc(p: argparse.ArgumentParser) -> None:
+    p.add_argument('--manpage-urls', required=True)
+    p.add_argument('--revision', required=True)
+    p.add_argument('--markdown-by-default', default=False, action='store_true')
+    p.add_argument("infile")
+    p.add_argument("outfile")
+
 def _run_cli_db(args: argparse.Namespace) -> None:
     with open(args.manpage_urls, 'r') as manpage_urls:
         md = DocBookConverter(
@@ -537,11 +599,24 @@ def _run_cli_commonmark(args: argparse.Namespace) -> None:
         with open(args.outfile, 'w') as f:
             f.write(md.finalize())
 
+def _run_cli_asciidoc(args: argparse.Namespace) -> None:
+    with open(args.manpage_urls, 'r') as manpage_urls:
+        md = AsciiDocConverter(
+            json.load(manpage_urls),
+            revision = args.revision,
+            markdown_by_default = args.markdown_by_default)
+
+        with open(args.infile, 'r') as f:
+            md.add_options(json.load(f))
+        with open(args.outfile, 'w') as f:
+            f.write(md.finalize())
+
 def build_cli(p: argparse.ArgumentParser) -> None:
     formats = p.add_subparsers(dest='format', required=True)
     _build_cli_db(formats.add_parser('docbook'))
     _build_cli_manpage(formats.add_parser('manpage'))
     _build_cli_commonmark(formats.add_parser('commonmark'))
+    _build_cli_asciidoc(formats.add_parser('asciidoc'))
 
 def run_cli(args: argparse.Namespace) -> None:
     if args.format == 'docbook':
@@ -550,5 +625,7 @@ def run_cli(args: argparse.Namespace) -> None:
         _run_cli_manpage(args)
     elif args.format == 'commonmark':
         _run_cli_commonmark(args)
+    elif args.format == 'asciidoc':
+        _run_cli_asciidoc(args)
     else:
         raise RuntimeError('format not hooked up', args)
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py
new file mode 100644
index 000000000000..487506469954
--- /dev/null
+++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py
@@ -0,0 +1,143 @@
+import nixos_render_docs
+
+from sample_md import sample1
+
+class Converter(nixos_render_docs.md.Converter):
+    __renderer__ = nixos_render_docs.asciidoc.AsciiDocRenderer
+
+def test_lists() -> None:
+    c = Converter({})
+    # attaching to the nth ancestor list requires n newlines before the +
+    assert c._render("""\
+- a
+
+  b
+- c
+  - d
+    - e
+
+      1
+
+  f
+""") == """\
+[]
+* {empty}a
++
+b
+
+* {empty}c
++
+[options="compact"]
+** {empty}d
++
+[]
+** {empty}e
++
+1
+
+
++
+f
+"""
+
+def test_full() -> None:
+    c = Converter({ 'man(1)': 'http://example.org' })
+    assert c._render(sample1) == """\
+[WARNING]
+====
+foo
+
+[NOTE]
+=====
+nested
+=====
+
+====
+
+
+link:link[ multiline ]
+
+link:http://example.org[man(1)] reference
+
+[[b]]some [[a]]nested anchors
+
+__emph__ **strong** __nesting emph **and strong** and ``code``__
+
+[]
+* {empty}wide bullet
+
+* {empty}list
+
+
+[]
+. {empty}wide ordered
+
+. {empty}list
+
+
+[options="compact"]
+* {empty}narrow bullet
+
+* {empty}list
+
+
+[options="compact"]
+. {empty}narrow ordered
+
+. {empty}list
+
+
+[quote]
+====
+quotes
+
+[quote]
+=====
+with __nesting__
+
+----
+nested code block
+----
+=====
+
+[options="compact"]
+* {empty}and lists
+
+* {empty}
++
+----
+containing code
+----
+
+
+and more quote
+====
+
+[start=100,options="compact"]
+. {empty}list starting at 100
+
+. {empty}goes on
+
+
+[]
+
+deflist:: {empty}
++
+[quote]
+=====
+with a quote and stuff
+=====
++
+----
+code block
+----
++
+----
+fenced block
+----
++
+text
+
+
+more stuff in same deflist:: {empty}foo
+"""

From ef152889444108666b516c0905fd8f786d427038 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Tue, 21 Feb 2023 17:24:08 +0000
Subject: [PATCH 176/191] texlive: use lists instead of sets to represent
 dependencies (#217230)

---
 .../tools/typesetting/tex/texlive/combine.nix |     2 +-
 .../tools/typesetting/tex/texlive/default.nix |    27 +-
 pkgs/tools/typesetting/tex/texlive/pkgs.nix   | 11778 ++++++++--------
 pkgs/tools/typesetting/tex/texlive/tl2nix.sed |     8 +-
 4 files changed, 6220 insertions(+), 5595 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 012f03d0e120..5caebace7cbd 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -15,7 +15,7 @@ let
     ];
   };
   pkgList = rec {
-    all = lib.filter pkgFilter (combinePkgs pkgSet);
+    all = lib.filter pkgFilter (combinePkgs (lib.attrValues pkgSet));
     splitBin = builtins.partition (p: p.tlType == "bin") all;
     bin = mkUniqueOutPaths splitBin.right
       ++ lib.optional
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index e7aaac3c8de6..94b8c2db9035 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -30,9 +30,9 @@ let
 
   # the set of TeX Live packages, collections, and schemes; using upstream naming
   tl = let
-    orig = import ./pkgs.nix tl;
+    orig = import ./pkgs.nix;
     removeSelfDep = lib.mapAttrs
-      (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; }
+      (n: p: if p ? deps then p // { deps = lib.filter (dn: n != dn) p.deps; }
                          else p);
     clean = removeSelfDep (orig // {
       # overrides of texlive.tlpdb
@@ -42,24 +42,24 @@ let
       };
 
       xdvi = orig.xdvi // { # it seems to need it to transform fonts
-        deps = (orig.xdvi.deps or {}) // { inherit (tl) metafont; };
+        deps = (orig.xdvi.deps or []) ++  [ "metafont" ];
       };
 
       # remove dependency-heavy packages from the basic collections
       collection-basic = orig.collection-basic // {
-        deps = removeAttrs orig.collection-basic.deps [ "metafont" "xdvi" ];
+        deps = lib.filter (n: n != "metafont" && n != "xdvi") orig.collection-basic.deps;
       };
       # add them elsewhere so that collections cover all packages
       collection-metapost = orig.collection-metapost // {
-        deps = orig.collection-metapost.deps // { inherit (tl) metafont; };
+        deps = orig.collection-metapost.deps ++ [ "metafont" ];
       };
       collection-plaingeneric = orig.collection-plaingeneric // {
-        deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; };
+        deps = orig.collection-plaingeneric.deps ++ [ "xdvi" ];
       };
 
       # override cyclic dependency until #167226 is fixed
       xecjk = orig.xecjk // {
-        deps = removeAttrs orig.xecjk.deps [ "ctex" ];
+        deps = lib.remove "ctex" orig.xecjk.deps;
       };
 
       texdoc = orig.texdoc // {
@@ -82,8 +82,11 @@ let
       };
     }); # overrides
 
-    # tl =
-    in lib.mapAttrs flatDeps clean;
+    linkDeps = lib.mapAttrs (_: attrs: attrs // lib.optionalAttrs (attrs ? deps) {
+      deps = builtins.map (n: tl.${n}) attrs.deps;
+    }); # transform [ "dep1" "dep2" ... ] into [ tl."dep1" ... ]
+
+    in lib.mapAttrs flatDeps (linkDeps clean);
     # TODO: texlive.infra for web2c config?
 
 
@@ -113,7 +116,7 @@ let
         ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source")
         ++ lib.optional (bin ? ${pname})
             ( bin.${pname} // { inherit pname; tlType = "bin"; } )
-        ++ combinePkgs (attrs.deps or {});
+        ++ combinePkgs (attrs.deps or []);
     };
 
   # for daily snapshots
@@ -183,8 +186,8 @@ let
       );
 
   # combine a set of TL packages into a single TL meta-package
-  combinePkgs = pkgSet: lib.concatLists # uniqueness is handled in `combine`
-    (lib.mapAttrsToList (_n: a: a.pkgs) pkgSet);
+  combinePkgs = pkgList: lib.concatLists # uniqueness is handled in `combine`
+    (builtins.map (a: a.pkgs) pkgList);
 
 in
   tl // {
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index 1889f4df197a..222d56b4f135 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -1,4 +1,4 @@
-tl: { # no indentation
+{ # no indentation
 "12many" = {
   revision = 15878;
   stripPrefix = 0;
@@ -226,9 +226,11 @@ tl: { # no indentation
 "acro" = {
   revision = 62925;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
+  deps = [
+    "etoolbox"
+    "l3kernel"
+    "l3packages"
+  ];
   sha512.run = "25c0dc9cda98db7ead55613aea92946cd90e7edfa1213d59966eb8fdd93ae1bc7b532f7849c43fb8fa77291b23dc5d8dc80cba4584c991a7b38e55564bd59ea3";
   sha512.doc = "c827f8dc5fa88b67e84e48d0cfb6d47aa5bfa98fbceed86e6262d98111a956d425d0a2f3cf54b18cba7593dfac17accc2cbe71cc04f1ea2157c511d670c41daa";
   hasRunfiles = true;
@@ -356,9 +358,11 @@ tl: { # no indentation
 "adjustbox" = {
   revision = 64967;
   stripPrefix = 0;
-  deps."collectbox" = tl."collectbox";
-  deps."graphics" = tl."graphics";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "collectbox"
+    "graphics"
+    "xkeyval"
+  ];
   sha512.run = "ac12b052b2112d5bcd942888ab69fa20aca6e2b392bf868959b8573ee8611d93042de3f90eace1519a89d0da64d2dcb3046e26fb0f86f46ea3e673e2a2aee2c8";
   sha512.doc = "d48b405a472df491b3ac6db23b126a70acda26e4dc2baf8e60569f110af2c4c740708c84fad9b70f689022e8747013198c98ea0bb3c6798f1dd8065a431d1ba5";
   sha512.source = "08da88fe2a344716e7184ac2cadf564a90def84c03af8270a2f5e906ae720a7794dcb2707af5e41ab41406b01021029f4272c3e2844e9e36cd913ab56f049ba3";
@@ -514,12 +518,14 @@ tl: { # no indentation
 };
 "aleph" = {
   revision = 62387;
-  deps."cm" = tl."cm";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."lambda" = tl."lambda";
-  deps."latex" = tl."latex";
-  deps."plain" = tl."plain";
+  deps = [
+    "cm"
+    "hyphen-base"
+    "knuth-lib"
+    "lambda"
+    "latex"
+    "plain"
+  ];
   hasFormats = true;
   sha512.run = "222d0c7045ddfdde5f0ca0ebe20a029c32fd0d4f35326c5ead6bf4ebbcadc86a2a2ff609bca3a6c3a04a09828c50c885f49ef9da0e6e548c18c2633400865c7f";
   sha512.doc = "77d2daaacfa99d7f4ed5b70706751936bed5ae00ac67490e428d900b5fee3d78797d2324039743cbf0cb06a3a03dba17643d67d9057d020a95a536c860d5e78e";
@@ -802,12 +808,14 @@ tl: { # no indentation
 };
 "amstex" = {
   revision = 63708;
-  deps."amsfonts" = tl."amsfonts";
-  deps."cm" = tl."cm";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."plain" = tl."plain";
-  deps."tex" = tl."tex";
+  deps = [
+    "amsfonts"
+    "cm"
+    "hyphen-base"
+    "knuth-lib"
+    "plain"
+    "tex"
+  ];
   hasFormats = true;
   sha512.run = "d92156cc5a01152776378c8809993b2ccbc9e917125d2ecfd2a06482401008385928e279a8832f328f7a8f4f3eeb746f9725e4986e4eb2f478c20a432ea8698e";
   sha512.doc = "ba87f3c3858ad7d86de6bcc03e50c5407e83f9de4bd3b3c63e3ce612fc5f933fba0d10bbad88525bae0a1f489adbd02643687f650874409962ee5b29447e14e8";
@@ -913,7 +921,9 @@ tl: { # no indentation
 "antomega" = {
   revision = 21933;
   stripPrefix = 0;
-  deps."omega" = tl."omega";
+  deps = [
+    "omega"
+  ];
   sha512.run = "af2cbe945ac3495e94fbf69797c05d9a7cd8c3874148c54c602a4a152c669638cf7a861949a3cc2d08aa21f378b57beffddf2d13e3afc1157c74472c348f5405";
   sha512.doc = "298b2e796736f7598a83a2d4fee53f48e78d0c8b255cc09c686371a3a05a4d36736cef96d812281cfd3fe1024af433f32e117c1c60d7559809220ed8dd5e56a9";
   sha512.source = "7ee92461e60834af1f736f387823788a44d680171d9a7acbfd71c858885e190f724b5db11074efb74faf63b471af5c34688af1be5b765de67b170dbcf123fe2f";
@@ -1615,9 +1625,11 @@ tl: { # no indentation
 "auto-pst-pdf" = {
   revision = 56596;
   stripPrefix = 0;
-  deps."ifplatform" = tl."ifplatform";
-  deps."iftex" = tl."iftex";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "ifplatform"
+    "iftex"
+    "xkeyval"
+  ];
   sha512.run = "5c1f85a0ec5aa4173181b087a1f5f8e30be6d8c21c3461999a85b42032d45292aa6f8aae4922a5e97d073fff5b2c9d114cd30f5d5bb73ef523718e891ce59473";
   sha512.doc = "73d6f4b2e298eedc537a46c1e69bce9e160eb28e6bc2f631596a4fd3aa658d8b51d6dfddb6748b7e629fe564a2ced5e55bcd766650616d936a4197e368b2fcd7";
   sha512.source = "199e9fefcb2f96f1ad9e33abeecedcff9c72f20614c48951197703ff65901763ef88f425af08021b1843f30c3ee8e3a9756095ad4b165772b829a29c6e5515f2";
@@ -1627,7 +1639,9 @@ tl: { # no indentation
 "auto-pst-pdf-lua" = {
   revision = 54779;
   stripPrefix = 0;
-  deps."iftex" = tl."iftex";
+  deps = [
+    "iftex"
+  ];
   sha512.run = "053adb8525158b1c0703333bc9a20d3923468da54db4400f83c8c651820a01a9569542afb5502b56abf7034122fe5baf17ea6d2e7d7dbe53acdc7c2f9b1de68d";
   sha512.doc = "dc7647af18502d3f7d88cb9dde9a4bc467204a78d6f6ef441d7593aeb2f9776532eddb94350081619986a0dece023c2ece54d3dce554188f5b62056b7a1a96b8";
   hasRunfiles = true;
@@ -2324,8 +2338,10 @@ tl: { # no indentation
 "bangla" = {
   revision = 60159;
   stripPrefix = 0;
-  deps."charissil" = tl."charissil";
-  deps."doulossil" = tl."doulossil";
+  deps = [
+    "charissil"
+    "doulossil"
+  ];
   sha512.run = "adeed1b1f42ef1c76406c376d5f672870feedd4ccdc8db382b057dea6dceecca6e53de7d2c0ca154def6b0be67c05aa46e959c89829f564a3acc6805462bb4bc";
   sha512.doc = "d62d6a72c268421033767b3d2c131583e62e0c139ea3e101094752616498111badc5f0544294e836715dc7b3fffd5da9d9e4d3a4103fd2090f38e7ee31afe5be";
   hasRunfiles = true;
@@ -2545,17 +2561,19 @@ tl: { # no indentation
 "beamer" = {
   revision = 64388;
   stripPrefix = 0;
-  deps."amscls" = tl."amscls";
-  deps."amsfonts" = tl."amsfonts";
-  deps."amsmath" = tl."amsmath";
-  deps."atbegshi" = tl."atbegshi";
-  deps."etoolbox" = tl."etoolbox";
-  deps."geometry" = tl."geometry";
-  deps."hyperref" = tl."hyperref";
-  deps."iftex" = tl."iftex";
-  deps."pgf" = tl."pgf";
-  deps."translator" = tl."translator";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "amscls"
+    "amsfonts"
+    "amsmath"
+    "atbegshi"
+    "etoolbox"
+    "geometry"
+    "hyperref"
+    "iftex"
+    "pgf"
+    "translator"
+    "xcolor"
+  ];
   sha512.run = "27118c5f5dd76a6c7cd0fb74fd8420c5a0b30655ffd57a1677f7e92163f81992ecfaa13cfbf9e2a0d47069980d0364848bcb0c24b120163833fed09c589f54ba";
   sha512.doc = "52512e5966c4b6f6b7d4660c61115d8ec3fea2b4e3dfd065fcbf4ea6bb9fb1895f48a69f092482932a73c74004b14026fb844ab3d358af706ead011a63053339";
   hasRunfiles = true;
@@ -2847,7 +2865,9 @@ tl: { # no indentation
 "beaulivre" = {
   revision = 64280;
   stripPrefix = 0;
-  deps."colorist" = tl."colorist";
+  deps = [
+    "colorist"
+  ];
   sha512.run = "7fa9fac71a151bc1e100ed3ad4261cb4d76df8734d424ba5600f73d526f48183f3d7024426be5c35114b20e6ff341f3cf735dfafaa96d17a42a4d7fc0e54179a";
   sha512.doc = "d489dadc440661b8c8ceb645a5a2ffbc50c5461d9fb1ac9964be76907aa250f657a1b6bbb7a4f8674babdece60958ce1f089a953e6597af971ace22184eb2d1a";
   hasRunfiles = true;
@@ -3024,7 +3044,9 @@ tl: { # no indentation
 };
 "bib2gls" = {
   revision = 65104;
-  deps."glossaries-extra" = tl."glossaries-extra";
+  deps = [
+    "glossaries-extra"
+  ];
   sha512.run = "009e393b3083a3260642cb36dc463c714689d1b32d07885c9d20092e4f7386d05118c452e6f97001120f70558a69aa58d757ae0998cefe10e164bb172e432fbf";
   sha512.doc = "2a22e662fa0c41581a3c9d9496f97854ea2faa0d01970ab0cc0542048d0ebdcfcbf7ddc7fcf519510d99300eb6634f1c7688874cf02cf6052962d903c5810887";
   sha512.source = "da69973053fda82589612813834134837cf9680f4257a6336aed08213df0ff4c34dbef3c7edb833c7987549599cc48ae82dec36bac96dda003e3de3d1422bc6d";
@@ -3042,9 +3064,11 @@ tl: { # no indentation
 };
 "bibcop" = {
   revision = 65306;
-  deps."fancyvrb" = tl."fancyvrb";
-  deps."iexec" = tl."iexec";
-  deps."verbatimcopy" = tl."verbatimcopy";
+  deps = [
+    "fancyvrb"
+    "iexec"
+    "verbatimcopy"
+  ];
   sha512.run = "d0b510a55ba24daf97727cd7b81174839276c4c8d467ec2ca1ea9729341d214fedfdd0b05650e33525e67f0c29b46e5e5337d8e08af8d07ba208b91b5ee526cc";
   sha512.doc = "1d36da4a989a59a1a044f310232207a9dd2d20a9cbb55dd5b0f2c52674d1a3ac54cba16de2e634e520a1a4e1e186ceff871ef701165313b4dcac615306700dff";
   sha512.source = "66dedb1e1cebd4cffc1aa411caf621b819c3a718561d899bc144574afd84313205bb14a0966838e0ddb77ad9dd7ab5fdf3570e1131bcb6138d4b27a9189ba4d3";
@@ -3084,11 +3108,13 @@ tl: { # no indentation
 "biblatex" = {
   revision = 63878;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."kvoptions" = tl."kvoptions";
-  deps."logreq" = tl."logreq";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."url" = tl."url";
+  deps = [
+    "etoolbox"
+    "kvoptions"
+    "logreq"
+    "pdftexcmds"
+    "url"
+  ];
   sha512.run = "a879c80e266b55d653dead15774e5b08ae827a5bbd8a17d7a6e2f9bf240bbc5be88a0c01df9d4b1ef7ccd3a55d0c7e4ef9b65018bcfd13b209ea370c951cb539";
   sha512.doc = "c941c5c976981fec48a86fafec6a7e8f80d36d1aa766f1b8fc798a2ed934f2f7f1ec17467743afc3e9e4d8fce21d0cd95bdfd378be35c7cd4ef239e49872ff7c";
   hasRunfiles = true;
@@ -3393,11 +3419,13 @@ tl: { # no indentation
 "biblatex-ms" = {
   revision = 64180;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."kvoptions" = tl."kvoptions";
-  deps."logreq" = tl."logreq";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."url" = tl."url";
+  deps = [
+    "etoolbox"
+    "kvoptions"
+    "logreq"
+    "pdftexcmds"
+    "url"
+  ];
   sha512.run = "cef1cecae6fa89d761f5eda158e495e40e0e77500eec84e4a08df7bacfa3a03fffe1b8e50b27e9456cbd6f393fae6293e61df69faa21e5a245e18c2b13722d86";
   sha512.doc = "9dce37ce0bc21b81bfbaeb2855b81089fb32c3a8b4547ec8197638d1063f2b126f4e94e3dab6164beab71abb66f8a2cce9e4f7efd5494295556156c55679f586";
   hasRunfiles = true;
@@ -3684,7 +3712,9 @@ tl: { # no indentation
 };
 "bibtex" = {
   revision = 64491;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "fadbb6ca18794e52b40a7083db41c5f1d42e47ce93daed7a551bf8e263f8aac8302578f23fe915c3706e4e3603cbdc9cafc55b07c895542a60eb1670ce07d628";
   sha512.doc = "6e1433e40fd604e391be05b9b68449cb6804488a42aac802d8960407930f99ae4450b77afe1baae4fe9b4d20b48c359472cf6c1e0a67d6f0a4a87cbffaaf1d8c";
   hasRunfiles = true;
@@ -3897,7 +3927,9 @@ tl: { # no indentation
 "bitset" = {
   revision = 53837;
   stripPrefix = 0;
-  deps."bigintcalc" = tl."bigintcalc";
+  deps = [
+    "bigintcalc"
+  ];
   sha512.run = "b1c9121312404d3daf6907623972c35e0f36cfb4197e589bd937c145506cb5a2d9d8c1f665ae3b4d3ec093e55bb146c0b67cd0858425b704fe29989b9924ccb7";
   sha512.doc = "a5a3ba9d27dc3d9658c1d261f798fdc5e6dc4cedd85287ef77d2a0341048d71f8575d4fbd711e499233e0991c51765953931d87d40dd22fa2a4e8ecb9f2a8dab";
   sha512.source = "40580c17ac81137d533eb013ed14bc092281b354ce42883c0a3c33ee7843be7ebed0ce642746ba9e173bedf8ee6f6c243b65e692ef2a50654ada23e323166c89";
@@ -4951,7 +4983,9 @@ tl: { # no indentation
 "cbfonts" = {
   revision = 54080;
   stripPrefix = 0;
-  deps."cbfonts-fd" = tl."cbfonts-fd";
+  deps = [
+    "cbfonts-fd"
+  ];
   sha512.run = "0e7cecfdfa102113f75f46f9c8bc76f578fca6c967128bb8b203af76cc64cbefd123ae87a8b04a9780f498517bd9f660d12e2dc586220f2c12cc8aa76f1aa40a";
   sha512.doc = "a069b7ca1b46e5656a05a5e38a0f9ea5c3ab1e5301edc47d7fdd43817a8f5d641980c2e54b7731dcbcf16e12f0dff17df5a816d66f7bd2b613232788815bb8e0";
   hasRunfiles = true;
@@ -5311,7 +5345,9 @@ tl: { # no indentation
 "chemformula" = {
   revision = 61719;
   stripPrefix = 0;
-  deps."units" = tl."units";
+  deps = [
+    "units"
+  ];
   sha512.run = "907efcb72ebf3a315bffc11a8d78caa82b510993b4a4de1da8a960bbd6c66bdf5bc202933fce5f4f0626ad4507a5095b571487beb2414bc49bd37e735f0299f1";
   sha512.doc = "c839fed7313744c6abb77fd4f803524c47af7f9ca0e4b533b307a198cc2fefc072541d58afca8cfab6a17b85ecdda4d3bacd451ac9616b47a448560a97f3b62a";
   hasRunfiles = true;
@@ -5613,11 +5649,13 @@ tl: { # no indentation
 "churchslavonic" = {
   revision = 42751;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."fonts-churchslavonic" = tl."fonts-churchslavonic";
-  deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic";
-  deps."oberdiek" = tl."oberdiek";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "etoolbox"
+    "fonts-churchslavonic"
+    "hyphen-churchslavonic"
+    "oberdiek"
+    "xcolor"
+  ];
   sha512.run = "6c572235b95bb1f8407addefdefa1d7d3facc09b963f4d65d2be317986eb6523db9a8ff7104f15c526962ea8fbd0e1430b68867bf619cebc9b494f5cc04bfb07";
   sha512.doc = "90d563afc8248ded0ea4f30ff685e2fd9da8dec7ea92a3d4313040905be883af3f11393a031ec85ad39e9e51d374557e0f1f373a78caf855d2048fc4e0393e37";
   hasRunfiles = true;
@@ -5673,14 +5711,16 @@ tl: { # no indentation
 };
 "citation-style-language" = {
   revision = 65357;
-  deps."filehook" = tl."filehook";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."lua-uca" = tl."lua-uca";
-  deps."lualibs" = tl."lualibs";
-  deps."luatex" = tl."luatex";
-  deps."luaxml" = tl."luaxml";
-  deps."url" = tl."url";
+  deps = [
+    "filehook"
+    "l3kernel"
+    "l3packages"
+    "lua-uca"
+    "lualibs"
+    "luatex"
+    "luaxml"
+    "url"
+  ];
   sha512.run = "4260ef2c25c7350e01a0bb7b7372a63da723c81a473ecad7346962c49ce35b68d5385863bf3ad742bd4da79720d4d240293f65677e01cdc41993509a5999cd21";
   sha512.doc = "19c2336b57d8da88dcf22a92e54872a0d9548d5b2f9433ef155534c29f935988056240064ee863fa4a86caaa93dd0e4873725342c698bddabcbc90b771fb8d60";
   hasRunfiles = true;
@@ -5729,12 +5769,14 @@ tl: { # no indentation
 "cjk" = {
   revision = 60865;
   stripPrefix = 0;
-  deps."arphic" = tl."arphic";
-  deps."cns" = tl."cns";
-  deps."garuda-c90" = tl."garuda-c90";
-  deps."norasi-c90" = tl."norasi-c90";
-  deps."uhc" = tl."uhc";
-  deps."wadalab" = tl."wadalab";
+  deps = [
+    "arphic"
+    "cns"
+    "garuda-c90"
+    "norasi-c90"
+    "uhc"
+    "wadalab"
+  ];
   sha512.run = "b13712912e479dab68cab9027042be8cb11047ebf9c034f532c857e83d28f19dfea5a1748685cfe1847c7372f2d0982f79736525694d937c88962c5262094585";
   sha512.doc = "a8c6b2d4d0899b841ccc32b378855d61bdaa65d5f68fd408df3894d386bcde18f384410f34e6f33ee2a5ce770e1e663a05ab038d9b7483012a3cb414739c3705";
   sha512.source = "88be587328daedfed3bdcb289b1a03343bd7257ae180a9e0857a6b00f173f601eccd8e5978dd29c2d95fbab180fcfd5135a682c5218325fc6b664f2cd505213c";
@@ -5752,7 +5794,9 @@ tl: { # no indentation
 "cjk-ko" = {
   revision = 63561;
   stripPrefix = 0;
-  deps."cjk" = tl."cjk";
+  deps = [
+    "cjk"
+  ];
   sha512.run = "be65ef03300b8fccc4012ece68570a86797e36267ea2f531fead77659cf7bf2a315cca1a3e3386f8d1dc09cbb3b44b20dafb3e0e0cbd53bddb1a368c984937b0";
   sha512.doc = "3ffcae00a4a0dcd175fcf864c3c0c578d7926917216b4a785c0a46074ef013eafe9458ba9010d14f081c63ab4ee0941d0597dace373eb178369de9caa210a16b";
   hasRunfiles = true;
@@ -5842,8 +5886,10 @@ tl: { # no indentation
 "clicks" = {
   revision = 64602;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "etoolbox"
+    "xkeyval"
+  ];
   sha512.run = "7218b2bf0f28a0ed382e4884aa30b59c2d8bff76a3d7a09461e5e3ebf1f41648889005db3c79fe203a4d3753a65f76a48058582e25f57e61d972e8256657712e";
   sha512.doc = "fc84edae6c263a889ea5b1d7a99b5fdf2c22bbb45c9c104e63d821a80b498d1932e654034f289a7470a15cb2ea6082eb8d8fedce24b21b9ccbd5e4304043d6b3";
   sha512.source = "ff19c270587c08c28db6cad54e2a58ce23f6041b08b6d611b7ffe6fe2b6506c1a7ae33ded3fe3ec59cee3fcfc276e6a1dc3750291b4f7691255066805ca90158";
@@ -6232,4417 +6278,4495 @@ tl: { # no indentation
 "collection-basic" = {
   revision = 59159;
   stripPrefix = 0;
-  deps."amsfonts" = tl."amsfonts";
-  deps."bibtex" = tl."bibtex";
-  deps."cm" = tl."cm";
-  deps."colorprofiles" = tl."colorprofiles";
-  deps."dvipdfmx" = tl."dvipdfmx";
-  deps."dvips" = tl."dvips";
-  deps."ec" = tl."ec";
-  deps."enctex" = tl."enctex";
-  deps."etex" = tl."etex";
-  deps."etex-pkg" = tl."etex-pkg";
-  deps."glyphlist" = tl."glyphlist";
-  deps."graphics-def" = tl."graphics-def";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."hyphenex" = tl."hyphenex";
-  deps."ifplatform" = tl."ifplatform";
-  deps."iftex" = tl."iftex";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."knuth-local" = tl."knuth-local";
-  deps."kpathsea" = tl."kpathsea";
-  deps."lua-alt-getopt" = tl."lua-alt-getopt";
-  deps."luahbtex" = tl."luahbtex";
-  deps."luatex" = tl."luatex";
-  deps."makeindex" = tl."makeindex";
-  deps."metafont" = tl."metafont";
-  deps."mflogo" = tl."mflogo";
-  deps."mfware" = tl."mfware";
-  deps."modes" = tl."modes";
-  deps."pdftex" = tl."pdftex";
-  deps."plain" = tl."plain";
-  deps."tex" = tl."tex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."texlive-common" = tl."texlive-common";
-  deps."texlive-en" = tl."texlive-en";
-  deps."texlive-msg-translations" = tl."texlive-msg-translations";
-  deps."texlive-scripts" = tl."texlive-scripts";
-  deps."tlshell" = tl."tlshell";
-  deps."unicode-data" = tl."unicode-data";
-  deps."xdvi" = tl."xdvi";
+  deps = [
+    "amsfonts"
+    "bibtex"
+    "cm"
+    "colorprofiles"
+    "dvipdfmx"
+    "dvips"
+    "ec"
+    "enctex"
+    "etex"
+    "etex-pkg"
+    "glyphlist"
+    "graphics-def"
+    "hyph-utf8"
+    "hyphen-base"
+    "hyphenex"
+    "ifplatform"
+    "iftex"
+    "knuth-lib"
+    "knuth-local"
+    "kpathsea"
+    "lua-alt-getopt"
+    "luahbtex"
+    "luatex"
+    "makeindex"
+    "metafont"
+    "mflogo"
+    "mfware"
+    "modes"
+    "pdftex"
+    "plain"
+    "tex"
+    "tex-ini-files"
+    "texlive-common"
+    "texlive-en"
+    "texlive-msg-translations"
+    "texlive-scripts"
+    "tlshell"
+    "unicode-data"
+    "xdvi"
+  ];
   sha512.run = "4241bc3a3ef21502faa9a2e0b16295126c357fc15813a625306552b40f9da804164abccce642f4ec1e677092f81d61381958b87fcf515120a12f9b7a19055370";
 };
 "collection-bibtexextra" = {
   revision = 65257;
   stripPrefix = 0;
-  deps."aaai-named" = tl."aaai-named";
-  deps."aichej" = tl."aichej";
-  deps."ajl" = tl."ajl";
-  deps."amsrefs" = tl."amsrefs";
-  deps."annotate" = tl."annotate";
-  deps."apacite" = tl."apacite";
-  deps."apalike-ejor" = tl."apalike-ejor";
-  deps."apalike2" = tl."apalike2";
-  deps."archaeologie" = tl."archaeologie";
-  deps."authordate" = tl."authordate";
-  deps."beebe" = tl."beebe";
-  deps."besjournals" = tl."besjournals";
-  deps."bestpapers" = tl."bestpapers";
-  deps."bib2gls" = tl."bib2gls";
-  deps."bibarts" = tl."bibarts";
-  deps."bibcop" = tl."bibcop";
-  deps."biber" = tl."biber";
-  deps."biber-ms" = tl."biber-ms";
-  deps."bibexport" = tl."bibexport";
-  deps."bibhtml" = tl."bibhtml";
-  deps."biblatex" = tl."biblatex";
-  deps."biblatex-abnt" = tl."biblatex-abnt";
-  deps."biblatex-ajc2020unofficial" = tl."biblatex-ajc2020unofficial";
-  deps."biblatex-anonymous" = tl."biblatex-anonymous";
-  deps."biblatex-apa" = tl."biblatex-apa";
-  deps."biblatex-apa6" = tl."biblatex-apa6";
-  deps."biblatex-archaeology" = tl."biblatex-archaeology";
-  deps."biblatex-arthistory-bonn" = tl."biblatex-arthistory-bonn";
-  deps."biblatex-bath" = tl."biblatex-bath";
-  deps."biblatex-bookinarticle" = tl."biblatex-bookinarticle";
-  deps."biblatex-bookinother" = tl."biblatex-bookinother";
-  deps."biblatex-bwl" = tl."biblatex-bwl";
-  deps."biblatex-caspervector" = tl."biblatex-caspervector";
-  deps."biblatex-chem" = tl."biblatex-chem";
-  deps."biblatex-chicago" = tl."biblatex-chicago";
-  deps."biblatex-claves" = tl."biblatex-claves";
-  deps."biblatex-cv" = tl."biblatex-cv";
-  deps."biblatex-dw" = tl."biblatex-dw";
-  deps."biblatex-enc" = tl."biblatex-enc";
-  deps."biblatex-ext" = tl."biblatex-ext";
-  deps."biblatex-fiwi" = tl."biblatex-fiwi";
-  deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015";
-  deps."biblatex-german-legal" = tl."biblatex-german-legal";
-  deps."biblatex-gost" = tl."biblatex-gost";
-  deps."biblatex-historian" = tl."biblatex-historian";
-  deps."biblatex-ieee" = tl."biblatex-ieee";
-  deps."biblatex-ijsra" = tl."biblatex-ijsra";
-  deps."biblatex-iso690" = tl."biblatex-iso690";
-  deps."biblatex-jura2" = tl."biblatex-jura2";
-  deps."biblatex-juradiss" = tl."biblatex-juradiss";
-  deps."biblatex-license" = tl."biblatex-license";
-  deps."biblatex-lncs" = tl."biblatex-lncs";
-  deps."biblatex-lni" = tl."biblatex-lni";
-  deps."biblatex-luh-ipw" = tl."biblatex-luh-ipw";
-  deps."biblatex-manuscripts-philology" = tl."biblatex-manuscripts-philology";
-  deps."biblatex-mla" = tl."biblatex-mla";
-  deps."biblatex-morenames" = tl."biblatex-morenames";
-  deps."biblatex-ms" = tl."biblatex-ms";
-  deps."biblatex-multiple-dm" = tl."biblatex-multiple-dm";
-  deps."biblatex-musuos" = tl."biblatex-musuos";
-  deps."biblatex-nature" = tl."biblatex-nature";
-  deps."biblatex-nejm" = tl."biblatex-nejm";
-  deps."biblatex-nottsclassic" = tl."biblatex-nottsclassic";
-  deps."biblatex-opcit-booktitle" = tl."biblatex-opcit-booktitle";
-  deps."biblatex-oxref" = tl."biblatex-oxref";
-  deps."biblatex-philosophy" = tl."biblatex-philosophy";
-  deps."biblatex-phys" = tl."biblatex-phys";
-  deps."biblatex-publist" = tl."biblatex-publist";
-  deps."biblatex-readbbl" = tl."biblatex-readbbl";
-  deps."biblatex-realauthor" = tl."biblatex-realauthor";
-  deps."biblatex-sbl" = tl."biblatex-sbl";
-  deps."biblatex-science" = tl."biblatex-science";
-  deps."biblatex-shortfields" = tl."biblatex-shortfields";
-  deps."biblatex-socialscienceshuberlin" = tl."biblatex-socialscienceshuberlin";
-  deps."biblatex-software" = tl."biblatex-software";
-  deps."biblatex-source-division" = tl."biblatex-source-division";
-  deps."biblatex-spbasic" = tl."biblatex-spbasic";
-  deps."biblatex-subseries" = tl."biblatex-subseries";
-  deps."biblatex-swiss-legal" = tl."biblatex-swiss-legal";
-  deps."biblatex-trad" = tl."biblatex-trad";
-  deps."biblatex-true-citepages-omit" = tl."biblatex-true-citepages-omit";
-  deps."biblatex-unified" = tl."biblatex-unified";
-  deps."biblatex-vancouver" = tl."biblatex-vancouver";
-  deps."biblatex2bibitem" = tl."biblatex2bibitem";
-  deps."biblist" = tl."biblist";
-  deps."bibtexperllibs" = tl."bibtexperllibs";
-  deps."bibtopic" = tl."bibtopic";
-  deps."bibtopicprefix" = tl."bibtopicprefix";
-  deps."bibunits" = tl."bibunits";
-  deps."biolett-bst" = tl."biolett-bst";
-  deps."bookdb" = tl."bookdb";
-  deps."breakcites" = tl."breakcites";
-  deps."cell" = tl."cell";
-  deps."chbibref" = tl."chbibref";
-  deps."chembst" = tl."chembst";
-  deps."chicago" = tl."chicago";
-  deps."chicago-annote" = tl."chicago-annote";
-  deps."chicagoa" = tl."chicagoa";
-  deps."chscite" = tl."chscite";
-  deps."citation-style-language" = tl."citation-style-language";
-  deps."citeall" = tl."citeall";
-  deps."citeref" = tl."citeref";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collref" = tl."collref";
-  deps."compactbib" = tl."compactbib";
-  deps."crossrefware" = tl."crossrefware";
-  deps."custom-bib" = tl."custom-bib";
-  deps."din1505" = tl."din1505";
-  deps."dk-bib" = tl."dk-bib";
-  deps."doipubmed" = tl."doipubmed";
-  deps."ecobiblatex" = tl."ecobiblatex";
-  deps."econ-bst" = tl."econ-bst";
-  deps."economic" = tl."economic";
-  deps."fbs" = tl."fbs";
-  deps."figbib" = tl."figbib";
-  deps."footbib" = tl."footbib";
-  deps."francais-bst" = tl."francais-bst";
-  deps."gbt7714" = tl."gbt7714";
-  deps."geschichtsfrkl" = tl."geschichtsfrkl";
-  deps."harvard" = tl."harvard";
-  deps."harvmac" = tl."harvmac";
-  deps."hep-bibliography" = tl."hep-bibliography";
-  deps."historische-zeitschrift" = tl."historische-zeitschrift";
-  deps."icite" = tl."icite";
-  deps."ietfbibs" = tl."ietfbibs";
-  deps."ijqc" = tl."ijqc";
-  deps."inlinebib" = tl."inlinebib";
-  deps."iopart-num" = tl."iopart-num";
-  deps."is-bst" = tl."is-bst";
-  deps."jbact" = tl."jbact";
-  deps."jmb" = tl."jmb";
-  deps."jneurosci" = tl."jneurosci";
-  deps."jurabib" = tl."jurabib";
-  deps."ksfh_nat" = tl."ksfh_nat";
-  deps."listbib" = tl."listbib";
-  deps."logreq" = tl."logreq";
-  deps."ltb2bib" = tl."ltb2bib";
-  deps."luabibentry" = tl."luabibentry";
-  deps."margbib" = tl."margbib";
-  deps."multibib" = tl."multibib";
-  deps."multibibliography" = tl."multibibliography";
-  deps."munich" = tl."munich";
-  deps."nar" = tl."nar";
-  deps."newcastle-bst" = tl."newcastle-bst";
-  deps."nmbib" = tl."nmbib";
-  deps."notes2bib" = tl."notes2bib";
-  deps."notex-bst" = tl."notex-bst";
-  deps."oscola" = tl."oscola";
-  deps."perception" = tl."perception";
-  deps."plainyr" = tl."plainyr";
-  deps."pnas2009" = tl."pnas2009";
-  deps."rsc" = tl."rsc";
-  deps."showtags" = tl."showtags";
-  deps."sort-by-letters" = tl."sort-by-letters";
-  deps."splitbib" = tl."splitbib";
-  deps."turabian-formatting" = tl."turabian-formatting";
-  deps."uni-wtal-ger" = tl."uni-wtal-ger";
-  deps."uni-wtal-lin" = tl."uni-wtal-lin";
-  deps."urlbst" = tl."urlbst";
-  deps."usebib" = tl."usebib";
-  deps."vak" = tl."vak";
-  deps."windycity" = tl."windycity";
-  deps."xcite" = tl."xcite";
-  deps."zootaxa-bst" = tl."zootaxa-bst";
+  deps = [
+    "aaai-named"
+    "aichej"
+    "ajl"
+    "amsrefs"
+    "annotate"
+    "apacite"
+    "apalike-ejor"
+    "apalike2"
+    "archaeologie"
+    "authordate"
+    "beebe"
+    "besjournals"
+    "bestpapers"
+    "bib2gls"
+    "bibarts"
+    "bibcop"
+    "biber"
+    "biber-ms"
+    "bibexport"
+    "bibhtml"
+    "biblatex"
+    "biblatex-abnt"
+    "biblatex-ajc2020unofficial"
+    "biblatex-anonymous"
+    "biblatex-apa"
+    "biblatex-apa6"
+    "biblatex-archaeology"
+    "biblatex-arthistory-bonn"
+    "biblatex-bath"
+    "biblatex-bookinarticle"
+    "biblatex-bookinother"
+    "biblatex-bwl"
+    "biblatex-caspervector"
+    "biblatex-chem"
+    "biblatex-chicago"
+    "biblatex-claves"
+    "biblatex-cv"
+    "biblatex-dw"
+    "biblatex-enc"
+    "biblatex-ext"
+    "biblatex-fiwi"
+    "biblatex-gb7714-2015"
+    "biblatex-german-legal"
+    "biblatex-gost"
+    "biblatex-historian"
+    "biblatex-ieee"
+    "biblatex-ijsra"
+    "biblatex-iso690"
+    "biblatex-jura2"
+    "biblatex-juradiss"
+    "biblatex-license"
+    "biblatex-lncs"
+    "biblatex-lni"
+    "biblatex-luh-ipw"
+    "biblatex-manuscripts-philology"
+    "biblatex-mla"
+    "biblatex-morenames"
+    "biblatex-ms"
+    "biblatex-multiple-dm"
+    "biblatex-musuos"
+    "biblatex-nature"
+    "biblatex-nejm"
+    "biblatex-nottsclassic"
+    "biblatex-opcit-booktitle"
+    "biblatex-oxref"
+    "biblatex-philosophy"
+    "biblatex-phys"
+    "biblatex-publist"
+    "biblatex-readbbl"
+    "biblatex-realauthor"
+    "biblatex-sbl"
+    "biblatex-science"
+    "biblatex-shortfields"
+    "biblatex-socialscienceshuberlin"
+    "biblatex-software"
+    "biblatex-source-division"
+    "biblatex-spbasic"
+    "biblatex-subseries"
+    "biblatex-swiss-legal"
+    "biblatex-trad"
+    "biblatex-true-citepages-omit"
+    "biblatex-unified"
+    "biblatex-vancouver"
+    "biblatex2bibitem"
+    "biblist"
+    "bibtexperllibs"
+    "bibtopic"
+    "bibtopicprefix"
+    "bibunits"
+    "biolett-bst"
+    "bookdb"
+    "breakcites"
+    "cell"
+    "chbibref"
+    "chembst"
+    "chicago"
+    "chicago-annote"
+    "chicagoa"
+    "chscite"
+    "citation-style-language"
+    "citeall"
+    "citeref"
+    "collection-latex"
+    "collref"
+    "compactbib"
+    "crossrefware"
+    "custom-bib"
+    "din1505"
+    "dk-bib"
+    "doipubmed"
+    "ecobiblatex"
+    "econ-bst"
+    "economic"
+    "fbs"
+    "figbib"
+    "footbib"
+    "francais-bst"
+    "gbt7714"
+    "geschichtsfrkl"
+    "harvard"
+    "harvmac"
+    "hep-bibliography"
+    "historische-zeitschrift"
+    "icite"
+    "ietfbibs"
+    "ijqc"
+    "inlinebib"
+    "iopart-num"
+    "is-bst"
+    "jbact"
+    "jmb"
+    "jneurosci"
+    "jurabib"
+    "ksfh_nat"
+    "listbib"
+    "logreq"
+    "ltb2bib"
+    "luabibentry"
+    "margbib"
+    "multibib"
+    "multibibliography"
+    "munich"
+    "nar"
+    "newcastle-bst"
+    "nmbib"
+    "notes2bib"
+    "notex-bst"
+    "oscola"
+    "perception"
+    "plainyr"
+    "pnas2009"
+    "rsc"
+    "showtags"
+    "sort-by-letters"
+    "splitbib"
+    "turabian-formatting"
+    "uni-wtal-ger"
+    "uni-wtal-lin"
+    "urlbst"
+    "usebib"
+    "vak"
+    "windycity"
+    "xcite"
+    "zootaxa-bst"
+  ];
   sha512.run = "db80edc251a62547b401d922c954a40dc3887b01a59952bf20829b67953e26083c98249dba83157b0e9db4b0b2b2802f5965d9360b332d45fe4d69762ef38c62";
 };
 "collection-binextra" = {
   revision = 65204;
   stripPrefix = 0;
-  deps."a2ping" = tl."a2ping";
-  deps."adhocfilelist" = tl."adhocfilelist";
-  deps."arara" = tl."arara";
-  deps."asymptote" = tl."asymptote";
-  deps."bibtex8" = tl."bibtex8";
-  deps."bibtexu" = tl."bibtexu";
-  deps."bundledoc" = tl."bundledoc";
-  deps."checklistings" = tl."checklistings";
-  deps."chklref" = tl."chklref";
-  deps."chktex" = tl."chktex";
-  deps."clojure-pamphlet" = tl."clojure-pamphlet";
-  deps."cluttex" = tl."cluttex";
-  deps."collection-basic" = tl."collection-basic";
-  deps."ctan-o-mat" = tl."ctan-o-mat";
-  deps."ctan_chk" = tl."ctan_chk";
-  deps."ctanbib" = tl."ctanbib";
-  deps."ctanify" = tl."ctanify";
-  deps."ctanupload" = tl."ctanupload";
-  deps."ctie" = tl."ctie";
-  deps."cweb" = tl."cweb";
-  deps."de-macro" = tl."de-macro";
-  deps."detex" = tl."detex";
-  deps."digestif" = tl."digestif";
-  deps."dtl" = tl."dtl";
-  deps."dtxgen" = tl."dtxgen";
-  deps."dvi2tty" = tl."dvi2tty";
-  deps."dviasm" = tl."dviasm";
-  deps."dvicopy" = tl."dvicopy";
-  deps."dvidvi" = tl."dvidvi";
-  deps."dviinfox" = tl."dviinfox";
-  deps."dviljk" = tl."dviljk";
-  deps."dviout-util" = tl."dviout-util";
-  deps."dvipng" = tl."dvipng";
-  deps."dvipos" = tl."dvipos";
-  deps."dvisvgm" = tl."dvisvgm";
-  deps."findhyph" = tl."findhyph";
-  deps."fragmaster" = tl."fragmaster";
-  deps."git-latexdiff" = tl."git-latexdiff";
-  deps."gsftopk" = tl."gsftopk";
-  deps."hook-pre-commit-pkg" = tl."hook-pre-commit-pkg";
-  deps."installfont" = tl."installfont";
-  deps."ketcindy" = tl."ketcindy";
-  deps."lacheck" = tl."lacheck";
-  deps."latex-git-log" = tl."latex-git-log";
-  deps."latex-papersize" = tl."latex-papersize";
-  deps."latex2man" = tl."latex2man";
-  deps."latex2nemeth" = tl."latex2nemeth";
-  deps."latexdiff" = tl."latexdiff";
-  deps."latexfileversion" = tl."latexfileversion";
-  deps."latexindent" = tl."latexindent";
-  deps."latexmk" = tl."latexmk";
-  deps."latexpand" = tl."latexpand";
-  deps."light-latex-make" = tl."light-latex-make";
-  deps."listings-ext" = tl."listings-ext";
-  deps."ltxfileinfo" = tl."ltxfileinfo";
-  deps."ltximg" = tl."ltximg";
-  deps."luajittex" = tl."luajittex";
-  deps."make4ht" = tl."make4ht";
-  deps."match_parens" = tl."match_parens";
-  deps."mflua" = tl."mflua";
-  deps."mkjobtexmf" = tl."mkjobtexmf";
-  deps."optexcount" = tl."optexcount";
-  deps."patgen" = tl."patgen";
-  deps."pdfbook2" = tl."pdfbook2";
-  deps."pdfcrop" = tl."pdfcrop";
-  deps."pdfjam" = tl."pdfjam";
-  deps."pdflatexpicscale" = tl."pdflatexpicscale";
-  deps."pdftex-quiet" = tl."pdftex-quiet";
-  deps."pdftosrc" = tl."pdftosrc";
-  deps."pdfxup" = tl."pdfxup";
-  deps."pfarrei" = tl."pfarrei";
-  deps."pkfix" = tl."pkfix";
-  deps."pkfix-helper" = tl."pkfix-helper";
-  deps."purifyeps" = tl."purifyeps";
-  deps."pythontex" = tl."pythontex";
-  deps."seetexk" = tl."seetexk";
-  deps."spix" = tl."spix";
-  deps."srcredact" = tl."srcredact";
-  deps."sty2dtx" = tl."sty2dtx";
-  deps."synctex" = tl."synctex";
-  deps."tex4ebook" = tl."tex4ebook";
-  deps."texaccents" = tl."texaccents";
-  deps."texcount" = tl."texcount";
-  deps."texdef" = tl."texdef";
-  deps."texdiff" = tl."texdiff";
-  deps."texdirflatten" = tl."texdirflatten";
-  deps."texdoc" = tl."texdoc";
-  deps."texdoctk" = tl."texdoctk";
-  deps."texfot" = tl."texfot";
-  deps."texlive-scripts-extra" = tl."texlive-scripts-extra";
-  deps."texliveonfly" = tl."texliveonfly";
-  deps."texloganalyser" = tl."texloganalyser";
-  deps."texlogfilter" = tl."texlogfilter";
-  deps."texlogsieve" = tl."texlogsieve";
-  deps."texosquery" = tl."texosquery";
-  deps."texplate" = tl."texplate";
-  deps."texware" = tl."texware";
-  deps."tie" = tl."tie";
-  deps."tlcockpit" = tl."tlcockpit";
-  deps."tpic2pdftex" = tl."tpic2pdftex";
-  deps."typeoutfileinfo" = tl."typeoutfileinfo";
-  deps."web" = tl."web";
-  deps."xindex" = tl."xindex";
-  deps."xindy" = tl."xindy";
-  deps."xpdfopen" = tl."xpdfopen";
+  deps = [
+    "a2ping"
+    "adhocfilelist"
+    "arara"
+    "asymptote"
+    "bibtex8"
+    "bibtexu"
+    "bundledoc"
+    "checklistings"
+    "chklref"
+    "chktex"
+    "clojure-pamphlet"
+    "cluttex"
+    "collection-basic"
+    "ctan-o-mat"
+    "ctan_chk"
+    "ctanbib"
+    "ctanify"
+    "ctanupload"
+    "ctie"
+    "cweb"
+    "de-macro"
+    "detex"
+    "digestif"
+    "dtl"
+    "dtxgen"
+    "dvi2tty"
+    "dviasm"
+    "dvicopy"
+    "dvidvi"
+    "dviinfox"
+    "dviljk"
+    "dviout-util"
+    "dvipng"
+    "dvipos"
+    "dvisvgm"
+    "findhyph"
+    "fragmaster"
+    "git-latexdiff"
+    "gsftopk"
+    "hook-pre-commit-pkg"
+    "installfont"
+    "ketcindy"
+    "lacheck"
+    "latex-git-log"
+    "latex-papersize"
+    "latex2man"
+    "latex2nemeth"
+    "latexdiff"
+    "latexfileversion"
+    "latexindent"
+    "latexmk"
+    "latexpand"
+    "light-latex-make"
+    "listings-ext"
+    "ltxfileinfo"
+    "ltximg"
+    "luajittex"
+    "make4ht"
+    "match_parens"
+    "mflua"
+    "mkjobtexmf"
+    "optexcount"
+    "patgen"
+    "pdfbook2"
+    "pdfcrop"
+    "pdfjam"
+    "pdflatexpicscale"
+    "pdftex-quiet"
+    "pdftosrc"
+    "pdfxup"
+    "pfarrei"
+    "pkfix"
+    "pkfix-helper"
+    "purifyeps"
+    "pythontex"
+    "seetexk"
+    "spix"
+    "srcredact"
+    "sty2dtx"
+    "synctex"
+    "tex4ebook"
+    "texaccents"
+    "texcount"
+    "texdef"
+    "texdiff"
+    "texdirflatten"
+    "texdoc"
+    "texdoctk"
+    "texfot"
+    "texlive-scripts-extra"
+    "texliveonfly"
+    "texloganalyser"
+    "texlogfilter"
+    "texlogsieve"
+    "texosquery"
+    "texplate"
+    "texware"
+    "tie"
+    "tlcockpit"
+    "tpic2pdftex"
+    "typeoutfileinfo"
+    "web"
+    "xindex"
+    "xindy"
+    "xpdfopen"
+  ];
   sha512.run = "4297ddb3f20775c97c2ac4782060ad2c2da469fb68eda24d98c0c84a07403215aaa4e221b82459300887769e9355cb4425f4fe599d5d8413e38f1be5c7f8fab9";
 };
 "collection-context" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
-  deps."context" = tl."context";
-  deps."context-account" = tl."context-account";
-  deps."context-algorithmic" = tl."context-algorithmic";
-  deps."context-animation" = tl."context-animation";
-  deps."context-annotation" = tl."context-annotation";
-  deps."context-bnf" = tl."context-bnf";
-  deps."context-chromato" = tl."context-chromato";
-  deps."context-cmscbf" = tl."context-cmscbf";
-  deps."context-cmttbf" = tl."context-cmttbf";
-  deps."context-construction-plan" = tl."context-construction-plan";
-  deps."context-cyrillicnumbers" = tl."context-cyrillicnumbers";
-  deps."context-degrade" = tl."context-degrade";
-  deps."context-fancybreak" = tl."context-fancybreak";
-  deps."context-filter" = tl."context-filter";
-  deps."context-french" = tl."context-french";
-  deps."context-fullpage" = tl."context-fullpage";
-  deps."context-gantt" = tl."context-gantt";
-  deps."context-gnuplot" = tl."context-gnuplot";
-  deps."context-handlecsv" = tl."context-handlecsv";
-  deps."context-inifile" = tl."context-inifile";
-  deps."context-layout" = tl."context-layout";
-  deps."context-letter" = tl."context-letter";
-  deps."context-lettrine" = tl."context-lettrine";
-  deps."context-mathsets" = tl."context-mathsets";
-  deps."context-notes-zh-cn" = tl."context-notes-zh-cn";
-  deps."context-rst" = tl."context-rst";
-  deps."context-ruby" = tl."context-ruby";
-  deps."context-simplefonts" = tl."context-simplefonts";
-  deps."context-simpleslides" = tl."context-simpleslides";
-  deps."context-title" = tl."context-title";
-  deps."context-transliterator" = tl."context-transliterator";
-  deps."context-typearea" = tl."context-typearea";
-  deps."context-typescripts" = tl."context-typescripts";
-  deps."context-vim" = tl."context-vim";
-  deps."context-visualcounter" = tl."context-visualcounter";
-  deps."jmn" = tl."jmn";
-  deps."npp-for-context" = tl."npp-for-context";
+  deps = [
+    "collection-basic"
+    "context"
+    "context-account"
+    "context-algorithmic"
+    "context-animation"
+    "context-annotation"
+    "context-bnf"
+    "context-chromato"
+    "context-cmscbf"
+    "context-cmttbf"
+    "context-construction-plan"
+    "context-cyrillicnumbers"
+    "context-degrade"
+    "context-fancybreak"
+    "context-filter"
+    "context-french"
+    "context-fullpage"
+    "context-gantt"
+    "context-gnuplot"
+    "context-handlecsv"
+    "context-inifile"
+    "context-layout"
+    "context-letter"
+    "context-lettrine"
+    "context-mathsets"
+    "context-notes-zh-cn"
+    "context-rst"
+    "context-ruby"
+    "context-simplefonts"
+    "context-simpleslides"
+    "context-title"
+    "context-transliterator"
+    "context-typearea"
+    "context-typescripts"
+    "context-vim"
+    "context-visualcounter"
+    "jmn"
+    "npp-for-context"
+  ];
   sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765";
 };
 "collection-fontsextra" = {
   revision = 64952;
   stripPrefix = 0;
-  deps."aboensis" = tl."aboensis";
-  deps."academicons" = tl."academicons";
-  deps."accanthis" = tl."accanthis";
-  deps."adforn" = tl."adforn";
-  deps."adfsymbols" = tl."adfsymbols";
-  deps."aesupp" = tl."aesupp";
-  deps."alegreya" = tl."alegreya";
-  deps."alfaslabone" = tl."alfaslabone";
-  deps."algolrevived" = tl."algolrevived";
-  deps."allrunes" = tl."allrunes";
-  deps."almendra" = tl."almendra";
-  deps."almfixed" = tl."almfixed";
-  deps."andika" = tl."andika";
-  deps."anonymouspro" = tl."anonymouspro";
-  deps."antiqua" = tl."antiqua";
-  deps."antt" = tl."antt";
-  deps."archaic" = tl."archaic";
-  deps."archivo" = tl."archivo";
-  deps."arev" = tl."arev";
-  deps."arimo" = tl."arimo";
-  deps."arvo" = tl."arvo";
-  deps."asana-math" = tl."asana-math";
-  deps."asapsym" = tl."asapsym";
-  deps."ascii-font" = tl."ascii-font";
-  deps."aspectratio" = tl."aspectratio";
-  deps."astro" = tl."astro";
-  deps."atkinson" = tl."atkinson";
-  deps."augie" = tl."augie";
-  deps."auncial-new" = tl."auncial-new";
-  deps."aurical" = tl."aurical";
-  deps."b1encoding" = tl."b1encoding";
-  deps."barcodes" = tl."barcodes";
-  deps."baskervald" = tl."baskervald";
-  deps."baskervaldx" = tl."baskervaldx";
-  deps."baskervillef" = tl."baskervillef";
-  deps."bbding" = tl."bbding";
-  deps."bbm" = tl."bbm";
-  deps."bbm-macros" = tl."bbm-macros";
-  deps."bbold" = tl."bbold";
-  deps."bbold-type1" = tl."bbold-type1";
-  deps."bboldx" = tl."bboldx";
-  deps."belleek" = tl."belleek";
-  deps."bera" = tl."bera";
-  deps."berenisadf" = tl."berenisadf";
-  deps."beuron" = tl."beuron";
-  deps."bguq" = tl."bguq";
-  deps."bitter" = tl."bitter";
-  deps."blacklettert1" = tl."blacklettert1";
-  deps."boisik" = tl."boisik";
-  deps."bookhands" = tl."bookhands";
-  deps."boondox" = tl."boondox";
-  deps."braille" = tl."braille";
-  deps."brushscr" = tl."brushscr";
-  deps."cabin" = tl."cabin";
-  deps."caladea" = tl."caladea";
-  deps."calligra" = tl."calligra";
-  deps."calligra-type1" = tl."calligra-type1";
-  deps."cantarell" = tl."cantarell";
-  deps."carlito" = tl."carlito";
-  deps."carolmin-ps" = tl."carolmin-ps";
-  deps."cascadia-code" = tl."cascadia-code";
-  deps."ccicons" = tl."ccicons";
-  deps."cfr-initials" = tl."cfr-initials";
-  deps."cfr-lm" = tl."cfr-lm";
-  deps."charissil" = tl."charissil";
-  deps."cherokee" = tl."cherokee";
-  deps."chivo" = tl."chivo";
-  deps."cinzel" = tl."cinzel";
-  deps."clara" = tl."clara";
-  deps."clearsans" = tl."clearsans";
-  deps."cm-lgc" = tl."cm-lgc";
-  deps."cm-mf-extra-bold" = tl."cm-mf-extra-bold";
-  deps."cm-unicode" = tl."cm-unicode";
-  deps."cmathbb" = tl."cmathbb";
-  deps."cmbright" = tl."cmbright";
-  deps."cmexb" = tl."cmexb";
-  deps."cmll" = tl."cmll";
-  deps."cmpica" = tl."cmpica";
-  deps."cmsrb" = tl."cmsrb";
-  deps."cmtiup" = tl."cmtiup";
-  deps."cmupint" = tl."cmupint";
-  deps."cochineal" = tl."cochineal";
-  deps."coelacanth" = tl."coelacanth";
-  deps."collection-basic" = tl."collection-basic";
-  deps."comfortaa" = tl."comfortaa";
-  deps."comicneue" = tl."comicneue";
-  deps."concmath-fonts" = tl."concmath-fonts";
-  deps."concmath-otf" = tl."concmath-otf";
-  deps."cookingsymbols" = tl."cookingsymbols";
-  deps."cooperhewitt" = tl."cooperhewitt";
-  deps."cormorantgaramond" = tl."cormorantgaramond";
-  deps."countriesofeurope" = tl."countriesofeurope";
-  deps."courier-scaled" = tl."courier-scaled";
-  deps."courierten" = tl."courierten";
-  deps."crimson" = tl."crimson";
-  deps."crimsonpro" = tl."crimsonpro";
-  deps."cryst" = tl."cryst";
-  deps."cuprum" = tl."cuprum";
-  deps."cyklop" = tl."cyklop";
-  deps."dancers" = tl."dancers";
-  deps."dantelogo" = tl."dantelogo";
-  deps."dejavu" = tl."dejavu";
-  deps."dejavu-otf" = tl."dejavu-otf";
-  deps."dice" = tl."dice";
-  deps."dictsym" = tl."dictsym";
-  deps."dingbat" = tl."dingbat";
-  deps."domitian" = tl."domitian";
-  deps."doublestroke" = tl."doublestroke";
-  deps."doulossil" = tl."doulossil";
-  deps."dozenal" = tl."dozenal";
-  deps."drm" = tl."drm";
-  deps."droid" = tl."droid";
-  deps."dsserif" = tl."dsserif";
-  deps."duerer" = tl."duerer";
-  deps."duerer-latex" = tl."duerer-latex";
-  deps."dutchcal" = tl."dutchcal";
-  deps."ean" = tl."ean";
-  deps."ebgaramond" = tl."ebgaramond";
-  deps."ebgaramond-maths" = tl."ebgaramond-maths";
-  deps."ecc" = tl."ecc";
-  deps."eco" = tl."eco";
-  deps."eczar" = tl."eczar";
-  deps."eiad" = tl."eiad";
-  deps."eiad-ltx" = tl."eiad-ltx";
-  deps."ektype-tanka" = tl."ektype-tanka";
-  deps."electrum" = tl."electrum";
-  deps."elvish" = tl."elvish";
-  deps."epigrafica" = tl."epigrafica";
-  deps."epsdice" = tl."epsdice";
-  deps."erewhon" = tl."erewhon";
-  deps."erewhon-math" = tl."erewhon-math";
-  deps."esrelation" = tl."esrelation";
-  deps."esstix" = tl."esstix";
-  deps."esvect" = tl."esvect";
-  deps."etbb" = tl."etbb";
-  deps."euler-math" = tl."euler-math";
-  deps."eulervm" = tl."eulervm";
-  deps."euxm" = tl."euxm";
-  deps."fbb" = tl."fbb";
-  deps."fdsymbol" = tl."fdsymbol";
-  deps."fetamont" = tl."fetamont";
-  deps."feyn" = tl."feyn";
-  deps."fge" = tl."fge";
-  deps."fira" = tl."fira";
-  deps."firamath" = tl."firamath";
-  deps."firamath-otf" = tl."firamath-otf";
-  deps."foekfont" = tl."foekfont";
-  deps."fonetika" = tl."fonetika";
-  deps."fontawesome" = tl."fontawesome";
-  deps."fontawesome5" = tl."fontawesome5";
-  deps."fontmfizz" = tl."fontmfizz";
-  deps."fonts-churchslavonic" = tl."fonts-churchslavonic";
-  deps."forum" = tl."forum";
-  deps."fourier" = tl."fourier";
-  deps."fouriernc" = tl."fouriernc";
-  deps."frcursive" = tl."frcursive";
-  deps."frederika2016" = tl."frederika2016";
-  deps."frimurer" = tl."frimurer";
-  deps."garamond-libre" = tl."garamond-libre";
-  deps."garamond-math" = tl."garamond-math";
-  deps."genealogy" = tl."genealogy";
-  deps."gentium-tug" = tl."gentium-tug";
-  deps."gfsartemisia" = tl."gfsartemisia";
-  deps."gfsbodoni" = tl."gfsbodoni";
-  deps."gfscomplutum" = tl."gfscomplutum";
-  deps."gfsdidot" = tl."gfsdidot";
-  deps."gfsdidotclassic" = tl."gfsdidotclassic";
-  deps."gfsneohellenic" = tl."gfsneohellenic";
-  deps."gfsneohellenicmath" = tl."gfsneohellenicmath";
-  deps."gfssolomos" = tl."gfssolomos";
-  deps."gillcm" = tl."gillcm";
-  deps."gillius" = tl."gillius";
-  deps."gnu-freefont" = tl."gnu-freefont";
-  deps."gofonts" = tl."gofonts";
-  deps."gothic" = tl."gothic";
-  deps."greenpoint" = tl."greenpoint";
-  deps."grotesq" = tl."grotesq";
-  deps."gudea" = tl."gudea";
-  deps."hacm" = tl."hacm";
-  deps."hamnosys" = tl."hamnosys";
-  deps."hands" = tl."hands";
-  deps."hep-font" = tl."hep-font";
-  deps."hep-math-font" = tl."hep-math-font";
-  deps."heros-otf" = tl."heros-otf";
-  deps."heuristica" = tl."heuristica";
-  deps."hfbright" = tl."hfbright";
-  deps."hfoldsty" = tl."hfoldsty";
-  deps."hindmadurai" = tl."hindmadurai";
-  deps."ibarra" = tl."ibarra";
-  deps."ifsym" = tl."ifsym";
-  deps."imfellenglish" = tl."imfellenglish";
-  deps."inconsolata" = tl."inconsolata";
-  deps."initials" = tl."initials";
-  deps."inriafonts" = tl."inriafonts";
-  deps."inter" = tl."inter";
-  deps."ipaex-type1" = tl."ipaex-type1";
-  deps."iwona" = tl."iwona";
-  deps."jablantile" = tl."jablantile";
-  deps."jamtimes" = tl."jamtimes";
-  deps."josefin" = tl."josefin";
-  deps."junicode" = tl."junicode";
-  deps."kixfont" = tl."kixfont";
-  deps."kpfonts" = tl."kpfonts";
-  deps."kpfonts-otf" = tl."kpfonts-otf";
-  deps."kurier" = tl."kurier";
-  deps."lato" = tl."lato";
-  deps."lexend" = tl."lexend";
-  deps."lfb" = tl."lfb";
-  deps."libertine" = tl."libertine";
-  deps."libertinegc" = tl."libertinegc";
-  deps."libertinus" = tl."libertinus";
-  deps."libertinus-fonts" = tl."libertinus-fonts";
-  deps."libertinus-otf" = tl."libertinus-otf";
-  deps."libertinus-type1" = tl."libertinus-type1";
-  deps."libertinust1math" = tl."libertinust1math";
-  deps."librebaskerville" = tl."librebaskerville";
-  deps."librebodoni" = tl."librebodoni";
-  deps."librecaslon" = tl."librecaslon";
-  deps."librefranklin" = tl."librefranklin";
-  deps."libris" = tl."libris";
-  deps."lineara" = tl."lineara";
-  deps."linguisticspro" = tl."linguisticspro";
-  deps."lobster2" = tl."lobster2";
-  deps."logix" = tl."logix";
-  deps."lxfonts" = tl."lxfonts";
-  deps."ly1" = tl."ly1";
-  deps."magra" = tl."magra";
-  deps."marcellus" = tl."marcellus";
-  deps."mathabx" = tl."mathabx";
-  deps."mathabx-type1" = tl."mathabx-type1";
-  deps."mathdesign" = tl."mathdesign";
-  deps."mdputu" = tl."mdputu";
-  deps."mdsymbol" = tl."mdsymbol";
-  deps."merriweather" = tl."merriweather";
-  deps."miama" = tl."miama";
-  deps."mintspirit" = tl."mintspirit";
-  deps."missaali" = tl."missaali";
-  deps."mlmodern" = tl."mlmodern";
-  deps."mnsymbol" = tl."mnsymbol";
-  deps."montserrat" = tl."montserrat";
-  deps."mpfonts" = tl."mpfonts";
-  deps."mweights" = tl."mweights";
-  deps."newcomputermodern" = tl."newcomputermodern";
-  deps."newpx" = tl."newpx";
-  deps."newtx" = tl."newtx";
-  deps."newtxsf" = tl."newtxsf";
-  deps."newtxtt" = tl."newtxtt";
-  deps."niceframe-type1" = tl."niceframe-type1";
-  deps."nimbus15" = tl."nimbus15";
-  deps."nkarta" = tl."nkarta";
-  deps."noto" = tl."noto";
-  deps."noto-emoji" = tl."noto-emoji";
-  deps."notomath" = tl."notomath";
-  deps."nunito" = tl."nunito";
-  deps."obnov" = tl."obnov";
-  deps."ocherokee" = tl."ocherokee";
-  deps."ocr-b" = tl."ocr-b";
-  deps."ocr-b-outline" = tl."ocr-b-outline";
-  deps."ogham" = tl."ogham";
-  deps."oinuit" = tl."oinuit";
-  deps."old-arrows" = tl."old-arrows";
-  deps."oldlatin" = tl."oldlatin";
-  deps."oldstandard" = tl."oldstandard";
-  deps."opensans" = tl."opensans";
-  deps."orkhun" = tl."orkhun";
-  deps."oswald" = tl."oswald";
-  deps."overlock" = tl."overlock";
-  deps."pacioli" = tl."pacioli";
-  deps."pagella-otf" = tl."pagella-otf";
-  deps."paratype" = tl."paratype";
-  deps."phaistos" = tl."phaistos";
-  deps."phonetic" = tl."phonetic";
-  deps."pigpen" = tl."pigpen";
-  deps."playfair" = tl."playfair";
-  deps."plex" = tl."plex";
-  deps."plex-otf" = tl."plex-otf";
-  deps."plimsoll" = tl."plimsoll";
-  deps."poiretone" = tl."poiretone";
-  deps."poltawski" = tl."poltawski";
-  deps."prodint" = tl."prodint";
-  deps."punk" = tl."punk";
-  deps."punk-latex" = tl."punk-latex";
-  deps."punknova" = tl."punknova";
-  deps."pxtxalfa" = tl."pxtxalfa";
-  deps."qualitype" = tl."qualitype";
-  deps."quattrocento" = tl."quattrocento";
-  deps."raleway" = tl."raleway";
-  deps."recycle" = tl."recycle";
-  deps."roboto" = tl."roboto";
-  deps."romande" = tl."romande";
-  deps."rosario" = tl."rosario";
-  deps."rsfso" = tl."rsfso";
-  deps."sansmathaccent" = tl."sansmathaccent";
-  deps."sansmathfonts" = tl."sansmathfonts";
-  deps."sauter" = tl."sauter";
-  deps."sauterfonts" = tl."sauterfonts";
-  deps."schola-otf" = tl."schola-otf";
-  deps."scholax" = tl."scholax";
-  deps."schulschriften" = tl."schulschriften";
-  deps."semaphor" = tl."semaphor";
-  deps."shobhika" = tl."shobhika";
-  deps."simpleicons" = tl."simpleicons";
-  deps."skull" = tl."skull";
-  deps."sourcecodepro" = tl."sourcecodepro";
-  deps."sourcesanspro" = tl."sourcesanspro";
-  deps."sourceserifpro" = tl."sourceserifpro";
-  deps."spectral" = tl."spectral";
-  deps."srbtiks" = tl."srbtiks";
-  deps."starfont" = tl."starfont";
-  deps."staves" = tl."staves";
-  deps."step" = tl."step";
-  deps."stepgreek" = tl."stepgreek";
-  deps."stickstoo" = tl."stickstoo";
-  deps."stix" = tl."stix";
-  deps."stix2-otf" = tl."stix2-otf";
-  deps."stix2-type1" = tl."stix2-type1";
-  deps."superiors" = tl."superiors";
-  deps."svrsymbols" = tl."svrsymbols";
-  deps."symbats3" = tl."symbats3";
-  deps."tapir" = tl."tapir";
-  deps."tempora" = tl."tempora";
-  deps."tengwarscript" = tl."tengwarscript";
-  deps."termes-otf" = tl."termes-otf";
-  deps."tfrupee" = tl."tfrupee";
-  deps."theanodidot" = tl."theanodidot";
-  deps."theanomodern" = tl."theanomodern";
-  deps."theanooldstyle" = tl."theanooldstyle";
-  deps."tinos" = tl."tinos";
-  deps."tpslifonts" = tl."tpslifonts";
-  deps."trajan" = tl."trajan";
-  deps."twemoji-colr" = tl."twemoji-colr";
-  deps."txfontsb" = tl."txfontsb";
-  deps."txuprcal" = tl."txuprcal";
-  deps."typicons" = tl."typicons";
-  deps."umtypewriter" = tl."umtypewriter";
-  deps."universa" = tl."universa";
-  deps."universalis" = tl."universalis";
-  deps."uppunctlm" = tl."uppunctlm";
-  deps."urwchancal" = tl."urwchancal";
-  deps."venturisadf" = tl."venturisadf";
-  deps."wsuipa" = tl."wsuipa";
-  deps."xcharter" = tl."xcharter";
-  deps."xcharter-math" = tl."xcharter-math";
-  deps."xits" = tl."xits";
-  deps."yfonts" = tl."yfonts";
-  deps."yfonts-otf" = tl."yfonts-otf";
-  deps."yfonts-t1" = tl."yfonts-t1";
-  deps."yinit-otf" = tl."yinit-otf";
-  deps."zlmtt" = tl."zlmtt";
+  deps = [
+    "aboensis"
+    "academicons"
+    "accanthis"
+    "adforn"
+    "adfsymbols"
+    "aesupp"
+    "alegreya"
+    "alfaslabone"
+    "algolrevived"
+    "allrunes"
+    "almendra"
+    "almfixed"
+    "andika"
+    "anonymouspro"
+    "antiqua"
+    "antt"
+    "archaic"
+    "archivo"
+    "arev"
+    "arimo"
+    "arvo"
+    "asana-math"
+    "asapsym"
+    "ascii-font"
+    "aspectratio"
+    "astro"
+    "atkinson"
+    "augie"
+    "auncial-new"
+    "aurical"
+    "b1encoding"
+    "barcodes"
+    "baskervald"
+    "baskervaldx"
+    "baskervillef"
+    "bbding"
+    "bbm"
+    "bbm-macros"
+    "bbold"
+    "bbold-type1"
+    "bboldx"
+    "belleek"
+    "bera"
+    "berenisadf"
+    "beuron"
+    "bguq"
+    "bitter"
+    "blacklettert1"
+    "boisik"
+    "bookhands"
+    "boondox"
+    "braille"
+    "brushscr"
+    "cabin"
+    "caladea"
+    "calligra"
+    "calligra-type1"
+    "cantarell"
+    "carlito"
+    "carolmin-ps"
+    "cascadia-code"
+    "ccicons"
+    "cfr-initials"
+    "cfr-lm"
+    "charissil"
+    "cherokee"
+    "chivo"
+    "cinzel"
+    "clara"
+    "clearsans"
+    "cm-lgc"
+    "cm-mf-extra-bold"
+    "cm-unicode"
+    "cmathbb"
+    "cmbright"
+    "cmexb"
+    "cmll"
+    "cmpica"
+    "cmsrb"
+    "cmtiup"
+    "cmupint"
+    "cochineal"
+    "coelacanth"
+    "collection-basic"
+    "comfortaa"
+    "comicneue"
+    "concmath-fonts"
+    "concmath-otf"
+    "cookingsymbols"
+    "cooperhewitt"
+    "cormorantgaramond"
+    "countriesofeurope"
+    "courier-scaled"
+    "courierten"
+    "crimson"
+    "crimsonpro"
+    "cryst"
+    "cuprum"
+    "cyklop"
+    "dancers"
+    "dantelogo"
+    "dejavu"
+    "dejavu-otf"
+    "dice"
+    "dictsym"
+    "dingbat"
+    "domitian"
+    "doublestroke"
+    "doulossil"
+    "dozenal"
+    "drm"
+    "droid"
+    "dsserif"
+    "duerer"
+    "duerer-latex"
+    "dutchcal"
+    "ean"
+    "ebgaramond"
+    "ebgaramond-maths"
+    "ecc"
+    "eco"
+    "eczar"
+    "eiad"
+    "eiad-ltx"
+    "ektype-tanka"
+    "electrum"
+    "elvish"
+    "epigrafica"
+    "epsdice"
+    "erewhon"
+    "erewhon-math"
+    "esrelation"
+    "esstix"
+    "esvect"
+    "etbb"
+    "euler-math"
+    "eulervm"
+    "euxm"
+    "fbb"
+    "fdsymbol"
+    "fetamont"
+    "feyn"
+    "fge"
+    "fira"
+    "firamath"
+    "firamath-otf"
+    "foekfont"
+    "fonetika"
+    "fontawesome"
+    "fontawesome5"
+    "fontmfizz"
+    "fonts-churchslavonic"
+    "forum"
+    "fourier"
+    "fouriernc"
+    "frcursive"
+    "frederika2016"
+    "frimurer"
+    "garamond-libre"
+    "garamond-math"
+    "genealogy"
+    "gentium-tug"
+    "gfsartemisia"
+    "gfsbodoni"
+    "gfscomplutum"
+    "gfsdidot"
+    "gfsdidotclassic"
+    "gfsneohellenic"
+    "gfsneohellenicmath"
+    "gfssolomos"
+    "gillcm"
+    "gillius"
+    "gnu-freefont"
+    "gofonts"
+    "gothic"
+    "greenpoint"
+    "grotesq"
+    "gudea"
+    "hacm"
+    "hamnosys"
+    "hands"
+    "hep-font"
+    "hep-math-font"
+    "heros-otf"
+    "heuristica"
+    "hfbright"
+    "hfoldsty"
+    "hindmadurai"
+    "ibarra"
+    "ifsym"
+    "imfellenglish"
+    "inconsolata"
+    "initials"
+    "inriafonts"
+    "inter"
+    "ipaex-type1"
+    "iwona"
+    "jablantile"
+    "jamtimes"
+    "josefin"
+    "junicode"
+    "kixfont"
+    "kpfonts"
+    "kpfonts-otf"
+    "kurier"
+    "lato"
+    "lexend"
+    "lfb"
+    "libertine"
+    "libertinegc"
+    "libertinus"
+    "libertinus-fonts"
+    "libertinus-otf"
+    "libertinus-type1"
+    "libertinust1math"
+    "librebaskerville"
+    "librebodoni"
+    "librecaslon"
+    "librefranklin"
+    "libris"
+    "lineara"
+    "linguisticspro"
+    "lobster2"
+    "logix"
+    "lxfonts"
+    "ly1"
+    "magra"
+    "marcellus"
+    "mathabx"
+    "mathabx-type1"
+    "mathdesign"
+    "mdputu"
+    "mdsymbol"
+    "merriweather"
+    "miama"
+    "mintspirit"
+    "missaali"
+    "mlmodern"
+    "mnsymbol"
+    "montserrat"
+    "mpfonts"
+    "mweights"
+    "newcomputermodern"
+    "newpx"
+    "newtx"
+    "newtxsf"
+    "newtxtt"
+    "niceframe-type1"
+    "nimbus15"
+    "nkarta"
+    "noto"
+    "noto-emoji"
+    "notomath"
+    "nunito"
+    "obnov"
+    "ocherokee"
+    "ocr-b"
+    "ocr-b-outline"
+    "ogham"
+    "oinuit"
+    "old-arrows"
+    "oldlatin"
+    "oldstandard"
+    "opensans"
+    "orkhun"
+    "oswald"
+    "overlock"
+    "pacioli"
+    "pagella-otf"
+    "paratype"
+    "phaistos"
+    "phonetic"
+    "pigpen"
+    "playfair"
+    "plex"
+    "plex-otf"
+    "plimsoll"
+    "poiretone"
+    "poltawski"
+    "prodint"
+    "punk"
+    "punk-latex"
+    "punknova"
+    "pxtxalfa"
+    "qualitype"
+    "quattrocento"
+    "raleway"
+    "recycle"
+    "roboto"
+    "romande"
+    "rosario"
+    "rsfso"
+    "sansmathaccent"
+    "sansmathfonts"
+    "sauter"
+    "sauterfonts"
+    "schola-otf"
+    "scholax"
+    "schulschriften"
+    "semaphor"
+    "shobhika"
+    "simpleicons"
+    "skull"
+    "sourcecodepro"
+    "sourcesanspro"
+    "sourceserifpro"
+    "spectral"
+    "srbtiks"
+    "starfont"
+    "staves"
+    "step"
+    "stepgreek"
+    "stickstoo"
+    "stix"
+    "stix2-otf"
+    "stix2-type1"
+    "superiors"
+    "svrsymbols"
+    "symbats3"
+    "tapir"
+    "tempora"
+    "tengwarscript"
+    "termes-otf"
+    "tfrupee"
+    "theanodidot"
+    "theanomodern"
+    "theanooldstyle"
+    "tinos"
+    "tpslifonts"
+    "trajan"
+    "twemoji-colr"
+    "txfontsb"
+    "txuprcal"
+    "typicons"
+    "umtypewriter"
+    "universa"
+    "universalis"
+    "uppunctlm"
+    "urwchancal"
+    "venturisadf"
+    "wsuipa"
+    "xcharter"
+    "xcharter-math"
+    "xits"
+    "yfonts"
+    "yfonts-otf"
+    "yfonts-t1"
+    "yinit-otf"
+    "zlmtt"
+  ];
   sha512.run = "e0c3a3142ca8dcdcdc0d7c5328e1624736f20bfe9e3757bad95d0e361b73ecdf3bc53e9d19f42ef5d91b74cbdf4fca1ee62b79f53d4d5a5f8aed47f51553d77e";
 };
 "collection-fontsrecommended" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."avantgar" = tl."avantgar";
-  deps."bookman" = tl."bookman";
-  deps."charter" = tl."charter";
-  deps."cm-super" = tl."cm-super";
-  deps."cmextra" = tl."cmextra";
-  deps."collection-basic" = tl."collection-basic";
-  deps."courier" = tl."courier";
-  deps."euro" = tl."euro";
-  deps."euro-ce" = tl."euro-ce";
-  deps."eurosym" = tl."eurosym";
-  deps."fpl" = tl."fpl";
-  deps."helvetic" = tl."helvetic";
-  deps."lm" = tl."lm";
-  deps."lm-math" = tl."lm-math";
-  deps."manfnt-font" = tl."manfnt-font";
-  deps."marvosym" = tl."marvosym";
-  deps."mathpazo" = tl."mathpazo";
-  deps."mflogo-font" = tl."mflogo-font";
-  deps."ncntrsbk" = tl."ncntrsbk";
-  deps."palatino" = tl."palatino";
-  deps."pxfonts" = tl."pxfonts";
-  deps."rsfs" = tl."rsfs";
-  deps."symbol" = tl."symbol";
-  deps."tex-gyre" = tl."tex-gyre";
-  deps."tex-gyre-math" = tl."tex-gyre-math";
-  deps."times" = tl."times";
-  deps."tipa" = tl."tipa";
-  deps."txfonts" = tl."txfonts";
-  deps."utopia" = tl."utopia";
-  deps."wasy" = tl."wasy";
-  deps."wasy-type1" = tl."wasy-type1";
-  deps."wasysym" = tl."wasysym";
-  deps."zapfchan" = tl."zapfchan";
-  deps."zapfding" = tl."zapfding";
+  deps = [
+    "avantgar"
+    "bookman"
+    "charter"
+    "cm-super"
+    "cmextra"
+    "collection-basic"
+    "courier"
+    "euro"
+    "euro-ce"
+    "eurosym"
+    "fpl"
+    "helvetic"
+    "lm"
+    "lm-math"
+    "manfnt-font"
+    "marvosym"
+    "mathpazo"
+    "mflogo-font"
+    "ncntrsbk"
+    "palatino"
+    "pxfonts"
+    "rsfs"
+    "symbol"
+    "tex-gyre"
+    "tex-gyre-math"
+    "times"
+    "tipa"
+    "txfonts"
+    "utopia"
+    "wasy"
+    "wasy-type1"
+    "wasysym"
+    "zapfchan"
+    "zapfding"
+  ];
   sha512.run = "eaa6e54780a0813a88102258ee3bd7a4640787be0b89eff4ba2c9cc19298bf3e2799ffab4e03e49f20131d07fbac9f601a7223fc1b47257dd0feeb04797c56a8";
 };
 "collection-fontutils" = {
   revision = 61207;
   stripPrefix = 0;
-  deps."accfonts" = tl."accfonts";
-  deps."afm2pl" = tl."afm2pl";
-  deps."albatross" = tl."albatross";
-  deps."collection-basic" = tl."collection-basic";
-  deps."dosepsbin" = tl."dosepsbin";
-  deps."dvipsconfig" = tl."dvipsconfig";
-  deps."epstopdf" = tl."epstopdf";
-  deps."fontinst" = tl."fontinst";
-  deps."fontools" = tl."fontools";
-  deps."fontware" = tl."fontware";
-  deps."lcdftypetools" = tl."lcdftypetools";
-  deps."luafindfont" = tl."luafindfont";
-  deps."metatype1" = tl."metatype1";
-  deps."mf2pt1" = tl."mf2pt1";
-  deps."ps2eps" = tl."ps2eps";
-  deps."ps2pk" = tl."ps2pk";
-  deps."psutils" = tl."psutils";
-  deps."t1utils" = tl."t1utils";
-  deps."ttfutils" = tl."ttfutils";
+  deps = [
+    "accfonts"
+    "afm2pl"
+    "albatross"
+    "collection-basic"
+    "dosepsbin"
+    "dvipsconfig"
+    "epstopdf"
+    "fontinst"
+    "fontools"
+    "fontware"
+    "lcdftypetools"
+    "luafindfont"
+    "metatype1"
+    "mf2pt1"
+    "ps2eps"
+    "ps2pk"
+    "psutils"
+    "t1utils"
+    "ttfutils"
+  ];
   sha512.run = "430c95b7e104cb837b7424ebb17ab7ee1aefd99d70aaceefff8a1924fa949329aebe0d5a28b939fabf28d3c5dfc2dcb466147e1396514d5dcf4f64af231db8a7";
 };
 "collection-formatsextra" = {
   revision = 62226;
   stripPrefix = 0;
-  deps."aleph" = tl."aleph";
-  deps."antomega" = tl."antomega";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."edmac" = tl."edmac";
-  deps."eplain" = tl."eplain";
-  deps."hitex" = tl."hitex";
-  deps."jadetex" = tl."jadetex";
-  deps."lambda" = tl."lambda";
-  deps."lollipop" = tl."lollipop";
-  deps."mltex" = tl."mltex";
-  deps."mxedruli" = tl."mxedruli";
-  deps."omega" = tl."omega";
-  deps."omegaware" = tl."omegaware";
-  deps."otibet" = tl."otibet";
-  deps."passivetex" = tl."passivetex";
-  deps."psizzl" = tl."psizzl";
-  deps."startex" = tl."startex";
-  deps."texsis" = tl."texsis";
-  deps."xmltex" = tl."xmltex";
-  deps."xmltexconfig" = tl."xmltexconfig";
+  deps = [
+    "aleph"
+    "antomega"
+    "collection-basic"
+    "collection-latex"
+    "edmac"
+    "eplain"
+    "hitex"
+    "jadetex"
+    "lambda"
+    "lollipop"
+    "mltex"
+    "mxedruli"
+    "omega"
+    "omegaware"
+    "otibet"
+    "passivetex"
+    "psizzl"
+    "startex"
+    "texsis"
+    "xmltex"
+    "xmltexconfig"
+  ];
   sha512.run = "6c7f0a1829789edea6a42d45f13f482abc0aa1ecc66b0ba4b70197efff349df75c9a89a98f21537cf6f3751b608fc3ee10ac842613deaf2aa21005374a23bab2";
 };
 "collection-games" = {
   revision = 64827;
   stripPrefix = 0;
-  deps."bartel-chess-fonts" = tl."bartel-chess-fonts";
-  deps."chess" = tl."chess";
-  deps."chess-problem-diagrams" = tl."chess-problem-diagrams";
-  deps."chessboard" = tl."chessboard";
-  deps."chessfss" = tl."chessfss";
-  deps."chinesechess" = tl."chinesechess";
-  deps."collection-latex" = tl."collection-latex";
-  deps."crossword" = tl."crossword";
-  deps."crosswrd" = tl."crosswrd";
-  deps."customdice" = tl."customdice";
-  deps."egameps" = tl."egameps";
-  deps."gamebook" = tl."gamebook";
-  deps."gamebooklib" = tl."gamebooklib";
-  deps."go" = tl."go";
-  deps."hanoi" = tl."hanoi";
-  deps."havannah" = tl."havannah";
-  deps."hexboard" = tl."hexboard";
-  deps."hexgame" = tl."hexgame";
-  deps."hmtrump" = tl."hmtrump";
-  deps."horoscop" = tl."horoscop";
-  deps."jeuxcartes" = tl."jeuxcartes";
-  deps."jigsaw" = tl."jigsaw";
-  deps."labyrinth" = tl."labyrinth";
-  deps."logicpuzzle" = tl."logicpuzzle";
-  deps."mahjong" = tl."mahjong";
-  deps."musikui" = tl."musikui";
-  deps."nimsticks" = tl."nimsticks";
-  deps."onedown" = tl."onedown";
-  deps."othello" = tl."othello";
-  deps."othelloboard" = tl."othelloboard";
-  deps."pas-crosswords" = tl."pas-crosswords";
-  deps."psgo" = tl."psgo";
-  deps."realtranspose" = tl."realtranspose";
-  deps."reverxii" = tl."reverxii";
-  deps."rubik" = tl."rubik";
-  deps."schwalbe-chess" = tl."schwalbe-chess";
-  deps."sgame" = tl."sgame";
-  deps."skak" = tl."skak";
-  deps."skaknew" = tl."skaknew";
-  deps."soup" = tl."soup";
-  deps."sudoku" = tl."sudoku";
-  deps."sudokubundle" = tl."sudokubundle";
-  deps."wargame" = tl."wargame";
-  deps."xq" = tl."xq";
-  deps."xskak" = tl."xskak";
+  deps = [
+    "bartel-chess-fonts"
+    "chess"
+    "chess-problem-diagrams"
+    "chessboard"
+    "chessfss"
+    "chinesechess"
+    "collection-latex"
+    "crossword"
+    "crosswrd"
+    "customdice"
+    "egameps"
+    "gamebook"
+    "gamebooklib"
+    "go"
+    "hanoi"
+    "havannah"
+    "hexboard"
+    "hexgame"
+    "hmtrump"
+    "horoscop"
+    "jeuxcartes"
+    "jigsaw"
+    "labyrinth"
+    "logicpuzzle"
+    "mahjong"
+    "musikui"
+    "nimsticks"
+    "onedown"
+    "othello"
+    "othelloboard"
+    "pas-crosswords"
+    "psgo"
+    "realtranspose"
+    "reverxii"
+    "rubik"
+    "schwalbe-chess"
+    "sgame"
+    "skak"
+    "skaknew"
+    "soup"
+    "sudoku"
+    "sudokubundle"
+    "wargame"
+    "xq"
+    "xskak"
+  ];
   sha512.run = "0ea226457c553c3db93d7415f1a9e33721b7a41ac17ef049aa52aaeb27a91169769f12532443c34664ccaf4cc76a26761a5d5d0b0a7fa1ccbd2f0142e8d29d67";
 };
 "collection-humanities" = {
   revision = 65216;
   stripPrefix = 0;
-  deps."adtrees" = tl."adtrees";
-  deps."bibleref" = tl."bibleref";
-  deps."bibleref-lds" = tl."bibleref-lds";
-  deps."bibleref-mouth" = tl."bibleref-mouth";
-  deps."bibleref-parse" = tl."bibleref-parse";
-  deps."collection-latex" = tl."collection-latex";
-  deps."covington" = tl."covington";
-  deps."diadia" = tl."diadia";
-  deps."dramatist" = tl."dramatist";
-  deps."dvgloss" = tl."dvgloss";
-  deps."ecltree" = tl."ecltree";
-  deps."edfnotes" = tl."edfnotes";
-  deps."eledform" = tl."eledform";
-  deps."eledmac" = tl."eledmac";
-  deps."expex" = tl."expex";
-  deps."gb4e" = tl."gb4e";
-  deps."gmverse" = tl."gmverse";
-  deps."jura" = tl."jura";
-  deps."juraabbrev" = tl."juraabbrev";
-  deps."juramisc" = tl."juramisc";
-  deps."jurarsp" = tl."jurarsp";
-  deps."langnames" = tl."langnames";
-  deps."ledmac" = tl."ledmac";
-  deps."lexikon" = tl."lexikon";
-  deps."lexref" = tl."lexref";
-  deps."ling-macros" = tl."ling-macros";
-  deps."linguex" = tl."linguex";
-  deps."liturg" = tl."liturg";
-  deps."metrix" = tl."metrix";
-  deps."nnext" = tl."nnext";
-  deps."parallel" = tl."parallel";
-  deps."parrun" = tl."parrun";
-  deps."phonrule" = tl."phonrule";
-  deps."plari" = tl."plari";
-  deps."play" = tl."play";
-  deps."poemscol" = tl."poemscol";
-  deps."poetry" = tl."poetry";
-  deps."poetrytex" = tl."poetrytex";
-  deps."qobitree" = tl."qobitree";
-  deps."qtree" = tl."qtree";
-  deps."reledmac" = tl."reledmac";
-  deps."rrgtrees" = tl."rrgtrees";
-  deps."rtklage" = tl."rtklage";
-  deps."screenplay" = tl."screenplay";
-  deps."screenplay-pkg" = tl."screenplay-pkg";
-  deps."sides" = tl."sides";
-  deps."stage" = tl."stage";
-  deps."textglos" = tl."textglos";
-  deps."thalie" = tl."thalie";
-  deps."theatre" = tl."theatre";
-  deps."tree-dvips" = tl."tree-dvips";
-  deps."verse" = tl."verse";
-  deps."xyling" = tl."xyling";
+  deps = [
+    "adtrees"
+    "bibleref"
+    "bibleref-lds"
+    "bibleref-mouth"
+    "bibleref-parse"
+    "collection-latex"
+    "covington"
+    "diadia"
+    "dramatist"
+    "dvgloss"
+    "ecltree"
+    "edfnotes"
+    "eledform"
+    "eledmac"
+    "expex"
+    "gb4e"
+    "gmverse"
+    "jura"
+    "juraabbrev"
+    "juramisc"
+    "jurarsp"
+    "langnames"
+    "ledmac"
+    "lexikon"
+    "lexref"
+    "ling-macros"
+    "linguex"
+    "liturg"
+    "metrix"
+    "nnext"
+    "parallel"
+    "parrun"
+    "phonrule"
+    "plari"
+    "play"
+    "poemscol"
+    "poetry"
+    "poetrytex"
+    "qobitree"
+    "qtree"
+    "reledmac"
+    "rrgtrees"
+    "rtklage"
+    "screenplay"
+    "screenplay-pkg"
+    "sides"
+    "stage"
+    "textglos"
+    "thalie"
+    "theatre"
+    "tree-dvips"
+    "verse"
+    "xyling"
+  ];
   sha512.run = "d2ae12a0b914be72772dadc60021220990f037f40a2ef4f95038cdd603c80e039f94009910aed38513b4a7938ec99ecf2f035a0dbe221b9e166ccd8aa977c30b";
 };
 "collection-langarabic" = {
   revision = 59594;
   stripPrefix = 0;
-  deps."alkalami" = tl."alkalami";
-  deps."alpha-persian" = tl."alpha-persian";
-  deps."amiri" = tl."amiri";
-  deps."arabi" = tl."arabi";
-  deps."arabi-add" = tl."arabi-add";
-  deps."arabic-book" = tl."arabic-book";
-  deps."arabluatex" = tl."arabluatex";
-  deps."arabtex" = tl."arabtex";
-  deps."bidi" = tl."bidi";
-  deps."bidihl" = tl."bidihl";
-  deps."collection-basic" = tl."collection-basic";
-  deps."dad" = tl."dad";
-  deps."ghab" = tl."ghab";
-  deps."hvarabic" = tl."hvarabic";
-  deps."hyphen-arabic" = tl."hyphen-arabic";
-  deps."hyphen-farsi" = tl."hyphen-farsi";
-  deps."imsproc" = tl."imsproc";
-  deps."kurdishlipsum" = tl."kurdishlipsum";
-  deps."lshort-persian" = tl."lshort-persian";
-  deps."luabidi" = tl."luabidi";
-  deps."na-box" = tl."na-box";
-  deps."persian-bib" = tl."persian-bib";
-  deps."quran" = tl."quran";
-  deps."sexam" = tl."sexam";
-  deps."simurgh" = tl."simurgh";
-  deps."texnegar" = tl."texnegar";
-  deps."tram" = tl."tram";
-  deps."xepersian" = tl."xepersian";
-  deps."xepersian-hm" = tl."xepersian-hm";
-  deps."xindy-persian" = tl."xindy-persian";
+  deps = [
+    "alkalami"
+    "alpha-persian"
+    "amiri"
+    "arabi"
+    "arabi-add"
+    "arabic-book"
+    "arabluatex"
+    "arabtex"
+    "bidi"
+    "bidihl"
+    "collection-basic"
+    "dad"
+    "ghab"
+    "hvarabic"
+    "hyphen-arabic"
+    "hyphen-farsi"
+    "imsproc"
+    "kurdishlipsum"
+    "lshort-persian"
+    "luabidi"
+    "na-box"
+    "persian-bib"
+    "quran"
+    "sexam"
+    "simurgh"
+    "texnegar"
+    "tram"
+    "xepersian"
+    "xepersian-hm"
+    "xindy-persian"
+  ];
   sha512.run = "3fdcf41fafd94373254281f3f7ee9f2a2e136cfa1adc1dd38e4b5cd6f90d0364e6a20d3284fcf255f245158352421e28cfb794c673b8b96399a20343ed991fc2";
 };
 "collection-langchinese" = {
   revision = 63995;
   stripPrefix = 0;
-  deps."arphic" = tl."arphic";
-  deps."arphic-ttf" = tl."arphic-ttf";
-  deps."asymptote-by-example-zh-cn" = tl."asymptote-by-example-zh-cn";
-  deps."asymptote-faq-zh-cn" = tl."asymptote-faq-zh-cn";
-  deps."asymptote-manual-zh-cn" = tl."asymptote-manual-zh-cn";
-  deps."cns" = tl."cns";
-  deps."collection-langcjk" = tl."collection-langcjk";
-  deps."ctex" = tl."ctex";
-  deps."ctex-faq" = tl."ctex-faq";
-  deps."exam-zh" = tl."exam-zh";
-  deps."fandol" = tl."fandol";
-  deps."fduthesis" = tl."fduthesis";
-  deps."hanzibox" = tl."hanzibox";
-  deps."hyphen-chinese" = tl."hyphen-chinese";
-  deps."impatient-cn" = tl."impatient-cn";
-  deps."install-latex-guide-zh-cn" = tl."install-latex-guide-zh-cn";
-  deps."latex-notes-zh-cn" = tl."latex-notes-zh-cn";
-  deps."lshort-chinese" = tl."lshort-chinese";
-  deps."nanicolle" = tl."nanicolle";
-  deps."njurepo" = tl."njurepo";
-  deps."pgfornament-han" = tl."pgfornament-han";
-  deps."qyxf-book" = tl."qyxf-book";
-  deps."texlive-zh-cn" = tl."texlive-zh-cn";
-  deps."texproposal" = tl."texproposal";
-  deps."tlmgr-intro-zh-cn" = tl."tlmgr-intro-zh-cn";
-  deps."upzhkinsoku" = tl."upzhkinsoku";
-  deps."xpinyin" = tl."xpinyin";
-  deps."xtuthesis" = tl."xtuthesis";
-  deps."zhlineskip" = tl."zhlineskip";
-  deps."zhlipsum" = tl."zhlipsum";
-  deps."zhmetrics" = tl."zhmetrics";
-  deps."zhmetrics-uptex" = tl."zhmetrics-uptex";
-  deps."zhnumber" = tl."zhnumber";
-  deps."zhspacing" = tl."zhspacing";
+  deps = [
+    "arphic"
+    "arphic-ttf"
+    "asymptote-by-example-zh-cn"
+    "asymptote-faq-zh-cn"
+    "asymptote-manual-zh-cn"
+    "cns"
+    "collection-langcjk"
+    "ctex"
+    "ctex-faq"
+    "exam-zh"
+    "fandol"
+    "fduthesis"
+    "hanzibox"
+    "hyphen-chinese"
+    "impatient-cn"
+    "install-latex-guide-zh-cn"
+    "latex-notes-zh-cn"
+    "lshort-chinese"
+    "nanicolle"
+    "njurepo"
+    "pgfornament-han"
+    "qyxf-book"
+    "texlive-zh-cn"
+    "texproposal"
+    "tlmgr-intro-zh-cn"
+    "upzhkinsoku"
+    "xpinyin"
+    "xtuthesis"
+    "zhlineskip"
+    "zhlipsum"
+    "zhmetrics"
+    "zhmetrics-uptex"
+    "zhnumber"
+    "zhspacing"
+  ];
   sha512.run = "d10096b2d83dc0378361184a64c347918e75dd51f48d962893371534c375dd8880e8febb1aaf1207e5ce04e59860f629f10c99bbf6304239e1147a5072194137";
 };
 "collection-langcjk" = {
   revision = 61912;
   stripPrefix = 0;
-  deps."adobemapping" = tl."adobemapping";
-  deps."c90" = tl."c90";
-  deps."cjk" = tl."cjk";
-  deps."cjk-gs-integrate" = tl."cjk-gs-integrate";
-  deps."cjkpunct" = tl."cjkpunct";
-  deps."cjkutils" = tl."cjkutils";
-  deps."collection-basic" = tl."collection-basic";
-  deps."dnp" = tl."dnp";
-  deps."fixjfm" = tl."fixjfm";
-  deps."garuda-c90" = tl."garuda-c90";
-  deps."jfmutil" = tl."jfmutil";
-  deps."norasi-c90" = tl."norasi-c90";
-  deps."pxtatescale" = tl."pxtatescale";
-  deps."xcjk2uni" = tl."xcjk2uni";
-  deps."xecjk" = tl."xecjk";
-  deps."zitie" = tl."zitie";
-  deps."zxjafont" = tl."zxjafont";
+  deps = [
+    "adobemapping"
+    "c90"
+    "cjk"
+    "cjk-gs-integrate"
+    "cjkpunct"
+    "cjkutils"
+    "collection-basic"
+    "dnp"
+    "fixjfm"
+    "garuda-c90"
+    "jfmutil"
+    "norasi-c90"
+    "pxtatescale"
+    "xcjk2uni"
+    "xecjk"
+    "zitie"
+    "zxjafont"
+  ];
   sha512.run = "6b00955359e063df2a7c02f2d44f88e6190d65834b8e5c77e9c67e44b8c9de9cee612cd298e79fe3cd598fd58996ace0829d3a5463cdc25b543e7565b1455e31";
 };
 "collection-langcyrillic" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."babel-belarusian" = tl."babel-belarusian";
-  deps."babel-bulgarian" = tl."babel-bulgarian";
-  deps."babel-russian" = tl."babel-russian";
-  deps."babel-serbian" = tl."babel-serbian";
-  deps."babel-serbianc" = tl."babel-serbianc";
-  deps."babel-ukrainian" = tl."babel-ukrainian";
-  deps."churchslavonic" = tl."churchslavonic";
-  deps."cmcyr" = tl."cmcyr";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."cyrillic" = tl."cyrillic";
-  deps."cyrillic-bin" = tl."cyrillic-bin";
-  deps."cyrplain" = tl."cyrplain";
-  deps."disser" = tl."disser";
-  deps."eskd" = tl."eskd";
-  deps."eskdx" = tl."eskdx";
-  deps."gost" = tl."gost";
-  deps."hyphen-belarusian" = tl."hyphen-belarusian";
-  deps."hyphen-bulgarian" = tl."hyphen-bulgarian";
-  deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic";
-  deps."hyphen-mongolian" = tl."hyphen-mongolian";
-  deps."hyphen-russian" = tl."hyphen-russian";
-  deps."hyphen-serbian" = tl."hyphen-serbian";
-  deps."hyphen-ukrainian" = tl."hyphen-ukrainian";
-  deps."lcyw" = tl."lcyw";
-  deps."lh" = tl."lh";
-  deps."lhcyr" = tl."lhcyr";
-  deps."lshort-bulgarian" = tl."lshort-bulgarian";
-  deps."lshort-mongol" = tl."lshort-mongol";
-  deps."lshort-russian" = tl."lshort-russian";
-  deps."lshort-ukr" = tl."lshort-ukr";
-  deps."mongolian-babel" = tl."mongolian-babel";
-  deps."montex" = tl."montex";
-  deps."mpman-ru" = tl."mpman-ru";
-  deps."numnameru" = tl."numnameru";
-  deps."pst-eucl-translation-bg" = tl."pst-eucl-translation-bg";
-  deps."ruhyphen" = tl."ruhyphen";
-  deps."russ" = tl."russ";
-  deps."serbian-apostrophe" = tl."serbian-apostrophe";
-  deps."serbian-date-lat" = tl."serbian-date-lat";
-  deps."serbian-def-cyr" = tl."serbian-def-cyr";
-  deps."serbian-lig" = tl."serbian-lig";
-  deps."t2" = tl."t2";
-  deps."texlive-ru" = tl."texlive-ru";
-  deps."texlive-sr" = tl."texlive-sr";
-  deps."ukrhyph" = tl."ukrhyph";
-  deps."xecyrmongolian" = tl."xecyrmongolian";
+  deps = [
+    "babel-belarusian"
+    "babel-bulgarian"
+    "babel-russian"
+    "babel-serbian"
+    "babel-serbianc"
+    "babel-ukrainian"
+    "churchslavonic"
+    "cmcyr"
+    "collection-basic"
+    "collection-latex"
+    "cyrillic"
+    "cyrillic-bin"
+    "cyrplain"
+    "disser"
+    "eskd"
+    "eskdx"
+    "gost"
+    "hyphen-belarusian"
+    "hyphen-bulgarian"
+    "hyphen-churchslavonic"
+    "hyphen-mongolian"
+    "hyphen-russian"
+    "hyphen-serbian"
+    "hyphen-ukrainian"
+    "lcyw"
+    "lh"
+    "lhcyr"
+    "lshort-bulgarian"
+    "lshort-mongol"
+    "lshort-russian"
+    "lshort-ukr"
+    "mongolian-babel"
+    "montex"
+    "mpman-ru"
+    "numnameru"
+    "pst-eucl-translation-bg"
+    "ruhyphen"
+    "russ"
+    "serbian-apostrophe"
+    "serbian-date-lat"
+    "serbian-def-cyr"
+    "serbian-lig"
+    "t2"
+    "texlive-ru"
+    "texlive-sr"
+    "ukrhyph"
+    "xecyrmongolian"
+  ];
   sha512.run = "43ba5d0f21162fbdb6fd0e9dc7c990fa845918704020da8ca5c6770139370be55f4b707f98708c28b472f9500ee25ea734bdd96c5541a22e66b69c03ae777ad0";
 };
 "collection-langczechslovak" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."babel-czech" = tl."babel-czech";
-  deps."babel-slovak" = tl."babel-slovak";
-  deps."cnbwp" = tl."cnbwp";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."cs" = tl."cs";
-  deps."csbulletin" = tl."csbulletin";
-  deps."cslatex" = tl."cslatex";
-  deps."csplain" = tl."csplain";
-  deps."cstex" = tl."cstex";
-  deps."hyphen-czech" = tl."hyphen-czech";
-  deps."hyphen-slovak" = tl."hyphen-slovak";
-  deps."lshort-czech" = tl."lshort-czech";
-  deps."lshort-slovak" = tl."lshort-slovak";
-  deps."texlive-cz" = tl."texlive-cz";
-  deps."vlna" = tl."vlna";
+  deps = [
+    "babel-czech"
+    "babel-slovak"
+    "cnbwp"
+    "collection-basic"
+    "collection-latex"
+    "cs"
+    "csbulletin"
+    "cslatex"
+    "csplain"
+    "cstex"
+    "hyphen-czech"
+    "hyphen-slovak"
+    "lshort-czech"
+    "lshort-slovak"
+    "texlive-cz"
+    "vlna"
+  ];
   sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67";
 };
 "collection-langenglish" = {
   revision = 63184;
   stripPrefix = 0;
-  deps."amiweb2c-guide" = tl."amiweb2c-guide";
-  deps."amscls-doc" = tl."amscls-doc";
-  deps."amslatex-primer" = tl."amslatex-primer";
-  deps."around-the-bend" = tl."around-the-bend";
-  deps."ascii-chart" = tl."ascii-chart";
-  deps."biblatex-cheatsheet" = tl."biblatex-cheatsheet";
-  deps."collection-basic" = tl."collection-basic";
-  deps."components" = tl."components";
-  deps."comprehensive" = tl."comprehensive";
-  deps."dickimaw" = tl."dickimaw";
-  deps."docsurvey" = tl."docsurvey";
-  deps."dtxtut" = tl."dtxtut";
-  deps."first-latex-doc" = tl."first-latex-doc";
-  deps."fontinstallationguide" = tl."fontinstallationguide";
-  deps."forest-quickstart" = tl."forest-quickstart";
-  deps."gentle" = tl."gentle";
-  deps."guide-to-latex" = tl."guide-to-latex";
-  deps."happy4th" = tl."happy4th";
-  deps."hyphen-english" = tl."hyphen-english";
-  deps."impatient" = tl."impatient";
-  deps."intro-scientific" = tl."intro-scientific";
-  deps."knuth-errata" = tl."knuth-errata";
-  deps."knuth-hint" = tl."knuth-hint";
-  deps."knuth-pdf" = tl."knuth-pdf";
-  deps."l2tabu-english" = tl."l2tabu-english";
-  deps."latex-brochure" = tl."latex-brochure";
-  deps."latex-course" = tl."latex-course";
-  deps."latex-doc-ptr" = tl."latex-doc-ptr";
-  deps."latex-for-undergraduates" = tl."latex-for-undergraduates";
-  deps."latex-graphics-companion" = tl."latex-graphics-companion";
-  deps."latex-refsheet" = tl."latex-refsheet";
-  deps."latex-veryshortguide" = tl."latex-veryshortguide";
-  deps."latex-web-companion" = tl."latex-web-companion";
-  deps."latex2e-help-texinfo" = tl."latex2e-help-texinfo";
-  deps."latex4wp" = tl."latex4wp";
-  deps."latexcheat" = tl."latexcheat";
-  deps."latexcourse-rug" = tl."latexcourse-rug";
-  deps."latexfileinfo-pkgs" = tl."latexfileinfo-pkgs";
-  deps."lshort-english" = tl."lshort-english";
-  deps."macros2e" = tl."macros2e";
-  deps."math-into-latex-4" = tl."math-into-latex-4";
-  deps."maths-symbols" = tl."maths-symbols";
-  deps."memdesign" = tl."memdesign";
-  deps."memoirchapterstyles" = tl."memoirchapterstyles";
-  deps."metafont-beginners" = tl."metafont-beginners";
-  deps."metapost-examples" = tl."metapost-examples";
-  deps."patgen2-tutorial" = tl."patgen2-tutorial";
-  deps."pictexsum" = tl."pictexsum";
-  deps."plain-doc" = tl."plain-doc";
-  deps."short-math-guide" = tl."short-math-guide";
-  deps."simplified-latex" = tl."simplified-latex";
-  deps."svg-inkscape" = tl."svg-inkscape";
-  deps."tamethebeast" = tl."tamethebeast";
-  deps."tds" = tl."tds";
-  deps."tex-font-errors-cheatsheet" = tl."tex-font-errors-cheatsheet";
-  deps."tex-nutshell" = tl."tex-nutshell";
-  deps."tex-overview" = tl."tex-overview";
-  deps."tex-refs" = tl."tex-refs";
-  deps."tex-vpat" = tl."tex-vpat";
-  deps."texbytopic" = tl."texbytopic";
-  deps."texonly" = tl."texonly";
-  deps."titlepages" = tl."titlepages";
-  deps."tlc2" = tl."tlc2";
-  deps."tlmgrbasics" = tl."tlmgrbasics";
-  deps."undergradmath" = tl."undergradmath";
-  deps."visualfaq" = tl."visualfaq";
-  deps."webguide" = tl."webguide";
-  deps."xetexref" = tl."xetexref";
-  deps."yet-another-guide-latex2e" = tl."yet-another-guide-latex2e";
+  deps = [
+    "amiweb2c-guide"
+    "amscls-doc"
+    "amslatex-primer"
+    "around-the-bend"
+    "ascii-chart"
+    "biblatex-cheatsheet"
+    "collection-basic"
+    "components"
+    "comprehensive"
+    "dickimaw"
+    "docsurvey"
+    "dtxtut"
+    "first-latex-doc"
+    "fontinstallationguide"
+    "forest-quickstart"
+    "gentle"
+    "guide-to-latex"
+    "happy4th"
+    "hyphen-english"
+    "impatient"
+    "intro-scientific"
+    "knuth-errata"
+    "knuth-hint"
+    "knuth-pdf"
+    "l2tabu-english"
+    "latex-brochure"
+    "latex-course"
+    "latex-doc-ptr"
+    "latex-for-undergraduates"
+    "latex-graphics-companion"
+    "latex-refsheet"
+    "latex-veryshortguide"
+    "latex-web-companion"
+    "latex2e-help-texinfo"
+    "latex4wp"
+    "latexcheat"
+    "latexcourse-rug"
+    "latexfileinfo-pkgs"
+    "lshort-english"
+    "macros2e"
+    "math-into-latex-4"
+    "maths-symbols"
+    "memdesign"
+    "memoirchapterstyles"
+    "metafont-beginners"
+    "metapost-examples"
+    "patgen2-tutorial"
+    "pictexsum"
+    "plain-doc"
+    "short-math-guide"
+    "simplified-latex"
+    "svg-inkscape"
+    "tamethebeast"
+    "tds"
+    "tex-font-errors-cheatsheet"
+    "tex-nutshell"
+    "tex-overview"
+    "tex-refs"
+    "tex-vpat"
+    "texbytopic"
+    "texonly"
+    "titlepages"
+    "tlc2"
+    "tlmgrbasics"
+    "undergradmath"
+    "visualfaq"
+    "webguide"
+    "xetexref"
+    "yet-another-guide-latex2e"
+  ];
   sha512.run = "94b1ee572454d4a791ab0637cf272f97a35dc5284c8a97a68715fcef36887eaa92ddb78f95722a6281d35c70fa6e5e4b6548ba8ca79fb69d9734c480383bdec2";
 };
 "collection-langeuropean" = {
   revision = 64723;
   stripPrefix = 0;
-  deps."armtex" = tl."armtex";
-  deps."babel-albanian" = tl."babel-albanian";
-  deps."babel-bosnian" = tl."babel-bosnian";
-  deps."babel-breton" = tl."babel-breton";
-  deps."babel-croatian" = tl."babel-croatian";
-  deps."babel-danish" = tl."babel-danish";
-  deps."babel-dutch" = tl."babel-dutch";
-  deps."babel-estonian" = tl."babel-estonian";
-  deps."babel-finnish" = tl."babel-finnish";
-  deps."babel-friulan" = tl."babel-friulan";
-  deps."babel-hungarian" = tl."babel-hungarian";
-  deps."babel-icelandic" = tl."babel-icelandic";
-  deps."babel-irish" = tl."babel-irish";
-  deps."babel-kurmanji" = tl."babel-kurmanji";
-  deps."babel-latin" = tl."babel-latin";
-  deps."babel-latvian" = tl."babel-latvian";
-  deps."babel-macedonian" = tl."babel-macedonian";
-  deps."babel-norsk" = tl."babel-norsk";
-  deps."babel-occitan" = tl."babel-occitan";
-  deps."babel-piedmontese" = tl."babel-piedmontese";
-  deps."babel-romanian" = tl."babel-romanian";
-  deps."babel-romansh" = tl."babel-romansh";
-  deps."babel-samin" = tl."babel-samin";
-  deps."babel-scottish" = tl."babel-scottish";
-  deps."babel-slovenian" = tl."babel-slovenian";
-  deps."babel-swedish" = tl."babel-swedish";
-  deps."babel-turkish" = tl."babel-turkish";
-  deps."babel-welsh" = tl."babel-welsh";
-  deps."collection-basic" = tl."collection-basic";
-  deps."finbib" = tl."finbib";
-  deps."gloss-occitan" = tl."gloss-occitan";
-  deps."hrlatex" = tl."hrlatex";
-  deps."huaz" = tl."huaz";
-  deps."hulipsum" = tl."hulipsum";
-  deps."hyphen-croatian" = tl."hyphen-croatian";
-  deps."hyphen-danish" = tl."hyphen-danish";
-  deps."hyphen-dutch" = tl."hyphen-dutch";
-  deps."hyphen-estonian" = tl."hyphen-estonian";
-  deps."hyphen-finnish" = tl."hyphen-finnish";
-  deps."hyphen-friulan" = tl."hyphen-friulan";
-  deps."hyphen-hungarian" = tl."hyphen-hungarian";
-  deps."hyphen-icelandic" = tl."hyphen-icelandic";
-  deps."hyphen-irish" = tl."hyphen-irish";
-  deps."hyphen-kurmanji" = tl."hyphen-kurmanji";
-  deps."hyphen-latin" = tl."hyphen-latin";
-  deps."hyphen-latvian" = tl."hyphen-latvian";
-  deps."hyphen-lithuanian" = tl."hyphen-lithuanian";
-  deps."hyphen-macedonian" = tl."hyphen-macedonian";
-  deps."hyphen-norwegian" = tl."hyphen-norwegian";
-  deps."hyphen-occitan" = tl."hyphen-occitan";
-  deps."hyphen-piedmontese" = tl."hyphen-piedmontese";
-  deps."hyphen-romanian" = tl."hyphen-romanian";
-  deps."hyphen-romansh" = tl."hyphen-romansh";
-  deps."hyphen-slovenian" = tl."hyphen-slovenian";
-  deps."hyphen-swedish" = tl."hyphen-swedish";
-  deps."hyphen-turkish" = tl."hyphen-turkish";
-  deps."hyphen-uppersorbian" = tl."hyphen-uppersorbian";
-  deps."hyphen-welsh" = tl."hyphen-welsh";
-  deps."kaytannollista-latexia" = tl."kaytannollista-latexia";
-  deps."lithuanian" = tl."lithuanian";
-  deps."lshort-dutch" = tl."lshort-dutch";
-  deps."lshort-estonian" = tl."lshort-estonian";
-  deps."lshort-finnish" = tl."lshort-finnish";
-  deps."lshort-slovenian" = tl."lshort-slovenian";
-  deps."lshort-turkish" = tl."lshort-turkish";
-  deps."nevelok" = tl."nevelok";
-  deps."rojud" = tl."rojud";
-  deps."swebib" = tl."swebib";
-  deps."turkmen" = tl."turkmen";
+  deps = [
+    "armtex"
+    "babel-albanian"
+    "babel-bosnian"
+    "babel-breton"
+    "babel-croatian"
+    "babel-danish"
+    "babel-dutch"
+    "babel-estonian"
+    "babel-finnish"
+    "babel-friulan"
+    "babel-hungarian"
+    "babel-icelandic"
+    "babel-irish"
+    "babel-kurmanji"
+    "babel-latin"
+    "babel-latvian"
+    "babel-macedonian"
+    "babel-norsk"
+    "babel-occitan"
+    "babel-piedmontese"
+    "babel-romanian"
+    "babel-romansh"
+    "babel-samin"
+    "babel-scottish"
+    "babel-slovenian"
+    "babel-swedish"
+    "babel-turkish"
+    "babel-welsh"
+    "collection-basic"
+    "finbib"
+    "gloss-occitan"
+    "hrlatex"
+    "huaz"
+    "hulipsum"
+    "hyphen-croatian"
+    "hyphen-danish"
+    "hyphen-dutch"
+    "hyphen-estonian"
+    "hyphen-finnish"
+    "hyphen-friulan"
+    "hyphen-hungarian"
+    "hyphen-icelandic"
+    "hyphen-irish"
+    "hyphen-kurmanji"
+    "hyphen-latin"
+    "hyphen-latvian"
+    "hyphen-lithuanian"
+    "hyphen-macedonian"
+    "hyphen-norwegian"
+    "hyphen-occitan"
+    "hyphen-piedmontese"
+    "hyphen-romanian"
+    "hyphen-romansh"
+    "hyphen-slovenian"
+    "hyphen-swedish"
+    "hyphen-turkish"
+    "hyphen-uppersorbian"
+    "hyphen-welsh"
+    "kaytannollista-latexia"
+    "lithuanian"
+    "lshort-dutch"
+    "lshort-estonian"
+    "lshort-finnish"
+    "lshort-slovenian"
+    "lshort-turkish"
+    "nevelok"
+    "rojud"
+    "swebib"
+    "turkmen"
+  ];
   sha512.run = "4a234c1f9b66d04df7f897ad38e6af56666917106e1a299e00dbccd6a5ba55c635beee78550c410cd4c631c3e91ea250adc79e8e3b29bc473d3e721c5adf75e4";
 };
 "collection-langfrench" = {
   revision = 63147;
   stripPrefix = 0;
-  deps."aeguill" = tl."aeguill";
-  deps."annee-scolaire" = tl."annee-scolaire";
-  deps."apprendre-a-programmer-en-tex" = tl."apprendre-a-programmer-en-tex";
-  deps."apprends-latex" = tl."apprends-latex";
-  deps."babel-basque" = tl."babel-basque";
-  deps."babel-french" = tl."babel-french";
-  deps."basque-book" = tl."basque-book";
-  deps."basque-date" = tl."basque-date";
-  deps."bib-fr" = tl."bib-fr";
-  deps."bibleref-french" = tl."bibleref-french";
-  deps."booktabs-fr" = tl."booktabs-fr";
-  deps."collection-basic" = tl."collection-basic";
-  deps."droit-fr" = tl."droit-fr";
-  deps."e-french" = tl."e-french";
-  deps."epslatex-fr" = tl."epslatex-fr";
-  deps."expose-expl3-dunkerque-2019" = tl."expose-expl3-dunkerque-2019";
-  deps."facture" = tl."facture";
-  deps."formation-latex-ul" = tl."formation-latex-ul";
-  deps."frenchmath" = tl."frenchmath";
-  deps."frletter" = tl."frletter";
-  deps."frpseudocode" = tl."frpseudocode";
-  deps."hyphen-basque" = tl."hyphen-basque";
-  deps."hyphen-french" = tl."hyphen-french";
-  deps."impatient-fr" = tl."impatient-fr";
-  deps."impnattypo" = tl."impnattypo";
-  deps."l2tabu-french" = tl."l2tabu-french";
-  deps."latex2e-help-texinfo-fr" = tl."latex2e-help-texinfo-fr";
-  deps."letgut" = tl."letgut";
-  deps."lshort-french" = tl."lshort-french";
-  deps."mafr" = tl."mafr";
-  deps."matapli" = tl."matapli";
-  deps."profcollege" = tl."profcollege";
-  deps."proflabo" = tl."proflabo";
-  deps."proflycee" = tl."proflycee";
-  deps."tabvar" = tl."tabvar";
-  deps."tdsfrmath" = tl."tdsfrmath";
-  deps."texlive-fr" = tl."texlive-fr";
-  deps."translation-array-fr" = tl."translation-array-fr";
-  deps."translation-dcolumn-fr" = tl."translation-dcolumn-fr";
-  deps."translation-natbib-fr" = tl."translation-natbib-fr";
-  deps."translation-tabbing-fr" = tl."translation-tabbing-fr";
-  deps."variations" = tl."variations";
-  deps."visualfaq-fr" = tl."visualfaq-fr";
-  deps."visualtikz" = tl."visualtikz";
+  deps = [
+    "aeguill"
+    "annee-scolaire"
+    "apprendre-a-programmer-en-tex"
+    "apprends-latex"
+    "babel-basque"
+    "babel-french"
+    "basque-book"
+    "basque-date"
+    "bib-fr"
+    "bibleref-french"
+    "booktabs-fr"
+    "collection-basic"
+    "droit-fr"
+    "e-french"
+    "epslatex-fr"
+    "expose-expl3-dunkerque-2019"
+    "facture"
+    "formation-latex-ul"
+    "frenchmath"
+    "frletter"
+    "frpseudocode"
+    "hyphen-basque"
+    "hyphen-french"
+    "impatient-fr"
+    "impnattypo"
+    "l2tabu-french"
+    "latex2e-help-texinfo-fr"
+    "letgut"
+    "lshort-french"
+    "mafr"
+    "matapli"
+    "profcollege"
+    "proflabo"
+    "proflycee"
+    "tabvar"
+    "tdsfrmath"
+    "texlive-fr"
+    "translation-array-fr"
+    "translation-dcolumn-fr"
+    "translation-natbib-fr"
+    "translation-tabbing-fr"
+    "variations"
+    "visualfaq-fr"
+    "visualtikz"
+  ];
   sha512.run = "baec84c93e0b9313b29f807831da39da40902afdbc2305e193e9d4805c631a1e44695c0bc148e973d9021146cc25da9b22b0130b29fe4ff9834667ec83dff9b6";
 };
 "collection-langgerman" = {
   revision = 55706;
   stripPrefix = 0;
-  deps."apalike-german" = tl."apalike-german";
-  deps."babel-german" = tl."babel-german";
-  deps."bibleref-german" = tl."bibleref-german";
-  deps."booktabs-de" = tl."booktabs-de";
-  deps."collection-basic" = tl."collection-basic";
-  deps."csquotes-de" = tl."csquotes-de";
-  deps."dehyph" = tl."dehyph";
-  deps."dehyph-exptl" = tl."dehyph-exptl";
-  deps."dhua" = tl."dhua";
-  deps."dtk-bibliography" = tl."dtk-bibliography";
-  deps."etdipa" = tl."etdipa";
-  deps."etoolbox-de" = tl."etoolbox-de";
-  deps."fifinddo-info" = tl."fifinddo-info";
-  deps."german" = tl."german";
-  deps."germbib" = tl."germbib";
-  deps."germkorr" = tl."germkorr";
-  deps."hausarbeit-jura" = tl."hausarbeit-jura";
-  deps."hyphen-german" = tl."hyphen-german";
-  deps."koma-script-examples" = tl."koma-script-examples";
-  deps."l2picfaq" = tl."l2picfaq";
-  deps."l2tabu" = tl."l2tabu";
-  deps."latexcheat-de" = tl."latexcheat-de";
-  deps."lshort-german" = tl."lshort-german";
-  deps."lualatex-doc-de" = tl."lualatex-doc-de";
-  deps."microtype-de" = tl."microtype-de";
-  deps."milog" = tl."milog";
-  deps."quran-de" = tl."quran-de";
-  deps."r_und_s" = tl."r_und_s";
-  deps."schulmathematik" = tl."schulmathematik";
-  deps."templates-fenn" = tl."templates-fenn";
-  deps."templates-sommer" = tl."templates-sommer";
-  deps."termcal-de" = tl."termcal-de";
-  deps."texlive-de" = tl."texlive-de";
-  deps."tipa-de" = tl."tipa-de";
-  deps."translation-arsclassica-de" = tl."translation-arsclassica-de";
-  deps."translation-biblatex-de" = tl."translation-biblatex-de";
-  deps."translation-chemsym-de" = tl."translation-chemsym-de";
-  deps."translation-ecv-de" = tl."translation-ecv-de";
-  deps."translation-enumitem-de" = tl."translation-enumitem-de";
-  deps."translation-europecv-de" = tl."translation-europecv-de";
-  deps."translation-filecontents-de" = tl."translation-filecontents-de";
-  deps."translation-moreverb-de" = tl."translation-moreverb-de";
-  deps."udesoftec" = tl."udesoftec";
-  deps."uhrzeit" = tl."uhrzeit";
-  deps."umlaute" = tl."umlaute";
-  deps."voss-mathcol" = tl."voss-mathcol";
+  deps = [
+    "apalike-german"
+    "babel-german"
+    "bibleref-german"
+    "booktabs-de"
+    "collection-basic"
+    "csquotes-de"
+    "dehyph"
+    "dehyph-exptl"
+    "dhua"
+    "dtk-bibliography"
+    "etdipa"
+    "etoolbox-de"
+    "fifinddo-info"
+    "german"
+    "germbib"
+    "germkorr"
+    "hausarbeit-jura"
+    "hyphen-german"
+    "koma-script-examples"
+    "l2picfaq"
+    "l2tabu"
+    "latexcheat-de"
+    "lshort-german"
+    "lualatex-doc-de"
+    "microtype-de"
+    "milog"
+    "quran-de"
+    "r_und_s"
+    "schulmathematik"
+    "templates-fenn"
+    "templates-sommer"
+    "termcal-de"
+    "texlive-de"
+    "tipa-de"
+    "translation-arsclassica-de"
+    "translation-biblatex-de"
+    "translation-chemsym-de"
+    "translation-ecv-de"
+    "translation-enumitem-de"
+    "translation-europecv-de"
+    "translation-filecontents-de"
+    "translation-moreverb-de"
+    "udesoftec"
+    "uhrzeit"
+    "umlaute"
+    "voss-mathcol"
+  ];
   sha512.run = "19b9f47b68ca6068900c413d8216e13c20d25ab084cdcbd500694a18a10cbaa35ba5681be09392e0b20873788519a436c28c1ea89a728e3f546083ce0883c15c";
 };
 "collection-langgreek" = {
   revision = 65038;
   stripPrefix = 0;
-  deps."babel-greek" = tl."babel-greek";
-  deps."begingreek" = tl."begingreek";
-  deps."betababel" = tl."betababel";
-  deps."cbfonts" = tl."cbfonts";
-  deps."cbfonts-fd" = tl."cbfonts-fd";
-  deps."collection-basic" = tl."collection-basic";
-  deps."gfsbaskerville" = tl."gfsbaskerville";
-  deps."gfsporson" = tl."gfsporson";
-  deps."greek-fontenc" = tl."greek-fontenc";
-  deps."greek-inputenc" = tl."greek-inputenc";
-  deps."greekdates" = tl."greekdates";
-  deps."greektex" = tl."greektex";
-  deps."greektonoi" = tl."greektonoi";
-  deps."hyphen-ancientgreek" = tl."hyphen-ancientgreek";
-  deps."hyphen-greek" = tl."hyphen-greek";
-  deps."ibycus-babel" = tl."ibycus-babel";
-  deps."ibygrk" = tl."ibygrk";
-  deps."kerkis" = tl."kerkis";
-  deps."levy" = tl."levy";
-  deps."lgreek" = tl."lgreek";
-  deps."lgrmath" = tl."lgrmath";
-  deps."mkgrkindex" = tl."mkgrkindex";
-  deps."talos" = tl."talos";
-  deps."teubner" = tl."teubner";
-  deps."xgreek" = tl."xgreek";
-  deps."yannisgr" = tl."yannisgr";
+  deps = [
+    "babel-greek"
+    "begingreek"
+    "betababel"
+    "cbfonts"
+    "cbfonts-fd"
+    "collection-basic"
+    "gfsbaskerville"
+    "gfsporson"
+    "greek-fontenc"
+    "greek-inputenc"
+    "greekdates"
+    "greektex"
+    "greektonoi"
+    "hyphen-ancientgreek"
+    "hyphen-greek"
+    "ibycus-babel"
+    "ibygrk"
+    "kerkis"
+    "levy"
+    "lgreek"
+    "lgrmath"
+    "mkgrkindex"
+    "talos"
+    "teubner"
+    "xgreek"
+    "yannisgr"
+  ];
   sha512.run = "800991b6bb8ac7772ad030ad665b812abd9b294498f7b7678be721ccc87d54607e267bd189a0591ebead2c6ecb64047e5b5581c374f067c3b1575b6d442cc6c9";
 };
 "collection-langitalian" = {
   revision = 55129;
   stripPrefix = 0;
-  deps."amsldoc-it" = tl."amsldoc-it";
-  deps."amsmath-it" = tl."amsmath-it";
-  deps."amsthdoc-it" = tl."amsthdoc-it";
-  deps."antanilipsum" = tl."antanilipsum";
-  deps."babel-italian" = tl."babel-italian";
-  deps."codicefiscaleitaliano" = tl."codicefiscaleitaliano";
-  deps."collection-basic" = tl."collection-basic";
-  deps."fancyhdr-it" = tl."fancyhdr-it";
-  deps."fixltxhyph" = tl."fixltxhyph";
-  deps."frontespizio" = tl."frontespizio";
-  deps."hyphen-italian" = tl."hyphen-italian";
-  deps."itnumpar" = tl."itnumpar";
-  deps."l2tabu-italian" = tl."l2tabu-italian";
-  deps."latex4wp-it" = tl."latex4wp-it";
-  deps."layaureo" = tl."layaureo";
-  deps."lshort-italian" = tl."lshort-italian";
-  deps."psfrag-italian" = tl."psfrag-italian";
-  deps."texlive-it" = tl."texlive-it";
-  deps."verifica" = tl."verifica";
+  deps = [
+    "amsldoc-it"
+    "amsmath-it"
+    "amsthdoc-it"
+    "antanilipsum"
+    "babel-italian"
+    "codicefiscaleitaliano"
+    "collection-basic"
+    "fancyhdr-it"
+    "fixltxhyph"
+    "frontespizio"
+    "hyphen-italian"
+    "itnumpar"
+    "l2tabu-italian"
+    "latex4wp-it"
+    "layaureo"
+    "lshort-italian"
+    "psfrag-italian"
+    "texlive-it"
+    "verifica"
+  ];
   sha512.run = "6ec5e8a62e3c1ed8e3c23542381091d38c77af507af7088a55e44f1e34b85d01ec19342db4541d9d6cd712c0929d54a3fc663e1d8fde3c53fef0d6fc43be4994";
 };
 "collection-langjapanese" = {
   revision = 64603;
   stripPrefix = 0;
-  deps."ascmac" = tl."ascmac";
-  deps."asternote" = tl."asternote";
-  deps."babel-japanese" = tl."babel-japanese";
-  deps."bxbase" = tl."bxbase";
-  deps."bxcjkjatype" = tl."bxcjkjatype";
-  deps."bxghost" = tl."bxghost";
-  deps."bxjaholiday" = tl."bxjaholiday";
-  deps."bxjalipsum" = tl."bxjalipsum";
-  deps."bxjaprnind" = tl."bxjaprnind";
-  deps."bxjatoucs" = tl."bxjatoucs";
-  deps."bxjscls" = tl."bxjscls";
-  deps."bxorigcapt" = tl."bxorigcapt";
-  deps."bxwareki" = tl."bxwareki";
-  deps."collection-langcjk" = tl."collection-langcjk";
-  deps."convbkmk" = tl."convbkmk";
-  deps."endnotesj" = tl."endnotesj";
-  deps."gckanbun" = tl."gckanbun";
-  deps."gentombow" = tl."gentombow";
-  deps."haranoaji" = tl."haranoaji";
-  deps."haranoaji-extra" = tl."haranoaji-extra";
-  deps."ieejtran" = tl."ieejtran";
-  deps."ifptex" = tl."ifptex";
-  deps."ifxptex" = tl."ifxptex";
-  deps."ipaex" = tl."ipaex";
-  deps."japanese-mathformulas" = tl."japanese-mathformulas";
-  deps."japanese-otf" = tl."japanese-otf";
-  deps."jieeetran" = tl."jieeetran";
-  deps."jlreq" = tl."jlreq";
-  deps."jlreq-deluxe" = tl."jlreq-deluxe";
-  deps."jpneduenumerate" = tl."jpneduenumerate";
-  deps."jpnedumathsymbols" = tl."jpnedumathsymbols";
-  deps."jsclasses" = tl."jsclasses";
-  deps."kanbun" = tl."kanbun";
-  deps."lshort-japanese" = tl."lshort-japanese";
-  deps."luatexja" = tl."luatexja";
-  deps."mendex-doc" = tl."mendex-doc";
-  deps."morisawa" = tl."morisawa";
-  deps."pbibtex-base" = tl."pbibtex-base";
-  deps."pbibtex-manual" = tl."pbibtex-manual";
-  deps."platex" = tl."platex";
-  deps."platex-tools" = tl."platex-tools";
-  deps."platexcheat" = tl."platexcheat";
-  deps."plautopatch" = tl."plautopatch";
-  deps."ptex" = tl."ptex";
-  deps."ptex-base" = tl."ptex-base";
-  deps."ptex-fontmaps" = tl."ptex-fontmaps";
-  deps."ptex-fonts" = tl."ptex-fonts";
-  deps."ptex-manual" = tl."ptex-manual";
-  deps."ptex2pdf" = tl."ptex2pdf";
-  deps."pxbase" = tl."pxbase";
-  deps."pxchfon" = tl."pxchfon";
-  deps."pxcjkcat" = tl."pxcjkcat";
-  deps."pxjahyper" = tl."pxjahyper";
-  deps."pxjodel" = tl."pxjodel";
-  deps."pxrubrica" = tl."pxrubrica";
-  deps."pxufont" = tl."pxufont";
-  deps."texlive-ja" = tl."texlive-ja";
-  deps."uplatex" = tl."uplatex";
-  deps."uptex" = tl."uptex";
-  deps."uptex-base" = tl."uptex-base";
-  deps."uptex-fonts" = tl."uptex-fonts";
-  deps."wadalab" = tl."wadalab";
-  deps."zxjafbfont" = tl."zxjafbfont";
-  deps."zxjatype" = tl."zxjatype";
+  deps = [
+    "ascmac"
+    "asternote"
+    "babel-japanese"
+    "bxbase"
+    "bxcjkjatype"
+    "bxghost"
+    "bxjaholiday"
+    "bxjalipsum"
+    "bxjaprnind"
+    "bxjatoucs"
+    "bxjscls"
+    "bxorigcapt"
+    "bxwareki"
+    "collection-langcjk"
+    "convbkmk"
+    "endnotesj"
+    "gckanbun"
+    "gentombow"
+    "haranoaji"
+    "haranoaji-extra"
+    "ieejtran"
+    "ifptex"
+    "ifxptex"
+    "ipaex"
+    "japanese-mathformulas"
+    "japanese-otf"
+    "jieeetran"
+    "jlreq"
+    "jlreq-deluxe"
+    "jpneduenumerate"
+    "jpnedumathsymbols"
+    "jsclasses"
+    "kanbun"
+    "lshort-japanese"
+    "luatexja"
+    "mendex-doc"
+    "morisawa"
+    "pbibtex-base"
+    "pbibtex-manual"
+    "platex"
+    "platex-tools"
+    "platexcheat"
+    "plautopatch"
+    "ptex"
+    "ptex-base"
+    "ptex-fontmaps"
+    "ptex-fonts"
+    "ptex-manual"
+    "ptex2pdf"
+    "pxbase"
+    "pxchfon"
+    "pxcjkcat"
+    "pxjahyper"
+    "pxjodel"
+    "pxrubrica"
+    "pxufont"
+    "texlive-ja"
+    "uplatex"
+    "uptex"
+    "uptex-base"
+    "uptex-fonts"
+    "wadalab"
+    "zxjafbfont"
+    "zxjatype"
+  ];
   sha512.run = "d9f73ff10afe2c91f9f6ad0e92ddcf8425ed7f51c7f08d291451775bcfcf3421d8d2afd78c7dbdceef995ac5a4262df89afce2b35e6c2dd064e8a310e1025f67";
 };
 "collection-langkorean" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."baekmuk" = tl."baekmuk";
-  deps."cjk-ko" = tl."cjk-ko";
-  deps."collection-langcjk" = tl."collection-langcjk";
-  deps."kotex-oblivoir" = tl."kotex-oblivoir";
-  deps."kotex-plain" = tl."kotex-plain";
-  deps."kotex-utf" = tl."kotex-utf";
-  deps."kotex-utils" = tl."kotex-utils";
-  deps."lshort-korean" = tl."lshort-korean";
-  deps."nanumtype1" = tl."nanumtype1";
-  deps."pmhanguljamo" = tl."pmhanguljamo";
-  deps."uhc" = tl."uhc";
-  deps."unfonts-core" = tl."unfonts-core";
-  deps."unfonts-extra" = tl."unfonts-extra";
+  deps = [
+    "baekmuk"
+    "cjk-ko"
+    "collection-langcjk"
+    "kotex-oblivoir"
+    "kotex-plain"
+    "kotex-utf"
+    "kotex-utils"
+    "lshort-korean"
+    "nanumtype1"
+    "pmhanguljamo"
+    "uhc"
+    "unfonts-core"
+    "unfonts-extra"
+  ];
   sha512.run = "2d93df728d34137c8f9a884aa2871a2980e806672006f2c5f0c5f79412d5789c6f94958363cfc9a78b5a97a7d76bbb6cb157b2cb2a8a283f7afdfd838fa24883";
 };
 "collection-langother" = {
   revision = 59564;
   stripPrefix = 0;
-  deps."aalok" = tl."aalok";
-  deps."akshar" = tl."akshar";
-  deps."amsldoc-vn" = tl."amsldoc-vn";
-  deps."aramaic-serto" = tl."aramaic-serto";
-  deps."babel-azerbaijani" = tl."babel-azerbaijani";
-  deps."babel-esperanto" = tl."babel-esperanto";
-  deps."babel-georgian" = tl."babel-georgian";
-  deps."babel-hebrew" = tl."babel-hebrew";
-  deps."babel-indonesian" = tl."babel-indonesian";
-  deps."babel-interlingua" = tl."babel-interlingua";
-  deps."babel-malay" = tl."babel-malay";
-  deps."babel-sorbian" = tl."babel-sorbian";
-  deps."babel-thai" = tl."babel-thai";
-  deps."babel-vietnamese" = tl."babel-vietnamese";
-  deps."bangla" = tl."bangla";
-  deps."bangtex" = tl."bangtex";
-  deps."bengali" = tl."bengali";
-  deps."burmese" = tl."burmese";
-  deps."chhaya" = tl."chhaya";
-  deps."cjhebrew" = tl."cjhebrew";
-  deps."collection-basic" = tl."collection-basic";
-  deps."ctib" = tl."ctib";
-  deps."ebong" = tl."ebong";
-  deps."ethiop" = tl."ethiop";
-  deps."ethiop-t1" = tl."ethiop-t1";
-  deps."fc" = tl."fc";
-  deps."fonts-tlwg" = tl."fonts-tlwg";
-  deps."hindawi-latex-template" = tl."hindawi-latex-template";
-  deps."hyphen-afrikaans" = tl."hyphen-afrikaans";
-  deps."hyphen-armenian" = tl."hyphen-armenian";
-  deps."hyphen-coptic" = tl."hyphen-coptic";
-  deps."hyphen-esperanto" = tl."hyphen-esperanto";
-  deps."hyphen-ethiopic" = tl."hyphen-ethiopic";
-  deps."hyphen-georgian" = tl."hyphen-georgian";
-  deps."hyphen-indic" = tl."hyphen-indic";
-  deps."hyphen-indonesian" = tl."hyphen-indonesian";
-  deps."hyphen-interlingua" = tl."hyphen-interlingua";
-  deps."hyphen-sanskrit" = tl."hyphen-sanskrit";
-  deps."hyphen-thai" = tl."hyphen-thai";
-  deps."hyphen-turkmen" = tl."hyphen-turkmen";
-  deps."latex-mr" = tl."latex-mr";
-  deps."latexbangla" = tl."latexbangla";
-  deps."latino-sine-flexione" = tl."latino-sine-flexione";
-  deps."lshort-thai" = tl."lshort-thai";
-  deps."lshort-vietnamese" = tl."lshort-vietnamese";
-  deps."marathi" = tl."marathi";
-  deps."ntheorem-vn" = tl."ntheorem-vn";
-  deps."padauk" = tl."padauk";
-  deps."quran-bn" = tl."quran-bn";
-  deps."quran-ur" = tl."quran-ur";
-  deps."sanskrit" = tl."sanskrit";
-  deps."sanskrit-t1" = tl."sanskrit-t1";
-  deps."thaienum" = tl."thaienum";
-  deps."thaispec" = tl."thaispec";
-  deps."unicode-alphabets" = tl."unicode-alphabets";
-  deps."velthuis" = tl."velthuis";
-  deps."vntex" = tl."vntex";
-  deps."wnri" = tl."wnri";
-  deps."wnri-latex" = tl."wnri-latex";
-  deps."xetex-devanagari" = tl."xetex-devanagari";
+  deps = [
+    "aalok"
+    "akshar"
+    "amsldoc-vn"
+    "aramaic-serto"
+    "babel-azerbaijani"
+    "babel-esperanto"
+    "babel-georgian"
+    "babel-hebrew"
+    "babel-indonesian"
+    "babel-interlingua"
+    "babel-malay"
+    "babel-sorbian"
+    "babel-thai"
+    "babel-vietnamese"
+    "bangla"
+    "bangtex"
+    "bengali"
+    "burmese"
+    "chhaya"
+    "cjhebrew"
+    "collection-basic"
+    "ctib"
+    "ebong"
+    "ethiop"
+    "ethiop-t1"
+    "fc"
+    "fonts-tlwg"
+    "hindawi-latex-template"
+    "hyphen-afrikaans"
+    "hyphen-armenian"
+    "hyphen-coptic"
+    "hyphen-esperanto"
+    "hyphen-ethiopic"
+    "hyphen-georgian"
+    "hyphen-indic"
+    "hyphen-indonesian"
+    "hyphen-interlingua"
+    "hyphen-sanskrit"
+    "hyphen-thai"
+    "hyphen-turkmen"
+    "latex-mr"
+    "latexbangla"
+    "latino-sine-flexione"
+    "lshort-thai"
+    "lshort-vietnamese"
+    "marathi"
+    "ntheorem-vn"
+    "padauk"
+    "quran-bn"
+    "quran-ur"
+    "sanskrit"
+    "sanskrit-t1"
+    "thaienum"
+    "thaispec"
+    "unicode-alphabets"
+    "velthuis"
+    "vntex"
+    "wnri"
+    "wnri-latex"
+    "xetex-devanagari"
+  ];
   sha512.run = "3db7709c3545df3713dc0a7df73f676f9f34df5fdc157c6a2d6a124a5bbd14f6f5f1f2938092e76be19417f9dd5ff4f84513c84beddafbe5c9747abd7fa597c0";
 };
 "collection-langpolish" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."babel-polish" = tl."babel-polish";
-  deps."bredzenie" = tl."bredzenie";
-  deps."cc-pl" = tl."cc-pl";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."gustlib" = tl."gustlib";
-  deps."gustprog" = tl."gustprog";
-  deps."hyphen-polish" = tl."hyphen-polish";
-  deps."lshort-polish" = tl."lshort-polish";
-  deps."mex" = tl."mex";
-  deps."mwcls" = tl."mwcls";
-  deps."pl" = tl."pl";
-  deps."polski" = tl."polski";
-  deps."przechlewski-book" = tl."przechlewski-book";
-  deps."qpxqtx" = tl."qpxqtx";
-  deps."tap" = tl."tap";
-  deps."tex-virtual-academy-pl" = tl."tex-virtual-academy-pl";
-  deps."texlive-pl" = tl."texlive-pl";
-  deps."utf8mex" = tl."utf8mex";
+  deps = [
+    "babel-polish"
+    "bredzenie"
+    "cc-pl"
+    "collection-basic"
+    "collection-latex"
+    "gustlib"
+    "gustprog"
+    "hyphen-polish"
+    "lshort-polish"
+    "mex"
+    "mwcls"
+    "pl"
+    "polski"
+    "przechlewski-book"
+    "qpxqtx"
+    "tap"
+    "tex-virtual-academy-pl"
+    "texlive-pl"
+    "utf8mex"
+  ];
   sha512.run = "fc0d08f70aeb83869109290e6d1585d513097dcd4e17791752ecd3d26ac202838afb5931f78ceaeeaf72c63b18fe9183edd650c075d03188f24cb2caded178de";
 };
 "collection-langportuguese" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."babel-portuges" = tl."babel-portuges";
-  deps."beamer-tut-pt" = tl."beamer-tut-pt";
-  deps."collection-basic" = tl."collection-basic";
-  deps."cursolatex" = tl."cursolatex";
-  deps."feupphdteses" = tl."feupphdteses";
-  deps."hyphen-portuguese" = tl."hyphen-portuguese";
-  deps."latex-via-exemplos" = tl."latex-via-exemplos";
-  deps."latexcheat-ptbr" = tl."latexcheat-ptbr";
-  deps."lshort-portuguese" = tl."lshort-portuguese";
-  deps."numberpt" = tl."numberpt";
-  deps."ordinalpt" = tl."ordinalpt";
-  deps."xypic-tut-pt" = tl."xypic-tut-pt";
+  deps = [
+    "babel-portuges"
+    "beamer-tut-pt"
+    "collection-basic"
+    "cursolatex"
+    "feupphdteses"
+    "hyphen-portuguese"
+    "latex-via-exemplos"
+    "latexcheat-ptbr"
+    "lshort-portuguese"
+    "numberpt"
+    "ordinalpt"
+    "xypic-tut-pt"
+  ];
   sha512.run = "16d67d288fb702807b43dcf8da044a45206c27c5cf0d953688fc341966fb166db8cec69b727b1de079b9bf434f024f7338eaf34529510cab7881147d1635b43d";
 };
 "collection-langspanish" = {
   revision = 54141;
   stripPrefix = 0;
-  deps."babel-catalan" = tl."babel-catalan";
-  deps."babel-galician" = tl."babel-galician";
-  deps."babel-spanish" = tl."babel-spanish";
-  deps."collection-basic" = tl."collection-basic";
-  deps."es-tex-faq" = tl."es-tex-faq";
-  deps."hyphen-catalan" = tl."hyphen-catalan";
-  deps."hyphen-galician" = tl."hyphen-galician";
-  deps."hyphen-spanish" = tl."hyphen-spanish";
-  deps."l2tabu-spanish" = tl."l2tabu-spanish";
-  deps."latex2e-help-texinfo-spanish" = tl."latex2e-help-texinfo-spanish";
-  deps."latexcheat-esmx" = tl."latexcheat-esmx";
-  deps."lshort-spanish" = tl."lshort-spanish";
-  deps."texlive-es" = tl."texlive-es";
+  deps = [
+    "babel-catalan"
+    "babel-galician"
+    "babel-spanish"
+    "collection-basic"
+    "es-tex-faq"
+    "hyphen-catalan"
+    "hyphen-galician"
+    "hyphen-spanish"
+    "l2tabu-spanish"
+    "latex2e-help-texinfo-spanish"
+    "latexcheat-esmx"
+    "lshort-spanish"
+    "texlive-es"
+  ];
   sha512.run = "88bdc5cefd5519bc80e50e2d808abf32aae8f7c730023afab3babb82ab817dc034c78d42b4143135df187343de7164a8fd94dc95c5ec8909e317a2f5628de15e";
 };
 "collection-latex" = {
   revision = 63515;
   stripPrefix = 0;
-  deps."ae" = tl."ae";
-  deps."amscls" = tl."amscls";
-  deps."amsmath" = tl."amsmath";
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."auxhook" = tl."auxhook";
-  deps."babel" = tl."babel";
-  deps."babel-english" = tl."babel-english";
-  deps."babelbib" = tl."babelbib";
-  deps."bigintcalc" = tl."bigintcalc";
-  deps."bitset" = tl."bitset";
-  deps."bookmark" = tl."bookmark";
-  deps."carlisle" = tl."carlisle";
-  deps."collection-basic" = tl."collection-basic";
-  deps."colortbl" = tl."colortbl";
-  deps."epstopdf-pkg" = tl."epstopdf-pkg";
-  deps."etexcmds" = tl."etexcmds";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."firstaid" = tl."firstaid";
-  deps."fix2col" = tl."fix2col";
-  deps."geometry" = tl."geometry";
-  deps."gettitlestring" = tl."gettitlestring";
-  deps."graphics" = tl."graphics";
-  deps."graphics-cfg" = tl."graphics-cfg";
-  deps."grfext" = tl."grfext";
-  deps."hopatch" = tl."hopatch";
-  deps."hycolor" = tl."hycolor";
-  deps."hyperref" = tl."hyperref";
-  deps."intcalc" = tl."intcalc";
-  deps."kvdefinekeys" = tl."kvdefinekeys";
-  deps."kvoptions" = tl."kvoptions";
-  deps."kvsetkeys" = tl."kvsetkeys";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-bin" = tl."latex-bin";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latex-lab" = tl."latex-lab";
-  deps."latexconfig" = tl."latexconfig";
-  deps."letltxmacro" = tl."letltxmacro";
-  deps."ltxcmds" = tl."ltxcmds";
-  deps."ltxmisc" = tl."ltxmisc";
-  deps."mfnfss" = tl."mfnfss";
-  deps."mptopdf" = tl."mptopdf";
-  deps."natbib" = tl."natbib";
-  deps."oberdiek" = tl."oberdiek";
-  deps."pagesel" = tl."pagesel";
-  deps."pdfescape" = tl."pdfescape";
-  deps."pslatex" = tl."pslatex";
-  deps."psnfss" = tl."psnfss";
-  deps."pspicture" = tl."pspicture";
-  deps."refcount" = tl."refcount";
-  deps."rerunfilecheck" = tl."rerunfilecheck";
-  deps."stringenc" = tl."stringenc";
-  deps."tools" = tl."tools";
-  deps."uniquecounter" = tl."uniquecounter";
-  deps."url" = tl."url";
+  deps = [
+    "ae"
+    "amscls"
+    "amsmath"
+    "atbegshi"
+    "atveryend"
+    "auxhook"
+    "babel"
+    "babel-english"
+    "babelbib"
+    "bigintcalc"
+    "bitset"
+    "bookmark"
+    "carlisle"
+    "collection-basic"
+    "colortbl"
+    "epstopdf-pkg"
+    "etexcmds"
+    "fancyhdr"
+    "firstaid"
+    "fix2col"
+    "geometry"
+    "gettitlestring"
+    "graphics"
+    "graphics-cfg"
+    "grfext"
+    "hopatch"
+    "hycolor"
+    "hyperref"
+    "intcalc"
+    "kvdefinekeys"
+    "kvoptions"
+    "kvsetkeys"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-bin"
+    "latex-fonts"
+    "latex-lab"
+    "latexconfig"
+    "letltxmacro"
+    "ltxcmds"
+    "ltxmisc"
+    "mfnfss"
+    "mptopdf"
+    "natbib"
+    "oberdiek"
+    "pagesel"
+    "pdfescape"
+    "pslatex"
+    "psnfss"
+    "pspicture"
+    "refcount"
+    "rerunfilecheck"
+    "stringenc"
+    "tools"
+    "uniquecounter"
+    "url"
+  ];
   sha512.run = "c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326d4b1852f8415d9876ca52645db939ad7a11c55f550a2096ccd4b8dd8be6a4114d6";
 };
 "collection-latexextra" = {
   revision = 65353;
   stripPrefix = 0;
-  deps."2up" = tl."2up";
-  deps."a0poster" = tl."a0poster";
-  deps."a4wide" = tl."a4wide";
-  deps."a5comb" = tl."a5comb";
-  deps."abraces" = tl."abraces";
-  deps."abspos" = tl."abspos";
-  deps."abstract" = tl."abstract";
-  deps."accessibility" = tl."accessibility";
-  deps."accsupp" = tl."accsupp";
-  deps."achemso" = tl."achemso";
-  deps."acro" = tl."acro";
-  deps."acronym" = tl."acronym";
-  deps."acroterm" = tl."acroterm";
-  deps."actuarialangle" = tl."actuarialangle";
-  deps."actuarialsymbol" = tl."actuarialsymbol";
-  deps."addfont" = tl."addfont";
-  deps."addlines" = tl."addlines";
-  deps."adjmulticol" = tl."adjmulticol";
-  deps."adjustbox" = tl."adjustbox";
-  deps."adrconv" = tl."adrconv";
-  deps."advdate" = tl."advdate";
-  deps."akktex" = tl."akktex";
-  deps."akletter" = tl."akletter";
-  deps."alertmessage" = tl."alertmessage";
-  deps."alnumsec" = tl."alnumsec";
-  deps."alphalph" = tl."alphalph";
-  deps."alterqcm" = tl."alterqcm";
-  deps."altfont" = tl."altfont";
-  deps."altsubsup" = tl."altsubsup";
-  deps."amsaddr" = tl."amsaddr";
-  deps."animate" = tl."animate";
-  deps."anonchap" = tl."anonchap";
-  deps."answers" = tl."answers";
-  deps."anyfontsize" = tl."anyfontsize";
-  deps."appendix" = tl."appendix";
-  deps."appendixnumberbeamer" = tl."appendixnumberbeamer";
-  deps."apptools" = tl."apptools";
-  deps."arabicfront" = tl."arabicfront";
-  deps."arcs" = tl."arcs";
-  deps."arraycols" = tl."arraycols";
-  deps."arrayjobx" = tl."arrayjobx";
-  deps."arraysort" = tl."arraysort";
-  deps."arydshln" = tl."arydshln";
-  deps."asciilist" = tl."asciilist";
-  deps."askinclude" = tl."askinclude";
-  deps."assignment" = tl."assignment";
-  deps."assoccnt" = tl."assoccnt";
-  deps."association-matrix" = tl."association-matrix";
-  deps."atenddvi" = tl."atenddvi";
-  deps."atendofenv" = tl."atendofenv";
-  deps."attachfile" = tl."attachfile";
-  deps."aurl" = tl."aurl";
-  deps."authoraftertitle" = tl."authoraftertitle";
-  deps."authorarchive" = tl."authorarchive";
-  deps."authorindex" = tl."authorindex";
-  deps."autofancyhdr" = tl."autofancyhdr";
-  deps."autonum" = tl."autonum";
-  deps."autopdf" = tl."autopdf";
-  deps."autopuncitems" = tl."autopuncitems";
-  deps."avremu" = tl."avremu";
-  deps."axessibility" = tl."axessibility";
-  deps."background" = tl."background";
-  deps."bankstatement" = tl."bankstatement";
-  deps."bashful" = tl."bashful";
-  deps."basicarith" = tl."basicarith";
-  deps."bchart" = tl."bchart";
-  deps."beamer-rl" = tl."beamer-rl";
-  deps."beamer2thesis" = tl."beamer2thesis";
-  deps."beamerappendixnote" = tl."beamerappendixnote";
-  deps."beameraudience" = tl."beameraudience";
-  deps."beamerauxtheme" = tl."beamerauxtheme";
-  deps."beamercolorthemeowl" = tl."beamercolorthemeowl";
-  deps."beamerdarkthemes" = tl."beamerdarkthemes";
-  deps."beamerposter" = tl."beamerposter";
-  deps."beamersubframe" = tl."beamersubframe";
-  deps."beamertheme-arguelles" = tl."beamertheme-arguelles";
-  deps."beamertheme-cuerna" = tl."beamertheme-cuerna";
-  deps."beamertheme-detlevcm" = tl."beamertheme-detlevcm";
-  deps."beamertheme-epyt" = tl."beamertheme-epyt";
-  deps."beamertheme-focus" = tl."beamertheme-focus";
-  deps."beamertheme-light" = tl."beamertheme-light";
-  deps."beamertheme-metropolis" = tl."beamertheme-metropolis";
-  deps."beamertheme-npbt" = tl."beamertheme-npbt";
-  deps."beamertheme-phnompenh" = tl."beamertheme-phnompenh";
-  deps."beamertheme-pure-minimalistic" = tl."beamertheme-pure-minimalistic";
-  deps."beamertheme-saintpetersburg" = tl."beamertheme-saintpetersburg";
-  deps."beamertheme-simpledarkblue" = tl."beamertheme-simpledarkblue";
-  deps."beamertheme-simpleplus" = tl."beamertheme-simpleplus";
-  deps."beamertheme-tcolorbox" = tl."beamertheme-tcolorbox";
-  deps."beamertheme-trigon" = tl."beamertheme-trigon";
-  deps."beamertheme-upenn-bc" = tl."beamertheme-upenn-bc";
-  deps."beamerthemeamurmaple" = tl."beamerthemeamurmaple";
-  deps."beamerthemejltree" = tl."beamerthemejltree";
-  deps."beamerthemelalic" = tl."beamerthemelalic";
-  deps."beamerthemenirma" = tl."beamerthemenirma";
-  deps."beamerthemenord" = tl."beamerthemenord";
-  deps."bearwear" = tl."bearwear";
-  deps."beaulivre" = tl."beaulivre";
-  deps."beton" = tl."beton";
-  deps."bewerbung" = tl."bewerbung";
-  deps."bez123" = tl."bez123";
-  deps."bhcexam" = tl."bhcexam";
-  deps."bibletext" = tl."bibletext";
-  deps."bigfoot" = tl."bigfoot";
-  deps."bigints" = tl."bigints";
-  deps."bilingualpages" = tl."bilingualpages";
-  deps."biochemistry-colors" = tl."biochemistry-colors";
-  deps."bithesis" = tl."bithesis";
-  deps."bizcard" = tl."bizcard";
-  deps."blindtext" = tl."blindtext";
-  deps."blkarray" = tl."blkarray";
-  deps."block" = tl."block";
-  deps."blowup" = tl."blowup";
-  deps."bnumexpr" = tl."bnumexpr";
-  deps."boites" = tl."boites";
-  deps."bold-extra" = tl."bold-extra";
-  deps."book-of-common-prayer" = tl."book-of-common-prayer";
-  deps."bookcover" = tl."bookcover";
-  deps."bookest" = tl."bookest";
-  deps."booklet" = tl."booklet";
-  deps."bookshelf" = tl."bookshelf";
-  deps."boolexpr" = tl."boolexpr";
-  deps."bophook" = tl."bophook";
-  deps."boxedminipage" = tl."boxedminipage";
-  deps."boxhandler" = tl."boxhandler";
-  deps."bracketkey" = tl."bracketkey";
-  deps."braket" = tl."braket";
-  deps."breakurl" = tl."breakurl";
-  deps."bubblesort" = tl."bubblesort";
-  deps."bullcntr" = tl."bullcntr";
-  deps."bxcalc" = tl."bxcalc";
-  deps."bxdpx-beamer" = tl."bxdpx-beamer";
-  deps."bxdvidriver" = tl."bxdvidriver";
-  deps."bxenclose" = tl."bxenclose";
-  deps."bxnewfont" = tl."bxnewfont";
-  deps."bxpapersize" = tl."bxpapersize";
-  deps."bxpdfver" = tl."bxpdfver";
-  deps."bxtexlogo" = tl."bxtexlogo";
-  deps."calcage" = tl."calcage";
-  deps."calctab" = tl."calctab";
-  deps."calculator" = tl."calculator";
-  deps."calrsfs" = tl."calrsfs";
-  deps."cals" = tl."cals";
-  deps."calxxxx-yyyy" = tl."calxxxx-yyyy";
-  deps."cancel" = tl."cancel";
-  deps."canoniclayout" = tl."canoniclayout";
-  deps."capt-of" = tl."capt-of";
-  deps."captcont" = tl."captcont";
-  deps."captdef" = tl."captdef";
-  deps."carbohydrates" = tl."carbohydrates";
-  deps."cases" = tl."cases";
-  deps."casyl" = tl."casyl";
-  deps."catchfile" = tl."catchfile";
-  deps."catchfilebetweentags" = tl."catchfilebetweentags";
-  deps."catechis" = tl."catechis";
-  deps."catoptions" = tl."catoptions";
-  deps."cbcoptic" = tl."cbcoptic";
-  deps."ccaption" = tl."ccaption";
-  deps."cclicenses" = tl."cclicenses";
-  deps."cd" = tl."cd";
-  deps."cd-cover" = tl."cd-cover";
-  deps."cdcmd" = tl."cdcmd";
-  deps."cdpbundl" = tl."cdpbundl";
-  deps."cellprops" = tl."cellprops";
-  deps."cellspace" = tl."cellspace";
-  deps."censor" = tl."censor";
-  deps."centeredline" = tl."centeredline";
-  deps."centerlastline" = tl."centerlastline";
-  deps."changebar" = tl."changebar";
-  deps."changelayout" = tl."changelayout";
-  deps."changelog" = tl."changelog";
-  deps."changepage" = tl."changepage";
-  deps."changes" = tl."changes";
-  deps."chappg" = tl."chappg";
-  deps."chapterfolder" = tl."chapterfolder";
-  deps."cheatsheet" = tl."cheatsheet";
-  deps."checkend" = tl."checkend";
-  deps."chet" = tl."chet";
-  deps."chextras" = tl."chextras";
-  deps."childdoc" = tl."childdoc";
-  deps."chkfloat" = tl."chkfloat";
-  deps."chletter" = tl."chletter";
-  deps."chngcntr" = tl."chngcntr";
-  deps."chronology" = tl."chronology";
-  deps."circ" = tl."circ";
-  deps."circledsteps" = tl."circledsteps";
-  deps."circledtext" = tl."circledtext";
-  deps."classics" = tl."classics";
-  deps."classpack" = tl."classpack";
-  deps."clefval" = tl."clefval";
-  deps."cleveref" = tl."cleveref";
-  deps."clicks" = tl."clicks";
-  deps."clipboard" = tl."clipboard";
-  deps."clistmap" = tl."clistmap";
-  deps."clock" = tl."clock";
-  deps."clrdblpg" = tl."clrdblpg";
-  deps."clrstrip" = tl."clrstrip";
-  deps."cmdstring" = tl."cmdstring";
-  deps."cmdtrack" = tl."cmdtrack";
-  deps."cmsd" = tl."cmsd";
-  deps."cnltx" = tl."cnltx";
-  deps."cntformats" = tl."cntformats";
-  deps."cntperchap" = tl."cntperchap";
-  deps."codebox" = tl."codebox";
-  deps."codedoc" = tl."codedoc";
-  deps."codehigh" = tl."codehigh";
-  deps."codepage" = tl."codepage";
-  deps."codesection" = tl."codesection";
-  deps."collcell" = tl."collcell";
-  deps."collectbox" = tl."collectbox";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-pictures" = tl."collection-pictures";
-  deps."colophon" = tl."colophon";
-  deps."color-edits" = tl."color-edits";
-  deps."colordoc" = tl."colordoc";
-  deps."colorframed" = tl."colorframed";
-  deps."colorinfo" = tl."colorinfo";
-  deps."coloring" = tl."coloring";
-  deps."colorist" = tl."colorist";
-  deps."colorspace" = tl."colorspace";
-  deps."colortab" = tl."colortab";
-  deps."colorwav" = tl."colorwav";
-  deps."colorweb" = tl."colorweb";
-  deps."colourchange" = tl."colourchange";
-  deps."combelow" = tl."combelow";
-  deps."combine" = tl."combine";
-  deps."comma" = tl."comma";
-  deps."commado" = tl."commado";
-  deps."commedit" = tl."commedit";
-  deps."comment" = tl."comment";
-  deps."commonunicode" = tl."commonunicode";
-  deps."competences" = tl."competences";
-  deps."concepts" = tl."concepts";
-  deps."concprog" = tl."concprog";
-  deps."conditext" = tl."conditext";
-  deps."constants" = tl."constants";
-  deps."continue" = tl."continue";
-  deps."contour" = tl."contour";
-  deps."contracard" = tl."contracard";
-  deps."conv-xkv" = tl."conv-xkv";
-  deps."cooking" = tl."cooking";
-  deps."cooking-units" = tl."cooking-units";
-  deps."cool" = tl."cool";
-  deps."coolfn" = tl."coolfn";
-  deps."coollist" = tl."coollist";
-  deps."coolstr" = tl."coolstr";
-  deps."coolthms" = tl."coolthms";
-  deps."cooltooltips" = tl."cooltooltips";
-  deps."coop-writing" = tl."coop-writing";
-  deps."coordsys" = tl."coordsys";
-  deps."copyedit" = tl."copyedit";
-  deps."copyrightbox" = tl."copyrightbox";
-  deps."coseoul" = tl."coseoul";
-  deps."counttexruns" = tl."counttexruns";
-  deps."courseoutline" = tl."courseoutline";
-  deps."coursepaper" = tl."coursepaper";
-  deps."coverpage" = tl."coverpage";
-  deps."cprotect" = tl."cprotect";
-  deps."cprotectinside" = tl."cprotectinside";
-  deps."crbox" = tl."crbox";
-  deps."create-theorem" = tl."create-theorem";
-  deps."crefthe" = tl."crefthe";
-  deps."crossreference" = tl."crossreference";
-  deps."crossreftools" = tl."crossreftools";
-  deps."crumbs" = tl."crumbs";
-  deps."csquotes" = tl."csquotes";
-  deps."css-colors" = tl."css-colors";
-  deps."csvmerge" = tl."csvmerge";
-  deps."csvsimple" = tl."csvsimple";
-  deps."cuisine" = tl."cuisine";
-  deps."currency" = tl."currency";
-  deps."currfile" = tl."currfile";
-  deps."currvita" = tl."currvita";
-  deps."cutwin" = tl."cutwin";
-  deps."cv" = tl."cv";
-  deps."cv4tw" = tl."cv4tw";
-  deps."cweb-latex" = tl."cweb-latex";
-  deps."cyber" = tl."cyber";
-  deps."cybercic" = tl."cybercic";
-  deps."darkmode" = tl."darkmode";
-  deps."dashbox" = tl."dashbox";
-  deps."dashrule" = tl."dashrule";
-  deps."dashundergaps" = tl."dashundergaps";
-  deps."dataref" = tl."dataref";
-  deps."datatool" = tl."datatool";
-  deps."datax" = tl."datax";
-  deps."dateiliste" = tl."dateiliste";
-  deps."datenumber" = tl."datenumber";
-  deps."datestamp" = tl."datestamp";
-  deps."datetime" = tl."datetime";
-  deps."datetime2" = tl."datetime2";
-  deps."datetime2-bahasai" = tl."datetime2-bahasai";
-  deps."datetime2-basque" = tl."datetime2-basque";
-  deps."datetime2-breton" = tl."datetime2-breton";
-  deps."datetime2-bulgarian" = tl."datetime2-bulgarian";
-  deps."datetime2-catalan" = tl."datetime2-catalan";
-  deps."datetime2-croatian" = tl."datetime2-croatian";
-  deps."datetime2-czech" = tl."datetime2-czech";
-  deps."datetime2-danish" = tl."datetime2-danish";
-  deps."datetime2-dutch" = tl."datetime2-dutch";
-  deps."datetime2-en-fulltext" = tl."datetime2-en-fulltext";
-  deps."datetime2-english" = tl."datetime2-english";
-  deps."datetime2-esperanto" = tl."datetime2-esperanto";
-  deps."datetime2-estonian" = tl."datetime2-estonian";
-  deps."datetime2-finnish" = tl."datetime2-finnish";
-  deps."datetime2-french" = tl."datetime2-french";
-  deps."datetime2-galician" = tl."datetime2-galician";
-  deps."datetime2-german" = tl."datetime2-german";
-  deps."datetime2-greek" = tl."datetime2-greek";
-  deps."datetime2-hebrew" = tl."datetime2-hebrew";
-  deps."datetime2-icelandic" = tl."datetime2-icelandic";
-  deps."datetime2-irish" = tl."datetime2-irish";
-  deps."datetime2-it-fulltext" = tl."datetime2-it-fulltext";
-  deps."datetime2-italian" = tl."datetime2-italian";
-  deps."datetime2-latin" = tl."datetime2-latin";
-  deps."datetime2-lsorbian" = tl."datetime2-lsorbian";
-  deps."datetime2-magyar" = tl."datetime2-magyar";
-  deps."datetime2-norsk" = tl."datetime2-norsk";
-  deps."datetime2-polish" = tl."datetime2-polish";
-  deps."datetime2-portuges" = tl."datetime2-portuges";
-  deps."datetime2-romanian" = tl."datetime2-romanian";
-  deps."datetime2-russian" = tl."datetime2-russian";
-  deps."datetime2-samin" = tl."datetime2-samin";
-  deps."datetime2-scottish" = tl."datetime2-scottish";
-  deps."datetime2-serbian" = tl."datetime2-serbian";
-  deps."datetime2-slovak" = tl."datetime2-slovak";
-  deps."datetime2-slovene" = tl."datetime2-slovene";
-  deps."datetime2-spanish" = tl."datetime2-spanish";
-  deps."datetime2-swedish" = tl."datetime2-swedish";
-  deps."datetime2-turkish" = tl."datetime2-turkish";
-  deps."datetime2-ukrainian" = tl."datetime2-ukrainian";
-  deps."datetime2-usorbian" = tl."datetime2-usorbian";
-  deps."datetime2-welsh" = tl."datetime2-welsh";
-  deps."dblfloatfix" = tl."dblfloatfix";
-  deps."dbshow" = tl."dbshow";
-  deps."debate" = tl."debate";
-  deps."decimal" = tl."decimal";
-  deps."decorule" = tl."decorule";
-  deps."delimtxt" = tl."delimtxt";
-  deps."democodetools" = tl."democodetools";
-  deps."denisbdoc" = tl."denisbdoc";
-  deps."diabetes-logbook" = tl."diabetes-logbook";
-  deps."diagbox" = tl."diagbox";
-  deps."diagnose" = tl."diagnose";
-  deps."dialogl" = tl."dialogl";
-  deps."dichokey" = tl."dichokey";
-  deps."dimnum" = tl."dimnum";
-  deps."dinbrief" = tl."dinbrief";
-  deps."directory" = tl."directory";
-  deps."dirtytalk" = tl."dirtytalk";
-  deps."dlfltxb" = tl."dlfltxb";
-  deps."dnaseq" = tl."dnaseq";
-  deps."doclicense" = tl."doclicense";
-  deps."docmfp" = tl."docmfp";
-  deps."docmute" = tl."docmute";
-  deps."docshots" = tl."docshots";
-  deps."doctools" = tl."doctools";
-  deps."documentation" = tl."documentation";
-  deps."docutils" = tl."docutils";
-  deps."doi" = tl."doi";
-  deps."dotarrow" = tl."dotarrow";
-  deps."dotlessi" = tl."dotlessi";
-  deps."dotseqn" = tl."dotseqn";
-  deps."download" = tl."download";
-  deps."dox" = tl."dox";
-  deps."dpfloat" = tl."dpfloat";
-  deps."dprogress" = tl."dprogress";
-  deps."drac" = tl."drac";
-  deps."draftcopy" = tl."draftcopy";
-  deps."draftfigure" = tl."draftfigure";
-  deps."draftwatermark" = tl."draftwatermark";
-  deps."dtk" = tl."dtk";
-  deps."dtxdescribe" = tl."dtxdescribe";
-  deps."dtxgallery" = tl."dtxgallery";
-  deps."ducksay" = tl."ducksay";
-  deps."duckuments" = tl."duckuments";
-  deps."dvdcoll" = tl."dvdcoll";
-  deps."dynamicnumber" = tl."dynamicnumber";
-  deps."dynblocks" = tl."dynblocks";
-  deps."ean13isbn" = tl."ean13isbn";
-  deps."easy" = tl."easy";
-  deps."easy-todo" = tl."easy-todo";
-  deps."easybook" = tl."easybook";
-  deps."easyfig" = tl."easyfig";
-  deps."easyfloats" = tl."easyfloats";
-  deps."easyformat" = tl."easyformat";
-  deps."easylist" = tl."easylist";
-  deps."easyreview" = tl."easyreview";
-  deps."ebezier" = tl."ebezier";
-  deps."ecclesiastic" = tl."ecclesiastic";
-  deps."econlipsum" = tl."econlipsum";
-  deps."ecv" = tl."ecv";
-  deps."ed" = tl."ed";
-  deps."edichokey" = tl."edichokey";
-  deps."edmargin" = tl."edmargin";
-  deps."eemeir" = tl."eemeir";
-  deps."efbox" = tl."efbox";
-  deps."egplot" = tl."egplot";
-  deps."ehhline" = tl."ehhline";
-  deps."einfart" = tl."einfart";
-  deps."elegantbook" = tl."elegantbook";
-  deps."elegantnote" = tl."elegantnote";
-  deps."elegantpaper" = tl."elegantpaper";
-  deps."elements" = tl."elements";
-  deps."ellipsis" = tl."ellipsis";
-  deps."elmath" = tl."elmath";
-  deps."elocalloc" = tl."elocalloc";
-  deps."elpres" = tl."elpres";
-  deps."elzcards" = tl."elzcards";
-  deps."emarks" = tl."emarks";
-  deps."embedall" = tl."embedall";
-  deps."embedfile" = tl."embedfile";
-  deps."embrac" = tl."embrac";
-  deps."emptypage" = tl."emptypage";
-  deps."emulateapj" = tl."emulateapj";
-  deps."endfloat" = tl."endfloat";
-  deps."endheads" = tl."endheads";
-  deps."endnotes" = tl."endnotes";
-  deps."endnotes-hy" = tl."endnotes-hy";
-  deps."engpron" = tl."engpron";
-  deps."engrec" = tl."engrec";
-  deps."enotez" = tl."enotez";
-  deps."enumitem" = tl."enumitem";
-  deps."enumitem-zref" = tl."enumitem-zref";
-  deps."envbig" = tl."envbig";
-  deps."environ" = tl."environ";
-  deps."envlab" = tl."envlab";
-  deps."epigraph" = tl."epigraph";
-  deps."epigraph-keys" = tl."epigraph-keys";
-  deps."epiolmec" = tl."epiolmec";
-  deps."eq-pin2corr" = tl."eq-pin2corr";
-  deps."eqell" = tl."eqell";
-  deps."eqlist" = tl."eqlist";
-  deps."eqnalign" = tl."eqnalign";
-  deps."eqname" = tl."eqname";
-  deps."eqparbox" = tl."eqparbox";
-  deps."errata" = tl."errata";
-  deps."erw-l3" = tl."erw-l3";
-  deps."esami" = tl."esami";
-  deps."esdiff" = tl."esdiff";
-  deps."esieecv" = tl."esieecv";
-  deps."esindex" = tl."esindex";
-  deps."esint" = tl."esint";
-  deps."esint-type1" = tl."esint-type1";
-  deps."etaremune" = tl."etaremune";
-  deps."etextools" = tl."etextools";
-  deps."etl" = tl."etl";
-  deps."etoc" = tl."etoc";
-  deps."eukdate" = tl."eukdate";
-  deps."eulerpx" = tl."eulerpx";
-  deps."europasscv" = tl."europasscv";
-  deps."europecv" = tl."europecv";
-  deps."everyhook" = tl."everyhook";
-  deps."everypage" = tl."everypage";
-  deps."exam" = tl."exam";
-  deps."exam-n" = tl."exam-n";
-  deps."exam-randomizechoices" = tl."exam-randomizechoices";
-  deps."examdesign" = tl."examdesign";
-  deps."example" = tl."example";
-  deps."examplep" = tl."examplep";
-  deps."exceltex" = tl."exceltex";
-  deps."excludeonly" = tl."excludeonly";
-  deps."exercise" = tl."exercise";
-  deps."exercisebank" = tl."exercisebank";
-  deps."exercisepoints" = tl."exercisepoints";
-  deps."exercises" = tl."exercises";
-  deps."exesheet" = tl."exesheet";
-  deps."exframe" = tl."exframe";
-  deps."exp-testopt" = tl."exp-testopt";
-  deps."expdlist" = tl."expdlist";
-  deps."export" = tl."export";
-  deps."exsheets" = tl."exsheets";
-  deps."exsol" = tl."exsol";
-  deps."extract" = tl."extract";
-  deps."facsimile" = tl."facsimile";
-  deps."factura" = tl."factura";
-  deps."familytree" = tl."familytree";
-  deps."fancyhandout" = tl."fancyhandout";
-  deps."fancylabel" = tl."fancylabel";
-  deps."fancynum" = tl."fancynum";
-  deps."fancypar" = tl."fancypar";
-  deps."fancyqr" = tl."fancyqr";
-  deps."fancyslides" = tl."fancyslides";
-  deps."fancytabs" = tl."fancytabs";
-  deps."fancytooltips" = tl."fancytooltips";
-  deps."fbox" = tl."fbox";
-  deps."fcolumn" = tl."fcolumn";
-  deps."fetchcls" = tl."fetchcls";
-  deps."fewerfloatpages" = tl."fewerfloatpages";
-  deps."ffcode" = tl."ffcode";
-  deps."ffslides" = tl."ffslides";
-  deps."fgruler" = tl."fgruler";
-  deps."fifo-stack" = tl."fifo-stack";
-  deps."figsize" = tl."figsize";
-  deps."filecontents" = tl."filecontents";
-  deps."filecontentsdef" = tl."filecontentsdef";
-  deps."filedate" = tl."filedate";
-  deps."fileinfo" = tl."fileinfo";
-  deps."filemod" = tl."filemod";
-  deps."fink" = tl."fink";
-  deps."finstrut" = tl."finstrut";
-  deps."fithesis" = tl."fithesis";
-  deps."fixcmex" = tl."fixcmex";
-  deps."fixfoot" = tl."fixfoot";
-  deps."fixme" = tl."fixme";
-  deps."fixmetodonotes" = tl."fixmetodonotes";
-  deps."fjodor" = tl."fjodor";
-  deps."flabels" = tl."flabels";
-  deps."flacards" = tl."flacards";
-  deps."flagderiv" = tl."flagderiv";
-  deps."flashcards" = tl."flashcards";
-  deps."flashmovie" = tl."flashmovie";
-  deps."flexipage" = tl."flexipage";
-  deps."flipbook" = tl."flipbook";
-  deps."flippdf" = tl."flippdf";
-  deps."floatflt" = tl."floatflt";
-  deps."floatrow" = tl."floatrow";
-  deps."flowfram" = tl."flowfram";
-  deps."fmp" = tl."fmp";
-  deps."fmtcount" = tl."fmtcount";
-  deps."fn2end" = tl."fn2end";
-  deps."fnbreak" = tl."fnbreak";
-  deps."fncychap" = tl."fncychap";
-  deps."fncylab" = tl."fncylab";
-  deps."fnpara" = tl."fnpara";
-  deps."fnpct" = tl."fnpct";
-  deps."fnumprint" = tl."fnumprint";
-  deps."foilhtml" = tl."foilhtml";
-  deps."foliono" = tl."foliono";
-  deps."fontaxes" = tl."fontaxes";
-  deps."fontsetup" = tl."fontsetup";
-  deps."fontsize" = tl."fontsize";
-  deps."fonttable" = tl."fonttable";
-  deps."footmisc" = tl."footmisc";
-  deps."footmisx" = tl."footmisx";
-  deps."footnotebackref" = tl."footnotebackref";
-  deps."footnoterange" = tl."footnoterange";
-  deps."footnpag" = tl."footnpag";
-  deps."forarray" = tl."forarray";
-  deps."foreign" = tl."foreign";
-  deps."forloop" = tl."forloop";
-  deps."formlett" = tl."formlett";
-  deps."forms16be" = tl."forms16be";
-  deps."formular" = tl."formular";
-  deps."fragments" = tl."fragments";
-  deps."frame" = tl."frame";
-  deps."framed" = tl."framed";
-  deps."frankenstein" = tl."frankenstein";
-  deps."frege" = tl."frege";
-  deps."froufrou" = tl."froufrou";
-  deps."ftcap" = tl."ftcap";
-  deps."ftnxtra" = tl."ftnxtra";
-  deps."fullblck" = tl."fullblck";
-  deps."fullminipage" = tl."fullminipage";
-  deps."fullwidth" = tl."fullwidth";
-  deps."functional" = tl."functional";
-  deps."fundus-calligra" = tl."fundus-calligra";
-  deps."fundus-cyr" = tl."fundus-cyr";
-  deps."fundus-sueterlin" = tl."fundus-sueterlin";
-  deps."fvextra" = tl."fvextra";
-  deps."fwlw" = tl."fwlw";
-  deps."g-brief" = tl."g-brief";
-  deps."gatherenum" = tl."gatherenum";
-  deps."gauss" = tl."gauss";
-  deps."gcard" = tl."gcard";
-  deps."gcite" = tl."gcite";
-  deps."gender" = tl."gender";
-  deps."genmpage" = tl."genmpage";
-  deps."gensymb" = tl."gensymb";
-  deps."getfiledate" = tl."getfiledate";
-  deps."getitems" = tl."getitems";
-  deps."gindex" = tl."gindex";
-  deps."ginpenc" = tl."ginpenc";
-  deps."gitfile-info" = tl."gitfile-info";
-  deps."gitinfo" = tl."gitinfo";
-  deps."gitinfo2" = tl."gitinfo2";
-  deps."gitlog" = tl."gitlog";
-  deps."gitstatus" = tl."gitstatus";
-  deps."gitver" = tl."gitver";
-  deps."globalvals" = tl."globalvals";
-  deps."gloss" = tl."gloss";
-  deps."glossaries" = tl."glossaries";
-  deps."glossaries-danish" = tl."glossaries-danish";
-  deps."glossaries-dutch" = tl."glossaries-dutch";
-  deps."glossaries-english" = tl."glossaries-english";
-  deps."glossaries-estonian" = tl."glossaries-estonian";
-  deps."glossaries-extra" = tl."glossaries-extra";
-  deps."glossaries-finnish" = tl."glossaries-finnish";
-  deps."glossaries-french" = tl."glossaries-french";
-  deps."glossaries-german" = tl."glossaries-german";
-  deps."glossaries-irish" = tl."glossaries-irish";
-  deps."glossaries-italian" = tl."glossaries-italian";
-  deps."glossaries-magyar" = tl."glossaries-magyar";
-  deps."glossaries-nynorsk" = tl."glossaries-nynorsk";
-  deps."glossaries-polish" = tl."glossaries-polish";
-  deps."glossaries-portuges" = tl."glossaries-portuges";
-  deps."glossaries-serbian" = tl."glossaries-serbian";
-  deps."glossaries-slovene" = tl."glossaries-slovene";
-  deps."glossaries-spanish" = tl."glossaries-spanish";
-  deps."gmdoc" = tl."gmdoc";
-  deps."gmdoc-enhance" = tl."gmdoc-enhance";
-  deps."gmiflink" = tl."gmiflink";
-  deps."gmutils" = tl."gmutils";
-  deps."gmverb" = tl."gmverb";
-  deps."grabbox" = tl."grabbox";
-  deps."gradient-text" = tl."gradient-text";
-  deps."grading-scheme" = tl."grading-scheme";
-  deps."graphbox" = tl."graphbox";
-  deps."graphicscache" = tl."graphicscache";
-  deps."graphicx-psmin" = tl."graphicx-psmin";
-  deps."graphicxbox" = tl."graphicxbox";
-  deps."graphpaper" = tl."graphpaper";
-  deps."grayhints" = tl."grayhints";
-  deps."grfpaste" = tl."grfpaste";
-  deps."grid" = tl."grid";
-  deps."grid-system" = tl."grid-system";
-  deps."gridpapers" = tl."gridpapers";
-  deps."gridset" = tl."gridset";
-  deps."gridslides" = tl."gridslides";
-  deps."gs1" = tl."gs1";
-  deps."guitlogo" = tl."guitlogo";
-  deps."ha-prosper" = tl."ha-prosper";
-  deps."hackthefootline" = tl."hackthefootline";
-  deps."halloweenmath" = tl."halloweenmath";
-  deps."handin" = tl."handin";
-  deps."handout" = tl."handout";
-  deps."handoutwithnotes" = tl."handoutwithnotes";
-  deps."hang" = tl."hang";
-  deps."hanging" = tl."hanging";
-  deps."hardwrap" = tl."hardwrap";
-  deps."harnon-cv" = tl."harnon-cv";
-  deps."harpoon" = tl."harpoon";
-  deps."hc" = tl."hc";
-  deps."he-she" = tl."he-she";
-  deps."hep-acronym" = tl."hep-acronym";
-  deps."hep-float" = tl."hep-float";
-  deps."hep-math" = tl."hep-math";
-  deps."hep-text" = tl."hep-text";
-  deps."hep-title" = tl."hep-title";
-  deps."hereapplies" = tl."hereapplies";
-  deps."hhtensor" = tl."hhtensor";
-  deps."hideanswer" = tl."hideanswer";
-  deps."highlightlatex" = tl."highlightlatex";
-  deps."histogr" = tl."histogr";
-  deps."hitec" = tl."hitec";
-  deps."hitreport" = tl."hitreport";
-  deps."hletter" = tl."hletter";
-  deps."hobsub" = tl."hobsub";
-  deps."hpsdiss" = tl."hpsdiss";
-  deps."href-ul" = tl."href-ul";
-  deps."hrefhide" = tl."hrefhide";
-  deps."huawei" = tl."huawei";
-  deps."hvextern" = tl."hvextern";
-  deps."hvindex" = tl."hvindex";
-  deps."hvlogos" = tl."hvlogos";
-  deps."hvpygmentex" = tl."hvpygmentex";
-  deps."hvqrurl" = tl."hvqrurl";
-  deps."hwemoji" = tl."hwemoji";
-  deps."hypdestopt" = tl."hypdestopt";
-  deps."hypdoc" = tl."hypdoc";
-  deps."hypdvips" = tl."hypdvips";
-  deps."hyper" = tl."hyper";
-  deps."hyperbar" = tl."hyperbar";
-  deps."hypernat" = tl."hypernat";
-  deps."hyperxmp" = tl."hyperxmp";
-  deps."hyphenat" = tl."hyphenat";
-  deps."identkey" = tl."identkey";
-  deps."idxcmds" = tl."idxcmds";
-  deps."idxlayout" = tl."idxlayout";
-  deps."iexec" = tl."iexec";
-  deps."ifallfalse" = tl."ifallfalse";
-  deps."iffont" = tl."iffont";
-  deps."ifmslide" = tl."ifmslide";
-  deps."ifmtarg" = tl."ifmtarg";
-  deps."ifnextok" = tl."ifnextok";
-  deps."ifoddpage" = tl."ifoddpage";
-  deps."ifthenx" = tl."ifthenx";
-  deps."iitem" = tl."iitem";
-  deps."image-gallery" = tl."image-gallery";
-  deps."imakeidx" = tl."imakeidx";
-  deps."import" = tl."import";
-  deps."incgraph" = tl."incgraph";
-  deps."indextools" = tl."indextools";
-  deps."inline-images" = tl."inline-images";
-  deps."inlinedef" = tl."inlinedef";
-  deps."inlinelabel" = tl."inlinelabel";
-  deps."inputenx" = tl."inputenx";
-  deps."inputtrc" = tl."inputtrc";
-  deps."interactiveworkbook" = tl."interactiveworkbook";
-  deps."interfaces" = tl."interfaces";
-  deps."intopdf" = tl."intopdf";
-  deps."inversepath" = tl."inversepath";
-  deps."invoice" = tl."invoice";
-  deps."invoice-class" = tl."invoice-class";
-  deps."invoice2" = tl."invoice2";
-  deps."iso" = tl."iso";
-  deps."iso10303" = tl."iso10303";
-  deps."isodate" = tl."isodate";
-  deps."isodoc" = tl."isodoc";
-  deps."isonums" = tl."isonums";
-  deps."isopt" = tl."isopt";
-  deps."isorot" = tl."isorot";
-  deps."isotope" = tl."isotope";
-  deps."issuulinks" = tl."issuulinks";
-  deps."iwhdp" = tl."iwhdp";
-  deps."jlabels" = tl."jlabels";
-  deps."jmsdelim" = tl."jmsdelim";
-  deps."jobname-suffix" = tl."jobname-suffix";
-  deps."jslectureplanner" = tl."jslectureplanner";
-  deps."jumplines" = tl."jumplines";
-  deps."jvlisting" = tl."jvlisting";
-  deps."kalendarium" = tl."kalendarium";
-  deps."kantlipsum" = tl."kantlipsum";
-  deps."kerntest" = tl."kerntest";
-  deps."keycommand" = tl."keycommand";
-  deps."keyfloat" = tl."keyfloat";
-  deps."keyindex" = tl."keyindex";
-  deps."keyparse" = tl."keyparse";
-  deps."keyreader" = tl."keyreader";
-  deps."keystroke" = tl."keystroke";
-  deps."keyval2e" = tl."keyval2e";
-  deps."keyvaltable" = tl."keyvaltable";
-  deps."kix" = tl."kix";
-  deps."knowledge" = tl."knowledge";
-  deps."koma-moderncvclassic" = tl."koma-moderncvclassic";
-  deps."koma-script-sfs" = tl."koma-script-sfs";
-  deps."komacv" = tl."komacv";
-  deps."komacv-rg" = tl."komacv-rg";
-  deps."ktv-texdata" = tl."ktv-texdata";
-  deps."l3build" = tl."l3build";
-  deps."labbook" = tl."labbook";
-  deps."labels" = tl."labels";
-  deps."labels4easylist" = tl."labels4easylist";
-  deps."labelschanged" = tl."labelschanged";
-  deps."lambdax" = tl."lambdax";
-  deps."lastpackage" = tl."lastpackage";
-  deps."lastpage" = tl."lastpage";
-  deps."latex-amsmath-dev" = tl."latex-amsmath-dev";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  deps."latex-bin-dev" = tl."latex-bin-dev";
-  deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
-  deps."latex-graphics-dev" = tl."latex-graphics-dev";
-  deps."latex-lab-dev" = tl."latex-lab-dev";
-  deps."latex-tools-dev" = tl."latex-tools-dev";
-  deps."latex-uni8" = tl."latex-uni8";
-  deps."latexcolors" = tl."latexcolors";
-  deps."latexdemo" = tl."latexdemo";
-  deps."latexgit" = tl."latexgit";
-  deps."layouts" = tl."layouts";
-  deps."lazylist" = tl."lazylist";
-  deps."lccaps" = tl."lccaps";
-  deps."lcd" = tl."lcd";
-  deps."lcg" = tl."lcg";
-  deps."leading" = tl."leading";
-  deps."leaflet" = tl."leaflet";
-  deps."lebhart" = tl."lebhart";
-  deps."lectures" = tl."lectures";
-  deps."lectureslides" = tl."lectureslides";
-  deps."leftidx" = tl."leftidx";
-  deps."leftindex" = tl."leftindex";
-  deps."leipzig" = tl."leipzig";
-  deps."lengthconvert" = tl."lengthconvert";
-  deps."lettre" = tl."lettre";
-  deps."lettrine" = tl."lettrine";
-  deps."lewis" = tl."lewis";
-  deps."lhelp" = tl."lhelp";
-  deps."libgreek" = tl."libgreek";
-  deps."limap" = tl."limap";
-  deps."linegoal" = tl."linegoal";
-  deps."linop" = tl."linop";
-  deps."lipsum" = tl."lipsum";
-  deps."lisp-on-tex" = tl."lisp-on-tex";
-  deps."listing" = tl."listing";
-  deps."listingsutf8" = tl."listingsutf8";
-  deps."listlbls" = tl."listlbls";
-  deps."listliketab" = tl."listliketab";
-  deps."listofsymbols" = tl."listofsymbols";
-  deps."lkproof" = tl."lkproof";
-  deps."lmake" = tl."lmake";
-  deps."locality" = tl."locality";
-  deps."logbox" = tl."logbox";
-  deps."logical-markup-utils" = tl."logical-markup-utils";
-  deps."logpap" = tl."logpap";
-  deps."longfbox" = tl."longfbox";
-  deps."longfigure" = tl."longfigure";
-  deps."longnamefilelist" = tl."longnamefilelist";
-  deps."loops" = tl."loops";
-  deps."lsc" = tl."lsc";
-  deps."lstaddons" = tl."lstaddons";
-  deps."lstfiracode" = tl."lstfiracode";
-  deps."lt3graph" = tl."lt3graph";
-  deps."lt3rawobjects" = tl."lt3rawobjects";
-  deps."ltablex" = tl."ltablex";
-  deps."ltabptch" = tl."ltabptch";
-  deps."ltxdockit" = tl."ltxdockit";
-  deps."ltxguidex" = tl."ltxguidex";
-  deps."ltxkeys" = tl."ltxkeys";
-  deps."ltxnew" = tl."ltxnew";
-  deps."ltxtools" = tl."ltxtools";
-  deps."lua-check-hyphen" = tl."lua-check-hyphen";
-  deps."lua-physical" = tl."lua-physical";
-  deps."luatodonotes" = tl."luatodonotes";
-  deps."macrolist" = tl."macrolist";
-  deps."macroswap" = tl."macroswap";
-  deps."magaz" = tl."magaz";
-  deps."magicnum" = tl."magicnum";
-  deps."magicwatermark" = tl."magicwatermark";
-  deps."mailing" = tl."mailing";
-  deps."mailmerge" = tl."mailmerge";
-  deps."makebarcode" = tl."makebarcode";
-  deps."makebase" = tl."makebase";
-  deps."makebox" = tl."makebox";
-  deps."makecell" = tl."makecell";
-  deps."makecirc" = tl."makecirc";
-  deps."makecmds" = tl."makecmds";
-  deps."makecookbook" = tl."makecookbook";
-  deps."makedtx" = tl."makedtx";
-  deps."makeglos" = tl."makeglos";
-  deps."makelabels" = tl."makelabels";
-  deps."makerobust" = tl."makerobust";
-  deps."mandi" = tl."mandi";
-  deps."manfnt" = tl."manfnt";
-  deps."manuscript" = tl."manuscript";
-  deps."manyind" = tl."manyind";
-  deps."marginfit" = tl."marginfit";
-  deps."marginfix" = tl."marginfix";
-  deps."marginnote" = tl."marginnote";
-  deps."markdown" = tl."markdown";
-  deps."mathalpha" = tl."mathalpha";
-  deps."mathastext" = tl."mathastext";
-  deps."mathexam" = tl."mathexam";
-  deps."mathfam256" = tl."mathfam256";
-  deps."mathfont" = tl."mathfont";
-  deps."maybemath" = tl."maybemath";
-  deps."mcaption" = tl."mcaption";
-  deps."mceinleger" = tl."mceinleger";
-  deps."mcexam" = tl."mcexam";
-  deps."mcite" = tl."mcite";
-  deps."mciteplus" = tl."mciteplus";
-  deps."mdframed" = tl."mdframed";
-  deps."media4svg" = tl."media4svg";
-  deps."media9" = tl."media9";
-  deps."medstarbeamer" = tl."medstarbeamer";
-  deps."meetingmins" = tl."meetingmins";
-  deps."memexsupp" = tl."memexsupp";
-  deps."memory" = tl."memory";
-  deps."mensa-tex" = tl."mensa-tex";
-  deps."menu" = tl."menu";
-  deps."menucard" = tl."menucard";
-  deps."menukeys" = tl."menukeys";
-  deps."metalogox" = tl."metalogox";
-  deps."metanorma" = tl."metanorma";
-  deps."metastr" = tl."metastr";
-  deps."method" = tl."method";
-  deps."metre" = tl."metre";
-  deps."mfirstuc" = tl."mfirstuc";
-  deps."mftinc" = tl."mftinc";
-  deps."mi-solns" = tl."mi-solns";
-  deps."midpage" = tl."midpage";
-  deps."mindflow" = tl."mindflow";
-  deps."minibox" = tl."minibox";
-  deps."minidocument" = tl."minidocument";
-  deps."minifp" = tl."minifp";
-  deps."minimalist" = tl."minimalist";
-  deps."minipage-marginpar" = tl."minipage-marginpar";
-  deps."minitoc" = tl."minitoc";
-  deps."minorrevision" = tl."minorrevision";
-  deps."minted" = tl."minted";
-  deps."minutes" = tl."minutes";
-  deps."mla-paper" = tl."mla-paper";
-  deps."mleftright" = tl."mleftright";
-  deps."mlist" = tl."mlist";
-  deps."mmap" = tl."mmap";
-  deps."mnotes" = tl."mnotes";
-  deps."moderncv" = tl."moderncv";
-  deps."modernposter" = tl."modernposter";
-  deps."moderntimeline" = tl."moderntimeline";
-  deps."modref" = tl."modref";
-  deps."modroman" = tl."modroman";
-  deps."modular" = tl."modular";
-  deps."monofill" = tl."monofill";
-  deps."moodle" = tl."moodle";
-  deps."moreenum" = tl."moreenum";
-  deps."morefloats" = tl."morefloats";
-  deps."morehype" = tl."morehype";
-  deps."moresize" = tl."moresize";
-  deps."moreverb" = tl."moreverb";
-  deps."morewrites" = tl."morewrites";
-  deps."movie15" = tl."movie15";
-  deps."mparhack" = tl."mparhack";
-  deps."mpostinl" = tl."mpostinl";
-  deps."msc" = tl."msc";
-  deps."msg" = tl."msg";
-  deps."mslapa" = tl."mslapa";
-  deps."mtgreek" = tl."mtgreek";
-  deps."multenum" = tl."multenum";
-  deps."multiaudience" = tl."multiaudience";
-  deps."multibbl" = tl."multibbl";
-  deps."multicap" = tl."multicap";
-  deps."multicolrule" = tl."multicolrule";
-  deps."multidef" = tl."multidef";
-  deps."multienv" = tl."multienv";
-  deps."multiexpand" = tl."multiexpand";
-  deps."multifootnote" = tl."multifootnote";
-  deps."multilang" = tl."multilang";
-  deps."multiple-choice" = tl."multiple-choice";
-  deps."multirow" = tl."multirow";
-  deps."mversion" = tl."mversion";
-  deps."mwe" = tl."mwe";
-  deps."mycv" = tl."mycv";
-  deps."mylatex" = tl."mylatex";
-  deps."mylatexformat" = tl."mylatexformat";
-  deps."nag" = tl."nag";
-  deps."nameauth" = tl."nameauth";
-  deps."namespc" = tl."namespc";
-  deps."ncclatex" = tl."ncclatex";
-  deps."ncctools" = tl."ncctools";
-  deps."needspace" = tl."needspace";
-  deps."nestquot" = tl."nestquot";
-  deps."newcommand" = tl."newcommand";
-  deps."newenviron" = tl."newenviron";
-  deps."newfile" = tl."newfile";
-  deps."newlfm" = tl."newlfm";
-  deps."newspaper" = tl."newspaper";
-  deps."newunicodechar" = tl."newunicodechar";
-  deps."newvbtm" = tl."newvbtm";
-  deps."newverbs" = tl."newverbs";
-  deps."nextpage" = tl."nextpage";
-  deps."nfssext-cfr" = tl."nfssext-cfr";
-  deps."nicefilelist" = tl."nicefilelist";
-  deps."niceframe" = tl."niceframe";
-  deps."nicetext" = tl."nicetext";
-  deps."nidanfloat" = tl."nidanfloat";
-  deps."ninecolors" = tl."ninecolors";
-  deps."nlctdoc" = tl."nlctdoc";
-  deps."noconflict" = tl."noconflict";
-  deps."noindentafter" = tl."noindentafter";
-  deps."noitcrul" = tl."noitcrul";
-  deps."nolbreaks" = tl."nolbreaks";
-  deps."nomencl" = tl."nomencl";
-  deps."nomentbl" = tl."nomentbl";
-  deps."nonfloat" = tl."nonfloat";
-  deps."nonumonpart" = tl."nonumonpart";
-  deps."nopageno" = tl."nopageno";
-  deps."normalcolor" = tl."normalcolor";
-  deps."notes" = tl."notes";
-  deps."notespages" = tl."notespages";
-  deps."notestex" = tl."notestex";
-  deps."notoccite" = tl."notoccite";
-  deps."nowidow" = tl."nowidow";
-  deps."nox" = tl."nox";
-  deps."ntheorem" = tl."ntheorem";
-  deps."numberedblock" = tl."numberedblock";
-  deps."numname" = tl."numname";
-  deps."numprint" = tl."numprint";
-  deps."numspell" = tl."numspell";
-  deps."ocg-p" = tl."ocg-p";
-  deps."ocgx" = tl."ocgx";
-  deps."ocgx2" = tl."ocgx2";
-  deps."ocr-latex" = tl."ocr-latex";
-  deps."octavo" = tl."octavo";
-  deps."oldstyle" = tl."oldstyle";
-  deps."onlyamsmath" = tl."onlyamsmath";
-  deps."opcit" = tl."opcit";
-  deps."opencolor" = tl."opencolor";
-  deps."optidef" = tl."optidef";
-  deps."optional" = tl."optional";
-  deps."options" = tl."options";
-  deps."orcidlink" = tl."orcidlink";
-  deps."orientation" = tl."orientation";
-  deps."outline" = tl."outline";
-  deps."outliner" = tl."outliner";
-  deps."outlines" = tl."outlines";
-  deps."outlining" = tl."outlining";
-  deps."overlays" = tl."overlays";
-  deps."overpic" = tl."overpic";
-  deps."padcount" = tl."padcount";
-  deps."pagecolor" = tl."pagecolor";
-  deps."pagecont" = tl."pagecont";
-  deps."pagegrid" = tl."pagegrid";
-  deps."pagenote" = tl."pagenote";
-  deps."pagerange" = tl."pagerange";
-  deps."pageslts" = tl."pageslts";
-  deps."palette" = tl."palette";
-  deps."pangram" = tl."pangram";
-  deps."paper" = tl."paper";
-  deps."papercdcase" = tl."papercdcase";
-  deps."papermas" = tl."papermas";
-  deps."papertex" = tl."papertex";
-  deps."paracol" = tl."paracol";
-  deps."parades" = tl."parades";
-  deps."paralist" = tl."paralist";
-  deps."paresse" = tl."paresse";
-  deps."parnotes" = tl."parnotes";
-  deps."parsa" = tl."parsa";
-  deps."parselines" = tl."parselines";
-  deps."pas-cours" = tl."pas-cours";
-  deps."pas-cv" = tl."pas-cv";
-  deps."pas-tableur" = tl."pas-tableur";
-  deps."patch" = tl."patch";
-  deps."patchcmd" = tl."patchcmd";
-  deps."pauldoc" = tl."pauldoc";
-  deps."pawpict" = tl."pawpict";
-  deps."pax" = tl."pax";
-  deps."pbalance" = tl."pbalance";
-  deps."pbox" = tl."pbox";
-  deps."pbsheet" = tl."pbsheet";
-  deps."pdf14" = tl."pdf14";
-  deps."pdfcol" = tl."pdfcol";
-  deps."pdfcolmk" = tl."pdfcolmk";
-  deps."pdfcomment" = tl."pdfcomment";
-  deps."pdfcprot" = tl."pdfcprot";
-  deps."pdfmarginpar" = tl."pdfmarginpar";
-  deps."pdfoverlay" = tl."pdfoverlay";
-  deps."pdfpagediff" = tl."pdfpagediff";
-  deps."pdfpc" = tl."pdfpc";
-  deps."pdfpc-movie" = tl."pdfpc-movie";
-  deps."pdfprivacy" = tl."pdfprivacy";
-  deps."pdfreview" = tl."pdfreview";
-  deps."pdfscreen" = tl."pdfscreen";
-  deps."pdfslide" = tl."pdfslide";
-  deps."pdfsync" = tl."pdfsync";
-  deps."pdfwin" = tl."pdfwin";
-  deps."pdfx" = tl."pdfx";
-  deps."pecha" = tl."pecha";
-  deps."perltex" = tl."perltex";
-  deps."permute" = tl."permute";
-  deps."petiteannonce" = tl."petiteannonce";
-  deps."pgfmath-xfp" = tl."pgfmath-xfp";
-  deps."phfcc" = tl."phfcc";
-  deps."phfextendedabstract" = tl."phfextendedabstract";
-  deps."phffullpagefigure" = tl."phffullpagefigure";
-  deps."phfnote" = tl."phfnote";
-  deps."phfparen" = tl."phfparen";
-  deps."phfqit" = tl."phfqit";
-  deps."phfquotetext" = tl."phfquotetext";
-  deps."phfsvnwatermark" = tl."phfsvnwatermark";
-  deps."phfthm" = tl."phfthm";
-  deps."philex" = tl."philex";
-  deps."phonenumbers" = tl."phonenumbers";
-  deps."photo" = tl."photo";
-  deps."photobook" = tl."photobook";
-  deps."picture" = tl."picture";
-  deps."piff" = tl."piff";
-  deps."pkgloader" = tl."pkgloader";
-  deps."placeins" = tl."placeins";
-  deps."plantslabels" = tl."plantslabels";
-  deps."plates" = tl."plates";
-  deps."plweb" = tl."plweb";
-  deps."pmboxdraw" = tl."pmboxdraw";
-  deps."polynom" = tl."polynom";
-  deps."polynomial" = tl."polynomial";
-  deps."polytable" = tl."polytable";
-  deps."postcards" = tl."postcards";
-  deps."poster-mac" = tl."poster-mac";
-  deps."postnotes" = tl."postnotes";
-  deps."powerdot" = tl."powerdot";
-  deps."ppr-prv" = tl."ppr-prv";
-  deps."ppt-slides" = tl."ppt-slides";
-  deps."practicalreports" = tl."practicalreports";
-  deps."precattl" = tl."precattl";
-  deps."prelim2e" = tl."prelim2e";
-  deps."preprint" = tl."preprint";
-  deps."pressrelease" = tl."pressrelease";
-  deps."prettyref" = tl."prettyref";
-  deps."prettytok" = tl."prettytok";
-  deps."preview" = tl."preview";
-  deps."printlen" = tl."printlen";
-  deps."probsoln" = tl."probsoln";
-  deps."program" = tl."program";
-  deps."progress" = tl."progress";
-  deps."progressbar" = tl."progressbar";
-  deps."projlib" = tl."projlib";
-  deps."proofread" = tl."proofread";
-  deps."properties" = tl."properties";
-  deps."prosper" = tl."prosper";
-  deps."protex" = tl."protex";
-  deps."protocol" = tl."protocol";
-  deps."psfragx" = tl."psfragx";
-  deps."pstool" = tl."pstool";
-  deps."pstring" = tl."pstring";
-  deps."pxgreeks" = tl."pxgreeks";
-  deps."pygmentex" = tl."pygmentex";
-  deps."python" = tl."python";
-  deps."pythonimmediate" = tl."pythonimmediate";
-  deps."qcm" = tl."qcm";
-  deps."qstest" = tl."qstest";
-  deps."qsymbols" = tl."qsymbols";
-  deps."quicktype" = tl."quicktype";
-  deps."quiz2socrative" = tl."quiz2socrative";
-  deps."quotchap" = tl."quotchap";
-  deps."quoting" = tl."quoting";
-  deps."quotmark" = tl."quotmark";
-  deps."ran_toks" = tl."ran_toks";
-  deps."randtext" = tl."randtext";
-  deps."rccol" = tl."rccol";
-  deps."rcs-multi" = tl."rcs-multi";
-  deps."rcsinfo" = tl."rcsinfo";
-  deps."readablecv" = tl."readablecv";
-  deps."readarray" = tl."readarray";
-  deps."realboxes" = tl."realboxes";
-  deps."recipe" = tl."recipe";
-  deps."recipebook" = tl."recipebook";
-  deps."recipecard" = tl."recipecard";
-  deps."rectopma" = tl."rectopma";
-  deps."refcheck" = tl."refcheck";
-  deps."refenums" = tl."refenums";
-  deps."reflectgraphics" = tl."reflectgraphics";
-  deps."refman" = tl."refman";
-  deps."refstyle" = tl."refstyle";
-  deps."regcount" = tl."regcount";
-  deps."regexpatch" = tl."regexpatch";
-  deps."register" = tl."register";
-  deps."regstats" = tl."regstats";
-  deps."relenc" = tl."relenc";
-  deps."relsize" = tl."relsize";
-  deps."repeatindex" = tl."repeatindex";
-  deps."repltext" = tl."repltext";
-  deps."rescansync" = tl."rescansync";
-  deps."returntogrid" = tl."returntogrid";
-  deps."rgltxdoc" = tl."rgltxdoc";
-  deps."rjlparshap" = tl."rjlparshap";
-  deps."rlepsf" = tl."rlepsf";
-  deps."rmpage" = tl."rmpage";
-  deps."robustcommand" = tl."robustcommand";
-  deps."robustindex" = tl."robustindex";
-  deps."romanbar" = tl."romanbar";
-  deps."romanbarpagenumber" = tl."romanbarpagenumber";
-  deps."romanneg" = tl."romanneg";
-  deps."romannum" = tl."romannum";
-  deps."rotfloat" = tl."rotfloat";
-  deps."rotpages" = tl."rotpages";
-  deps."roundbox" = tl."roundbox";
-  deps."rterface" = tl."rterface";
-  deps."rtkinenc" = tl."rtkinenc";
-  deps."rulerbox" = tl."rulerbox";
-  deps."rulercompass" = tl."rulercompass";
-  deps."runcode" = tl."runcode";
-  deps."rvwrite" = tl."rvwrite";
-  deps."sanitize-umlaut" = tl."sanitize-umlaut";
-  deps."sauerj" = tl."sauerj";
-  deps."saveenv" = tl."saveenv";
-  deps."savefnmark" = tl."savefnmark";
-  deps."savesym" = tl."savesym";
-  deps."savetrees" = tl."savetrees";
-  deps."scale" = tl."scale";
-  deps."scalebar" = tl."scalebar";
-  deps."scalerel" = tl."scalerel";
-  deps."scanpages" = tl."scanpages";
-  deps."schedule" = tl."schedule";
-  deps."schooldocs" = tl."schooldocs";
-  deps."scontents" = tl."scontents";
-  deps."scrambledenvs" = tl."scrambledenvs";
-  deps."scrlayer-fancyhdr" = tl."scrlayer-fancyhdr";
-  deps."scrlttr2copy" = tl."scrlttr2copy";
-  deps."sdaps" = tl."sdaps";
-  deps."sdrt" = tl."sdrt";
-  deps."secdot" = tl."secdot";
-  deps."secnum" = tl."secnum";
-  deps."sectionbox" = tl."sectionbox";
-  deps."sectionbreak" = tl."sectionbreak";
-  deps."sectsty" = tl."sectsty";
-  deps."seealso" = tl."seealso";
-  deps."selectp" = tl."selectp";
-  deps."selinput" = tl."selinput";
-  deps."semantex" = tl."semantex";
-  deps."semantic" = tl."semantic";
-  deps."semantic-markup" = tl."semantic-markup";
-  deps."semesterplanner" = tl."semesterplanner";
-  deps."semioneside" = tl."semioneside";
-  deps."semproc" = tl."semproc";
-  deps."semtex" = tl."semtex";
-  deps."sepfootnotes" = tl."sepfootnotes";
-  deps."seqsplit" = tl."seqsplit";
-  deps."sesstime" = tl."sesstime";
-  deps."sf298" = tl."sf298";
-  deps."sffms" = tl."sffms";
-  deps."sfmath" = tl."sfmath";
-  deps."shadethm" = tl."shadethm";
-  deps."shadow" = tl."shadow";
-  deps."shadowtext" = tl."shadowtext";
-  deps."shapepar" = tl."shapepar";
-  deps."shdoc" = tl."shdoc";
-  deps."shipunov" = tl."shipunov";
-  deps."shorttoc" = tl."shorttoc";
-  deps."show2e" = tl."show2e";
-  deps."showcharinbox" = tl."showcharinbox";
-  deps."showdim" = tl."showdim";
-  deps."showexpl" = tl."showexpl";
-  deps."showlabels" = tl."showlabels";
-  deps."sidecap" = tl."sidecap";
-  deps."sidenotes" = tl."sidenotes";
-  deps."sidenotesplus" = tl."sidenotesplus";
-  deps."silence" = tl."silence";
-  deps."sillypage" = tl."sillypage";
-  deps."simplecd" = tl."simplecd";
-  deps."simplecv" = tl."simplecv";
-  deps."simpleinvoice" = tl."simpleinvoice";
-  deps."simplivre" = tl."simplivre";
-  deps."sitem" = tl."sitem";
-  deps."skb" = tl."skb";
-  deps."skdoc" = tl."skdoc";
-  deps."skeldoc" = tl."skeldoc";
-  deps."skeycommand" = tl."skeycommand";
-  deps."skeyval" = tl."skeyval";
-  deps."skills" = tl."skills";
-  deps."skrapport" = tl."skrapport";
-  deps."slantsc" = tl."slantsc";
-  deps."smalltableof" = tl."smalltableof";
-  deps."smart-eqn" = tl."smart-eqn";
-  deps."smartref" = tl."smartref";
-  deps."smartunits" = tl."smartunits";
-  deps."snapshot" = tl."snapshot";
-  deps."snaptodo" = tl."snaptodo";
-  deps."snotez" = tl."snotez";
-  deps."soulpos" = tl."soulpos";
-  deps."soulutf8" = tl."soulutf8";
-  deps."spacingtricks" = tl."spacingtricks";
-  deps."spark-otf" = tl."spark-otf";
-  deps."sparklines" = tl."sparklines";
-  deps."sphack" = tl."sphack";
-  deps."splitindex" = tl."splitindex";
-  deps."spot" = tl."spot";
-  deps."spotcolor" = tl."spotcolor";
-  deps."spreadtab" = tl."spreadtab";
-  deps."spverbatim" = tl."spverbatim";
-  deps."srbook-mem" = tl."srbook-mem";
-  deps."srcltx" = tl."srcltx";
-  deps."sseq" = tl."sseq";
-  deps."sslides" = tl."sslides";
-  deps."stack" = tl."stack";
-  deps."stackengine" = tl."stackengine";
-  deps."standalone" = tl."standalone";
-  deps."stdclsdv" = tl."stdclsdv";
-  deps."stdpage" = tl."stdpage";
-  deps."stealcaps" = tl."stealcaps";
-  deps."stex" = tl."stex";
-  deps."storebox" = tl."storebox";
-  deps."storecmd" = tl."storecmd";
-  deps."stringstrings" = tl."stringstrings";
-  deps."sttools" = tl."sttools";
-  deps."stubs" = tl."stubs";
-  deps."studenthandouts" = tl."studenthandouts";
-  deps."styledcmd" = tl."styledcmd";
-  deps."subdepth" = tl."subdepth";
-  deps."subdocs" = tl."subdocs";
-  deps."subeqn" = tl."subeqn";
-  deps."subeqnarray" = tl."subeqnarray";
-  deps."subfigmat" = tl."subfigmat";
-  deps."subfigure" = tl."subfigure";
-  deps."subfiles" = tl."subfiles";
-  deps."subfloat" = tl."subfloat";
-  deps."substitutefont" = tl."substitutefont";
-  deps."substr" = tl."substr";
-  deps."supertabular" = tl."supertabular";
-  deps."suppose" = tl."suppose";
-  deps."svg" = tl."svg";
-  deps."svgcolor" = tl."svgcolor";
-  deps."svn" = tl."svn";
-  deps."svn-multi" = tl."svn-multi";
-  deps."svn-prov" = tl."svn-prov";
-  deps."svninfo" = tl."svninfo";
-  deps."swfigure" = tl."swfigure";
-  deps."swungdash" = tl."swungdash";
-  deps."syntax" = tl."syntax";
-  deps."syntrace" = tl."syntrace";
-  deps."synttree" = tl."synttree";
-  deps."tabbing" = tl."tabbing";
-  deps."tabfigures" = tl."tabfigures";
-  deps."tableaux" = tl."tableaux";
-  deps."tablefootnote" = tl."tablefootnote";
-  deps."tableof" = tl."tableof";
-  deps."tablestyles" = tl."tablestyles";
-  deps."tablists" = tl."tablists";
-  deps."tabls" = tl."tabls";
-  deps."tablvar" = tl."tablvar";
-  deps."tabstackengine" = tl."tabstackengine";
-  deps."tabto-ltx" = tl."tabto-ltx";
-  deps."tabu" = tl."tabu";
-  deps."tabularborder" = tl."tabularborder";
-  deps."tabularcalc" = tl."tabularcalc";
-  deps."tabularew" = tl."tabularew";
-  deps."tabularray" = tl."tabularray";
-  deps."tabulary" = tl."tabulary";
-  deps."tagging" = tl."tagging";
-  deps."tagpair" = tl."tagpair";
-  deps."tagpdf" = tl."tagpdf";
-  deps."talk" = tl."talk";
-  deps."tamefloats" = tl."tamefloats";
-  deps."tasks" = tl."tasks";
-  deps."tcldoc" = tl."tcldoc";
-  deps."tcolorbox" = tl."tcolorbox";
-  deps."tdclock" = tl."tdclock";
-  deps."technics" = tl."technics";
-  deps."ted" = tl."ted";
-  deps."templatetools" = tl."templatetools";
-  deps."termcal" = tl."termcal";
-  deps."termlist" = tl."termlist";
-  deps."termsim" = tl."termsim";
-  deps."testhyphens" = tl."testhyphens";
-  deps."testidx" = tl."testidx";
-  deps."tex-label" = tl."tex-label";
-  deps."tex-locale" = tl."tex-locale";
-  deps."texlogos" = tl."texlogos";
-  deps."texmate" = tl."texmate";
-  deps."texments" = tl."texments";
-  deps."texpower" = tl."texpower";
-  deps."texshade" = tl."texshade";
-  deps."texsurgery" = tl."texsurgery";
-  deps."textcsc" = tl."textcsc";
-  deps."textfit" = tl."textfit";
-  deps."textmerg" = tl."textmerg";
-  deps."textpos" = tl."textpos";
-  deps."textualicomma" = tl."textualicomma";
-  deps."texvc" = tl."texvc";
-  deps."theoremref" = tl."theoremref";
-  deps."thinsp" = tl."thinsp";
-  deps."thmtools" = tl."thmtools";
-  deps."threadcol" = tl."threadcol";
-  deps."threeparttable" = tl."threeparttable";
-  deps."threeparttablex" = tl."threeparttablex";
-  deps."thumb" = tl."thumb";
-  deps."thumbs" = tl."thumbs";
-  deps."thumby" = tl."thumby";
-  deps."ticket" = tl."ticket";
-  deps."tipauni" = tl."tipauni";
-  deps."titlecaps" = tl."titlecaps";
-  deps."titlefoot" = tl."titlefoot";
-  deps."titlepic" = tl."titlepic";
-  deps."titleref" = tl."titleref";
-  deps."titlesec" = tl."titlesec";
-  deps."titling" = tl."titling";
-  deps."to-be-determined" = tl."to-be-determined";
-  deps."tocbibind" = tl."tocbibind";
-  deps."tocdata" = tl."tocdata";
-  deps."tocloft" = tl."tocloft";
-  deps."tocvsec2" = tl."tocvsec2";
-  deps."todo" = tl."todo";
-  deps."todonotes" = tl."todonotes";
-  deps."tokcycle" = tl."tokcycle";
-  deps."tokenizer" = tl."tokenizer";
-  deps."toolbox" = tl."toolbox";
-  deps."topfloat" = tl."topfloat";
-  deps."topiclongtable" = tl."topiclongtable";
-  deps."totalcount" = tl."totalcount";
-  deps."totcount" = tl."totcount";
-  deps."totpages" = tl."totpages";
-  deps."translations" = tl."translations";
-  deps."transparent" = tl."transparent";
-  deps."trfsigns" = tl."trfsigns";
-  deps."trimspaces" = tl."trimspaces";
-  deps."trivfloat" = tl."trivfloat";
-  deps."trsym" = tl."trsym";
-  deps."truncate" = tl."truncate";
-  deps."tucv" = tl."tucv";
-  deps."turnthepage" = tl."turnthepage";
-  deps."twoinone" = tl."twoinone";
-  deps."twoup" = tl."twoup";
-  deps."txgreeks" = tl."txgreeks";
-  deps."type1cm" = tl."type1cm";
-  deps."typed-checklist" = tl."typed-checklist";
-  deps."typeface" = tl."typeface";
-  deps."typoaid" = tl."typoaid";
-  deps."typogrid" = tl."typogrid";
-  deps."uassign" = tl."uassign";
-  deps."ucs" = tl."ucs";
-  deps."uebungsblatt" = tl."uebungsblatt";
-  deps."umoline" = tl."umoline";
-  deps."underlin" = tl."underlin";
-  deps."underoverlap" = tl."underoverlap";
-  deps."undolabl" = tl."undolabl";
-  deps."uni-titlepage" = tl."uni-titlepage";
-  deps."unicodefonttable" = tl."unicodefonttable";
-  deps."unisc" = tl."unisc";
-  deps."unitconv" = tl."unitconv";
-  deps."units" = tl."units";
-  deps."unravel" = tl."unravel";
-  deps."upmethodology" = tl."upmethodology";
-  deps."upquote" = tl."upquote";
-  deps."uri" = tl."uri";
-  deps."ushort" = tl."ushort";
-  deps."uspace" = tl."uspace";
-  deps."utf8add" = tl."utf8add";
-  deps."uwmslide" = tl."uwmslide";
-  deps."variablelm" = tl."variablelm";
-  deps."varindex" = tl."varindex";
-  deps."varsfromjobname" = tl."varsfromjobname";
-  deps."varwidth" = tl."varwidth";
-  deps."vcell" = tl."vcell";
-  deps."vdmlisting" = tl."vdmlisting";
-  deps."verbasef" = tl."verbasef";
-  deps."verbatimbox" = tl."verbatimbox";
-  deps."verbatimcopy" = tl."verbatimcopy";
-  deps."verbdef" = tl."verbdef";
-  deps."verbments" = tl."verbments";
-  deps."verifiche" = tl."verifiche";
-  deps."version" = tl."version";
-  deps."versions" = tl."versions";
-  deps."versonotes" = tl."versonotes";
-  deps."vertbars" = tl."vertbars";
-  deps."vgrid" = tl."vgrid";
-  deps."vhistory" = tl."vhistory";
-  deps."vmargin" = tl."vmargin";
-  deps."volumes" = tl."volumes";
-  deps."vpe" = tl."vpe";
-  deps."vruler" = tl."vruler";
-  deps."vtable" = tl."vtable";
-  deps."vwcol" = tl."vwcol";
-  deps."wallcalendar" = tl."wallcalendar";
-  deps."wallpaper" = tl."wallpaper";
-  deps."warning" = tl."warning";
-  deps."warpcol" = tl."warpcol";
-  deps."was" = tl."was";
-  deps."webquiz" = tl."webquiz";
-  deps."widetable" = tl."widetable";
-  deps."widows-and-orphans" = tl."widows-and-orphans";
-  deps."williams" = tl."williams";
-  deps."willowtreebook" = tl."willowtreebook";
-  deps."withargs" = tl."withargs";
-  deps."wordcount" = tl."wordcount";
-  deps."wordlike" = tl."wordlike";
-  deps."worksheet" = tl."worksheet";
-  deps."wrapfig" = tl."wrapfig";
-  deps."wrapfig2" = tl."wrapfig2";
-  deps."wrapstuff" = tl."wrapstuff";
-  deps."wtref" = tl."wtref";
-  deps."xargs" = tl."xargs";
-  deps."xassoccnt" = tl."xassoccnt";
-  deps."xbmks" = tl."xbmks";
-  deps."xcntperchap" = tl."xcntperchap";
-  deps."xcolor-material" = tl."xcolor-material";
-  deps."xcolor-solarized" = tl."xcolor-solarized";
-  deps."xcomment" = tl."xcomment";
-  deps."xcookybooky" = tl."xcookybooky";
-  deps."xcpdftips" = tl."xcpdftips";
-  deps."xdoc" = tl."xdoc";
-  deps."xellipsis" = tl."xellipsis";
-  deps."xfakebold" = tl."xfakebold";
-  deps."xfor" = tl."xfor";
-  deps."xhfill" = tl."xhfill";
-  deps."xifthen" = tl."xifthen";
-  deps."xint" = tl."xint";
-  deps."xkcdcolors" = tl."xkcdcolors";
-  deps."xltabular" = tl."xltabular";
-  deps."xmpincl" = tl."xmpincl";
-  deps."xnewcommand" = tl."xnewcommand";
-  deps."xoptarg" = tl."xoptarg";
-  deps."xpatch" = tl."xpatch";
-  deps."xpeek" = tl."xpeek";
-  deps."xprintlen" = tl."xprintlen";
-  deps."xpunctuate" = tl."xpunctuate";
-  deps."xsavebox" = tl."xsavebox";
-  deps."xsim" = tl."xsim";
-  deps."xstring" = tl."xstring";
-  deps."xtab" = tl."xtab";
-  deps."xurl" = tl."xurl";
-  deps."xwatermark" = tl."xwatermark";
-  deps."xytree" = tl."xytree";
-  deps."yafoot" = tl."yafoot";
-  deps."yagusylo" = tl."yagusylo";
-  deps."yaletter" = tl."yaletter";
-  deps."ycbook" = tl."ycbook";
-  deps."ydoc" = tl."ydoc";
-  deps."yplan" = tl."yplan";
-  deps."zebra-goodies" = tl."zebra-goodies";
-  deps."zed-csp" = tl."zed-csp";
-  deps."ziffer" = tl."ziffer";
-  deps."zref" = tl."zref";
-  deps."zref-check" = tl."zref-check";
-  deps."zref-clever" = tl."zref-clever";
-  deps."zref-vario" = tl."zref-vario";
-  deps."zwgetfdate" = tl."zwgetfdate";
-  deps."zwpagelayout" = tl."zwpagelayout";
+  deps = [
+    "2up"
+    "a0poster"
+    "a4wide"
+    "a5comb"
+    "abraces"
+    "abspos"
+    "abstract"
+    "accessibility"
+    "accsupp"
+    "achemso"
+    "acro"
+    "acronym"
+    "acroterm"
+    "actuarialangle"
+    "actuarialsymbol"
+    "addfont"
+    "addlines"
+    "adjmulticol"
+    "adjustbox"
+    "adrconv"
+    "advdate"
+    "akktex"
+    "akletter"
+    "alertmessage"
+    "alnumsec"
+    "alphalph"
+    "alterqcm"
+    "altfont"
+    "altsubsup"
+    "amsaddr"
+    "animate"
+    "anonchap"
+    "answers"
+    "anyfontsize"
+    "appendix"
+    "appendixnumberbeamer"
+    "apptools"
+    "arabicfront"
+    "arcs"
+    "arraycols"
+    "arrayjobx"
+    "arraysort"
+    "arydshln"
+    "asciilist"
+    "askinclude"
+    "assignment"
+    "assoccnt"
+    "association-matrix"
+    "atenddvi"
+    "atendofenv"
+    "attachfile"
+    "aurl"
+    "authoraftertitle"
+    "authorarchive"
+    "authorindex"
+    "autofancyhdr"
+    "autonum"
+    "autopdf"
+    "autopuncitems"
+    "avremu"
+    "axessibility"
+    "background"
+    "bankstatement"
+    "bashful"
+    "basicarith"
+    "bchart"
+    "beamer-rl"
+    "beamer2thesis"
+    "beamerappendixnote"
+    "beameraudience"
+    "beamerauxtheme"
+    "beamercolorthemeowl"
+    "beamerdarkthemes"
+    "beamerposter"
+    "beamersubframe"
+    "beamertheme-arguelles"
+    "beamertheme-cuerna"
+    "beamertheme-detlevcm"
+    "beamertheme-epyt"
+    "beamertheme-focus"
+    "beamertheme-light"
+    "beamertheme-metropolis"
+    "beamertheme-npbt"
+    "beamertheme-phnompenh"
+    "beamertheme-pure-minimalistic"
+    "beamertheme-saintpetersburg"
+    "beamertheme-simpledarkblue"
+    "beamertheme-simpleplus"
+    "beamertheme-tcolorbox"
+    "beamertheme-trigon"
+    "beamertheme-upenn-bc"
+    "beamerthemeamurmaple"
+    "beamerthemejltree"
+    "beamerthemelalic"
+    "beamerthemenirma"
+    "beamerthemenord"
+    "bearwear"
+    "beaulivre"
+    "beton"
+    "bewerbung"
+    "bez123"
+    "bhcexam"
+    "bibletext"
+    "bigfoot"
+    "bigints"
+    "bilingualpages"
+    "biochemistry-colors"
+    "bithesis"
+    "bizcard"
+    "blindtext"
+    "blkarray"
+    "block"
+    "blowup"
+    "bnumexpr"
+    "boites"
+    "bold-extra"
+    "book-of-common-prayer"
+    "bookcover"
+    "bookest"
+    "booklet"
+    "bookshelf"
+    "boolexpr"
+    "bophook"
+    "boxedminipage"
+    "boxhandler"
+    "bracketkey"
+    "braket"
+    "breakurl"
+    "bubblesort"
+    "bullcntr"
+    "bxcalc"
+    "bxdpx-beamer"
+    "bxdvidriver"
+    "bxenclose"
+    "bxnewfont"
+    "bxpapersize"
+    "bxpdfver"
+    "bxtexlogo"
+    "calcage"
+    "calctab"
+    "calculator"
+    "calrsfs"
+    "cals"
+    "calxxxx-yyyy"
+    "cancel"
+    "canoniclayout"
+    "capt-of"
+    "captcont"
+    "captdef"
+    "carbohydrates"
+    "cases"
+    "casyl"
+    "catchfile"
+    "catchfilebetweentags"
+    "catechis"
+    "catoptions"
+    "cbcoptic"
+    "ccaption"
+    "cclicenses"
+    "cd"
+    "cd-cover"
+    "cdcmd"
+    "cdpbundl"
+    "cellprops"
+    "cellspace"
+    "censor"
+    "centeredline"
+    "centerlastline"
+    "changebar"
+    "changelayout"
+    "changelog"
+    "changepage"
+    "changes"
+    "chappg"
+    "chapterfolder"
+    "cheatsheet"
+    "checkend"
+    "chet"
+    "chextras"
+    "childdoc"
+    "chkfloat"
+    "chletter"
+    "chngcntr"
+    "chronology"
+    "circ"
+    "circledsteps"
+    "circledtext"
+    "classics"
+    "classpack"
+    "clefval"
+    "cleveref"
+    "clicks"
+    "clipboard"
+    "clistmap"
+    "clock"
+    "clrdblpg"
+    "clrstrip"
+    "cmdstring"
+    "cmdtrack"
+    "cmsd"
+    "cnltx"
+    "cntformats"
+    "cntperchap"
+    "codebox"
+    "codedoc"
+    "codehigh"
+    "codepage"
+    "codesection"
+    "collcell"
+    "collectbox"
+    "collection-latexrecommended"
+    "collection-pictures"
+    "colophon"
+    "color-edits"
+    "colordoc"
+    "colorframed"
+    "colorinfo"
+    "coloring"
+    "colorist"
+    "colorspace"
+    "colortab"
+    "colorwav"
+    "colorweb"
+    "colourchange"
+    "combelow"
+    "combine"
+    "comma"
+    "commado"
+    "commedit"
+    "comment"
+    "commonunicode"
+    "competences"
+    "concepts"
+    "concprog"
+    "conditext"
+    "constants"
+    "continue"
+    "contour"
+    "contracard"
+    "conv-xkv"
+    "cooking"
+    "cooking-units"
+    "cool"
+    "coolfn"
+    "coollist"
+    "coolstr"
+    "coolthms"
+    "cooltooltips"
+    "coop-writing"
+    "coordsys"
+    "copyedit"
+    "copyrightbox"
+    "coseoul"
+    "counttexruns"
+    "courseoutline"
+    "coursepaper"
+    "coverpage"
+    "cprotect"
+    "cprotectinside"
+    "crbox"
+    "create-theorem"
+    "crefthe"
+    "crossreference"
+    "crossreftools"
+    "crumbs"
+    "csquotes"
+    "css-colors"
+    "csvmerge"
+    "csvsimple"
+    "cuisine"
+    "currency"
+    "currfile"
+    "currvita"
+    "cutwin"
+    "cv"
+    "cv4tw"
+    "cweb-latex"
+    "cyber"
+    "cybercic"
+    "darkmode"
+    "dashbox"
+    "dashrule"
+    "dashundergaps"
+    "dataref"
+    "datatool"
+    "datax"
+    "dateiliste"
+    "datenumber"
+    "datestamp"
+    "datetime"
+    "datetime2"
+    "datetime2-bahasai"
+    "datetime2-basque"
+    "datetime2-breton"
+    "datetime2-bulgarian"
+    "datetime2-catalan"
+    "datetime2-croatian"
+    "datetime2-czech"
+    "datetime2-danish"
+    "datetime2-dutch"
+    "datetime2-en-fulltext"
+    "datetime2-english"
+    "datetime2-esperanto"
+    "datetime2-estonian"
+    "datetime2-finnish"
+    "datetime2-french"
+    "datetime2-galician"
+    "datetime2-german"
+    "datetime2-greek"
+    "datetime2-hebrew"
+    "datetime2-icelandic"
+    "datetime2-irish"
+    "datetime2-it-fulltext"
+    "datetime2-italian"
+    "datetime2-latin"
+    "datetime2-lsorbian"
+    "datetime2-magyar"
+    "datetime2-norsk"
+    "datetime2-polish"
+    "datetime2-portuges"
+    "datetime2-romanian"
+    "datetime2-russian"
+    "datetime2-samin"
+    "datetime2-scottish"
+    "datetime2-serbian"
+    "datetime2-slovak"
+    "datetime2-slovene"
+    "datetime2-spanish"
+    "datetime2-swedish"
+    "datetime2-turkish"
+    "datetime2-ukrainian"
+    "datetime2-usorbian"
+    "datetime2-welsh"
+    "dblfloatfix"
+    "dbshow"
+    "debate"
+    "decimal"
+    "decorule"
+    "delimtxt"
+    "democodetools"
+    "denisbdoc"
+    "diabetes-logbook"
+    "diagbox"
+    "diagnose"
+    "dialogl"
+    "dichokey"
+    "dimnum"
+    "dinbrief"
+    "directory"
+    "dirtytalk"
+    "dlfltxb"
+    "dnaseq"
+    "doclicense"
+    "docmfp"
+    "docmute"
+    "docshots"
+    "doctools"
+    "documentation"
+    "docutils"
+    "doi"
+    "dotarrow"
+    "dotlessi"
+    "dotseqn"
+    "download"
+    "dox"
+    "dpfloat"
+    "dprogress"
+    "drac"
+    "draftcopy"
+    "draftfigure"
+    "draftwatermark"
+    "dtk"
+    "dtxdescribe"
+    "dtxgallery"
+    "ducksay"
+    "duckuments"
+    "dvdcoll"
+    "dynamicnumber"
+    "dynblocks"
+    "ean13isbn"
+    "easy"
+    "easy-todo"
+    "easybook"
+    "easyfig"
+    "easyfloats"
+    "easyformat"
+    "easylist"
+    "easyreview"
+    "ebezier"
+    "ecclesiastic"
+    "econlipsum"
+    "ecv"
+    "ed"
+    "edichokey"
+    "edmargin"
+    "eemeir"
+    "efbox"
+    "egplot"
+    "ehhline"
+    "einfart"
+    "elegantbook"
+    "elegantnote"
+    "elegantpaper"
+    "elements"
+    "ellipsis"
+    "elmath"
+    "elocalloc"
+    "elpres"
+    "elzcards"
+    "emarks"
+    "embedall"
+    "embedfile"
+    "embrac"
+    "emptypage"
+    "emulateapj"
+    "endfloat"
+    "endheads"
+    "endnotes"
+    "endnotes-hy"
+    "engpron"
+    "engrec"
+    "enotez"
+    "enumitem"
+    "enumitem-zref"
+    "envbig"
+    "environ"
+    "envlab"
+    "epigraph"
+    "epigraph-keys"
+    "epiolmec"
+    "eq-pin2corr"
+    "eqell"
+    "eqlist"
+    "eqnalign"
+    "eqname"
+    "eqparbox"
+    "errata"
+    "erw-l3"
+    "esami"
+    "esdiff"
+    "esieecv"
+    "esindex"
+    "esint"
+    "esint-type1"
+    "etaremune"
+    "etextools"
+    "etl"
+    "etoc"
+    "eukdate"
+    "eulerpx"
+    "europasscv"
+    "europecv"
+    "everyhook"
+    "everypage"
+    "exam"
+    "exam-n"
+    "exam-randomizechoices"
+    "examdesign"
+    "example"
+    "examplep"
+    "exceltex"
+    "excludeonly"
+    "exercise"
+    "exercisebank"
+    "exercisepoints"
+    "exercises"
+    "exesheet"
+    "exframe"
+    "exp-testopt"
+    "expdlist"
+    "export"
+    "exsheets"
+    "exsol"
+    "extract"
+    "facsimile"
+    "factura"
+    "familytree"
+    "fancyhandout"
+    "fancylabel"
+    "fancynum"
+    "fancypar"
+    "fancyqr"
+    "fancyslides"
+    "fancytabs"
+    "fancytooltips"
+    "fbox"
+    "fcolumn"
+    "fetchcls"
+    "fewerfloatpages"
+    "ffcode"
+    "ffslides"
+    "fgruler"
+    "fifo-stack"
+    "figsize"
+    "filecontents"
+    "filecontentsdef"
+    "filedate"
+    "fileinfo"
+    "filemod"
+    "fink"
+    "finstrut"
+    "fithesis"
+    "fixcmex"
+    "fixfoot"
+    "fixme"
+    "fixmetodonotes"
+    "fjodor"
+    "flabels"
+    "flacards"
+    "flagderiv"
+    "flashcards"
+    "flashmovie"
+    "flexipage"
+    "flipbook"
+    "flippdf"
+    "floatflt"
+    "floatrow"
+    "flowfram"
+    "fmp"
+    "fmtcount"
+    "fn2end"
+    "fnbreak"
+    "fncychap"
+    "fncylab"
+    "fnpara"
+    "fnpct"
+    "fnumprint"
+    "foilhtml"
+    "foliono"
+    "fontaxes"
+    "fontsetup"
+    "fontsize"
+    "fonttable"
+    "footmisc"
+    "footmisx"
+    "footnotebackref"
+    "footnoterange"
+    "footnpag"
+    "forarray"
+    "foreign"
+    "forloop"
+    "formlett"
+    "forms16be"
+    "formular"
+    "fragments"
+    "frame"
+    "framed"
+    "frankenstein"
+    "frege"
+    "froufrou"
+    "ftcap"
+    "ftnxtra"
+    "fullblck"
+    "fullminipage"
+    "fullwidth"
+    "functional"
+    "fundus-calligra"
+    "fundus-cyr"
+    "fundus-sueterlin"
+    "fvextra"
+    "fwlw"
+    "g-brief"
+    "gatherenum"
+    "gauss"
+    "gcard"
+    "gcite"
+    "gender"
+    "genmpage"
+    "gensymb"
+    "getfiledate"
+    "getitems"
+    "gindex"
+    "ginpenc"
+    "gitfile-info"
+    "gitinfo"
+    "gitinfo2"
+    "gitlog"
+    "gitstatus"
+    "gitver"
+    "globalvals"
+    "gloss"
+    "glossaries"
+    "glossaries-danish"
+    "glossaries-dutch"
+    "glossaries-english"
+    "glossaries-estonian"
+    "glossaries-extra"
+    "glossaries-finnish"
+    "glossaries-french"
+    "glossaries-german"
+    "glossaries-irish"
+    "glossaries-italian"
+    "glossaries-magyar"
+    "glossaries-nynorsk"
+    "glossaries-polish"
+    "glossaries-portuges"
+    "glossaries-serbian"
+    "glossaries-slovene"
+    "glossaries-spanish"
+    "gmdoc"
+    "gmdoc-enhance"
+    "gmiflink"
+    "gmutils"
+    "gmverb"
+    "grabbox"
+    "gradient-text"
+    "grading-scheme"
+    "graphbox"
+    "graphicscache"
+    "graphicx-psmin"
+    "graphicxbox"
+    "graphpaper"
+    "grayhints"
+    "grfpaste"
+    "grid"
+    "grid-system"
+    "gridpapers"
+    "gridset"
+    "gridslides"
+    "gs1"
+    "guitlogo"
+    "ha-prosper"
+    "hackthefootline"
+    "halloweenmath"
+    "handin"
+    "handout"
+    "handoutwithnotes"
+    "hang"
+    "hanging"
+    "hardwrap"
+    "harnon-cv"
+    "harpoon"
+    "hc"
+    "he-she"
+    "hep-acronym"
+    "hep-float"
+    "hep-math"
+    "hep-text"
+    "hep-title"
+    "hereapplies"
+    "hhtensor"
+    "hideanswer"
+    "highlightlatex"
+    "histogr"
+    "hitec"
+    "hitreport"
+    "hletter"
+    "hobsub"
+    "hpsdiss"
+    "href-ul"
+    "hrefhide"
+    "huawei"
+    "hvextern"
+    "hvindex"
+    "hvlogos"
+    "hvpygmentex"
+    "hvqrurl"
+    "hwemoji"
+    "hypdestopt"
+    "hypdoc"
+    "hypdvips"
+    "hyper"
+    "hyperbar"
+    "hypernat"
+    "hyperxmp"
+    "hyphenat"
+    "identkey"
+    "idxcmds"
+    "idxlayout"
+    "iexec"
+    "ifallfalse"
+    "iffont"
+    "ifmslide"
+    "ifmtarg"
+    "ifnextok"
+    "ifoddpage"
+    "ifthenx"
+    "iitem"
+    "image-gallery"
+    "imakeidx"
+    "import"
+    "incgraph"
+    "indextools"
+    "inline-images"
+    "inlinedef"
+    "inlinelabel"
+    "inputenx"
+    "inputtrc"
+    "interactiveworkbook"
+    "interfaces"
+    "intopdf"
+    "inversepath"
+    "invoice"
+    "invoice-class"
+    "invoice2"
+    "iso"
+    "iso10303"
+    "isodate"
+    "isodoc"
+    "isonums"
+    "isopt"
+    "isorot"
+    "isotope"
+    "issuulinks"
+    "iwhdp"
+    "jlabels"
+    "jmsdelim"
+    "jobname-suffix"
+    "jslectureplanner"
+    "jumplines"
+    "jvlisting"
+    "kalendarium"
+    "kantlipsum"
+    "kerntest"
+    "keycommand"
+    "keyfloat"
+    "keyindex"
+    "keyparse"
+    "keyreader"
+    "keystroke"
+    "keyval2e"
+    "keyvaltable"
+    "kix"
+    "knowledge"
+    "koma-moderncvclassic"
+    "koma-script-sfs"
+    "komacv"
+    "komacv-rg"
+    "ktv-texdata"
+    "l3build"
+    "labbook"
+    "labels"
+    "labels4easylist"
+    "labelschanged"
+    "lambdax"
+    "lastpackage"
+    "lastpage"
+    "latex-amsmath-dev"
+    "latex-base-dev"
+    "latex-bin-dev"
+    "latex-firstaid-dev"
+    "latex-graphics-dev"
+    "latex-lab-dev"
+    "latex-tools-dev"
+    "latex-uni8"
+    "latexcolors"
+    "latexdemo"
+    "latexgit"
+    "layouts"
+    "lazylist"
+    "lccaps"
+    "lcd"
+    "lcg"
+    "leading"
+    "leaflet"
+    "lebhart"
+    "lectures"
+    "lectureslides"
+    "leftidx"
+    "leftindex"
+    "leipzig"
+    "lengthconvert"
+    "lettre"
+    "lettrine"
+    "lewis"
+    "lhelp"
+    "libgreek"
+    "limap"
+    "linegoal"
+    "linop"
+    "lipsum"
+    "lisp-on-tex"
+    "listing"
+    "listingsutf8"
+    "listlbls"
+    "listliketab"
+    "listofsymbols"
+    "lkproof"
+    "lmake"
+    "locality"
+    "logbox"
+    "logical-markup-utils"
+    "logpap"
+    "longfbox"
+    "longfigure"
+    "longnamefilelist"
+    "loops"
+    "lsc"
+    "lstaddons"
+    "lstfiracode"
+    "lt3graph"
+    "lt3rawobjects"
+    "ltablex"
+    "ltabptch"
+    "ltxdockit"
+    "ltxguidex"
+    "ltxkeys"
+    "ltxnew"
+    "ltxtools"
+    "lua-check-hyphen"
+    "lua-physical"
+    "luatodonotes"
+    "macrolist"
+    "macroswap"
+    "magaz"
+    "magicnum"
+    "magicwatermark"
+    "mailing"
+    "mailmerge"
+    "makebarcode"
+    "makebase"
+    "makebox"
+    "makecell"
+    "makecirc"
+    "makecmds"
+    "makecookbook"
+    "makedtx"
+    "makeglos"
+    "makelabels"
+    "makerobust"
+    "mandi"
+    "manfnt"
+    "manuscript"
+    "manyind"
+    "marginfit"
+    "marginfix"
+    "marginnote"
+    "markdown"
+    "mathalpha"
+    "mathastext"
+    "mathexam"
+    "mathfam256"
+    "mathfont"
+    "maybemath"
+    "mcaption"
+    "mceinleger"
+    "mcexam"
+    "mcite"
+    "mciteplus"
+    "mdframed"
+    "media4svg"
+    "media9"
+    "medstarbeamer"
+    "meetingmins"
+    "memexsupp"
+    "memory"
+    "mensa-tex"
+    "menu"
+    "menucard"
+    "menukeys"
+    "metalogox"
+    "metanorma"
+    "metastr"
+    "method"
+    "metre"
+    "mfirstuc"
+    "mftinc"
+    "mi-solns"
+    "midpage"
+    "mindflow"
+    "minibox"
+    "minidocument"
+    "minifp"
+    "minimalist"
+    "minipage-marginpar"
+    "minitoc"
+    "minorrevision"
+    "minted"
+    "minutes"
+    "mla-paper"
+    "mleftright"
+    "mlist"
+    "mmap"
+    "mnotes"
+    "moderncv"
+    "modernposter"
+    "moderntimeline"
+    "modref"
+    "modroman"
+    "modular"
+    "monofill"
+    "moodle"
+    "moreenum"
+    "morefloats"
+    "morehype"
+    "moresize"
+    "moreverb"
+    "morewrites"
+    "movie15"
+    "mparhack"
+    "mpostinl"
+    "msc"
+    "msg"
+    "mslapa"
+    "mtgreek"
+    "multenum"
+    "multiaudience"
+    "multibbl"
+    "multicap"
+    "multicolrule"
+    "multidef"
+    "multienv"
+    "multiexpand"
+    "multifootnote"
+    "multilang"
+    "multiple-choice"
+    "multirow"
+    "mversion"
+    "mwe"
+    "mycv"
+    "mylatex"
+    "mylatexformat"
+    "nag"
+    "nameauth"
+    "namespc"
+    "ncclatex"
+    "ncctools"
+    "needspace"
+    "nestquot"
+    "newcommand"
+    "newenviron"
+    "newfile"
+    "newlfm"
+    "newspaper"
+    "newunicodechar"
+    "newvbtm"
+    "newverbs"
+    "nextpage"
+    "nfssext-cfr"
+    "nicefilelist"
+    "niceframe"
+    "nicetext"
+    "nidanfloat"
+    "ninecolors"
+    "nlctdoc"
+    "noconflict"
+    "noindentafter"
+    "noitcrul"
+    "nolbreaks"
+    "nomencl"
+    "nomentbl"
+    "nonfloat"
+    "nonumonpart"
+    "nopageno"
+    "normalcolor"
+    "notes"
+    "notespages"
+    "notestex"
+    "notoccite"
+    "nowidow"
+    "nox"
+    "ntheorem"
+    "numberedblock"
+    "numname"
+    "numprint"
+    "numspell"
+    "ocg-p"
+    "ocgx"
+    "ocgx2"
+    "ocr-latex"
+    "octavo"
+    "oldstyle"
+    "onlyamsmath"
+    "opcit"
+    "opencolor"
+    "optidef"
+    "optional"
+    "options"
+    "orcidlink"
+    "orientation"
+    "outline"
+    "outliner"
+    "outlines"
+    "outlining"
+    "overlays"
+    "overpic"
+    "padcount"
+    "pagecolor"
+    "pagecont"
+    "pagegrid"
+    "pagenote"
+    "pagerange"
+    "pageslts"
+    "palette"
+    "pangram"
+    "paper"
+    "papercdcase"
+    "papermas"
+    "papertex"
+    "paracol"
+    "parades"
+    "paralist"
+    "paresse"
+    "parnotes"
+    "parsa"
+    "parselines"
+    "pas-cours"
+    "pas-cv"
+    "pas-tableur"
+    "patch"
+    "patchcmd"
+    "pauldoc"
+    "pawpict"
+    "pax"
+    "pbalance"
+    "pbox"
+    "pbsheet"
+    "pdf14"
+    "pdfcol"
+    "pdfcolmk"
+    "pdfcomment"
+    "pdfcprot"
+    "pdfmarginpar"
+    "pdfoverlay"
+    "pdfpagediff"
+    "pdfpc"
+    "pdfpc-movie"
+    "pdfprivacy"
+    "pdfreview"
+    "pdfscreen"
+    "pdfslide"
+    "pdfsync"
+    "pdfwin"
+    "pdfx"
+    "pecha"
+    "perltex"
+    "permute"
+    "petiteannonce"
+    "pgfmath-xfp"
+    "phfcc"
+    "phfextendedabstract"
+    "phffullpagefigure"
+    "phfnote"
+    "phfparen"
+    "phfqit"
+    "phfquotetext"
+    "phfsvnwatermark"
+    "phfthm"
+    "philex"
+    "phonenumbers"
+    "photo"
+    "photobook"
+    "picture"
+    "piff"
+    "pkgloader"
+    "placeins"
+    "plantslabels"
+    "plates"
+    "plweb"
+    "pmboxdraw"
+    "polynom"
+    "polynomial"
+    "polytable"
+    "postcards"
+    "poster-mac"
+    "postnotes"
+    "powerdot"
+    "ppr-prv"
+    "ppt-slides"
+    "practicalreports"
+    "precattl"
+    "prelim2e"
+    "preprint"
+    "pressrelease"
+    "prettyref"
+    "prettytok"
+    "preview"
+    "printlen"
+    "probsoln"
+    "program"
+    "progress"
+    "progressbar"
+    "projlib"
+    "proofread"
+    "properties"
+    "prosper"
+    "protex"
+    "protocol"
+    "psfragx"
+    "pstool"
+    "pstring"
+    "pxgreeks"
+    "pygmentex"
+    "python"
+    "pythonimmediate"
+    "qcm"
+    "qstest"
+    "qsymbols"
+    "quicktype"
+    "quiz2socrative"
+    "quotchap"
+    "quoting"
+    "quotmark"
+    "ran_toks"
+    "randtext"
+    "rccol"
+    "rcs-multi"
+    "rcsinfo"
+    "readablecv"
+    "readarray"
+    "realboxes"
+    "recipe"
+    "recipebook"
+    "recipecard"
+    "rectopma"
+    "refcheck"
+    "refenums"
+    "reflectgraphics"
+    "refman"
+    "refstyle"
+    "regcount"
+    "regexpatch"
+    "register"
+    "regstats"
+    "relenc"
+    "relsize"
+    "repeatindex"
+    "repltext"
+    "rescansync"
+    "returntogrid"
+    "rgltxdoc"
+    "rjlparshap"
+    "rlepsf"
+    "rmpage"
+    "robustcommand"
+    "robustindex"
+    "romanbar"
+    "romanbarpagenumber"
+    "romanneg"
+    "romannum"
+    "rotfloat"
+    "rotpages"
+    "roundbox"
+    "rterface"
+    "rtkinenc"
+    "rulerbox"
+    "rulercompass"
+    "runcode"
+    "rvwrite"
+    "sanitize-umlaut"
+    "sauerj"
+    "saveenv"
+    "savefnmark"
+    "savesym"
+    "savetrees"
+    "scale"
+    "scalebar"
+    "scalerel"
+    "scanpages"
+    "schedule"
+    "schooldocs"
+    "scontents"
+    "scrambledenvs"
+    "scrlayer-fancyhdr"
+    "scrlttr2copy"
+    "sdaps"
+    "sdrt"
+    "secdot"
+    "secnum"
+    "sectionbox"
+    "sectionbreak"
+    "sectsty"
+    "seealso"
+    "selectp"
+    "selinput"
+    "semantex"
+    "semantic"
+    "semantic-markup"
+    "semesterplanner"
+    "semioneside"
+    "semproc"
+    "semtex"
+    "sepfootnotes"
+    "seqsplit"
+    "sesstime"
+    "sf298"
+    "sffms"
+    "sfmath"
+    "shadethm"
+    "shadow"
+    "shadowtext"
+    "shapepar"
+    "shdoc"
+    "shipunov"
+    "shorttoc"
+    "show2e"
+    "showcharinbox"
+    "showdim"
+    "showexpl"
+    "showlabels"
+    "sidecap"
+    "sidenotes"
+    "sidenotesplus"
+    "silence"
+    "sillypage"
+    "simplecd"
+    "simplecv"
+    "simpleinvoice"
+    "simplivre"
+    "sitem"
+    "skb"
+    "skdoc"
+    "skeldoc"
+    "skeycommand"
+    "skeyval"
+    "skills"
+    "skrapport"
+    "slantsc"
+    "smalltableof"
+    "smart-eqn"
+    "smartref"
+    "smartunits"
+    "snapshot"
+    "snaptodo"
+    "snotez"
+    "soulpos"
+    "soulutf8"
+    "spacingtricks"
+    "spark-otf"
+    "sparklines"
+    "sphack"
+    "splitindex"
+    "spot"
+    "spotcolor"
+    "spreadtab"
+    "spverbatim"
+    "srbook-mem"
+    "srcltx"
+    "sseq"
+    "sslides"
+    "stack"
+    "stackengine"
+    "standalone"
+    "stdclsdv"
+    "stdpage"
+    "stealcaps"
+    "stex"
+    "storebox"
+    "storecmd"
+    "stringstrings"
+    "sttools"
+    "stubs"
+    "studenthandouts"
+    "styledcmd"
+    "subdepth"
+    "subdocs"
+    "subeqn"
+    "subeqnarray"
+    "subfigmat"
+    "subfigure"
+    "subfiles"
+    "subfloat"
+    "substitutefont"
+    "substr"
+    "supertabular"
+    "suppose"
+    "svg"
+    "svgcolor"
+    "svn"
+    "svn-multi"
+    "svn-prov"
+    "svninfo"
+    "swfigure"
+    "swungdash"
+    "syntax"
+    "syntrace"
+    "synttree"
+    "tabbing"
+    "tabfigures"
+    "tableaux"
+    "tablefootnote"
+    "tableof"
+    "tablestyles"
+    "tablists"
+    "tabls"
+    "tablvar"
+    "tabstackengine"
+    "tabto-ltx"
+    "tabu"
+    "tabularborder"
+    "tabularcalc"
+    "tabularew"
+    "tabularray"
+    "tabulary"
+    "tagging"
+    "tagpair"
+    "tagpdf"
+    "talk"
+    "tamefloats"
+    "tasks"
+    "tcldoc"
+    "tcolorbox"
+    "tdclock"
+    "technics"
+    "ted"
+    "templatetools"
+    "termcal"
+    "termlist"
+    "termsim"
+    "testhyphens"
+    "testidx"
+    "tex-label"
+    "tex-locale"
+    "texlogos"
+    "texmate"
+    "texments"
+    "texpower"
+    "texshade"
+    "texsurgery"
+    "textcsc"
+    "textfit"
+    "textmerg"
+    "textpos"
+    "textualicomma"
+    "texvc"
+    "theoremref"
+    "thinsp"
+    "thmtools"
+    "threadcol"
+    "threeparttable"
+    "threeparttablex"
+    "thumb"
+    "thumbs"
+    "thumby"
+    "ticket"
+    "tipauni"
+    "titlecaps"
+    "titlefoot"
+    "titlepic"
+    "titleref"
+    "titlesec"
+    "titling"
+    "to-be-determined"
+    "tocbibind"
+    "tocdata"
+    "tocloft"
+    "tocvsec2"
+    "todo"
+    "todonotes"
+    "tokcycle"
+    "tokenizer"
+    "toolbox"
+    "topfloat"
+    "topiclongtable"
+    "totalcount"
+    "totcount"
+    "totpages"
+    "translations"
+    "transparent"
+    "trfsigns"
+    "trimspaces"
+    "trivfloat"
+    "trsym"
+    "truncate"
+    "tucv"
+    "turnthepage"
+    "twoinone"
+    "twoup"
+    "txgreeks"
+    "type1cm"
+    "typed-checklist"
+    "typeface"
+    "typoaid"
+    "typogrid"
+    "uassign"
+    "ucs"
+    "uebungsblatt"
+    "umoline"
+    "underlin"
+    "underoverlap"
+    "undolabl"
+    "uni-titlepage"
+    "unicodefonttable"
+    "unisc"
+    "unitconv"
+    "units"
+    "unravel"
+    "upmethodology"
+    "upquote"
+    "uri"
+    "ushort"
+    "uspace"
+    "utf8add"
+    "uwmslide"
+    "variablelm"
+    "varindex"
+    "varsfromjobname"
+    "varwidth"
+    "vcell"
+    "vdmlisting"
+    "verbasef"
+    "verbatimbox"
+    "verbatimcopy"
+    "verbdef"
+    "verbments"
+    "verifiche"
+    "version"
+    "versions"
+    "versonotes"
+    "vertbars"
+    "vgrid"
+    "vhistory"
+    "vmargin"
+    "volumes"
+    "vpe"
+    "vruler"
+    "vtable"
+    "vwcol"
+    "wallcalendar"
+    "wallpaper"
+    "warning"
+    "warpcol"
+    "was"
+    "webquiz"
+    "widetable"
+    "widows-and-orphans"
+    "williams"
+    "willowtreebook"
+    "withargs"
+    "wordcount"
+    "wordlike"
+    "worksheet"
+    "wrapfig"
+    "wrapfig2"
+    "wrapstuff"
+    "wtref"
+    "xargs"
+    "xassoccnt"
+    "xbmks"
+    "xcntperchap"
+    "xcolor-material"
+    "xcolor-solarized"
+    "xcomment"
+    "xcookybooky"
+    "xcpdftips"
+    "xdoc"
+    "xellipsis"
+    "xfakebold"
+    "xfor"
+    "xhfill"
+    "xifthen"
+    "xint"
+    "xkcdcolors"
+    "xltabular"
+    "xmpincl"
+    "xnewcommand"
+    "xoptarg"
+    "xpatch"
+    "xpeek"
+    "xprintlen"
+    "xpunctuate"
+    "xsavebox"
+    "xsim"
+    "xstring"
+    "xtab"
+    "xurl"
+    "xwatermark"
+    "xytree"
+    "yafoot"
+    "yagusylo"
+    "yaletter"
+    "ycbook"
+    "ydoc"
+    "yplan"
+    "zebra-goodies"
+    "zed-csp"
+    "ziffer"
+    "zref"
+    "zref-check"
+    "zref-clever"
+    "zref-vario"
+    "zwgetfdate"
+    "zwpagelayout"
+  ];
   sha512.run = "15a6199c93d8a3b2dbbde8761f9889ea8d8ea3720500a9718e405a6146a8d460828e6c1010a3436c547e1bcb28e98fb7ac964c1facad4ed6c2b843b372e9bd89";
 };
 "collection-latexrecommended" = {
   revision = 63547;
   stripPrefix = 0;
-  deps."anysize" = tl."anysize";
-  deps."attachfile2" = tl."attachfile2";
-  deps."beamer" = tl."beamer";
-  deps."booktabs" = tl."booktabs";
-  deps."breqn" = tl."breqn";
-  deps."caption" = tl."caption";
-  deps."cite" = tl."cite";
-  deps."cmap" = tl."cmap";
-  deps."collection-latex" = tl."collection-latex";
-  deps."crop" = tl."crop";
-  deps."ctable" = tl."ctable";
-  deps."eso-pic" = tl."eso-pic";
-  deps."etoolbox" = tl."etoolbox";
-  deps."euenc" = tl."euenc";
-  deps."euler" = tl."euler";
-  deps."everysel" = tl."everysel";
-  deps."everyshi" = tl."everyshi";
-  deps."extsizes" = tl."extsizes";
-  deps."fancybox" = tl."fancybox";
-  deps."fancyref" = tl."fancyref";
-  deps."fancyvrb" = tl."fancyvrb";
-  deps."filehook" = tl."filehook";
-  deps."float" = tl."float";
-  deps."fontspec" = tl."fontspec";
-  deps."footnotehyper" = tl."footnotehyper";
-  deps."fp" = tl."fp";
-  deps."grffile" = tl."grffile";
-  deps."hologo" = tl."hologo";
-  deps."index" = tl."index";
-  deps."infwarerr" = tl."infwarerr";
-  deps."jknapltx" = tl."jknapltx";
-  deps."koma-script" = tl."koma-script";
-  deps."l3experimental" = tl."l3experimental";
-  deps."latexbug" = tl."latexbug";
-  deps."lineno" = tl."lineno";
-  deps."listings" = tl."listings";
-  deps."lwarp" = tl."lwarp";
-  deps."mathspec" = tl."mathspec";
-  deps."mathtools" = tl."mathtools";
-  deps."mdwtools" = tl."mdwtools";
-  deps."memoir" = tl."memoir";
-  deps."metalogo" = tl."metalogo";
-  deps."microtype" = tl."microtype";
-  deps."ms" = tl."ms";
-  deps."newfloat" = tl."newfloat";
-  deps."ntgclass" = tl."ntgclass";
-  deps."parskip" = tl."parskip";
-  deps."pdflscape" = tl."pdflscape";
-  deps."pdfmanagement-testphase" = tl."pdfmanagement-testphase";
-  deps."pdfpages" = tl."pdfpages";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."polyglossia" = tl."polyglossia";
-  deps."psfrag" = tl."psfrag";
-  deps."ragged2e" = tl."ragged2e";
-  deps."rcs" = tl."rcs";
-  deps."sansmath" = tl."sansmath";
-  deps."section" = tl."section";
-  deps."seminar" = tl."seminar";
-  deps."sepnum" = tl."sepnum";
-  deps."setspace" = tl."setspace";
-  deps."subfig" = tl."subfig";
-  deps."textcase" = tl."textcase";
-  deps."thumbpdf" = tl."thumbpdf";
-  deps."translator" = tl."translator";
-  deps."typehtml" = tl."typehtml";
-  deps."ucharcat" = tl."ucharcat";
-  deps."underscore" = tl."underscore";
-  deps."unicode-math" = tl."unicode-math";
-  deps."xcolor" = tl."xcolor";
-  deps."xkeyval" = tl."xkeyval";
-  deps."xltxtra" = tl."xltxtra";
-  deps."xunicode" = tl."xunicode";
+  deps = [
+    "anysize"
+    "attachfile2"
+    "beamer"
+    "booktabs"
+    "breqn"
+    "caption"
+    "cite"
+    "cmap"
+    "collection-latex"
+    "crop"
+    "ctable"
+    "eso-pic"
+    "etoolbox"
+    "euenc"
+    "euler"
+    "everysel"
+    "everyshi"
+    "extsizes"
+    "fancybox"
+    "fancyref"
+    "fancyvrb"
+    "filehook"
+    "float"
+    "fontspec"
+    "footnotehyper"
+    "fp"
+    "grffile"
+    "hologo"
+    "index"
+    "infwarerr"
+    "jknapltx"
+    "koma-script"
+    "l3experimental"
+    "latexbug"
+    "lineno"
+    "listings"
+    "lwarp"
+    "mathspec"
+    "mathtools"
+    "mdwtools"
+    "memoir"
+    "metalogo"
+    "microtype"
+    "ms"
+    "newfloat"
+    "ntgclass"
+    "parskip"
+    "pdflscape"
+    "pdfmanagement-testphase"
+    "pdfpages"
+    "pdftexcmds"
+    "polyglossia"
+    "psfrag"
+    "ragged2e"
+    "rcs"
+    "sansmath"
+    "section"
+    "seminar"
+    "sepnum"
+    "setspace"
+    "subfig"
+    "textcase"
+    "thumbpdf"
+    "translator"
+    "typehtml"
+    "ucharcat"
+    "underscore"
+    "unicode-math"
+    "xcolor"
+    "xkeyval"
+    "xltxtra"
+    "xunicode"
+  ];
   sha512.run = "4e445e9830476058f6b878f306516de2fdf1b174011dd79e6a7d875adf104f2a15cdceefc7045a8ae404399d3a08d8cd4eda8fc5af317ea043b03e6c648a73b1";
 };
 "collection-luatex" = {
   revision = 65354;
   stripPrefix = 0;
-  deps."addliga" = tl."addliga";
-  deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua";
-  deps."barracuda" = tl."barracuda";
-  deps."bezierplot" = tl."bezierplot";
-  deps."checkcites" = tl."checkcites";
-  deps."chickenize" = tl."chickenize";
-  deps."chinese-jfm" = tl."chinese-jfm";
-  deps."cloze" = tl."cloze";
-  deps."collection-basic" = tl."collection-basic";
-  deps."combofont" = tl."combofont";
-  deps."cstypo" = tl."cstypo";
-  deps."ctablestack" = tl."ctablestack";
-  deps."ekdosis" = tl."ekdosis";
-  deps."emoji" = tl."emoji";
-  deps."emojicite" = tl."emojicite";
-  deps."enigma" = tl."enigma";
-  deps."innerscript" = tl."innerscript";
-  deps."interpreter" = tl."interpreter";
-  deps."kanaparser" = tl."kanaparser";
-  deps."ligtype" = tl."ligtype";
-  deps."linebreaker" = tl."linebreaker";
-  deps."lt3luabridge" = tl."lt3luabridge";
-  deps."lua-typo" = tl."lua-typo";
-  deps."lua-uca" = tl."lua-uca";
-  deps."lua-ul" = tl."lua-ul";
-  deps."lua-uni-algos" = tl."lua-uni-algos";
-  deps."lua-visual-debug" = tl."lua-visual-debug";
-  deps."lua-widow-control" = tl."lua-widow-control";
-  deps."luaaddplot" = tl."luaaddplot";
-  deps."luacas" = tl."luacas";
-  deps."luacensor" = tl."luacensor";
-  deps."luacode" = tl."luacode";
-  deps."luacolor" = tl."luacolor";
-  deps."luahyphenrules" = tl."luahyphenrules";
-  deps."luaimageembed" = tl."luaimageembed";
-  deps."luaindex" = tl."luaindex";
-  deps."luainputenc" = tl."luainputenc";
-  deps."luaintro" = tl."luaintro";
-  deps."luakeys" = tl."luakeys";
-  deps."lualatex-doc" = tl."lualatex-doc";
-  deps."lualatex-math" = tl."lualatex-math";
-  deps."lualatex-truncate" = tl."lualatex-truncate";
-  deps."lualibs" = tl."lualibs";
-  deps."luamathalign" = tl."luamathalign";
-  deps."luamodulartables" = tl."luamodulartables";
-  deps."luamplib" = tl."luamplib";
-  deps."luaoptions" = tl."luaoptions";
-  deps."luaotfload" = tl."luaotfload";
-  deps."luapackageloader" = tl."luapackageloader";
-  deps."luaprogtable" = tl."luaprogtable";
-  deps."luaquotes" = tl."luaquotes";
-  deps."luarandom" = tl."luarandom";
-  deps."luatex85" = tl."luatex85";
-  deps."luatexbase" = tl."luatexbase";
-  deps."luatexko" = tl."luatexko";
-  deps."luatextra" = tl."luatextra";
-  deps."luatruthtable" = tl."luatruthtable";
-  deps."luavlna" = tl."luavlna";
-  deps."luaxml" = tl."luaxml";
-  deps."lutabulartools" = tl."lutabulartools";
-  deps."minim" = tl."minim";
-  deps."minim-math" = tl."minim-math";
-  deps."minim-mp" = tl."minim-mp";
-  deps."minim-pdf" = tl."minim-pdf";
-  deps."minim-xmp" = tl."minim-xmp";
-  deps."newpax" = tl."newpax";
-  deps."nodetree" = tl."nodetree";
-  deps."odsfile" = tl."odsfile";
-  deps."optex" = tl."optex";
-  deps."pdfarticle" = tl."pdfarticle";
-  deps."pdfextra" = tl."pdfextra";
-  deps."penlight" = tl."penlight";
-  deps."piton" = tl."piton";
-  deps."placeat" = tl."placeat";
-  deps."plantuml" = tl."plantuml";
-  deps."pyluatex" = tl."pyluatex";
-  deps."scikgtex" = tl."scikgtex";
-  deps."selnolig" = tl."selnolig";
-  deps."showhyphenation" = tl."showhyphenation";
-  deps."showkerning" = tl."showkerning";
-  deps."spacekern" = tl."spacekern";
-  deps."spelling" = tl."spelling";
-  deps."stricttex" = tl."stricttex";
-  deps."truthtable" = tl."truthtable";
-  deps."tsvtemplate" = tl."tsvtemplate";
-  deps."typewriter" = tl."typewriter";
-  deps."uninormalize" = tl."uninormalize";
-  deps."yamlvars" = tl."yamlvars";
+  deps = [
+    "addliga"
+    "auto-pst-pdf-lua"
+    "barracuda"
+    "bezierplot"
+    "checkcites"
+    "chickenize"
+    "chinese-jfm"
+    "cloze"
+    "collection-basic"
+    "combofont"
+    "cstypo"
+    "ctablestack"
+    "ekdosis"
+    "emoji"
+    "emojicite"
+    "enigma"
+    "innerscript"
+    "interpreter"
+    "kanaparser"
+    "ligtype"
+    "linebreaker"
+    "lt3luabridge"
+    "lua-typo"
+    "lua-uca"
+    "lua-ul"
+    "lua-uni-algos"
+    "lua-visual-debug"
+    "lua-widow-control"
+    "luaaddplot"
+    "luacas"
+    "luacensor"
+    "luacode"
+    "luacolor"
+    "luahyphenrules"
+    "luaimageembed"
+    "luaindex"
+    "luainputenc"
+    "luaintro"
+    "luakeys"
+    "lualatex-doc"
+    "lualatex-math"
+    "lualatex-truncate"
+    "lualibs"
+    "luamathalign"
+    "luamodulartables"
+    "luamplib"
+    "luaoptions"
+    "luaotfload"
+    "luapackageloader"
+    "luaprogtable"
+    "luaquotes"
+    "luarandom"
+    "luatex85"
+    "luatexbase"
+    "luatexko"
+    "luatextra"
+    "luatruthtable"
+    "luavlna"
+    "luaxml"
+    "lutabulartools"
+    "minim"
+    "minim-math"
+    "minim-mp"
+    "minim-pdf"
+    "minim-xmp"
+    "newpax"
+    "nodetree"
+    "odsfile"
+    "optex"
+    "pdfarticle"
+    "pdfextra"
+    "penlight"
+    "piton"
+    "placeat"
+    "plantuml"
+    "pyluatex"
+    "scikgtex"
+    "selnolig"
+    "showhyphenation"
+    "showkerning"
+    "spacekern"
+    "spelling"
+    "stricttex"
+    "truthtable"
+    "tsvtemplate"
+    "typewriter"
+    "uninormalize"
+    "yamlvars"
+  ];
   sha512.run = "44e1041adf14954f5da71342247dd8863057ff52db1a05525c01caa87a4f27084580aab0b375c96bdb05e4ab718afebfdd2254146ed1cd69b2abccfa975e0330";
 };
 "collection-mathscience" = {
   revision = 65312;
   stripPrefix = 0;
-  deps."12many" = tl."12many";
-  deps."accents" = tl."accents";
-  deps."alg" = tl."alg";
-  deps."algobox" = tl."algobox";
-  deps."algorithm2e" = tl."algorithm2e";
-  deps."algorithmicx" = tl."algorithmicx";
-  deps."algorithms" = tl."algorithms";
-  deps."algpseudocodex" = tl."algpseudocodex";
-  deps."algxpar" = tl."algxpar";
-  deps."aligned-overset" = tl."aligned-overset";
-  deps."amscdx" = tl."amscdx";
-  deps."amstex" = tl."amstex";
-  deps."annotate-equations" = tl."annotate-equations";
-  deps."apxproof" = tl."apxproof";
-  deps."autobreak" = tl."autobreak";
-  deps."axodraw2" = tl."axodraw2";
-  deps."backnaur" = tl."backnaur";
-  deps."begriff" = tl."begriff";
-  deps."binomexp" = tl."binomexp";
-  deps."biocon" = tl."biocon";
-  deps."bitpattern" = tl."bitpattern";
-  deps."bodeplot" = tl."bodeplot";
-  deps."bohr" = tl."bohr";
-  deps."boldtensors" = tl."boldtensors";
-  deps."bosisio" = tl."bosisio";
-  deps."bpchem" = tl."bpchem";
-  deps."bropd" = tl."bropd";
-  deps."bussproofs" = tl."bussproofs";
-  deps."bussproofs-extra" = tl."bussproofs-extra";
-  deps."bytefield" = tl."bytefield";
-  deps."calculation" = tl."calculation";
-  deps."cartonaugh" = tl."cartonaugh";
-  deps."cascade" = tl."cascade";
-  deps."causets" = tl."causets";
-  deps."ccfonts" = tl."ccfonts";
-  deps."ccool" = tl."ccool";
-  deps."chemarrow" = tl."chemarrow";
-  deps."chemcompounds" = tl."chemcompounds";
-  deps."chemcono" = tl."chemcono";
-  deps."chemexec" = tl."chemexec";
-  deps."chemformula" = tl."chemformula";
-  deps."chemgreek" = tl."chemgreek";
-  deps."chemmacros" = tl."chemmacros";
-  deps."chemnum" = tl."chemnum";
-  deps."chemobabel" = tl."chemobabel";
-  deps."chemplants" = tl."chemplants";
-  deps."chemschemex" = tl."chemschemex";
-  deps."chemsec" = tl."chemsec";
-  deps."chemstyle" = tl."chemstyle";
-  deps."clrscode" = tl."clrscode";
-  deps."clrscode3e" = tl."clrscode3e";
-  deps."codeanatomy" = tl."codeanatomy";
-  deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
-  deps."collection-latex" = tl."collection-latex";
-  deps."commath" = tl."commath";
-  deps."commutative-diagrams" = tl."commutative-diagrams";
-  deps."complexity" = tl."complexity";
-  deps."computational-complexity" = tl."computational-complexity";
-  deps."concmath" = tl."concmath";
-  deps."concrete" = tl."concrete";
-  deps."conteq" = tl."conteq";
-  deps."correctmathalign" = tl."correctmathalign";
-  deps."cryptocode" = tl."cryptocode";
-  deps."csassignments" = tl."csassignments";
-  deps."cvss" = tl."cvss";
-  deps."decision-table" = tl."decision-table";
-  deps."delim" = tl."delim";
-  deps."delimseasy" = tl."delimseasy";
-  deps."delimset" = tl."delimset";
-  deps."derivative" = tl."derivative";
-  deps."diffcoeff" = tl."diffcoeff";
-  deps."digiconfigs" = tl."digiconfigs";
-  deps."dijkstra" = tl."dijkstra";
-  deps."drawmatrix" = tl."drawmatrix";
-  deps."drawstack" = tl."drawstack";
-  deps."dyntree" = tl."dyntree";
-  deps."easing" = tl."easing";
-  deps."ebproof" = tl."ebproof";
-  deps."econometrics" = tl."econometrics";
-  deps."eltex" = tl."eltex";
-  deps."emf" = tl."emf";
-  deps."endiagram" = tl."endiagram";
-  deps."engtlc" = tl."engtlc";
-  deps."eolang" = tl."eolang";
-  deps."eqexpl" = tl."eqexpl";
-  deps."eqnarray" = tl."eqnarray";
-  deps."eqnnumwarn" = tl."eqnnumwarn";
-  deps."euclideangeometry" = tl."euclideangeometry";
-  deps."extarrows" = tl."extarrows";
-  deps."extpfeil" = tl."extpfeil";
-  deps."faktor" = tl."faktor";
-  deps."fascicules" = tl."fascicules";
-  deps."fixdif" = tl."fixdif";
-  deps."fixmath" = tl."fixmath";
-  deps."fnspe" = tl."fnspe";
-  deps."formal-grammar" = tl."formal-grammar";
-  deps."fouridx" = tl."fouridx";
-  deps."functan" = tl."functan";
-  deps."galois" = tl."galois";
-  deps."gastex" = tl."gastex";
-  deps."gene-logic" = tl."gene-logic";
-  deps."ghsystem" = tl."ghsystem";
-  deps."glosmathtools" = tl."glosmathtools";
-  deps."gotoh" = tl."gotoh";
-  deps."grundgesetze" = tl."grundgesetze";
-  deps."gu" = tl."gu";
-  deps."helmholtz-ellis-ji-notation" = tl."helmholtz-ellis-ji-notation";
-  deps."hep" = tl."hep";
-  deps."hep-reference" = tl."hep-reference";
-  deps."hepnames" = tl."hepnames";
-  deps."hepparticles" = tl."hepparticles";
-  deps."hepthesis" = tl."hepthesis";
-  deps."hepunits" = tl."hepunits";
-  deps."ibrackets" = tl."ibrackets";
-  deps."includernw" = tl."includernw";
-  deps."interval" = tl."interval";
-  deps."ionumbers" = tl."ionumbers";
-  deps."isomath" = tl."isomath";
-  deps."jkmath" = tl."jkmath";
-  deps."jupynotex" = tl."jupynotex";
-  deps."karnaugh" = tl."karnaugh";
-  deps."karnaugh-map" = tl."karnaugh-map";
-  deps."karnaughmap" = tl."karnaughmap";
-  deps."kvmap" = tl."kvmap";
-  deps."letterswitharrows" = tl."letterswitharrows";
-  deps."lie-hasse" = tl."lie-hasse";
-  deps."logicproof" = tl."logicproof";
-  deps."longdivision" = tl."longdivision";
-  deps."lpform" = tl."lpform";
-  deps."lplfitch" = tl."lplfitch";
-  deps."lstbayes" = tl."lstbayes";
-  deps."mathcommand" = tl."mathcommand";
-  deps."mathcomp" = tl."mathcomp";
-  deps."mathfixs" = tl."mathfixs";
-  deps."mathlig" = tl."mathlig";
-  deps."mathpartir" = tl."mathpartir";
-  deps."mathpunctspace" = tl."mathpunctspace";
-  deps."mathsemantics" = tl."mathsemantics";
-  deps."matlab-prettifier" = tl."matlab-prettifier";
-  deps."matrix-skeleton" = tl."matrix-skeleton";
-  deps."mattens" = tl."mattens";
-  deps."mecaso" = tl."mecaso";
-  deps."membranecomputing" = tl."membranecomputing";
-  deps."memorygraphs" = tl."memorygraphs";
-  deps."messagepassing" = tl."messagepassing";
-  deps."mgltex" = tl."mgltex";
-  deps."mhchem" = tl."mhchem";
-  deps."mhequ" = tl."mhequ";
-  deps."miller" = tl."miller";
-  deps."mismath" = tl."mismath";
-  deps."multiobjective" = tl."multiobjective";
-  deps."namedtensor" = tl."namedtensor";
-  deps."natded" = tl."natded";
-  deps."nath" = tl."nath";
-  deps."nchairx" = tl."nchairx";
-  deps."nicematrix" = tl."nicematrix";
-  deps."nuc" = tl."nuc";
-  deps."nucleardata" = tl."nucleardata";
-  deps."numerica" = tl."numerica";
-  deps."numerica-plus" = tl."numerica-plus";
-  deps."numerica-tables" = tl."numerica-tables";
-  deps."objectz" = tl."objectz";
-  deps."oplotsymbl" = tl."oplotsymbl";
-  deps."ot-tableau" = tl."ot-tableau";
-  deps."oubraces" = tl."oubraces";
-  deps."pascaltriangle" = tl."pascaltriangle";
-  deps."perfectcut" = tl."perfectcut";
-  deps."pfdicons" = tl."pfdicons";
-  deps."physconst" = tl."physconst";
-  deps."physics" = tl."physics";
-  deps."physunits" = tl."physunits";
-  deps."pinoutikz" = tl."pinoutikz";
-  deps."pm-isomath" = tl."pm-isomath";
-  deps."polexpr" = tl."polexpr";
-  deps."prftree" = tl."prftree";
-  deps."principia" = tl."principia";
-  deps."proba" = tl."proba";
-  deps."proof-at-the-end" = tl."proof-at-the-end";
-  deps."prooftrees" = tl."prooftrees";
-  deps."pseudo" = tl."pseudo";
-  deps."pseudocode" = tl."pseudocode";
-  deps."pythonhighlight" = tl."pythonhighlight";
-  deps."qsharp" = tl."qsharp";
-  deps."rank-2-roots" = tl."rank-2-roots";
-  deps."rbt-mathnotes" = tl."rbt-mathnotes";
-  deps."rec-thy" = tl."rec-thy";
-  deps."rest-api" = tl."rest-api";
-  deps."revquantum" = tl."revquantum";
-  deps."ribbonproofs" = tl."ribbonproofs";
-  deps."rmathbr" = tl."rmathbr";
-  deps."sankey" = tl."sankey";
-  deps."sasnrdisplay" = tl."sasnrdisplay";
-  deps."sciposter" = tl."sciposter";
-  deps."sclang-prettifier" = tl."sclang-prettifier";
-  deps."scratchx" = tl."scratchx";
-  deps."sesamanuel" = tl."sesamanuel";
-  deps."sfg" = tl."sfg";
-  deps."shuffle" = tl."shuffle";
-  deps."simplebnf" = tl."simplebnf";
-  deps."simpler-wick" = tl."simpler-wick";
-  deps."simples-matrices" = tl."simples-matrices";
-  deps."simplewick" = tl."simplewick";
-  deps."sistyle" = tl."sistyle";
-  deps."siunits" = tl."siunits";
-  deps."siunitx" = tl."siunitx";
-  deps."skmath" = tl."skmath";
-  deps."spalign" = tl."spalign";
-  deps."spbmark" = tl."spbmark";
-  deps."stanli" = tl."stanli";
-  deps."statex" = tl."statex";
-  deps."statex2" = tl."statex2";
-  deps."statistics" = tl."statistics";
-  deps."statistik" = tl."statistik";
-  deps."statmath" = tl."statmath";
-  deps."steinmetz" = tl."steinmetz";
-  deps."stmaryrd" = tl."stmaryrd";
-  deps."structmech" = tl."structmech";
-  deps."struktex" = tl."struktex";
-  deps."substances" = tl."substances";
-  deps."subsupscripts" = tl."subsupscripts";
-  deps."subtext" = tl."subtext";
-  deps."susy" = tl."susy";
-  deps."syllogism" = tl."syllogism";
-  deps."sympytexpackage" = tl."sympytexpackage";
-  deps."synproof" = tl."synproof";
-  deps."t-angles" = tl."t-angles";
-  deps."tablor" = tl."tablor";
-  deps."tensind" = tl."tensind";
-  deps."tensor" = tl."tensor";
-  deps."tex-ewd" = tl."tex-ewd";
-  deps."textgreek" = tl."textgreek";
-  deps."textopo" = tl."textopo";
-  deps."thermodynamics" = tl."thermodynamics";
-  deps."thmbox" = tl."thmbox";
-  deps."tiscreen" = tl."tiscreen";
-  deps."turnstile" = tl."turnstile";
-  deps."ulqda" = tl."ulqda";
-  deps."unitsdef" = tl."unitsdef";
-  deps."venn" = tl."venn";
-  deps."witharrows" = tl."witharrows";
-  deps."xymtex" = tl."xymtex";
-  deps."yhmath" = tl."yhmath";
-  deps."youngtab" = tl."youngtab";
-  deps."yquant" = tl."yquant";
-  deps."ytableau" = tl."ytableau";
-  deps."zx-calculus" = tl."zx-calculus";
+  deps = [
+    "12many"
+    "accents"
+    "alg"
+    "algobox"
+    "algorithm2e"
+    "algorithmicx"
+    "algorithms"
+    "algpseudocodex"
+    "algxpar"
+    "aligned-overset"
+    "amscdx"
+    "amstex"
+    "annotate-equations"
+    "apxproof"
+    "autobreak"
+    "axodraw2"
+    "backnaur"
+    "begriff"
+    "binomexp"
+    "biocon"
+    "bitpattern"
+    "bodeplot"
+    "bohr"
+    "boldtensors"
+    "bosisio"
+    "bpchem"
+    "bropd"
+    "bussproofs"
+    "bussproofs-extra"
+    "bytefield"
+    "calculation"
+    "cartonaugh"
+    "cascade"
+    "causets"
+    "ccfonts"
+    "ccool"
+    "chemarrow"
+    "chemcompounds"
+    "chemcono"
+    "chemexec"
+    "chemformula"
+    "chemgreek"
+    "chemmacros"
+    "chemnum"
+    "chemobabel"
+    "chemplants"
+    "chemschemex"
+    "chemsec"
+    "chemstyle"
+    "clrscode"
+    "clrscode3e"
+    "codeanatomy"
+    "collection-fontsrecommended"
+    "collection-latex"
+    "commath"
+    "commutative-diagrams"
+    "complexity"
+    "computational-complexity"
+    "concmath"
+    "concrete"
+    "conteq"
+    "correctmathalign"
+    "cryptocode"
+    "csassignments"
+    "cvss"
+    "decision-table"
+    "delim"
+    "delimseasy"
+    "delimset"
+    "derivative"
+    "diffcoeff"
+    "digiconfigs"
+    "dijkstra"
+    "drawmatrix"
+    "drawstack"
+    "dyntree"
+    "easing"
+    "ebproof"
+    "econometrics"
+    "eltex"
+    "emf"
+    "endiagram"
+    "engtlc"
+    "eolang"
+    "eqexpl"
+    "eqnarray"
+    "eqnnumwarn"
+    "euclideangeometry"
+    "extarrows"
+    "extpfeil"
+    "faktor"
+    "fascicules"
+    "fixdif"
+    "fixmath"
+    "fnspe"
+    "formal-grammar"
+    "fouridx"
+    "functan"
+    "galois"
+    "gastex"
+    "gene-logic"
+    "ghsystem"
+    "glosmathtools"
+    "gotoh"
+    "grundgesetze"
+    "gu"
+    "helmholtz-ellis-ji-notation"
+    "hep"
+    "hep-reference"
+    "hepnames"
+    "hepparticles"
+    "hepthesis"
+    "hepunits"
+    "ibrackets"
+    "includernw"
+    "interval"
+    "ionumbers"
+    "isomath"
+    "jkmath"
+    "jupynotex"
+    "karnaugh"
+    "karnaugh-map"
+    "karnaughmap"
+    "kvmap"
+    "letterswitharrows"
+    "lie-hasse"
+    "logicproof"
+    "longdivision"
+    "lpform"
+    "lplfitch"
+    "lstbayes"
+    "mathcommand"
+    "mathcomp"
+    "mathfixs"
+    "mathlig"
+    "mathpartir"
+    "mathpunctspace"
+    "mathsemantics"
+    "matlab-prettifier"
+    "matrix-skeleton"
+    "mattens"
+    "mecaso"
+    "membranecomputing"
+    "memorygraphs"
+    "messagepassing"
+    "mgltex"
+    "mhchem"
+    "mhequ"
+    "miller"
+    "mismath"
+    "multiobjective"
+    "namedtensor"
+    "natded"
+    "nath"
+    "nchairx"
+    "nicematrix"
+    "nuc"
+    "nucleardata"
+    "numerica"
+    "numerica-plus"
+    "numerica-tables"
+    "objectz"
+    "oplotsymbl"
+    "ot-tableau"
+    "oubraces"
+    "pascaltriangle"
+    "perfectcut"
+    "pfdicons"
+    "physconst"
+    "physics"
+    "physunits"
+    "pinoutikz"
+    "pm-isomath"
+    "polexpr"
+    "prftree"
+    "principia"
+    "proba"
+    "proof-at-the-end"
+    "prooftrees"
+    "pseudo"
+    "pseudocode"
+    "pythonhighlight"
+    "qsharp"
+    "rank-2-roots"
+    "rbt-mathnotes"
+    "rec-thy"
+    "rest-api"
+    "revquantum"
+    "ribbonproofs"
+    "rmathbr"
+    "sankey"
+    "sasnrdisplay"
+    "sciposter"
+    "sclang-prettifier"
+    "scratchx"
+    "sesamanuel"
+    "sfg"
+    "shuffle"
+    "simplebnf"
+    "simpler-wick"
+    "simples-matrices"
+    "simplewick"
+    "sistyle"
+    "siunits"
+    "siunitx"
+    "skmath"
+    "spalign"
+    "spbmark"
+    "stanli"
+    "statex"
+    "statex2"
+    "statistics"
+    "statistik"
+    "statmath"
+    "steinmetz"
+    "stmaryrd"
+    "structmech"
+    "struktex"
+    "substances"
+    "subsupscripts"
+    "subtext"
+    "susy"
+    "syllogism"
+    "sympytexpackage"
+    "synproof"
+    "t-angles"
+    "tablor"
+    "tensind"
+    "tensor"
+    "tex-ewd"
+    "textgreek"
+    "textopo"
+    "thermodynamics"
+    "thmbox"
+    "tiscreen"
+    "turnstile"
+    "ulqda"
+    "unitsdef"
+    "venn"
+    "witharrows"
+    "xymtex"
+    "yhmath"
+    "youngtab"
+    "yquant"
+    "ytableau"
+    "zx-calculus"
+  ];
   sha512.run = "30620c4a12471f0b880cb45857c52e2540984852c5f17753ef5dde259e92224fcad2f1c3dcae357c8475aacf4552b6704a67e99331edc073ffbd595e47a533b1";
 };
 "collection-metapost" = {
   revision = 64878;
   stripPrefix = 0;
-  deps."automata" = tl."automata";
-  deps."bbcard" = tl."bbcard";
-  deps."blockdraw_mp" = tl."blockdraw_mp";
-  deps."bpolynomial" = tl."bpolynomial";
-  deps."cmarrows" = tl."cmarrows";
-  deps."collection-basic" = tl."collection-basic";
-  deps."drv" = tl."drv";
-  deps."dviincl" = tl."dviincl";
-  deps."emp" = tl."emp";
-  deps."epsincl" = tl."epsincl";
-  deps."expressg" = tl."expressg";
-  deps."exteps" = tl."exteps";
-  deps."featpost" = tl."featpost";
-  deps."feynmf" = tl."feynmf";
-  deps."feynmp-auto" = tl."feynmp-auto";
-  deps."fiziko" = tl."fiziko";
-  deps."garrigues" = tl."garrigues";
-  deps."gmp" = tl."gmp";
-  deps."hatching" = tl."hatching";
-  deps."hershey-mp" = tl."hershey-mp";
-  deps."latexmp" = tl."latexmp";
-  deps."mcf2graph" = tl."mcf2graph";
-  deps."metago" = tl."metago";
-  deps."metaobj" = tl."metaobj";
-  deps."metaplot" = tl."metaplot";
-  deps."metapost" = tl."metapost";
-  deps."metapost-colorbrewer" = tl."metapost-colorbrewer";
-  deps."metauml" = tl."metauml";
-  deps."mfpic" = tl."mfpic";
-  deps."mfpic4ode" = tl."mfpic4ode";
-  deps."minim-hatching" = tl."minim-hatching";
-  deps."mp3d" = tl."mp3d";
-  deps."mparrows" = tl."mparrows";
-  deps."mpattern" = tl."mpattern";
-  deps."mpcolornames" = tl."mpcolornames";
-  deps."mpgraphics" = tl."mpgraphics";
-  deps."mptrees" = tl."mptrees";
-  deps."piechartmp" = tl."piechartmp";
-  deps."repere" = tl."repere";
-  deps."roex" = tl."roex";
-  deps."roundrect" = tl."roundrect";
-  deps."shapes" = tl."shapes";
-  deps."slideshow" = tl."slideshow";
-  deps."splines" = tl."splines";
-  deps."suanpan" = tl."suanpan";
-  deps."textpath" = tl."textpath";
-  deps."threeddice" = tl."threeddice";
+  deps = [
+    "automata"
+    "bbcard"
+    "blockdraw_mp"
+    "bpolynomial"
+    "cmarrows"
+    "collection-basic"
+    "drv"
+    "dviincl"
+    "emp"
+    "epsincl"
+    "expressg"
+    "exteps"
+    "featpost"
+    "feynmf"
+    "feynmp-auto"
+    "fiziko"
+    "garrigues"
+    "gmp"
+    "hatching"
+    "hershey-mp"
+    "latexmp"
+    "mcf2graph"
+    "metago"
+    "metaobj"
+    "metaplot"
+    "metapost"
+    "metapost-colorbrewer"
+    "metauml"
+    "mfpic"
+    "mfpic4ode"
+    "minim-hatching"
+    "mp3d"
+    "mparrows"
+    "mpattern"
+    "mpcolornames"
+    "mpgraphics"
+    "mptrees"
+    "piechartmp"
+    "repere"
+    "roex"
+    "roundrect"
+    "shapes"
+    "slideshow"
+    "splines"
+    "suanpan"
+    "textpath"
+    "threeddice"
+  ];
   sha512.run = "c17510f676b4aec1887893083e00438be77d879e44e52aedeb040ae1eb593d1d688fefc8eaa48939db0f83e8d1743cea3030490e73d8c3d65689b3e4db21f016";
 };
 "collection-music" = {
   revision = 64966;
   stripPrefix = 0;
-  deps."abc" = tl."abc";
-  deps."autosp" = tl."autosp";
-  deps."bagpipe" = tl."bagpipe";
-  deps."chordbars" = tl."chordbars";
-  deps."chordbox" = tl."chordbox";
-  deps."collection-latex" = tl."collection-latex";
-  deps."ddphonism" = tl."ddphonism";
-  deps."figbas" = tl."figbas";
-  deps."gchords" = tl."gchords";
-  deps."gregoriotex" = tl."gregoriotex";
-  deps."gtrcrd" = tl."gtrcrd";
-  deps."guitar" = tl."guitar";
-  deps."guitarchordschemes" = tl."guitarchordschemes";
-  deps."guitartabs" = tl."guitartabs";
-  deps."harmony" = tl."harmony";
-  deps."latex4musicians" = tl."latex4musicians";
-  deps."leadsheets" = tl."leadsheets";
-  deps."lilyglyphs" = tl."lilyglyphs";
-  deps."lyluatex" = tl."lyluatex";
-  deps."m-tx" = tl."m-tx";
-  deps."musical" = tl."musical";
-  deps."musicography" = tl."musicography";
-  deps."musixguit" = tl."musixguit";
-  deps."musixtex" = tl."musixtex";
-  deps."musixtex-fonts" = tl."musixtex-fonts";
-  deps."musixtnt" = tl."musixtnt";
-  deps."octave" = tl."octave";
-  deps."piano" = tl."piano";
-  deps."pmx" = tl."pmx";
-  deps."pmxchords" = tl."pmxchords";
-  deps."songbook" = tl."songbook";
-  deps."songproj" = tl."songproj";
-  deps."songs" = tl."songs";
-  deps."xml2pmx" = tl."xml2pmx";
-  deps."xpiano" = tl."xpiano";
+  deps = [
+    "abc"
+    "autosp"
+    "bagpipe"
+    "chordbars"
+    "chordbox"
+    "collection-latex"
+    "ddphonism"
+    "figbas"
+    "gchords"
+    "gregoriotex"
+    "gtrcrd"
+    "guitar"
+    "guitarchordschemes"
+    "guitartabs"
+    "harmony"
+    "latex4musicians"
+    "leadsheets"
+    "lilyglyphs"
+    "lyluatex"
+    "m-tx"
+    "musical"
+    "musicography"
+    "musixguit"
+    "musixtex"
+    "musixtex-fonts"
+    "musixtnt"
+    "octave"
+    "piano"
+    "pmx"
+    "pmxchords"
+    "songbook"
+    "songproj"
+    "songs"
+    "xml2pmx"
+    "xpiano"
+  ];
   sha512.run = "5d416eca3382c36a869959d850de6ffb4606c1a15c5adeae2ed0f8800c4a95cb068b4fbacb8d835ba4b0b4880b05f603b4e0ba36b98e357ec5ba637d0fb59100";
 };
 "collection-pictures" = {
   revision = 65359;
   stripPrefix = 0;
-  deps."adigraph" = tl."adigraph";
-  deps."aobs-tikz" = tl."aobs-tikz";
-  deps."askmaps" = tl."askmaps";
-  deps."asyfig" = tl."asyfig";
-  deps."asypictureb" = tl."asypictureb";
-  deps."autoarea" = tl."autoarea";
-  deps."bardiag" = tl."bardiag";
-  deps."beamerswitch" = tl."beamerswitch";
-  deps."binarytree" = tl."binarytree";
-  deps."blochsphere" = tl."blochsphere";
-  deps."bloques" = tl."bloques";
-  deps."blox" = tl."blox";
-  deps."bodegraph" = tl."bodegraph";
-  deps."bondgraph" = tl."bondgraph";
-  deps."bondgraphs" = tl."bondgraphs";
-  deps."braids" = tl."braids";
-  deps."bxeepic" = tl."bxeepic";
-  deps."byo-twemojis" = tl."byo-twemojis";
-  deps."byrne" = tl."byrne";
-  deps."cachepic" = tl."cachepic";
-  deps."callouts" = tl."callouts";
-  deps."celtic" = tl."celtic";
-  deps."chemfig" = tl."chemfig";
-  deps."circuit-macros" = tl."circuit-macros";
-  deps."circuitikz" = tl."circuitikz";
-  deps."coffeestains" = tl."coffeestains";
-  deps."collection-basic" = tl."collection-basic";
-  deps."combinedgraphics" = tl."combinedgraphics";
-  deps."curve" = tl."curve";
-  deps."curve2e" = tl."curve2e";
-  deps."curves" = tl."curves";
-  deps."dcpic" = tl."dcpic";
-  deps."diagmac2" = tl."diagmac2";
-  deps."ditaa" = tl."ditaa";
-  deps."doc-pictex" = tl."doc-pictex";
-  deps."dot2texi" = tl."dot2texi";
-  deps."dottex" = tl."dottex";
-  deps."dpcircling" = tl."dpcircling";
-  deps."dratex" = tl."dratex";
-  deps."drs" = tl."drs";
-  deps."duotenzor" = tl."duotenzor";
-  deps."dynkin-diagrams" = tl."dynkin-diagrams";
-  deps."ecgdraw" = tl."ecgdraw";
-  deps."eepic" = tl."eepic";
-  deps."ellipse" = tl."ellipse";
-  deps."endofproofwd" = tl."endofproofwd";
-  deps."epspdf" = tl."epspdf";
-  deps."epspdfconversion" = tl."epspdfconversion";
-  deps."esk" = tl."esk";
-  deps."euflag" = tl."euflag";
-  deps."fast-diagram" = tl."fast-diagram";
-  deps."fig4latex" = tl."fig4latex";
-  deps."figchild" = tl."figchild";
-  deps."figput" = tl."figput";
-  deps."fitbox" = tl."fitbox";
-  deps."flowchart" = tl."flowchart";
-  deps."forest" = tl."forest";
-  deps."genealogytree" = tl."genealogytree";
-  deps."getmap" = tl."getmap";
-  deps."gincltex" = tl."gincltex";
-  deps."gnuplottex" = tl."gnuplottex";
-  deps."gradientframe" = tl."gradientframe";
-  deps."grafcet" = tl."grafcet";
-  deps."graph35" = tl."graph35";
-  deps."graphicxpsd" = tl."graphicxpsd";
-  deps."graphviz" = tl."graphviz";
-  deps."gtrlib-largetrees" = tl."gtrlib-largetrees";
-  deps."harveyballs" = tl."harveyballs";
-  deps."here" = tl."here";
-  deps."hf-tikz" = tl."hf-tikz";
-  deps."hobby" = tl."hobby";
-  deps."hvfloat" = tl."hvfloat";
-  deps."istgame" = tl."istgame";
-  deps."kblocks" = tl."kblocks";
-  deps."kinematikz" = tl."kinematikz";
-  deps."knitting" = tl."knitting";
-  deps."knittingpattern" = tl."knittingpattern";
-  deps."ladder" = tl."ladder";
-  deps."lapdf" = tl."lapdf";
-  deps."latex-make" = tl."latex-make";
-  deps."liftarm" = tl."liftarm";
-  deps."lpic" = tl."lpic";
-  deps."lroundrect" = tl."lroundrect";
-  deps."luamesh" = tl."luamesh";
-  deps."luasseq" = tl."luasseq";
-  deps."maker" = tl."maker";
-  deps."makeshape" = tl."makeshape";
-  deps."mathspic" = tl."mathspic";
-  deps."mercatormap" = tl."mercatormap";
-  deps."milsymb" = tl."milsymb";
-  deps."miniplot" = tl."miniplot";
-  deps."mkpic" = tl."mkpic";
-  deps."modiagram" = tl."modiagram";
-  deps."neuralnetwork" = tl."neuralnetwork";
-  deps."nl-interval" = tl."nl-interval";
-  deps."nndraw" = tl."nndraw";
-  deps."numericplots" = tl."numericplots";
-  deps."pb-diagram" = tl."pb-diagram";
-  deps."penrose" = tl."penrose";
-  deps."petri-nets" = tl."petri-nets";
-  deps."pgf" = tl."pgf";
-  deps."pgf-blur" = tl."pgf-blur";
-  deps."pgf-cmykshadings" = tl."pgf-cmykshadings";
-  deps."pgf-interference" = tl."pgf-interference";
-  deps."pgf-periodictable" = tl."pgf-periodictable";
-  deps."pgf-pie" = tl."pgf-pie";
-  deps."pgf-soroban" = tl."pgf-soroban";
-  deps."pgf-spectra" = tl."pgf-spectra";
-  deps."pgf-umlcd" = tl."pgf-umlcd";
-  deps."pgf-umlsd" = tl."pgf-umlsd";
-  deps."pgfgantt" = tl."pgfgantt";
-  deps."pgfkeyx" = tl."pgfkeyx";
-  deps."pgfmolbio" = tl."pgfmolbio";
-  deps."pgfmorepages" = tl."pgfmorepages";
-  deps."pgfopts" = tl."pgfopts";
-  deps."pgfornament" = tl."pgfornament";
-  deps."pgfplots" = tl."pgfplots";
-  deps."picinpar" = tl."picinpar";
-  deps."pict2e" = tl."pict2e";
-  deps."pictex" = tl."pictex";
-  deps."pictex2" = tl."pictex2";
-  deps."pinlabel" = tl."pinlabel";
-  deps."pixelart" = tl."pixelart";
-  deps."pmgraph" = tl."pmgraph";
-  deps."postage" = tl."postage";
-  deps."prerex" = tl."prerex";
-  deps."productbox" = tl."productbox";
-  deps."ptolemaicastronomy" = tl."ptolemaicastronomy";
-  deps."puyotikz" = tl."puyotikz";
-  deps."pxpgfmark" = tl."pxpgfmark";
-  deps."pxpic" = tl."pxpic";
-  deps."qcircuit" = tl."qcircuit";
-  deps."qrcode" = tl."qrcode";
-  deps."quantikz" = tl."quantikz";
-  deps."randbild" = tl."randbild";
-  deps."randomwalk" = tl."randomwalk";
-  deps."realhats" = tl."realhats";
-  deps."reotex" = tl."reotex";
-  deps."robotarm" = tl."robotarm";
-  deps."rviewport" = tl."rviewport";
-  deps."sa-tikz" = tl."sa-tikz";
-  deps."schemabloc" = tl."schemabloc";
-  deps."scratch" = tl."scratch";
-  deps."scratch3" = tl."scratch3";
-  deps."scsnowman" = tl."scsnowman";
-  deps."setdeck" = tl."setdeck";
-  deps."signchart" = tl."signchart";
-  deps."simplenodes" = tl."simplenodes";
-  deps."simpleoptics" = tl."simpleoptics";
-  deps."smartdiagram" = tl."smartdiagram";
-  deps."spath3" = tl."spath3";
-  deps."spectralsequences" = tl."spectralsequences";
-  deps."strands" = tl."strands";
-  deps."swimgraf" = tl."swimgraf";
-  deps."syntaxdi" = tl."syntaxdi";
-  deps."table-fct" = tl."table-fct";
-  deps."texdraw" = tl."texdraw";
-  deps."ticollege" = tl."ticollege";
-  deps."tikz-3dplot" = tl."tikz-3dplot";
-  deps."tikz-among-us" = tl."tikz-among-us";
-  deps."tikz-bagua" = tl."tikz-bagua";
-  deps."tikz-bayesnet" = tl."tikz-bayesnet";
-  deps."tikz-bbox" = tl."tikz-bbox";
-  deps."tikz-cd" = tl."tikz-cd";
-  deps."tikz-dependency" = tl."tikz-dependency";
-  deps."tikz-dimline" = tl."tikz-dimline";
-  deps."tikz-ext" = tl."tikz-ext";
-  deps."tikz-feynhand" = tl."tikz-feynhand";
-  deps."tikz-feynman" = tl."tikz-feynman";
-  deps."tikz-imagelabels" = tl."tikz-imagelabels";
-  deps."tikz-inet" = tl."tikz-inet";
-  deps."tikz-kalender" = tl."tikz-kalender";
-  deps."tikz-karnaugh" = tl."tikz-karnaugh";
-  deps."tikz-ladder" = tl."tikz-ladder";
-  deps."tikz-lake-fig" = tl."tikz-lake-fig";
-  deps."tikz-layers" = tl."tikz-layers";
-  deps."tikz-mirror-lens" = tl."tikz-mirror-lens";
-  deps."tikz-nef" = tl."tikz-nef";
-  deps."tikz-network" = tl."tikz-network";
-  deps."tikz-opm" = tl."tikz-opm";
-  deps."tikz-optics" = tl."tikz-optics";
-  deps."tikz-page" = tl."tikz-page";
-  deps."tikz-palattice" = tl."tikz-palattice";
-  deps."tikz-planets" = tl."tikz-planets";
-  deps."tikz-qtree" = tl."tikz-qtree";
-  deps."tikz-relay" = tl."tikz-relay";
-  deps."tikz-sfc" = tl."tikz-sfc";
-  deps."tikz-swigs" = tl."tikz-swigs";
-  deps."tikz-timing" = tl."tikz-timing";
-  deps."tikz-trackschematic" = tl."tikz-trackschematic";
-  deps."tikz-truchet" = tl."tikz-truchet";
-  deps."tikzbricks" = tl."tikzbricks";
-  deps."tikzcodeblocks" = tl."tikzcodeblocks";
-  deps."tikzducks" = tl."tikzducks";
-  deps."tikzfill" = tl."tikzfill";
-  deps."tikzinclude" = tl."tikzinclude";
-  deps."tikzlings" = tl."tikzlings";
-  deps."tikzmark" = tl."tikzmark";
-  deps."tikzmarmots" = tl."tikzmarmots";
-  deps."tikzorbital" = tl."tikzorbital";
-  deps."tikzpackets" = tl."tikzpackets";
-  deps."tikzpagenodes" = tl."tikzpagenodes";
-  deps."tikzpeople" = tl."tikzpeople";
-  deps."tikzpfeile" = tl."tikzpfeile";
-  deps."tikzpingus" = tl."tikzpingus";
-  deps."tikzposter" = tl."tikzposter";
-  deps."tikzscale" = tl."tikzscale";
-  deps."tikzsymbols" = tl."tikzsymbols";
-  deps."tikztosvg" = tl."tikztosvg";
-  deps."tile-graphic" = tl."tile-graphic";
-  deps."timing-diagrams" = tl."timing-diagrams";
-  deps."tipfr" = tl."tipfr";
-  deps."tkz-base" = tl."tkz-base";
-  deps."tkz-berge" = tl."tkz-berge";
-  deps."tkz-doc" = tl."tkz-doc";
-  deps."tkz-euclide" = tl."tkz-euclide";
-  deps."tkz-fct" = tl."tkz-fct";
-  deps."tkz-graph" = tl."tkz-graph";
-  deps."tkz-orm" = tl."tkz-orm";
-  deps."tkz-tab" = tl."tkz-tab";
-  deps."tkzexample" = tl."tkzexample";
-  deps."tonevalue" = tl."tonevalue";
-  deps."tqft" = tl."tqft";
-  deps."tsemlines" = tl."tsemlines";
-  deps."tufte-latex" = tl."tufte-latex";
-  deps."twemojis" = tl."twemojis";
-  deps."tzplot" = tl."tzplot";
-  deps."utfsym" = tl."utfsym";
-  deps."venndiagram" = tl."venndiagram";
-  deps."visualpstricks" = tl."visualpstricks";
-  deps."wheelchart" = tl."wheelchart";
-  deps."worldflags" = tl."worldflags";
-  deps."xistercian" = tl."xistercian";
-  deps."xpicture" = tl."xpicture";
-  deps."xput" = tl."xput";
-  deps."xypic" = tl."xypic";
+  deps = [
+    "adigraph"
+    "aobs-tikz"
+    "askmaps"
+    "asyfig"
+    "asypictureb"
+    "autoarea"
+    "bardiag"
+    "beamerswitch"
+    "binarytree"
+    "blochsphere"
+    "bloques"
+    "blox"
+    "bodegraph"
+    "bondgraph"
+    "bondgraphs"
+    "braids"
+    "bxeepic"
+    "byo-twemojis"
+    "byrne"
+    "cachepic"
+    "callouts"
+    "celtic"
+    "chemfig"
+    "circuit-macros"
+    "circuitikz"
+    "coffeestains"
+    "collection-basic"
+    "combinedgraphics"
+    "curve"
+    "curve2e"
+    "curves"
+    "dcpic"
+    "diagmac2"
+    "ditaa"
+    "doc-pictex"
+    "dot2texi"
+    "dottex"
+    "dpcircling"
+    "dratex"
+    "drs"
+    "duotenzor"
+    "dynkin-diagrams"
+    "ecgdraw"
+    "eepic"
+    "ellipse"
+    "endofproofwd"
+    "epspdf"
+    "epspdfconversion"
+    "esk"
+    "euflag"
+    "fast-diagram"
+    "fig4latex"
+    "figchild"
+    "figput"
+    "fitbox"
+    "flowchart"
+    "forest"
+    "genealogytree"
+    "getmap"
+    "gincltex"
+    "gnuplottex"
+    "gradientframe"
+    "grafcet"
+    "graph35"
+    "graphicxpsd"
+    "graphviz"
+    "gtrlib-largetrees"
+    "harveyballs"
+    "here"
+    "hf-tikz"
+    "hobby"
+    "hvfloat"
+    "istgame"
+    "kblocks"
+    "kinematikz"
+    "knitting"
+    "knittingpattern"
+    "ladder"
+    "lapdf"
+    "latex-make"
+    "liftarm"
+    "lpic"
+    "lroundrect"
+    "luamesh"
+    "luasseq"
+    "maker"
+    "makeshape"
+    "mathspic"
+    "mercatormap"
+    "milsymb"
+    "miniplot"
+    "mkpic"
+    "modiagram"
+    "neuralnetwork"
+    "nl-interval"
+    "nndraw"
+    "numericplots"
+    "pb-diagram"
+    "penrose"
+    "petri-nets"
+    "pgf"
+    "pgf-blur"
+    "pgf-cmykshadings"
+    "pgf-interference"
+    "pgf-periodictable"
+    "pgf-pie"
+    "pgf-soroban"
+    "pgf-spectra"
+    "pgf-umlcd"
+    "pgf-umlsd"
+    "pgfgantt"
+    "pgfkeyx"
+    "pgfmolbio"
+    "pgfmorepages"
+    "pgfopts"
+    "pgfornament"
+    "pgfplots"
+    "picinpar"
+    "pict2e"
+    "pictex"
+    "pictex2"
+    "pinlabel"
+    "pixelart"
+    "pmgraph"
+    "postage"
+    "prerex"
+    "productbox"
+    "ptolemaicastronomy"
+    "puyotikz"
+    "pxpgfmark"
+    "pxpic"
+    "qcircuit"
+    "qrcode"
+    "quantikz"
+    "randbild"
+    "randomwalk"
+    "realhats"
+    "reotex"
+    "robotarm"
+    "rviewport"
+    "sa-tikz"
+    "schemabloc"
+    "scratch"
+    "scratch3"
+    "scsnowman"
+    "setdeck"
+    "signchart"
+    "simplenodes"
+    "simpleoptics"
+    "smartdiagram"
+    "spath3"
+    "spectralsequences"
+    "strands"
+    "swimgraf"
+    "syntaxdi"
+    "table-fct"
+    "texdraw"
+    "ticollege"
+    "tikz-3dplot"
+    "tikz-among-us"
+    "tikz-bagua"
+    "tikz-bayesnet"
+    "tikz-bbox"
+    "tikz-cd"
+    "tikz-dependency"
+    "tikz-dimline"
+    "tikz-ext"
+    "tikz-feynhand"
+    "tikz-feynman"
+    "tikz-imagelabels"
+    "tikz-inet"
+    "tikz-kalender"
+    "tikz-karnaugh"
+    "tikz-ladder"
+    "tikz-lake-fig"
+    "tikz-layers"
+    "tikz-mirror-lens"
+    "tikz-nef"
+    "tikz-network"
+    "tikz-opm"
+    "tikz-optics"
+    "tikz-page"
+    "tikz-palattice"
+    "tikz-planets"
+    "tikz-qtree"
+    "tikz-relay"
+    "tikz-sfc"
+    "tikz-swigs"
+    "tikz-timing"
+    "tikz-trackschematic"
+    "tikz-truchet"
+    "tikzbricks"
+    "tikzcodeblocks"
+    "tikzducks"
+    "tikzfill"
+    "tikzinclude"
+    "tikzlings"
+    "tikzmark"
+    "tikzmarmots"
+    "tikzorbital"
+    "tikzpackets"
+    "tikzpagenodes"
+    "tikzpeople"
+    "tikzpfeile"
+    "tikzpingus"
+    "tikzposter"
+    "tikzscale"
+    "tikzsymbols"
+    "tikztosvg"
+    "tile-graphic"
+    "timing-diagrams"
+    "tipfr"
+    "tkz-base"
+    "tkz-berge"
+    "tkz-doc"
+    "tkz-euclide"
+    "tkz-fct"
+    "tkz-graph"
+    "tkz-orm"
+    "tkz-tab"
+    "tkzexample"
+    "tonevalue"
+    "tqft"
+    "tsemlines"
+    "tufte-latex"
+    "twemojis"
+    "tzplot"
+    "utfsym"
+    "venndiagram"
+    "visualpstricks"
+    "wheelchart"
+    "worldflags"
+    "xistercian"
+    "xpicture"
+    "xput"
+    "xypic"
+  ];
   sha512.run = "cad55c99deb26ad1a6f12c60d5a7a0b35f250bad69f982e74163b9bbf027483104914989540c8169a05cdf0f5a853259c00c816ccddf858d0a970fc8b3eca9f9";
 };
 "collection-plaingeneric" = {
   revision = 65277;
   stripPrefix = 0;
-  deps."abbr" = tl."abbr";
-  deps."abstyles" = tl."abstyles";
-  deps."apnum" = tl."apnum";
-  deps."autoaligne" = tl."autoaligne";
-  deps."barr" = tl."barr";
-  deps."bitelist" = tl."bitelist";
-  deps."borceux" = tl."borceux";
-  deps."c-pascal" = tl."c-pascal";
-  deps."catcodes" = tl."catcodes";
-  deps."chronosys" = tl."chronosys";
-  deps."collection-basic" = tl."collection-basic";
-  deps."colorsep" = tl."colorsep";
-  deps."compare" = tl."compare";
-  deps."crossrefenum" = tl."crossrefenum";
-  deps."cweb-old" = tl."cweb-old";
-  deps."dinat" = tl."dinat";
-  deps."dirtree" = tl."dirtree";
-  deps."docbytex" = tl."docbytex";
-  deps."dowith" = tl."dowith";
-  deps."eijkhout" = tl."eijkhout";
-  deps."encxvlna" = tl."encxvlna";
-  deps."epigram" = tl."epigram";
-  deps."epsf" = tl."epsf";
-  deps."epsf-dvipdfmx" = tl."epsf-dvipdfmx";
-  deps."expex-acro" = tl."expex-acro";
-  deps."expkv" = tl."expkv";
-  deps."expkv-cs" = tl."expkv-cs";
-  deps."expkv-def" = tl."expkv-def";
-  deps."expkv-opt" = tl."expkv-opt";
-  deps."fenixpar" = tl."fenixpar";
-  deps."figflow" = tl."figflow";
-  deps."fixpdfmag" = tl."fixpdfmag";
-  deps."fltpoint" = tl."fltpoint";
-  deps."fntproof" = tl."fntproof";
-  deps."font-change" = tl."font-change";
-  deps."fontch" = tl."fontch";
-  deps."fontname" = tl."fontname";
-  deps."gates" = tl."gates";
-  deps."getoptk" = tl."getoptk";
-  deps."gfnotation" = tl."gfnotation";
-  deps."gobble" = tl."gobble";
-  deps."graphics-pln" = tl."graphics-pln";
-  deps."gtl" = tl."gtl";
-  deps."hlist" = tl."hlist";
-  deps."hyplain" = tl."hyplain";
-  deps."inputnormalization" = tl."inputnormalization";
-  deps."insbox" = tl."insbox";
-  deps."js-misc" = tl."js-misc";
-  deps."kastrup" = tl."kastrup";
-  deps."lambda-lists" = tl."lambda-lists";
-  deps."langcode" = tl."langcode";
-  deps."lecturer" = tl."lecturer";
-  deps."letterspacing" = tl."letterspacing";
-  deps."librarian" = tl."librarian";
-  deps."listofitems" = tl."listofitems";
-  deps."localloc" = tl."localloc";
-  deps."mathdots" = tl."mathdots";
-  deps."metatex" = tl."metatex";
-  deps."midnight" = tl."midnight";
-  deps."mkpattern" = tl."mkpattern";
-  deps."modulus" = tl."modulus";
-  deps."multido" = tl."multido";
-  deps."namedef" = tl."namedef";
-  deps."navigator" = tl."navigator";
-  deps."newsletr" = tl."newsletr";
-  deps."nth" = tl."nth";
-  deps."ofs" = tl."ofs";
-  deps."olsak-misc" = tl."olsak-misc";
-  deps."outerhbox" = tl."outerhbox";
-  deps."path" = tl."path";
-  deps."pdf-trans" = tl."pdf-trans";
-  deps."pdfmsym" = tl."pdfmsym";
-  deps."pitex" = tl."pitex";
-  deps."placeins-plain" = tl."placeins-plain";
-  deps."plainpkg" = tl."plainpkg";
-  deps."plipsum" = tl."plipsum";
-  deps."plnfss" = tl."plnfss";
-  deps."plstmary" = tl."plstmary";
-  deps."poormanlog" = tl."poormanlog";
-  deps."present" = tl."present";
-  deps."pwebmac" = tl."pwebmac";
-  deps."random" = tl."random";
-  deps."randomlist" = tl."randomlist";
-  deps."resumemac" = tl."resumemac";
-  deps."ruler" = tl."ruler";
-  deps."schemata" = tl."schemata";
-  deps."shade" = tl."shade";
-  deps."simplekv" = tl."simplekv";
-  deps."soul" = tl."soul";
-  deps."swrule" = tl."swrule";
-  deps."systeme" = tl."systeme";
-  deps."tabto-generic" = tl."tabto-generic";
-  deps."termmenu" = tl."termmenu";
-  deps."tex-ps" = tl."tex-ps";
-  deps."tex4ht" = tl."tex4ht";
-  deps."texapi" = tl."texapi";
-  deps."texdate" = tl."texdate";
-  deps."texdimens" = tl."texdimens";
-  deps."texinfo" = tl."texinfo";
-  deps."timetable" = tl."timetable";
-  deps."tracklang" = tl."tracklang";
-  deps."transparent-io" = tl."transparent-io";
-  deps."treetex" = tl."treetex";
-  deps."trigonometry" = tl."trigonometry";
-  deps."ulem" = tl."ulem";
-  deps."upca" = tl."upca";
-  deps."varisize" = tl."varisize";
-  deps."xii" = tl."xii";
-  deps."xii-lat" = tl."xii-lat";
-  deps."xintsession" = tl."xintsession";
-  deps."xlop" = tl."xlop";
-  deps."yax" = tl."yax";
-  deps."zztex" = tl."zztex";
+  deps = [
+    "abbr"
+    "abstyles"
+    "apnum"
+    "autoaligne"
+    "barr"
+    "bitelist"
+    "borceux"
+    "c-pascal"
+    "catcodes"
+    "chronosys"
+    "collection-basic"
+    "colorsep"
+    "compare"
+    "crossrefenum"
+    "cweb-old"
+    "dinat"
+    "dirtree"
+    "docbytex"
+    "dowith"
+    "eijkhout"
+    "encxvlna"
+    "epigram"
+    "epsf"
+    "epsf-dvipdfmx"
+    "expex-acro"
+    "expkv"
+    "expkv-cs"
+    "expkv-def"
+    "expkv-opt"
+    "fenixpar"
+    "figflow"
+    "fixpdfmag"
+    "fltpoint"
+    "fntproof"
+    "font-change"
+    "fontch"
+    "fontname"
+    "gates"
+    "getoptk"
+    "gfnotation"
+    "gobble"
+    "graphics-pln"
+    "gtl"
+    "hlist"
+    "hyplain"
+    "inputnormalization"
+    "insbox"
+    "js-misc"
+    "kastrup"
+    "lambda-lists"
+    "langcode"
+    "lecturer"
+    "letterspacing"
+    "librarian"
+    "listofitems"
+    "localloc"
+    "mathdots"
+    "metatex"
+    "midnight"
+    "mkpattern"
+    "modulus"
+    "multido"
+    "namedef"
+    "navigator"
+    "newsletr"
+    "nth"
+    "ofs"
+    "olsak-misc"
+    "outerhbox"
+    "path"
+    "pdf-trans"
+    "pdfmsym"
+    "pitex"
+    "placeins-plain"
+    "plainpkg"
+    "plipsum"
+    "plnfss"
+    "plstmary"
+    "poormanlog"
+    "present"
+    "pwebmac"
+    "random"
+    "randomlist"
+    "resumemac"
+    "ruler"
+    "schemata"
+    "shade"
+    "simplekv"
+    "soul"
+    "swrule"
+    "systeme"
+    "tabto-generic"
+    "termmenu"
+    "tex-ps"
+    "tex4ht"
+    "texapi"
+    "texdate"
+    "texdimens"
+    "texinfo"
+    "timetable"
+    "tracklang"
+    "transparent-io"
+    "treetex"
+    "trigonometry"
+    "ulem"
+    "upca"
+    "varisize"
+    "xii"
+    "xii-lat"
+    "xintsession"
+    "xlop"
+    "yax"
+    "zztex"
+  ];
   sha512.run = "6a6e3140f67c0903ba5a50cb0a127c3e64e0b9d0c55d2e732e5906ca6572f1122d8e79787da7c19326bfb4839782178f937775dc562b39fb9d11c8dac9c3b0bd";
 };
 "collection-pstricks" = {
   revision = 65367;
   stripPrefix = 0;
-  deps."auto-pst-pdf" = tl."auto-pst-pdf";
-  deps."bclogo" = tl."bclogo";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-plaingeneric" = tl."collection-plaingeneric";
-  deps."dsptricks" = tl."dsptricks";
-  deps."luapstricks" = tl."luapstricks";
-  deps."makeplot" = tl."makeplot";
-  deps."pdftricks" = tl."pdftricks";
-  deps."pdftricks2" = tl."pdftricks2";
-  deps."pedigree-perl" = tl."pedigree-perl";
-  deps."psbao" = tl."psbao";
-  deps."pst-2dplot" = tl."pst-2dplot";
-  deps."pst-3d" = tl."pst-3d";
-  deps."pst-3dplot" = tl."pst-3dplot";
-  deps."pst-abspos" = tl."pst-abspos";
-  deps."pst-am" = tl."pst-am";
-  deps."pst-antiprism" = tl."pst-antiprism";
-  deps."pst-arrow" = tl."pst-arrow";
-  deps."pst-asr" = tl."pst-asr";
-  deps."pst-bar" = tl."pst-bar";
-  deps."pst-barcode" = tl."pst-barcode";
-  deps."pst-bezier" = tl."pst-bezier";
-  deps."pst-blur" = tl."pst-blur";
-  deps."pst-bspline" = tl."pst-bspline";
-  deps."pst-calculate" = tl."pst-calculate";
-  deps."pst-calendar" = tl."pst-calendar";
-  deps."pst-cie" = tl."pst-cie";
-  deps."pst-circ" = tl."pst-circ";
-  deps."pst-coil" = tl."pst-coil";
-  deps."pst-contourplot" = tl."pst-contourplot";
-  deps."pst-cox" = tl."pst-cox";
-  deps."pst-dart" = tl."pst-dart";
-  deps."pst-dbicons" = tl."pst-dbicons";
-  deps."pst-diffraction" = tl."pst-diffraction";
-  deps."pst-electricfield" = tl."pst-electricfield";
-  deps."pst-eps" = tl."pst-eps";
-  deps."pst-eucl" = tl."pst-eucl";
-  deps."pst-exa" = tl."pst-exa";
-  deps."pst-feyn" = tl."pst-feyn";
-  deps."pst-fill" = tl."pst-fill";
-  deps."pst-fit" = tl."pst-fit";
-  deps."pst-flags" = tl."pst-flags";
-  deps."pst-fr3d" = tl."pst-fr3d";
-  deps."pst-fractal" = tl."pst-fractal";
-  deps."pst-fun" = tl."pst-fun";
-  deps."pst-func" = tl."pst-func";
-  deps."pst-gantt" = tl."pst-gantt";
-  deps."pst-geo" = tl."pst-geo";
-  deps."pst-geometrictools" = tl."pst-geometrictools";
-  deps."pst-gr3d" = tl."pst-gr3d";
-  deps."pst-grad" = tl."pst-grad";
-  deps."pst-graphicx" = tl."pst-graphicx";
-  deps."pst-hsb" = tl."pst-hsb";
-  deps."pst-infixplot" = tl."pst-infixplot";
-  deps."pst-intersect" = tl."pst-intersect";
-  deps."pst-jtree" = tl."pst-jtree";
-  deps."pst-knot" = tl."pst-knot";
-  deps."pst-labo" = tl."pst-labo";
-  deps."pst-layout" = tl."pst-layout";
-  deps."pst-lens" = tl."pst-lens";
-  deps."pst-light3d" = tl."pst-light3d";
-  deps."pst-lsystem" = tl."pst-lsystem";
-  deps."pst-magneticfield" = tl."pst-magneticfield";
-  deps."pst-marble" = tl."pst-marble";
-  deps."pst-math" = tl."pst-math";
-  deps."pst-mirror" = tl."pst-mirror";
-  deps."pst-moire" = tl."pst-moire";
-  deps."pst-node" = tl."pst-node";
-  deps."pst-ob3d" = tl."pst-ob3d";
-  deps."pst-ode" = tl."pst-ode";
-  deps."pst-optexp" = tl."pst-optexp";
-  deps."pst-optic" = tl."pst-optic";
-  deps."pst-osci" = tl."pst-osci";
-  deps."pst-ovl" = tl."pst-ovl";
-  deps."pst-pad" = tl."pst-pad";
-  deps."pst-pdf" = tl."pst-pdf";
-  deps."pst-pdgr" = tl."pst-pdgr";
-  deps."pst-perspective" = tl."pst-perspective";
-  deps."pst-platon" = tl."pst-platon";
-  deps."pst-plot" = tl."pst-plot";
-  deps."pst-poker" = tl."pst-poker";
-  deps."pst-poly" = tl."pst-poly";
-  deps."pst-pulley" = tl."pst-pulley";
-  deps."pst-qtree" = tl."pst-qtree";
-  deps."pst-rputover" = tl."pst-rputover";
-  deps."pst-rubans" = tl."pst-rubans";
-  deps."pst-shell" = tl."pst-shell";
-  deps."pst-sigsys" = tl."pst-sigsys";
-  deps."pst-slpe" = tl."pst-slpe";
-  deps."pst-solarsystem" = tl."pst-solarsystem";
-  deps."pst-solides3d" = tl."pst-solides3d";
-  deps."pst-soroban" = tl."pst-soroban";
-  deps."pst-spectra" = tl."pst-spectra";
-  deps."pst-spinner" = tl."pst-spinner";
-  deps."pst-stru" = tl."pst-stru";
-  deps."pst-support" = tl."pst-support";
-  deps."pst-text" = tl."pst-text";
-  deps."pst-thick" = tl."pst-thick";
-  deps."pst-tools" = tl."pst-tools";
-  deps."pst-tree" = tl."pst-tree";
-  deps."pst-turtle" = tl."pst-turtle";
-  deps."pst-tvz" = tl."pst-tvz";
-  deps."pst-uml" = tl."pst-uml";
-  deps."pst-vectorian" = tl."pst-vectorian";
-  deps."pst-vehicle" = tl."pst-vehicle";
-  deps."pst-venn" = tl."pst-venn";
-  deps."pst-vowel" = tl."pst-vowel";
-  deps."pst2pdf" = tl."pst2pdf";
-  deps."pstricks" = tl."pstricks";
-  deps."pstricks-add" = tl."pstricks-add";
-  deps."pstricks_calcnotes" = tl."pstricks_calcnotes";
-  deps."uml" = tl."uml";
-  deps."vaucanson-g" = tl."vaucanson-g";
-  deps."vocaltract" = tl."vocaltract";
+  deps = [
+    "auto-pst-pdf"
+    "bclogo"
+    "collection-basic"
+    "collection-plaingeneric"
+    "dsptricks"
+    "luapstricks"
+    "makeplot"
+    "pdftricks"
+    "pdftricks2"
+    "pedigree-perl"
+    "psbao"
+    "pst-2dplot"
+    "pst-3d"
+    "pst-3dplot"
+    "pst-abspos"
+    "pst-am"
+    "pst-antiprism"
+    "pst-arrow"
+    "pst-asr"
+    "pst-bar"
+    "pst-barcode"
+    "pst-bezier"
+    "pst-blur"
+    "pst-bspline"
+    "pst-calculate"
+    "pst-calendar"
+    "pst-cie"
+    "pst-circ"
+    "pst-coil"
+    "pst-contourplot"
+    "pst-cox"
+    "pst-dart"
+    "pst-dbicons"
+    "pst-diffraction"
+    "pst-electricfield"
+    "pst-eps"
+    "pst-eucl"
+    "pst-exa"
+    "pst-feyn"
+    "pst-fill"
+    "pst-fit"
+    "pst-flags"
+    "pst-fr3d"
+    "pst-fractal"
+    "pst-fun"
+    "pst-func"
+    "pst-gantt"
+    "pst-geo"
+    "pst-geometrictools"
+    "pst-gr3d"
+    "pst-grad"
+    "pst-graphicx"
+    "pst-hsb"
+    "pst-infixplot"
+    "pst-intersect"
+    "pst-jtree"
+    "pst-knot"
+    "pst-labo"
+    "pst-layout"
+    "pst-lens"
+    "pst-light3d"
+    "pst-lsystem"
+    "pst-magneticfield"
+    "pst-marble"
+    "pst-math"
+    "pst-mirror"
+    "pst-moire"
+    "pst-node"
+    "pst-ob3d"
+    "pst-ode"
+    "pst-optexp"
+    "pst-optic"
+    "pst-osci"
+    "pst-ovl"
+    "pst-pad"
+    "pst-pdf"
+    "pst-pdgr"
+    "pst-perspective"
+    "pst-platon"
+    "pst-plot"
+    "pst-poker"
+    "pst-poly"
+    "pst-pulley"
+    "pst-qtree"
+    "pst-rputover"
+    "pst-rubans"
+    "pst-shell"
+    "pst-sigsys"
+    "pst-slpe"
+    "pst-solarsystem"
+    "pst-solides3d"
+    "pst-soroban"
+    "pst-spectra"
+    "pst-spinner"
+    "pst-stru"
+    "pst-support"
+    "pst-text"
+    "pst-thick"
+    "pst-tools"
+    "pst-tree"
+    "pst-turtle"
+    "pst-tvz"
+    "pst-uml"
+    "pst-vectorian"
+    "pst-vehicle"
+    "pst-venn"
+    "pst-vowel"
+    "pst2pdf"
+    "pstricks"
+    "pstricks-add"
+    "pstricks_calcnotes"
+    "uml"
+    "vaucanson-g"
+    "vocaltract"
+  ];
   sha512.run = "508276fe37018f3d9773fc7cda0cb37edcdd28e9cf8ab54ed5be16b07c2066de4626a561bbe387c7bba0fb82d4102be406efd721a4b5dc90110b8560083d2b07";
 };
 "collection-publishers" = {
   revision = 65221;
   stripPrefix = 0;
-  deps."aastex" = tl."aastex";
-  deps."abnt" = tl."abnt";
-  deps."abntex2" = tl."abntex2";
-  deps."abntexto" = tl."abntexto";
-  deps."acmart" = tl."acmart";
-  deps."acmconf" = tl."acmconf";
-  deps."active-conf" = tl."active-conf";
-  deps."adfathesis" = tl."adfathesis";
-  deps."afparticle" = tl."afparticle";
-  deps."afthesis" = tl."afthesis";
-  deps."aguplus" = tl."aguplus";
-  deps."aiaa" = tl."aiaa";
-  deps."anonymous-acm" = tl."anonymous-acm";
-  deps."anufinalexam" = tl."anufinalexam";
-  deps."aomart" = tl."aomart";
-  deps."apa" = tl."apa";
-  deps."apa6" = tl."apa6";
-  deps."apa6e" = tl."apa6e";
-  deps."apa7" = tl."apa7";
-  deps."arsclassica" = tl."arsclassica";
-  deps."articleingud" = tl."articleingud";
-  deps."asaetr" = tl."asaetr";
-  deps."ascelike" = tl."ascelike";
-  deps."asmeconf" = tl."asmeconf";
-  deps."asmejour" = tl."asmejour";
-  deps."aucklandthesis" = tl."aucklandthesis";
-  deps."bangorcsthesis" = tl."bangorcsthesis";
-  deps."bangorexam" = tl."bangorexam";
-  deps."bath-bst" = tl."bath-bst";
-  deps."beamer-fuberlin" = tl."beamer-fuberlin";
-  deps."beamer-verona" = tl."beamer-verona";
-  deps."beilstein" = tl."beilstein";
-  deps."bfh-ci" = tl."bfh-ci";
-  deps."bgteubner" = tl."bgteubner";
-  deps."bjfuthesis" = tl."bjfuthesis";
-  deps."bmstu" = tl."bmstu";
-  deps."bmstu-iu8" = tl."bmstu-iu8";
-  deps."br-lex" = tl."br-lex";
-  deps."brandeis-dissertation" = tl."brandeis-dissertation";
-  deps."brandeis-problemset" = tl."brandeis-problemset";
-  deps."brandeis-thesis" = tl."brandeis-thesis";
-  deps."buctthesis" = tl."buctthesis";
-  deps."cascadilla" = tl."cascadilla";
-  deps."cesenaexam" = tl."cesenaexam";
-  deps."chem-journal" = tl."chem-journal";
-  deps."chifoot" = tl."chifoot";
-  deps."chs-physics-report" = tl."chs-physics-report";
-  deps."cje" = tl."cje";
-  deps."classicthesis" = tl."classicthesis";
-  deps."cleanthesis" = tl."cleanthesis";
-  deps."cmpj" = tl."cmpj";
-  deps."collection-latex" = tl."collection-latex";
-  deps."confproc" = tl."confproc";
-  deps."cquthesis" = tl."cquthesis";
-  deps."dccpaper" = tl."dccpaper";
-  deps."dithesis" = tl."dithesis";
-  deps."ebook" = tl."ebook";
-  deps."ebsthesis" = tl."ebsthesis";
-  deps."ecothesis" = tl."ecothesis";
-  deps."ejpecp" = tl."ejpecp";
-  deps."ekaia" = tl."ekaia";
-  deps."elbioimp" = tl."elbioimp";
-  deps."els-cas-templates" = tl."els-cas-templates";
-  deps."elsarticle" = tl."elsarticle";
-  deps."elteikthesis" = tl."elteikthesis";
-  deps."emisa" = tl."emisa";
-  deps."erdc" = tl."erdc";
-  deps."estcpmm" = tl."estcpmm";
-  deps."etsvthor" = tl."etsvthor";
-  deps."facture-belge-simple-sans-tva" = tl."facture-belge-simple-sans-tva";
-  deps."fbithesis" = tl."fbithesis";
-  deps."fcavtex" = tl."fcavtex";
-  deps."fcltxdoc" = tl."fcltxdoc";
-  deps."fei" = tl."fei";
-  deps."ftc-notebook" = tl."ftc-notebook";
-  deps."gaceta" = tl."gaceta";
-  deps."gammas" = tl."gammas";
-  deps."geradwp" = tl."geradwp";
-  deps."gradstudentresume" = tl."gradstudentresume";
-  deps."grant" = tl."grant";
-  deps."gsemthesis" = tl."gsemthesis";
-  deps."gzt" = tl."gzt";
-  deps."h2020proposal" = tl."h2020proposal";
-  deps."hagenberg-thesis" = tl."hagenberg-thesis";
-  deps."har2nat" = tl."har2nat";
-  deps."hecthese" = tl."hecthese";
-  deps."hep-paper" = tl."hep-paper";
-  deps."hfutexam" = tl."hfutexam";
-  deps."hfutthesis" = tl."hfutthesis";
-  deps."hithesis" = tl."hithesis";
-  deps."hitszbeamer" = tl."hitszbeamer";
-  deps."hitszthesis" = tl."hitszthesis";
-  deps."hobete" = tl."hobete";
-  deps."hu-berlin-bundle" = tl."hu-berlin-bundle";
-  deps."hustthesis" = tl."hustthesis";
-  deps."icsv" = tl."icsv";
-  deps."ieeeconf" = tl."ieeeconf";
-  deps."ieeepes" = tl."ieeepes";
-  deps."ieeetran" = tl."ieeetran";
-  deps."ijmart" = tl."ijmart";
-  deps."ijsra" = tl."ijsra";
-  deps."imac" = tl."imac";
-  deps."imtekda" = tl."imtekda";
-  deps."inkpaper" = tl."inkpaper";
-  deps."iodhbwm" = tl."iodhbwm";
-  deps."iscram" = tl."iscram";
-  deps."jacow" = tl."jacow";
-  deps."jmlr" = tl."jmlr";
-  deps."jnuexam" = tl."jnuexam";
-  deps."jourcl" = tl."jourcl";
-  deps."jpsj" = tl."jpsj";
-  deps."kdgdocs" = tl."kdgdocs";
-  deps."kdpcover" = tl."kdpcover";
-  deps."kfupm-math-exam" = tl."kfupm-math-exam";
-  deps."kluwer" = tl."kluwer";
-  deps."ksp-thesis" = tl."ksp-thesis";
-  deps."ku-template" = tl."ku-template";
-  deps."langsci" = tl."langsci";
-  deps."langsci-avm" = tl."langsci-avm";
-  deps."limecv" = tl."limecv";
-  deps."lion-msc" = tl."lion-msc";
-  deps."llncs" = tl."llncs";
-  deps."llncsconf" = tl."llncsconf";
-  deps."lni" = tl."lni";
-  deps."lps" = tl."lps";
-  deps."matc3" = tl."matc3";
-  deps."matc3mem" = tl."matc3mem";
-  deps."mcmthesis" = tl."mcmthesis";
-  deps."mentis" = tl."mentis";
-  deps."mlacls" = tl."mlacls";
-  deps."mluexercise" = tl."mluexercise";
-  deps."mnras" = tl."mnras";
-  deps."modeles-factures-belges-assocs" = tl."modeles-factures-belges-assocs";
-  deps."msu-thesis" = tl."msu-thesis";
-  deps."mucproc" = tl."mucproc";
-  deps."mugsthesis" = tl."mugsthesis";
-  deps."muling" = tl."muling";
-  deps."musuos" = tl."musuos";
-  deps."muthesis" = tl."muthesis";
-  deps."mynsfc" = tl."mynsfc";
-  deps."nature" = tl."nature";
-  deps."navydocs" = tl."navydocs";
-  deps."nddiss" = tl."nddiss";
-  deps."ndsu-thesis" = tl."ndsu-thesis";
-  deps."ndsu-thesis-2022" = tl."ndsu-thesis-2022";
-  deps."nih" = tl."nih";
-  deps."nihbiosketch" = tl."nihbiosketch";
-  deps."njustthesis" = tl."njustthesis";
-  deps."njuthesis" = tl."njuthesis";
-  deps."njuvisual" = tl."njuvisual";
-  deps."nostarch" = tl."nostarch";
-  deps."novel" = tl."novel";
-  deps."nrc" = tl."nrc";
-  deps."nwafuthesis" = tl."nwafuthesis";
-  deps."nwejm" = tl."nwejm";
-  deps."onrannual" = tl."onrannual";
-  deps."opteng" = tl."opteng";
-  deps."oup-authoring-template" = tl."oup-authoring-template";
-  deps."philosophersimprint" = tl."philosophersimprint";
-  deps."pittetd" = tl."pittetd";
-  deps."pkuthss" = tl."pkuthss";
-  deps."powerdot-fuberlin" = tl."powerdot-fuberlin";
-  deps."powerdot-tuliplab" = tl."powerdot-tuliplab";
-  deps."pracjourn" = tl."pracjourn";
-  deps."prociagssymp" = tl."prociagssymp";
-  deps."proposal" = tl."proposal";
-  deps."prtec" = tl."prtec";
-  deps."ptptex" = tl."ptptex";
-  deps."qrbill" = tl."qrbill";
-  deps."quantumarticle" = tl."quantumarticle";
-  deps."resphilosophica" = tl."resphilosophica";
-  deps."resumecls" = tl."resumecls";
-  deps."revtex" = tl."revtex";
-  deps."revtex4" = tl."revtex4";
-  deps."revtex4-1" = tl."revtex4-1";
-  deps."rutitlepage" = tl."rutitlepage";
-  deps."ryersonsgsthesis" = tl."ryersonsgsthesis";
-  deps."ryethesis" = tl."ryethesis";
-  deps."sageep" = tl."sageep";
-  deps."sapthesis" = tl."sapthesis";
-  deps."schule" = tl."schule";
-  deps."scientific-thesis-cover" = tl."scientific-thesis-cover";
-  deps."scripture" = tl."scripture";
-  deps."scrjrnl" = tl."scrjrnl";
-  deps."sduthesis" = tl."sduthesis";
-  deps."se2thesis" = tl."se2thesis";
-  deps."seu-ml-assign" = tl."seu-ml-assign";
-  deps."seuthesis" = tl."seuthesis";
-  deps."seuthesix" = tl."seuthesix";
-  deps."shortmathj" = tl."shortmathj";
-  deps."shtthesis" = tl."shtthesis";
-  deps."smflatex" = tl."smflatex";
-  deps."soton" = tl."soton";
-  deps."sphdthesis" = tl."sphdthesis";
-  deps."spie" = tl."spie";
-  deps."sr-vorl" = tl."sr-vorl";
-  deps."srdp-mathematik" = tl."srdp-mathematik";
-  deps."stellenbosch" = tl."stellenbosch";
-  deps."suftesi" = tl."suftesi";
-  deps."sugconf" = tl."sugconf";
-  deps."tabriz-thesis" = tl."tabriz-thesis";
-  deps."technion-thesis-template" = tl."technion-thesis-template";
-  deps."texilikechaps" = tl."texilikechaps";
-  deps."texilikecover" = tl."texilikecover";
-  deps."thesis-ekf" = tl."thesis-ekf";
-  deps."thesis-gwu" = tl."thesis-gwu";
-  deps."thesis-qom" = tl."thesis-qom";
-  deps."thesis-titlepage-fhac" = tl."thesis-titlepage-fhac";
-  deps."thuaslogos" = tl."thuaslogos";
-  deps."thubeamer" = tl."thubeamer";
-  deps."thucoursework" = tl."thucoursework";
-  deps."thuthesis" = tl."thuthesis";
-  deps."timbreicmc" = tl."timbreicmc";
-  deps."tlc-article" = tl."tlc-article";
-  deps."topletter" = tl."topletter";
-  deps."toptesi" = tl."toptesi";
-  deps."tuda-ci" = tl."tuda-ci";
-  deps."tudscr" = tl."tudscr";
-  deps."tugboat" = tl."tugboat";
-  deps."tugboat-plain" = tl."tugboat-plain";
-  deps."tui" = tl."tui";
-  deps."turabian" = tl."turabian";
-  deps."uaclasses" = tl."uaclasses";
-  deps."uafthesis" = tl."uafthesis";
-  deps."uantwerpendocs" = tl."uantwerpendocs";
-  deps."ucalgmthesis" = tl."ucalgmthesis";
-  deps."ucbthesis" = tl."ucbthesis";
-  deps."ucdavisthesis" = tl."ucdavisthesis";
-  deps."ucsmonograph" = tl."ucsmonograph";
-  deps."ucthesis" = tl."ucthesis";
-  deps."udes-genie-these" = tl."udes-genie-these";
-  deps."uestcthesis" = tl."uestcthesis";
-  deps."ufrgscca" = tl."ufrgscca";
-  deps."uhhassignment" = tl."uhhassignment";
-  deps."uiucredborder" = tl."uiucredborder";
-  deps."uiucthesis" = tl."uiucthesis";
-  deps."ukbill" = tl."ukbill";
-  deps."ulthese" = tl."ulthese";
-  deps."umbclegislation" = tl."umbclegislation";
-  deps."umich-thesis" = tl."umich-thesis";
-  deps."umthesis" = tl."umthesis";
-  deps."unam-thesis" = tl."unam-thesis";
-  deps."unamth-template" = tl."unamth-template";
-  deps."unamthesis" = tl."unamthesis";
-  deps."unbtex" = tl."unbtex";
-  deps."unifith" = tl."unifith";
-  deps."unigrazpub" = tl."unigrazpub";
-  deps."unitn-bimrep" = tl."unitn-bimrep";
-  deps."univie-ling" = tl."univie-ling";
-  deps."unizgklasa" = tl."unizgklasa";
-  deps."unswcover" = tl."unswcover";
-  deps."uothesis" = tl."uothesis";
-  deps."uowthesis" = tl."uowthesis";
-  deps."uowthesistitlepage" = tl."uowthesistitlepage";
-  deps."urcls" = tl."urcls";
-  deps."uspatent" = tl."uspatent";
-  deps."ut-thesis" = tl."ut-thesis";
-  deps."utexasthesis" = tl."utexasthesis";
-  deps."uwa-colours" = tl."uwa-colours";
-  deps."uwa-letterhead" = tl."uwa-letterhead";
-  deps."uwa-pcf" = tl."uwa-pcf";
-  deps."uwa-pif" = tl."uwa-pif";
-  deps."uwthesis" = tl."uwthesis";
-  deps."vancouver" = tl."vancouver";
-  deps."wsemclassic" = tl."wsemclassic";
-  deps."xduthesis" = tl."xduthesis";
-  deps."xduts" = tl."xduts";
-  deps."xmuthesis" = tl."xmuthesis";
-  deps."yathesis" = tl."yathesis";
-  deps."yazd-thesis" = tl."yazd-thesis";
-  deps."yb-book" = tl."yb-book";
-  deps."york-thesis" = tl."york-thesis";
+  deps = [
+    "aastex"
+    "abnt"
+    "abntex2"
+    "abntexto"
+    "acmart"
+    "acmconf"
+    "active-conf"
+    "adfathesis"
+    "afparticle"
+    "afthesis"
+    "aguplus"
+    "aiaa"
+    "anonymous-acm"
+    "anufinalexam"
+    "aomart"
+    "apa"
+    "apa6"
+    "apa6e"
+    "apa7"
+    "arsclassica"
+    "articleingud"
+    "asaetr"
+    "ascelike"
+    "asmeconf"
+    "asmejour"
+    "aucklandthesis"
+    "bangorcsthesis"
+    "bangorexam"
+    "bath-bst"
+    "beamer-fuberlin"
+    "beamer-verona"
+    "beilstein"
+    "bfh-ci"
+    "bgteubner"
+    "bjfuthesis"
+    "bmstu"
+    "bmstu-iu8"
+    "br-lex"
+    "brandeis-dissertation"
+    "brandeis-problemset"
+    "brandeis-thesis"
+    "buctthesis"
+    "cascadilla"
+    "cesenaexam"
+    "chem-journal"
+    "chifoot"
+    "chs-physics-report"
+    "cje"
+    "classicthesis"
+    "cleanthesis"
+    "cmpj"
+    "collection-latex"
+    "confproc"
+    "cquthesis"
+    "dccpaper"
+    "dithesis"
+    "ebook"
+    "ebsthesis"
+    "ecothesis"
+    "ejpecp"
+    "ekaia"
+    "elbioimp"
+    "els-cas-templates"
+    "elsarticle"
+    "elteikthesis"
+    "emisa"
+    "erdc"
+    "estcpmm"
+    "etsvthor"
+    "facture-belge-simple-sans-tva"
+    "fbithesis"
+    "fcavtex"
+    "fcltxdoc"
+    "fei"
+    "ftc-notebook"
+    "gaceta"
+    "gammas"
+    "geradwp"
+    "gradstudentresume"
+    "grant"
+    "gsemthesis"
+    "gzt"
+    "h2020proposal"
+    "hagenberg-thesis"
+    "har2nat"
+    "hecthese"
+    "hep-paper"
+    "hfutexam"
+    "hfutthesis"
+    "hithesis"
+    "hitszbeamer"
+    "hitszthesis"
+    "hobete"
+    "hu-berlin-bundle"
+    "hustthesis"
+    "icsv"
+    "ieeeconf"
+    "ieeepes"
+    "ieeetran"
+    "ijmart"
+    "ijsra"
+    "imac"
+    "imtekda"
+    "inkpaper"
+    "iodhbwm"
+    "iscram"
+    "jacow"
+    "jmlr"
+    "jnuexam"
+    "jourcl"
+    "jpsj"
+    "kdgdocs"
+    "kdpcover"
+    "kfupm-math-exam"
+    "kluwer"
+    "ksp-thesis"
+    "ku-template"
+    "langsci"
+    "langsci-avm"
+    "limecv"
+    "lion-msc"
+    "llncs"
+    "llncsconf"
+    "lni"
+    "lps"
+    "matc3"
+    "matc3mem"
+    "mcmthesis"
+    "mentis"
+    "mlacls"
+    "mluexercise"
+    "mnras"
+    "modeles-factures-belges-assocs"
+    "msu-thesis"
+    "mucproc"
+    "mugsthesis"
+    "muling"
+    "musuos"
+    "muthesis"
+    "mynsfc"
+    "nature"
+    "navydocs"
+    "nddiss"
+    "ndsu-thesis"
+    "ndsu-thesis-2022"
+    "nih"
+    "nihbiosketch"
+    "njustthesis"
+    "njuthesis"
+    "njuvisual"
+    "nostarch"
+    "novel"
+    "nrc"
+    "nwafuthesis"
+    "nwejm"
+    "onrannual"
+    "opteng"
+    "oup-authoring-template"
+    "philosophersimprint"
+    "pittetd"
+    "pkuthss"
+    "powerdot-fuberlin"
+    "powerdot-tuliplab"
+    "pracjourn"
+    "prociagssymp"
+    "proposal"
+    "prtec"
+    "ptptex"
+    "qrbill"
+    "quantumarticle"
+    "resphilosophica"
+    "resumecls"
+    "revtex"
+    "revtex4"
+    "revtex4-1"
+    "rutitlepage"
+    "ryersonsgsthesis"
+    "ryethesis"
+    "sageep"
+    "sapthesis"
+    "schule"
+    "scientific-thesis-cover"
+    "scripture"
+    "scrjrnl"
+    "sduthesis"
+    "se2thesis"
+    "seu-ml-assign"
+    "seuthesis"
+    "seuthesix"
+    "shortmathj"
+    "shtthesis"
+    "smflatex"
+    "soton"
+    "sphdthesis"
+    "spie"
+    "sr-vorl"
+    "srdp-mathematik"
+    "stellenbosch"
+    "suftesi"
+    "sugconf"
+    "tabriz-thesis"
+    "technion-thesis-template"
+    "texilikechaps"
+    "texilikecover"
+    "thesis-ekf"
+    "thesis-gwu"
+    "thesis-qom"
+    "thesis-titlepage-fhac"
+    "thuaslogos"
+    "thubeamer"
+    "thucoursework"
+    "thuthesis"
+    "timbreicmc"
+    "tlc-article"
+    "topletter"
+    "toptesi"
+    "tuda-ci"
+    "tudscr"
+    "tugboat"
+    "tugboat-plain"
+    "tui"
+    "turabian"
+    "uaclasses"
+    "uafthesis"
+    "uantwerpendocs"
+    "ucalgmthesis"
+    "ucbthesis"
+    "ucdavisthesis"
+    "ucsmonograph"
+    "ucthesis"
+    "udes-genie-these"
+    "uestcthesis"
+    "ufrgscca"
+    "uhhassignment"
+    "uiucredborder"
+    "uiucthesis"
+    "ukbill"
+    "ulthese"
+    "umbclegislation"
+    "umich-thesis"
+    "umthesis"
+    "unam-thesis"
+    "unamth-template"
+    "unamthesis"
+    "unbtex"
+    "unifith"
+    "unigrazpub"
+    "unitn-bimrep"
+    "univie-ling"
+    "unizgklasa"
+    "unswcover"
+    "uothesis"
+    "uowthesis"
+    "uowthesistitlepage"
+    "urcls"
+    "uspatent"
+    "ut-thesis"
+    "utexasthesis"
+    "uwa-colours"
+    "uwa-letterhead"
+    "uwa-pcf"
+    "uwa-pif"
+    "uwthesis"
+    "vancouver"
+    "wsemclassic"
+    "xduthesis"
+    "xduts"
+    "xmuthesis"
+    "yathesis"
+    "yazd-thesis"
+    "yb-book"
+    "york-thesis"
+  ];
   sha512.run = "550fb7f9dd937a7ac66772d7a9f733c9ccd07b79a18d5faa333c66db823528848c8d1f7ac726ef97c4d5df3a87ae807646d5b932ddfa82e256ce3c6d1e917d3b";
 };
 "collection-texworks" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
-  deps."texworks" = tl."texworks";
+  deps = [
+    "collection-basic"
+    "texworks"
+  ];
   sha512.run = "b1f38877115fb6efc9b63a5591c399b799f3a258e342d5e198b74b582628461ad67ea7c1ab76e5ae83a3e8e538c62ac3e7c5b3d3f1d29c093331843067cfec57";
 };
 "collection-wintools" = {
@@ -10653,49 +10777,51 @@ tl: { # no indentation
 "collection-xetex" = {
   revision = 64951;
   stripPrefix = 0;
-  deps."arabxetex" = tl."arabxetex";
-  deps."awesomebox" = tl."awesomebox";
-  deps."bidi-atbegshi" = tl."bidi-atbegshi";
-  deps."bidicontour" = tl."bidicontour";
-  deps."bidipagegrid" = tl."bidipagegrid";
-  deps."bidipresentation" = tl."bidipresentation";
-  deps."bidishadowtext" = tl."bidishadowtext";
-  deps."businesscard-qrcode" = tl."businesscard-qrcode";
-  deps."collection-basic" = tl."collection-basic";
-  deps."cqubeamer" = tl."cqubeamer";
-  deps."fixlatvian" = tl."fixlatvian";
-  deps."font-change-xetex" = tl."font-change-xetex";
-  deps."fontbook" = tl."fontbook";
-  deps."fontwrap" = tl."fontwrap";
-  deps."interchar" = tl."interchar";
-  deps."na-position" = tl."na-position";
-  deps."philokalia" = tl."philokalia";
-  deps."ptext" = tl."ptext";
-  deps."realscripts" = tl."realscripts";
-  deps."simple-resume-cv" = tl."simple-resume-cv";
-  deps."simple-thesis-dissertation" = tl."simple-thesis-dissertation";
-  deps."tetragonos" = tl."tetragonos";
-  deps."ucharclasses" = tl."ucharclasses";
-  deps."unicode-bidi" = tl."unicode-bidi";
-  deps."unimath-plain-xetex" = tl."unimath-plain-xetex";
-  deps."unisugar" = tl."unisugar";
-  deps."xebaposter" = tl."xebaposter";
-  deps."xechangebar" = tl."xechangebar";
-  deps."xecolor" = tl."xecolor";
-  deps."xecyr" = tl."xecyr";
-  deps."xeindex" = tl."xeindex";
-  deps."xelatex-dev" = tl."xelatex-dev";
-  deps."xesearch" = tl."xesearch";
-  deps."xespotcolor" = tl."xespotcolor";
-  deps."xetex" = tl."xetex";
-  deps."xetex-itrans" = tl."xetex-itrans";
-  deps."xetex-pstricks" = tl."xetex-pstricks";
-  deps."xetex-tibetan" = tl."xetex-tibetan";
-  deps."xetexconfig" = tl."xetexconfig";
-  deps."xetexfontinfo" = tl."xetexfontinfo";
-  deps."xetexko" = tl."xetexko";
-  deps."xevlna" = tl."xevlna";
-  deps."zbmath-review-template" = tl."zbmath-review-template";
+  deps = [
+    "arabxetex"
+    "awesomebox"
+    "bidi-atbegshi"
+    "bidicontour"
+    "bidipagegrid"
+    "bidipresentation"
+    "bidishadowtext"
+    "businesscard-qrcode"
+    "collection-basic"
+    "cqubeamer"
+    "fixlatvian"
+    "font-change-xetex"
+    "fontbook"
+    "fontwrap"
+    "interchar"
+    "na-position"
+    "philokalia"
+    "ptext"
+    "realscripts"
+    "simple-resume-cv"
+    "simple-thesis-dissertation"
+    "tetragonos"
+    "ucharclasses"
+    "unicode-bidi"
+    "unimath-plain-xetex"
+    "unisugar"
+    "xebaposter"
+    "xechangebar"
+    "xecolor"
+    "xecyr"
+    "xeindex"
+    "xelatex-dev"
+    "xesearch"
+    "xespotcolor"
+    "xetex"
+    "xetex-itrans"
+    "xetex-pstricks"
+    "xetex-tibetan"
+    "xetexconfig"
+    "xetexfontinfo"
+    "xetexko"
+    "xevlna"
+    "zbmath-review-template"
+  ];
   sha512.run = "457c4e7a3e2089adc69173950c5d3fa177c6e03c5936c49328bbd3c276d9940ba5aca974aea4b97c5dd51b6ec1ca9ebe28861e730aef63b1312589e0cb16df1e";
 };
 "collref" = {
@@ -11070,17 +11196,19 @@ tl: { # no indentation
 };
 "context" = {
   revision = 58167;
-  deps."amsfonts" = tl."amsfonts";
-  deps."lm" = tl."lm";
-  deps."lm-math" = tl."lm-math";
-  deps."luatex" = tl."luatex";
-  deps."manfnt-font" = tl."manfnt-font";
-  deps."metapost" = tl."metapost";
-  deps."mflogo-font" = tl."mflogo-font";
-  deps."mptopdf" = tl."mptopdf";
-  deps."pdftex" = tl."pdftex";
-  deps."stmaryrd" = tl."stmaryrd";
-  deps."xetex" = tl."xetex";
+  deps = [
+    "amsfonts"
+    "lm"
+    "lm-math"
+    "luatex"
+    "manfnt-font"
+    "metapost"
+    "mflogo-font"
+    "mptopdf"
+    "pdftex"
+    "stmaryrd"
+    "xetex"
+  ];
   hasFormats = true;
   sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69";
   sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd";
@@ -11089,7 +11217,9 @@ tl: { # no indentation
 "context-account" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "755ddb4c62a496873d5362df01307163c79d2a6c3fabce6ea01b442c16dad2f23d72909df71dd44eb4fbbf5c57366e20eb49bfce240807c2e2a9a52cbd76680a";
   sha512.doc = "b19f6d0330e5da99a961304f8c022609dedb2dc3a8cc4607cb9b2ca7eda38f9c8b972316bb9fac92cc36166e1c0822afaebda2c5e2d87db1e1efd2781f51956e";
   hasRunfiles = true;
@@ -11097,7 +11227,9 @@ tl: { # no indentation
 "context-algorithmic" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "72d4bbfe723b4012f8701c2786f96009bbed3c6b4bd2129f7153306f172e72218920e222f97ee6d5ee4b863e9e915fc38dd92b0c42066385fde35c5c3d0cc42a";
   sha512.doc = "19ba676dc7822bc0a6583d6e9e031f3780977835c10d901e1ae02fca781719a0e015ac79cfc35c908a8de40a19614fcd17a35c604c9311b50972d0706d6f07e1";
   hasRunfiles = true;
@@ -11105,7 +11237,9 @@ tl: { # no indentation
 "context-animation" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "19691ca3325b3f72154ac8439e616a128b5f3ba8c9447bb1e92979e175daa902cd756853a2b6e6a34a84fbe96e02771a0c6ef27ed5bbb7eac94f62dd72d571f1";
   sha512.doc = "a06227508c2dc343598fc6878e2b17b56341f5dd86a473957318eb94ecc6e150adaedf7346ffb931eda184651efd00d8f60e36ec6ea50e9ac94e2ed096058293";
   hasRunfiles = true;
@@ -11113,7 +11247,9 @@ tl: { # no indentation
 "context-annotation" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "bb66132ed1e4f146c407bb3b2852c451b82d3d06de1dc25ddec6e692d17f4d994d1a67cfd7ff711dc2de7a4ce7259b1768d6efcfb58856321d5ea5b15271cd34";
   sha512.doc = "4491012c8172beb64478b2de5557ed8f97701cfcb3996a8a5ff9990048d79ddce8cc2796dbf4c08812bc8963c0d318f9d79d2d4c2d14bc372f06dbc28e012c3d";
   hasRunfiles = true;
@@ -11121,7 +11257,9 @@ tl: { # no indentation
 "context-bnf" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "53e5d3d7c977aab648bb024942263a8aed5da6314506825ace02556db890ea23400c6de714ddf6380235c942dfc02e127736579b6be1c5b0b0ecc65d25fb0d6b";
   sha512.doc = "d7ab60c2f8571ce2e2e96b82c1f97b140c5750324efb73275062a8d301d530279a3f9c19f6a6feebd6d7c72727d94f469d9aad05ad67cde5dbd3de9f695dad31";
   hasRunfiles = true;
@@ -11129,7 +11267,9 @@ tl: { # no indentation
 "context-chromato" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "52e11c6953e7c2e2f9a3a20b8885fd12f5abef32d32da5ae5415b0321d37ac5ff8ff5bece3d522e1f785470cef542568cd56abd509d26671da9298c3d0ba27cc";
   sha512.doc = "5c7c7f03050b0a17dadf23a09dced356a036c6b95ca76aeb0fda583dbc490d82222de64299c121224efaccc78b62364a1bc56daf020c177865c29e343529f040";
   hasRunfiles = true;
@@ -11137,7 +11277,9 @@ tl: { # no indentation
 "context-cmscbf" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "cb0e5849ac3168a4ecdd1545edd029a1622ecf1c46d29eec97b28a66f65305e6b4d3a9c83e24d78e1596c8009ad5c9a0e25fa7e09448c3e0ea492e62bc933ea8";
   sha512.doc = "8f45989c08f09381ccbf2942a08c0b13792917a18d5b2e92fb45c7ac2f4b4538f5ffd633da0348e12835c03a6f79b0ea7044f1ebea5770365a83d2d097a56df4";
   hasRunfiles = true;
@@ -11145,7 +11287,9 @@ tl: { # no indentation
 "context-cmttbf" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "e3bc048c09bfdf114efa25077fa4e6a6c20b4d0e2ba337cefa0a8a82348fd3376f82cae0c85b029b863b7a5db9d9552b4fc5f5487d5ed5f6d88484181ea98ced";
   sha512.doc = "2b55367f236330a07120229902405213a495de2ba455f333bc23e1c1abbe0f0a4be16ee95415f613d41572916722e3d023a71698f74e5e37f34a8de4fdca6e47";
   hasRunfiles = true;
@@ -11153,7 +11297,9 @@ tl: { # no indentation
 "context-construction-plan" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "b292f8e271fcac88eaedc376257ae16a401a6c31009eaa3d4faeefba25c33d034f57d30ba4638e85b76ffd0d24ef4d541dfbceb1bc0b5c806a8412d239a32146";
   sha512.doc = "605e09bedb9e2ad1e98a621c0a4842f28592c93507c3da31f8c6437e95e63a47e795b38fa0263d7fa81fa3b8838f21d2426c8705f8e17ac1d827923cf5e88784";
   hasRunfiles = true;
@@ -11161,7 +11307,9 @@ tl: { # no indentation
 "context-cyrillicnumbers" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "14a90656d706d68ce441301aa6bccf2033c36f9c8d8605ec9dedeeedb71a5670dae325a5a198b2ca25373eb2b495e57fff31b85089c6c0fb987738c76ac636b2";
   sha512.doc = "d95b1df26033aaff0a9f6759268ac3e68bff02556001e3f9b2bae1db68aa13c839a87047a6ae0a296f8e5817398ba35b7cbacc4f194dd93cf72684904190e7e3";
   hasRunfiles = true;
@@ -11169,7 +11317,9 @@ tl: { # no indentation
 "context-degrade" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "b2df5bbee492b7137180bfe7b0b826f4149b8231b78cb839ac9716f02b622e5b3a0eb5964e12625650a224ae463714bb7cafbecae6061a6e3120022d2f545d52";
   sha512.doc = "8f24fd70547ecfcbb163df2e3e4450525f0e56583b6984f61fb04559142bd838287e79c9b9d8cdef2c26a882688074b5010615e6d818a11f2f5812d88e31cd82";
   hasRunfiles = true;
@@ -11177,7 +11327,9 @@ tl: { # no indentation
 "context-fancybreak" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "1e8e51de47c67a3287dfa4386f9c09b4dfaa494d9b59fe8d117a3a1b65a5041add24c36227f2d2d7fb3bf2ec34d6a5a8b6658d275b63f55793d05dea08722b10";
   sha512.doc = "6082670766d63da902d2a53f2a6ee89fcdce942fd73439fea8326ef3117e6a5483b86d9d4271d2f3d9546a5fe44277721cd15510a9da392db36356b44ae2f36d";
   hasRunfiles = true;
@@ -11185,7 +11337,9 @@ tl: { # no indentation
 "context-filter" = {
   revision = 62070;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "c2534b543fd5444776a054f43fafa393040af5bcb67f869d61d200a4a1d0355f1d81c64adab683d15a6be806a21dfc9ad661995bbe51da3c0bfb841ade4b077f";
   sha512.doc = "a9c2ea88b0e2514840c368ea7686894dda4b86c93ec8f34989238ffdf5704f1c1898d0ee5e0724035314d2d37803f1a1afdd445dd802a94f5ff4223148f81767";
   hasRunfiles = true;
@@ -11193,7 +11347,9 @@ tl: { # no indentation
 "context-french" = {
   revision = 54215;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "aed7a7f91e909e8b9b7efc5e0b45c67d5ed3e084c5019e1ddd68d8e9e969c0579b1dbbe4e25d74ca22b256324358ed34f3f54a92e2fb3a012a6aa43797e8aaa7";
   sha512.doc = "926a054d12f59d45dbe538eaed4087ed2c9f3321f1051c7006fe651af95d2275788030ee9371ffd39a7f7f8a4022776c19721323ab82871f061dca365c081728";
   hasRunfiles = true;
@@ -11201,7 +11357,9 @@ tl: { # no indentation
 "context-fullpage" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "280a16b47e04f3099a2f960435bf1c22ec623553303e339df4d06135b768cee6565e20a0c4e0c080d8c6f621a32d862ba6203daacdbf9ecd03b62829dd0014fd";
   sha512.doc = "1d4ff98bae26e0d6ec1ce1ca58fac82f8592158f8635eeac737546873f1f468b2ad7a82b9f8956b770fdc0c01443a9327c509265cdecb90d83dca15462cfa23b";
   hasRunfiles = true;
@@ -11209,8 +11367,10 @@ tl: { # no indentation
 "context-gantt" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
-  deps."hatching" = tl."hatching";
+  deps = [
+    "context"
+    "hatching"
+  ];
   sha512.run = "e0c61179f4ecdf93c13dbfe19f59487fbce55e1a0dece76ac025a88a452e7168c5e3b84e53c01bcae4cc412993be36eb554dc5f7299fc1205f4070aa07a834cf";
   sha512.doc = "a5cc76238f8377dc8d06869bf23a1367c880b57ba62ab8c8331886cbed145427e2819ba92965924fc7a78579d28b7c1cf331acf7f199cf72672ccb64962c9367";
   hasRunfiles = true;
@@ -11218,7 +11378,9 @@ tl: { # no indentation
 "context-gnuplot" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "d3d7dce105707bd8fd903038e458cae614ec63da7932231e1f659570ec3a7960ea0fab338a8405f2ca8ce8b03946b58db8255333d2a4ab5a659566f4d272b0b0";
   sha512.doc = "40e471b27d53ced33590792ac62992a220357c6db1c78cba901197362a36817bc14b049f2573ee2e5b5adad5182c5bea2880c4f7a2477bcd1a06ee7ccf88b0b9";
   hasRunfiles = true;
@@ -11226,7 +11388,9 @@ tl: { # no indentation
 "context-handlecsv" = {
   revision = 51306;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "10f862b7152e0efe2a8444fcf847ade2aad2c1499e146b94643a7e08a438359c2f7d1927e7e9773f3dd14475fb4535d17fb4f29ff053e7a29c9463f40c6e5598";
   sha512.doc = "39330dfaf22a83181086343ac9ea7d64025fbe779e55161b33e5a9a9802e0928bb1c16941aeb307da641835aefdfe2e431becbc0cfe40ad8bb33a3816b9b177b";
   hasRunfiles = true;
@@ -11234,7 +11398,9 @@ tl: { # no indentation
 "context-inifile" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "9dd9b61cd2b5700b0e2b6e59bf4040de9431820c659f121c2681e454ddb4b34454270eac6c442836c90f8a1819761ce0d7659684a1f0c8876fec1f947a0b16f7";
   sha512.doc = "9635bc80ae7222c6a38004ad5f985004634b7db9596e03a23123ad71bbf177639bb1b028bdfe79d51b75c1c429c327f65c2b5e0720723d8bcdf63f4939312850";
   hasRunfiles = true;
@@ -11242,7 +11408,9 @@ tl: { # no indentation
 "context-layout" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "6cad00783d0bc91000ca0e0c8350fe2a2e99f7fefccd375d5bb2f1a144fc04a59f83122dcd490fc0596b1dc9fd0c0a779bfa35932362927ed50ed8df39ec359e";
   sha512.doc = "4ecf7bfe5fbc78453cc116cf7a657f4b6ac7fc21ca7dd6da5beb0ea1af0c1fd48d6a74ab516213f49d1e29cb8bd47fbcc94145157472e3ea22b291f494fc3d1f";
   hasRunfiles = true;
@@ -11250,7 +11418,9 @@ tl: { # no indentation
 "context-letter" = {
   revision = 60787;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "558836a8c95743270f627a18dfe7a29ffc7a2eaeb4cf663d589ef5c07eab4dad6f09db31511379c90a41d1e9e7da5766e8dc3c8bb0902fa06bda4fb33caa97c9";
   sha512.doc = "94e1bf68371f3e8c426cfff5c471f93c86ce51fdd92dfad59669d32cc73d86de606113ece55d13a0f25ac4a26f16916407de9175b84acc79ba107156c20cd20a";
   hasRunfiles = true;
@@ -11258,7 +11428,9 @@ tl: { # no indentation
 "context-lettrine" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "79e4e246a7bb0a300db53425e2769a3ef61bc0249ce57840c0b9037805e86eadbd1ef4ab8a110fd806584393feef00f498418732cfd53922aed6df67c561e535";
   sha512.doc = "ab32697b6c309b1099b809c33182ffc48bb3019c8d520269cbb616b61e8f20678cc2cf4e7e971e06cadb22ffcee0d502deedf21aa95d8d372d1840e4fb4a6591";
   hasRunfiles = true;
@@ -11266,7 +11438,9 @@ tl: { # no indentation
 "context-mathsets" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "e4c689c745d06c61d6f693a9832001aa8c79d51664c2a5d6d0c6148a95b30870063f50eecca31ac0924193c6dab8c12cd5ccaca16eeaf5f83a99cef1a8889ec3";
   sha512.doc = "f2c33244814da8e8838483038f507fe6b3e146f37691e55a37bb5355985d2af4c5fc423318133c4f13837a3e66a4fe72d5c14f6721bb5ee0417a59691b86d3f1";
   hasRunfiles = true;
@@ -11274,14 +11448,18 @@ tl: { # no indentation
 "context-notes-zh-cn" = {
   revision = 23171;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "a05cd68d609fb9427ca07f64ba1b9ad85762464a3294653c8a790c0a6a41d6af43aab72a1eb7ef0d56a299db2f54af5666dbe974f9fdac014f624350c8bfe50a";
   sha512.doc = "4261b8aeb5b3cbebde2890af1b7039c6f557ce36f4979228f40f9e5e99b19aa5c457ed6842f4501f4dc32f51f58d9fcd0764028b9d5c74fd07d41c8c866220a1";
 };
 "context-rst" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "f93173c1b27afe538d670c791048f495fa3f236cf75511d43b33172d140ac47fa3b5f11c674db5d515733b8ef9cfa7ac2d3c46b78b624768ee95a21884dae904";
   sha512.doc = "536f63f9fa02e37c38f445974dab1f75b38abf0769379ee1735001972db71be10d51a1782e850ddd75d73f2a6f1375cf043684c0fae1a88b20a1650248870f9a";
   hasRunfiles = true;
@@ -11289,7 +11467,9 @@ tl: { # no indentation
 "context-ruby" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "e219c6da61585d88f8e899278d1c85f0903ed32b6c7368cdb6076697230a0e79f5f88f53dd98514394fa09e7580c1c6b7c167d81c010107f3399dffb18b13d95";
   sha512.doc = "179e501b428bd87a49830a68236008ea6e962b80e79ab45a0e75a7b86a7fc11025ac38ad463c459c6d290aa5ac8627da5849d1fd8f7502ea7d97696b53ed2647";
   hasRunfiles = true;
@@ -11297,7 +11477,9 @@ tl: { # no indentation
 "context-simplefonts" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "7c817f4a25a8883ce052c9657a3d6117042e8538fadc8d67b4b0194abd69238045c09d365e90e555d5b04d83a1ef82039ca9631aec00eb1f80b56fbefa729cd3";
   sha512.doc = "238babc7694bf85c81e3079b5d72feabc9c9eeea4f3b625a57ecb133d70ac745334ca0426097dccfe53e3ffe108ac0859be4da7625bb6b683abec1101367ac06";
   hasRunfiles = true;
@@ -11305,7 +11487,9 @@ tl: { # no indentation
 "context-simpleslides" = {
   revision = 63903;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "2db8348769d60d38266ad3798264864a0453b38c769db02ddaee072e795596fd48cc201caa5023d980c1a748c41a30e4c560ece68def59deb3c467bec2e60f64";
   sha512.doc = "532a9a142b30c8fe2ff3431d24988ef96e5da63276cd0084fe8b69b3e9cb572a0beab8d7ee4291d00a4b1d725f3d23ed47632811fde7e2aca41998c5d44a0481";
   hasRunfiles = true;
@@ -11313,7 +11497,9 @@ tl: { # no indentation
 "context-title" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "bc7d6cbd373cb6d6214489ed97117929ba381626c854a0a5a950bfa44c06214991d7a90290793c825c96e6d22ba1f6807054d4553d1d3980d9d9bc0e6dabafda";
   sha512.doc = "3b910eeca8c8a442939873e082a4025523472b267ed3268e63cbf5fbe0821c9db8d8d183058d139aa02233dfdb6be7e23fb9df360a490f7d551875c59753c7c0";
   hasRunfiles = true;
@@ -11321,7 +11507,9 @@ tl: { # no indentation
 "context-transliterator" = {
   revision = 61127;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "f919d3f9e6ab25932cfaeadfc07f86ebdbe00d84dc21236e4775930fc3866cee69cf9a25d373e13655f4396a3c395ea6ea103a28ffb4f00a4e95b7ceaec155c9";
   sha512.doc = "8473c1ca7b48009055f5c33031ec60f80d84dc43396789b0c0c7e6d65bcf014a237088dca07211beae4bfb80377f55cf12a9f379995cff50f52143fc4bc81295";
   hasRunfiles = true;
@@ -11329,7 +11517,9 @@ tl: { # no indentation
 "context-typearea" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "c4a2f2317b146b31102273e9b616d403d4ee836a61fae96bd9315670b0bdd5f9d94ecde00b53d2ea5f7073773bd8af5c322b07c3b05bf7ad5262a9f0e0b623a1";
   sha512.doc = "7171bc5c5e82b3897f75421e745e876c2aea84e9e9cb74badd6dedc75666b8f9ddb8b6d11c523ea64be6b57dca4f84555827afa32a0c90f6df1c31b68b1f6395";
   hasRunfiles = true;
@@ -11337,7 +11527,9 @@ tl: { # no indentation
 "context-typescripts" = {
   revision = 60422;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "a13d06b9a792cbd2352016df508a7860e45b541d04cef1c9d9c8b5a6199120a71dfd69f990700c4a76ac31ec11209caef431a190b9045bdc46cc44f88cbef0a3";
   sha512.doc = "3d948f22da14b1d481817477235657cee714e4a2a69834729c20e18157f1175890ddc7fce992e8f5f27e26cd6d08186ff1521e2186681557cfff1a4778267324";
   hasRunfiles = true;
@@ -11345,8 +11537,10 @@ tl: { # no indentation
 "context-vim" = {
   revision = 62071;
   stripPrefix = 0;
-  deps."context" = tl."context";
-  deps."context-filter" = tl."context-filter";
+  deps = [
+    "context"
+    "context-filter"
+  ];
   sha512.run = "12100c7aa3eb555cf9dbe72454a96e63feda52329a8a192ff86ba30477acab4ebaaf84c15a79f16d4e3f95cef02baf8146e5810b8c9e8e94c25ba1317bf4fc2c";
   sha512.doc = "0f49e22b9e1d465f46727a9e952e095eceab55e77a2559fe497cf14690377f77ca42aa23ce7eaca659e9b0983e5a950b36733eef49b0473fd33a8f783edb43b1";
   hasRunfiles = true;
@@ -11354,7 +11548,9 @@ tl: { # no indentation
 "context-visualcounter" = {
   revision = 47085;
   stripPrefix = 0;
-  deps."context" = tl."context";
+  deps = [
+    "context"
+  ];
   sha512.run = "da7799ee31a4298f8e8cb02cb4e480fa49fb4188b776df877648c663c93523636bdd7fa6ca5eb403fc8f3483064bf223fed042c1d27eb0817c224ddf8e21c673";
   sha512.doc = "1788355ea4109e7e2bbaa9bbc3798f60a814d549d082638a59a453cc5fb39b54ff8a00471a28a96a5501e91899874ae19981ae0f8a09b6353d19275b851b9f80";
   sha512.source = "39bba551e9f0bb8d70c0b60a2b0fba3d7cad30555d4052fc6ae722bfd9cb79d5cca784474a9f1847faccccb1618662bc4dd2fadd1fdacaf2f4cc9c035b5501ec";
@@ -11663,7 +11859,9 @@ tl: { # no indentation
 "create-theorem" = {
   revision = 64104;
   stripPrefix = 0;
-  deps."crefthe" = tl."crefthe";
+  deps = [
+    "crefthe"
+  ];
   sha512.run = "dcb4f947d6d0fed303d53c19e29049070b1c3ca47fb0d78c0c1c3455f6de59ea2aa98640ac88549bb8f00f1b5cd4320a84f92f98d08a0ee788eb47417a86486d";
   sha512.doc = "4c84bebff2a93f8326fb8ce795a9fe2193194f70d49b5448b51d25a98378336bc931a60d762dc12bcfb2fffc362663391347a4b89e69336fb47efd23dcae4499";
   hasRunfiles = true;
@@ -11750,9 +11948,11 @@ tl: { # no indentation
 "crumbs" = {
   revision = 64602;
   stripPrefix = 0;
-  deps."catchfile" = tl."catchfile";
-  deps."etoolbox" = tl."etoolbox";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "catchfile"
+    "etoolbox"
+    "xkeyval"
+  ];
   sha512.run = "f4e3e045665c16d02c6b1cf2d43957fcbfe38ceb17b6bed9445803d4134a3ad2c22b552230ed685d42c33864169c782c9ef51ba47669d7a975e699ec532a1f76";
   sha512.doc = "b6e13f1177eace8e349648dd376e3252b34ada5e84c0a676631ef313507064c68624936730fe9780707bced36f05d4103cd9aa33a4bd511cd23836ed2ab38d03";
   sha512.source = "5220b2d854c11d4c0734ec22dded6c1259d470c416c08fec4d4fff35714bd56126f5c4f8785e958454c1a3854541b9d8cb571d4f7a86b636b1c12e739c52072d";
@@ -11778,7 +11978,9 @@ tl: { # no indentation
 "cs" = {
   revision = 41553;
   stripPrefix = 0;
-  deps."cmexb" = tl."cmexb";
+  deps = [
+    "cmexb"
+  ];
   sha512.run = "bc956c595d4460f35c64c92e7730a7cc9cd3af95301afba56c49bcf8415666863de926733409ce1afd99ba767fe3a3fa45c68f2dcc912b69c6f72b618289fb30";
   hasRunfiles = true;
 };
@@ -11800,19 +12002,21 @@ tl: { # no indentation
 };
 "cslatex" = {
   revision = 62387;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."cm" = tl."cm";
-  deps."csplain" = tl."csplain";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "cm"
+    "csplain"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "a65516275b53ce0e2487193b537759da447137898915f577c66893d6408c664b7cb830941dac2e80b2922c1597719cc879f66d3378216bfa2dc190e1bf502675";
   sha512.doc = "d1be033b7355bb3431193a9a39bdd1e269c7f3a97333c2b753ffdf795ad45a366893267a13472463805ed428760de680aae3377b25ef39bf5522a0186f80f899";
@@ -11821,16 +12025,18 @@ tl: { # no indentation
 };
 "csplain" = {
   revision = 62771;
-  deps."cm" = tl."cm";
-  deps."cs" = tl."cs";
-  deps."enctex" = tl."enctex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."luatex" = tl."luatex";
-  deps."luatex85" = tl."luatex85";
-  deps."plain" = tl."plain";
-  deps."tex" = tl."tex";
-  deps."tex-ini-files" = tl."tex-ini-files";
+  deps = [
+    "cm"
+    "cs"
+    "enctex"
+    "hyph-utf8"
+    "hyphen-base"
+    "luatex"
+    "luatex85"
+    "plain"
+    "tex"
+    "tex-ini-files"
+  ];
   hasFormats = true;
   sha512.run = "c4dbe1721fc2281cba7e426f6c75d35671cfeddf77a947f147a33c651090bc90528583445736bc2933c2d3986424e1b3ac4984e93cfae5f0ad1cfe41902f63cb";
   hasRunfiles = true;
@@ -11839,7 +12045,9 @@ tl: { # no indentation
 "csquotes" = {
   revision = 64389;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
+  deps = [
+    "etoolbox"
+  ];
   sha512.run = "68427cbe486f3b53bdb24869a3ad52cf6a006d7872ff9408560d9e4b0f1e8184fcb437d54e10f11d7a3585ff8ff7ad40ab4a95aa66091bb69a75a3e8e60aede8";
   sha512.doc = "ceba04fab9ec257c6bbc2fc903e3888bae9ef6bfa5664c8e01da14ee2b1482005aece22b6bf4fa7fb893c2dc1b0cb7f762eb048e0b2c039be80ef73b0bfef131";
   hasRunfiles = true;
@@ -11947,43 +12155,45 @@ tl: { # no indentation
 "ctex" = {
   revision = 63891;
   stripPrefix = 0;
-  deps."adobemapping" = tl."adobemapping";
-  deps."atbegshi" = tl."atbegshi";
-  deps."beamer" = tl."beamer";
-  deps."cjk" = tl."cjk";
-  deps."cjkpunct" = tl."cjkpunct";
-  deps."ec" = tl."ec";
-  deps."epstopdf-pkg" = tl."epstopdf-pkg";
-  deps."etoolbox" = tl."etoolbox";
-  deps."everyhook" = tl."everyhook";
-  deps."fandol" = tl."fandol";
-  deps."fontspec" = tl."fontspec";
-  deps."iftex" = tl."iftex";
-  deps."infwarerr" = tl."infwarerr";
-  deps."kvoptions" = tl."kvoptions";
-  deps."kvsetkeys" = tl."kvsetkeys";
-  deps."latex-bin" = tl."latex-bin";
-  deps."ltxcmds" = tl."ltxcmds";
-  deps."luatexja" = tl."luatexja";
-  deps."mptopdf" = tl."mptopdf";
-  deps."ms" = tl."ms";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."platex-tools" = tl."platex-tools";
-  deps."svn-prov" = tl."svn-prov";
-  deps."tipa" = tl."tipa";
-  deps."tools" = tl."tools";
-  deps."ttfutils" = tl."ttfutils";
-  deps."ulem" = tl."ulem";
-  deps."uplatex" = tl."uplatex";
-  deps."xcjk2uni" = tl."xcjk2uni";
-  deps."xecjk" = tl."xecjk";
-  deps."xetex" = tl."xetex";
-  deps."xkeyval" = tl."xkeyval";
-  deps."xpinyin" = tl."xpinyin";
-  deps."xunicode" = tl."xunicode";
-  deps."zhmetrics" = tl."zhmetrics";
-  deps."zhmetrics-uptex" = tl."zhmetrics-uptex";
-  deps."zhnumber" = tl."zhnumber";
+  deps = [
+    "adobemapping"
+    "atbegshi"
+    "beamer"
+    "cjk"
+    "cjkpunct"
+    "ec"
+    "epstopdf-pkg"
+    "etoolbox"
+    "everyhook"
+    "fandol"
+    "fontspec"
+    "iftex"
+    "infwarerr"
+    "kvoptions"
+    "kvsetkeys"
+    "latex-bin"
+    "ltxcmds"
+    "luatexja"
+    "mptopdf"
+    "ms"
+    "pdftexcmds"
+    "platex-tools"
+    "svn-prov"
+    "tipa"
+    "tools"
+    "ttfutils"
+    "ulem"
+    "uplatex"
+    "xcjk2uni"
+    "xecjk"
+    "xetex"
+    "xkeyval"
+    "xpinyin"
+    "xunicode"
+    "zhmetrics"
+    "zhmetrics-uptex"
+    "zhnumber"
+  ];
   sha512.run = "eea93d70d6c7768d8157841db4d4aadc3077422dba7b9cfa9bd4235dc547a43f694c9d3e0002fc2aefa3d8b8823f2478bee712a46cf62742bd30b7cffa7edcdf";
   sha512.doc = "9e23c44358c6060f071a5233ec81efa1efad1f280ebfbb025b7d4c5f6070d4480ad34b961591af429637dc2131b2147051a191e7ea20aa52ec6081bbdbe057fc";
   sha512.source = "1c0033fd3ee4585c3f81490e89c24f2224fe49966068b30fea229dd9c84b6d0b54e5ab2abbd6e500d211c9403fdaf418c3c7c04dead4cc2119912ac8c8000d42";
@@ -12006,7 +12216,9 @@ tl: { # no indentation
 };
 "ctie" = {
   revision = 62387;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "c1c69127e1157c15086beb269e1925feaf63eebbc45baec018ce97196a2fc42638bb3107a4c1d065e98a08e490d238d2bffe1827f27f9015ffa5be88be53d6bf";
   sha512.doc = "494a3e6569a77b434f66a56f1fa44d4651dc23e7cdcacb101043ed55cc6e32551f148e67976b67b88507da2fe05a0b006c810fb737f9364d47cb010438c7b39e";
   version = "1.1";
@@ -12185,7 +12397,9 @@ tl: { # no indentation
 "cyrillic" = {
   revision = 63613;
   stripPrefix = 0;
-  deps."cyrillic-bin" = tl."cyrillic-bin";
+  deps = [
+    "cyrillic-bin"
+  ];
   sha512.run = "1b8889d33e5433b32d0b84bd31ef7ea96fe338456ef8e1732ea6c254dfe2f21d3600766b1e51bafa4ddbf0144e8420ad8ba6ad593eaa32c3d45dde99b0b4ec8c";
   sha512.doc = "b0b1d24d3e8887c5b9c251922157de7cf042845009c07e62fd324ba850dff9f39bc6ebad04ab216ad69070da93f77f68693d1be57cd15b038374f0253329c8fa";
   sha512.source = "4dc564f475a883cb75ae0fad6b5aecb936c1ab9cdaae857dc7cdfb3d8f06f6534542c36b053cc7b74f455a2646f081060c670b35f1eda5fa69418b1c1f97e5dd";
@@ -12273,10 +12487,12 @@ tl: { # no indentation
 "datatool" = {
   revision = 52663;
   stripPrefix = 0;
-  deps."fp" = tl."fp";
-  deps."substr" = tl."substr";
-  deps."xfor" = tl."xfor";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "fp"
+    "substr"
+    "xfor"
+    "xkeyval"
+  ];
   sha512.run = "323b1526a32eb4e0d81db77278d66ebb6ac91fa357f7f76c8ac1f199efdc4be17ae4f8fb83fe55f3ac9cfb8a18d163a85d6c21cc11c26e4dea0db5f85dc12dd5";
   sha512.doc = "32b5391c7197bc29783bab0c93a5225784fea999f69bdd8b1b5c152ed338716f82dbedfdb6cd19064ee409407c0b808e5f410e6090cda6d1f8ded2ca41f3ace9";
   sha512.source = "e149a3be96ee0161b2bd872ab73e74c36ea638f0a1f0a48e0268093bdff2c2c1cfabe5c0a4d3ca8ef7ee4c02bd03710c5c1b2ff9c1b543ed792a444160814493";
@@ -12331,9 +12547,11 @@ tl: { # no indentation
 "datetime2" = {
   revision = 63102;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."tracklang" = tl."tracklang";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "etoolbox"
+    "tracklang"
+    "xkeyval"
+  ];
   sha512.run = "7f2ad65f95e3881e5016647bff85b10138faaa7d26d097bdce0ec7b30cc0d913a43c2a45b0caa69a6669e54725122cf1a86117d0d4f543caba67058423af7f62";
   sha512.doc = "d43970aea6c7971ed6a3564a6681caea0e0f5606607496d9ec51d6c2fa741dd6c28754c9e9f06cde0ad1a79280b53629eb427faf820d00549468a650cbd0eac8";
   sha512.source = "511c10e67c7d77ee10d8d75704628313a1598636ce82a5ce114942854b3a9d2da237ed12fdab986f13b04ce3c2123933db91b850360b309aa52305575a7cf2d4";
@@ -12532,7 +12750,9 @@ tl: { # no indentation
 "datetime2-it-fulltext" = {
   revision = 54779;
   stripPrefix = 0;
-  deps."iftex" = tl."iftex";
+  deps = [
+    "iftex"
+  ];
   sha512.run = "29a67f9c4414d08adce673ac2b501e92be5822470511b55677b041fa1d89b55760246fea08ba0f4cac7ef6f8e7ff52498f0459d50f94bf2bc6b3e4a944976a99";
   sha512.doc = "24bceb74337abc4ae74bbf9101bd32cc65371d60a0461cec91c8e3ecc3822c848eb8c7f0bc8706ec1b2118294df659b44f3139c3a3ed1c0c243f9654ae1b3d6d";
   sha512.source = "89a91a69a45100324b24c5cca3e0bdedc8dec2a466c414e65044f55a6c1ec3c715946dd5c5ed942fc9dc8f6a597fe5f2075dd7d05c88d241da4bccb27ba9cb3d";
@@ -12771,12 +12991,14 @@ tl: { # no indentation
 "debate" = {
   revision = 64846;
   stripPrefix = 0;
-  deps."listings" = tl."listings";
-  deps."listingsutf8" = tl."listingsutf8";
-  deps."pdfcol" = tl."pdfcol";
-  deps."tcolorbox" = tl."tcolorbox";
-  deps."xcolor" = tl."xcolor";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "listings"
+    "listingsutf8"
+    "pdfcol"
+    "tcolorbox"
+    "xcolor"
+    "xkeyval"
+  ];
   sha512.run = "88f9ff3f473dfbd84509adfe4491d15b7c20229361afde9cbce382be0441378cd6bb7d306c9b0a424dc065f34ab2d86eca8a0334d00fd3a5bae513776c418815";
   sha512.doc = "ba5e90ecc8c1733cdb78233099cdc95e09d02786df11606b3f823f2b1b60934cd2881c873ad7afa192ee1b0ff5ad91121896cb30e7405ee3ae9bc960d26e7f9c";
   sha512.source = "b9c0b94eea82d7b684aa358788a5ee3cb9709738137827b7a4f70ddd0d02ad92b6feecf03d0de7dd08c1ab233f17db3c973cfafef98134be33a41d6a8d7c4da6";
@@ -12818,8 +13040,10 @@ tl: { # no indentation
 "dehyph-exptl" = {
   revision = 62734;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "13c7fe78927fb7e85155284d47fe597e173647efea8d7077e06f55c358b2b851e3b65820829859d4d770b81af836f308a2b9e0e5c3ddb17f1644d1cf803adc63";
   sha512.doc = "812af78620465987b65654b1b0e270ac911a18019106c54d24622b4f146534f9474b691247e8cde140c1101bf48d843fb1238e5713f9a59a79e969b9314ae895";
@@ -13186,11 +13410,13 @@ tl: { # no indentation
 "docshots" = {
   revision = 65141;
   stripPrefix = 0;
-  deps."fancyvrb" = tl."fancyvrb";
-  deps."iexec" = tl."iexec";
-  deps."pdfcrop" = tl."pdfcrop";
-  deps."pgf" = tl."pgf";
-  deps."pgf-blur" = tl."pgf-blur";
+  deps = [
+    "fancyvrb"
+    "iexec"
+    "pdfcrop"
+    "pgf"
+    "pgf-blur"
+  ];
   sha512.run = "1d4ce9b3bd39d12bc4fc2630c3f9116e7030d623700e951fa99e5bd25fcb2965765d5bf32a709eb9ea2ebd39382ef1ef33205ddd24c6cd5e9b75136de0ff18c2";
   sha512.doc = "7ab3122caf188621a0f5045b9d8dff1361b6577c6e80d6f6bf20a9e81703e7060936162356e4c34c44bea6f8611ae8819eafd8abf745a28346ce3d8b065596f8";
   sha512.source = "1913dbf266953cd42e9a840e140b00fc785f12f610d0e5c84f70a1eb3bef06b8a4cd5c612c682a8c6ab2fb8ff355fe416cbbe70ef366e123f13419bcaaa1abbc";
@@ -13672,7 +13898,9 @@ tl: { # no indentation
 };
 "dvipdfmx" = {
   revision = 61101;
-  deps."glyphlist" = tl."glyphlist";
+  deps = [
+    "glyphlist"
+  ];
   sha512.run = "6dd78f4b5cabb51c3bd9988fa46bf90a5a79b3d3293257a4c563a8a76a5a03eb167ce3ec0d4ce6ed05412a551eb201f2379a50a97ac5355ebe833f7b34cee4b4";
   sha512.doc = "00dce9b36eefd1788bbe455b2e5104efd9afc8bd891aeafb2cd9bdee406eeb25ab520e42e614e9d2363eb6a7273232bc3c4805bacd82a22099c5ffc438e852cb";
   hasRunfiles = true;
@@ -13808,11 +14036,13 @@ tl: { # no indentation
 "easyfloats" = {
   revision = 57204;
   stripPrefix = 0;
-  deps."caption" = tl."caption";
-  deps."environ" = tl."environ";
-  deps."etoolbox" = tl."etoolbox";
-  deps."float" = tl."float";
-  deps."pgf" = tl."pgf";
+  deps = [
+    "caption"
+    "environ"
+    "etoolbox"
+    "float"
+    "pgf"
+  ];
   sha512.run = "2d02a55fc3d50e5fb79ebe8188300db47aaecb42089843033c569ee0508a38f81e9409d872535e1f7fe3b13a067bdabbf8249073b803c8d232d08aa1d5520d48";
   sha512.doc = "d6e96d7af908e83b67b77f0432e6ffcdcc55b64bc63ac360e42291f16adec4ab6655a423f5fc8f31180071afc5645f47b7ecb2c1c80af719b6cb0cc6e77948da";
   sha512.source = "b21681d30b8963127d603bf81b140851b5e8ea17b63d5979bc05bcfa68efd67460b9f0d0419a69c44606a4d569f5840b3c8d6f0ce7b0cf18d86c1fa104776b5a";
@@ -14133,7 +14363,9 @@ tl: { # no indentation
 "einfart" = {
   revision = 64280;
   stripPrefix = 0;
-  deps."minimalist" = tl."minimalist";
+  deps = [
+    "minimalist"
+  ];
   sha512.run = "0038664f40f0cf5c940d44d618876e98f1419058b7bfe27e741d536743c4ca208bd728aa4a193544956efa30c0e970ffbb04559e751b116037c8760d34a615f6";
   sha512.doc = "89cb6a140802ed0395bbad43c3bdaeca5879e4564d0f9ae15f333f243490788651bdef214d2aafa5c44c0d720e8fbfc66f3dd584b544d80ad3058015cb883553";
   hasRunfiles = true;
@@ -14566,7 +14798,9 @@ tl: { # no indentation
 "environ" = {
   revision = 56615;
   stripPrefix = 0;
-  deps."trimspaces" = tl."trimspaces";
+  deps = [
+    "trimspaces"
+  ];
   sha512.run = "c8dec70e56651a89ae8da15abc0ad81cc2edb4487837469238e2adc0e7c58cae4c5da82b637a3336839b50103e3d846c5cee8c73141488f644469a0f3e9d363f";
   sha512.doc = "78d4d3f570470619c938687a6c9a6925aad901d781e3e893bd731a49bb8eca62bf1870e68d84f7125e10d91d7bec02a323ae42278ff59c04d7e33eefa2261496";
   sha512.source = "b30607d21bbf5ddf1c7d36bd9173a16d91bdfcfa004782be50e50f17bf54d94e943d5e524e2331b75f3ce65e81193ba98e69ab56c38959d632007f5b0a87bd6a";
@@ -14585,13 +14819,15 @@ tl: { # no indentation
 "eolang" = {
   revision = 65289;
   stripPrefix = 0;
-  deps."amsfonts" = tl."amsfonts";
-  deps."amsmath" = tl."amsmath";
-  deps."fancyvrb" = tl."fancyvrb";
-  deps."iexec" = tl."iexec";
-  deps."pgf" = tl."pgf";
-  deps."pgfopts" = tl."pgfopts";
-  deps."stmaryrd" = tl."stmaryrd";
+  deps = [
+    "amsfonts"
+    "amsmath"
+    "fancyvrb"
+    "iexec"
+    "pgf"
+    "pgfopts"
+    "stmaryrd"
+  ];
   sha512.run = "2c98181e8dccb936d3f87812a5aa7f3bfb1faf5796a790f3d41ecf94f0331a5069341c2843c81f058c4374a0bc4e31b316e7e30045d0e44f729579bea76f1308";
   sha512.doc = "90e0a7e29708b4dcc79e9f7492bd218fa84eb0860bf33651fad77eda0e161cabbba20b1bf57aafbaa1077da3335a78436ee9ab3f33965e5e091eb080058cf2e7";
   sha512.source = "197fefc52cb241227dea65c14d11a427f0190c6ad6fca97ea6a330471d44c736ad40578338d342c3ace689739e861cc380198c5c05f4648dd0ad423e5ac60da2";
@@ -14639,25 +14875,27 @@ tl: { # no indentation
 };
 "eplain" = {
   revision = 64721;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."pdftex" = tl."pdftex";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dehyph"
+    "everyshi"
+    "firstaid"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "pdftex"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "fda8158ae2bdc96187b6e6ace2a94be3e0f68201adbc02553b48a3848481352ac10ddd72babcbc2835e089ce751ade7dfa6cfd1c642c94155c2861db865f5c29";
   sha512.doc = "60902b2422d2f5d7570a19daf7f586df7882505d7c156539699a0aa47a0f3bde5688dcbdc92c8a6a9878f11392bc9b9f147626aad230eecd2740d56f104928ed";
@@ -14903,7 +15141,9 @@ tl: { # no indentation
 "esint-type1" = {
   revision = 15878;
   stripPrefix = 0;
-  deps."esint" = tl."esint";
+  deps = [
+    "esint"
+  ];
   sha512.run = "5a663d01e9241adf1961c922c588888561f495e6378fdd7aaa90954c3e51c5f0f8e6dc1e1947c9f03ce3472e1aab3dde1b35e6b5f0814f5e2cda564a31a45a1f";
   sha512.doc = "081a225225f503fac403d306fac3ee3b2747341ef5c4ee9420f49a56ca959c7757f154c24f90ed9506041b13464ea216e6edb52f29790d189ea7b33c7c797f8e";
   hasRunfiles = true;
@@ -15877,12 +16117,14 @@ tl: { # no indentation
 "ffcode" = {
   revision = 65170;
   stripPrefix = 0;
-  deps."environ" = tl."environ";
-  deps."microtype" = tl."microtype";
-  deps."minted" = tl."minted";
-  deps."pgf" = tl."pgf";
-  deps."tcolorbox" = tl."tcolorbox";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "environ"
+    "microtype"
+    "minted"
+    "pgf"
+    "tcolorbox"
+    "xkeyval"
+  ];
   sha512.run = "e76c0605b8a074d1827a73a3ba4e9fae40ade590b01e90ee10593c4484e0a534cebb556bf49389fa03355424910cc349b73fbae2827153fc717be69d38d007e0";
   sha512.doc = "c5302e1113f5d1a05517c4877efd710bc6931bac62157001ea540f0b40388c95202dd457fb1362f8b30dc313a48d9742fcd5c6c6a7e5f3404755a3eafa01041a";
   sha512.source = "2863c642dddba771bc4507ed2f0e4a3c4ff12ab4291fb397a2e0f8859776bbba7442a85fefe87d655d0c6236b5e40878ba29cfa19f71870f6932f38247657f5f";
@@ -16606,12 +16848,14 @@ tl: { # no indentation
 "fontspec" = {
   revision = 63386;
   stripPrefix = 0;
-  deps."euenc" = tl."euenc";
-  deps."iftex" = tl."iftex";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."lm" = tl."lm";
-  deps."xunicode" = tl."xunicode";
+  deps = [
+    "euenc"
+    "iftex"
+    "l3kernel"
+    "l3packages"
+    "lm"
+    "xunicode"
+  ];
   sha512.run = "fc4516b96eefa9cb896488510f5ac531446acfa7993abc2f361751e06fe95128afbaadad393dd7ce8c22ea731c81ba99cd8182ce8205c55f78f64a69ba815996";
   sha512.doc = "e765756f93f1aeb03acf0f15d3388c3a39156f2bc46e951ab5c2e4596ac9babd975af025c0881078f58caeacc3281d3769a701f112b17f10ac474d12b4eac897";
   sha512.source = "286db8b9c512c02f2333860b5ff2c980b8b5680de92fc896c95611f2cf1587077f47f9c0aa0e520ad0f64c6f031f8a2fb310f67034ebaca286076d7764bfbc99";
@@ -16721,13 +16965,15 @@ tl: { # no indentation
 "forest" = {
   revision = 57398;
   stripPrefix = 0;
-  deps."elocalloc" = tl."elocalloc";
-  deps."environ" = tl."environ";
-  deps."etoolbox" = tl."etoolbox";
-  deps."inlinedef" = tl."inlinedef";
-  deps."l3packages" = tl."l3packages";
-  deps."pgf" = tl."pgf";
-  deps."pgfopts" = tl."pgfopts";
+  deps = [
+    "elocalloc"
+    "environ"
+    "etoolbox"
+    "inlinedef"
+    "l3packages"
+    "pgf"
+    "pgfopts"
+  ];
   sha512.run = "edc3341b84e7e89fba3bb76004562c0bc889f944ed33474ba9cf5ed5e63a690202e851a30f44158caa8351b874b8e91659bd91c50d59ec43de9460869e4213f1";
   sha512.doc = "fdaec77023176fc2f7510a9e3b4dcc587898e1f96886340222f932c0d93b1002ad35fba8a38a036f713e41814f3dc6b3f75a5657ae485b15ffea43089895bcae";
   sha512.source = "45f912d17d29568e6ee267814d63bc14c20bb0d91c62b39c21301dd611c50db3b5f7de5f16b519da0f2b4d15609727144c34b16a620abb85114a42344cdaf24f";
@@ -17144,7 +17390,9 @@ tl: { # no indentation
 "garuda-c90" = {
   revision = 60832;
   stripPrefix = 0;
-  deps."fonts-tlwg" = tl."fonts-tlwg";
+  deps = [
+    "fonts-tlwg"
+  ];
   sha512.run = "a806538598cae0365968ab20936631a052dc65f9f6056c39197f7b1c7a5aad717a7a8b72ed2a1af347f8ce91f27d7dcd74b758db8f01fc7810a8d658990bcc28";
   sha512.source = "58f62ec8020489b69743c0591129967730f9ad0729f7cca343ab6e6fa6675122a1e37bf73f090cae050cb695a14dbfb3c52346e3c528e660484d2cb576aaca65";
   hasRunfiles = true;
@@ -17191,9 +17439,11 @@ tl: { # no indentation
 "gbt7714" = {
   revision = 64633;
   stripPrefix = 0;
-  deps."bibtex" = tl."bibtex";
-  deps."natbib" = tl."natbib";
-  deps."url" = tl."url";
+  deps = [
+    "bibtex"
+    "natbib"
+    "url"
+  ];
   sha512.run = "f2f869bf4d507ac76ee576f1bb739bc5e5681d3f2cb1db64841f90dfb22a9b18aab04c5722e231280cb94f055ab002ed99fc965bdbb3d2bdeb8d953f704e73b2";
   sha512.doc = "17b79fb795d0b2a0f2c696da83ee1196750c1fef15c77d33353d6742443d43287b5bb96c349be8e58b0df538f4585f45b353234bb100318cbbc6de6f14192da9";
   sha512.source = "0d7e44fdd1106800d2dac2cac49dfe4c9154498837e27880f0193fbc8033f2a74fe5670f79c929ce2216fef216288e5e072f1ccddd23cec85b6265ad569d21d0";
@@ -17307,8 +17557,10 @@ tl: { # no indentation
 "geometry" = {
   revision = 61719;
   stripPrefix = 0;
-  deps."graphics" = tl."graphics";
-  deps."iftex" = tl."iftex";
+  deps = [
+    "graphics"
+    "iftex"
+  ];
   sha512.run = "ed64996404299bd8379197b293baed752ff064e04eec87ffafdfd55cf21c2c48174560eb1c3bcdb0b06190badb9d9cc699aaa7a2ac8a5c537b0c818a423770fc";
   sha512.doc = "a58ab22ae6df349d81b5ddf18a4e9b7dbb5804a497bbaff42acde18ca59fe8a19bfee34293debc23e44c690456e6a1b1d87614fbb85dc6cb3b3b7d330fc866d7";
   sha512.source = "f4e1e8c0f5b8f443c8f5e6ad948cb1736ed944384daec20e9402c871872e86248b3167c72e07fc94fe32ef6ab36c17d2f177135ccf99f68d1c892af0a695bcbf";
@@ -17633,13 +17885,15 @@ tl: { # no indentation
 };
 "glossaries" = {
   revision = 64919;
-  deps."amsmath" = tl."amsmath";
-  deps."datatool" = tl."datatool";
-  deps."etoolbox" = tl."etoolbox";
-  deps."mfirstuc" = tl."mfirstuc";
-  deps."tracklang" = tl."tracklang";
-  deps."xfor" = tl."xfor";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "amsmath"
+    "datatool"
+    "etoolbox"
+    "mfirstuc"
+    "tracklang"
+    "xfor"
+    "xkeyval"
+  ];
   sha512.run = "a805158d4c2741c4efc707bfe417032903630d3f235c7431a3767e47592d8b9be2d64f6a14f21a0c7a3f4b37cbcba90d501c0ab1a551fe16357745960f362a1b";
   sha512.doc = "24e43bacdaf3d3680b49460849f2d4eb652f2e2103558edecff0cb78d261d0275e5f416c7fe83857fbe09f7016643849ee5f030e4b3db167f469960d7791489b";
   sha512.source = "5240de5d2c942ec2eba38e76073f230265ce74dda641622acc8aad4c5856c1e8a749d01829ac39fc4b83479d9d24346270507c0f4bc5b957b7f4f3d07c4e898e";
@@ -18010,8 +18264,10 @@ tl: { # no indentation
 "graphics" = {
   revision = 64892;
   stripPrefix = 0;
-  deps."graphics-cfg" = tl."graphics-cfg";
-  deps."graphics-def" = tl."graphics-def";
+  deps = [
+    "graphics-cfg"
+    "graphics-def"
+  ];
   sha512.run = "e123ddcd0af8ddd37519076b86a443ff74af4da4a960446708c344a2fe75b700a4700db71414cfe06470532ef863926e5e45b9292f81dfed07f60323543e92cf";
   sha512.doc = "9ff56bfcb46f79ea455797e6582a04ce4e8539b395c988382359cdc7eff81544861b85f3b9303acf12a3f05b66aa52311d776cf3d12404b976068369f3947e08";
   sha512.source = "a23d65d454559f6f84f3a810357d31153bec5d44c8ccbf142b1ed14eeebda7cb7c385de9b5da7ce225db169f05e6d155263a097421c84af6e845b1acdbe36902";
@@ -18931,23 +19187,25 @@ tl: { # no indentation
 };
 "hitex" = {
   revision = 65130;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "etex"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "knuth-lib"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "5a88c0f4d7bddc0161ce24bbe17884a93469f9ffb56ea6a2dcd3045cb97e5c9d09941e44e365483bc5126e1c9c6970ad151e19573d93b1472534333a507f1c63";
   sha512.doc = "3016748caa430c75689e27459c002abc8f68d4aa1c2d0be04b1f82981c44f7a3fd748f900aab5e4c37b16a56f884d5c0cf7d42323288c74cb51b72c19e0b08aa";
@@ -19082,8 +19340,10 @@ tl: { # no indentation
 "href-ul" = {
   revision = 64880;
   stripPrefix = 0;
-  deps."hyperref" = tl."hyperref";
-  deps."ulem" = tl."ulem";
+  deps = [
+    "hyperref"
+    "ulem"
+  ];
   sha512.run = "fd3ddb8d494b5b6a80bddf3e28747cb872452d8bf56e0e59cdbd19e811a235683ac0aff7e92e358f7b9f352cfc2b6c03f2263248cc13e147e4dad649fb331381";
   sha512.doc = "9318e6fd357b9705e95db7600dea3b3b1fe2e7bcb0dffec4bf92b5375a8d7feaaf1574188bfeaefa71f05f6aa3728b51d9c7c72908cc66945a3bc8d5391583d9";
   sha512.source = "cea37410dbfd8094c4028b96f03d8ac631a32f349098ad5acdbdd484a789d2da58a21f65745d647e05075226d8ad3e1c2217850a312afe522206e900c0b00eed";
@@ -19120,33 +19380,35 @@ tl: { # no indentation
 "huawei" = {
   revision = 65264;
   stripPrefix = 0;
-  deps."biblatex" = tl."biblatex";
-  deps."cjk" = tl."cjk";
-  deps."currfile" = tl."currfile";
-  deps."datetime" = tl."datetime";
-  deps."enumitem" = tl."enumitem";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."footmisc" = tl."footmisc";
-  deps."geometry" = tl."geometry";
-  deps."graphics" = tl."graphics";
-  deps."hyperref" = tl."hyperref";
-  deps."l3packages" = tl."l3packages";
-  deps."lastpage" = tl."lastpage";
-  deps."libertine" = tl."libertine";
-  deps."makecell" = tl."makecell";
-  deps."microtype" = tl."microtype";
-  deps."minted" = tl."minted";
-  deps."paralist" = tl."paralist";
-  deps."pgf" = tl."pgf";
-  deps."setspace" = tl."setspace";
-  deps."svg" = tl."svg";
-  deps."tcolorbox" = tl."tcolorbox";
-  deps."textpos" = tl."textpos";
-  deps."titling" = tl."titling";
-  deps."tools" = tl."tools";
-  deps."ulem" = tl."ulem";
-  deps."wrapfig" = tl."wrapfig";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "biblatex"
+    "cjk"
+    "currfile"
+    "datetime"
+    "enumitem"
+    "fancyhdr"
+    "footmisc"
+    "geometry"
+    "graphics"
+    "hyperref"
+    "l3packages"
+    "lastpage"
+    "libertine"
+    "makecell"
+    "microtype"
+    "minted"
+    "paralist"
+    "pgf"
+    "setspace"
+    "svg"
+    "tcolorbox"
+    "textpos"
+    "titling"
+    "tools"
+    "ulem"
+    "wrapfig"
+    "xcolor"
+  ];
   sha512.run = "d181f45f8211714674697a8e2e203b3169cb1be998687f315418dca664cb09533b5e3b5f7b1cda0db628401d263d7ca816c2ce1c29da48f1550ea9100d9e2523";
   sha512.doc = "3b4112d8b5389ab26034ff126744aa4299cbc5f42630a00a7e7b4245e4355ed0abe42718100439af3cb5b1642db4567b6d16e69ffe852cae0c5c9aa20e8cd7f9";
   sha512.source = "93271d9361e0cbf9fff9890f2617c96a381b631332041a576309a28af77150afc1da99f7596d3b89d0685584115cdbfd46d1b5fa7706b7ae4af88984e8fae8ab";
@@ -19306,23 +19568,25 @@ tl: { # no indentation
 "hyperref" = {
   revision = 65014;
   stripPrefix = 0;
-  deps."atbegshi" = tl."atbegshi";
-  deps."auxhook" = tl."auxhook";
-  deps."bitset" = tl."bitset";
-  deps."etexcmds" = tl."etexcmds";
-  deps."gettitlestring" = tl."gettitlestring";
-  deps."hycolor" = tl."hycolor";
-  deps."intcalc" = tl."intcalc";
-  deps."kvdefinekeys" = tl."kvdefinekeys";
-  deps."kvsetkeys" = tl."kvsetkeys";
-  deps."letltxmacro" = tl."letltxmacro";
-  deps."ltxcmds" = tl."ltxcmds";
-  deps."pdfescape" = tl."pdfescape";
-  deps."refcount" = tl."refcount";
-  deps."rerunfilecheck" = tl."rerunfilecheck";
-  deps."stringenc" = tl."stringenc";
-  deps."url" = tl."url";
-  deps."zapfding" = tl."zapfding";
+  deps = [
+    "atbegshi"
+    "auxhook"
+    "bitset"
+    "etexcmds"
+    "gettitlestring"
+    "hycolor"
+    "intcalc"
+    "kvdefinekeys"
+    "kvsetkeys"
+    "letltxmacro"
+    "ltxcmds"
+    "pdfescape"
+    "refcount"
+    "rerunfilecheck"
+    "stringenc"
+    "url"
+    "zapfding"
+  ];
   sha512.run = "b0e32f4792039b1e48f4deab6b33a53a0bc32549a6fddada1156880c3ad21bf566d69389c4ae626fc1a844f3b0b94f24a4b1331a9e52b89e4619993bc81c5db5";
   sha512.doc = "97bc2f11dc6b023347817fb18ff91ce6ed4d2a9e22ad3f17aea29781a0bacf6173f13e59e64229c6f62a9b2e67f7b1fdf513db11fb6759a5373b7a1d38d703c8";
   sha512.source = "f8d405385e10f1d818c6c97ca7919886e3b520e661e465e0f516a36ed884de8011cf907b72dc49f0437741df096af2f49837af4d31fb46159efe7867466292a6";
@@ -19348,8 +19612,10 @@ tl: { # no indentation
 "hyphen-afrikaans" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "0f969847994b3b377c752c23f802e8c51b4076efc2d43ad2560a72b83cea3bf0a64d7df18a59afe4289a4547a9f23cf81b0c365a499be85a2467579941fa9700";
   hasRunfiles = true;
@@ -19357,8 +19623,10 @@ tl: { # no indentation
 "hyphen-ancientgreek" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "3f91560ecf78c5540fd4f5d9890f6aa7a57bcd3a41095985785505b82e40793b91a5da3a01bdc021b11c32db3dd7030a104686b34b496c9094acfb85509cd007";
   hasRunfiles = true;
@@ -19366,16 +19634,20 @@ tl: { # no indentation
 "hyphen-arabic" = {
   revision = 54568;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "85012062097dd4b624cb39c68b293169a25ab3c9cd15b4474c3a3ffbe4b8ab13d6856c6c70a580da45a2d210952df2d9760682da3917cfd24d17772dc2ccce7f";
 };
 "hyphen-armenian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "59538414bf5a4701199100fbd9d5247999a36bc28c7c6ef2a28deb9024e01605d48839f00f345c848365853ac3a9f1aab7402f44860532d7a5c099d2f27ee189";
   sha512.source = "d25e6347545e00a809db1dc8e48ef3fe67678b9ec93a1f3619d2a5a3d786d6e411c2e9f905120e3c5d01d9489c0a83035ce8025836249c88ee768bf07b8e2ca7";
@@ -19390,8 +19662,10 @@ tl: { # no indentation
 "hyphen-basque" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "b90680dc5692824d60ca603e8bdd2fcade7cc772c8c0f9538d579704fb16165db2baf0c466ccaff46d92491b4a678fa86a127c0d106dbef6d640dfd2f887663d";
   sha512.source = "75a20da77fa056c719ecc1f014bb09c67f62f1c4a3abe04b7cadf45c7a4e06e4492cb0d34a8025f19f3ee5e3330e488212885095335d4a7e97baa5b106576223";
@@ -19400,8 +19674,10 @@ tl: { # no indentation
 "hyphen-belarusian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "19b9bd10d2357d0cb6ecc9ddb5e46b65b3c0eec1b2917a78311f255c1609bbb86595ce617d331271a72de934ae4001597f4a04d61b3810e34f3b197b21cab193";
   hasRunfiles = true;
@@ -19409,8 +19685,10 @@ tl: { # no indentation
 "hyphen-bulgarian" = {
   revision = 58685;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "9763e6ece053594b01cd9255a8a3551eb6b86ab082f6f9283664e256c55d43b9513b624774a650d83215d656334751f569496030187c1c78e2fe80f2d10f2f1f";
   hasRunfiles = true;
@@ -19418,8 +19696,10 @@ tl: { # no indentation
 "hyphen-catalan" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "37189e09ee902f2c5145f30180b51211091b07d7d04125c98f1b7c424ad27f6899424b78cd17c559509076eeeb957b4f268fb4130807e7fafb461174fed8200b";
   hasRunfiles = true;
@@ -19427,8 +19707,10 @@ tl: { # no indentation
 "hyphen-chinese" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a78b70095fcfe297e2d85a49108affd5d48451ff4740461eed46d395410a665011614c9a89dff37e9477ee3803de6ebaa68595ac39222f2968a4124355ea7fa7";
   hasRunfiles = true;
@@ -19436,8 +19718,10 @@ tl: { # no indentation
 "hyphen-churchslavonic" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "c44b3f5fec7b44958336dcfb1a43c5b71fd1715262278863f5fcd74d7ec0cc6f1d572b741256d791e6979f15e4b0fcda8058725e27f17e1deb6e5df5fdb007ab";
   hasRunfiles = true;
@@ -19445,8 +19729,10 @@ tl: { # no indentation
 "hyphen-coptic" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "fe36adfe900e23f2b0c3e9c3a3d96b608c49bf597222537d355d6a68e2f87f587db78a1921ab1c9a80ea175529e353524c35e99b83ef7f5515ab7c0aacd2f680";
   hasRunfiles = true;
@@ -19454,8 +19740,10 @@ tl: { # no indentation
 "hyphen-croatian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "8355d0aa95bb2e72bfc45015f9ae9f6a138f94441387a4daadfec5be4060878f6e69d05eab15432d99c256c1a3f68c122d5c915164fe343459d658a4543ddf42";
   hasRunfiles = true;
@@ -19463,8 +19751,10 @@ tl: { # no indentation
 "hyphen-czech" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "f5c8b08c2db716dfa6d36fcf337b4e18372978d04e28ff2c8ed0a0b3866f4bb3efb7b498fedbfde5052fc504b8677ae553c2dce73701e219632d8c5460d7e826";
   hasRunfiles = true;
@@ -19472,8 +19762,10 @@ tl: { # no indentation
 "hyphen-danish" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "954543a3fb81ff00d9c58315ba59d7a5e3430217dda6c1453bcb7ffb0516025dea4b877eb9d66c9f80ccc69d3d4895bdc6ae1b611d8394435fa647b8b806559d";
   hasRunfiles = true;
@@ -19481,8 +19773,10 @@ tl: { # no indentation
 "hyphen-dutch" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "111371e47ca29069a5a9144d694858dd899b19e2b38d0c793b1e4884c69ae2d62398aacb4cd89e23246fc025e42872875bc808c1f327ac1502fac88c962e6c14";
   hasRunfiles = true;
@@ -19491,8 +19785,10 @@ tl: { # no indentation
 "hyphen-english" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a305cf89138e4327844d43a7e21773e31ac97a4655e4d58ae9a46dc0df565e432330debf704c37b4ad552561357521eba0b676755544ceb9c4f21ace09d6dd2c";
   hasRunfiles = true;
@@ -19500,8 +19796,10 @@ tl: { # no indentation
 "hyphen-esperanto" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "ed2976e9fb3eec5d2f0759348b284129e43bf161db571dd21270335388b8aec57e1b8393bc9b246f8a6e9cde22f93a4cb3c1a03dcadd64fdda3d70b576789050";
   hasRunfiles = true;
@@ -19509,8 +19807,10 @@ tl: { # no indentation
 "hyphen-estonian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "0eb91153214aaca8c3b5816f5315f9afdeb7c19521c87c79ea2b35e82217bfb23c8bb774baf810206f4413fc663e441ebe6b4962880ca0dbcda9209d2acce3b8";
   hasRunfiles = true;
@@ -19518,8 +19818,10 @@ tl: { # no indentation
 "hyphen-ethiopic" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a1532603758e7f774acba7c13ee74f0046ff187598ca86b2e93b91da31317f03fdbab5d4d7c0814978fb2ac159bd6e5a48e6e734c19758da21ad0a031844f52b";
   sha512.source = "9d6c8c1b0ce5c40d388937328461336a97fcf1fe780fa6198e029f12ef118d9d98f6eec03ea217743851f0217217d6548298df9336fcf33e6c4c196bbdb9eef0";
@@ -19528,16 +19830,20 @@ tl: { # no indentation
 "hyphen-farsi" = {
   revision = 54568;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "5b02582769a55bb07d81e748e83170c16aca1c33b0a240cf547fa9c2212f2be52223e258229c760ddc5dd730419bd9e761614cc4fb3b3ba8102841bb779af511";
 };
 "hyphen-finnish" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "6aa171d77952165cdcb1b667885f16dd382124ed70ed1db80a9a89553d972720d8ff5f0da1b36669e02c3030d9ff362ab77ba1fa2ba45cddfb460018f0c0191d";
   hasRunfiles = true;
@@ -19545,8 +19851,10 @@ tl: { # no indentation
 "hyphen-french" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "b9d2d05311a90f4caa6c4e8aa8a2e80e9c15fc3552f03f0ac6ec70d386610612715deb6e778247248355a3a209fb2413d6d2aee12f18bc35d5a334870b612507";
   hasRunfiles = true;
@@ -19554,8 +19862,10 @@ tl: { # no indentation
 "hyphen-friulan" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "d1775a9b6e6b7fa155e44c93271e2ccb41bd1ec143ea0cf624841ad48a123db924dd134e6e60b862a808ad2058ed5b86cb34d98e5728b9dccd3997ba2f06932e";
   hasRunfiles = true;
@@ -19563,8 +19873,10 @@ tl: { # no indentation
 "hyphen-galician" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "2d707542f80dc94ad20c0daa776df23b773a5e6ccb261e11db675e1e89f5f303a4f5cd50d97f491cc7ea8b0f3c0d3f6391707812a95d4e72cca3afa7815e566f";
   sha512.source = "b9925168b1f9ae5139ffc3bd34810cc05a27475cfae31e98fd0d7618575fc994ca95d7479506024abec2c33bb20121811244d69c490df18a29d6c93fe02174c6";
@@ -19573,8 +19885,10 @@ tl: { # no indentation
 "hyphen-georgian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "edaf041a2f92b0f7dbf28042c81838e8fd781cf9c3ad529c314227c94917ce4e8728ca676f8bd42e2a81bae76b11aabc1e22896e3ef9cd38ca4b718bc58fa0cb";
   hasRunfiles = true;
@@ -19582,9 +19896,11 @@ tl: { # no indentation
 "hyphen-german" = {
   revision = 59807;
   stripPrefix = 0;
-  deps."dehyph" = tl."dehyph";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "dehyph"
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "c27389dea67ffd0d45419d484b0c72577b2d5b8234266483add078b970d5d994d41f7cf9a1509ad93efe9489501f986127ea717135c5f57588094393e0d7219e";
   hasRunfiles = true;
@@ -19592,8 +19908,10 @@ tl: { # no indentation
 "hyphen-greek" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "3da84f41aaf7e5d4be0ce609e4d119e65c9189ff6662051cb7e879e9e373d990ef1c59ac7cfead1bdbc6e55b52d4b3ed28d157b22dbec43e5226f16872d5a7de";
   sha512.doc = "865aaf1f9f0fbe130f9006e41ef677713667832745fc24c28cffe805a540a19f7104a3f0fef3258ba0e16c1c456959904887899a4c584338c58de7fcc80c5419";
@@ -19603,8 +19921,10 @@ tl: { # no indentation
 "hyphen-hungarian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "868a4c3f4d0eda078054026bd1ec35e05c2f4013e093bf58147bfa2d861814242b55a900ce60384767558c9552ff9d41cf447e2a157bae83bd2877251012d96b";
   sha512.doc = "164180f0485e16a49ba83dcb4721902e8a29f399032d4f5a59d55e424b8178a25dedd9fb99919d9d772142342fb78fe0dbf7a5303382a0b7feae4a381b76f8bb";
@@ -19613,8 +19933,10 @@ tl: { # no indentation
 "hyphen-icelandic" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "69add7ccde189e86810e2a82692a260de9a9fcc0ba011352881d202d4f4c94c4dbd84fe36dff40ef9b9ad3e8e990947cc61022307790f13cad56744f3ef5e41f";
   hasRunfiles = true;
@@ -19622,8 +19944,10 @@ tl: { # no indentation
 "hyphen-indic" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "765be1c13ef3445b056b61c24460cc2f18bad038c04541bf4773c7f61c6d26be25d3079b260a1b9623e2f01155ec52eb5bc87b0ea9234e50a5ca24dd8a7a5937";
   hasRunfiles = true;
@@ -19631,8 +19955,10 @@ tl: { # no indentation
 "hyphen-indonesian" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "3f04a63010c02d77cb229c90aec9f1079557493958573be9ce992ac5ae3c229f01f9abc0cac785d9340ff48aa169a01f8b327ecb2e255bef57f1fe85d04d1d2a";
   hasRunfiles = true;
@@ -19640,8 +19966,10 @@ tl: { # no indentation
 "hyphen-interlingua" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "dfed82ea70f25d452726b5cd03d8e060bddc23cbbc5deebab2ddad93ce6744c38d357327fbe570bf7a1444f62cee0cc422a6c7d066d6693a238d851b4fe46e32";
   hasRunfiles = true;
@@ -19649,8 +19977,10 @@ tl: { # no indentation
 "hyphen-irish" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "478a77c4ab8231a3041c3427075f16c072f58a394eced8ff0cd5da6544f3f2fd65722f33fd8344e18060c96f09bd18b90af71f8508639fc9c59d29d704d9e348";
   hasRunfiles = true;
@@ -19658,8 +19988,10 @@ tl: { # no indentation
 "hyphen-italian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "4e79ee31893d6c948a3aac8588d4beb75d89f89df973b1e39cd63894e008af55f8dca774194d7eb105fb0aef692b17bb645d5bd85cca7debafd74aabf241bc30";
   hasRunfiles = true;
@@ -19668,8 +20000,10 @@ tl: { # no indentation
 "hyphen-kurmanji" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "e5114da178fc841b1079130c01f8729ac94f0e3592dbd479f44a978ea009fd75b410d6130d9badd6227d115d8f6dad3ed4b553dbfbf4f80be5d1c2adf108e2fa";
   hasRunfiles = true;
@@ -19677,8 +20011,10 @@ tl: { # no indentation
 "hyphen-latin" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "9d0db7fcad4ca764379957fa22f9daede79898bcacfbdb62abe54318a52dd82a66f8e39542c18008e3f6b6d0db284b1e9b891531d3c8f3c9cf22c764e83d57b3";
   hasRunfiles = true;
@@ -19687,8 +20023,10 @@ tl: { # no indentation
 "hyphen-latvian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "85aeadb0cb3c5de9ef48057132ccd958d17f014b07b56b9ebe2186a709c4e7646fad260e156718e43ec3eac88681654f88c9b53a6d71fb3eaee934dcb4439ed9";
   hasRunfiles = true;
@@ -19696,8 +20034,10 @@ tl: { # no indentation
 "hyphen-lithuanian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "7a691e3c55c768b9ea5ef13552dc42025ab613df0a0d5c0d54aad58b63da11a93e59bc53e6a8211d5e054cbea8500846da01e9619bbee723d648e2d369a49d55";
   hasRunfiles = true;
@@ -19705,8 +20045,10 @@ tl: { # no indentation
 "hyphen-macedonian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "f88208291212874df493151581205d1b270b2d4278176c42e11edac9b344b73c2ee859f93b6947e4a6003a00abc4d3753024add9caf84f114c8a0cec72aa8c8d";
   hasRunfiles = true;
@@ -19714,8 +20056,10 @@ tl: { # no indentation
 "hyphen-mongolian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "159562a8feb25918bc422e7dc78a46423c7fff2f3c61016a0162761411999a5555be3c6e36cf967d5034f65c12f4b0834ae0c0423c2f3ab17a65034b1803dc72";
   hasRunfiles = true;
@@ -19723,8 +20067,10 @@ tl: { # no indentation
 "hyphen-norwegian" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "8b02e90bfcdf3c6d4bd1966b21e0512069f1749c638d537e9553f68e61e0bc325db8d3b462f45650db4376c7a769c2cde3e0c0601d7de272898a23cd2251c064";
   hasRunfiles = true;
@@ -19732,8 +20078,10 @@ tl: { # no indentation
 "hyphen-occitan" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "b0743d1f6083dac7a347e22aed19d0c5d76119582e4862557a55b817b17dddaa69a2150f14daf6b08689278dd61b27c1b6ed45df5601dd6327bf185a7a46a5c6";
   hasRunfiles = true;
@@ -19741,8 +20089,10 @@ tl: { # no indentation
 "hyphen-piedmontese" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "fa7fc73edd582ba20b8236507385f0a30f477bb9c79e35fea56aa4020be966b9c4a16a327848dd051fa4cf6e6117ef8a51eb92ed6cb72f6993cb290fa5cd5ca3";
   hasRunfiles = true;
@@ -19750,8 +20100,10 @@ tl: { # no indentation
 "hyphen-polish" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "5580b3865ff8d20d475cb962b0257b909ff0e410b6776cb8153145fb0ee42b2f777069413bc6b3622c8c52318aba1ba836210e8972c5b6a47ef978c24fc8848a";
   hasRunfiles = true;
@@ -19760,8 +20112,10 @@ tl: { # no indentation
 "hyphen-portuguese" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "9d9ab3e616522ab9837bb7c7509127f998c442e96f96ee6b6fc0fdc9ac53fd03319d0c0ce28e23a35f1ae0ebb840cdeb19e8ab6444549c33059b28e7b307486e";
   hasRunfiles = true;
@@ -19769,8 +20123,10 @@ tl: { # no indentation
 "hyphen-romanian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "124a93a633731dc1b3d6cbf2fc9b8489bf0737911a0c25ea44dbdfffa07c165ba5804dfd7e9cbe0be3b6eceb9fd6e95daefcae2356ee140f644416bbe1b13507";
   hasRunfiles = true;
@@ -19778,8 +20134,10 @@ tl: { # no indentation
 "hyphen-romansh" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a69d3881493c70cfd58e3d79ed76ce6f18bbcb43e1683f31270eafeb743b366a3c52c9945ff94db333e88ca18145263ba74002f5e78bb42d7aefa48c66af7955";
   hasRunfiles = true;
@@ -19787,9 +20145,11 @@ tl: { # no indentation
 "hyphen-russian" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."ruhyphen" = tl."ruhyphen";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+    "ruhyphen"
+  ];
   hasHyphens = true;
   sha512.run = "f17852dffbb8f5c337b8316b92c2b0a60a318df491231047d9c0930d55d8b2be3274ec94d0d87085d53e06e89c585d47250f046300bf3890ce751f6f2052d348";
   hasRunfiles = true;
@@ -19797,8 +20157,10 @@ tl: { # no indentation
 "hyphen-sanskrit" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "e84b6ca93e922c9c6edf03f4dbec1fae9eef2462379ef2fd0f3508a5048b54819c5ba12e0d76bafe1336666ca74ba95e27f63224fa048068bc515f3bc41f6eba";
   sha512.doc = "95c6ae15687118ffc9019c8634347a602e6590b4a1d18bc060e57fe548a81f097070322975be1f62fa2685c5affff7f31b4854b0ec941bbcb9377ecf16986cea";
@@ -19807,8 +20169,10 @@ tl: { # no indentation
 "hyphen-serbian" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "390aa9c116b6db7b362fc57aa0758a4c489c5fe33c718fb37675b17a9772a463ce532a2ace3e1ef90275b4afef5ea8d6cff71a7abe625d84e3f461c115306452";
   hasRunfiles = true;
@@ -19817,8 +20181,10 @@ tl: { # no indentation
 "hyphen-slovak" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a0786980e0cda7029a72075023520acdc998b83226e85deb0b8186ee4293560321517d507f74fbe68f1d68a16cd8af67aae68baead9176f9cc687bcc7d0a72e1";
   hasRunfiles = true;
@@ -19826,8 +20192,10 @@ tl: { # no indentation
 "hyphen-slovenian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "a605c9149ae452df8b2c25aa0f6bcdde53150e4485147a065f1f56c9740c3544c5c7f9c6049aea913916a62aabaf40777cf6f0f76a858e485c0bd09826a6ef5b";
   hasRunfiles = true;
@@ -19835,8 +20203,10 @@ tl: { # no indentation
 "hyphen-spanish" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "d6783537ff44a326b83c2004afd63f5bdbd162fa4865138c2e6d34c9e6a103ac41dd7b382454646b09c74970f8e0d5827a5f4af617936f74fd300b2054a096d4";
   sha512.doc = "263fd9480c5f225c7e36169b86e846baa64745b83c1072c9602e873f2e7cf8e63b07ab85b29e9d4263656faff58a39fe83e1eba34517b8ba34720f189c8e7f43";
@@ -19847,8 +20217,10 @@ tl: { # no indentation
 "hyphen-swedish" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "5f993ae6b22eadb87b6a1839bfa7d78a0dccc1107c5afbec8c248ed001018da38bb179e29f2430cffa90283221b20c5475346a8d5566edf16152266257f2a37d";
   hasRunfiles = true;
@@ -19856,8 +20228,10 @@ tl: { # no indentation
 "hyphen-thai" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "8336eee03250859ab4328ad3c1fe437d2af688ef56b43be49c45838965ffe033befa84cdf600e9f48cdf60cbbfbff44450c830bd4c34556f680c5096ed3aecc4";
   hasRunfiles = true;
@@ -19865,8 +20239,10 @@ tl: { # no indentation
 "hyphen-turkish" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "5c7023e01bf59af4d36bd451f51ae00c445711c7ecf109c9d835f1d689446d7b0b1b2627b7f9e84e4f4a8ceff52227ff280ac64481e1d29d538a30e093dace85";
   sha512.source = "2aa80889b9657b03b6beb6510b6790fba13811b97abbac186eaf4d3f40212b41db0dd2d21583429820faad558b0415a09aa8254d2edd96812cf6396fb18ccf5c";
@@ -19875,8 +20251,10 @@ tl: { # no indentation
 "hyphen-turkmen" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "c984bb7f09c5816c36a7a790f16df1750ee90f36e2130994ecd1db63f26afb650245985699a80da9b4d7004ad67106771d8c7b79262438369aee3f52fd8374cf";
   sha512.source = "a496f681db0b4b85d82ec1dd60c057f63b6d1c1b52d391e7bee98d3d6e1fb596701c91f2ca400d0df13b96ec7a43d275646b7d2874fe1e4efc9d9b2b47f6cc5d";
@@ -19885,9 +20263,11 @@ tl: { # no indentation
 "hyphen-ukrainian" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."ukrhyph" = tl."ukrhyph";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+    "ukrhyph"
+  ];
   hasHyphens = true;
   sha512.run = "05a9111b358c659159c6edfd38b9ce3d78febd794cc82968dc3e2acdc3612786304721fbd07f00f0a8278f4c2e46a1bfad821b5da45e60546d6acb5bf9068d08";
   hasRunfiles = true;
@@ -19895,8 +20275,10 @@ tl: { # no indentation
 "hyphen-uppersorbian" = {
   revision = 58609;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "b2cb1bcd953ffabbd3f5acd8c72e9c60415fd300004de56ee446fc77d381aac1db65d613a2f591d3d0e45f2a12ff5340457ae3061b4c77de502923932383bdcb";
   hasRunfiles = true;
@@ -19904,8 +20286,10 @@ tl: { # no indentation
 "hyphen-welsh" = {
   revision = 58652;
   stripPrefix = 0;
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "hyph-utf8"
+    "hyphen-base"
+  ];
   hasHyphens = true;
   sha512.run = "12a23e0b9d00eb4381e3c97ecbb449faf5a73b755a17fc0301f1cbad5d0babb370aeec16dcdd316cefb56e142873abaa685288b1a1d3c7dcb76a07a9ef127ac6";
   hasRunfiles = true;
@@ -20053,8 +20437,10 @@ tl: { # no indentation
 "iexec" = {
   revision = 64908;
   stripPrefix = 0;
-  deps."tools" = tl."tools";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "tools"
+    "xkeyval"
+  ];
   sha512.run = "7e6c55383a22d2b47858e02b0d7023a7d130a089c550c0d4aa387035374ba6e0266b35a2f825e4d0bc4fb084bab42686df610f8f6f9007ff155bf7c150383cb1";
   sha512.doc = "2b55ea3e886043af3e137be5e23388d1d0311e64f695b3774d85be2305e5ea8389a4139e4b3c84989187d66066ffadeccb0d8b70a5347ecfc6dfef750d28b2ba";
   sha512.source = "d4f8b3b253189de2e303c00c5c8e42cd539eaf7eb0cd20feff54473086056fff2e6f8be3bebc071a261c68adffa55f198505dc81df4d095f3ab2dc6932b8e7a1";
@@ -20742,64 +21128,66 @@ tl: { # no indentation
 };
 "jadetex" = {
   revision = 63654;
-  deps."amsfonts" = tl."amsfonts";
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."auxhook" = tl."auxhook";
-  deps."babel" = tl."babel";
-  deps."bigintcalc" = tl."bigintcalc";
-  deps."bitset" = tl."bitset";
-  deps."cm" = tl."cm";
-  deps."colortbl" = tl."colortbl";
-  deps."cyrillic" = tl."cyrillic";
-  deps."dehyph" = tl."dehyph";
-  deps."ec" = tl."ec";
-  deps."etexcmds" = tl."etexcmds";
-  deps."everyshi" = tl."everyshi";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."firstaid" = tl."firstaid";
-  deps."gettitlestring" = tl."gettitlestring";
-  deps."graphics" = tl."graphics";
-  deps."graphics-cfg" = tl."graphics-cfg";
-  deps."graphics-def" = tl."graphics-def";
-  deps."hycolor" = tl."hycolor";
-  deps."hyperref" = tl."hyperref";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."iftex" = tl."iftex";
-  deps."infwarerr" = tl."infwarerr";
-  deps."intcalc" = tl."intcalc";
-  deps."kvdefinekeys" = tl."kvdefinekeys";
-  deps."kvoptions" = tl."kvoptions";
-  deps."kvsetkeys" = tl."kvsetkeys";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latexconfig" = tl."latexconfig";
-  deps."letltxmacro" = tl."letltxmacro";
-  deps."ltxcmds" = tl."ltxcmds";
-  deps."marvosym" = tl."marvosym";
-  deps."passivetex" = tl."passivetex";
-  deps."pdfescape" = tl."pdfescape";
-  deps."pdftex" = tl."pdftex";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."psnfss" = tl."psnfss";
-  deps."refcount" = tl."refcount";
-  deps."rerunfilecheck" = tl."rerunfilecheck";
-  deps."stmaryrd" = tl."stmaryrd";
-  deps."symbol" = tl."symbol";
-  deps."tex" = tl."tex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."tipa" = tl."tipa";
-  deps."tools" = tl."tools";
-  deps."ulem" = tl."ulem";
-  deps."unicode-data" = tl."unicode-data";
-  deps."uniquecounter" = tl."uniquecounter";
-  deps."url" = tl."url";
-  deps."wasysym" = tl."wasysym";
-  deps."zapfding" = tl."zapfding";
+  deps = [
+    "amsfonts"
+    "atbegshi"
+    "atveryend"
+    "auxhook"
+    "babel"
+    "bigintcalc"
+    "bitset"
+    "cm"
+    "colortbl"
+    "cyrillic"
+    "dehyph"
+    "ec"
+    "etexcmds"
+    "everyshi"
+    "fancyhdr"
+    "firstaid"
+    "gettitlestring"
+    "graphics"
+    "graphics-cfg"
+    "graphics-def"
+    "hycolor"
+    "hyperref"
+    "hyph-utf8"
+    "hyphen-base"
+    "iftex"
+    "infwarerr"
+    "intcalc"
+    "kvdefinekeys"
+    "kvoptions"
+    "kvsetkeys"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "latexconfig"
+    "letltxmacro"
+    "ltxcmds"
+    "marvosym"
+    "passivetex"
+    "pdfescape"
+    "pdftex"
+    "pdftexcmds"
+    "psnfss"
+    "refcount"
+    "rerunfilecheck"
+    "stmaryrd"
+    "symbol"
+    "tex"
+    "tex-ini-files"
+    "tipa"
+    "tools"
+    "ulem"
+    "unicode-data"
+    "uniquecounter"
+    "url"
+    "wasysym"
+    "zapfding"
+  ];
   hasFormats = true;
   sha512.run = "75b9c8be4f87b51798826f5ea070ff9877e8bfa2fbee5112972e9e0fc81a76dcb7081c2fe9eed645f53a38dd85443dfdb394004b2970c2ff5a91b32dc1cab909";
   sha512.doc = "f70f85a12d730fc9dfb29da57a6f95239c10aa8ba7b9453ae884cae81399609fb99ccac3bfbc41f0c5f360ef80bd3f78b2f8479a826412bf573e9c5336d7e8ca";
@@ -21193,17 +21581,19 @@ tl: { # no indentation
 "kdpcover" = {
   revision = 65150;
   stripPrefix = 0;
-  deps."anyfontsize" = tl."anyfontsize";
-  deps."geometry" = tl."geometry";
-  deps."graphics" = tl."graphics";
-  deps."microtype" = tl."microtype";
-  deps."pgf" = tl."pgf";
-  deps."setspace" = tl."setspace";
-  deps."textpos" = tl."textpos";
-  deps."tools" = tl."tools";
-  deps."xcolor" = tl."xcolor";
-  deps."xifthen" = tl."xifthen";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "anyfontsize"
+    "geometry"
+    "graphics"
+    "microtype"
+    "pgf"
+    "setspace"
+    "textpos"
+    "tools"
+    "xcolor"
+    "xifthen"
+    "xkeyval"
+  ];
   sha512.run = "d68fa467a50f7d1648e51b918201b76c199920e39915a3c5fcc72cd75c4b11b0924082cf8c01363fe5af998c66ffae71137e7f9635e147ed40ed5e7cd4fd63cb";
   sha512.doc = "880f981153526b41cc128677d950e52b4ff5449adc4fbb3b0004a983bcc7222fb64714ca033b605172fe0b52107e6cc8ff0fcbd1778bf7aa6b9d20fa994ef452";
   sha512.source = "e67cc3eede96c42506beb03d8e4e7db1b5fd4a7ed15026a060c3a5db559c0abc7fe0f9e24c22b23d2aff7c7979005f0c26d250607129d29b6d4bc9babc0e11be";
@@ -21409,7 +21799,9 @@ tl: { # no indentation
 "koma-script" = {
   revision = 64685;
   stripPrefix = 0;
-  deps."footmisc" = tl."footmisc";
+  deps = [
+    "footmisc"
+  ];
   sha512.run = "2fe2a07d56107390a191c016c29f7bf77700647b7996957a3802aa89b9b7eacc4cefe1c444b6faa688a147a8b0d9c5d80fca511dc2454a15ada6ddaf6aa3ccb2";
   hasRunfiles = true;
   version = "3.38";
@@ -21449,8 +21841,10 @@ tl: { # no indentation
 "kotex-oblivoir" = {
   revision = 64928;
   stripPrefix = 0;
-  deps."kotex-utf" = tl."kotex-utf";
-  deps."memoir" = tl."memoir";
+  deps = [
+    "kotex-utf"
+    "memoir"
+  ];
   sha512.run = "17a5f52990cfdf57fdc8ffdc3fc417a15ab52e21296a95b6b1698166ac215937bc26db8aeac7b38459cdf3411480045af85aec491884cd89f00896916a7702e0";
   sha512.doc = "5ef9480a78f216dcf11fe06d8766ba66817a86faa7d0003af77a1fe1079f5e8a8c527bcd333e5fe02153f6ca0b0a82eaa206eb1c5bb7b9517b9ef2865faadc4b";
   hasRunfiles = true;
@@ -21467,7 +21861,9 @@ tl: { # no indentation
 "kotex-utf" = {
   revision = 63690;
   stripPrefix = 0;
-  deps."cjk-ko" = tl."cjk-ko";
+  deps = [
+    "cjk-ko"
+  ];
   sha512.run = "be75556f3857a405d235f920866f8089f105a57f9accff07a541fe110bb8124e049ebe75368ce3282bcd329cc6a02eed0ccffdfad49020986d61221839cae4b5";
   sha512.doc = "7226874594b10ee48e8aea30a72e6d6f4db9f770d5d5830dc83a41f828bfe36b0b11f679aff02722e457150548860f1ad719758e6ffd239bbf9ac18d907acded";
   hasRunfiles = true;
@@ -21475,7 +21871,9 @@ tl: { # no indentation
 };
 "kotex-utils" = {
   revision = 38727;
-  deps."kotex-utf" = tl."kotex-utf";
+  deps = [
+    "kotex-utf"
+  ];
   sha512.run = "569e9677ef0f346e5a53f4cc84302a8ddf2b4ad85708f4ab8ba7d076ebf339ec60998a41fa92fa815167e9bfc37085ebfd921dd13a60b017a0574e4a5d205802";
   sha512.doc = "a46c5d09d119fa2fe8b9acea87a37776536e3216b776af6b7037fc5b0a522af5c1a58baf081e60f06c9a4054e8ac2372458c276c779038a030dc92efdfa3aef6";
   hasRunfiles = true;
@@ -21563,9 +21961,11 @@ tl: { # no indentation
 "kvmap" = {
   revision = 56361;
   stripPrefix = 0;
-  deps."amsmath" = tl."amsmath";
-  deps."l3experimental" = tl."l3experimental";
-  deps."pgf" = tl."pgf";
+  deps = [
+    "amsmath"
+    "l3experimental"
+    "pgf"
+  ];
   sha512.run = "54a107c866519e6ce6cb69bd8c13ae085813c4adf235592e32cbfb2bd7eb8039ff8e1fe165f43892367a28ac0984874581424e733b1d3722796204df96d840f3";
   sha512.doc = "41fb3957c91e3127b5d7c78fe2114cb4fe6c8167e6f7f2bbf3a5b7c0fdb12c0ac79e47d84fad54c4b6a3165114c333c575eea01d5c0c886c19b21643ab0fb03f";
   sha512.source = "5dae9b0972acc7c95b148fb13d9008b27591aa9ff9065c1c43dc799c5096f89a8b6b2da97b17bb5e544b1a10702cf247d9cecaa39d9790993996276741c0d792";
@@ -21642,7 +22042,9 @@ tl: { # no indentation
 };
 "l3build" = {
   revision = 64987;
-  deps."luatex" = tl."luatex";
+  deps = [
+    "luatex"
+  ];
   sha512.run = "25d5696ec1f33dcb90be757a1b0fe16950c82f1db243b1490ed24b6acd94dac836b163e64f1279a66dbd7496cb60072cd9e6ad631cbb2ff532e8d51cb44fabbc";
   sha512.doc = "0293c819fad182fdb6928ec2b7a9c3daa20ca53f9e243bea80951645a9ed0f2f0daca095c22dcaca55bb43fff52cca4dff76237d87eff25e6aa0a36215789d25";
   sha512.source = "051e6b948ebb9f02581bfbe22f07b12148b9dcb0b779ef98deec8c0f613b77b11c8ae9c32c8c59f50ca5cd104e13f2216b979d636867d79db4044b0c7ef2be1c";
@@ -21651,7 +22053,9 @@ tl: { # no indentation
 "l3experimental" = {
   revision = 63089;
   stripPrefix = 0;
-  deps."l3kernel" = tl."l3kernel";
+  deps = [
+    "l3kernel"
+  ];
   sha512.run = "aa8f499d84578afcd72e29a48e8c5ff337d2b1acb4cbf3b4b3754925d60e2bf1f2003e82bafc859701c295d61f572305135bb5d078c194fd0d747059ac69f2ea";
   sha512.doc = "71236121e4ca1395e433802a627aae1689f9b0aa55413d87317a0e9c0d0f9cf0ddd47bb7509160f0956d153b6ef9819362fbb95344e3ccb9fa1c8733ac4a427f";
   sha512.source = "8aea8b5a80af397443bf3d25c489a02622a63ddd5efbec9335952af310f9888c25e0a18fbdc3694927caf38af63f89bc518e72927fee6343fba48805b25b90ea";
@@ -21660,7 +22064,9 @@ tl: { # no indentation
 "l3kernel" = {
   revision = 65299;
   stripPrefix = 0;
-  deps."l3backend" = tl."l3backend";
+  deps = [
+    "l3backend"
+  ];
   sha512.run = "9cbcf410a7d6aaf5477805feb48e19fd751e418718c261a4cea1305322dc8ac7eb6a14af9337de0393b5c6aa49b6496116b9e10c0a1338511aedb307d196f6b2";
   sha512.doc = "da9d55dbb019ac88b891ba276c27af91a4747e4c8289804a5fdb52555c81c6a293eaa0adef12157ce4147cce20841902090aed8e2dd58084ecedf1d051b55f83";
   sha512.source = "37be0d6c2adea6e62c2b24eff707ecb261e7ffed0d9e774ed43095aaadf859fe7b96d992cd5b20870a14737327c903d8b3d80b2983fce730d7ed168ef939ac08";
@@ -21669,7 +22075,9 @@ tl: { # no indentation
 "l3packages" = {
   revision = 65300;
   stripPrefix = 0;
-  deps."l3kernel" = tl."l3kernel";
+  deps = [
+    "l3kernel"
+  ];
   sha512.run = "b163a5f7eccdd650faad6ed6d2539f54d7343f9f11335e54cbedddfad9b1ba06899365583ec44c59bb7b67efe8a2f507b8217f52a3f65d194967981521b39195";
   sha512.doc = "c39241a45eac0e1da5be990bee94b99547b22bec1469aba31a999fadff334bbc701f38ba47b01300da578eadc3778af75c77d3180c970e5d0c22de9a09be2692";
   sha512.source = "40f19b6e8ef60aead350679a8451b62ec2f833b5413fbc96c706bbd33a020652ed5fcd86b8da6b9b5ee8c812e3aa07371e0e63c7ece51bc21c97e562a5b27fff";
@@ -21814,10 +22222,12 @@ tl: { # no indentation
 "latex" = {
   revision = 65161;
   stripPrefix = 0;
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latexconfig" = tl."latexconfig";
-  deps."luatex" = tl."luatex";
-  deps."pdftex" = tl."pdftex";
+  deps = [
+    "latex-fonts"
+    "latexconfig"
+    "luatex"
+    "pdftex"
+  ];
   sha512.run = "de95ba089738862d57b1139a21da57a8263cbe9ff81a7ab43608ce23fde57b4630057a95c99ecb7be712bc864e0c07a56429019d7aa9f63c01f47a995d5d567d";
   sha512.doc = "68ecd2a5c85afe7b39402db416bb7ad0f8e5662c77d77c0839a470f3f70da65377560fbcb5a6952e997da70868533f29a4b7c65d3f7dd63db13aa95ee7159b23";
   sha512.source = "59d3d31147fc8a31c6348c2a5f371cd4dc69d2367f9ced0c62150c5d14ead49b4e195c328ad4791638e61b93f69143c0c93bbed5551b31e4de1284a4aa7b6d73";
@@ -21844,60 +22254,64 @@ tl: { # no indentation
 };
 "latex-bin" = {
   revision = 62387;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."graphics" = tl."graphics";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latexconfig" = tl."latexconfig";
-  deps."lm" = tl."lm";
-  deps."luahbtex" = tl."luahbtex";
-  deps."luaotfload" = tl."luaotfload";
-  deps."luatex" = tl."luatex";
-  deps."pdftex" = tl."pdftex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dehyph"
+    "everyshi"
+    "firstaid"
+    "graphics"
+    "hyph-utf8"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "latexconfig"
+    "lm"
+    "luahbtex"
+    "luaotfload"
+    "luatex"
+    "pdftex"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "91b6749a7fc520500812c203a1acb0701e7984e5e309eaf0c4815bc7ea0b507f3eeaaae3a6ad715ee53f018b8e38c695c4ff9567f26222cd2c52ba24e1a03c1f";
   sha512.doc = "30f9001ed8236f01555f8a21ff8286ea409d75583876f8ba795e1a819dea14cb3f2b3dff31e0258cf5deb75ae2fd9201e33260ef1f32c2ce53fb86bfa4e59f83";
 };
 "latex-bin-dev" = {
   revision = 62387;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latex-graphics-dev" = tl."latex-graphics-dev";
-  deps."latexconfig" = tl."latexconfig";
-  deps."lm" = tl."lm";
-  deps."luahbtex" = tl."luahbtex";
-  deps."luaotfload" = tl."luaotfload";
-  deps."luatex" = tl."luatex";
-  deps."pdftex" = tl."pdftex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dehyph"
+    "everyshi"
+    "firstaid"
+    "hyph-utf8"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-base-dev"
+    "latex-firstaid-dev"
+    "latex-fonts"
+    "latex-graphics-dev"
+    "latexconfig"
+    "lm"
+    "luahbtex"
+    "luaotfload"
+    "luatex"
+    "pdftex"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "dade40731ce41c6a0304cb7472255f2d6c8b1fed45b619282aa747b3ebbdfd707da18947f06c8896d72605b324ffa58c3c7195bd90629531ef1fb54a91f1310c";
   sha512.doc = "7434698038dd90f10c51743e238cfcf0d85da2067d458f399e557b855c7ae6fd4e013ef4272e710eb9695d3e4f8757acae95c41a9e704a393202aafc11218754";
@@ -21960,7 +22374,9 @@ tl: { # no indentation
 "latex-graphics-dev" = {
   revision = 64899;
   stripPrefix = 0;
-  deps."graphics-cfg" = tl."graphics-cfg";
+  deps = [
+    "graphics-cfg"
+  ];
   sha512.run = "33e2d6ed2e3076219a0438b8d8461110e7edf3a9b0534455d2fc43837a3766d12bdc8d912414bf88bdbd9b10a54a5b8b2045ff3a3cef42ed7cdc49a2d8664d5a";
   sha512.doc = "ab0be817107e89a4d87c8e5ce68d20ec06eba0ae37ccf79d2dae1e916fc9ae8e2b1c7f7d9701daeffa5bfb931a881d63cfd188393e075c943d91fccf3eb1753c";
   sha512.source = "cb5f6a80b7178dfd1074235d5e1c7a3a2830d4c7eb037cf9e5d51a2770ed85140be7648e288cd5d67f64955212b29d8dc37fe359c0b7a27fc065cdecdc198de7";
@@ -22308,7 +22724,9 @@ tl: { # no indentation
 };
 "lcdftypetools" = {
   revision = 52851;
-  deps."glyphlist" = tl."glyphlist";
+  deps = [
+    "glyphlist"
+  ];
   sha512.run = "3f3cc8f7cce233eb36315b21db408847a267ff393d6d4118de61c4b03ec408f3f29b2d41fdcf84995bfbf5d07bcb25984d7ffc76458d4f2dc12fdb6dfb85e23f";
   sha512.doc = "5a1dd1e2fd79351afc65d6786b24aebd9681a2b9e92755b44a836b47da5ceb1817f085483f306991a113dc0c26edfcd84839dec93bb46a003034536f31b31e5f";
 };
@@ -22359,7 +22777,9 @@ tl: { # no indentation
 "lebhart" = {
   revision = 64280;
   stripPrefix = 0;
-  deps."colorist" = tl."colorist";
+  deps = [
+    "colorist"
+  ];
   sha512.run = "4b1411cfb2cef9639554ef01af946a53d49ae429649af78a9213a79f695d0014cb3c0ef9cb13c3d0f85e0286e27b5ba214ae85ba6f2c94a32655131e4898ddb8";
   sha512.doc = "06c091c1a7c05c9c8f3de49b1bb0499e7f95273fd048de20aa59cf67bdd100d623735e8c214e81fe4b2ecbc3ef1dc83911789bd4a6f008baf62bfb12233642d1";
   hasRunfiles = true;
@@ -22545,7 +22965,9 @@ tl: { # no indentation
 "lh" = {
   revision = 15878;
   stripPrefix = 0;
-  deps."ec" = tl."ec";
+  deps = [
+    "ec"
+  ];
   sha512.run = "265aeba5ee99cbec2eca77a273a9e4857d78280e0ff17089a358e7f85d0595025e259b2edd471ce5287479531fe37cfeeaeba405ac9cabc7ac9616242815b6cf";
   sha512.doc = "33f1cd39b2e68caa750ca5867bebbbc43c9948a7606f6fe44ba3bd8be84661fb562b5472ec57ccc3f6c18ef2823188c2f81ca4444b562f935e6f041d8ec0f39d";
   sha512.source = "a81d3d7295101718dc4e66c6daafca8c480b281d7219956b0007adb4fd7e0f35959277931254fc778bf69c581b7d15ccf445f5037b589cee937211c39f59529e";
@@ -22571,10 +22993,12 @@ tl: { # no indentation
 "libertine" = {
   revision = 64359;
   stripPrefix = 0;
-  deps."fontaxes" = tl."fontaxes";
-  deps."iftex" = tl."iftex";
-  deps."mweights" = tl."mweights";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "fontaxes"
+    "iftex"
+    "mweights"
+    "xkeyval"
+  ];
   sha512.run = "7b95b6612f5b46298cddf459184f11752a4b050110bd1d0271e43e364aa5da58c9e27d3b72119b76e863a19ab0987ea408d749ecf18ff40da1ab8a585e31c7cf";
   sha512.doc = "c33beec53a939a5b9f672e0c5a7aea7a3b3047e4f1f1e68b7d4d64cd03a7f73da2bbce2a4c56199f71519d4c364a3e0ccddf8f93f24dc9eb1fd3896fd035ec77";
   hasRunfiles = true;
@@ -23052,7 +23476,9 @@ tl: { # no indentation
 "logreq" = {
   revision = 53003;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
+  deps = [
+    "etoolbox"
+  ];
   sha512.run = "df61c0c6c0b8520f5ec38780d8eb69cfd5fccd21f5120e48eee71e02b004d3da4cc9cb9371a36766852e3ca09a3db86655f1a2639a49741f00134cff1246acd2";
   sha512.doc = "fa9277da81dfb3aa235bd795780e8d3e629558fede90fa9234528b50a11507e59e65e49a0ca787af037186890392dfd45bf6de7bd859cec369626fb7d57b543f";
   hasRunfiles = true;
@@ -23060,8 +23486,10 @@ tl: { # no indentation
 };
 "lollipop" = {
   revision = 45678;
-  deps."cm" = tl."cm";
-  deps."hyphen-base" = tl."hyphen-base";
+  deps = [
+    "cm"
+    "hyphen-base"
+  ];
   hasFormats = true;
   sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78";
   sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86";
@@ -23612,15 +24040,17 @@ tl: { # no indentation
 };
 "luahbtex" = {
   revision = 62387;
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."luatex" = tl."luatex";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "cm"
+    "etex"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "luatex"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "daafa6e417e7c366dde221488b91708f8c1302cf6db849b91a82bd74619f0b91e16430680aabeb27e43d1469262c9f799cd0bd6547635ac6ad54ef8e2dae5703";
   sha512.doc = "5d2915af80990896181a70c24dd3c51748fbaa6f3f9b96b67b1b40bc8ab36d39293e8f76c0f3dabdaffb252423eec61375b6f5aa859a1310236f7d39d6f2fcf3";
@@ -23668,15 +24098,17 @@ tl: { # no indentation
 };
 "luajittex" = {
   revision = 62774;
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."luatex" = tl."luatex";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "cm"
+    "etex"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "luatex"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "f7503044bf237ca6d6e33a3a067bba0d73dfecfee7e77b5ebd4f3d6417dd24f7aa263cb08e7ffb86708574ecda31d5c7d89b42d2ad2179119393b99129f8077d";
   sha512.doc = "3924029e274913999cf54e2f3a4d3ef85dbfbb4ee93a629b8eeb77c796557c3086eb447fa74d2d7a6f33a17f433f38ceb033f7e1633e240bbb135b4239b588f7";
@@ -23706,8 +24138,10 @@ tl: { # no indentation
 "lualatex-math" = {
   revision = 61464;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."filehook" = tl."filehook";
+  deps = [
+    "etoolbox"
+    "filehook"
+  ];
   sha512.run = "16c945e72165acd9f4bcf20f81e6c5df9ec22f19d45cbb8f076763d2d1a1a2e230938dabbadfcc065e3a060487885ac2edb223aae22d12f6981f5fca5c0f951f";
   sha512.doc = "f5a8db238ae096b7b1a2eaa84643f063cd28e08b328cbcc780171a60c571e858a1cd1941a8ea9053392a8c65b965a81c8cd585ce2accb27e797e3e4e8ad3a127";
   sha512.source = "e04a36a2280fbccb9572539ebc9bafba4edb7ccada25c4b3faadaa61c2f4458d9e9a90e54fa00b5ba675e59f42ed2d076b39918e5c126e2f619f2f69ff904d81";
@@ -23775,10 +24209,12 @@ tl: { # no indentation
 };
 "luaotfload" = {
   revision = 64616;
-  deps."lm" = tl."lm";
-  deps."lua-alt-getopt" = tl."lua-alt-getopt";
-  deps."lua-uni-algos" = tl."lua-uni-algos";
-  deps."lualibs" = tl."lualibs";
+  deps = [
+    "lm"
+    "lua-alt-getopt"
+    "lua-uni-algos"
+    "lualibs"
+  ];
   sha512.run = "70f27796fdfe61e0337239a2962052eb2896478358fca0f271287db06a1d2de2f83cd7394d0ec6c281e9a5779ec396e2993f53b8b045ed7a09cb17f100a4a477";
   sha512.doc = "9e1c223ec2589f32640aefd2692d031b8ba324da30a814eea98768443eeb76d92d2700c320e6f96006e54635d31a655cae0a27c76931e7640748889ead4fbfb4";
   sha512.source = "3ed04272b887f434bfe2dd166974889318597e22c57109647946f2b255efca2fb6d1ecc1f02485a1bf387e77956c64a9f42c4af237b29f9fc7a38400d8cfbef1";
@@ -23788,7 +24224,9 @@ tl: { # no indentation
 "luapackageloader" = {
   revision = 54779;
   stripPrefix = 0;
-  deps."iftex" = tl."iftex";
+  deps = [
+    "iftex"
+  ];
   sha512.run = "7f2558dc265746f143520c2c6f3bf2ed05ac8c54988e573519321a7fb5a2a991220d0eb8906893f77964dc01f0e3f16b783dcd20f809042a11d29cd137f557fd";
   sha512.doc = "64719d715fc98bc09ab17db5f2053ea3e34d703adda6677f50ffe178a974230e8a03a9019b995238d073580e1faa745e655a7207468965ccb9f67bfccb5b5a49";
   hasRunfiles = true;
@@ -23836,14 +24274,16 @@ tl: { # no indentation
 };
 "luatex" = {
   revision = 64839;
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "cm"
+    "etex"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "3789aa894fa2472f763275ddb045178acb51bbcbfa5f88d0dfee5498932089519b273ca5f6bf413992578638a7331e88b69f976db75cb9aeb50bf7d5f0396a69";
   sha512.doc = "f7c0807c1b4548666efa133330f1ecae7d85a0465357c5dc90f77d65b34d73e8755fe825155f2688a066f73f3cd9c76cab29a7ab06ce4406854177db4242fb51";
@@ -23861,7 +24301,9 @@ tl: { # no indentation
 "luatexbase" = {
   revision = 52663;
   stripPrefix = 0;
-  deps."ctablestack" = tl."ctablestack";
+  deps = [
+    "ctablestack"
+  ];
   sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb";
   sha512.doc = "5dc696009e84662fc56443d7a5d61b3f30adbfeae3cf7176e81e676087d0fe580cb0575add49999ea8d5651850b7562c775b0727de01934465f3613ab7344be3";
   sha512.source = "ebb46d5d4c3f6ccfdbc758f9dab64d7e83c2fe988f7da6852dfd5e786bc757f2438f86010a695eb2e780a02830f15dea941de7fb5bdd6e6561df0774b476dd5a";
@@ -23871,7 +24313,9 @@ tl: { # no indentation
 "luatexja" = {
   revision = 65267;
   stripPrefix = 0;
-  deps."luatexbase" = tl."luatexbase";
+  deps = [
+    "luatexbase"
+  ];
   sha512.run = "6f146fd9d98d931094653b6e2d2357ba1f23c7c539489bc6e21db884b3da8a91dd822f3c301a4fc22168331b9760a96e61c6c0cc5c197585c2b02ffd96d6ca8e";
   sha512.doc = "f7b5adca5278dbdb05d2bab6eb4c5449c07f4ea6bca6548397bda6a27b73fbe5ce9c6e4dbd9ca19bde9b3b950157d783a1e73040c08ae60f661a486168653f91";
   sha512.source = "58ec25306a8203494cb029bb9866d847537723acaeef83b5a0899b9bd27e3045291a4aebfd3e094215f99282d4d744799b876cf26bf9a46908b502cec07863bf";
@@ -24354,7 +24798,9 @@ tl: { # no indentation
 "mathabx-type1" = {
   revision = 21129;
   stripPrefix = 0;
-  deps."mathabx" = tl."mathabx";
+  deps = [
+    "mathabx"
+  ];
   sha512.run = "ae2272ac7d79a3bb1a655000a2d5fa1c3d948363763abe194cbac4084d5ef60492648977660c3d9dfbc2c70bea3c207d031d2147097fb1d7af503aa80f257d1c";
   sha512.doc = "2504e85d659cba06fa25ae4e154309a6d3dcba2ac8bae0d4066b6637f19081987b0bc774902365e5b723f4b6c35cad07709e316ec1893a018baabc699d755e8b";
   hasRunfiles = true;
@@ -24465,8 +24911,10 @@ tl: { # no indentation
 "mathpazo" = {
   revision = 52663;
   stripPrefix = 0;
-  deps."fpl" = tl."fpl";
-  deps."palatino" = tl."palatino";
+  deps = [
+    "fpl"
+    "palatino"
+  ];
   sha512.run = "72bfba52e37abd933cb7b1b19dd813c3c76438591c94f9c407cabb8a44c8c67f78fae04442027287e5bf30b7239c3703ece4271194716882773eeb50d4cb2f47";
   sha512.doc = "94e624f2cea50bf3534300d3332dd61e1bc5b4c834603356831d0f9bf4c6bdc34af5d31df002c10430d4945c2c71dbf7c156b7b05ba08c657cc2d960839c2a35";
   sha512.source = "bd6aba477ca38c9778d7d23460420f485ac5658e9514ac2260475a50b6ee7e2ff736bac81a4548fb4aebae952a406a0de1bef01bd7d8fe4984080ab835d328d4";
@@ -24818,8 +25266,10 @@ tl: { # no indentation
 };
 "metafont" = {
   revision = 62387;
-  deps."kpathsea" = tl."kpathsea";
-  deps."modes" = tl."modes";
+  deps = [
+    "kpathsea"
+    "modes"
+  ];
   hasFormats = true;
   sha512.run = "4e287680b7b14497133165a45ed668dd326e587a305475d90f4b545aa1973a0e6001fef2e3a9afa5fd2f343497d109f4670fcc0f4c0263b20624dbbad1f21bd3";
   sha512.doc = "07e574fce34949b71ea0b156c394db80bdd9c9a3018afbdadf786fa431674b6fd0c2f79e8f9a72c872b17b2dbedb755c0ce3def552740a99e63d65e28fc3d2b0";
@@ -24884,7 +25334,9 @@ tl: { # no indentation
 };
 "metapost" = {
   revision = 62387;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "d807a22bd0f3358d1986a477834c19b2fce636e4ea96f52f745220a165726505849ac4a1048bd4be49cf9e42e098a55df2a4c9b4d267dddbe2fb093ba3029d6d";
   sha512.doc = "384730c3f784bb026bb29ee69dc95d179c53636c405e1a037477269e9a3a95d8c296729d7bb54037ca4a76e5ef00eff4876c4538203e400db8c4f0850c48b259";
   hasRunfiles = true;
@@ -24963,17 +25415,19 @@ tl: { # no indentation
 };
 "mex" = {
   revision = 58661;
-  deps."enctex" = tl."enctex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."hyphen-polish" = tl."hyphen-polish";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."pdftex" = tl."pdftex";
-  deps."pl" = tl."pl";
-  deps."plain" = tl."plain";
-  deps."tex" = tl."tex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."utf8mex" = tl."utf8mex";
+  deps = [
+    "enctex"
+    "hyph-utf8"
+    "hyphen-base"
+    "hyphen-polish"
+    "knuth-lib"
+    "pdftex"
+    "pl"
+    "plain"
+    "tex"
+    "tex-ini-files"
+    "utf8mex"
+  ];
   hasFormats = true;
   sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be";
   sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e";
@@ -25016,8 +25470,10 @@ tl: { # no indentation
 };
 "mflua" = {
   revision = 62774;
-  deps."luatex" = tl."luatex";
-  deps."metafont" = tl."metafont";
+  deps = [
+    "luatex"
+    "metafont"
+  ];
   hasFormats = true;
   sha512.run = "fa735fa117e7bd433339efbb709caa5fc25007088500dd5e4f6999cc417d188fd43435f74d526186880ac857f9bfc52e1fb7f1055974cea959e28536150b1a19";
   hasRunfiles = true;
@@ -25075,12 +25531,14 @@ tl: { # no indentation
 "mhchem" = {
   revision = 61456;
   stripPrefix = 0;
-  deps."amsmath" = tl."amsmath";
-  deps."chemgreek" = tl."chemgreek";
-  deps."graphics" = tl."graphics";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."tools" = tl."tools";
+  deps = [
+    "amsmath"
+    "chemgreek"
+    "graphics"
+    "l3kernel"
+    "l3packages"
+    "tools"
+  ];
   sha512.run = "fffeb1ce083d8eb3da6543409e5cc735c9699f9145114c8325c336b93d2dab2a9976fc448c6324318407c3af888cb91cc7764fcf3bd24369e4940f00dda66429";
   sha512.doc = "cd4c41a329489149b3f2bc79dd50e0517707681f452888394870459d10888095a0cbb7b7c18500f04264c6c85f791d9af9d799b1b4e221e991af32690e7405ba";
   hasRunfiles = true;
@@ -25292,21 +25750,23 @@ tl: { # no indentation
 "minted" = {
   revision = 65252;
   stripPrefix = 0;
-  deps."catchfile" = tl."catchfile";
-  deps."etoolbox" = tl."etoolbox";
-  deps."fancyvrb" = tl."fancyvrb";
-  deps."float" = tl."float";
-  deps."framed" = tl."framed";
-  deps."fvextra" = tl."fvextra";
-  deps."graphics" = tl."graphics";
-  deps."ifplatform" = tl."ifplatform";
-  deps."kvoptions" = tl."kvoptions";
-  deps."lineno" = tl."lineno";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."tools" = tl."tools";
-  deps."upquote" = tl."upquote";
-  deps."xcolor" = tl."xcolor";
-  deps."xstring" = tl."xstring";
+  deps = [
+    "catchfile"
+    "etoolbox"
+    "fancyvrb"
+    "float"
+    "framed"
+    "fvextra"
+    "graphics"
+    "ifplatform"
+    "kvoptions"
+    "lineno"
+    "pdftexcmds"
+    "tools"
+    "upquote"
+    "xcolor"
+    "xstring"
+  ];
   sha512.run = "faf543c7f48371cca2a4af7d1e4e1e9b16c13673908417ec982d773dac561ab9e467f79bed230f5c0e359fc82c5cfff1f83e18cb6261279943d1e5a2f117ea2f";
   sha512.doc = "41640837e53d5b9cdce55a8f29707fe4f654da19813efbc1770df39b8f00aabdf600032dd504a8cebe23b4ef91e226014a94e031c52d0458f0684c5a53bd276a";
   sha512.source = "384af78dba5447f7169804597afba5b42f8860cabe691e2490d90248ed798880d11471e8cad7ede8a4b1dbaf7b9684dea05ae54719c7637b8f5b6d953fd0ba98";
@@ -25420,25 +25880,27 @@ tl: { # no indentation
 };
 "mltex" = {
   revision = 62145;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latexconfig" = tl."latexconfig";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dehyph"
+    "everyshi"
+    "firstaid"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "latexconfig"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "e04f33b83474e58c4725abbba21ae56659920ad2929faba7f25b47befeeb7e207e36888e1dbf7260ecc95c126e1732f6f5dced3d277db7c3889f2b08590b04dc";
   sha512.doc = "e9d5a1cfdc6183bf99ef369b447c73e9ec5926952a80a75708db4fc6343ffc1a10d599276c13f295005f7c8c56e2e35ad9edc9dee3ee06928fa8c7b267d82bbf";
@@ -25499,16 +25961,18 @@ tl: { # no indentation
 "moderncv" = {
   revision = 62128;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."graphics" = tl."graphics";
-  deps."hyperref" = tl."hyperref";
-  deps."iftex" = tl."iftex";
-  deps."l3packages" = tl."l3packages";
-  deps."microtype" = tl."microtype";
-  deps."tools" = tl."tools";
-  deps."url" = tl."url";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "etoolbox"
+    "fancyhdr"
+    "graphics"
+    "hyperref"
+    "iftex"
+    "l3packages"
+    "microtype"
+    "tools"
+    "url"
+    "xcolor"
+  ];
   sha512.run = "988cc5f400af4ecdfc0730a63d7f2a13fde81b9120f198622a5e2d145ca94e1d5bc952e261ef2f4cacefda8a23626119975fd1e00b44f4a66b1fbb7f4c011d40";
   sha512.doc = "9527fa84fffc4eb2ac92dab59cf0e5ae87a6f5befd4ed05acdd85cc7050dcc669f8b814ef928e69bb1c1e8bb3bd774aca1f85acf6b750a1c9555a3165eba0281";
   hasRunfiles = true;
@@ -25602,7 +26066,9 @@ tl: { # no indentation
 "montex" = {
   revision = 29349;
   stripPrefix = 0;
-  deps."cbfonts" = tl."cbfonts";
+  deps = [
+    "cbfonts"
+  ];
   sha512.run = "9676cef9e0fbe7a0196b1ea0fb3ea4f0399a3ee8ed76ef06e824848a57922dc4f7cc1f50a1fcea47fc265465407653447ab80e80dbac3c4bc00488d0929f87bc";
   sha512.doc = "1965f31e28a9f54d86a495b4b8cea50dc59f409d066918dedf77f86448b60ea547565dcf2069ee0e0a646d53f34d244868600951c4b1a4d4e099fe50e3c2b477";
   hasRunfiles = true;
@@ -25767,7 +26233,9 @@ tl: { # no indentation
 };
 "mptopdf" = {
   revision = 61520;
-  deps."plain" = tl."plain";
+  deps = [
+    "plain"
+  ];
   hasFormats = true;
   sha512.run = "3e5bb2983ea7329e4d3a48a29a5902d0245b0bd07f6cc3d272358701bd7df8bef808cd23810a70ab60209dea2d8788624e98497c6c04c917a59874a84ed94a30";
   sha512.doc = "7bb6c2bc9dd0bceddb4b5aaa8d7143c40fb41baac2065cfbaf14642acb33bb7f05703d7b8469da0e92453ec10f0b8252d00b05588d7846835d622be097a83f8d";
@@ -26049,7 +26517,9 @@ tl: { # no indentation
 };
 "musixtnt" = {
   revision = 40307;
-  deps."musixtex" = tl."musixtex";
+  deps = [
+    "musixtex"
+  ];
   sha512.run = "eab6332d626f199e46dcd03ea546abbc4446b41c4b0354c066790ebfde154c6fa90f861dcff77206318b58a31565d884576899629520e78b3285bac673d1f4bf";
   sha512.doc = "2da473ad2425064747187da005e01d6844731c536b75095828a85d358ffb1344331ef483c0cebe79b346b4fa96a358a1e416cce7d7cfcce6b1242cf3c0a3645e";
   hasRunfiles = true;
@@ -26183,7 +26653,9 @@ tl: { # no indentation
 "namedef" = {
   revision = 55881;
   stripPrefix = 0;
-  deps."l3kernel" = tl."l3kernel";
+  deps = [
+    "l3kernel"
+  ];
   sha512.run = "c413d600911ab1107554ec2aacadc80fad12a95e7486817c002274f282e047915d06f4878e68e423af649569752cd27d7c1b3a802a9abff68e91038719b2fd28";
   sha512.doc = "72031cf2858a3b68092c852c216f96aaea212c721e47d90e870c8153f83db921590246fb11b59009d431754720791e3c625fb3abd7bdd9010cd1a49894023ebb";
   sha512.source = "adff08a774126c8faff52ba14044a8e2140f9586358dab6ce95e7a941706bf57c32acf0ad75282bd3b01dec8a73fea105c0c65a1453f5903d5eaeb3fe0349b15";
@@ -26460,7 +26932,9 @@ tl: { # no indentation
 "newtx" = {
   revision = 62369;
   stripPrefix = 0;
-  deps."kastrup" = tl."kastrup";
+  deps = [
+    "kastrup"
+  ];
   sha512.run = "07c63e655ebb6381bb7eaa4f0f1a35054894ee6db55992cb8fadc04a2dc62470767a12661a8cc697c8d15df40861835463ff7a0bad449f9fb86b59093642b89c";
   sha512.doc = "e615ce1c1a9478358af27885cd9c0b8d7ad152a3fb437ab705bf682d5849bd705a248de2d879ea9b4de0833984c15b0ad59c4da7da88c9e12d21fff9e4fd9efa";
   hasRunfiles = true;
@@ -26591,7 +27065,9 @@ tl: { # no indentation
 "nimbus15" = {
   revision = 58839;
   stripPrefix = 0;
-  deps."fontools" = tl."fontools";
+  deps = [
+    "fontools"
+  ];
   sha512.run = "9e39f92dea1fa293d6249d16877dd6b2d990d1d48cfd31f4ac1d66233b97ff178d2b70f428978a084fc9a50b9dd994adb6a8ad29375e54f5d5ccf6ca7ed62f64";
   sha512.doc = "8fb9ece6ca17549572a0d79a541397c6545dc01ac0422a5270314bba1cb83b1451fb0f56e34f449cc3d3de326e063e4ea1f2ea03a0fbda7342e9d0a101fb5ed1";
   hasRunfiles = true;
@@ -26791,7 +27267,9 @@ tl: { # no indentation
 "norasi-c90" = {
   revision = 60831;
   stripPrefix = 0;
-  deps."fonts-tlwg" = tl."fonts-tlwg";
+  deps = [
+    "fonts-tlwg"
+  ];
   sha512.run = "5f65927546348815b07c93003a2b0922403d274bfa3d1665d4649c9dbc737df924958c2fd61c1d06cd5e7c1862aff392c8d1e9d827f4ae79e70d9b76467f651d";
   sha512.source = "8fb30cc3a1e762ec15c813fff0191b08b64a0d259dbdd21a9edcf70c6eb1b327cff5ef3f48b9dba0b7d99d1ec31b3accef65deca7285e27790261ca659bd525d";
   hasRunfiles = true;
@@ -27083,13 +27561,15 @@ tl: { # no indentation
 "oberdiek" = {
   revision = 64463;
   stripPrefix = 0;
-  deps."auxhook" = tl."auxhook";
-  deps."grfext" = tl."grfext";
-  deps."grffile" = tl."grffile";
-  deps."iftex" = tl."iftex";
-  deps."infwarerr" = tl."infwarerr";
-  deps."kvoptions" = tl."kvoptions";
-  deps."pdftexcmds" = tl."pdftexcmds";
+  deps = [
+    "auxhook"
+    "grfext"
+    "grffile"
+    "iftex"
+    "infwarerr"
+    "kvoptions"
+    "pdftexcmds"
+  ];
   sha512.run = "b3f9d5918b24d6191515b459709afb9364a28f44a8b1ad3adc98c2d10c9a4f10316c80070c575fe4a6a06405bcead5bed312ab75553a32d254b2a80b2afbfb8f";
   sha512.doc = "b7f756ceb7dc619bc1941dfc56c5dd2f151e33c57c51444a11dbe74280a23ac27886da05b4b8d0f33dfe9839a5538cbac5e9d506338c89fb223d82867a3f839c";
   sha512.source = "688768a47cf782c817cc23e6e527e41c1893fc084702c2ab85e2e4b7df4b3d515033dbae0ea26bf904f6fae77dfce41d21a7b59415fbf67449a3aacc7047afd0";
@@ -27333,16 +27813,18 @@ tl: { # no indentation
 };
 "optex" = {
   revision = 65185;
-  deps."amsfonts" = tl."amsfonts";
-  deps."cm" = tl."cm";
-  deps."ec" = tl."ec";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."librarian" = tl."librarian";
-  deps."lm" = tl."lm";
-  deps."luaotfload" = tl."luaotfload";
-  deps."luatex" = tl."luatex";
-  deps."rsfs" = tl."rsfs";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "amsfonts"
+    "cm"
+    "ec"
+    "hyphen-base"
+    "librarian"
+    "lm"
+    "luaotfload"
+    "luatex"
+    "rsfs"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "a30b58b6dc9a1e06c3bf2fe196532ca88e5bf9ebae5e36f5ec2b9f146f95f18a70df2b15698bbcfc51300cef2c1b25c28521885c2ac1a44c6bb8cc485eed8739";
   sha512.doc = "8b7b46ab7984a0d1f590adabefb99085734532dd0dede6c429fdaa2bcaa3c2dcd1d0e70d37ae3cf9a109ab018f0fd29a7bc36250b8bf5d12c41ee4fa21bf9ccd";
@@ -27845,7 +28327,9 @@ tl: { # no indentation
 };
 "patgen" = {
   revision = 62387;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "e4b04bdc28d75de619307567716d2c29b41286a82cdafd6eca45df36baf67588cee94c4c320abadee4e3103fac8b33ba9367114875e56f198665388fc93e341d";
   sha512.doc = "dcf16fddb0085e8a8984047ff9e500c8b7fdd7d6b24b4f6154f464e05fe137b807c13d910881fda96e617cf80780ed1e75ccfe0fda2477b1d9b95990baf5f279";
   version = "2.4";
@@ -28096,10 +28580,12 @@ tl: { # no indentation
 "pdfpages" = {
   revision = 65319;
   stripPrefix = 0;
-  deps."eso-pic" = tl."eso-pic";
-  deps."graphics" = tl."graphics";
-  deps."oberdiek" = tl."oberdiek";
-  deps."tools" = tl."tools";
+  deps = [
+    "eso-pic"
+    "graphics"
+    "oberdiek"
+    "tools"
+  ];
   sha512.run = "c29f811574dde6dcd717255d40df7234d0916d6e7e4fe4c25e62639123bcdf4464e3e285c335c11bf2a289e8ca6391278611a0073fbd3ac8a071790717b2778a";
   sha512.doc = "d91c5ae383beb5b4d16d69d09124c1e9598d3abebecc5d1f63319a90c8784c361fda0bc68626db752c8b9a3dc3f6b691a1be6d6ed7d16169278228f68b876b2e";
   sha512.source = "869945d91d96e3a7936515a84bc4cfaad96193bb198a0a4db88300d1bfcf61ac971c6144820fcdb52045f4fa3511af8ec4045f999bbf8ef07d869d43e68dbee2";
@@ -28164,15 +28650,17 @@ tl: { # no indentation
 };
 "pdftex" = {
   revision = 64690;
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."etex" = tl."etex";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."kpathsea" = tl."kpathsea";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
+  deps = [
+    "cm"
+    "dehyph"
+    "etex"
+    "hyph-utf8"
+    "hyphen-base"
+    "knuth-lib"
+    "kpathsea"
+    "plain"
+    "tex-ini-files"
+  ];
   hasFormats = true;
   sha512.run = "f35a908deb539efbcab7f7db6b8d1c0aba08f1e6aa1fe39c4f7235d2cfddb61e14252fb71f90df1023a6a30809240dfb45905ff21a0d899a5c480e1b007212ec";
   sha512.doc = "018e860e5fc2222cac7d1f00498d74f3ccac00a10d0d226f2b2dd49d9941381ffc5341dea728155c3c0a4b39482b5b7c08e94c26cda99cb561b5044a6098beec";
@@ -28342,12 +28830,14 @@ tl: { # no indentation
 "pgf" = {
   revision = 59210;
   stripPrefix = 0;
-  deps."atveryend" = tl."atveryend";
-  deps."fp" = tl."fp";
-  deps."graphics" = tl."graphics";
-  deps."ms" = tl."ms";
-  deps."pdftexcmds" = tl."pdftexcmds";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "atveryend"
+    "fp"
+    "graphics"
+    "ms"
+    "pdftexcmds"
+    "xcolor"
+  ];
   sha512.run = "c02a5b4a0f3aab13d39166c30bd456603de012ce6089662ab0b7c091ac906eb5c1719543246db97ac49cc109ad05c1b1d59330a64a43f82689cddcc86a465d06";
   sha512.doc = "360aaf8f3a2b2f531c9f24c777fdc687bae4a40b2d03f99f081765690a94711f63902abc3e9a602fc2d2d5bf93d3611cf40e7082fab7176fc0fba07876485238";
   sha512.source = "f2779d8172a81882263bd1ff7ec17766fe1273cb824e7fdf695704dfb4575ff0aa3a77ca264e4c57e4c4cb232bfc87782532dcdb69de00eeb1ea3cc23392bb7f";
@@ -28391,9 +28881,11 @@ tl: { # no indentation
 "pgf-pie" = {
   revision = 63603;
   stripPrefix = 0;
-  deps."carlisle" = tl."carlisle";
-  deps."latex" = tl."latex";
-  deps."pgf" = tl."pgf";
+  deps = [
+    "carlisle"
+    "latex"
+    "pgf"
+  ];
   sha512.run = "3e5cdb5def0918ab1c3d38d35bb85f07711144d1fcaf0f3af8b2c5e0eacd9af6c3b92bc6e1f45438e40d7f5838770b91ab513970cdd9a3f7dad2918eefb875f6";
   sha512.doc = "ac151cb61ea4fc440ffeeea9b987f6dd648b53596934900f41437f787bedcabe2ca8dd53c37828aab816e9334d0d26573f81000333e50d0761d70c586a5d87e3";
   hasRunfiles = true;
@@ -28418,8 +28910,10 @@ tl: { # no indentation
 "pgf-umlcd" = {
   revision = 63386;
   stripPrefix = 0;
-  deps."latex" = tl."latex";
-  deps."pgf" = tl."pgf";
+  deps = [
+    "latex"
+    "pgf"
+  ];
   sha512.run = "a55281a157a2a347f1c9d82679cd663f4493e03123d14dbef0d71582613772252b693a25b3d3e5b72b948c4fd12d0d7b0354d2e38083583b550d7cfb5e634d93";
   sha512.doc = "6d798d93590d859d69bda9f0bd391049db91e2d4fb6f0b019a6f76eeaae9e73c9f249ec356cf5a5d4505af6948d4c70c2ad4685c1c41a7ba40ec62d3d8a9dd00";
   hasRunfiles = true;
@@ -28428,8 +28922,10 @@ tl: { # no indentation
 "pgf-umlsd" = {
   revision = 55342;
   stripPrefix = 0;
-  deps."latex" = tl."latex";
-  deps."pgf" = tl."pgf";
+  deps = [
+    "latex"
+    "pgf"
+  ];
   sha512.run = "6b015603e3daa362e473d795d32fa785ce247b58ec9f88872fe4bdb4fa660000bd87da2369de556f998485a6fcb6dd49aaca549b0470b41adacba5a278453197";
   sha512.doc = "968d23fcc4f114bab204ec53281975a6fee5f81635ece256351198075cd8463a706954f463beacc162180459fdb3652657f2c060a71c588681f8de6e788a4e6a";
   hasRunfiles = true;
@@ -28438,7 +28934,9 @@ tl: { # no indentation
 "pgfgantt" = {
   revision = 52662;
   stripPrefix = 0;
-  deps."pgf" = tl."pgf";
+  deps = [
+    "pgf"
+  ];
   sha512.run = "0269703fc00f10981d5ce8958159a24814b9f410c1b00516608c039b1ea8a3381392bf1d89e98f3011d42210047bf2e1fec2f103467087f9172e143d9ab6fcf1";
   sha512.doc = "4890ae174c92db8df7befcef30d03724ae52fa4b26ac796d247a703794ce745ee892f0d2ab8a4f62e96a5e5f792791a6f7e8b9e71f1c0f11b68e8cbcf5165472";
   sha512.source = "668987bd37aebd38697c02bc39d85371c7d40613aba13c0f3b62ece8145608057cf3f76cda03de6df25f7ba820359ff2ba1c340aa1b9ebff94bbd42aed39e401";
@@ -28482,7 +28980,9 @@ tl: { # no indentation
 "pgfopts" = {
   revision = 56615;
   stripPrefix = 0;
-  deps."pgf" = tl."pgf";
+  deps = [
+    "pgf"
+  ];
   sha512.run = "7d672d626428c37fa749a810c57be43c6102e1325a6d3e16c57bc560b6d65a57bae94e619a73f3e0efb46ce7b4783d05a6e98c64b1e90c6e0f94f1dd9acd676f";
   sha512.doc = "ff82e0502fdeefe6afe90aad4e7615de9be4ef8e2e6a69e7a537202af77aed00c0895269ceed3d38e0f34345efbdd771d22b0c8759fcb46ff8e91ce639dcd21d";
   sha512.source = "758da1f3daa0ef888b484ea657fdd4384102868e4eee543bc97e73f103b67c367277f5c00efd06a2080f9ac3fb82c909cd30f641363120e70357450179dab6c5";
@@ -28507,7 +29007,9 @@ tl: { # no indentation
 "pgfplots" = {
   revision = 61719;
   stripPrefix = 0;
-  deps."pgf" = tl."pgf";
+  deps = [
+    "pgf"
+  ];
   sha512.run = "8244e65860f37d74d05535a627ef6cd321407a69a142d156bae190c562a9402a0d7e927df732c32cc5f556dede1b51f7aeca5d7d3a26167348a21f2e3d8be5ac";
   sha512.doc = "720a77c574c81e7c3619e3b988c8a359bd6cf284ad3fa7c795eb01c371ede85ad727dde8e5f19d8f683947b5dc5752324581e364c59e8a644b5ae34d6b75a96f";
   sha512.source = "d840015854794de1a311f1d8a9935a93c71a098c46fb1c5cec8a57228a924685f75ea76fc9cf2a9f9f30ed39920bbf2092fbdef2645ddaa5ad5a3787839c1d2a";
@@ -28945,24 +29447,26 @@ tl: { # no indentation
 };
 "platex" = {
   revision = 65305;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."ptex" = tl."ptex";
-  deps."ptex-fonts" = tl."ptex-fonts";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-base-dev"
+    "latex-firstaid-dev"
+    "latex-fonts"
+    "ptex"
+    "ptex-fonts"
+    "tex-ini-files"
+    "unicode-data"
+  ];
   hasFormats = true;
   sha512.run = "53a9c0137d35110ce5b1875875f2b5e20d9db884b62bf25eea4a9d9c2724ff6e779680c060ee2aad5ebf36372045b3ef7d711658f6d50af4999e409f5860c09f";
   sha512.doc = "7b47db806f6a79ab99c19833f3cbbfdb2bae594f370ccb51288df95c262680a7a789888952edb542321d899f6efa0d4aaec6b9d00adec8826b8a10c4db2d3c27";
@@ -29163,8 +29667,10 @@ tl: { # no indentation
 "polski" = {
   revision = 60322;
   stripPrefix = 0;
-  deps."hyphen-polish" = tl."hyphen-polish";
-  deps."pl" = tl."pl";
+  deps = [
+    "hyphen-polish"
+    "pl"
+  ];
   sha512.run = "24bdb98990f66e89085056e6ad3e0930dd16d0f4bbd07a2c9a49931796e143505276d2025fee21b2b52d927c3b2992d31f4edae4668cdb549f6f00ef43dc1c69";
   sha512.doc = "755e7625d5ee1e4457e7ee518469d585c9c1e566c57bf147c62195555ae91dadb68f469127cb18a7c30cda1468129db09cb09b1974f5273d41c9491a6e1d5ffc";
   sha512.source = "8e216956a95df02134cf411d170a75309c3f167a5bf7d78f77c4e47950c8a5da52e523e367f5ce60492fc0ab7cb205e9b57835b883225752731ca094d7c507b8";
@@ -29182,12 +29688,14 @@ tl: { # no indentation
 "polyglossia" = {
   revision = 65144;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."filehook" = tl."filehook";
-  deps."fontspec" = tl."fontspec";
-  deps."iftex" = tl."iftex";
-  deps."makecmds" = tl."makecmds";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "etoolbox"
+    "filehook"
+    "fontspec"
+    "iftex"
+    "makecmds"
+    "xkeyval"
+  ];
   sha512.run = "65d91b180f748592c2eb7a98232b7b438c762a56100294995454e54d7759ef00076d63d90660fcded3d0ee5aa03d1a4b328ff3706db1926be2546140325e8e96";
   sha512.doc = "88867dbf5e218720a13e0ffeaf0ecc3784adbf5097c99cfc193f35be1c99c82c459e0e27b1e1d72cee1020549bc6131b8da03a47beef42f59d53b4fd4fe036c4";
   sha512.source = "e037d2a8c0bebf37a8ed3dcdae764dd2cda3d780379ba70a67eb46447936816e8c43122d691bdf58122fcc7a96f2bcf3d6710d71bf5bb378cf0418efd40ae37f";
@@ -29299,18 +29807,20 @@ tl: { # no indentation
 "ppt-slides" = {
   revision = 65194;
   stripPrefix = 0;
-  deps."crumbs" = tl."crumbs";
-  deps."enumitem" = tl."enumitem";
-  deps."hyperref" = tl."hyperref";
-  deps."pagecolor" = tl."pagecolor";
-  deps."pgf" = tl."pgf";
-  deps."pgfopts" = tl."pgfopts";
-  deps."qrcode" = tl."qrcode";
-  deps."seqsplit" = tl."seqsplit";
-  deps."tikzpagenodes" = tl."tikzpagenodes";
-  deps."tools" = tl."tools";
-  deps."varwidth" = tl."varwidth";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "crumbs"
+    "enumitem"
+    "hyperref"
+    "pagecolor"
+    "pgf"
+    "pgfopts"
+    "qrcode"
+    "seqsplit"
+    "tikzpagenodes"
+    "tools"
+    "varwidth"
+    "xcolor"
+  ];
   sha512.run = "8741def8d57db17bef3490c881a615340290283860e9978e105b7ba0768b5fbf02023722109dd2f6860e9fa8d44fe7cf742eb2a97ae08d1199a6dea9f73503f2";
   sha512.doc = "6528e50797dae2dd928d11f78bdcb3368177412823657baccba10c194bebce97384ed55d10c5307c13aa06883a156abd57a944acc26f9237a138df22b5a33658";
   sha512.source = "42dd3fdc96d1ffbf39deba0e2e292392a9aa6a2b266d7787448b93996f12c966abff0b643281fec8b336a395b283e2e88fafb365f616455e3393645cd7c3a55c";
@@ -29396,9 +29906,11 @@ tl: { # no indentation
 "prettytok" = {
   revision = 63842;
   stripPrefix = 0;
-  deps."filecontentsdef" = tl."filecontentsdef";
-  deps."l3kernel" = tl."l3kernel";
-  deps."precattl" = tl."precattl";
+  deps = [
+    "filecontentsdef"
+    "l3kernel"
+    "precattl"
+  ];
   sha512.run = "8b9f5e9fec9d50b9f688115e00ad6fde21adfb9cef69e020fb297abcfe489cc6fde08d2ad4b72ea5f6b8e0b7499a97c798e8c0bd306d298427fcd19b6365c300";
   sha512.doc = "8dc2afdc9920817b13050bdb6d92164e9322a18fd1d7a7adc7a1655c8dd68181b00faef22c09f9bce45be0744e179c978ba40c6f841e3c2cdba1c88225f7486f";
   hasRunfiles = true;
@@ -29700,9 +30212,11 @@ tl: { # no indentation
 "psnfss" = {
   revision = 54694;
   stripPrefix = 0;
-  deps."graphics" = tl."graphics";
-  deps."symbol" = tl."symbol";
-  deps."zapfding" = tl."zapfding";
+  deps = [
+    "graphics"
+    "symbol"
+    "zapfding"
+  ];
   sha512.run = "f7d1acebcd1d32a691221f396220358f3bb15dff2e2cebec4b537b1b790b68d8ce1164711983a52b4f04d6e470df2e3e5fec63bb1d3bf39fe205d5f0351299de";
   sha512.doc = "d1c14edccdf43ed2c786394bc04e9fd683b683532a9dc18d592f918ee8899234d23feb738128aa1418f441288cdbf0c6de832f8c4d98023926baeace36365a1d";
   sha512.source = "6862a7e74be6a575996e6f45a2236db810f1c030d3a0c53b2b97c2e803fc7e29010108e4597d637b8abedd63b1f956da268f62ca2c609accaa4d035be7bfd8ed";
@@ -30475,7 +30989,9 @@ tl: { # no indentation
 "pst-uml" = {
   revision = 15878;
   stripPrefix = 0;
-  deps."multido" = tl."multido";
+  deps = [
+    "multido"
+  ];
   sha512.run = "e4ff8ea9b7fb9f530e33280de3e9eb20d653c0c062fa80611a544daf74da0b1dd2481b43d8f5258f9ebc1d1bf95b393b32c7152ab8464a9e980cefa105c45ceb";
   sha512.doc = "d8aa92785c241b6346762d98349d8464ce604afceb8774ef160e8c24e0a40d3fd8dba7cac3f78cbf38cbf6cfebb79939ad3c76e6b4014c1028859aba38123efe";
   sha512.source = "8b7e551154c1b1966046268ed3353b6c78c3a66bfa20f44c7fba3b58f661f2585b71d49d2dd673368f732b2f9446dc7783bad4ae5248169a79721d330a49514c";
@@ -30568,13 +31084,15 @@ tl: { # no indentation
 };
 "ptex" = {
   revision = 62464;
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."plain" = tl."plain";
-  deps."ptex-base" = tl."ptex-base";
-  deps."ptex-fonts" = tl."ptex-fonts";
+  deps = [
+    "cm"
+    "etex"
+    "hyphen-base"
+    "knuth-lib"
+    "plain"
+    "ptex-base"
+    "ptex-fonts"
+  ];
   hasFormats = true;
   sha512.run = "6e2e40d86740a24550cb4f55630db81bdc777daf87533cb23b4fe041439d00e10cbb7b5fab92e33828c87945e710ea3579d76a8e0fdae0b8ba069b5eb33968c3";
   sha512.doc = "96aed9e990d013c7f5310a5ec86a1f7465d0de8503009669a5e10ccf4d3ed8767bf1408cfb04cfa8876e02640bc4a3b07249c331cc6190e391cb4a5b8aeafa35";
@@ -30824,10 +31342,12 @@ tl: { # no indentation
 "pythonimmediate" = {
   revision = 65349;
   stripPrefix = 0;
-  deps."currfile" = tl."currfile";
-  deps."l3packages" = tl."l3packages";
-  deps."precattl" = tl."precattl";
-  deps."saveenv" = tl."saveenv";
+  deps = [
+    "currfile"
+    "l3packages"
+    "precattl"
+    "saveenv"
+  ];
   sha512.run = "970cd28032c551271f97fcae614a03f012684b0f1a09904284ff35e9461195a1e5b8a6f51c12c4e7dc7b54720d13a34d9bbe471469a03c0fd00ddc49d8462d9c";
   sha512.doc = "68068245368180f4dff747a18abdc068a2f0fddcc5b3cf3e63403d99ceaf56ddc5ee17bb32ebefb42f92268d3b681c5c5feb94aa76823b90478d77f0b3e511bd";
   hasRunfiles = true;
@@ -31409,8 +31929,10 @@ tl: { # no indentation
 "rerunfilecheck" = {
   revision = 63869;
   stripPrefix = 0;
-  deps."atveryend" = tl."atveryend";
-  deps."uniquecounter" = tl."uniquecounter";
+  deps = [
+    "atveryend"
+    "uniquecounter"
+  ];
   sha512.run = "464daf4ee4f443f4ff329e28b928df94e83e83696e3e5604de7b51beb61c25a0ce50dc00b35d2cc8d0cabb32d10bc28c3c06069f5dd7eafd9fdb2d44a3adf313";
   sha512.doc = "7c570d38c989aaeb7db5271501c5384ba8b8601396f629d7ffee32baaf1c289592bb5d69d2cb2784cfb2008fdc047098d43dc20803e4b90eac59848c15dd0cb7";
   sha512.source = "2d987c01bc0f67708080d4578f308444ed3220a37ee11ef1a95c2a9bfa0ab49a46ab46d291153f0c748935f473124d70212a821233b22f1e606be6183e4afe81";
@@ -31962,7 +32484,9 @@ tl: { # no indentation
 "saveenv" = {
   revision = 65346;
   stripPrefix = 0;
-  deps."precattl" = tl."precattl";
+  deps = [
+    "precattl"
+  ];
   sha512.run = "e0e368dcf3add9d59b22d8e04da1de9110d6f1ad2e31cd2cd44f894ea1d7f0cbd4eb41b500637e896eb179539e19c4a1d0601035e2404726dfc98677f9db0927";
   sha512.doc = "2016c815add27dca5b498f4cca3ce69c9c18f544b9651305d5d9a9a7a10b30fe187c526da37813218388f8305fc3df83257b2e9b6289171febb770c7d59d9274";
   hasRunfiles = true;
@@ -32056,307 +32580,327 @@ tl: { # no indentation
 "scheme-basic" = {
   revision = 54191;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
+  deps = [
+    "collection-basic"
+    "collection-latex"
+  ];
   sha512.run = "027a1cd0dd4fc5da2427864bb49fc885a00bec6e8a74da24ce9cd781c69bf4288ddfc3c790307ed48052a8fc00c1989d3939b253da6638370adbb1c43348749b";
 };
 "scheme-bookpub" = {
   revision = 63547;
   stripPrefix = 0;
-  deps."barcodes" = tl."barcodes";
-  deps."biber" = tl."biber";
-  deps."biblatex" = tl."biblatex";
-  deps."bookcover" = tl."bookcover";
-  deps."caption" = tl."caption";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."enumitem" = tl."enumitem";
-  deps."fontspec" = tl."fontspec";
-  deps."latexmk" = tl."latexmk";
-  deps."lipsum" = tl."lipsum";
-  deps."listings" = tl."listings";
-  deps."markdown" = tl."markdown";
-  deps."memoir" = tl."memoir";
-  deps."microtype" = tl."microtype";
-  deps."minted" = tl."minted";
-  deps."novel" = tl."novel";
-  deps."octavo" = tl."octavo";
-  deps."pdfpages" = tl."pdfpages";
-  deps."pgf" = tl."pgf";
-  deps."qrcode" = tl."qrcode";
-  deps."shapes" = tl."shapes";
-  deps."titlesec" = tl."titlesec";
-  deps."tocloft" = tl."tocloft";
-  deps."tufte-latex" = tl."tufte-latex";
-  deps."willowtreebook" = tl."willowtreebook";
+  deps = [
+    "barcodes"
+    "biber"
+    "biblatex"
+    "bookcover"
+    "caption"
+    "collection-basic"
+    "collection-latex"
+    "enumitem"
+    "fontspec"
+    "latexmk"
+    "lipsum"
+    "listings"
+    "markdown"
+    "memoir"
+    "microtype"
+    "minted"
+    "novel"
+    "octavo"
+    "pdfpages"
+    "pgf"
+    "qrcode"
+    "shapes"
+    "titlesec"
+    "tocloft"
+    "tufte-latex"
+    "willowtreebook"
+  ];
   sha512.run = "0ea47f8907821e273a581c52494b6a4e9a511a71e11ebfb05756eaded6e5132fc548312cb6365cc4c1906b4e8ffb14ee5ed496484fe5e2a2611e154091d23cf6";
 };
 "scheme-context" = {
   revision = 59636;
   stripPrefix = 0;
-  deps."antt" = tl."antt";
-  deps."asana-math" = tl."asana-math";
-  deps."ccicons" = tl."ccicons";
-  deps."collection-context" = tl."collection-context";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."dejavu" = tl."dejavu";
-  deps."eulervm" = tl."eulervm";
-  deps."gentium-tug" = tl."gentium-tug";
-  deps."iwona" = tl."iwona";
-  deps."kurier" = tl."kurier";
-  deps."ly1" = tl."ly1";
-  deps."manfnt-font" = tl."manfnt-font";
-  deps."marvosym" = tl."marvosym";
-  deps."mflogo-font" = tl."mflogo-font";
-  deps."poltawski" = tl."poltawski";
-  deps."pxfonts" = tl."pxfonts";
-  deps."tex-gyre" = tl."tex-gyre";
-  deps."tex-gyre-math" = tl."tex-gyre-math";
-  deps."txfonts" = tl."txfonts";
-  deps."wasy" = tl."wasy";
-  deps."xits" = tl."xits";
+  deps = [
+    "antt"
+    "asana-math"
+    "ccicons"
+    "collection-context"
+    "collection-metapost"
+    "dejavu"
+    "eulervm"
+    "gentium-tug"
+    "iwona"
+    "kurier"
+    "ly1"
+    "manfnt-font"
+    "marvosym"
+    "mflogo-font"
+    "poltawski"
+    "pxfonts"
+    "tex-gyre"
+    "tex-gyre-math"
+    "txfonts"
+    "wasy"
+    "xits"
+  ];
   sha512.run = "0b041f3c27ef88e7baec105b7cb24fa65c4b1f092f155482d584d9041ced4f329251f0b0d32f7019c15fff3c57b4d17f057cf39781f8be16a4e8c0ce4838163e";
 };
 "scheme-full" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-bibtexextra" = tl."collection-bibtexextra";
-  deps."collection-binextra" = tl."collection-binextra";
-  deps."collection-context" = tl."collection-context";
-  deps."collection-fontsextra" = tl."collection-fontsextra";
-  deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
-  deps."collection-fontutils" = tl."collection-fontutils";
-  deps."collection-formatsextra" = tl."collection-formatsextra";
-  deps."collection-games" = tl."collection-games";
-  deps."collection-humanities" = tl."collection-humanities";
-  deps."collection-langarabic" = tl."collection-langarabic";
-  deps."collection-langchinese" = tl."collection-langchinese";
-  deps."collection-langcjk" = tl."collection-langcjk";
-  deps."collection-langcyrillic" = tl."collection-langcyrillic";
-  deps."collection-langczechslovak" = tl."collection-langczechslovak";
-  deps."collection-langenglish" = tl."collection-langenglish";
-  deps."collection-langeuropean" = tl."collection-langeuropean";
-  deps."collection-langfrench" = tl."collection-langfrench";
-  deps."collection-langgerman" = tl."collection-langgerman";
-  deps."collection-langgreek" = tl."collection-langgreek";
-  deps."collection-langitalian" = tl."collection-langitalian";
-  deps."collection-langjapanese" = tl."collection-langjapanese";
-  deps."collection-langkorean" = tl."collection-langkorean";
-  deps."collection-langother" = tl."collection-langother";
-  deps."collection-langpolish" = tl."collection-langpolish";
-  deps."collection-langportuguese" = tl."collection-langportuguese";
-  deps."collection-langspanish" = tl."collection-langspanish";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collection-latexextra" = tl."collection-latexextra";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-luatex" = tl."collection-luatex";
-  deps."collection-mathscience" = tl."collection-mathscience";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."collection-music" = tl."collection-music";
-  deps."collection-pictures" = tl."collection-pictures";
-  deps."collection-plaingeneric" = tl."collection-plaingeneric";
-  deps."collection-pstricks" = tl."collection-pstricks";
-  deps."collection-publishers" = tl."collection-publishers";
-  deps."collection-texworks" = tl."collection-texworks";
-  deps."collection-xetex" = tl."collection-xetex";
+  deps = [
+    "collection-basic"
+    "collection-bibtexextra"
+    "collection-binextra"
+    "collection-context"
+    "collection-fontsextra"
+    "collection-fontsrecommended"
+    "collection-fontutils"
+    "collection-formatsextra"
+    "collection-games"
+    "collection-humanities"
+    "collection-langarabic"
+    "collection-langchinese"
+    "collection-langcjk"
+    "collection-langcyrillic"
+    "collection-langczechslovak"
+    "collection-langenglish"
+    "collection-langeuropean"
+    "collection-langfrench"
+    "collection-langgerman"
+    "collection-langgreek"
+    "collection-langitalian"
+    "collection-langjapanese"
+    "collection-langkorean"
+    "collection-langother"
+    "collection-langpolish"
+    "collection-langportuguese"
+    "collection-langspanish"
+    "collection-latex"
+    "collection-latexextra"
+    "collection-latexrecommended"
+    "collection-luatex"
+    "collection-mathscience"
+    "collection-metapost"
+    "collection-music"
+    "collection-pictures"
+    "collection-plaingeneric"
+    "collection-pstricks"
+    "collection-publishers"
+    "collection-texworks"
+    "collection-xetex"
+  ];
   sha512.run = "bda507842fde5239d7f45169ff78690bd96066d1834cdcc6a0dcbd3e3439308c694ce4be6a91d1f155ebe5e29d46173fe13c83bcd4356969da95fb7cca1b4e38";
 };
 "scheme-gust" = {
   revision = 59755;
   stripPrefix = 0;
-  deps."amslatex-primer" = tl."amslatex-primer";
-  deps."amstex" = tl."amstex";
-  deps."antt" = tl."antt";
-  deps."bibtex8" = tl."bibtex8";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-context" = tl."collection-context";
-  deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
-  deps."collection-fontutils" = tl."collection-fontutils";
-  deps."collection-langpolish" = tl."collection-langpolish";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."collection-plaingeneric" = tl."collection-plaingeneric";
-  deps."collection-texworks" = tl."collection-texworks";
-  deps."collection-xetex" = tl."collection-xetex";
-  deps."comment" = tl."comment";
-  deps."comprehensive" = tl."comprehensive";
-  deps."concrete" = tl."concrete";
-  deps."cyklop" = tl."cyklop";
-  deps."dvidvi" = tl."dvidvi";
-  deps."dviljk" = tl."dviljk";
-  deps."fontinstallationguide" = tl."fontinstallationguide";
-  deps."gustprog" = tl."gustprog";
-  deps."impatient" = tl."impatient";
-  deps."iwona" = tl."iwona";
-  deps."metafont-beginners" = tl."metafont-beginners";
-  deps."metapost-examples" = tl."metapost-examples";
-  deps."poltawski" = tl."poltawski";
-  deps."seetexk" = tl."seetexk";
-  deps."seminar" = tl."seminar";
-  deps."tds" = tl."tds";
-  deps."tex4ht" = tl."tex4ht";
-  deps."texdoc" = tl."texdoc";
+  deps = [
+    "amslatex-primer"
+    "amstex"
+    "antt"
+    "bibtex8"
+    "collection-basic"
+    "collection-context"
+    "collection-fontsrecommended"
+    "collection-fontutils"
+    "collection-langpolish"
+    "collection-latex"
+    "collection-latexrecommended"
+    "collection-metapost"
+    "collection-plaingeneric"
+    "collection-texworks"
+    "collection-xetex"
+    "comment"
+    "comprehensive"
+    "concrete"
+    "cyklop"
+    "dvidvi"
+    "dviljk"
+    "fontinstallationguide"
+    "gustprog"
+    "impatient"
+    "iwona"
+    "metafont-beginners"
+    "metapost-examples"
+    "poltawski"
+    "seetexk"
+    "seminar"
+    "tds"
+    "tex4ht"
+    "texdoc"
+  ];
   sha512.run = "2b3e2e3d31c8fca7297729e910ada06a0d0282b618c92487b7a0da686938dc1f6f3b0881c7d1f8f3d002806ad8860c25802637c77919e21ca54ae8a23ef08ae7";
 };
 "scheme-infraonly" = {
   revision = 54191;
   stripPrefix = 0;
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."kpathsea" = tl."kpathsea";
-  deps."texlive-scripts" = tl."texlive-scripts";
+  deps = [
+    "hyphen-base"
+    "kpathsea"
+    "texlive-scripts"
+  ];
   sha512.run = "f3e449bf0b34deb9ae776685f386245c4ca9644f2175ae51e9c62faa00e3cfac30fa2aa07fbd83b15b21d487ca368c09a18742d2434047783350698ced3b20b9";
 };
 "scheme-medium" = {
   revision = 54074;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-binextra" = tl."collection-binextra";
-  deps."collection-context" = tl."collection-context";
-  deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
-  deps."collection-fontutils" = tl."collection-fontutils";
-  deps."collection-langczechslovak" = tl."collection-langczechslovak";
-  deps."collection-langenglish" = tl."collection-langenglish";
-  deps."collection-langeuropean" = tl."collection-langeuropean";
-  deps."collection-langfrench" = tl."collection-langfrench";
-  deps."collection-langgerman" = tl."collection-langgerman";
-  deps."collection-langitalian" = tl."collection-langitalian";
-  deps."collection-langpolish" = tl."collection-langpolish";
-  deps."collection-langportuguese" = tl."collection-langportuguese";
-  deps."collection-langspanish" = tl."collection-langspanish";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-luatex" = tl."collection-luatex";
-  deps."collection-mathscience" = tl."collection-mathscience";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."collection-plaingeneric" = tl."collection-plaingeneric";
-  deps."collection-texworks" = tl."collection-texworks";
-  deps."collection-xetex" = tl."collection-xetex";
+  deps = [
+    "collection-basic"
+    "collection-binextra"
+    "collection-context"
+    "collection-fontsrecommended"
+    "collection-fontutils"
+    "collection-langczechslovak"
+    "collection-langenglish"
+    "collection-langeuropean"
+    "collection-langfrench"
+    "collection-langgerman"
+    "collection-langitalian"
+    "collection-langpolish"
+    "collection-langportuguese"
+    "collection-langspanish"
+    "collection-latex"
+    "collection-latexrecommended"
+    "collection-luatex"
+    "collection-mathscience"
+    "collection-metapost"
+    "collection-plaingeneric"
+    "collection-texworks"
+    "collection-xetex"
+  ];
   sha512.run = "fdfbbd8fc370bfb0ea35ed9f3137b62eddd3e54777963668b3dfe7af6328a92f37c74e190e7f506ec27a3efbe44458941360599a4061a2765d0072af56808d60";
 };
 "scheme-minimal" = {
   revision = 54191;
   stripPrefix = 0;
-  deps."collection-basic" = tl."collection-basic";
+  deps = [
+    "collection-basic"
+  ];
   sha512.run = "ac177b74d9d5b9fa599831275a4084a0eeb7b764a6ed837d8f14f8391f0e6c0757f7b2d4a8e71868e0c8ea4d497f29d78c4c73fb9e6311dbecf29626516bbf82";
 };
 "scheme-small" = {
   revision = 54191;
   stripPrefix = 0;
-  deps."babel-basque" = tl."babel-basque";
-  deps."babel-czech" = tl."babel-czech";
-  deps."babel-danish" = tl."babel-danish";
-  deps."babel-dutch" = tl."babel-dutch";
-  deps."babel-english" = tl."babel-english";
-  deps."babel-finnish" = tl."babel-finnish";
-  deps."babel-french" = tl."babel-french";
-  deps."babel-german" = tl."babel-german";
-  deps."babel-hungarian" = tl."babel-hungarian";
-  deps."babel-italian" = tl."babel-italian";
-  deps."babel-norsk" = tl."babel-norsk";
-  deps."babel-polish" = tl."babel-polish";
-  deps."babel-portuges" = tl."babel-portuges";
-  deps."babel-spanish" = tl."babel-spanish";
-  deps."babel-swedish" = tl."babel-swedish";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."collection-xetex" = tl."collection-xetex";
-  deps."ec" = tl."ec";
-  deps."eurosym" = tl."eurosym";
-  deps."hyphen-basque" = tl."hyphen-basque";
-  deps."hyphen-czech" = tl."hyphen-czech";
-  deps."hyphen-danish" = tl."hyphen-danish";
-  deps."hyphen-dutch" = tl."hyphen-dutch";
-  deps."hyphen-english" = tl."hyphen-english";
-  deps."hyphen-finnish" = tl."hyphen-finnish";
-  deps."hyphen-french" = tl."hyphen-french";
-  deps."hyphen-german" = tl."hyphen-german";
-  deps."hyphen-hungarian" = tl."hyphen-hungarian";
-  deps."hyphen-italian" = tl."hyphen-italian";
-  deps."hyphen-norwegian" = tl."hyphen-norwegian";
-  deps."hyphen-polish" = tl."hyphen-polish";
-  deps."hyphen-portuguese" = tl."hyphen-portuguese";
-  deps."hyphen-spanish" = tl."hyphen-spanish";
-  deps."hyphen-swedish" = tl."hyphen-swedish";
-  deps."lm" = tl."lm";
-  deps."lualibs" = tl."lualibs";
-  deps."luaotfload" = tl."luaotfload";
-  deps."luatexbase" = tl."luatexbase";
-  deps."revtex" = tl."revtex";
-  deps."synctex" = tl."synctex";
-  deps."times" = tl."times";
-  deps."tipa" = tl."tipa";
-  deps."ulem" = tl."ulem";
-  deps."upquote" = tl."upquote";
-  deps."zapfding" = tl."zapfding";
+  deps = [
+    "babel-basque"
+    "babel-czech"
+    "babel-danish"
+    "babel-dutch"
+    "babel-english"
+    "babel-finnish"
+    "babel-french"
+    "babel-german"
+    "babel-hungarian"
+    "babel-italian"
+    "babel-norsk"
+    "babel-polish"
+    "babel-portuges"
+    "babel-spanish"
+    "babel-swedish"
+    "collection-basic"
+    "collection-latex"
+    "collection-latexrecommended"
+    "collection-metapost"
+    "collection-xetex"
+    "ec"
+    "eurosym"
+    "hyphen-basque"
+    "hyphen-czech"
+    "hyphen-danish"
+    "hyphen-dutch"
+    "hyphen-english"
+    "hyphen-finnish"
+    "hyphen-french"
+    "hyphen-german"
+    "hyphen-hungarian"
+    "hyphen-italian"
+    "hyphen-norwegian"
+    "hyphen-polish"
+    "hyphen-portuguese"
+    "hyphen-spanish"
+    "hyphen-swedish"
+    "lm"
+    "lualibs"
+    "luaotfload"
+    "luatexbase"
+    "revtex"
+    "synctex"
+    "times"
+    "tipa"
+    "ulem"
+    "upquote"
+    "zapfding"
+  ];
   sha512.run = "6267151dd73cb8b751ad47b79f9c698b465ad5ae5494d462cf5b3b4e7446a3c014a715381bc6a79eaacfd1ba6efb37c6c1bafbd5e1f82e8db751bbaa9a943013";
 };
 "scheme-tetex" = {
   revision = 59715;
   stripPrefix = 0;
-  deps."acronym" = tl."acronym";
-  deps."amslatex-primer" = tl."amslatex-primer";
-  deps."bbm" = tl."bbm";
-  deps."bbm-macros" = tl."bbm-macros";
-  deps."bbold" = tl."bbold";
-  deps."bibtex8" = tl."bibtex8";
-  deps."cmbright" = tl."cmbright";
-  deps."collection-basic" = tl."collection-basic";
-  deps."collection-context" = tl."collection-context";
-  deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
-  deps."collection-fontutils" = tl."collection-fontutils";
-  deps."collection-formatsextra" = tl."collection-formatsextra";
-  deps."collection-langcjk" = tl."collection-langcjk";
-  deps."collection-langcyrillic" = tl."collection-langcyrillic";
-  deps."collection-langczechslovak" = tl."collection-langczechslovak";
-  deps."collection-langenglish" = tl."collection-langenglish";
-  deps."collection-langeuropean" = tl."collection-langeuropean";
-  deps."collection-langfrench" = tl."collection-langfrench";
-  deps."collection-langgerman" = tl."collection-langgerman";
-  deps."collection-langgreek" = tl."collection-langgreek";
-  deps."collection-langitalian" = tl."collection-langitalian";
-  deps."collection-langother" = tl."collection-langother";
-  deps."collection-langpolish" = tl."collection-langpolish";
-  deps."collection-langportuguese" = tl."collection-langportuguese";
-  deps."collection-langspanish" = tl."collection-langspanish";
-  deps."collection-latex" = tl."collection-latex";
-  deps."collection-latexrecommended" = tl."collection-latexrecommended";
-  deps."collection-mathscience" = tl."collection-mathscience";
-  deps."collection-metapost" = tl."collection-metapost";
-  deps."collection-pictures" = tl."collection-pictures";
-  deps."collection-plaingeneric" = tl."collection-plaingeneric";
-  deps."collection-pstricks" = tl."collection-pstricks";
-  deps."ctie" = tl."ctie";
-  deps."cweb" = tl."cweb";
-  deps."detex" = tl."detex";
-  deps."dtl" = tl."dtl";
-  deps."dvi2tty" = tl."dvi2tty";
-  deps."dvicopy" = tl."dvicopy";
-  deps."dvidvi" = tl."dvidvi";
-  deps."dviljk" = tl."dviljk";
-  deps."eplain" = tl."eplain";
-  deps."eulervm" = tl."eulervm";
-  deps."gentle" = tl."gentle";
-  deps."lshort-english" = tl."lshort-english";
-  deps."mltex" = tl."mltex";
-  deps."multirow" = tl."multirow";
-  deps."nomencl" = tl."nomencl";
-  deps."patgen" = tl."patgen";
-  deps."pst-pdf" = tl."pst-pdf";
-  deps."rsfs" = tl."rsfs";
-  deps."seetexk" = tl."seetexk";
-  deps."siunits" = tl."siunits";
-  deps."subfigure" = tl."subfigure";
-  deps."supertabular" = tl."supertabular";
-  deps."tamethebeast" = tl."tamethebeast";
-  deps."tds" = tl."tds";
-  deps."tex-refs" = tl."tex-refs";
-  deps."tie" = tl."tie";
-  deps."web" = tl."web";
-  deps."xpdfopen" = tl."xpdfopen";
+  deps = [
+    "acronym"
+    "amslatex-primer"
+    "bbm"
+    "bbm-macros"
+    "bbold"
+    "bibtex8"
+    "cmbright"
+    "collection-basic"
+    "collection-context"
+    "collection-fontsrecommended"
+    "collection-fontutils"
+    "collection-formatsextra"
+    "collection-langcjk"
+    "collection-langcyrillic"
+    "collection-langczechslovak"
+    "collection-langenglish"
+    "collection-langeuropean"
+    "collection-langfrench"
+    "collection-langgerman"
+    "collection-langgreek"
+    "collection-langitalian"
+    "collection-langother"
+    "collection-langpolish"
+    "collection-langportuguese"
+    "collection-langspanish"
+    "collection-latex"
+    "collection-latexrecommended"
+    "collection-mathscience"
+    "collection-metapost"
+    "collection-pictures"
+    "collection-plaingeneric"
+    "collection-pstricks"
+    "ctie"
+    "cweb"
+    "detex"
+    "dtl"
+    "dvi2tty"
+    "dvicopy"
+    "dvidvi"
+    "dviljk"
+    "eplain"
+    "eulervm"
+    "gentle"
+    "lshort-english"
+    "mltex"
+    "multirow"
+    "nomencl"
+    "patgen"
+    "pst-pdf"
+    "rsfs"
+    "seetexk"
+    "siunits"
+    "subfigure"
+    "supertabular"
+    "tamethebeast"
+    "tds"
+    "tex-refs"
+    "tie"
+    "web"
+    "xpdfopen"
+  ];
   sha512.run = "fe8b53391733392a72be2e2c80892ec68fbdb749c70636c307825c8bfd6284945c9961610fd19f8b5d6b03ec50f0a1543c7d159f5f2a19534d71b221addfb708";
 };
 "schola-otf" = {
@@ -32556,12 +33100,14 @@ tl: { # no indentation
 "sdaps" = {
   revision = 65345;
   stripPrefix = 0;
-  deps."environ" = tl."environ";
-  deps."lastpage" = tl."lastpage";
-  deps."pgf" = tl."pgf";
-  deps."qrcode" = tl."qrcode";
-  deps."sectsty" = tl."sectsty";
-  deps."translator" = tl."translator";
+  deps = [
+    "environ"
+    "lastpage"
+    "pgf"
+    "qrcode"
+    "sectsty"
+    "translator"
+  ];
   sha512.run = "57559707a9a5a2a924a767b25ed2f86759826a31788fb2662aa2e3ad2889b2266009ec9754c48ce923561c7587c78b23ab56731322a619b4a225775b7beb91b2";
   sha512.doc = "fe1f636c2c21159e5c17aaa75ca0bc89fb1b6ab8dda8d475045efcb3eaf489a876fe9caa4cd077e27b51f37292c5141347233ed6103ebe4f20573ff0899e445b";
   sha512.source = "3f5d1073699a71e9e89a3c71704b8b2800925041145a60454cae0ce2fe7f468e5200c7273afb70c64306a347f4037bc0698b3af223f82d755658d54f2d8c08fe";
@@ -32684,7 +33230,9 @@ tl: { # no indentation
 "semantex" = {
   revision = 65183;
   stripPrefix = 0;
-  deps."semtex" = tl."semtex";
+  deps = [
+    "semtex"
+  ];
   sha512.run = "057b229640da956b4c36653cc1e4057317d9fb2123a69aa144078b52192a2aa8d43660a41124fd91b147ebba5473ca43c30a70fc55881daa52f6b7ded05666b3";
   sha512.doc = "6cddaebc42ce355e536fc515b726cc6344f885efd67041b564a4b8c2bd297969aa5aded0a989c5a4b3a30d574af977e44880e2ef8be8d3fae052ef44c9d6b2f9";
   hasRunfiles = true;
@@ -33085,32 +33633,34 @@ tl: { # no indentation
 "shtthesis" = {
   revision = 62441;
   stripPrefix = 0;
-  deps."alphalph" = tl."alphalph";
-  deps."biber" = tl."biber";
-  deps."biblatex" = tl."biblatex";
-  deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015";
-  deps."booktabs" = tl."booktabs";
-  deps."caption" = tl."caption";
-  deps."colortbl" = tl."colortbl";
-  deps."ctex" = tl."ctex";
-  deps."datetime" = tl."datetime";
-  deps."enumitem" = tl."enumitem";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."fmtcount" = tl."fmtcount";
-  deps."lastpage" = tl."lastpage";
-  deps."latexmk" = tl."latexmk";
-  deps."listings" = tl."listings";
-  deps."lua-alt-getopt" = tl."lua-alt-getopt";
-  deps."lualatex-math" = tl."lualatex-math";
-  deps."mathtools" = tl."mathtools";
-  deps."ntheorem" = tl."ntheorem";
-  deps."tex-gyre" = tl."tex-gyre";
-  deps."tocvsec2" = tl."tocvsec2";
-  deps."transparent" = tl."transparent";
-  deps."undolabl" = tl."undolabl";
-  deps."unicode-math" = tl."unicode-math";
-  deps."xits" = tl."xits";
-  deps."xstring" = tl."xstring";
+  deps = [
+    "alphalph"
+    "biber"
+    "biblatex"
+    "biblatex-gb7714-2015"
+    "booktabs"
+    "caption"
+    "colortbl"
+    "ctex"
+    "datetime"
+    "enumitem"
+    "fancyhdr"
+    "fmtcount"
+    "lastpage"
+    "latexmk"
+    "listings"
+    "lua-alt-getopt"
+    "lualatex-math"
+    "mathtools"
+    "ntheorem"
+    "tex-gyre"
+    "tocvsec2"
+    "transparent"
+    "undolabl"
+    "unicode-math"
+    "xits"
+    "xstring"
+  ];
   sha512.run = "da3b02cc3558a337d7d35018fad00faf6d9183f3f4bc5b5b31e168a11dcfa705a77cad6c42f3fe3d98ce67f50d94ca1f75a82999d5a27837ea8fba6c01602594";
   sha512.doc = "04f1ccf2bef9e11364d7f066ed1a7fc218e39ef7a08824eb65537d88ed03097399eb01d07ba6d0a34e7456fc6de1291ea4f1c9264074eecd2e1af341c42e9197";
   hasRunfiles = true;
@@ -33299,7 +33849,9 @@ tl: { # no indentation
 "simplivre" = {
   revision = 64280;
   stripPrefix = 0;
-  deps."minimalist" = tl."minimalist";
+  deps = [
+    "minimalist"
+  ];
   sha512.run = "9ab406b3c577d9f683d5e4ed8303f4791f9b2a75200ab9cd2eded6699a580eba2cacf6da16b0848f407d7bd04c1fc6afe3881552ee0f4d57b1fb5c32154174fb";
   sha512.doc = "4167bcb50e182f7eeb163b5d3ed4e53e65599aa3acfc7ce4bbb20db5d185bace58e28e24f9091e172fa6c516dcfaf948c1fae93efc68398f0708f42b67e5990a";
   hasRunfiles = true;
@@ -33342,8 +33894,10 @@ tl: { # no indentation
 "siunitx" = {
   revision = 65207;
   stripPrefix = 0;
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
+  deps = [
+    "l3kernel"
+    "l3packages"
+  ];
   sha512.run = "6116eebfaa5f9b0ae3e63f4c0b26c91c358e48b62651c215c25ac5352385c01e06ff28fcd5422085de0330bdd6ad6d79b5b4ee5cb9a200ed8ffaab515ca261e2";
   sha512.doc = "77eedc2cdf10ab386728fac623ed6d0ba895b4bb70c0934086251d96679b38eeedddb7408adcd6005289a20f3bbd4ec7811336509197c51d6be19e5a0cfc9b4d";
   sha512.source = "58faa7f7a5809a935303a7e9a779453cef8a5dcc43ded0fd16658e32f170a5052095c8f24d44542c80310cd24463583f5136a6d4986ce559ad3cd92ae8446c6b";
@@ -33586,8 +34140,10 @@ tl: { # no indentation
 "soulpos" = {
   revision = 60772;
   stripPrefix = 0;
-  deps."oberdiek" = tl."oberdiek";
-  deps."soul" = tl."soul";
+  deps = [
+    "oberdiek"
+    "soul"
+  ];
   sha512.run = "2b4d2fcaa687ff7d229706e563f739356a450a8ef02180f3c98432b11d027cd097fa895c3c971a944329b8657c74b4d2cf566110919e511e6883706561332678";
   sha512.doc = "9577aa2c77e9cafea54eee0ee032acd7c1343d6eb66b76fc25d694b524630bd2f41043187671cd444c9cdd0ccc8b9064e6c71365492cbdbd46517a061efc87cc";
   hasRunfiles = true;
@@ -33881,7 +34437,9 @@ tl: { # no indentation
 "stackengine" = {
   revision = 60019;
   stripPrefix = 0;
-  deps."listofitems" = tl."listofitems";
+  deps = [
+    "listofitems"
+  ];
   sha512.run = "15327eda5a6eda2b58055efc419ef50b8d8cf8c35283bcc41ee85e354f61ede6efeabf5e75bbb4cd022b95e52109bce1ee2e28fc701c5940723f3b15dd44c75a";
   sha512.doc = "a0edeaed3766af88d1c5e0508fd285382850bfd072cf4f6fdc1c329c8ca9f5e1eb5fe75357d9a86dd8b2476381747c9a3f7cd7dad0d7c32419bef0d37849928b";
   hasRunfiles = true;
@@ -33899,11 +34457,13 @@ tl: { # no indentation
 "standalone" = {
   revision = 64677;
   stripPrefix = 0;
-  deps."adjustbox" = tl."adjustbox";
-  deps."currfile" = tl."currfile";
-  deps."filemod" = tl."filemod";
-  deps."gincltex" = tl."gincltex";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "adjustbox"
+    "currfile"
+    "filemod"
+    "gincltex"
+    "xkeyval"
+  ];
   sha512.run = "8e74a676232ffe9fbe93ee3a1095c0c29cd65bd23f8e4602308d8fc1abfde9025c01e8ba379782d4c79d3349b4298806419735c624436a7b0c93e2170c592efb";
   sha512.doc = "358fb3b29f4c2d37d03b7d98ee02b35ff8571ffaf30b8d3fa1a9b0f74965ca4b0bcbf2a7172b8771dd3f1240c7dad1acccc7710dad302411dc43a301149597cd";
   sha512.source = "a29880dfca00e77b19ee828333c72f7c95a26470b8edd5ecea53bae3300868266ad4aa0db2bc6e16f72c14493b43659434ef4880b025b5bccad3305d0ea18b33";
@@ -34279,7 +34839,9 @@ tl: { # no indentation
 "subfiles" = {
   revision = 56977;
   stripPrefix = 0;
-  deps."import" = tl."import";
+  deps = [
+    "import"
+  ];
   sha512.run = "8f842b0debcae3110f0a4b2f59047cd55c2726d128bf3e159f2745a4b8a645c3f8471fe218ca34c32f2b35d42d1c5023a25f09fc3bf0c1a4f0c33197776b1cec";
   sha512.doc = "f54f52c5cee01b7ae8e01bff5a4d828b5c6708c31f2cf40d7e83c8a91c4c597945695dd7062b6088d3f91f7a9858e3227c850d658ae7a7bf94392e00e3eaf9c7";
   sha512.source = "2623a0ec244722c1e3194d9ff1237305c1b7bf8c3baf6f60edd69b165bbd5ea83fb73ad23bf9aac1937b4ecf1059754e798eb2c97f7bab5d550fabbe84b752c0";
@@ -34734,7 +35296,9 @@ tl: { # no indentation
 "tabu" = {
   revision = 61719;
   stripPrefix = 0;
-  deps."varwidth" = tl."varwidth";
+  deps = [
+    "varwidth"
+  ];
   sha512.run = "b40dc1e91084912df03175a6529223c6f24ae3c0ec77cfb8f1f8625816ea78c044c8f01f1b473e84696421d6772d9201fa4b59aa93e6f014b73598d16c09a6cd";
   sha512.doc = "5ef0a71d643bf5069a622aa8c807bf87db7445caab1f17b5202ee25ddab5368e94e796eb16de4fb183f294cedc232d48cbdba68f45d2451e01a2483d6869822d";
   sha512.source = "7c80ee8d25933e5d1c579357cffdf7177b0a419a847ca1e671cb1dda19fbde9b3680658df6b814d5d92953dd13eeee5100a5aa2fdb5fec3cbc1e213545cb3a78";
@@ -35083,11 +35647,13 @@ tl: { # no indentation
 };
 "tex" = {
   revision = 62387;
-  deps."cm" = tl."cm";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."kpathsea" = tl."kpathsea";
-  deps."plain" = tl."plain";
+  deps = [
+    "cm"
+    "hyphen-base"
+    "knuth-lib"
+    "kpathsea"
+    "plain"
+  ];
   hasFormats = true;
   sha512.run = "7d177346a2df7e7dbd2fce3635a8860c0deee30271beeba585091f8027c796678a3dc9cda2952a073c9ca02e26cd656a3bdcabe4661c23e81af350a987d7e4aa";
   sha512.doc = "e545796c64bbce0680d12b9d77ca64b008c369f90639ad9c3e7b7b219ceb85fcf24fa7eccaff65639bb9fe7159c2b2dd124866acd2ad78d860ff4e872a341d23";
@@ -35273,7 +35839,9 @@ tl: { # no indentation
 };
 "texdoc" = {
   revision = 62815;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "eda9f9c138191f73487c5da101898970cb7f268eade19a7eb44231d05d819b23b182a9ca15e61c23f172c9869659c3bb5f45f35d2590d7da79d10021195284be";
   sha512.doc = "0d4ad9b75b0c9f209bed3a5c816bbfb49a49667ca31b59fdf98caf42b60c9e618d6daae5fa9b3bd288dc6dc5fe2c6dc3a4cf7a1348f06006b9f60618d225a639";
   hasRunfiles = true;
@@ -35281,7 +35849,9 @@ tl: { # no indentation
 };
 "texdoctk" = {
   revision = 62186;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe";
   sha512.doc = "fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba";
   hasRunfiles = true;
@@ -35499,7 +36069,9 @@ tl: { # no indentation
 "texpower" = {
   revision = 29349;
   stripPrefix = 0;
-  deps."tpslifonts" = tl."tpslifonts";
+  deps = [
+    "tpslifonts"
+  ];
   sha512.run = "7e2efadabaf173fd30c592cbcd2338563b8690048ccaffd86efb079a04b7b95c8ab113b99205cbb2912eae3a709a110d7b152270422cf2cbfd2ab85d42f12d69";
   sha512.doc = "e61965b5e31b487daba383a4e6ebc0dba85475f8cade2faae6adb8576ec7ec544b518a6e0e105aa185ff82fd6aba7a9ea4abda2a9446d52f5b3acdb42580e315";
   sha512.source = "3add8eeda886ce6422d3b7ea53a55dc69bb2f5c2e64cdede105a7b4756b008807bef6245ddc2596b45809311874e566263c51e98ec6751b4db9d3c5c5f58efd3";
@@ -35524,11 +36096,13 @@ tl: { # no indentation
 };
 "texsis" = {
   revision = 45678;
-  deps."cm" = tl."cm";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."plain" = tl."plain";
-  deps."tex" = tl."tex";
+  deps = [
+    "cm"
+    "hyphen-base"
+    "knuth-lib"
+    "plain"
+    "tex"
+  ];
   hasFormats = true;
   sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e";
   sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90";
@@ -35581,7 +36155,9 @@ tl: { # no indentation
 "textgreek" = {
   revision = 44192;
   stripPrefix = 0;
-  deps."greek-fontenc" = tl."greek-fontenc";
+  deps = [
+    "greek-fontenc"
+  ];
   sha512.run = "2370f666c2cef43a579e32a755675431717ccfb4bad6f30261a6c67e0617816ffc272c25e0d076d91c4047c41926c92ae375507f36f2fab01673bd7e708f5188";
   sha512.doc = "9107ca31b645977d56a3b1e37f7b12f0302b1b2531bd2a21883f7931831e70c4383beae77469aab4663253da3109cdd9c53589cbab95f7f0126389d12509127f";
   sha512.source = "367b63cd318c1e69944444f4cab82af7a7b1dde667d6469ade4c6433960b21a6f8922280d5a46e96fc88ddf4c2d5d3f3a440b55045a67512459208ae181bda96";
@@ -35906,7 +36482,9 @@ tl: { # no indentation
 };
 "tie" = {
   revision = 62387;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "96cab708d9faec3f451302c6141655b79524d3497d9bded141235a2fcfbb27bb2d65fd096e559cc01b01f4ab28b97f5851ba9e202c313240ef1af07c4676085f";
   sha512.doc = "519a15cde0a8b52250bdf61926ce44ea9267ff9f75f57f3ee9b390ce1aa6f7bc2a6bc2f30222d41a7606721ed28cbbd44348cb44229fba1c7126196291667917";
   version = "2.4";
@@ -35993,8 +36571,10 @@ tl: { # no indentation
 "tikz-feynman" = {
   revision = 56615;
   stripPrefix = 0;
-  deps."iftex" = tl."iftex";
-  deps."pgfopts" = tl."pgfopts";
+  deps = [
+    "iftex"
+    "pgfopts"
+  ];
   sha512.run = "34c147e6ee16643e99d2c8fa789b39aea6f3b9ae7de93fd5c65d1b0daca1e9514d484b5b38892a0cffa1aeedcd405df0bc6621bf68e587311bc9fe45205c29fc";
   sha512.doc = "ae0510a7971538fe458d83d4da4c78f7d607c7a1298344a139c02c49985f9005f6a81ab15f9dc621929d70d634c2cec4189ac4a2955e994611247af0c96986f3";
   hasRunfiles = true;
@@ -36156,7 +36736,9 @@ tl: { # no indentation
 "tikz-timing" = {
   revision = 64967;
   stripPrefix = 0;
-  deps."svn-prov" = tl."svn-prov";
+  deps = [
+    "svn-prov"
+  ];
   sha512.run = "2c3af958ff5509a470b4e1f93bdbb063f5b911a81de12d749fbd7dc6810715a473814d6d8694a81a49d2f45f1f468ef9d441fe07c2269c9c9a9094e350228b36";
   sha512.doc = "33ab52c8b2a60b9bad41a60375aa75432aea20a71c9fa7816d5dbc868e6a70b491dca9572d5c63ea486053294b6b709aa313de464e375e4f0a7a04f76764630a";
   sha512.source = "f1c7c0be255d533898bd65e85f2a36b2f86abb6580b716cb239821a243f67a2706cbcfffb99628b060aadc9b56dfee45f66e54851861df2e0cf12e6cd331aa4e";
@@ -36577,8 +37159,10 @@ tl: { # no indentation
 "to-be-determined" = {
   revision = 64882;
   stripPrefix = 0;
-  deps."soul" = tl."soul";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "soul"
+    "xcolor"
+  ];
   sha512.run = "a7c6b60844601f81bb659f57e212cfdc9e7cf72f24bfc662aed9dd26ebb9385187ebf44d82b59b637544b920c05dd5e3a698b69a0ef7ace4b57cd7531d240e3f";
   sha512.doc = "0df7f6b340c28d2ef9db73af4bbad364bbb238a42f37effbde69af30774de627d29b2f03e098482e6fe66d09bec49d7d4a4566ebb3125eb2f3423c1d5fdba066";
   sha512.source = "38d70708e3be579d46e086c2e1b227ac081da1d721fff64b51543269b9df11b7ebe67a8e95999bb3ca1b691b91a4c3e1a8d79bce2f367e6965e34a5577377608";
@@ -36633,10 +37217,12 @@ tl: { # no indentation
 "todonotes" = {
   revision = 59465;
   stripPrefix = 0;
-  deps."pgf" = tl."pgf";
-  deps."tools" = tl."tools";
-  deps."xcolor" = tl."xcolor";
-  deps."xkeyval" = tl."xkeyval";
+  deps = [
+    "pgf"
+    "tools"
+    "xcolor"
+    "xkeyval"
+  ];
   sha512.run = "78f84bcaf613003f694dfaddff2631cfe34c081ec5aac576a267f99940abcca1c8c71dc801e8df295c585a4db06517e5cce4671aef4188b81feba4be1ed6eccb";
   sha512.doc = "89b61bb5630846a7cf739f39cc43a4e08890a4b0af06c884a60d9ac30068044c89cb99578aefe3b08c5761a412e524dacd79b028e69430d87ec17493b42ab7eb";
   sha512.source = "e7bf0b61f1ce386b727f54288d1c6486fdb784fb7d7fe42e5a86f0815766df33881214579051c57325d6963fa7e073469ce488aeca816f7566275318e171fecc";
@@ -37012,21 +37598,23 @@ tl: { # no indentation
 "tudscr" = {
   revision = 64085;
   stripPrefix = 0;
-  deps."cbfonts" = tl."cbfonts";
-  deps."environ" = tl."environ";
-  deps."etoolbox" = tl."etoolbox";
-  deps."geometry" = tl."geometry";
-  deps."graphics" = tl."graphics";
-  deps."greek-inputenc" = tl."greek-inputenc";
-  deps."iwona" = tl."iwona";
-  deps."koma-script" = tl."koma-script";
-  deps."mathastext" = tl."mathastext";
-  deps."mweights" = tl."mweights";
-  deps."oberdiek" = tl."oberdiek";
-  deps."opensans" = tl."opensans";
-  deps."trimspaces" = tl."trimspaces";
-  deps."xcolor" = tl."xcolor";
-  deps."xpatch" = tl."xpatch";
+  deps = [
+    "cbfonts"
+    "environ"
+    "etoolbox"
+    "geometry"
+    "graphics"
+    "greek-inputenc"
+    "iwona"
+    "koma-script"
+    "mathastext"
+    "mweights"
+    "oberdiek"
+    "opensans"
+    "trimspaces"
+    "xcolor"
+    "xpatch"
+  ];
   sha512.run = "4e17b12a82a18bb1f4babf123f1e84681c6f9524f2113725f14ad85042dcd5b1fb2aeaa45f709c1797512b8e0f35cd0ff743b60901e75676ec321f8bc682e793";
   sha512.doc = "3335c87afe969963718137a9f854e0a4935c34bd850471673a3914fb9666e8f3195962d3474df35b876741b37c231851d47b440d49c35e42533b3717be1f442e";
   sha512.source = "d317e3fc0624ec762293c972c9feaaf56186faf0962137f43f36b974ef223b094919cd84b9f5183e89e0ea6b922e4ae22b489bc619af466dac41c98fe0b651e5";
@@ -37036,12 +37624,14 @@ tl: { # no indentation
 "tufte-latex" = {
   revision = 37649;
   stripPrefix = 0;
-  deps."changepage" = tl."changepage";
-  deps."ifmtarg" = tl."ifmtarg";
-  deps."paralist" = tl."paralist";
-  deps."placeins" = tl."placeins";
-  deps."sauerj" = tl."sauerj";
-  deps."xifthen" = tl."xifthen";
+  deps = [
+    "changepage"
+    "ifmtarg"
+    "paralist"
+    "placeins"
+    "sauerj"
+    "xifthen"
+  ];
   sha512.run = "6dd01a5a6faf37439ca9aab23534f99050b84bfac16df48545417ee03e72700344c25b2de3262e8e28406da705d50296473a815fa14b701c609b3715f01405d1";
   sha512.doc = "11ac57e79a05db644235b6db851473c75d1538a1261d7022a63d9ab0cc54486cc13b7cc95c44d16912952e46bc9264c1bfb831a728b51a03495d01f1963410d3";
   hasRunfiles = true;
@@ -37677,8 +38267,10 @@ tl: { # no indentation
 "unicode-math" = {
   revision = 61719;
   stripPrefix = 0;
-  deps."fontspec" = tl."fontspec";
-  deps."lm-math" = tl."lm-math";
+  deps = [
+    "fontspec"
+    "lm-math"
+  ];
   sha512.run = "05dd4b08e8e766c2c8e719a12aa5a28259bc429fb1f1d05850e865ef258ab5e1372a785a2787098ea50bb31c852727ba8269ca656ce55ee0a7355fe4fd7344cc";
   sha512.doc = "c8d05fe09c6ed76f29978eff8b7688d8989865f6517f06a58acb899603265e499db5d962895b5b3a0b6bf8d235f29da88f76a3b7b35778953878d02f2910b524";
   sha512.source = "b1f21cf06c5ece08e75575cb2e23f7e9815c0670cdb2af0026c1037556e646e81c2103740bcb14e95375cf88b3a665afa3b24a4fd6c33f416c36f588649de79f";
@@ -37869,25 +38461,27 @@ tl: { # no indentation
 };
 "uplatex" = {
   revision = 65305;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."platex" = tl."platex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
-  deps."uptex" = tl."uptex";
-  deps."uptex-fonts" = tl."uptex-fonts";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-base-dev"
+    "latex-firstaid-dev"
+    "latex-fonts"
+    "platex"
+    "tex-ini-files"
+    "unicode-data"
+    "uptex"
+    "uptex-fonts"
+  ];
   hasFormats = true;
   sha512.run = "aa49098049ae86a286ccd14a3a25060104ade1ecfa1f31d44c36398dc1d9130e78ee2f3dfbda067c5cda54275a5ace7fdfa66ff8a4e30ab2cfef32c52d4c8781";
   sha512.doc = "373eaf7028b4528b1e7d1be399d0bc05b477fdb8a429f845d0bc7d767bbc7ff6a991174c8eff0e346a5b4c0a3dbee24b633df97656dcc1a1c5e5f80487f73a64";
@@ -37921,14 +38515,16 @@ tl: { # no indentation
 };
 "uptex" = {
   revision = 62464;
-  deps."cm" = tl."cm";
-  deps."etex" = tl."etex";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
-  deps."plain" = tl."plain";
-  deps."ptex-base" = tl."ptex-base";
-  deps."uptex-base" = tl."uptex-base";
-  deps."uptex-fonts" = tl."uptex-fonts";
+  deps = [
+    "cm"
+    "etex"
+    "hyphen-base"
+    "knuth-lib"
+    "plain"
+    "ptex-base"
+    "uptex-base"
+    "uptex-fonts"
+  ];
   hasFormats = true;
   sha512.run = "9255b1ec06d2b1e214dda666b5f37df20ce98095a3726e2e114082cd0ebb13f9f4e0d46b8cfd28da528a6ab68896fd62a0593e02b5072e6c3196937b098bd626";
   sha512.doc = "2a9d880635afb3c848893c371d3aca7796e6aafb11949047a21e9f0df73d06b69d3cc84cfe28438f0424722b41b795be913e79cc01b16dacd5370ec5d1e9ac5b";
@@ -38216,7 +38812,9 @@ tl: { # no indentation
 };
 "velthuis" = {
   revision = 55475;
-  deps."xetex-devanagari" = tl."xetex-devanagari";
+  deps = [
+    "xetex-devanagari"
+  ];
   sha512.run = "451023c09755f3aa884128a6ddd5e70a6820724de66f8923deea812a8e28c337676de95aa98a06a96013502fa24e9855b24977603c675820b1d5a0a056fe4cab";
   sha512.doc = "e17270b0e427e3ff02b1d43e578815ec37c0046a20ceb898a357041f9184044162077d9fc64f66d955d774637a8d2ec59d31b624dd743113c972d0854075df10";
   hasRunfiles = true;
@@ -38537,7 +39135,9 @@ tl: { # no indentation
 "wasy-type1" = {
   revision = 53534;
   stripPrefix = 0;
-  deps."wasy" = tl."wasy";
+  deps = [
+    "wasy"
+  ];
   sha512.run = "d7131c025bd97bdaf62697feb698da97d175783e4b0502d3e85b60a663f46a0520268a6063956afaddc6308ddd21954992bf8d216049cb324133e3760ac20825";
   sha512.doc = "d9c88d39deabe19393df0b6d83bddd644e347592735cd7511dc70374ea015cd7fdf36ac9f320b44c612c8276eee3d7cd94f9e0b26de050c0771c85ec7dbae53c";
   hasRunfiles = true;
@@ -38554,7 +39154,9 @@ tl: { # no indentation
 };
 "web" = {
   revision = 62517;
-  deps."kpathsea" = tl."kpathsea";
+  deps = [
+    "kpathsea"
+  ];
   sha512.run = "edac6079f0de1904e008c2a5fd7ee697f32c5324e3b9a7a4d8997b97ef214bfa1a787c84ecd4bcccd38e88c58b9729b4c5684ab58bbfcc97ce159dc5c2b5b312";
   sha512.doc = "50ae800de53cecfa6f656ba41d35d7c486e4cfe4b2ed42dd26dc60ecaa9a0b80c178dead765a7076fcc6141e8a2158e9b0854ceecc2cbf7b2e85c23cf22a7da3";
   version = "4.5";
@@ -38906,7 +39508,9 @@ tl: { # no indentation
 "xecjk" = {
   revision = 64059;
   stripPrefix = 0;
-  deps."ctex" = tl."ctex";
+  deps = [
+    "ctex"
+  ];
   sha512.run = "3382b181053c76e58ba3f77b195765d83e5515a48b0c73580fc19305bd395de8d19b98be3494da8201b0a22a851a53c82dda14beb54a545b652cd0bd5719af67";
   sha512.doc = "b2dd0caf3317d708cc001b5aba57979f86eaa20d9d38d360650b45fbb683603e2075658a0c0a9c0631c81ea06ecac27694c45df47f053d9e7440901d66280295";
   sha512.source = "07fe51d62358a376d2f3cc2774cf606bd4e9f8b3bd3fb202427f34c3c15b004fed5985f7fe776b3529a83ea4aa3e3e176311e14bb0a02cf055eb501a3f474839";
@@ -38948,24 +39552,26 @@ tl: { # no indentation
 };
 "xelatex-dev" = {
   revision = 62145;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."lm" = tl."lm";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
-  deps."xetex" = tl."xetex";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-base-dev"
+    "latex-firstaid-dev"
+    "latex-fonts"
+    "lm"
+    "tex-ini-files"
+    "unicode-data"
+    "xetex"
+  ];
   hasFormats = true;
   sha512.run = "088c917758f727ba08b8571d302c93f0b14fc15ca6dcb0ef7a89df4ba144c508d8d42265cc6b1915707329b64aa1d1030ed0b5513987fbd4437d0a58a232b5db";
 };
@@ -39015,25 +39621,27 @@ tl: { # no indentation
 };
 "xetex" = {
   revision = 62387;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dvipdfmx" = tl."dvipdfmx";
-  deps."etex" = tl."etex";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."lm" = tl."lm";
-  deps."plain" = tl."plain";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
-  deps."xetexconfig" = tl."xetexconfig";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dvipdfmx"
+    "etex"
+    "everyshi"
+    "firstaid"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "lm"
+    "plain"
+    "tex-ini-files"
+    "unicode-data"
+    "xetexconfig"
+  ];
   hasFormats = true;
   sha512.run = "e9f0aebda0a7fb36e2cbce4dd49e965335438c4ebf2d41eb8e19eabe29617239dd67e7e3433a8c75fd40f072a2c6753a7d0762afd34fca4130929e51888aaabf";
   sha512.doc = "31f03ee1ae00bc7883109ab7b7374feedc384d86b491873e90797658eae12299dd60b95edc1c86f1faa61a0b7a952cca23993e991863b37e49c27afd6c21c034";
@@ -39108,7 +39716,9 @@ tl: { # no indentation
 "xfakebold" = {
   revision = 55654;
   stripPrefix = 0;
-  deps."iftex" = tl."iftex";
+  deps = [
+    "iftex"
+  ];
   sha512.run = "99c735bd449c96b3444a8b50032c9962601a04beeeeb6b0fcb759ee0cc53e4510dc8d077a3cad7b99c968bb9d60bbd37f2f0c7d56ffb5fc667301423bfd32bdb";
   sha512.doc = "bb6f1bda41427f4c144402095a79aafe70d6b534b6d0462d951a2c58fabb0bc8dd9edfdabf526bba243b2c79aeacee728741dca778e25019ae909856b164a316";
   hasRunfiles = true;
@@ -39251,7 +39861,9 @@ tl: { # no indentation
 "xltxtra" = {
   revision = 56594;
   stripPrefix = 0;
-  deps."metalogo" = tl."metalogo";
+  deps = [
+    "metalogo"
+  ];
   sha512.run = "ff75c7b2f36f0e3cdc466dde35d83ccbb76c9c95f5d191a5498831247d1d418b69a8f0df8b263eae78e4a13694e628eba64c24e7480c7dbf56948cd5b1504a76";
   sha512.doc = "6fc84121dd3486f5f7744d757520e2b4d7baf83686e2630990be7e72ccb121e5b417779e4682e6e8a566b016a8995f80d7d4c6dfb3d6d2c9f70ed506bee99d64";
   sha512.source = "c177b99366479f6ed5ef935be07fbfc3425b48f2c3d274e175bbde9c63cbcc93ee4bca4c3c2886fdc2894b627332ff7edffa5b1083ad86dcced56bfb0d9fe03f";
@@ -39265,26 +39877,28 @@ tl: { # no indentation
 };
 "xmltex" = {
   revision = 62145;
-  deps."atbegshi" = tl."atbegshi";
-  deps."atveryend" = tl."atveryend";
-  deps."babel" = tl."babel";
-  deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
-  deps."everyshi" = tl."everyshi";
-  deps."firstaid" = tl."firstaid";
-  deps."hyph-utf8" = tl."hyph-utf8";
-  deps."hyphen-base" = tl."hyphen-base";
-  deps."l3backend" = tl."l3backend";
-  deps."l3kernel" = tl."l3kernel";
-  deps."l3packages" = tl."l3packages";
-  deps."latex" = tl."latex";
-  deps."latex-fonts" = tl."latex-fonts";
-  deps."latexconfig" = tl."latexconfig";
-  deps."pdftex" = tl."pdftex";
-  deps."tex" = tl."tex";
-  deps."tex-ini-files" = tl."tex-ini-files";
-  deps."unicode-data" = tl."unicode-data";
-  deps."xmltexconfig" = tl."xmltexconfig";
+  deps = [
+    "atbegshi"
+    "atveryend"
+    "babel"
+    "cm"
+    "dehyph"
+    "everyshi"
+    "firstaid"
+    "hyph-utf8"
+    "hyphen-base"
+    "l3backend"
+    "l3kernel"
+    "l3packages"
+    "latex"
+    "latex-fonts"
+    "latexconfig"
+    "pdftex"
+    "tex"
+    "tex-ini-files"
+    "unicode-data"
+    "xmltexconfig"
+  ];
   hasFormats = true;
   sha512.run = "ee01abb25b18e99f18bc78357be04fb1405473e90fbdf74ed875e2910812550c44fcc7aee960b2bdc53fcd7d78e9aa706e46929da65d5cb78d9ca43ba475d675";
   sha512.doc = "d87c6d1f4c472b436104b0746d48a463977dc7eb520de3d7a53f48bc1c8e5682a23d604bbe2ebda1b5029d4a6dd33c2d2bf8b917ad4f54d2c7472874fdfe8509";
@@ -39468,7 +40082,9 @@ tl: { # no indentation
 "xunicode" = {
   revision = 30466;
   stripPrefix = 0;
-  deps."tipa" = tl."tipa";
+  deps = [
+    "tipa"
+  ];
   sha512.run = "f49628013bc54e82bc38a2c749ddde9426c65716f04c5c8d8264398b9595e571d380e07c045db9e7ed5d6df7d0b7b1f8e81eaa28d6b67a6756d2c5023b731176";
   sha512.doc = "fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0";
   hasRunfiles = true;
@@ -39598,36 +40214,38 @@ tl: { # no indentation
 "yb-book" = {
   revision = 64586;
   stripPrefix = 0;
-  deps."anyfontsize" = tl."anyfontsize";
-  deps."biblatex" = tl."biblatex";
-  deps."bigfoot" = tl."bigfoot";
-  deps."changepage" = tl."changepage";
-  deps."chngcntr" = tl."chngcntr";
-  deps."csquotes" = tl."csquotes";
-  deps."enumitem" = tl."enumitem";
-  deps."fancyhdr" = tl."fancyhdr";
-  deps."float" = tl."float";
-  deps."footmisc" = tl."footmisc";
-  deps."geometry" = tl."geometry";
-  deps."ifmtarg" = tl."ifmtarg";
-  deps."imakeidx" = tl."imakeidx";
-  deps."lastpage" = tl."lastpage";
-  deps."libertine" = tl."libertine";
-  deps."mdframed" = tl."mdframed";
-  deps."microtype" = tl."microtype";
-  deps."needspace" = tl."needspace";
-  deps."paralist" = tl."paralist";
-  deps."pgf" = tl."pgf";
-  deps."qrcode" = tl."qrcode";
-  deps."setspace" = tl."setspace";
-  deps."soul" = tl."soul";
-  deps."titlesec" = tl."titlesec";
-  deps."ulem" = tl."ulem";
-  deps."wrapfig" = tl."wrapfig";
-  deps."xcolor" = tl."xcolor";
-  deps."xifthen" = tl."xifthen";
-  deps."xkeyval" = tl."xkeyval";
-  deps."zref" = tl."zref";
+  deps = [
+    "anyfontsize"
+    "biblatex"
+    "bigfoot"
+    "changepage"
+    "chngcntr"
+    "csquotes"
+    "enumitem"
+    "fancyhdr"
+    "float"
+    "footmisc"
+    "geometry"
+    "ifmtarg"
+    "imakeidx"
+    "lastpage"
+    "libertine"
+    "mdframed"
+    "microtype"
+    "needspace"
+    "paralist"
+    "pgf"
+    "qrcode"
+    "setspace"
+    "soul"
+    "titlesec"
+    "ulem"
+    "wrapfig"
+    "xcolor"
+    "xifthen"
+    "xkeyval"
+    "zref"
+  ];
   sha512.run = "dea52e5aee243d84ad52bb5eb61957e05b500ea9caf36360fd587d0a38ebb602f2821e040e3acf41e8318c0ce491f3bdcb5a477ef65be7b41ec2fe12df680542";
   sha512.doc = "ecb2ed5bf434f96aacd7422bc815cdc8b69c307475f8f71b8b8b5bc2aad916d1db1394eeaf3b7ddd54e3bf7dc059574c821f2d44f9247103153fb5ef3f40f02d";
   sha512.source = "20080fd53bc9c749632236d710972bac2db0ab0a7c3cd4a1b39fdc1226a2279332dca41856647b6132f033f381de798b8dc522ba3199e747ea15e5ca571d71c8";
@@ -39644,16 +40262,18 @@ tl: { # no indentation
 "ydoc" = {
   revision = 64887;
   stripPrefix = 0;
-  deps."etoolbox" = tl."etoolbox";
-  deps."float" = tl."float";
-  deps."hyperref" = tl."hyperref";
-  deps."listings" = tl."listings";
-  deps."needspace" = tl."needspace";
-  deps."newverbs" = tl."newverbs";
-  deps."showexpl" = tl."showexpl";
-  deps."tools" = tl."tools";
-  deps."url" = tl."url";
-  deps."xcolor" = tl."xcolor";
+  deps = [
+    "etoolbox"
+    "float"
+    "hyperref"
+    "listings"
+    "needspace"
+    "newverbs"
+    "showexpl"
+    "tools"
+    "url"
+    "xcolor"
+  ];
   sha512.run = "116d4be9a7ca06f90967c85a696e893a85555402acf400c0251a71f4d43a5ad244ee041518d4408b6627610ff87792f07ab51309303e442159bce46025d5a27c";
   sha512.doc = "714ff9f1fc20d9f3e5effe9159935a45662f7f8dde9be0371055a3e178b9a74618046c1f4ba67cd1b89b6b0abfdf41de2716a097e67138d42f733ece3edb028d";
   sha512.source = "1a4d7c462316b3d2689b5121d81af8ff7847909e039564a0d66c859607e5c4fa573dbc607cffbd73223f48f471847057fbfeeb71a31947b5b1a8c02eb88eb35b";
@@ -39898,8 +40518,10 @@ tl: { # no indentation
 "zref-vario" = {
   revision = 63874;
   stripPrefix = 0;
-  deps."tools" = tl."tools";
-  deps."zref-clever" = tl."zref-clever";
+  deps = [
+    "tools"
+    "zref-clever"
+  ];
   sha512.run = "a6098a6d02e8ceef899a6dae98af5f4faa4878d450d02dbec9c3d855eacf359d30418ed81b8884b898f2b5b39e65abd7b4572e6797b73050d3f708a73d20f9f2";
   sha512.doc = "1fe5da87c16231ed058d42a0bb99d041823e8b81471039773338a09e83f650419d7f11a58322101e178f2682fc655aeac8be5d82d1df55da6929cd119c94b0be";
   sha512.source = "3389daa24248921968989cde9386d438c3bc81dcde8a800bc324437cf8e468f24bf8d0eb24296319cb9da45cf42295e45ae01f47a32ce175ce2dfb2508c4372c";
diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
index c02ca35296ec..506843c0952a 100644
--- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
@@ -1,5 +1,5 @@
 # wrap whole file into an attrset
-1itl: { # no indentation
+1i{ # no indentation
 $a}
 
 # form an attrmap per package
@@ -28,16 +28,16 @@ $a}
 
   # extract deps
   /^depend [^.]+$/{
-    s/^depend (.+)$/  deps."\1" = tl."\1";/
+    s/^depend (.+)$/  deps = [\n    "\1"/
 
     # loop through following depend lines
     :next
       h ; N     # save & read next line
       s/\ndepend (.+)\.(.+)$//
-      s/\ndepend (.+)$/\n  deps."\1" = tl."\1";/
+      s/\ndepend (.+)$/\n    "\1"/
       t next    # loop if the previous lines matched
 
-    x; p; x     # print saved deps
+    x; s/$/\n  ];/p ; x     # print saved deps
     s/^.*\n//   # remove deps, resume processing
   }
 

From 36ea699bd4c96e345cdbbe93eabb366a1cf4ce0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 17:34:02 +0000
Subject: [PATCH 177/191] sqlc: 1.16.0 -> 1.17.0

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

diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix
index ad9dd660315e..fa2c8ab83a8c 100644
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ b/pkgs/development/tools/database/sqlc/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 let
-  version = "1.16.0";
+  version = "1.17.0";
 in
 buildGoModule {
   pname = "sqlc";
@@ -11,11 +11,11 @@ buildGoModule {
     owner = "kyleconroy";
     repo = "sqlc";
     rev    = "v${version}";
-    sha256 = "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc=";
+    sha256 = "sha256-knblQwO+c8AD0WJ+1l6FJP8j8pdsVhKa/oiPqUJfsVY=";
   };
 
   proxyVendor = true;
-  vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc=";
+  vendorHash = "sha256-y5OYq1X4Y0DxFYW2CiedcIjhOyeHgMhJ3dMa+2PUCUY=";
 
   subPackages = [ "cmd/sqlc" ];
 

From 98661a89f2f9fdb0c6fddee4e2edb5f9734ddaff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 17:55:36 +0000
Subject: [PATCH 178/191] tinygltf: 2.8.2 -> 2.8.3

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

diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix
index 65cd814c1e6c..fa9d79aed1a7 100644
--- a/pkgs/development/libraries/tinygltf/default.nix
+++ b/pkgs/development/libraries/tinygltf/default.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.8.2";
+  version = "2.8.3";
   pname = "tinygltf";
 
   src = fetchFromGitHub {
     owner = "syoyo";
     repo = "tinygltf";
     rev = "v${version}";
-    sha256 = "sha256-0O+Vfsd1omCXeSGdjLZ29yTutC+527NCIBm6hU3qKj4=";
+    sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg=";
   };
 
   nativeBuildInputs = [ cmake ];

From d92b0d660231e9bf0eb766043ccb762b6a64d873 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 18:08:37 +0000
Subject: [PATCH 179/191] openapi-generator-cli: 6.3.0 -> 6.4.0

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

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 69ab1b35c141..70496caf992c 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
 { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
 
 let this = stdenv.mkDerivation rec {
-  version = "6.3.0";
+  version = "6.4.0";
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
-    sha256 = "sha256-1xTXvuxQCksCT+pj4+eHyb8fAc4YcK9Tn3xIijB7P1s=";
+    sha256 = "sha256-Na6tMA4MlGn72dMM9G9BU4l9yygpEgkcpOySEtzp0VE=";
   };
 
   dontUnpack = true;

From 42bc696492914d7be91a7695b1d4b448b52ba753 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 18:32:50 +0000
Subject: [PATCH 180/191] istioctl: 1.16.2 -> 1.17.0

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

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index fcbab9313ecd..fc7e0be004c9 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "sha256-Qvpg6qLrtnnMrRWFHv7J+drM75V6DaMu1jxcxaCJ4kk=";
+    sha256 = "sha256-cMpFf+VTTH8d1KpvbUoB2pJYPp3FHhRthut8tjTEZtc=";
   };
-  vendorHash = "sha256-wPkjRkgQiGvZm+eOGVlM5cgrYugF/E8H71bcR2ofP2U=";
+  vendorHash = "sha256-C8UyfVCCkLAU9/qY9Kcv8TKKfG3rLNzu8mfi23O18rU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 77aed400272819132e4eeccd9b4bc7aa61c901b6 Mon Sep 17 00:00:00 2001
From: "DavidCrompton1192@gmail.com" <DavidCrompton1192@gmail.com>
Date: Tue, 21 Feb 2023 13:52:34 -0500
Subject: [PATCH 181/191] neuron: 7.5 -> 8.2.1

---
 maintainers/maintainer-list.nix               |   6 +
 .../science/biology/neuron/default.nix        | 162 ++++++++++--------
 .../neuron/neuron-carbon-disable.patch        |  21 ---
 .../biology/neuron/neuron_darwin_rpath.patch  |  11 ++
 .../python-modules/neuronpy/default.nix       |  31 ----
 pkgs/top-level/all-packages.nix               |   4 +-
 pkgs/top-level/python-packages.nix            |   6 +-
 7 files changed, 107 insertions(+), 134 deletions(-)
 delete mode 100644 pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
 create mode 100644 pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch
 delete mode 100644 pkgs/development/python-modules/neuronpy/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af0ec94e8a49..8ed71a1850db 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3404,6 +3404,12 @@
     githubId = 6754950;
     name = "David Armstrong Lewis";
   };
+  davidcromp = {
+    email = "davidcrompton1192@gmail.com";
+    github = "DavidCromp";
+    githubId = 10701143;
+    name = "David Crompton";
+  };
   davidrusu = {
     email = "davidrusu.me@gmail.com";
     github = "davidrusu";
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index a35d586b9ac3..65d581e553b7 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -1,94 +1,104 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
-, pkg-config
-, automake
-, autoconf
-, libtool
-, ncurses
 , readline
-, which
-, python ? null
-, useMpi ? false
+, xorg
 , mpi
-, iv
+, cmake
+, bison
+, flex
+, git
+, perl
+, gsl
+, xcbuild
+, python3
+, useMpi ? false
+, useIv ? true
+, useCore ? false
+, useRx3d ? false
 }:
 
+
 stdenv.mkDerivation rec {
-  pname = "neuron${lib.optionalString useMpi "-mpi"}";
-  version = "7.5";
+  pname = "neuron";
+  version = "8.2.1";
 
-  nativeBuildInputs = [ which pkg-config automake autoconf libtool ];
-  buildInputs = [ ncurses readline python iv ]
-    ++ lib.optional useMpi mpi;
+  # format is for pythonModule conversion
+  format = "other";
 
-  src = fetchurl {
-    url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
-    sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf";
-  };
+  nativeBuildInputs = [
+    cmake
+    bison
+    flex
+    git
+  ] ++ lib.optional useCore [ perl gsl ]
+  ++ lib.optional stdenv.isDarwin [ xcbuild ];
 
-  patches = (lib.optionals (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);
+  buildInputs = lib.optional useIv [
+    xorg.libX11.dev
+    xorg.libXcomposite.dev
+    xorg.libXext.dev
+  ];
 
-  # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these...
-  postPatch = lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace src/gnu/neuron_gnu_builtin.h \
-      --replace 'double abs(double arg);' "" \
-      --replace 'float abs(float arg);' "" \
-      --replace 'short abs(short arg);' "" \
-      --replace 'long abs(long arg);' ""
-  '' + lib.optionalString stdenv.isDarwin ''
-    # we are darwin, but we don't have all the quirks the source wants to compensate for
-    substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"'
-    for f in src/nrnpython/*.[ch] ; do
-      substituteInPlace $f --replace "<Python/Python.h>" "<Python.h>"
+  propagatedBuildInputs = [
+    readline
+    python3
+    python3.pkgs.wheel
+    python3.pkgs.setuptools
+    python3.pkgs.scikit-build
+    python3.pkgs.matplotlib
+  ] ++ lib.optional useMpi [
+    mpi
+  ] ++ lib.optional useMpi [
+    python3.pkgs.mpi4py
+  ] ++ lib.optional useRx3d [
+    python3.pkgs.cython
+    python3.pkgs.numpy
+  ];
+
+  patches = [ ./neuron_darwin_rpath.patch ];
+
+  # Patch build shells for cmake (bin, src, cmake) and submodules (external)
+  postPatch = ''
+    patchShebangs ./bin ./src ./external ./cmake
+    sed -e 's#DESTDIR =#DESTDIR = '"$out"'#' -i external/coreneuron/extra/nrnivmodl_core_makefile.in
+  '';
+
+  cmakeFlags = [
+    "-DNRN_ENABLE_INTERVIEWS=${if useIv then "ON" else "OFF"}"
+    "-DNRN_ENABLE_MPI=${if useMpi then "ON" else "OFF"}"
+    "-DNRN_ENABLE_CORENEURON=${if useCore then "ON" else "OFF"}"
+    "-DNRN_ENABLE_RX3D=${if useRx3d then "ON" else "OFF"}"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/${python3.sitePackages}
+    mv $out/lib/python/* $out/${python3.sitePackages}/
+    rm -rf $out/lib/python build
+    for entry in $out/lib/*.so; do
+      # remove references to build
+      patchelf --set-rpath $(patchelf --print-rpath $entry | tr ':' '\n' | sed '/^\/build/d' | tr '\n' ':') $entry
     done
   '';
 
-  enableParallelBuilding = true;
-
-  ## neuron install by default everything under prefix/${host_arch}/*
-  ## override this to support nix standard file hierarchy
-  ## without issues: install everything under prefix/
-  preConfigure = ''
-    ./build.sh
-    export prefix="''${prefix} --exec-prefix=''${out}"
-  '';
-
-  configureFlags = with lib;
-                    [ "--with-readline=${readline}" "--with-iv=${iv}" ]
-                    ++  optionals (python != null)  [ "--with-nrnpython=${python.interpreter}" ]
-                    ++ (if useMpi then ["--with-mpi" "--with-paranrn"]
-                        else ["--without-mpi"]);
-
-
-  postInstall = lib.optionalString (python != null) ''
-    ## standardise python neuron install dir if any
-    if [[ -d $out/lib/python ]]; then
-        mkdir -p ''${out}/${python.sitePackages}
-        mv ''${out}/lib/python/*  ''${out}/${python.sitePackages}/
-    fi
-  '';
-
-  propagatedBuildInputs = [ readline ncurses which libtool ];
+  src = fetchurl {
+    url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz";
+    sha256 = "0kb0dn7nmivv3zflzkbj2fj3184zwp2crkxp0mdxkwm4kpnxqz0v";
+  };
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "Simulation environment for empirically-based simulations of neurons and networks of neurons";
-
-    longDescription = "NEURON is a simulation environment for developing and exercising models of
-                neurons and networks of neurons. It is particularly well-suited to problems where
-                cable properties of cells play an important role, possibly including extracellular
-                potential close to the membrane), and where cell membrane properties are complex,
-                involving many ion-specific channels, ion accumulation, and second messengers";
-
-    sourceProvenance = with sourceTypes; [
-      fromSource
-    ] ++ lib.optionals (python != null) [
-      binaryNativeCode  # "geometry3d" bundled libraries
-    ];
-    license     = licenses.bsd3;
-    homepage    = "http://www.neuron.yale.edu/neuron";
-    maintainers = [ maintainers.adev ];
-    # source claims it's only tested for x86 and powerpc
-    platforms   = platforms.x86_64 ++ platforms.i686;
+    longDescription = ''
+      NEURON is a simulation environment for developing and exercising models of
+      neurons and networks of neurons. It is particularly well-suited to problems where
+      cable properties of cells play an important role, possibly including extracellular
+      potential close to the membrane), and where cell membrane properties are complex,
+      involving many ion-specific channels, ion accumulation, and second messengers
+    '';
+    sourceProvenance = with sourceTypes; [ fromSource ];
+    license = licenses.bsd3;
+    homepage = "http://www.neuron.yale.edu/neuron";
+    maintainers = with maintainers; [ adev davidcromp ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
deleted file mode 100644
index 923bffb1c338..000000000000
--- a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- nrn-7.4/src/mac/Makefile.am	2015-11-12 21:42:45.000000000 +0100
-+++ nrn-7.4.new/src/mac/Makefile.am	2016-08-24 17:43:39.000000000 +0200
-@@ -15,18 +15,8 @@
- host_cpu = @host_cpu@
- 
- if MAC_DARWIN
--carbon = @enable_carbon@
- bin_SCRIPTS = $(launch_scripts)
- install: install-am
--if UniversalMacBinary
--	$(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
--	$(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
--	lipo aouti386 aoutppc -create -output a.out
--else
--	gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
--
--endif
--	carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)"
- 	for i in $(S) ; do \
- 		sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \
- 		mv temp $(DESTDIR)$(bindir)/$$i; \
diff --git a/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch
new file mode 100644
index 000000000000..1b0fa2670782
--- /dev/null
+++ b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch
@@ -0,0 +1,11 @@
+--- a/src/nrnpython/setup.py.in
++++ b/src/nrnpython/setup.py.in
+@@ -124,7 +124,7 @@ libdirs = [destdir + get_escaped_path("@NRN_LIBDIR@"),
+ rpath_prefix_flag='-Wl,-R'
+ extra_link_args = [@NRN_LINK_FLAGS_COMMA_SEPARATED_STRINGS@]
+ @MAC_DARWIN_FALSE@extra_link_args += [rpath_prefix_flag+lib_path for lib_path in libdirs]
+-@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../")
++@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../../")
+ @MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,%s" % ivlibdir)
+
+ # as neuron module will be built during make, add build/lib
diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix
deleted file mode 100644
index 2d388dfa4c27..000000000000
--- a/pkgs/development/python-modules/neuronpy/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, numpy
-, matplotlib
-, scipy
-, isPy27
-}:
-
-buildPythonPackage rec {
-  pname = "neuronpy";
-  version = "0.1.6";
-  disabled = !isPy27;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25";
-  };
-
-  propagatedBuildInputs = [ numpy matplotlib scipy ];
-
-  #No tests included
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Interfaces and utilities for the NEURON simulator and analysis of neural data";
-    maintainers = [ maintainers.nico202 ];
-    license = licenses.mit;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33e3f7fd1601..7a0bfd20762d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36422,11 +36422,11 @@ with pkgs;
 
   nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; };
 
-  neuron = callPackage ../applications/science/biology/neuron { python = null; };
+  neuron = callPackage ../applications/science/biology/neuron { };
 
   neuron-mpi = neuron.override {useMpi = true; };
 
-  neuron-full = neuron-mpi.override { python = python2; };
+  neuron-full = neuron-mpi.override { useCore = true; useRx3d = true; };
 
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f09a8eb1a188..bfbfb1504357 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6334,11 +6334,9 @@ self: super: with self; {
 
   networkx = callPackage ../development/python-modules/networkx { };
 
-  neuron-mpi = toPythonModule (pkgs.neuron-mpi.override { inherit python; });
+  neuron-full = pkgs.neuron-full.override { python3 = python; };
 
-  neuron = toPythonModule (pkgs.neuron.override { inherit python; });
-
-  neuronpy = callPackage ../development/python-modules/neuronpy { };
+  neuronpy = python.pkgs.toPythonModule neuron-full;
 
   nevow = callPackage ../development/python-modules/nevow { };
 

From bc5d5b3dd0677aef708e5993150dfecb301ef041 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 15 Jan 2023 12:59:13 +0200
Subject: [PATCH 182/191] grandperspective: init at 3.0.1

---
 .../darwin/grandperspective/default.nix       | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/grandperspective/default.nix

diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/os-specific/darwin/grandperspective/default.nix
new file mode 100644
index 000000000000..a1156c7cb873
--- /dev/null
+++ b/pkgs/os-specific/darwin/grandperspective/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, fetchurl, undmg, ... }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.1";
+  pname = "grandperspective";
+
+  src = fetchurl {
+    inherit version;
+    url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${builtins.replaceStrings [ "." ] [ "_" ] version}.dmg";
+    sha256 = "sha256-ZPqrlN9aw5q7656GmmxCnTRBw3lu9n952rIyun8MsiI=";
+  };
+
+  sourceRoot = "GrandPerspective.app";
+  buildInputs = [ undmg ];
+  installPhase = ''
+    mkdir -p "$out/Applications/GrandPerspective.app";
+    cp -R . "$out/Applications/GrandPerspective.app";
+  '';
+
+  meta = with lib; {
+    description = "Open-source macOS application to analyze disk usage";
+    longDescription = ''
+      GrandPerspective is a small utility application for macOS that graphically shows the disk usage within a file
+      system. It can help you to manage your disk, as you can easily spot which files and folders take up the most
+      space. It uses a so called tree map for visualisation. Each file is shown as a rectangle with an area proportional to
+      the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary.
+    '';
+    homepage = "https://grandperspectiv.sourceforge.net";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ eliandoran ];
+    platforms = [ "x86_64-darwin" ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f46e94edd40..3b872661fb66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3437,6 +3437,8 @@ with pkgs;
 
   goku = callPackage ../os-specific/darwin/goku { };
 
+  grandperspective = callPackage ../os-specific/darwin/grandperspective { };
+
   grb = callPackage ../applications/misc/grb { };
 
   kerf   = kerf_1; /* kerf2 is WIP */

From 5df6f1809d70bb27d033bede5845090a888d5ebd Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 21 Feb 2023 14:22:03 -0500
Subject: [PATCH 183/191] python310Packages.lightgbm: unbreak

---
 pkgs/development/python-modules/lightgbm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 01be9fb86511..1be852daa157 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -13,7 +13,7 @@
 buildPythonPackage rec {
   pname = "lightgbm";
   version = "3.3.5";
-  format = "other";
+  format = "setuptools";
 
   disabled = pythonOlder "3.7";
 

From 3a119621cc5386585d338b4ab094791476b52aed Mon Sep 17 00:00:00 2001
From: Connor Baker <connorbaker01@gmail.com>
Date: Thu, 9 Feb 2023 12:54:34 -0500
Subject: [PATCH 184/191] nccl: 2.12.10-1 -> 2.16.5-1

---
 .../libraries/science/math/nccl/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix
index 41dddf2391ac..34c18cde23c5 100644
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/pkgs/development/libraries/science/math/nccl/default.nix
@@ -1,14 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }:
+{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }:
+
+let
+  inherit (cudaPackages) cudatoolkit;
+in
 
 stdenv.mkDerivation rec {
   name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
-  version = "2.12.10-1";
+  version = "2.16.5-1";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl";
     rev = "v${version}";
-    sha256 = "sha256-QqORzm0gD+QG+P8rId8bQn2oZsxL5YyxCIobUVs85wE=";
+    hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU=";
   };
 
   outputs = [ "out" "dev" ];
@@ -39,7 +43,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
-    inherit cudatoolkit;
+    inherit cudaPackages;
   };
 
   meta = with lib; {

From a018bded8924bbca658b0affc49ea54086869d90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 19:35:18 +0000
Subject: [PATCH 185/191] belle-sip: 5.2.16 -> 5.2.23

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

diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index a76068548122..44e5a4aa2de6 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "belle-sip";
-  version = "5.2.16";
+  version = "5.2.23";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI=";
+    sha256 = "sha256-c73PCM+bRz6CjGRY2AapEcvKC1UqyEfzb7qsicmrkQU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 7923b7a53d01358aa2c10e42c27812da9cab3c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Feb 2023 09:09:28 -0800
Subject: [PATCH 186/191] libdeltachat: 1.108.0 -> 1.109.0

Diff: https://github.com/deltachat/deltachat-core-rust/compare/1.108.0...1.109.0

Changelog: https://github.com/deltachat/deltachat-core-rust/blob/1.109.0/CHANGELOG.md
---
 pkgs/development/libraries/libdeltachat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index cd0320184b0f..7efb7d755ad4 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.108.0";
+  version = "1.109.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = version;
-    hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I=";
+    hash = "sha256-6zlXa9N7gaF1ta6mjszsA25+QRrHF8m1brKoSiL5OHo=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck=";
+    hash = "sha256-Z7CLKhKWqAaLhsXi81OOKWmwQddHCebCJibbKiNNptk=";
   };
 
   nativeBuildInputs = [

From a089108828bbcf570013c370b2a4a782ab4bd0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Feb 2023 09:16:19 -0800
Subject: [PATCH 187/191] python310Packages.deltachat: use pyproject format

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

diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix
index d0bdc0cd7179..11e652b3826b 100644
--- a/pkgs/development/python-modules/deltachat/default.nix
+++ b/pkgs/development/python-modules/deltachat/default.nix
@@ -1,9 +1,10 @@
 { lib
 , buildPythonPackage
-, isPy27
+, pythonOlder
 , pkg-config
 , pkgconfig
 , setuptools-scm
+, wheel
 , libdeltachat
 , cffi
 , imap-tools
@@ -18,12 +19,16 @@ buildPythonPackage rec {
   inherit (libdeltachat) version src;
   sourceRoot = "${src.name}/python";
 
-  disabled = isPy27;
+  disabled = pythonOlder "3.7";
+  format = "pyproject";
 
   nativeBuildInputs = [
+    cffi
     pkg-config
     pkgconfig
+    setuptools
     setuptools-scm
+    wheel
   ];
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -37,7 +42,7 @@ buildPythonPackage rec {
     imap-tools
     pluggy
     requests
-    setuptools
+    setuptools # for pkg_resources
   ];
 
   nativeCheckInputs = [

From f26cedf1ef59430afd24aa85aa1094e13940cbe9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 21 Feb 2023 22:37:56 +0100
Subject: [PATCH 188/191] gitea: 1.18.4 -> 1.18.5

ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.18.5
---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 2ded0cf170d6..3141d08cdcec 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -15,12 +15,12 @@
 
 buildGoModule rec {
   pname = "gitea";
-  version = "1.18.4";
+  version = "1.18.5";
 
   # not fetching directly from the git repo, because that lacks several vendor files for the web UI
   src = fetchurl {
     url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
-    hash = "sha256-LSSOmqSeiv9qNCAsRWYtjRLfUDLMd8mOVAxTOacvNOA=";
+    hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk=";
   };
 
   vendorHash = null;

From 057e7b7c24c4f73a3ee668a068733997ae36ebad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Feb 2023 19:15:14 -0800
Subject: [PATCH 189/191] python310Packages.async-lru: 1.0.3 -> 2.0.0

Diff: https://github.com/aio-libs/async-lru/compare/v1.0.3...v2.0.0
---
 .../python-modules/async-lru/default.nix        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix
index 73ccaa62c3d3..49e75fc118ba 100644
--- a/pkgs/development/python-modules/async-lru/default.nix
+++ b/pkgs/development/python-modules/async-lru/default.nix
@@ -2,23 +2,30 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, typing-extensions
 , pytestCheckHook
 , pytest-asyncio
 }:
 
 buildPythonPackage rec {
   pname = "async-lru";
-  version = "1.0.3";
+  version = "2.0.0";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "async-lru";
     rev = "v${version}";
-    hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM=";
+    hash = "sha256-mCmEMN9D6kEkHb3GoYuVk4XxvhaSX5eOHqpKawrcoxs=";
   };
 
+  propagatedBuildInputs = [
+    typing-extensions
+  ];
+
   postPatch = ''
     sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg
   '';
@@ -28,10 +35,6 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
-  pytestFlagsArray = [
-    "--asyncio-mode=strict"
-  ];
-
   pythonImportsCheck = [ "async_lru" ];
 
   meta = with lib; {

From 5a5adc2ad7009851d7d0fc26311e42a93b171d2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Feb 2023 18:43:04 +0000
Subject: [PATCH 190/191] erigon: 2.38.1 -> 2.39.0

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

diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix
index 51b6d4d16b2b..e4823f1a66c3 100644
--- a/pkgs/applications/blockchains/erigon/default.nix
+++ b/pkgs/applications/blockchains/erigon/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "erigon";
-  version = "2.38.1";
+  version = "2.39.0";
 in
 buildGoModule {
   inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sLJMmSEUQNsodZ9Ms0ipDwN2QOYa9pZTlEqt4CF23Sc=";
+    sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU=";
     fetchSubmodules = true;
   };
 
-  vendorSha256 = "sha256-KESY+PSbWQHPJphop4GnVF4T8Q/MPb2GFDEko0ieXEM=";
+  vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY=";
   proxyVendor = true;
 
   # Build errors in mdbx when format hardening is enabled:

From 8260d35eb9212c4803a3c612a9f7e29c3434fde2 Mon Sep 17 00:00:00 2001
From: Bill Ewanick <bill@ewanick.com>
Date: Tue, 21 Feb 2023 11:33:47 -0500
Subject: [PATCH 191/191] lemmy: 0.16.7 -> 0.17.1

---
 pkgs/servers/web-apps/lemmy/package.json | 121 ++++++++++++-----------
 pkgs/servers/web-apps/lemmy/pin.json     |  10 +-
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json
index 36121c10595a..7f7abbdb4afc 100644
--- a/pkgs/servers/web-apps/lemmy/package.json
+++ b/pkgs/servers/web-apps/lemmy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lemmy-ui",
   "description": "An isomorphic UI for lemmy",
-  "version": "0.16.7",
+  "version": "0.17.1",
   "author": "Dessalines <tyhou13@gmx.com>",
   "license": "AGPL-3.0",
   "scripts": {
@@ -9,7 +9,7 @@
     "build:prod": "webpack --mode=production",
     "clean": "yarn run rimraf dist",
     "dev": "yarn start",
-    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
+    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'",
     "prebuild:dev": "yarn clean && node generate_translations.js",
     "prebuild:prod": "yarn clean && node generate_translations.js",
     "prepare": "husky install",
@@ -17,82 +17,91 @@
   },
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "dependencies": {
-    "@typescript-eslint/parser": "^5.21.0",
-    "autosize": "^5.0.1",
-    "check-password-strength": "^2.0.5",
-    "choices.js": "^10.1.0",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-typescript": "^7.20.13",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/runtime": "^7.20.13",
+    "autosize": "^5.0.2",
+    "babel-loader": "^9.1.2",
+    "babel-plugin-inferno": "^6.6.0",
+    "check-password-strength": "^2.0.7",
+    "choices.js": "^10.2.0",
     "classnames": "^2.3.1",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
     "emoji-short-name": "^2.0.0",
-    "express": "~4.18.0",
-    "i18next": "^21.6.16",
-    "inferno": "^7.4.11",
-    "inferno-create-element": "^7.4.11",
+    "express": "~4.18.2",
+    "html-to-text": "^9.0.3",
+    "i18next": "^22.4.9",
+    "inferno": "^8.0.5",
+    "inferno-create-element": "^8.0.5",
     "inferno-helmet": "^5.2.1",
-    "inferno-hydrate": "^7.4.11",
-    "inferno-i18next-dess": "^0.0.1",
-    "inferno-router": "^7.4.11",
-    "inferno-server": "^7.4.11",
+    "inferno-hydrate": "^8.0.5",
+    "inferno-i18next-dess": "0.0.2",
+    "inferno-router": "^8.0.5",
+    "inferno-server": "^8.0.5",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
+    "lemmy-js-client": "0.17.0-rc.62",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
     "markdown-it-footnote": "^3.0.3",
     "markdown-it-html5-embed": "^1.0.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "moment": "^2.29.3",
+    "mini-css-extract-plugin": "^2.7.2",
+    "moment": "^2.29.4",
+    "node-fetch": "^2.6.1",
     "register-service-worker": "^1.7.2",
-    "rxjs": "^7.5.5",
-    "sass": "^1.51.0",
-    "serialize-javascript": "^6.0.0",
+    "run-node-webpack-plugin": "^1.3.0",
+    "rxjs": "^7.8.0",
+    "sanitize-html": "^2.8.1",
+    "sass": "^1.57.1",
+    "sass-loader": "^13.2.0",
+    "serialize-javascript": "^6.0.1",
     "tippy.js": "^6.3.7",
-    "toastify-js": "^1.11.2",
+    "toastify-js": "^1.12.0",
     "tributejs": "^5.1.3",
+    "webpack": "5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-node-externals": "^3.0.0",
     "websocket-ts": "^1.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/plugin-transform-typescript": "^7.16.1",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-typescript": "^7.16.0",
-    "@babel/runtime": "^7.17.9",
+    "@babel/core": "^7.20.12",
     "@types/autosize": "^4.0.0",
-    "@types/express": "^4.17.13",
-    "@types/node": "^17.0.29",
-    "@types/node-fetch": "^2.6.1",
+    "@types/express": "^4.17.16",
+    "@types/html-to-text": "^9.0.0",
+    "@types/markdown-it": "^12.2.3",
+    "@types/markdown-it-container": "^2.0.5",
+    "@types/node": "^18.11.18",
+    "@types/node-fetch": "^2.6.2",
+    "@types/sanitize-html": "^2.8.0",
     "@types/serialize-javascript": "^5.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-inferno": "^6.4.0",
-    "bootstrap": "^5.1.3",
-    "bootswatch": "^5.1.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "^6.7.1",
-    "eslint": "^8.14.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.4",
+    "@types/toastify-js": "^1.11.1",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "bootstrap": "^5.2.3",
+    "bootswatch": "^5.2.3",
+    "eslint": "^8.33.0",
+    "eslint-plugin-inferno": "^7.32.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.3",
     "import-sort-style-module": "^6.0.0",
-    "lemmy-js-client": "0.16.4",
-    "lint-staged": "^12.4.1",
-    "mini-css-extract-plugin": "^2.6.0",
-    "node-fetch": "^2.6.1",
-    "prettier": "^2.6.2",
+    "lint-staged": "^13.1.0",
+    "prettier": "^2.8.3",
     "prettier-plugin-import-sort": "^0.0.7",
-    "prettier-plugin-organize-imports": "^2.3.4",
-    "prettier-plugin-packagejson": "^2.2.17",
-    "rimraf": "^3.0.2",
-    "run-node-webpack-plugin": "^1.3.0",
-    "sass-loader": "^12.6.0",
-    "sortpack": "^2.2.0",
+    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier-plugin-packagejson": "^2.4.2",
+    "rimraf": "^4.1.2",
+    "sortpack": "^2.3.3",
     "style-loader": "^3.3.1",
-    "terser": "^5.13.0",
-    "typescript": "^4.6.3",
-    "webpack": "5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "4.8.1",
-    "webpack-node-externals": "^3.0.0"
+    "terser": "^5.16.2",
+    "typescript": "^4.9.5",
+    "webpack-dev-server": "4.11.1"
   },
   "engines": {
     "node": ">=8.9.0"
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index d27a5319309b..05960e62965d 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,7 +1,7 @@
 {
-  "version": "0.16.7",
-  "serverSha256": "sha256-S0WomoWm3Bf3M6W6Q1+emLuwC4IPxGlM5aqY8yTPG6Q=",
-  "serverCargoSha256": "sha256-PxIFgQ6ngkpZInJX55feFg/R+nVO30z6q+apZKBXlkg=",
-  "uiSha256": "sha256-gM+L/gMNMuQQTnnlrGRqAlXKBrf27bpbZWoqufpb3LE=",
-  "uiYarnDepsSha256": "sha256-2NiDuqAyZeNn3c3XDeP2m5hHej4w4/gcabxfHgC8PV4="
+  "version": "0.17.1",
+  "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=",
+  "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=",
+  "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=",
+  "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ="
 }