From 0a8e692d29816ecd06e3e25034a0b52fe037ceb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 24 Nov 2022 21:29:38 +0100
Subject: [PATCH 001/247] stdenv: show supported and requested platforms when
 check meta fails

---
 pkgs/stdenv/generic/check-meta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 94998bbfa0fe..1f0481d8c177 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -367,7 +367,7 @@ let
     else if !allowBroken && attrs.meta.broken or false then
       { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }
     else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
-      { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; }
+      { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${toString attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }
 

From 4ee9acb309665a7bf7661c596b33aff74286638a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 14 Feb 2023 18:49:10 +0100
Subject: [PATCH 002/247] python310Packages.etcd: cleanup patchPhase overwrite,
 update meta

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

diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
index a2c4dc971cbc..e479885cd914 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI=";
   };
 
-  patchPhase = ''
+  postPatch = ''
     sed -i -e '13,14d;37d' setup.py
   '';
 
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "A Python etcd client that just works";
     homepage = "https://github.com/dsoprea/PythonEtcdClient";
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
   };
-
 }

From 12db8314d734f9fbb2dc58dfe73c1b3410599b29 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 15 Feb 2023 10:11:38 +0100
Subject: [PATCH 003/247] fail2ban: 0.11.2 -> 1.0.2

Update to 1.0.2: https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog#ver-102-20221109---finally-war-game-test-tape-not-a-nuclear-alarm
1.0.1 contained a few breaking changes, but I think they have little
impact.

I changed the module to use the systemd service shipping with fail2ban
(now added to the package).
---
 .../manual/release-notes/rl-2305.section.md   |  2 ++
 nixos/modules/services/security/fail2ban.nix  | 12 +------
 pkgs/tools/security/fail2ban/default.nix      | 36 +++++--------------
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index c81cbc69f94e..bcd277ba6f89 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -95,6 +95,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
 
+- `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog))
+
 - Calling `makeSetupHook` without passing a `name` argument is deprecated.
 
 - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 3c4bcd1ac265..ead24d147071 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -273,26 +273,16 @@ in
       "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
     };
 
+    systemd.packages = [ cfg.package ];
     systemd.services.fail2ban = {
-      description = "Fail2ban Intrusion Prevention System";
-
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
       partOf = optional config.networking.firewall.enable "firewall.service";
 
       restartTriggers = [ fail2banConf jailConf pathsConf ];
 
       path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ] ++ cfg.extraPackages;
 
-      unitConfig.Documentation = "man:fail2ban(1)";
-
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/fail2ban-server -xf start";
-        ExecStop = "${cfg.package}/bin/fail2ban-server stop";
-        ExecReload = "${cfg.package}/bin/fail2ban-server reload";
-        Type = "simple";
-        Restart = "on-failure";
-        PIDFile = "/run/fail2ban/fail2ban.pid";
         # Capabilities
         CapabilityBoundingSet = [ "CAP_AUDIT_READ" "CAP_DAC_READ_SEARCH" "CAP_NET_ADMIN" "CAP_NET_RAW" ];
         # Security
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index daa0e8471158..780f1b4dfb0c 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,18 +1,17 @@
 { lib, stdenv, fetchFromGitHub
 , python3
-, fetchpatch
 , installShellFiles
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fail2ban";
-  version = "0.11.2";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "fail2ban";
     repo = "fail2ban";
     rev = version;
-    sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE=";
+    hash = "sha256-Zd8zLkFlvXTbeInEkNFyHgcAiOsX4WwF6hf5juSQvbY=";
   };
 
   outputs = [ "out" "man" ];
@@ -25,31 +24,13 @@ python3.pkgs.buildPythonApplication rec {
       pyinotify
     ];
 
-  patches = [
-    # remove references to use_2to3, for setuptools>=58
-    # has been merged into master, remove next release
-    (fetchpatch {
-      url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch";
-      sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI=";
-    })
-    # fix use of MutableMapping with Python >= 3.10
-    # https://github.com/fail2ban/fail2ban/issues/3142
-    (fetchpatch {
-      url = "https://github.com/fail2ban/fail2ban/commit/294ec73f629d0e29cece3a1eb5dd60b6fccea41f.patch";
-      sha256 = "sha256-Eimm4xjBDYNn5QdTyMqGgT5EXsZdd/txxcWJojXlsFE=";
-    })
-  ];
-
   preConfigure = ''
-    # workaround for setuptools 58+
-    # https://github.com/fail2ban/fail2ban/issues/3098
     patchShebangs fail2ban-2to3
     ./fail2ban-2to3
 
     for i in config/action.d/sendmail*.conf; do
       substituteInPlace $i \
-        --replace /usr/sbin/sendmail sendmail \
-        --replace /usr/bin/whois whois
+        --replace /usr/sbin/sendmail sendmail
     done
 
     substituteInPlace config/filter.d/dovecot.conf \
@@ -65,15 +46,17 @@ python3.pkgs.buildPythonApplication rec {
     ${python3.interpreter} setup.py install_data --install-dir=$out --root=$out
   '';
 
-  postPatch = ''
-    ${stdenv.shell} ./fail2ban-2to3
-  '';
-
   postInstall =
     let
       sitePackages = "$out/${python3.sitePackages}";
     in
     ''
+      install -m 644 -D -t "$out/lib/systemd/system" build/fail2ban.service
+      # Replace binary paths
+      sed -i "s#build/bdist.*/wheel/fail2ban.*/scripts/#$out/bin/#g" $out/lib/systemd/system/fail2ban.service
+      # Delete creating the runtime directory, systemd does that
+      sed -i "/ExecStartPre/d" $out/lib/systemd/system/fail2ban.service
+
       # see https://github.com/NixOS/nixpkgs/issues/4968
       rm -r "${sitePackages}/etc"
 
@@ -88,6 +71,5 @@ python3.pkgs.buildPythonApplication rec {
     description = "A program that scans log files for repeated failing login attempts and bans IP addresses";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ eelco lovek323 ];
-    platforms = platforms.unix;
   };
 }

From 5e5a84b193f66427d215fd1af2b2fd2400a5c84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 31 Jan 2023 22:25:27 +0100
Subject: [PATCH 004/247] nixos/nginx: add recommendedZstdSettings

---
 .../services/web-servers/nginx/default.nix    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index bc5b4be51098..89fecc938cad 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -186,8 +186,8 @@ let
         brotli_types ${lib.concatStringsSep " " compressMimeTypes};
       ''}
 
-      # https://docs.nginx.com/nginx/admin-guide/web-server/compression/
       ${optionalString cfg.recommendedGzipSettings ''
+        # https://docs.nginx.com/nginx/admin-guide/web-server/compression/
         gzip on;
         gzip_static on;
         gzip_vary on;
@@ -197,6 +197,14 @@ let
         gzip_types ${lib.concatStringsSep " " compressMimeTypes};
       ''}
 
+      ${optionalString cfg.recommendedZstdSettings ''
+        zstd on;
+        zstd_comp_level 9;
+        zstd_min_length 256;
+        zstd_static on;
+        zstd_types ${lib.concatStringsSep " " compressMimeTypes};
+      ''}
+
       ${optionalString cfg.recommendedProxySettings ''
         proxy_redirect          off;
         proxy_connect_timeout   ${cfg.proxyTimeout};
@@ -492,6 +500,16 @@ in
         '';
       };
 
+      recommendedZstdSettings = mkOption {
+        default = false;
+        type = types.bool;
+        description = lib.mdDoc ''
+          Enable recommended zstd settings. Learn more about compression in Zstd format [here](https://github.com/tokers/zstd-nginx-module).
+
+          This adds `pkgs.nginxModules.zstd` to `services.nginx.additionalModules`.
+        '';
+      };
+
       proxyTimeout = mkOption {
         type = types.str;
         default = "60s";
@@ -1005,7 +1023,8 @@ in
       groups = config.users.groups;
     }) dependentCertNames;
 
-    services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli;
+    services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli
+      ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd;
 
     systemd.services.nginx = {
       description = "Nginx Web Server";

From e31461fff1d71e13ed5749b810dd5bac28fbf9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 31 Jan 2023 22:25:36 +0100
Subject: [PATCH 005/247] nginx.modules.zstd: init

---
 pkgs/servers/http/nginx/modules.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index d09c98ef2a20..0bbc654309a0 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -29,6 +29,7 @@
 , which
 , yajl
 , zlib
+, zstd
 }:
 
 let
@@ -666,6 +667,19 @@ let self = {
       sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ=";
     };
   };
+
+  zstd = {
+    name = "zstd";
+    src = fetchFromGitHub {
+      name = "zstd";
+      owner = "tokers";
+      repo = "zstd-nginx-module";
+      rev = "25d88c262be47462cf90015ee7ebf6317b6848f9";
+      sha256 = "sha256-YRluKekhx1tb6e5IL1FPK05jPtzfQPaHI47cdada928=";
+    };
+
+    inputs = [ zstd ];
+  };
 }; in self // lib.optionalAttrs config.allowAliases {
   # deprecated or renamed packages
   modsecurity-nginx = self.modsecurity;

From e2822bee39d39e1409731d9763de54f5056a33ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 22 Feb 2023 22:51:41 +0100
Subject: [PATCH 006/247] libcef: 100.0.24 -> 110.0.27

i686-linux is no longer supported since chrome 101
---
 pkgs/development/libraries/libcef/default.nix | 15 +++++----------
 pkgs/development/libraries/libcef/update.sh   |  2 --
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 96f53a33b1eb..3c4d317d5261 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -61,26 +61,21 @@ let
       platformStr = "linuxarm64";
       projectArch = "arm64";
     };
-    "i686-linux" = {
-      platformStr = "linux32";
-      projectArch = "x86";
-    };
     "x86_64-linux" = {
       platformStr = "linux64";
       projectArch = "x86_64";
     };
   };
-  platforms."aarch64-linux".sha256 = "0gmnmr0zn2ffn7xbhmfh6rhmwmxy5zzlj0s3lyp99knjn47lg2fg";
-  platforms."i686-linux".sha256 = "1lp2z9db89qk2wh900c2dzlhflwmcbmp4m7xnlj04pq4q2kgfm9p";
-  platforms."x86_64-linux".sha256 = "1ljrp0iky7rrj04sbqicrg1jr938xnid6jlirbf7gwlmzliz3wfs";
+  platforms."aarch64-linux".sha256 = "1aacq9baw0hxf3h354fmws4v6008d3axxmri23vlvhzg7hza05n1";
+  platforms."x86_64-linux".sha256 = "17wpmvrbkdhnsk63f36yk6kq0mqhx63ih0mbhf8hl0qj6yndabgc";
 
   platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
 in
 stdenv.mkDerivation rec {
   pname = "cef-binary";
-  version = "100.0.24";
-  gitRevision = "0783cf8";
-  chromiumVersion = "100.0.4896.127";
+  version = "110.0.27";
+  gitRevision = "1296c82";
+  chromiumVersion = "110.0.5481.100";
 
   src = fetchurl {
     url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/development/libraries/libcef/update.sh
index 545f7c702052..d11fd7193d6e 100755
--- a/pkgs/development/libraries/libcef/update.sh
+++ b/pkgs/development/libraries/libcef/update.sh
@@ -12,7 +12,6 @@ GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut
 CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version')
 
 SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2)
-SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2)
 SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2)
 
 setKV () {
@@ -23,5 +22,4 @@ setKV version ${CEF_VERSION}
 setKV gitRevision ${GIT_REVISION}
 setKV chromiumVersion ${CHROMIUM_VERSION}
 setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64}
-setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32}
 setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64}

From 1320cb8157dff844e102106e727588fdd6e1fa20 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 28 Feb 2023 10:52:38 +0800
Subject: [PATCH 007/247] tdesktop: add patch to disable custom URL scheme
 registration

The generated .desktop files contains references to unwrapped tdesktop,
breaking scheme handling. And the scheme handler is already registered
in the packaged .desktop file, rendering this unnessesary

Reference: https://github.com/NixOS/nixpkgs/issues/218370
---
 .../instant-messengers/telegram/tdesktop/default.nix  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3066a3aa745b..9ab4ce65b62b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch
 , callPackage
 , pkg-config
 , cmake
@@ -87,6 +88,16 @@ env.mkDerivation rec {
     sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk";
   };
 
+  patches = [
+    # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling
+    # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary
+    # see https://github.com/NixOS/nixpkgs/issues/218370
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
+      hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
       --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'

From 86053e5ec2c1ed023e543cf753922a989055fc1c Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 1 Mar 2023 13:55:30 +0100
Subject: [PATCH 008/247] dgraph: use --prefix to prefix PATH

This is more robust in case PATH is empty or otherwise weird.
---
 nixos/modules/services/databases/dgraph.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix
index 887164fa5b94..7f005a9971a6 100644
--- a/nixos/modules/services/databases/dgraph.nix
+++ b/nixos/modules/services/databases/dgraph.nix
@@ -12,7 +12,7 @@ let
   ''
     mkdir -p $out/bin
     makeWrapper ${cfg.package}/bin/dgraph $out/bin/dgraph \
-      --set PATH '${lib.makeBinPath [ pkgs.nodejs ]}:$PATH' \
+      --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}" \
   '';
   securityOptions = {
       NoNewPrivileges = true;

From f37d97b7a09ba749617ba6a7b0342712554e0bf4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 12:42:30 +0100
Subject: [PATCH 009/247] libbacktrace: clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Prefix version with “unstable-” as per contributing guide
- Do not use rec pointlessly
- Use `lib.enableFeature`
- Add update script
- Format the expression
- Remove unused callPackage input
---
 .../libraries/libbacktrace/default.nix        | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix
index 549ed0c29e86..e9713f2edb26 100644
--- a/pkgs/development/libraries/libbacktrace/default.nix
+++ b/pkgs/development/libraries/libbacktrace/default.nix
@@ -1,22 +1,31 @@
-{ lib, stdenv, callPackage, fetchFromGitHub
+{ stdenv
+, lib
+, fetchFromGitHub
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
+, unstableGitUpdater
 }:
-let
-  yesno = b: if b then "yes" else "no";
-in stdenv.mkDerivation rec {
+
+stdenv.mkDerivation {
   pname = "libbacktrace";
-  version = "2020-05-13";
+  version = "unstable-2020-05-13";
+
   src = fetchFromGitHub {
     owner = "ianlancetaylor";
-    repo = pname;
+    repo = "libbacktrace";
     rev = "9b7f216e867916594d81e8b6118f092ac3fcf704";
     sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh";
   };
+
   configureFlags = [
-    "--enable-static=${yesno enableStatic}"
-    "--enable-shared=${yesno enableShared}"
+    (lib.enableFeature enableStatic "static")
+    (lib.enableFeature enableShared "shared")
   ];
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
   meta = with lib; {
     description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces";
     homepage = "https://github.com/ianlancetaylor/libbacktrace";

From 9cc45e195f4ea9d972bd7dd1dae904a32c365bfc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 11:42:52 +0000
Subject: [PATCH 010/247] =?UTF-8?q?libbacktrace:=20unstable-2020-05-13=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2022-12-16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/ianlancetaylor/libbacktrace/compare/9b7f216e867916594d81e8b6118f092ac3fcf704...da7eff2f37e38136c5a0c8922957b9dfab5483ef
---
 pkgs/development/libraries/libbacktrace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix
index e9713f2edb26..6c440e4e42e6 100644
--- a/pkgs/development/libraries/libbacktrace/default.nix
+++ b/pkgs/development/libraries/libbacktrace/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "libbacktrace";
-  version = "unstable-2020-05-13";
+  version = "unstable-2022-12-16";
 
   src = fetchFromGitHub {
     owner = "ianlancetaylor";
     repo = "libbacktrace";
-    rev = "9b7f216e867916594d81e8b6118f092ac3fcf704";
-    sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh";
+    rev = "da7eff2f37e38136c5a0c8922957b9dfab5483ef";
+    sha256 = "ADp8n1kUf8OysFY/Jv1ytxKjqgz1Nu2VRcFGlt1k/HM=";
   };
 
   configureFlags = [

From 14c5fae1cbde7f4eddb95bccf4535b211963217e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 20:46:00 +0100
Subject: [PATCH 011/247] libbacktrace: Enable tests

Only on Linux since they will fail on Darwin:

    dsymutil btest
    error: cannot parse the debug map for 'btest': The file was not recognized as a valid object file
    make[1]: *** [Makefile:2584: btest.dSYM] Error 1
---
 ...cktrace-avoid-libtool-wrapping-tests.patch | 201 ++++++++++++++++++
 .../libraries/libbacktrace/default.nix        |  13 ++
 2 files changed, 214 insertions(+)
 create mode 100644 pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch

diff --git a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
new file mode 100644
index 000000000000..3ee3198cb229
--- /dev/null
+++ b/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
@@ -0,0 +1,201 @@
+From 1cf6b108882669f1b20c18fb5f2d6dff0fc83296 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 24 Dec 2022 15:31:51 +0100
+Subject: [PATCH 1/4] libbacktrace: avoid libtool wrapping tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When `--enable-shared` is used, libtool will produce shell scripts
+instead of programs, preventing separate debug info from being generated:
+
+    objcopy --only-keep-debug btest btest_gnudebuglink.debug
+    objcopy: btest: file format not recognized
+    make[2]: *** [Makefile:2615: btest_gnudebuglink] Error 1
+
+Let’s make it properly set rpath with `-no-install` flag,
+so that wrappers are not needed, as mentioned on
+https://autotools.info/libtool/wrappers.html
+---
+ Makefile.am | 28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c53cbae..6eab991 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -107,6 +107,8 @@ check_DATA =
+ # Flags to use when compiling test programs.
+ libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
+ 
++libbacktrace_TEST_LDFLAGS = -no-install
++
+ if USE_DSYMUTIL
+ 
+ %.dSYM: %
+@@ -171,48 +173,56 @@ xcoff_%.c: xcoff.c
+ 
+ test_elf_32_SOURCES = test_format.c testlib.c
+ test_elf_32_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_elf_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo
+ 
+ BUILDTESTS += test_elf_32
+ 
+ test_elf_64_SOURCES = test_format.c testlib.c
+ test_elf_64_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_elf_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo
+ 
+ BUILDTESTS += test_elf_64
+ 
+ test_macho_SOURCES = test_format.c testlib.c
+ test_macho_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_macho_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_macho_LDADD = libbacktrace_noformat.la macho.lo
+ 
+ BUILDTESTS += test_macho
+ 
+ test_xcoff_32_SOURCES = test_format.c testlib.c
+ test_xcoff_32_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_xcoff_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo
+ 
+ BUILDTESTS += test_xcoff_32
+ 
+ test_xcoff_64_SOURCES = test_format.c testlib.c
+ test_xcoff_64_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_xcoff_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_xcoff_64_LDADD = libbacktrace_noformat.la xcoff_64.lo
+ 
+ BUILDTESTS += test_xcoff_64
+ 
+ test_pecoff_SOURCES = test_format.c testlib.c
+ test_pecoff_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_pecoff_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_pecoff_LDADD = libbacktrace_noformat.la pecoff.lo
+ 
+ BUILDTESTS += test_pecoff
+ 
+ test_unknown_SOURCES = test_format.c testlib.c
+ test_unknown_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++test_unknown_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ test_unknown_LDADD = libbacktrace_noformat.la unknown.lo
+ 
+ BUILDTESTS += test_unknown
+ 
+ unittest_SOURCES = unittest.c testlib.c
+ unittest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++unittest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ unittest_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += unittest
+@@ -253,7 +263,7 @@ if HAVE_OBJCOPY_DEBUGLINK
+ 
+ b2test_SOURCES = $(btest_SOURCES)
+ b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS)
+-b2test_LDFLAGS = -Wl,--build-id
++b2test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS)
+ b2test_LDADD = libbacktrace_elf_for_test.la
+ 
+ check_PROGRAMS += b2test
+@@ -263,7 +273,7 @@ if HAVE_DWZ
+ 
+ b3test_SOURCES = $(btest_SOURCES)
+ b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS)
+-b3test_LDFLAGS = -Wl,--build-id
++b3test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS)
+ b3test_LDADD = libbacktrace_elf_for_test.la
+ 
+ check_PROGRAMS += b3test
+@@ -276,6 +286,7 @@ endif HAVE_ELF
+ 
+ btest_SOURCES = btest.c testlib.c
+ btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O
++btest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ btest_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += btest
+@@ -330,6 +341,7 @@ endif HAVE_DWZ
+ 
+ stest_SOURCES = stest.c
+ stest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++stest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ stest_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += stest
+@@ -352,6 +364,7 @@ if HAVE_ELF
+ 
+ ztest_SOURCES = ztest.c testlib.c
+ ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
++ztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ ztest_LDADD = libbacktrace.la
+ ztest_alloc_LDADD = libbacktrace_alloc.la
+ 
+@@ -371,6 +384,7 @@ BUILDTESTS += ztest_alloc
+ 
+ zstdtest_SOURCES = zstdtest.c testlib.c
+ zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
++zstdtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ zstdtest_LDADD = libbacktrace.la
+ zstdtest_alloc_LDADD = libbacktrace_alloc.la
+ 
+@@ -392,6 +406,7 @@ endif HAVE_ELF
+ 
+ edtest_SOURCES = edtest.c edtest2_build.c testlib.c
+ edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS)
++edtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ edtest_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += edtest
+@@ -422,6 +437,7 @@ BUILDTESTS += ttest
+ 
+ ttest_SOURCES = ttest.c testlib.c
+ ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread
++ttest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ ttest_LDADD = libbacktrace.la
+ 
+ if USE_DSYMUTIL
+@@ -460,12 +476,12 @@ if HAVE_COMPRESSED_DEBUG
+ 
+ ctestg_SOURCES = btest.c testlib.c
+ ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS)
+-ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu
++ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu $(libbacktrace_TEST_LDFLAGS)
+ ctestg_LDADD = libbacktrace.la
+ 
+ ctesta_SOURCES = btest.c testlib.c
+ ctesta_CFLAGS = $(libbacktrace_TEST_CFLAGS)
+-ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi
++ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi $(libbacktrace_TEST_LDFLAGS)
+ ctesta_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += ctestg ctesta
+@@ -474,7 +490,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD
+ 
+ ctestzstd_SOURCES = btest.c testlib.c
+ ctestzstd_CFLAGS = $(libbacktrace_TEST_CFLAGS)
+-ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd
++ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd $(libbacktrace_TEST_LDFLAGS)
+ ctestzstd_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += ctestzstd
+@@ -521,6 +537,7 @@ endif
+ 
+ mtest_SOURCES = mtest.c testlib.c
+ mtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O
++mtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ mtest_LDADD = libbacktrace.la
+ 
+ BUILDTESTS += mtest
+@@ -553,6 +570,7 @@ if HAVE_ELF
+ 
+ xztest_SOURCES = xztest.c testlib.c
+ xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\"
++xztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS)
+ xztest_LDADD = libbacktrace.la
+ 
+ xztest_alloc_SOURCES = $(xztest_SOURCES)
+-- 
+2.38.1
+
diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix
index 6c440e4e42e6..e6572d54f945 100644
--- a/pkgs/development/libraries/libbacktrace/default.nix
+++ b/pkgs/development/libraries/libbacktrace/default.nix
@@ -4,6 +4,7 @@
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 , unstableGitUpdater
+, autoreconfHook
 }:
 
 stdenv.mkDerivation {
@@ -17,11 +18,23 @@ stdenv.mkDerivation {
     sha256 = "ADp8n1kUf8OysFY/Jv1ytxKjqgz1Nu2VRcFGlt1k/HM=";
   };
 
+  patches = [
+    # Fix tests with shared library.
+    # https://github.com/ianlancetaylor/libbacktrace/pull/99
+    ./0001-libbacktrace-avoid-libtool-wrapping-tests.patch
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   configureFlags = [
     (lib.enableFeature enableStatic "static")
     (lib.enableFeature enableShared "shared")
   ];
 
+  doCheck = stdenv.isLinux;
+
   passthru = {
     updateScript = unstableGitUpdater { };
   };

From 1e0384829d14e4eb186dc71f9b6df249508a9df1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 20:35:01 +0100
Subject: [PATCH 012/247] libbacktrace: Add support for NIX_DEBUG_INFO_DIRS

Also fix tests.
---
 ...acktrace-Allow-configuring-debug-dir.patch | 108 ++++++++++++++++++
 ...upport-multiple-build-id-directories.patch | 101 ++++++++++++++++
 ...port-NIX_DEBUG_INFO_DIRS-environment.patch |  42 +++++++
 .../libraries/libbacktrace/default.nix        |   8 ++
 4 files changed, 259 insertions(+)
 create mode 100644 pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
 create mode 100644 pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
 create mode 100644 pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch

diff --git a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
new file mode 100644
index 000000000000..37da7ef4d964
--- /dev/null
+++ b/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
@@ -0,0 +1,108 @@
+From f409ee343fe6cdc059bb411746f27a515aec66a8 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 24 Dec 2022 16:46:18 +0100
+Subject: [PATCH 2/4] libbacktrace: Allow configuring debug dir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On platforms that do not use FHS like NixOS or GNU Guix,
+the build-id directories are not under `/usr/lib/debug`.
+
+Let’s add `--with-separate-debug-dir` configure flag so that
+the path can be changed. The same flag is supported by gdb:
+
+https://github.com/bminor/binutils-gdb/blob/095f84c7e3cf85cd68c657c46b80be078f336bc9/gdb/configure.ac#L113-L115
+---
+ Makefile.am  | 11 ++++++-----
+ configure.ac |  8 ++++++++
+ elf.c        |  4 ++--
+ 3 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6eab991..da443c1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,8 @@ ACLOCAL_AMFLAGS = -I config
+ 
+ AM_CPPFLAGS =
+ 
+-AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
++AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) \
++	-DSYSTEM_DEBUG_DIR=\"$(SEPARATE_DEBUG_DIR)\"
+ 
+ include_HEADERS = backtrace.h backtrace-supported.h
+ 
+@@ -134,7 +135,7 @@ libbacktrace_noformat_la_DEPENDENCIES = $(libbacktrace_noformat_la_LIBADD)
+ if HAVE_ELF
+ if HAVE_OBJCOPY_DEBUGLINK
+ 
+-TEST_BUILD_ID_DIR=$(abs_builddir)/usr/lib/debug/.build-id/
++TEST_DEBUG_DIR=$(abs_builddir)/usr/lib/debug
+ 
+ check_LTLIBRARIES += libbacktrace_elf_for_test.la
+ 
+@@ -143,8 +144,8 @@ libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \
+ 	$(VIEW_FILE) $(ALLOC_FILE)
+ 
+ elf_for_test.c: elf.c
+-	SEARCH='^#define SYSTEM_BUILD_ID_DIR.*$$'; \
+-	REPLACE="#define SYSTEM_BUILD_ID_DIR \"$(TEST_BUILD_ID_DIR)\""; \
++	SEARCH='^#define BUILD_ID_DIR.*$$'; \
++	REPLACE='\0\n#undef SYSTEM_DEBUG_DIR\n#define SYSTEM_DEBUG_DIR "$(TEST_DEBUG_DIR)"'; \
+ 	$(SED) "s%$$SEARCH%$$REPLACE%" \
+ 		$< \
+ 		> $@.tmp
+@@ -468,7 +469,7 @@ endif HAVE_OBJCOPY_DEBUGLINK
+ 
+ %_buildid: %
+ 	./install-debuginfo-for-buildid.sh \
+-	  "$(TEST_BUILD_ID_DIR)" \
++	  "$(TEST_DEBUG_DIR)/.build-id" \
+ 	  $<
+ 	$(OBJCOPY) --strip-debug $< $@
+ 
+diff --git a/configure.ac b/configure.ac
+index 7f122cb..bb590ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,6 +67,14 @@ AM_MAINTAINER_MODE
+ AC_ARG_WITH(target-subdir,
+ [  --with-target-subdir=SUBDIR      Configuring in a subdirectory for target])
+ 
++AC_ARG_WITH(separate-debug-dir,
++[  --with-separate-debug-dir=DEBUGDIR      Look for global separate debug info in this path @<:@LIBDIR/debug@:>@],
++[separate_debug_dir=$withval],
++[separate_debug_dir=$libdir/debug])
++
++SEPARATE_DEBUG_DIR=$separate_debug_dir
++AC_SUBST(SEPARATE_DEBUG_DIR)
++
+ # We must force CC to /not/ be precious variables; otherwise
+ # the wrong, non-multilib-adjusted value will be used in multilibs.
+ # As a side effect, we have to subst CFLAGS ourselves.
+diff --git a/elf.c b/elf.c
+index e82ecc5..8b1189c 100644
+--- a/elf.c
++++ b/elf.c
+@@ -856,7 +856,7 @@ elf_readlink (struct backtrace_state *state, const char *filename,
+     }
+ }
+ 
+-#define SYSTEM_BUILD_ID_DIR "/usr/lib/debug/.build-id/"
++#define BUILD_ID_DIR "/.build-id/"
+ 
+ /* Open a separate debug info file, using the build ID to find it.
+    Returns an open file descriptor, or -1.
+@@ -870,7 +870,7 @@ elf_open_debugfile_by_buildid (struct backtrace_state *state,
+ 			       backtrace_error_callback error_callback,
+ 			       void *data)
+ {
+-  const char * const prefix = SYSTEM_BUILD_ID_DIR;
++  const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR;
+   const size_t prefix_len = strlen (prefix);
+   const char * const suffix = ".debug";
+   const size_t suffix_len = strlen (suffix);
+-- 
+2.38.1
+
diff --git a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
new file mode 100644
index 000000000000..f223217a8313
--- /dev/null
+++ b/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
@@ -0,0 +1,101 @@
+From de122af5382d8017cae63bdee946206c6c6c23ab Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 24 Dec 2022 20:19:27 +0100
+Subject: [PATCH 3/4] libbacktrace: Support multiple build id directories
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gdb supports multiple debug directories separated by colons:
+https://github.com/bminor/binutils-gdb/blob/fcbfb25dcca625a7f999ec51d48b6fc3a32123c3/gdb/build-id.c#L136-L142
+
+This is useful for example when using dwarffs in addition
+to debug data installed using distribution’s package manager.
+---
+ elf.c | 57 ++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 36 insertions(+), 21 deletions(-)
+
+diff --git a/elf.c b/elf.c
+index 8b1189c..65c647a 100644
+--- a/elf.c
++++ b/elf.c
+@@ -865,12 +865,12 @@ elf_readlink (struct backtrace_state *state, const char *filename,
+    when the build ID is known is in /usr/lib/debug/.build-id.  */
+ 
+ static int
+-elf_open_debugfile_by_buildid (struct backtrace_state *state,
++elf_open_debugfile_by_buildid (const char * const prefix,
++                               struct backtrace_state *state,
+ 			       const char *buildid_data, size_t buildid_size,
+ 			       backtrace_error_callback error_callback,
+ 			       void *data)
+ {
+-  const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR;
+   const size_t prefix_len = strlen (prefix);
+   const char * const suffix = ".debug";
+   const size_t suffix_len = strlen (suffix);
+@@ -6936,27 +6936,42 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
+   if (buildid_data != NULL)
+     {
+       int d;
++      char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1];
++      char *debug_dir;
+ 
+-      d = elf_open_debugfile_by_buildid (state, buildid_data, buildid_size,
+-					 error_callback, data);
+-      if (d >= 0)
+-	{
+-	  int ret;
++      strcpy(debug_directories, SYSTEM_DEBUG_DIR);
+ 
+-	  elf_release_view (state, &buildid_view, error_callback, data);
+-	  if (debuglink_view_valid)
+-	    elf_release_view (state, &debuglink_view, error_callback, data);
+-	  if (debugaltlink_view_valid)
+-	    elf_release_view (state, &debugaltlink_view, error_callback, data);
+-	  ret = elf_add (state, "", d, NULL, 0, base_address, error_callback,
+-			 data, fileline_fn, found_sym, found_dwarf, NULL, 0,
+-			 1, NULL, 0);
+-	  if (ret < 0)
+-	    backtrace_close (d, error_callback, data);
+-	  else if (descriptor >= 0)
+-	    backtrace_close (descriptor, error_callback, data);
+-	  return ret;
+-	}
++      debug_dir = strtok (debug_directories, ":");
++      while (debug_dir != NULL)
++      {
++        char prefix[strlen(debug_dir) + strlen(BUILD_ID_DIR) + 1];
++        strcpy(prefix, debug_dir);
++        strcat(prefix, BUILD_ID_DIR);
++
++        d = elf_open_debugfile_by_buildid (prefix, state, buildid_data, buildid_size,
++                                           error_callback, data);
++
++        if (d >= 0)
++          {
++            int ret;
++
++            elf_release_view (state, &buildid_view, error_callback, data);
++            if (debuglink_view_valid)
++              elf_release_view (state, &debuglink_view, error_callback, data);
++            if (debugaltlink_view_valid)
++              elf_release_view (state, &debugaltlink_view, error_callback, data);
++            ret = elf_add (state, "", d, NULL, 0, base_address, error_callback,
++                           data, fileline_fn, found_sym, found_dwarf, NULL, 0,
++                           1, NULL, 0);
++            if (ret < 0)
++              backtrace_close (d, error_callback, data);
++            else if (descriptor >= 0)
++              backtrace_close (descriptor, error_callback, data);
++            return ret;
++          }
++
++        debug_dir = strtok (NULL, ":");
++      }
+     }
+ 
+   if (buildid_view_valid)
+-- 
+2.38.1
+
diff --git a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
new file mode 100644
index 000000000000..9abbbedb9eaa
--- /dev/null
+++ b/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
@@ -0,0 +1,42 @@
+From a3b7510e4c9e7201a4301f2a45d8569b06354607 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 24 Dec 2022 20:30:22 +0100
+Subject: [PATCH 4/4] libbacktrace: Support NIX_DEBUG_INFO_DIRS environment
+ variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Let’s make debug data lookup work on NixOS just like in gdb.
+---
+ elf.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/elf.c b/elf.c
+index 65c647a..5c8abc0 100644
+--- a/elf.c
++++ b/elf.c
+@@ -6935,11 +6935,18 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
+ 
+   if (buildid_data != NULL)
+     {
++      const char *debug_directories_immutable;
++      const char *nix_debug = getenv ("NIX_DEBUG_INFO_DIRS");
++      if (nix_debug != NULL)
++        debug_directories_immutable = nix_debug;
++      else
++        debug_directories_immutable = SYSTEM_DEBUG_DIR;
++
+       int d;
+-      char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1];
++      char debug_directories[strlen(debug_directories_immutable) + 1];
+       char *debug_dir;
+ 
+-      strcpy(debug_directories, SYSTEM_DEBUG_DIR);
++      strcpy(debug_directories, debug_directories_immutable);
+ 
+       debug_dir = strtok (debug_directories, ":");
+       while (debug_dir != NULL)
+-- 
+2.38.1
+
diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix
index e6572d54f945..bc998563a732 100644
--- a/pkgs/development/libraries/libbacktrace/default.nix
+++ b/pkgs/development/libraries/libbacktrace/default.nix
@@ -22,6 +22,14 @@ stdenv.mkDerivation {
     # Fix tests with shared library.
     # https://github.com/ianlancetaylor/libbacktrace/pull/99
     ./0001-libbacktrace-avoid-libtool-wrapping-tests.patch
+
+    # Support multiple debug dirs.
+    # https://github.com/ianlancetaylor/libbacktrace/pull/100
+    ./0002-libbacktrace-Allow-configuring-debug-dir.patch
+    ./0003-libbacktrace-Support-multiple-build-id-directories.patch
+
+    # Support NIX_DEBUG_INFO_DIRS environment variable.
+    ./0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
   ];
 
   nativeBuildInputs = [

From d6619542978324e80eb949721f4749955034540a Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 7 Mar 2023 15:25:03 +0100
Subject: [PATCH 013/247] outline: 0.67.2 -> 0.68.1

---
 pkgs/servers/web-apps/outline/default.nix |    4 +-
 pkgs/servers/web-apps/outline/yarn.lock   | 1290 +++++++++++----------
 pkgs/servers/web-apps/outline/yarn.nix    |  880 ++++++++------
 3 files changed, 1219 insertions(+), 955 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index c438c7918692..56a8685fd980 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.67.2";
+  version = "0.68.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    sha256 = "sha256-O5t//UwF+AVFxeBQHRIZM5RSf4+DgUE5LHWVRKxJLfc=";
+    sha256 = "sha256-pln3cdozZPEodfXeUtTbBvhHb5yqE4uu0VKA95Zv6ro=";
   };
 
   nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
diff --git a/pkgs/servers/web-apps/outline/yarn.lock b/pkgs/servers/web-apps/outline/yarn.lock
index f5b7c69fd4d8..171fb2712bcf 100644
--- a/pkgs/servers/web-apps/outline/yarn.lock
+++ b/pkgs/servers/web-apps/outline/yarn.lock
@@ -158,7 +158,7 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
   integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
@@ -173,7 +173,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.18.9", "@babel/helper-member-expression-to-functions@^7.20.7":
+"@babel/helper-member-expression-to-functions@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05"
   integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==
@@ -298,7 +298,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
@@ -521,7 +521,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.18.6":
+"@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.7.2":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
   integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
@@ -1013,7 +1013,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.6", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.6", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
   integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
@@ -1560,50 +1560,49 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
-  integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
+"@jest/console@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.4.1.tgz#cbc31d73f6329f693b3d34b365124de797704fff"
+  integrity sha512-m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==
   dependencies:
-    "@jest/types" "^28.1.3"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
+    jest-message-util "^29.4.1"
+    jest-util "^29.4.1"
     slash "^3.0.0"
 
-"@jest/core@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
-  integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
+"@jest/core@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.4.1.tgz#91371179b5959951e211dfaeea4277a01dcca14f"
+  integrity sha512-RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==
   dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/reporters" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/console" "^29.4.1"
+    "@jest/reporters" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@jest/transform" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
-    jest-changed-files "^28.1.3"
-    jest-config "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-resolve-dependencies "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    jest-watcher "^28.1.3"
+    jest-changed-files "^29.4.0"
+    jest-config "^29.4.1"
+    jest-haste-map "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.4.1"
+    jest-resolve-dependencies "^29.4.1"
+    jest-runner "^29.4.1"
+    jest-runtime "^29.4.1"
+    jest-snapshot "^29.4.1"
+    jest-util "^29.4.1"
+    jest-validate "^29.4.1"
+    jest-watcher "^29.4.1"
     micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    rimraf "^3.0.0"
+    pretty-format "^29.4.1"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
@@ -1617,20 +1616,30 @@
     "@types/node" "*"
     jest-mock "^28.1.3"
 
-"@jest/expect-utils@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
-  integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
+"@jest/environment@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.4.1.tgz#52d232a85cdc995b407a940c89c86568f5a88ffe"
+  integrity sha512-pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==
   dependencies:
-    jest-get-type "^28.0.2"
+    "@jest/fake-timers" "^29.4.1"
+    "@jest/types" "^29.4.1"
+    "@types/node" "*"
+    jest-mock "^29.4.1"
 
-"@jest/expect@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
-  integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
+"@jest/expect-utils@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.1.tgz#105b9f3e2c48101f09cae2f0a4d79a1b3a419cbb"
+  integrity sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==
   dependencies:
-    expect "^28.1.3"
-    jest-snapshot "^28.1.3"
+    jest-get-type "^29.2.0"
+
+"@jest/expect@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.4.1.tgz#3338fa20f547bb6e550c4be37d6f82711cc13c38"
+  integrity sha512-ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==
+  dependencies:
+    expect "^29.4.1"
+    jest-snapshot "^29.4.1"
 
 "@jest/fake-timers@^28.1.3":
   version "28.1.3"
@@ -1644,26 +1653,39 @@
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
-"@jest/globals@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
-  integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
+"@jest/fake-timers@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.4.1.tgz#7b673131e8ea2a2045858f08241cace5d518b42b"
+  integrity sha512-/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==
   dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/types" "^29.4.1"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.4.1"
+    jest-mock "^29.4.1"
+    jest-util "^29.4.1"
 
-"@jest/reporters@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
-  integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
+"@jest/globals@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.4.1.tgz#3cd78c5567ab0249f09fbd81bf9f37a7328f4713"
+  integrity sha512-znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==
+  dependencies:
+    "@jest/environment" "^29.4.1"
+    "@jest/expect" "^29.4.1"
+    "@jest/types" "^29.4.1"
+    jest-mock "^29.4.1"
+
+"@jest/reporters@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.4.1.tgz#50d509c08575c75e3cd2176d72ec3786419d5e04"
+  integrity sha512-AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
+    "@jest/console" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@jest/transform" "^29.4.1"
+    "@jest/types" "^29.4.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
     "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
@@ -1675,13 +1697,12 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
+    jest-message-util "^29.4.1"
+    jest-util "^29.4.1"
+    jest-worker "^29.4.1"
     slash "^3.0.0"
     string-length "^4.0.1"
     strip-ansi "^6.0.0"
-    terminal-link "^2.0.0"
     v8-to-istanbul "^9.0.1"
 
 "@jest/schemas@^28.1.3":
@@ -1691,83 +1712,62 @@
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
-"@jest/schemas@^29.0.0":
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
-  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+"@jest/schemas@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz#0d6ad358f295cc1deca0b643e6b4c86ebd539f17"
+  integrity sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==
   dependencies:
-    "@sinclair/typebox" "^0.24.1"
+    "@sinclair/typebox" "^0.25.16"
 
-"@jest/source-map@^28.1.2":
-  version "28.1.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
-  integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
+"@jest/source-map@^29.2.0":
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744"
+  integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.13"
+    "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
-"@jest/test-result@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
-  integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
+"@jest/test-result@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.4.1.tgz#997f19695e13b34779ceb3c288a416bd26c3238d"
+  integrity sha512-WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==
   dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/console" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
-  integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
+"@jest/test-sequencer@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.4.1.tgz#f7a006ec7058b194a10cf833c88282ef86d578fd"
+  integrity sha512-v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==
   dependencies:
-    "@jest/test-result" "^28.1.3"
+    "@jest/test-result" "^29.4.1"
     graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
+    jest-haste-map "^29.4.1"
     slash "^3.0.0"
 
-"@jest/transform@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
-  integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
+"@jest/transform@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.4.1.tgz#e4f517841bb795c7dcdee1ba896275e2c2d26d4a"
+  integrity sha512-5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.1"
-
-"@jest/transform@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
-  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.1"
     "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
+    jest-haste-map "^29.4.1"
     jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
+    jest-util "^29.4.1"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^5.0.0"
 
 "@jest/types@^28.1.3":
   version "28.1.3"
@@ -1781,12 +1781,12 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jest/types@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
-  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+"@jest/types@^29.4.1":
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.1.tgz#f9f83d0916f50696661da72766132729dcb82ecb"
+  integrity sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.4.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
@@ -2125,7 +2125,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -2315,6 +2315,37 @@
     "@babel/runtime" "^7.13.10"
     csstype "^3.0.4"
 
+"@radix-ui/react-compose-refs@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz#37595b1f16ec7f228d698590e78eeed18ff218ae"
+  integrity sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-portal@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.1.tgz#169c5a50719c2bb0079cf4c91a27aa6d37e5dd33"
+  integrity sha512-NY2vUWI5WENgAT1nfC6JS7RU5xRYBfjZVLq0HmgEN1Ezy3rk/UruMV4+Rd0F40PEaFC5SrLS1ixYvcYIQrb4Ig==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.1"
+
+"@radix-ui/react-primitive@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.1.tgz#c1ebcce283dd2f02e4fbefdaa49d1cb13dbc990a"
+  integrity sha512-fHbmislWVkZaIdeF6GZxF0A/NH/3BjrGIYj+Ae6eTmTCr7EB0RQAAVEiqsXK6p3/JcRqVSBQoceZroj30Jj3XA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-slot" "1.0.1"
+
+"@radix-ui/react-slot@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.1.tgz#e7868c669c974d649070e9ecbec0b367ee0b4d81"
+  integrity sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "1.0.0"
+
 "@radix-ui/react-use-rect@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-0.1.1.tgz#6c15384beee59c086e75b89a7e66f3d2e583a856"
@@ -2342,22 +2373,6 @@
   resolved "https://registry.yarnpkg.com/@reach/observe-rect/-/observe-rect-1.2.0.tgz#d7a6013b8aafcc64c778a0ccb83355a11204d3b2"
   integrity sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ==
 
-"@reach/portal@^0.16.0":
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.16.0.tgz#1544531d978b770770b718b2872b35652a11e7e3"
-  integrity sha512-vXJ0O9T+72HiSEWHPs2cx7YbSO7pQsTMhgqPc5aaddIYpo2clJx1PnYuS0lSNlVaDO0IxQhwYq43evXaXnmviw==
-  dependencies:
-    "@reach/utils" "0.16.0"
-    tslib "^2.3.0"
-
-"@reach/utils@0.16.0":
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.16.0.tgz#5b0777cf16a7cab1ddd4728d5d02762df0ba84ce"
-  integrity sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==
-  dependencies:
-    tiny-warning "^1.0.3"
-    tslib "^2.3.0"
-
 "@react-aria/focus@^3.8.0":
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.8.0.tgz#b292df7e35ed1b57af43f98df8135b00c4667d17"
@@ -2456,30 +2471,20 @@
     "@react-types/shared" "^3.14.1"
     clsx "^1.1.1"
 
-"@react-dnd/asap@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651"
-  integrity sha512-0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ==
-
 "@react-dnd/asap@^5.0.1":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-5.0.2.tgz#1f81f124c1cd6f39511c11a881cfb0f715343488"
   integrity sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==
 
-"@react-dnd/invariant@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-2.0.0.tgz#09d2e81cd39e0e767d7da62df9325860f24e517e"
-  integrity sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw==
-
 "@react-dnd/invariant@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-4.0.2.tgz#b92edffca10a26466643349fac7cdfb8799769df"
   integrity sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==
 
-"@react-dnd/shallowequal@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
-  integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
+"@react-dnd/shallowequal@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4"
+  integrity sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==
 
 "@react-stately/radio@^3.5.1":
   version "3.5.1"
@@ -2692,6 +2697,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.27.tgz#d55643516a1546174e10da681a8aaa81e757452d"
   integrity sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==
 
+"@sinclair/typebox@^0.25.16":
+  version "0.25.21"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
+  integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -2699,6 +2709,20 @@
   dependencies:
     type-detect "4.0.8"
 
+"@sinonjs/commons@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
+  integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c"
+  integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==
+  dependencies:
+    "@sinonjs/commons" "^2.0.0"
+
 "@sinonjs/fake-timers@^9.1.2":
   version "9.1.2"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
@@ -2949,11 +2973,12 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^9.0.13":
-  version "9.0.13"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
-  integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
+"@types/fs-extra@^11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.1.tgz#f542ec47810532a8a252127e6e105f487e0a6ea5"
+  integrity sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==
   dependencies:
+    "@types/jsonfile" "*"
     "@types/node" "*"
 
 "@types/fuzzy-search@^2.1.2":
@@ -2961,6 +2986,14 @@
   resolved "https://registry.yarnpkg.com/@types/fuzzy-search/-/fuzzy-search-2.1.2.tgz#d57b2af8fb723baa1792d40d511f431c4c8f75af"
   integrity sha512-YOqA50Z3xcycm4Br5+MBUpSumfdOAcv34A8A8yFn62zBQPTzJSXQk11qYE5w8BWQ0KrVThXUgEQh7ZLrYI1NaQ==
 
+"@types/glob@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.1.tgz#6e3041640148b7764adf21ce5c7138ad454725b0"
+  integrity sha512-8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
 "@types/google.analytics@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/google.analytics/-/google.analytics-0.0.42.tgz#efe6ef9251a22ec8208dbb09f221a48a1863d720"
@@ -3066,6 +3099,13 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/jsonfile@*":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.1.tgz#ac84e9aefa74a2425a0fb3012bdea44f58970f1b"
+  integrity sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==
+  dependencies:
+    "@types/node" "*"
+
 "@types/jsonwebtoken@^8.5.8":
   version "8.5.8"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz#01b39711eb844777b7af1d1f2b4cf22fda1c0c44"
@@ -3226,6 +3266,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
+"@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
 "@types/ms@*":
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
@@ -3716,14 +3761,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840"
-  integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==
+"@typescript-eslint/parser@^5.48.1":
+  version "5.48.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.48.1.tgz#d0125792dab7e232035434ab8ef0658154db2f10"
+  integrity sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.40.0"
-    "@typescript-eslint/types" "5.40.0"
-    "@typescript-eslint/typescript-estree" "5.40.0"
+    "@typescript-eslint/scope-manager" "5.48.1"
+    "@typescript-eslint/types" "5.48.1"
+    "@typescript-eslint/typescript-estree" "5.48.1"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.40.0":
@@ -3734,6 +3779,14 @@
     "@typescript-eslint/types" "5.40.0"
     "@typescript-eslint/visitor-keys" "5.40.0"
 
+"@typescript-eslint/scope-manager@5.48.1":
+  version "5.48.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz#39c71e4de639f5fe08b988005beaaf6d79f9d64d"
+  integrity sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==
+  dependencies:
+    "@typescript-eslint/types" "5.48.1"
+    "@typescript-eslint/visitor-keys" "5.48.1"
+
 "@typescript-eslint/type-utils@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126"
@@ -3749,6 +3802,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
   integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
 
+"@typescript-eslint/types@5.48.1":
+  version "5.48.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.1.tgz#efd1913a9aaf67caf8a6e6779fd53e14e8587e14"
+  integrity sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==
+
 "@typescript-eslint/typescript-estree@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
@@ -3762,6 +3820,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.48.1":
+  version "5.48.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz#9efa8ee2aa471c6ab62e649f6e64d8d121bc2056"
+  integrity sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==
+  dependencies:
+    "@typescript-eslint/types" "5.48.1"
+    "@typescript-eslint/visitor-keys" "5.48.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772"
@@ -3783,6 +3854,14 @@
     "@typescript-eslint/types" "5.40.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.48.1":
+  version "5.48.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz#79fd4fb9996023ef86849bf6f904f33eb6c8fccb"
+  integrity sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==
+  dependencies:
+    "@typescript-eslint/types" "5.48.1"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -4463,28 +4542,15 @@ babel-helper-get-function-arity@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
-  integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
+babel-jest@^29.3.1, babel-jest@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.4.1.tgz#01fa167e27470b35c2d4a1b841d9586b1764da19"
+  integrity sha512-xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==
   dependencies:
-    "@jest/transform" "^28.1.3"
+    "@jest/transform" "^29.4.1"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^28.1.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
-babel-jest@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44"
-  integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==
-  dependencies:
-    "@jest/transform" "^29.3.1"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.2.0"
+    babel-preset-jest "^29.4.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
@@ -4525,20 +4591,10 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
-  integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-jest-hoist@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
-  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
+babel-plugin-jest-hoist@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz#3fd3dfcedf645932df6d0c9fc3d9a704dd860248"
+  integrity sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -4668,20 +4724,12 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
-  integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
+babel-preset-jest@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz#c2b03c548b02dea0a18ae21d5759c136f9251ee4"
+  integrity sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==
   dependencies:
-    babel-plugin-jest-hoist "^28.1.3"
-    babel-preset-current-node-syntax "^1.0.0"
-
-babel-preset-jest@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
-  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
-  dependencies:
-    babel-plugin-jest-hoist "^29.2.0"
+    babel-plugin-jest-hoist "^29.4.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
@@ -4841,6 +4889,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -4857,7 +4912,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -5545,7 +5600,7 @@ color@3.0.x:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colorette@^2.0.14, colorette@^2.0.16:
+colorette@^2.0.14, colorette@^2.0.19:
   version "2.0.19"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
@@ -5575,6 +5630,11 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
+command-score@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/command-score/-/command-score-0.1.2.tgz#b986ad7e8c0beba17552a56636c44ae38363d381"
+  integrity sha512-VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w==
+
 commander@7, commander@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -5590,7 +5650,7 @@ commander@^4.0.1, commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^8.0.0, commander@^8.3.0:
+commander@^8.0.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
@@ -5736,7 +5796,7 @@ content-type@^1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -5754,9 +5814,9 @@ cookie@^0.4.1, cookie@~0.4.1:
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
 cookiejar@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
-  integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
+  integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
 
 cookies@~0.8.0:
   version "0.8.0"
@@ -6581,6 +6641,11 @@ diff-sequences@^28.1.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
+diff-sequences@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
+  integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -6612,15 +6677,6 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
-dnd-core@14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-14.0.0.tgz#973ab3470d0a9ac5a0fa9021c4feba93ad12347d"
-  integrity sha512-wTDYKyjSqWuYw3ZG0GJ7k+UIfzxTNoZLjDrut37PbcPGNfwhlKYlPUqjAKUjOOv80izshUiqusaKgJPItXSevA==
-  dependencies:
-    "@react-dnd/asap" "^4.0.0"
-    "@react-dnd/invariant" "^2.0.0"
-    redux "^4.0.5"
-
 dnd-core@^16.0.1:
   version "16.0.1"
   resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-16.0.1.tgz#a1c213ed08961f6bd1959a28bb76f1a868360d19"
@@ -6888,10 +6944,10 @@ email-providers@^1.13.1:
   resolved "https://registry.yarnpkg.com/email-providers/-/email-providers-1.13.1.tgz#dfaea33a7744035510f0f64ed44098e7077f68c9"
   integrity sha512-+BPUngcWMy9piqS33yeOcqJXYhIxet94UbK1B/uDOGfjLav4YlDAf9/RhplRypSDBSKx92STNH0PcwgCJnNATw==
 
-emittery@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
-  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@*, emoji-regex@^10.0.0:
   version "10.0.0"
@@ -7577,7 +7633,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^5.0.0, execa@^5.1.1:
+execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -7592,6 +7648,21 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20"
+  integrity sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^3.0.1"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
 exif-parser@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
@@ -7615,16 +7686,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
-  integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
+expect@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.1.tgz#58cfeea9cbf479b64ed081fd1e074ac8beb5a1fe"
+  integrity sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==
   dependencies:
-    "@jest/expect-utils" "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
+    "@jest/expect-utils" "^29.4.1"
+    jest-get-type "^29.2.0"
+    jest-matcher-utils "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-util "^29.4.1"
 
 exports-loader@^1.1.1:
   version "1.1.1"
@@ -8049,6 +8120,15 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
+  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
@@ -8058,15 +8138,6 @@ fs-extra@^3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.0.1, fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -8245,7 +8316,7 @@ get-port@^5.1.1:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -8331,6 +8402,17 @@ glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
@@ -8790,6 +8872,11 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+human-signals@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5"
+  integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==
+
 humanize-number@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/humanize-number/-/humanize-number-0.0.2.tgz#11c0af6a471643633588588048f1799541489c18"
@@ -8909,10 +8996,10 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+immutable@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz#83260d50889526b4b531a5e293709a77f7c55a2a"
+  integrity sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.2"
@@ -9384,6 +9471,11 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -9557,82 +9649,82 @@ java-properties@^1.0.0:
   resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
   integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==
 
-jest-changed-files@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
-  integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
+jest-changed-files@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.4.0.tgz#ac2498bcd394228f7eddcadcf928b3583bf2779d"
+  integrity sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==
   dependencies:
     execa "^5.0.0"
     p-limit "^3.1.0"
 
-jest-circus@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
-  integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
+jest-circus@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.4.1.tgz#ff1b63eb04c3b111cefea9489e8dbadd23ce49bd"
+  integrity sha512-v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==
   dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/environment" "^29.4.1"
+    "@jest/expect" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
     is-generator-fn "^2.0.0"
-    jest-each "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
+    jest-each "^29.4.1"
+    jest-matcher-utils "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-runtime "^29.4.1"
+    jest-snapshot "^29.4.1"
+    jest-util "^29.4.1"
     p-limit "^3.1.0"
-    pretty-format "^28.1.3"
+    pretty-format "^29.4.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
-  integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
+jest-cli@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.4.1.tgz#7abef96944f300feb9b76f68b1eb2d68774fe553"
+  integrity sha512-jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==
   dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/core" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@jest/types" "^29.4.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
+    jest-config "^29.4.1"
+    jest-util "^29.4.1"
+    jest-validate "^29.4.1"
     prompts "^2.0.1"
     yargs "^17.3.1"
 
-jest-config@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
-  integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
+jest-config@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.4.1.tgz#e62670c6c980ec21d75941806ec4d0c0c6402728"
+  integrity sha512-g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    babel-jest "^28.1.3"
+    "@jest/test-sequencer" "^29.4.1"
+    "@jest/types" "^29.4.1"
+    babel-jest "^29.4.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-circus "^28.1.3"
-    jest-environment-node "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
+    jest-circus "^29.4.1"
+    jest-environment-node "^29.4.1"
+    jest-get-type "^29.2.0"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.4.1"
+    jest-runner "^29.4.1"
+    jest-util "^29.4.1"
+    jest-validate "^29.4.1"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^28.1.3"
+    pretty-format "^29.4.1"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
@@ -9646,23 +9738,33 @@ jest-diff@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-docblock@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
-  integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
+jest-diff@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.1.tgz#9a6dc715037e1fa7a8a44554e7d272088c4029bd"
+  integrity sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.4.1"
+
+jest-docblock@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82"
+  integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
-  integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
+jest-each@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.4.1.tgz#05ce9979e7486dbd0f5d41895f49ccfdd0afce01"
+  integrity sha512-QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==
   dependencies:
-    "@jest/types" "^28.1.3"
+    "@jest/types" "^29.4.1"
     chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    jest-util "^28.1.3"
-    pretty-format "^28.1.3"
+    jest-get-type "^29.2.0"
+    jest-util "^29.4.1"
+    pretty-format "^29.4.1"
 
 jest-environment-jsdom@^28.1.3:
   version "28.1.3"
@@ -9678,17 +9780,17 @@ jest-environment-jsdom@^28.1.3:
     jest-util "^28.1.3"
     jsdom "^19.0.0"
 
-jest-environment-node@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
-  integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
+jest-environment-node@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.4.1.tgz#22550b7d0f8f0b16228639c9f88ca04bbf3c1974"
+  integrity sha512-x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==
   dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/environment" "^29.4.1"
+    "@jest/fake-timers" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
+    jest-mock "^29.4.1"
+    jest-util "^29.4.1"
 
 jest-fetch-mock@^3.0.3:
   version "3.0.3"
@@ -9703,53 +9805,39 @@ jest-get-type@^28.0.2:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
   integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
 
-jest-haste-map@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
-  integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
+jest-get-type@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
+  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-haste-map@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
-  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
+jest-haste-map@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.4.1.tgz#b0579dc82d94b40ed9041af56ad25c2f80bedaeb"
+  integrity sha512-imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.1"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
     jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-util "^29.4.1"
+    jest-worker "^29.4.1"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-leak-detector@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
-  integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
+jest-leak-detector@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.4.1.tgz#632186c546e084da2b490b7496fee1a1c9929637"
+  integrity sha512-akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==
   dependencies:
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.4.1"
 
-jest-matcher-utils@^28.0.0, jest-matcher-utils@^28.1.3:
+jest-matcher-utils@^28.0.0:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
   integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
@@ -9759,6 +9847,16 @@ jest-matcher-utils@^28.0.0, jest-matcher-utils@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
+jest-matcher-utils@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz#73d834e305909c3b43285fbc76f78bf0ad7e1954"
+  integrity sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.4.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.4.1"
+
 jest-message-util@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
@@ -9774,6 +9872,21 @@ jest-message-util@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.1.tgz#522623aa1df9a36ebfdffb06495c7d9d19e8a845"
+  integrity sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.4.1"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.4.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
@@ -9782,126 +9895,132 @@ jest-mock@^28.1.3:
     "@jest/types" "^28.1.3"
     "@types/node" "*"
 
+jest-mock@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.4.1.tgz#a218a2abf45c99c501d4665207748a6b9e29afbd"
+  integrity sha512-MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==
+  dependencies:
+    "@jest/types" "^29.4.1"
+    "@types/node" "*"
+    jest-util "^29.4.1"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
-  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
-
 jest-regex-util@^29.2.0:
   version "29.2.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
   integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
 
-jest-resolve-dependencies@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
-  integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
+jest-resolve-dependencies@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.1.tgz#02420a2e055da105e5fca8218c471d8b9553c904"
+  integrity sha512-Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==
   dependencies:
-    jest-regex-util "^28.0.2"
-    jest-snapshot "^28.1.3"
+    jest-regex-util "^29.2.0"
+    jest-snapshot "^29.4.1"
 
-jest-resolve@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
-  integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
+jest-resolve@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.4.1.tgz#4c6bf71a07b8f0b79c5fdf4f2a2cf47317694c5e"
+  integrity sha512-j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==
   dependencies:
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
+    jest-haste-map "^29.4.1"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
+    jest-util "^29.4.1"
+    jest-validate "^29.4.1"
     resolve "^1.20.0"
-    resolve.exports "^1.1.0"
+    resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
-  integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
+jest-runner@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.4.1.tgz#57460d9ebb0eea2e27eeddca1816cf8537469661"
+  integrity sha512-8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==
   dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/environment" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/console" "^29.4.1"
+    "@jest/environment" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@jest/transform" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.10.2"
+    emittery "^0.13.1"
     graceful-fs "^4.2.9"
-    jest-docblock "^28.1.1"
-    jest-environment-node "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-leak-detector "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-resolve "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-util "^28.1.3"
-    jest-watcher "^28.1.3"
-    jest-worker "^28.1.3"
+    jest-docblock "^29.2.0"
+    jest-environment-node "^29.4.1"
+    jest-haste-map "^29.4.1"
+    jest-leak-detector "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-resolve "^29.4.1"
+    jest-runtime "^29.4.1"
+    jest-util "^29.4.1"
+    jest-watcher "^29.4.1"
+    jest-worker "^29.4.1"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
-  integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
+jest-runtime@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.4.1.tgz#9a50f9c69d3a391690897c01b0bfa8dc5dd45808"
+  integrity sha512-UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==
   dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/globals" "^28.1.3"
-    "@jest/source-map" "^28.1.2"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/environment" "^29.4.1"
+    "@jest/fake-timers" "^29.4.1"
+    "@jest/globals" "^29.4.1"
+    "@jest/source-map" "^29.2.0"
+    "@jest/test-result" "^29.4.1"
+    "@jest/transform" "^29.4.1"
+    "@jest/types" "^29.4.1"
+    "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
+    jest-haste-map "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-mock "^29.4.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.4.1"
+    jest-snapshot "^29.4.1"
+    jest-util "^29.4.1"
+    semver "^7.3.5"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
-  integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
+jest-snapshot@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.4.1.tgz#5692210b3690c94f19317913d4082b123bd83dd9"
+  integrity sha512-l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==
   dependencies:
     "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/expect-utils" "^29.4.1"
+    "@jest/transform" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^28.1.3"
+    expect "^29.4.1"
     graceful-fs "^4.2.9"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-haste-map "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
+    jest-diff "^29.4.1"
+    jest-get-type "^29.2.0"
+    jest-haste-map "^29.4.1"
+    jest-matcher-utils "^29.4.1"
+    jest-message-util "^29.4.1"
+    jest-util "^29.4.1"
     natural-compare "^1.4.0"
-    pretty-format "^28.1.3"
+    pretty-format "^29.4.1"
     semver "^7.3.5"
 
 jest-util@^28.1.3:
@@ -9916,42 +10035,42 @@ jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-util@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
-  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
+jest-util@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.1.tgz#2eeed98ff4563b441b5a656ed1a786e3abc3e4c4"
+  integrity sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
-  integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
+jest-validate@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.4.1.tgz#0d5174510415083ec329d4f981bf6779211f17e9"
+  integrity sha512-qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==
   dependencies:
-    "@jest/types" "^28.1.3"
+    "@jest/types" "^29.4.1"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^28.0.2"
+    jest-get-type "^29.2.0"
     leven "^3.1.0"
-    pretty-format "^28.1.3"
+    pretty-format "^29.4.1"
 
-jest-watcher@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
-  integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
+jest-watcher@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.4.1.tgz#6e3e2486918bd778849d4d6e67fd77b814f3e6ed"
+  integrity sha512-vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==
   dependencies:
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
+    "@jest/test-result" "^29.4.1"
+    "@jest/types" "^29.4.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    emittery "^0.10.2"
-    jest-util "^28.1.3"
+    emittery "^0.13.1"
+    jest-util "^29.4.1"
     string-length "^4.0.1"
 
 jest-worker@^26.2.1, jest-worker@^26.5.0:
@@ -9963,22 +10082,13 @@ jest-worker@^26.2.1, jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
+jest-worker@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.4.1.tgz#7cb4a99a38975679600305650f86f4807460aab1"
+  integrity sha512-O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==
   dependencies:
     "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest-worker@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
-  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
-  dependencies:
-    "@types/node" "*"
-    jest-util "^29.3.1"
+    jest-util "^29.4.1"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
@@ -10238,14 +10348,14 @@ katex@^0.16.4:
   dependencies:
     commander "^8.0.0"
 
-kbar@0.1.0-beta.28:
-  version "0.1.0-beta.28"
-  resolved "https://registry.yarnpkg.com/kbar/-/kbar-0.1.0-beta.28.tgz#35bcf1d45996f5b0cf32f4f70f673c97dc67a1f8"
-  integrity sha512-JmwZUO8fG1irDWqYIUKnoaAXT6t0QxCbmAEBNgHgXWeYFmk9CvhFWwAiFxtSfVX7d+efSTUf93KVrcd2Y61Zaw==
+kbar@0.1.0-beta.40:
+  version "0.1.0-beta.40"
+  resolved "https://registry.yarnpkg.com/kbar/-/kbar-0.1.0-beta.40.tgz#89747e3c1538375fef779af986b6614bb441ae7c"
+  integrity sha512-vEV02WuEBvKaSivO2DnNtyd3gUAbruYrZCax5fXcLcVTFV6q0/w6Ew3z6Qy+AqXxbZdWguwQ3POIwgdHevp+6A==
   dependencies:
-    "@reach/portal" "^0.16.0"
+    "@radix-ui/react-portal" "^1.0.1"
+    command-score "^0.1.2"
     fast-equals "^2.0.3"
-    match-sorter "^6.3.0"
     react-virtual "^2.8.2"
     tiny-invariant "^1.2.0"
 
@@ -10405,10 +10515,10 @@ koa-send@5.0.1, koa-send@^5.0.0:
     http-errors "^1.7.3"
     resolve-path "^1.4.0"
 
-koa-sslify@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/koa-sslify/-/koa-sslify-5.0.0.tgz#f3047de9afc92ad960208cea87fcac43795791a7"
-  integrity sha512-3Qc/DxPcH4BavYkt7xOVDFbaS7nR8oCozb/0dlIpLlyGVhFXcjHETWBwE3QrDLwjKOVJj6ykwRJoNzPT9QxCag==
+koa-sslify@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/koa-sslify/-/koa-sslify-5.0.1.tgz#b94ffead65a3e239a0324ff7516cb0fde996a1e1"
+  integrity sha512-QwQgMvNPyePpngghYZxeuPzeQqMOFYUXiKu8pd4wz9rd7ZmoOq4VKtoEIjctLt3Qcfv2aHL/0UIRAmIK4qDczg==
 
 koa-static@^5.0.0:
   version "5.0.0"
@@ -10558,12 +10668,7 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lilconfig@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
-  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
-
-lilconfig@^2.0.6:
+lilconfig@2.0.6, lilconfig@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
@@ -10585,25 +10690,24 @@ linkify-it@^4.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-lint-staged@^12.3.8:
-  version "12.3.8"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.8.tgz#ee3fe2e16c9d76f99d8348072900b017d6d76901"
-  integrity sha512-0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==
+lint-staged@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.1.0.tgz#d4c61aec939e789e489fa51987ec5207b50fd37e"
+  integrity sha512-pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==
   dependencies:
     cli-truncate "^3.1.0"
-    colorette "^2.0.16"
-    commander "^8.3.0"
-    debug "^4.3.3"
-    execa "^5.1.1"
-    lilconfig "2.0.4"
-    listr2 "^4.0.1"
-    micromatch "^4.0.4"
+    colorette "^2.0.19"
+    commander "^9.4.1"
+    debug "^4.3.4"
+    execa "^6.1.0"
+    lilconfig "2.0.6"
+    listr2 "^5.0.5"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
-    object-inspect "^1.12.0"
-    pidtree "^0.5.0"
+    object-inspect "^1.12.2"
+    pidtree "^0.6.0"
     string-argv "^0.3.1"
-    supports-color "^9.2.1"
-    yaml "^1.10.2"
+    yaml "^2.1.3"
 
 list-stylesheets@^2.0.0:
   version "2.0.0"
@@ -10613,17 +10717,17 @@ list-stylesheets@^2.0.0:
     cheerio "1.0.0-rc.10"
     pick-util "^1.1.4"
 
-listr2@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
-  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
+listr2@^5.0.5:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-5.0.7.tgz#de69ccc4caf6bea7da03c74f7a2ffecf3904bd53"
+  integrity sha512-MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw==
   dependencies:
     cli-truncate "^2.1.0"
-    colorette "^2.0.16"
+    colorette "^2.0.19"
     log-update "^4.0.0"
     p-map "^4.0.0"
     rfdc "^1.3.0"
-    rxjs "^7.5.5"
+    rxjs "^7.8.0"
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
@@ -10936,14 +11040,6 @@ markdown-it@^13.0.1:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-match-sorter@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
-  integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    remove-accents "0.4.2"
-
 matcher-collection@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
@@ -11067,13 +11163,13 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+micromatch@^4.0.4, micromatch@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -11115,6 +11211,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 min-document@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@@ -11147,6 +11248,13 @@ minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
@@ -11542,6 +11650,13 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
+  integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==
+  dependencies:
+    path-key "^4.0.0"
+
 nth-check@^2.0.0, nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -11580,10 +11695,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.12.0, object-inspect@^1.7.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.7.0, object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
 object-is@^1.0.2, object-is@^1.1.2:
   version "1.1.5"
@@ -11691,6 +11806,13 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 only@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
@@ -12085,6 +12207,11 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -12218,15 +12345,15 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pidtree@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.5.0.tgz#ad5fbc1de78b8a5f99d6fbdd4f6e4eee21d1aca1"
-  integrity sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==
+pidtree@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
+  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
 
 pify@^4.0.1:
   version "4.0.1"
@@ -12420,6 +12547,15 @@ pretty-format@^28.0.0, pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.4.1:
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.1.tgz#0da99b532559097b8254298da7c75a0785b1751c"
+  integrity sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==
+  dependencies:
+    "@jest/schemas" "^29.4.0"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5"
@@ -12885,14 +13021,14 @@ react-dnd-html5-backend@^16.0.1:
   dependencies:
     dnd-core "^16.0.1"
 
-react-dnd@^14.0.1:
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-14.0.1.tgz#012a855b0fb35a27c7c84aba7ff6c495e0baddb2"
-  integrity sha512-r57KKBfmAYTwmQ/cREQehNjEX9U9Xi4AUWykLX92fB9JkY9z90DMWZhSE1M7o6Y71Y2/a2SBvSPQ385QboNrIQ==
+react-dnd@^16.0.1:
+  version "16.0.1"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-16.0.1.tgz#2442a3ec67892c60d40a1559eef45498ba26fa37"
+  integrity sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==
   dependencies:
-    "@react-dnd/invariant" "^2.0.0"
-    "@react-dnd/shallowequal" "^2.0.0"
-    dnd-core "14.0.0"
+    "@react-dnd/invariant" "^4.0.1"
+    "@react-dnd/shallowequal" "^4.0.1"
+    dnd-core "^16.0.1"
     fast-deep-equal "^3.1.3"
     hoist-non-react-statics "^3.3.2"
 
@@ -12934,12 +13070,12 @@ react-hook-form@^7.41.5:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.41.5.tgz#dcd0e7438c15044eadc99df6deb889da5858a03b"
   integrity sha512-DAKjSJ7X9f16oQrP3TW2/eD9N6HOgrmIahP4LOdFphEWVfGZ2LulFd6f6AQ/YS/0cx/5oc4j8a1PXxuaurWp/Q==
 
-react-i18next@^12.1.1:
-  version "12.1.1"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.1.1.tgz#2626cdbfe6bcb76ef833861c0184a5c4e5e3c089"
-  integrity sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==
+react-i18next@^12.1.5:
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.1.5.tgz#b65f5733dd2f96188a9359c009b7dbe27443f009"
+  integrity sha512-7PQAv6DA0TcStG96fle+8RfTwxVbHVlZZJPoEszwUNvDuWpGldJmNWa3ZPesEsZQZGF6GkzwvEh6p57qpFD2gQ==
   dependencies:
-    "@babel/runtime" "^7.14.5"
+    "@babel/runtime" "^7.20.6"
     html-parse-stringify "^3.0.1"
 
 react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
@@ -13215,7 +13351,7 @@ redis@^3.0.0:
     redis-errors "^1.2.0"
     redis-parser "^3.0.0"
 
-redux@^4.0.5, redux@^4.2.0:
+redux@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
@@ -13330,11 +13466,6 @@ remote-content@^3.0.0:
     superagent "^7.0.2"
     superagent-proxy "^3.0.0"
 
-remove-accents@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
-  integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
-
 remove-bom-buffer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
@@ -13462,10 +13593,10 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+resolve.exports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
+  integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
 resolve@^1.1.6, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0:
   version "1.22.1"
@@ -13616,10 +13747,10 @@ rw@1:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
-rxjs@^7.0.0, rxjs@^7.5.5:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc"
-  integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==
+rxjs@^7.0.0, rxjs@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
+  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
   dependencies:
     tslib "^2.1.0"
 
@@ -13782,10 +13913,10 @@ sequelize-pool@^7.1.0:
   resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-7.1.0.tgz#210b391af4002762f823188fd6ecfc7413020768"
   integrity sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==
 
-sequelize-typescript@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-2.1.3.tgz#94a8d0a4b5739fc917c8d8fa66e1acb5aadc1274"
-  integrity sha512-0mejGAaLywuCoOOLSXCQs2sMBNudU/QtWZkGY5VT2dfTHToXZi5bOxCa3/CukNNk7wJwXnLuIdeHdlqjvVoj1g==
+sequelize-typescript@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-2.1.5.tgz#f12d14607cc8abfd6172cd99f7d3255ec5c4d78e"
+  integrity sha512-x1CNODct8gJyfZPwEZBU5uVGNwgJI2Fda913ZxD5ZtCSRyTDPBTS/0uXciF+MlCpyqjpmoCAPtudQWzw579bzA==
   dependencies:
     glob "7.2.0"
 
@@ -14513,6 +14644,11 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -14633,19 +14769,6 @@ supports-color@^8.0.0, supports-color@^8.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^9.2.1:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.2.tgz#502acaf82f2b7ee78eb7c83dcac0f89694e5a7bb"
-  integrity sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==
-
-supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -14724,14 +14847,6 @@ tempy@^0.6.0:
     type-fest "^0.16.0"
     unique-string "^2.0.0"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
@@ -14873,10 +14988,10 @@ timm@^1.6.1:
   resolved "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz#96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f"
   integrity sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==
 
-tiny-cookie@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tiny-cookie/-/tiny-cookie-2.3.2.tgz#3b5fb4e0888cfa0b4728d5f6b7be3d3a88e6a5f0"
-  integrity sha512-qbymkVh+6+Gc/c9sqnvbG+dOHH6bschjphK3SHgIfT6h/t+63GBL37JXNoXEc6u/+BcwU6XmaWUuf19ouLVtPg==
+tiny-cookie@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tiny-cookie/-/tiny-cookie-2.4.0.tgz#f2f2d4c2b1714cbb28ded23a7024e026c02b4a4a"
+  integrity sha512-MbXgqX1JwuaOgHWIM7KsEryxIHSpRchroXh/fy67mw2XLPvrpZvQ2j85zSf8bLpRhTztLnOtOkVSKytJPo1ATA==
 
 tiny-glob@^0.2.9:
   version "0.2.9"
@@ -15073,7 +15188,7 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1:
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.4.0, tslib@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
@@ -16103,10 +16218,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+write-file-atomic@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0"
+  integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
@@ -16236,11 +16351,16 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.10.2:
+yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^2.1.3:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.1.tgz#3014bf0482dcd15147aa8e56109ce8632cd60ce4"
+  integrity sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==
+
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -16304,7 +16424,7 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zod@^3.19.1:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.19.1.tgz#112f074a97b50bfc4772d4ad1576814bd8ac4473"
-  integrity sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==
+zod@^3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.20.2.tgz#068606642c8f51b3333981f91c0a8ab37dfc2807"
+  integrity sha512-1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ==
diff --git a/pkgs/servers/web-apps/outline/yarn.nix b/pkgs/servers/web-apps/outline/yarn.nix
index 6e2aa068aeab..2561cf919182 100644
--- a/pkgs/servers/web-apps/outline/yarn.nix
+++ b/pkgs/servers/web-apps/outline/yarn.nix
@@ -1538,19 +1538,19 @@
       };
     }
     {
-      name = "_jest_console___console_28.1.3.tgz";
+      name = "_jest_console___console_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_console___console_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz";
-        sha512 = "QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==";
+        name = "_jest_console___console_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/console/-/console-29.4.1.tgz";
+        sha512 = "m+XpwKSi3PPM9znm5NGS8bBReeAJJpSkL1OuFCqaMaJL2YX9YXLkkI+MBchMPwu+ZuM2rynL51sgfkQteQ1CKQ==";
       };
     }
     {
-      name = "_jest_core___core_28.1.3.tgz";
+      name = "_jest_core___core_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_core___core_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz";
-        sha512 = "CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==";
+        name = "_jest_core___core_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/core/-/core-29.4.1.tgz";
+        sha512 = "RXFTohpBqpaTebNdg5l3I5yadnKo9zLBajMT0I38D0tDhreVBYv3fA8kywthI00sWxPztWLD3yjiUkewwu/wKA==";
       };
     }
     {
@@ -1562,19 +1562,27 @@
       };
     }
     {
-      name = "_jest_expect_utils___expect_utils_28.1.3.tgz";
+      name = "_jest_environment___environment_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_expect_utils___expect_utils_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz";
-        sha512 = "wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==";
+        name = "_jest_environment___environment_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/environment/-/environment-29.4.1.tgz";
+        sha512 = "pJ14dHGSQke7Q3mkL/UZR9ZtTOxqskZaC91NzamEH4dlKRt42W+maRBXiw/LWkdJe+P0f/zDR37+SPMplMRlPg==";
       };
     }
     {
-      name = "_jest_expect___expect_28.1.3.tgz";
+      name = "_jest_expect_utils___expect_utils_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_expect___expect_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz";
-        sha512 = "lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==";
+        name = "_jest_expect_utils___expect_utils_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.1.tgz";
+        sha512 = "w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ==";
+      };
+    }
+    {
+      name = "_jest_expect___expect_29.4.1.tgz";
+      path = fetchurl {
+        name = "_jest_expect___expect_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/expect/-/expect-29.4.1.tgz";
+        sha512 = "ZxKJP5DTUNF2XkpJeZIzvnzF1KkfrhEF6Rz0HGG69fHl6Bgx5/GoU3XyaeFYEjuuKSOOsbqD/k72wFvFxc3iTw==";
       };
     }
     {
@@ -1586,19 +1594,27 @@
       };
     }
     {
-      name = "_jest_globals___globals_28.1.3.tgz";
+      name = "_jest_fake_timers___fake_timers_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_globals___globals_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz";
-        sha512 = "XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==";
+        name = "_jest_fake_timers___fake_timers_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.4.1.tgz";
+        sha512 = "/1joI6rfHFmmm39JxNfmNAO3Nwm6Y0VoL5fJDy7H1AtWrD1CgRtqJbN9Ld6rhAkGO76qqp4cwhhxJ9o9kYjQMw==";
       };
     }
     {
-      name = "_jest_reporters___reporters_28.1.3.tgz";
+      name = "_jest_globals___globals_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_reporters___reporters_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz";
-        sha512 = "JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==";
+        name = "_jest_globals___globals_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/globals/-/globals-29.4.1.tgz";
+        sha512 = "znoK2EuFytbHH0ZSf2mQK2K1xtIgmaw4Da21R2C/NE/+NnItm5mPEFQmn8gmF3f0rfOlmZ3Y3bIf7bFj7DHxAA==";
+      };
+    }
+    {
+      name = "_jest_reporters___reporters_29.4.1.tgz";
+      path = fetchurl {
+        name = "_jest_reporters___reporters_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.4.1.tgz";
+        sha512 = "AISY5xpt2Xpxj9R6y0RF1+O6GRy9JsGa8+vK23Lmzdy1AYcpQn5ItX79wJSsTmfzPKSAcsY1LNt/8Y5Xe5LOSg==";
       };
     }
     {
@@ -1610,51 +1626,43 @@
       };
     }
     {
-      name = "_jest_schemas___schemas_29.0.0.tgz";
+      name = "_jest_schemas___schemas_29.4.0.tgz";
       path = fetchurl {
-        name = "_jest_schemas___schemas_29.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz";
-        sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==";
+        name = "_jest_schemas___schemas_29.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz";
+        sha512 = "0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==";
       };
     }
     {
-      name = "_jest_source_map___source_map_28.1.2.tgz";
+      name = "_jest_source_map___source_map_29.2.0.tgz";
       path = fetchurl {
-        name = "_jest_source_map___source_map_28.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz";
-        sha512 = "cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==";
+        name = "_jest_source_map___source_map_29.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz";
+        sha512 = "1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==";
       };
     }
     {
-      name = "_jest_test_result___test_result_28.1.3.tgz";
+      name = "_jest_test_result___test_result_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_test_result___test_result_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz";
-        sha512 = "kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==";
+        name = "_jest_test_result___test_result_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.4.1.tgz";
+        sha512 = "WRt29Lwt+hEgfN8QDrXqXGgCTidq1rLyFqmZ4lmJOpVArC8daXrZWkWjiaijQvgd3aOUj2fM8INclKHsQW9YyQ==";
       };
     }
     {
-      name = "_jest_test_sequencer___test_sequencer_28.1.3.tgz";
+      name = "_jest_test_sequencer___test_sequencer_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_test_sequencer___test_sequencer_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz";
-        sha512 = "NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==";
+        name = "_jest_test_sequencer___test_sequencer_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.4.1.tgz";
+        sha512 = "v5qLBNSsM0eHzWLXsQ5fiB65xi49A3ILPSFQKPXzGL4Vyux0DPZAIN7NAFJa9b4BiTDP9MBF/Zqc/QA1vuiJ0w==";
       };
     }
     {
-      name = "_jest_transform___transform_28.1.3.tgz";
+      name = "_jest_transform___transform_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_transform___transform_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz";
-        sha512 = "u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==";
-      };
-    }
-    {
-      name = "_jest_transform___transform_29.3.1.tgz";
-      path = fetchurl {
-        name = "_jest_transform___transform_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz";
-        sha512 = "8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==";
+        name = "_jest_transform___transform_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-29.4.1.tgz";
+        sha512 = "5w6YJrVAtiAgr0phzKjYd83UPbCXsBRTeYI4BXokv9Er9CcrH9hfXL/crCvP2d2nGOcovPUnlYiLPFLZrkG5Hg==";
       };
     }
     {
@@ -1666,11 +1674,11 @@
       };
     }
     {
-      name = "_jest_types___types_29.3.1.tgz";
+      name = "_jest_types___types_29.4.1.tgz";
       path = fetchurl {
-        name = "_jest_types___types_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz";
-        sha512 = "d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==";
+        name = "_jest_types___types_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-29.4.1.tgz";
+        sha512 = "zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==";
       };
     }
     {
@@ -2217,6 +2225,38 @@
         sha512 = "uzYeElL3w7SeNMuQpXiFlBhTT+JyaNMCwDfjKkrzugEcYrf5n52PHqncNdQPUtR42hJh8V9FsqyEDbDxkeNjJQ==";
       };
     }
+    {
+      name = "_radix_ui_react_compose_refs___react_compose_refs_1.0.0.tgz";
+      path = fetchurl {
+        name = "_radix_ui_react_compose_refs___react_compose_refs_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz";
+        sha512 = "0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==";
+      };
+    }
+    {
+      name = "_radix_ui_react_portal___react_portal_1.0.1.tgz";
+      path = fetchurl {
+        name = "_radix_ui_react_portal___react_portal_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.1.tgz";
+        sha512 = "NY2vUWI5WENgAT1nfC6JS7RU5xRYBfjZVLq0HmgEN1Ezy3rk/UruMV4+Rd0F40PEaFC5SrLS1ixYvcYIQrb4Ig==";
+      };
+    }
+    {
+      name = "_radix_ui_react_primitive___react_primitive_1.0.1.tgz";
+      path = fetchurl {
+        name = "_radix_ui_react_primitive___react_primitive_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.1.tgz";
+        sha512 = "fHbmislWVkZaIdeF6GZxF0A/NH/3BjrGIYj+Ae6eTmTCr7EB0RQAAVEiqsXK6p3/JcRqVSBQoceZroj30Jj3XA==";
+      };
+    }
+    {
+      name = "_radix_ui_react_slot___react_slot_1.0.1.tgz";
+      path = fetchurl {
+        name = "_radix_ui_react_slot___react_slot_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.1.tgz";
+        sha512 = "avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==";
+      };
+    }
     {
       name = "_radix_ui_react_use_rect___react_use_rect_0.1.1.tgz";
       path = fetchurl {
@@ -2249,22 +2289,6 @@
         sha512 = "Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ==";
       };
     }
-    {
-      name = "_reach_portal___portal_0.16.0.tgz";
-      path = fetchurl {
-        name = "_reach_portal___portal_0.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/@reach/portal/-/portal-0.16.0.tgz";
-        sha512 = "vXJ0O9T+72HiSEWHPs2cx7YbSO7pQsTMhgqPc5aaddIYpo2clJx1PnYuS0lSNlVaDO0IxQhwYq43evXaXnmviw==";
-      };
-    }
-    {
-      name = "_reach_utils___utils_0.16.0.tgz";
-      path = fetchurl {
-        name = "_reach_utils___utils_0.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/@reach/utils/-/utils-0.16.0.tgz";
-        sha512 = "PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==";
-      };
-    }
     {
       name = "_react_aria_focus___focus_3.8.0.tgz";
       path = fetchurl {
@@ -2337,14 +2361,6 @@
         sha512 = "wqjGNFX4TrXriUU1gvCaoqRhuckdoYogUWN0iyQRkTmzvb7H/NNzQzHou5ggWAdts/NzJUInwKarBWM9hCZZbg==";
       };
     }
-    {
-      name = "_react_dnd_asap___asap_4.0.0.tgz";
-      path = fetchurl {
-        name = "_react_dnd_asap___asap_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz";
-        sha512 = "0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ==";
-      };
-    }
     {
       name = "_react_dnd_asap___asap_5.0.2.tgz";
       path = fetchurl {
@@ -2353,14 +2369,6 @@
         sha512 = "WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==";
       };
     }
-    {
-      name = "_react_dnd_invariant___invariant_2.0.0.tgz";
-      path = fetchurl {
-        name = "_react_dnd_invariant___invariant_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-2.0.0.tgz";
-        sha512 = "xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw==";
-      };
-    }
     {
       name = "_react_dnd_invariant___invariant_4.0.2.tgz";
       path = fetchurl {
@@ -2370,11 +2378,11 @@
       };
     }
     {
-      name = "_react_dnd_shallowequal___shallowequal_2.0.0.tgz";
+      name = "_react_dnd_shallowequal___shallowequal_4.0.2.tgz";
       path = fetchurl {
-        name = "_react_dnd_shallowequal___shallowequal_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz";
-        sha512 = "Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==";
+        name = "_react_dnd_shallowequal___shallowequal_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz";
+        sha512 = "/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==";
       };
     }
     {
@@ -2553,6 +2561,14 @@
         sha512 = "K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==";
       };
     }
+    {
+      name = "_sinclair_typebox___typebox_0.25.21.tgz";
+      path = fetchurl {
+        name = "_sinclair_typebox___typebox_0.25.21.tgz";
+        url  = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz";
+        sha512 = "gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==";
+      };
+    }
     {
       name = "_sinonjs_commons___commons_1.8.1.tgz";
       path = fetchurl {
@@ -2561,6 +2577,22 @@
         sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==";
       };
     }
+    {
+      name = "_sinonjs_commons___commons_2.0.0.tgz";
+      path = fetchurl {
+        name = "_sinonjs_commons___commons_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz";
+        sha512 = "uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==";
+      };
+    }
+    {
+      name = "_sinonjs_fake_timers___fake_timers_10.0.2.tgz";
+      path = fetchurl {
+        name = "_sinonjs_fake_timers___fake_timers_10.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz";
+        sha512 = "SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==";
+      };
+    }
     {
       name = "_sinonjs_fake_timers___fake_timers_9.1.2.tgz";
       path = fetchurl {
@@ -2858,11 +2890,11 @@
       };
     }
     {
-      name = "_types_fs_extra___fs_extra_9.0.13.tgz";
+      name = "_types_fs_extra___fs_extra_11.0.1.tgz";
       path = fetchurl {
-        name = "_types_fs_extra___fs_extra_9.0.13.tgz";
-        url  = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz";
-        sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==";
+        name = "_types_fs_extra___fs_extra_11.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.1.tgz";
+        sha512 = "MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==";
       };
     }
     {
@@ -2873,6 +2905,14 @@
         sha512 = "YOqA50Z3xcycm4Br5+MBUpSumfdOAcv34A8A8yFn62zBQPTzJSXQk11qYE5w8BWQ0KrVThXUgEQh7ZLrYI1NaQ==";
       };
     }
+    {
+      name = "_types_glob___glob_8.0.1.tgz";
+      path = fetchurl {
+        name = "_types_glob___glob_8.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.1.tgz";
+        sha512 = "8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw==";
+      };
+    }
     {
       name = "_types_google.analytics___google.analytics_0.0.42.tgz";
       path = fetchurl {
@@ -3009,6 +3049,14 @@
         sha1 = "7ihweulOEdK4J7y+UnC86n8+ce4=";
       };
     }
+    {
+      name = "_types_jsonfile___jsonfile_6.1.1.tgz";
+      path = fetchurl {
+        name = "_types_jsonfile___jsonfile_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.1.tgz";
+        sha512 = "GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==";
+      };
+    }
     {
       name = "_types_jsonwebtoken___jsonwebtoken_8.5.8.tgz";
       path = fetchurl {
@@ -3201,6 +3249,14 @@
         sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==";
       };
     }
+    {
+      name = "_types_minimatch___minimatch_5.1.2.tgz";
+      path = fetchurl {
+        name = "_types_minimatch___minimatch_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz";
+        sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==";
+      };
+    }
     {
       name = "_types_ms___ms_0.7.31.tgz";
       path = fetchurl {
@@ -3786,11 +3842,11 @@
       };
     }
     {
-      name = "_typescript_eslint_parser___parser_5.40.0.tgz";
+      name = "_typescript_eslint_parser___parser_5.48.1.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_parser___parser_5.40.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz";
-        sha512 = "Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==";
+        name = "_typescript_eslint_parser___parser_5.48.1.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.48.1.tgz";
+        sha512 = "4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==";
       };
     }
     {
@@ -3801,6 +3857,14 @@
         sha512 = "d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==";
       };
     }
+    {
+      name = "_typescript_eslint_scope_manager___scope_manager_5.48.1.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_scope_manager___scope_manager_5.48.1.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz";
+        sha512 = "S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==";
+      };
+    }
     {
       name = "_typescript_eslint_type_utils___type_utils_5.40.0.tgz";
       path = fetchurl {
@@ -3817,6 +3881,14 @@
         sha512 = "V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==";
       };
     }
+    {
+      name = "_typescript_eslint_types___types_5.48.1.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_types___types_5.48.1.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.1.tgz";
+        sha512 = "xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==";
+      };
+    }
     {
       name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.0.tgz";
       path = fetchurl {
@@ -3825,6 +3897,14 @@
         sha512 = "b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==";
       };
     }
+    {
+      name = "_typescript_eslint_typescript_estree___typescript_estree_5.48.1.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_typescript_estree___typescript_estree_5.48.1.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz";
+        sha512 = "Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==";
+      };
+    }
     {
       name = "_typescript_eslint_utils___utils_5.40.0.tgz";
       path = fetchurl {
@@ -3841,6 +3921,14 @@
         sha512 = "ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==";
       };
     }
+    {
+      name = "_typescript_eslint_visitor_keys___visitor_keys_5.48.1.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_visitor_keys___visitor_keys_5.48.1.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz";
+        sha512 = "Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==";
+      };
+    }
     {
       name = "_webassemblyjs_ast___ast_1.9.0.tgz";
       path = fetchurl {
@@ -4634,19 +4722,11 @@
       };
     }
     {
-      name = "babel_jest___babel_jest_28.1.3.tgz";
+      name = "babel_jest___babel_jest_29.4.1.tgz";
       path = fetchurl {
-        name = "babel_jest___babel_jest_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz";
-        sha512 = "epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==";
-      };
-    }
-    {
-      name = "babel_jest___babel_jest_29.3.1.tgz";
-      path = fetchurl {
-        name = "babel_jest___babel_jest_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz";
-        sha512 = "aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==";
+        name = "babel_jest___babel_jest_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.4.1.tgz";
+        sha512 = "xBZa/pLSsF/1sNpkgsiT3CmY7zV1kAsZ9OxxtrFqYucnOuRftXAfcJqcDVyOPeN4lttWTwhLdu0T9f8uvoPEUg==";
       };
     }
     {
@@ -4682,19 +4762,11 @@
       };
     }
     {
-      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_28.1.3.tgz";
+      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.4.0.tgz";
       path = fetchurl {
-        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz";
-        sha512 = "Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==";
-      };
-    }
-    {
-      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz";
-      path = fetchurl {
-        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz";
-        sha512 = "TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==";
+        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_29.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz";
+        sha512 = "a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==";
       };
     }
     {
@@ -4810,19 +4882,11 @@
       };
     }
     {
-      name = "babel_preset_jest___babel_preset_jest_28.1.3.tgz";
+      name = "babel_preset_jest___babel_preset_jest_29.4.0.tgz";
       path = fetchurl {
-        name = "babel_preset_jest___babel_preset_jest_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz";
-        sha512 = "L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==";
-      };
-    }
-    {
-      name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz";
-      path = fetchurl {
-        name = "babel_preset_jest___babel_preset_jest_29.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz";
-        sha512 = "z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==";
+        name = "babel_preset_jest___babel_preset_jest_29.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz";
+        sha512 = "fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==";
       };
     }
     {
@@ -5017,6 +5081,14 @@
         sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     }
+    {
+      name = "brace_expansion___brace_expansion_2.0.1.tgz";
+      path = fetchurl {
+        name = "brace_expansion___brace_expansion_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz";
+        sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==";
+      };
+    }
     {
       name = "braces___braces_2.3.2.tgz";
       path = fetchurl {
@@ -5761,6 +5833,14 @@
         sha512 = "GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==";
       };
     }
+    {
+      name = "command_score___command_score_0.1.2.tgz";
+      path = fetchurl {
+        name = "command_score___command_score_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/command-score/-/command-score-0.1.2.tgz";
+        sha512 = "VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w==";
+      };
+    }
     {
       name = "commander___commander_7.2.0.tgz";
       path = fetchurl {
@@ -5986,11 +6066,11 @@
       };
     }
     {
-      name = "cookiejar___cookiejar_2.1.3.tgz";
+      name = "cookiejar___cookiejar_2.1.4.tgz";
       path = fetchurl {
-        name = "cookiejar___cookiejar_2.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz";
-        sha512 = "JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==";
+        name = "cookiejar___cookiejar_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz";
+        sha512 = "LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==";
       };
     }
     {
@@ -6889,6 +6969,14 @@
         sha512 = "FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==";
       };
     }
+    {
+      name = "diff_sequences___diff_sequences_29.3.1.tgz";
+      path = fetchurl {
+        name = "diff_sequences___diff_sequences_29.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz";
+        sha512 = "hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==";
+      };
+    }
     {
       name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
       path = fetchurl {
@@ -6929,14 +7017,6 @@
         sha1 = "44Mx8IRLukm5qctxx3FYWqsbxlo=";
       };
     }
-    {
-      name = "dnd_core___dnd_core_14.0.0.tgz";
-      path = fetchurl {
-        name = "dnd_core___dnd_core_14.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/dnd-core/-/dnd-core-14.0.0.tgz";
-        sha512 = "wTDYKyjSqWuYw3ZG0GJ7k+UIfzxTNoZLjDrut37PbcPGNfwhlKYlPUqjAKUjOOv80izshUiqusaKgJPItXSevA==";
-      };
-    }
     {
       name = "dnd_core___dnd_core_16.0.1.tgz";
       path = fetchurl {
@@ -7250,11 +7330,11 @@
       };
     }
     {
-      name = "emittery___emittery_0.10.2.tgz";
+      name = "emittery___emittery_0.13.1.tgz";
       path = fetchurl {
-        name = "emittery___emittery_0.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz";
-        sha512 = "aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==";
+        name = "emittery___emittery_0.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz";
+        sha512 = "DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==";
       };
     }
     {
@@ -7889,6 +7969,14 @@
         sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==";
       };
     }
+    {
+      name = "execa___execa_6.1.0.tgz";
+      path = fetchurl {
+        name = "execa___execa_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz";
+        sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==";
+      };
+    }
     {
       name = "exif_parser___exif_parser_0.1.12.tgz";
       path = fetchurl {
@@ -7914,11 +8002,11 @@
       };
     }
     {
-      name = "expect___expect_28.1.3.tgz";
+      name = "expect___expect_29.4.1.tgz";
       path = fetchurl {
-        name = "expect___expect_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz";
-        sha512 = "eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==";
+        name = "expect___expect_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/expect/-/expect-29.4.1.tgz";
+        sha512 = "OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A==";
       };
     }
     {
@@ -8409,6 +8497,14 @@
         sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==";
       };
     }
+    {
+      name = "fs_extra___fs_extra_11.1.0.tgz";
+      path = fetchurl {
+        name = "fs_extra___fs_extra_11.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz";
+        sha512 = "0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==";
+      };
+    }
     {
       name = "fs_extra___fs_extra_3.0.1.tgz";
       path = fetchurl {
@@ -8417,14 +8513,6 @@
         sha1 = "N5TzeMWLNC6n27sjCVEJxLO2IpE=";
       };
     }
-    {
-      name = "fs_extra___fs_extra_4.0.3.tgz";
-      path = fetchurl {
-        name = "fs_extra___fs_extra_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz";
-        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
-      };
-    }
     {
       name = "fs_extra___fs_extra_8.1.0.tgz";
       path = fetchurl {
@@ -8713,6 +8801,14 @@
         sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==";
       };
     }
+    {
+      name = "glob___glob_8.1.0.tgz";
+      path = fetchurl {
+        name = "glob___glob_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz";
+        sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==";
+      };
+    }
     {
       name = "global___global_4.4.0.tgz";
       path = fetchurl {
@@ -9193,6 +9289,14 @@
         sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==";
       };
     }
+    {
+      name = "human_signals___human_signals_3.0.1.tgz";
+      path = fetchurl {
+        name = "human_signals___human_signals_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz";
+        sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==";
+      };
+    }
     {
       name = "humanize_number___humanize_number_0.0.2.tgz";
       path = fetchurl {
@@ -9338,11 +9442,11 @@
       };
     }
     {
-      name = "immutable___immutable_4.0.0.tgz";
+      name = "immutable___immutable_4.2.4.tgz";
       path = fetchurl {
-        name = "immutable___immutable_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz";
-        sha512 = "zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==";
+        name = "immutable___immutable_4.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz";
+        sha512 = "WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==";
       };
     }
     {
@@ -9953,6 +10057,14 @@
         sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
       };
     }
+    {
+      name = "is_stream___is_stream_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_stream___is_stream_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz";
+        sha512 = "LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==";
+      };
+    }
     {
       name = "is_string___is_string_1.0.7.tgz";
       path = fetchurl {
@@ -10162,35 +10274,35 @@
       };
     }
     {
-      name = "jest_changed_files___jest_changed_files_28.1.3.tgz";
+      name = "jest_changed_files___jest_changed_files_29.4.0.tgz";
       path = fetchurl {
-        name = "jest_changed_files___jest_changed_files_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz";
-        sha512 = "esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==";
+        name = "jest_changed_files___jest_changed_files_29.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.4.0.tgz";
+        sha512 = "rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==";
       };
     }
     {
-      name = "jest_circus___jest_circus_28.1.3.tgz";
+      name = "jest_circus___jest_circus_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_circus___jest_circus_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz";
-        sha512 = "cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==";
+        name = "jest_circus___jest_circus_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.4.1.tgz";
+        sha512 = "v02NuL5crMNY4CGPHBEflLzl4v91NFb85a+dH9a1pUNx6Xjggrd8l9pPy4LZ1VYNRXlb+f65+7O/MSIbLir6pA==";
       };
     }
     {
-      name = "jest_cli___jest_cli_28.1.3.tgz";
+      name = "jest_cli___jest_cli_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_cli___jest_cli_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz";
-        sha512 = "roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==";
+        name = "jest_cli___jest_cli_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.4.1.tgz";
+        sha512 = "jz7GDIhtxQ37M+9dlbv5K+/FVcIo1O/b1sX3cJgzlQUf/3VG25nvuWzlDC4F1FLLzUThJeWLu8I7JF9eWpuURQ==";
       };
     }
     {
-      name = "jest_config___jest_config_28.1.3.tgz";
+      name = "jest_config___jest_config_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_config___jest_config_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz";
-        sha512 = "MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==";
+        name = "jest_config___jest_config_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-29.4.1.tgz";
+        sha512 = "g7p3q4NuXiM4hrS4XFATTkd+2z0Ml2RhFmFPM8c3WyKwVDNszbl4E7cV7WIx1YZeqqCtqbtTtZhGZWJlJqngzg==";
       };
     }
     {
@@ -10202,19 +10314,27 @@
       };
     }
     {
-      name = "jest_docblock___jest_docblock_28.1.1.tgz";
+      name = "jest_diff___jest_diff_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_docblock___jest_docblock_28.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz";
-        sha512 = "3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==";
+        name = "jest_diff___jest_diff_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.1.tgz";
+        sha512 = "uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==";
       };
     }
     {
-      name = "jest_each___jest_each_28.1.3.tgz";
+      name = "jest_docblock___jest_docblock_29.2.0.tgz";
       path = fetchurl {
-        name = "jest_each___jest_each_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz";
-        sha512 = "arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==";
+        name = "jest_docblock___jest_docblock_29.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz";
+        sha512 = "bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==";
+      };
+    }
+    {
+      name = "jest_each___jest_each_29.4.1.tgz";
+      path = fetchurl {
+        name = "jest_each___jest_each_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-29.4.1.tgz";
+        sha512 = "QlYFiX3llJMWUV0BtWht/esGEz9w+0i7BHwODKCze7YzZzizgExB9MOfiivF/vVT0GSQ8wXLhvHXh3x2fVD4QQ==";
       };
     }
     {
@@ -10226,11 +10346,11 @@
       };
     }
     {
-      name = "jest_environment_node___jest_environment_node_28.1.3.tgz";
+      name = "jest_environment_node___jest_environment_node_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_environment_node___jest_environment_node_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz";
-        sha512 = "ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==";
+        name = "jest_environment_node___jest_environment_node_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.4.1.tgz";
+        sha512 = "x/H2kdVgxSkxWAIlIh9MfMuBa0hZySmfsC5lCsWmWr6tZySP44ediRKDUiNggX/eHLH7Cd5ZN10Rw+XF5tXsqg==";
       };
     }
     {
@@ -10250,27 +10370,27 @@
       };
     }
     {
-      name = "jest_haste_map___jest_haste_map_28.1.3.tgz";
+      name = "jest_get_type___jest_get_type_29.2.0.tgz";
       path = fetchurl {
-        name = "jest_haste_map___jest_haste_map_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz";
-        sha512 = "3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==";
+        name = "jest_get_type___jest_get_type_29.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz";
+        sha512 = "uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==";
       };
     }
     {
-      name = "jest_haste_map___jest_haste_map_29.3.1.tgz";
+      name = "jest_haste_map___jest_haste_map_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_haste_map___jest_haste_map_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz";
-        sha512 = "/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==";
+        name = "jest_haste_map___jest_haste_map_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.4.1.tgz";
+        sha512 = "imTjcgfVVTvg02khXL11NNLTx9ZaofbAWhilrMg/G8dIkp+HYCswhxf0xxJwBkfhWb3e8dwbjuWburvxmcr58w==";
       };
     }
     {
-      name = "jest_leak_detector___jest_leak_detector_28.1.3.tgz";
+      name = "jest_leak_detector___jest_leak_detector_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_leak_detector___jest_leak_detector_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz";
-        sha512 = "WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==";
+        name = "jest_leak_detector___jest_leak_detector_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.4.1.tgz";
+        sha512 = "akpZv7TPyGMnH2RimOCgy+hPmWZf55EyFUvymQ4LMsQP8xSPlZumCPtXGoDhFNhUE2039RApZkTQDKU79p/FiQ==";
       };
     }
     {
@@ -10281,6 +10401,14 @@
         sha512 = "kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==";
       };
     }
+    {
+      name = "jest_matcher_utils___jest_matcher_utils_29.4.1.tgz";
+      path = fetchurl {
+        name = "jest_matcher_utils___jest_matcher_utils_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz";
+        sha512 = "k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA==";
+      };
+    }
     {
       name = "jest_message_util___jest_message_util_28.1.3.tgz";
       path = fetchurl {
@@ -10289,6 +10417,14 @@
         sha512 = "PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==";
       };
     }
+    {
+      name = "jest_message_util___jest_message_util_29.4.1.tgz";
+      path = fetchurl {
+        name = "jest_message_util___jest_message_util_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.1.tgz";
+        sha512 = "H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ==";
+      };
+    }
     {
       name = "jest_mock___jest_mock_28.1.3.tgz";
       path = fetchurl {
@@ -10297,6 +10433,14 @@
         sha512 = "o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==";
       };
     }
+    {
+      name = "jest_mock___jest_mock_29.4.1.tgz";
+      path = fetchurl {
+        name = "jest_mock___jest_mock_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.4.1.tgz";
+        sha512 = "MwA4hQ7zBOcgVCVnsM8TzaFLVUD/pFWTfbkY953Y81L5ret3GFRZtmPmRFAjKQSdCKoJvvqOu6Bvfpqlwwb0dQ==";
+      };
+    }
     {
       name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
       path = fetchurl {
@@ -10305,14 +10449,6 @@
         sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==";
       };
     }
-    {
-      name = "jest_regex_util___jest_regex_util_28.0.2.tgz";
-      path = fetchurl {
-        name = "jest_regex_util___jest_regex_util_28.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz";
-        sha512 = "4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==";
-      };
-    }
     {
       name = "jest_regex_util___jest_regex_util_29.2.0.tgz";
       path = fetchurl {
@@ -10322,43 +10458,43 @@
       };
     }
     {
-      name = "jest_resolve_dependencies___jest_resolve_dependencies_28.1.3.tgz";
+      name = "jest_resolve_dependencies___jest_resolve_dependencies_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_resolve_dependencies___jest_resolve_dependencies_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz";
-        sha512 = "qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==";
+        name = "jest_resolve_dependencies___jest_resolve_dependencies_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.1.tgz";
+        sha512 = "Y3QG3M1ncAMxfjbYgtqNXC5B595zmB6e//p/qpA/58JkQXu/IpLDoLeOa8YoYfsSglBKQQzNUqtfGJJT/qLmJg==";
       };
     }
     {
-      name = "jest_resolve___jest_resolve_28.1.3.tgz";
+      name = "jest_resolve___jest_resolve_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_resolve___jest_resolve_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz";
-        sha512 = "Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==";
+        name = "jest_resolve___jest_resolve_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.4.1.tgz";
+        sha512 = "j/ZFNV2lm9IJ2wmlq1uYK0Y/1PiyDq9g4HEGsNTNr3viRbJdV+8Lf1SXIiLZXFvyiisu0qUyIXGBnw+OKWkJwQ==";
       };
     }
     {
-      name = "jest_runner___jest_runner_28.1.3.tgz";
+      name = "jest_runner___jest_runner_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_runner___jest_runner_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz";
-        sha512 = "GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==";
+        name = "jest_runner___jest_runner_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.4.1.tgz";
+        sha512 = "8d6XXXi7GtHmsHrnaqBKWxjKb166Eyj/ksSaUYdcBK09VbjPwIgWov1VwSmtupCIz8q1Xv4Qkzt/BTo3ZqiCeg==";
       };
     }
     {
-      name = "jest_runtime___jest_runtime_28.1.3.tgz";
+      name = "jest_runtime___jest_runtime_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_runtime___jest_runtime_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz";
-        sha512 = "NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==";
+        name = "jest_runtime___jest_runtime_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.4.1.tgz";
+        sha512 = "UXTMU9uKu2GjYwTtoAw5rn4STxWw/nadOfW7v1sx6LaJYa3V/iymdCLQM6xy3+7C6mY8GfX22vKpgxY171UIoA==";
       };
     }
     {
-      name = "jest_snapshot___jest_snapshot_28.1.3.tgz";
+      name = "jest_snapshot___jest_snapshot_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_snapshot___jest_snapshot_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz";
-        sha512 = "4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==";
+        name = "jest_snapshot___jest_snapshot_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.4.1.tgz";
+        sha512 = "l4iV8EjGgQWVz3ee/LR9sULDk2pCkqb71bjvlqn+qp90lFwpnulHj4ZBT8nm1hA1C5wowXLc7MGnw321u0tsYA==";
       };
     }
     {
@@ -10370,27 +10506,27 @@
       };
     }
     {
-      name = "jest_util___jest_util_29.3.1.tgz";
+      name = "jest_util___jest_util_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_util___jest_util_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz";
-        sha512 = "7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==";
+        name = "jest_util___jest_util_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.1.tgz";
+        sha512 = "bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==";
       };
     }
     {
-      name = "jest_validate___jest_validate_28.1.3.tgz";
+      name = "jest_validate___jest_validate_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_validate___jest_validate_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz";
-        sha512 = "SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==";
+        name = "jest_validate___jest_validate_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.4.1.tgz";
+        sha512 = "qNZXcZQdIQx4SfUB/atWnI4/I2HUvhz8ajOSYUu40CSmf9U5emil8EDHgE7M+3j9/pavtk3knlZBDsgFvv/SWw==";
       };
     }
     {
-      name = "jest_watcher___jest_watcher_28.1.3.tgz";
+      name = "jest_watcher___jest_watcher_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_watcher___jest_watcher_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz";
-        sha512 = "t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==";
+        name = "jest_watcher___jest_watcher_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.4.1.tgz";
+        sha512 = "vFOzflGFs27nU6h8dpnVRER3O2rFtL+VMEwnG0H3KLHcllLsU8y9DchSh0AL/Rg5nN1/wSiQ+P4ByMGpuybaVw==";
       };
     }
     {
@@ -10402,19 +10538,11 @@
       };
     }
     {
-      name = "jest_worker___jest_worker_28.1.3.tgz";
+      name = "jest_worker___jest_worker_29.4.1.tgz";
       path = fetchurl {
-        name = "jest_worker___jest_worker_28.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz";
-        sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==";
-      };
-    }
-    {
-      name = "jest_worker___jest_worker_29.3.1.tgz";
-      path = fetchurl {
-        name = "jest_worker___jest_worker_29.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz";
-        sha512 = "lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==";
+        name = "jest_worker___jest_worker_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.4.1.tgz";
+        sha512 = "O9doU/S1EBe+yp/mstQ0VpPwpv0Clgn68TkNwGxL6/usX/KUW9Arnn4ag8C3jc6qHcXznhsT5Na1liYzAsuAbQ==";
       };
     }
     {
@@ -10666,11 +10794,11 @@
       };
     }
     {
-      name = "kbar___kbar_0.1.0_beta.28.tgz";
+      name = "kbar___kbar_0.1.0_beta.40.tgz";
       path = fetchurl {
-        name = "kbar___kbar_0.1.0_beta.28.tgz";
-        url  = "https://registry.yarnpkg.com/kbar/-/kbar-0.1.0-beta.28.tgz";
-        sha512 = "JmwZUO8fG1irDWqYIUKnoaAXT6t0QxCbmAEBNgHgXWeYFmk9CvhFWwAiFxtSfVX7d+efSTUf93KVrcd2Y61Zaw==";
+        name = "kbar___kbar_0.1.0_beta.40.tgz";
+        url  = "https://registry.yarnpkg.com/kbar/-/kbar-0.1.0-beta.40.tgz";
+        sha512 = "vEV02WuEBvKaSivO2DnNtyd3gUAbruYrZCax5fXcLcVTFV6q0/w6Ew3z6Qy+AqXxbZdWguwQ3POIwgdHevp+6A==";
       };
     }
     {
@@ -10842,11 +10970,11 @@
       };
     }
     {
-      name = "koa_sslify___koa_sslify_5.0.0.tgz";
+      name = "koa_sslify___koa_sslify_5.0.1.tgz";
       path = fetchurl {
-        name = "koa_sslify___koa_sslify_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/koa-sslify/-/koa-sslify-5.0.0.tgz";
-        sha512 = "3Qc/DxPcH4BavYkt7xOVDFbaS7nR8oCozb/0dlIpLlyGVhFXcjHETWBwE3QrDLwjKOVJj6ykwRJoNzPT9QxCag==";
+        name = "koa_sslify___koa_sslify_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/koa-sslify/-/koa-sslify-5.0.1.tgz";
+        sha512 = "QwQgMvNPyePpngghYZxeuPzeQqMOFYUXiKu8pd4wz9rd7ZmoOq4VKtoEIjctLt3Qcfv2aHL/0UIRAmIK4qDczg==";
       };
     }
     {
@@ -10993,14 +11121,6 @@
         sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==";
       };
     }
-    {
-      name = "lilconfig___lilconfig_2.0.4.tgz";
-      path = fetchurl {
-        name = "lilconfig___lilconfig_2.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz";
-        sha512 = "bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==";
-      };
-    }
     {
       name = "lilconfig___lilconfig_2.0.6.tgz";
       path = fetchurl {
@@ -11034,11 +11154,11 @@
       };
     }
     {
-      name = "lint_staged___lint_staged_12.3.8.tgz";
+      name = "lint_staged___lint_staged_13.1.0.tgz";
       path = fetchurl {
-        name = "lint_staged___lint_staged_12.3.8.tgz";
-        url  = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.8.tgz";
-        sha512 = "0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==";
+        name = "lint_staged___lint_staged_13.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.1.0.tgz";
+        sha512 = "pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==";
       };
     }
     {
@@ -11050,11 +11170,11 @@
       };
     }
     {
-      name = "listr2___listr2_4.0.5.tgz";
+      name = "listr2___listr2_5.0.7.tgz";
       path = fetchurl {
-        name = "listr2___listr2_4.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz";
-        sha512 = "juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==";
+        name = "listr2___listr2_5.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/listr2/-/listr2-5.0.7.tgz";
+        sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw==";
       };
     }
     {
@@ -11425,14 +11545,6 @@
         sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==";
       };
     }
-    {
-      name = "match_sorter___match_sorter_6.3.1.tgz";
-      path = fetchurl {
-        name = "match_sorter___match_sorter_6.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz";
-        sha512 = "mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==";
-      };
-    }
     {
       name = "matcher_collection___matcher_collection_2.0.1.tgz";
       path = fetchurl {
@@ -11554,11 +11666,11 @@
       };
     }
     {
-      name = "micromatch___micromatch_4.0.4.tgz";
+      name = "micromatch___micromatch_4.0.5.tgz";
       path = fetchurl {
-        name = "micromatch___micromatch_4.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz";
-        sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==";
+        name = "micromatch___micromatch_4.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz";
+        sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==";
       };
     }
     {
@@ -11617,6 +11729,14 @@
         sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     }
+    {
+      name = "mimic_fn___mimic_fn_4.0.0.tgz";
+      path = fetchurl {
+        name = "mimic_fn___mimic_fn_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz";
+        sha512 = "vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==";
+      };
+    }
     {
       name = "min_document___min_document_2.19.0.tgz";
       path = fetchurl {
@@ -11657,6 +11777,14 @@
         sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
       };
     }
+    {
+      name = "minimatch___minimatch_5.1.6.tgz";
+      path = fetchurl {
+        name = "minimatch___minimatch_5.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz";
+        sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==";
+      };
+    }
     {
       name = "minimist___minimist_1.2.7.tgz";
       path = fetchurl {
@@ -12097,6 +12225,14 @@
         sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==";
       };
     }
+    {
+      name = "npm_run_path___npm_run_path_5.1.0.tgz";
+      path = fetchurl {
+        name = "npm_run_path___npm_run_path_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz";
+        sha512 = "sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==";
+      };
+    }
     {
       name = "nth_check___nth_check_2.1.1.tgz";
       path = fetchurl {
@@ -12146,11 +12282,11 @@
       };
     }
     {
-      name = "object_inspect___object_inspect_1.12.0.tgz";
+      name = "object_inspect___object_inspect_1.12.3.tgz";
       path = fetchurl {
-        name = "object_inspect___object_inspect_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz";
-        sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==";
+        name = "object_inspect___object_inspect_1.12.3.tgz";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz";
+        sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==";
       };
     }
     {
@@ -12265,6 +12401,14 @@
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     }
+    {
+      name = "onetime___onetime_6.0.0.tgz";
+      path = fetchurl {
+        name = "onetime___onetime_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz";
+        sha512 = "1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==";
+      };
+    }
     {
       name = "only___only_0.0.2.tgz";
       path = fetchurl {
@@ -12713,6 +12857,14 @@
         sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
       };
     }
+    {
+      name = "path_key___path_key_4.0.0.tgz";
+      path = fetchurl {
+        name = "path_key___path_key_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz";
+        sha512 = "haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==";
+      };
+    }
     {
       name = "path_parse___path_parse_1.0.7.tgz";
       path = fetchurl {
@@ -12890,11 +13042,11 @@
       };
     }
     {
-      name = "pidtree___pidtree_0.5.0.tgz";
+      name = "pidtree___pidtree_0.6.0.tgz";
       path = fetchurl {
-        name = "pidtree___pidtree_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/pidtree/-/pidtree-0.5.0.tgz";
-        sha512 = "9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==";
+        name = "pidtree___pidtree_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz";
+        sha512 = "eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==";
       };
     }
     {
@@ -13137,6 +13289,14 @@
         sha512 = "8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==";
       };
     }
+    {
+      name = "pretty_format___pretty_format_29.4.1.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_29.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.1.tgz";
+        sha512 = "dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==";
+      };
+    }
     {
       name = "pretty___pretty_2.0.0.tgz";
       path = fetchurl {
@@ -13650,11 +13810,11 @@
       };
     }
     {
-      name = "react_dnd___react_dnd_14.0.1.tgz";
+      name = "react_dnd___react_dnd_16.0.1.tgz";
       path = fetchurl {
-        name = "react_dnd___react_dnd_14.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/react-dnd/-/react-dnd-14.0.1.tgz";
-        sha512 = "r57KKBfmAYTwmQ/cREQehNjEX9U9Xi4AUWykLX92fB9JkY9z90DMWZhSE1M7o6Y71Y2/a2SBvSPQ385QboNrIQ==";
+        name = "react_dnd___react_dnd_16.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-dnd/-/react-dnd-16.0.1.tgz";
+        sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==";
       };
     }
     {
@@ -13698,11 +13858,11 @@
       };
     }
     {
-      name = "react_i18next___react_i18next_12.1.1.tgz";
+      name = "react_i18next___react_i18next_12.1.5.tgz";
       path = fetchurl {
-        name = "react_i18next___react_i18next_12.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.1.1.tgz";
-        sha512 = "mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==";
+        name = "react_i18next___react_i18next_12.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.1.5.tgz";
+        sha512 = "7PQAv6DA0TcStG96fle+8RfTwxVbHVlZZJPoEszwUNvDuWpGldJmNWa3ZPesEsZQZGF6GkzwvEh6p57qpFD2gQ==";
       };
     }
     {
@@ -14121,14 +14281,6 @@
         sha512 = "/hjCYVqWY/jYR07ptEJpClnYrGedSQ5AxCrEeMb3NlrxTgUK/7+iCOReE3z1QMYm3UL7sJX3o7cww/NC6UgyhA==";
       };
     }
-    {
-      name = "remove_accents___remove_accents_0.4.2.tgz";
-      path = fetchurl {
-        name = "remove_accents___remove_accents_0.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz";
-        sha1 = "CkPTqq4egNuRngeuJUsoXZ4ce7U=";
-      };
-    }
     {
       name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
       path = fetchurl {
@@ -14298,11 +14450,11 @@
       };
     }
     {
-      name = "resolve.exports___resolve.exports_1.1.0.tgz";
+      name = "resolve.exports___resolve.exports_2.0.0.tgz";
       path = fetchurl {
-        name = "resolve.exports___resolve.exports_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz";
-        sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==";
+        name = "resolve.exports___resolve.exports_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz";
+        sha512 = "6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==";
       };
     }
     {
@@ -14490,11 +14642,11 @@
       };
     }
     {
-      name = "rxjs___rxjs_7.5.6.tgz";
+      name = "rxjs___rxjs_7.8.0.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_7.5.6.tgz";
-        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz";
-        sha512 = "dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==";
+        name = "rxjs___rxjs_7.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz";
+        sha512 = "F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==";
       };
     }
     {
@@ -14690,11 +14842,11 @@
       };
     }
     {
-      name = "sequelize_typescript___sequelize_typescript_2.1.3.tgz";
+      name = "sequelize_typescript___sequelize_typescript_2.1.5.tgz";
       path = fetchurl {
-        name = "sequelize_typescript___sequelize_typescript_2.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-2.1.3.tgz";
-        sha512 = "0mejGAaLywuCoOOLSXCQs2sMBNudU/QtWZkGY5VT2dfTHToXZi5bOxCa3/CukNNk7wJwXnLuIdeHdlqjvVoj1g==";
+        name = "sequelize_typescript___sequelize_typescript_2.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-2.1.5.tgz";
+        sha512 = "x1CNODct8gJyfZPwEZBU5uVGNwgJI2Fda913ZxD5ZtCSRyTDPBTS/0uXciF+MlCpyqjpmoCAPtudQWzw579bzA==";
       };
     }
     {
@@ -15529,6 +15681,14 @@
         sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==";
       };
     }
+    {
+      name = "strip_final_newline___strip_final_newline_3.0.0.tgz";
+      path = fetchurl {
+        name = "strip_final_newline___strip_final_newline_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz";
+        sha512 = "dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==";
+      };
+    }
     {
       name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
       path = fetchurl {
@@ -15649,22 +15809,6 @@
         sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==";
       };
     }
-    {
-      name = "supports_color___supports_color_9.2.2.tgz";
-      path = fetchurl {
-        name = "supports_color___supports_color_9.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.2.tgz";
-        sha512 = "XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==";
-      };
-    }
-    {
-      name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
-      path = fetchurl {
-        name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz";
-        sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==";
-      };
-    }
     {
       name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
       path = fetchurl {
@@ -15753,14 +15897,6 @@
         sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==";
       };
     }
-    {
-      name = "terminal_link___terminal_link_2.1.1.tgz";
-      path = fetchurl {
-        name = "terminal_link___terminal_link_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz";
-        sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==";
-      };
-    }
     {
       name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz";
       path = fetchurl {
@@ -15906,11 +16042,11 @@
       };
     }
     {
-      name = "tiny_cookie___tiny_cookie_2.3.2.tgz";
+      name = "tiny_cookie___tiny_cookie_2.4.0.tgz";
       path = fetchurl {
-        name = "tiny_cookie___tiny_cookie_2.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/tiny-cookie/-/tiny-cookie-2.3.2.tgz";
-        sha512 = "qbymkVh+6+Gc/c9sqnvbG+dOHH6bschjphK3SHgIfT6h/t+63GBL37JXNoXEc6u/+BcwU6XmaWUuf19ouLVtPg==";
+        name = "tiny_cookie___tiny_cookie_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/tiny-cookie/-/tiny-cookie-2.4.0.tgz";
+        sha512 = "MbXgqX1JwuaOgHWIM7KsEryxIHSpRchroXh/fy67mw2XLPvrpZvQ2j85zSf8bLpRhTztLnOtOkVSKytJPo1ATA==";
       };
     }
     {
@@ -17242,11 +17378,11 @@
       };
     }
     {
-      name = "write_file_atomic___write_file_atomic_4.0.1.tgz";
+      name = "write_file_atomic___write_file_atomic_5.0.0.tgz";
       path = fetchurl {
-        name = "write_file_atomic___write_file_atomic_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz";
-        sha512 = "nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==";
+        name = "write_file_atomic___write_file_atomic_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.0.tgz";
+        sha512 = "R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==";
       };
     }
     {
@@ -17433,6 +17569,14 @@
         sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==";
       };
     }
+    {
+      name = "yaml___yaml_2.2.1.tgz";
+      path = fetchurl {
+        name = "yaml___yaml_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/yaml/-/yaml-2.2.1.tgz";
+        sha512 = "e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==";
+      };
+    }
     {
       name = "yargs_parser___yargs_parser_20.2.9.tgz";
       path = fetchurl {
@@ -17498,11 +17642,11 @@
       };
     }
     {
-      name = "zod___zod_3.19.1.tgz";
+      name = "zod___zod_3.20.2.tgz";
       path = fetchurl {
-        name = "zod___zod_3.19.1.tgz";
-        url  = "https://registry.yarnpkg.com/zod/-/zod-3.19.1.tgz";
-        sha512 = "LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==";
+        name = "zod___zod_3.20.2.tgz";
+        url  = "https://registry.yarnpkg.com/zod/-/zod-3.20.2.tgz";
+        sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ==";
       };
     }
   ];

From a6e176c5b2ec099739a23ff9fe3df3e34e2c1a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 10 Mar 2023 18:05:55 +0100
Subject: [PATCH 014/247] ArchiSteamFarm: choose correct framework instead of
 patching

---
 .../misc/ArchiSteamFarm/default.nix           | 12 +++++-----
 .../misc/ArchiSteamFarm/fix-framework.diff    | 24 -------------------
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index d7909c64a203..da5bda5569f3 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -22,11 +22,6 @@ buildDotnetModule rec {
     sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI=";
   };
 
-  patches = [
-    # otherwise installPhase fails with NETSDK1129
-    ./fix-framework.diff
-  ];
-
   dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
   dotnet-sdk = dotnetCorePackages.sdk_7_0;
 
@@ -38,6 +33,9 @@ buildDotnetModule rec {
     "-p:PublishSingleFile=true"
     "-p:PublishTrimmed=true"
   ];
+  dotnetInstallFlags = [
+    "--framework=net7.0"
+  ];
   selfContainedBuild = true;
 
   runtimeDeps = [ libkrb5 zlib openssl ];
@@ -58,9 +56,11 @@ buildDotnetModule rec {
 
   postInstall = ''
     buildPlugin() {
+      echo "Publishing plugin $1"
       dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
         --output $out/lib/${pname}/plugins/$1 --configuration Release \
-        -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore
+        -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \
+        --framework=net7.0
      }
 
      buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher
diff --git a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff b/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff
deleted file mode 100644
index 6c525e735b0e..000000000000
--- a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 89137fba..bce300a4 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -29,16 +29,16 @@
- 		<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
- 		<RollForward>LatestMajor</RollForward>
- 		<RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64</RuntimeIdentifiers>
--		<TargetFrameworks>net7.0</TargetFrameworks>
-+		<TargetFramework>net7.0</TargetFramework>
- 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
- 	</PropertyGroup>
- 
- 	<PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''">
--		<TargetFrameworks>$(TargetFrameworks);net481</TargetFrameworks>
-+		<TargetFramework>$(TargetFramework);net481</TargetFramework>
- 	</PropertyGroup>
- 
- 	<PropertyGroup Condition="'$(ASFNetStandard)' != ''">
--		<TargetFrameworks>$(TargetFrameworks);netstandard2.1</TargetFrameworks>
-+		<TargetFramework>$(TargetFramework);netstandard2.1</TargetFramework>
- 	</PropertyGroup>
- 
- 	<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">

From 65da8d4f29157068df5da784b3d39158bdb6495f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 10 Mar 2023 22:08:10 +0100
Subject: [PATCH 015/247] nix: dedupe fix-requires-non-existing-output patch

---
 pkgs/tools/package-management/nix/default.nix | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b21969f7cab1..bdfe03b9408d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -53,6 +53,13 @@ let
     sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
   };
 
+  patch-non-existing-output = fetchpatch {
+    # https://github.com/NixOS/nix/pull/7283
+    name = "fix-requires-non-existing-output.patch";
+    url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
+    sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
+  };
+
 in lib.makeExtensible (self: {
   nix_2_3 = (common rec {
     version = "2.3.16";
@@ -82,12 +89,7 @@ in lib.makeExtensible (self: {
     sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=";
     patches = [
       ./patches/flaky-tests.patch
-      (fetchpatch {
-        # https://github.com/NixOS/nix/pull/7283
-        name = "fix-requires-non-existing-output.patch";
-        url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
-        sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
-      })
+      patch-non-existing-output
       patch-monitorfdhup
       patch-sqlite-exception
     ];
@@ -98,12 +100,7 @@ in lib.makeExtensible (self: {
     sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk=";
     patches = [
       ./patches/flaky-tests.patch
-      (fetchpatch {
-        # https://github.com/NixOS/nix/pull/7283
-        name = "fix-requires-non-existing-output.patch";
-        url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
-        sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
-      })
+      patch-non-existing-output
       patch-monitorfdhup
       patch-sqlite-exception
     ];

From 8e2e741ab5bdea119a34013b1387eb3f281841cb Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 20 Feb 2023 02:26:31 +0800
Subject: [PATCH 016/247] zsh: set environment variables in zshenv instead of
 zprofile

This patch fixes two issues:

1. The file in which environment variables are set is inconsistent.
  - This file sets them in zprofile when programs.zsh.enable is not
  set.
  - Zsh module sets them in zshenv when programs.zsh.enable is set.

2. Setting environment variables in zprofile overrides what users set
in .zshenv.  See these[1] home-manager[2] issues[3].

/etc/profile is also changed to /etc/set-environment. Here is a
comparison:

Using /etc/profile:
- Pros
  - config.environment.shellInit is sourced in all zsh
- Cons
  - config.environment.loginShellInit is also sourced in non-login zsh
  - config.programs.bash.shellInit is also sourced in all zsh
  - config.programs.bash.loginShellInit is also sourced in all zsh

Using /etc/set-environment:
- Pros
  - config.programs.bash.shellInit is not sourced in any zsh
  - config.programs.bash.loginShellInit is not sourced in any zsh
- Cons
  - config.environment.shellInit is not sourced in any zsh
  - config.environment.loginShellInit is not sourced in any zsh

[1]: https://github.com/nix-community/home-manager/issues/2751#issuecomment-1048682643
[2]: https://github.com/nix-community/home-manager/issues/2991
[3]: https://github.com/nix-community/home-manager/issues/3681#issuecomment-1436054233
---
 .../manual/release-notes/rl-2305.section.md   |  2 ++
 pkgs/shells/zsh/default.nix                   | 28 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 3e63ddced611..b3bf583236de 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -187,6 +187,8 @@ In addition to numerous new and upgraded packages, this release has the followin
   The `{aclUse,superUser,disableActions}` attributes have been renamed, `pluginsConfig` now also accepts an attribute set of booleans, passing plain PHP is deprecated.
   Same applies to `acl` which now also accepts structured settings.
 
+- The `zsh` package changes the way to set environment variables on NixOS systems where `programs.zsh.enable` equals `false`.  It now sources `/etc/set-environment` when reading the system-level `zshenv` file.  Before, it sourced `/etc/profile` when reading the system-level `zprofile` file.
+
 - The `wordpress` service now takes configuration via the `services.wordpress.sites.<name>.settings` attribute set, `extraConfig` is still available to append  additional text to `wp-config.php`.
 
 - To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services.
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 5a003b889a04..3a5a83ad1f8c 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "--enable-multibyte"
     "--with-tcsetpgrp"
     "--enable-pcre"
-    "--enable-zprofile=${placeholder "out"}/etc/zprofile"
+    "--enable-zshenv=${placeholder "out"}/etc/zshenv"
     "--disable-site-fndir"
   ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [
     # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba
@@ -64,34 +64,36 @@ stdenv.mkDerivation {
   postInstall = ''
     make install.info install.html
     mkdir -p $out/etc/
-    cat > $out/etc/zprofile <<EOF
+    cat > $out/etc/zshenv <<EOF
 if test -e /etc/NIXOS; then
-  if test -r /etc/zprofile; then
-    . /etc/zprofile
+  if test -r /etc/zshenv; then
+    . /etc/zshenv
   else
     emulate bash
     alias shopt=false
-    . /etc/profile
+    if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+      . /etc/set-environment
+    fi
     unalias shopt
     emulate zsh
   fi
-  if test -r /etc/zprofile.local; then
-    . /etc/zprofile.local
+  if test -r /etc/zshenv.local; then
+    . /etc/zshenv.local
   fi
 else
-  # on non-nixos we just source the global /etc/zprofile as if we did
+  # on non-nixos we just source the global /etc/zshenv as if we did
   # not use the configure flag
-  if test -r /etc/zprofile; then
-    . /etc/zprofile
+  if test -r /etc/zshenv; then
+    . /etc/zshenv
   fi
 fi
 EOF
     ${if stdenv.hostPlatform == stdenv.buildPlatform then ''
-      $out/bin/zsh -c "zcompile $out/etc/zprofile"
+      $out/bin/zsh -c "zcompile $out/etc/zshenv"
     '' else ''
-      ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile"
+      ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zshenv"
     ''}
-    mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
+    mv $out/etc/zshenv $out/etc/zshenv_zwc_is_used
 
     rm $out/bin/zsh-${version}
     mkdir -p $out/share/doc/

From a8e44411d65222b0af2ec3d1b641e7f1b82eb87d Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Fri, 17 Feb 2023 19:31:55 -0500
Subject: [PATCH 017/247] sparrow: 1.7.1 -> 1.7.3

---
 .../blockchains/sparrow/default.nix           | 29 ++++--------------
 .../blockchains/sparrow/fhsenv.nix            | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 +++--
 3 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/applications/blockchains/sparrow/fhsenv.nix

diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix
index 85d5abdd178c..d7f1963a3c89 100644
--- a/pkgs/applications/blockchains/sparrow/default.nix
+++ b/pkgs/applications/blockchains/sparrow/default.nix
@@ -20,11 +20,11 @@
 
 let
   pname = "sparrow";
-  version = "1.7.1";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
-    sha256 = "0q31b4ncvbhr9gb47wplphg43pwlg5vpd1b12qiidqlrkgm2vjy8";
+    sha256 = "sha256-/tKct73v0zWAjY4kTllnb/+SB/8ENgVl8Yh/LErKTxY=";
   };
 
   launcher = writeScript "sparrow" ''
@@ -156,24 +156,6 @@ let
       ln -s ${hwi}/bin/hwi $out/modules/com.sparrowwallet.sparrow/native/linux/x64/hwi
     '';
   };
-
-  # To use the udev rules for connected hardware wallets,
-  # add "pkgs.sparrow" to "services.udev.packages" and add user accounts to the user group "plugdev".
-  udev-rules = stdenv.mkDerivation {
-    name = "sparrow-udev";
-
-    src = let version = "2.0.2"; in
-      fetchurl {
-        url = "https://github.com/bitcoin-core/HWI/releases/download/${version}/hwi-${version}.tar.gz";
-        sha256 = "sha256-di1fRsMbwpHcBFNTCVivfxpwhUoUKLA3YTnJxKq/jHM=";
-      };
-
-    installPhase = ''
-      mkdir -p $out/etc/udev/rules.d
-      cp -a hwilib/udev/* $out/etc/udev/rules.d
-      rm $out/etc/udev/rules.d/README.md
-    '';
-  };
 in
 stdenv.mkDerivation rec {
   inherit pname version src;
@@ -186,8 +168,9 @@ stdenv.mkDerivation rec {
       icon = pname;
       desktopName = "Sparrow Bitcoin Wallet";
       genericName = "Bitcoin Wallet";
-      categories = [ "Finance" ];
+      categories = [ "Finance" "Network" ];
       mimeTypes = [ "application/psbt" "application/bitcoin-transaction" "x-scheme-handler/bitcoin" "x-scheme-handler/auth47" "x-scheme-handler/lightning" ];
+      startupWMClass = "Sparrow";
     })
   ];
 
@@ -217,8 +200,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/icons
     ln -s ${sparrow-icons}/hicolor $out/share/icons
 
-    mkdir -p $out/etc/udev
-    ln -s ${udev-rules}/etc/udev/rules.d $out/etc/udev/rules.d
+    mkdir -p $out/etc/udev/rules.d
+    cp ${hwi}/lib/python*/site-packages/hwilib/udev/*.rules $out/etc/udev/rules.d
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix
new file mode 100644
index 000000000000..a82b975227c1
--- /dev/null
+++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildFHSUserEnv
+, sparrow-unwrapped
+}:
+
+buildFHSUserEnv {
+  name = "sparrow";
+
+  runScript = "${sparrow-unwrapped}/bin/sparrow";
+
+  targetPkgs = pkgs: with pkgs; [
+    sparrow-unwrapped
+    pcsclite
+  ];
+
+  multiPkgs = pkgs: with pkgs; [
+    pcsclite
+  ];
+
+  extraInstallCommands = ''
+    mkdir -p $out/share
+    ln -s ${sparrow-unwrapped}/share/applications $out/share
+    ln -s ${sparrow-unwrapped}/share/icons $out/share
+
+    mkdir -p $out/etc/udev
+    ln -s ${sparrow-unwrapped}/etc/udev/rules.d $out/etc/udev/rules.d
+  '';
+
+  meta = sparrow-unwrapped.meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1c8cad8e0e7..4ed295b8b008 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12267,8 +12267,12 @@ with pkgs;
 
   sozu = callPackage ../servers/sozu { };
 
-  sparrow = callPackage ../applications/blockchains/sparrow {
-    openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix { };
+  sparrow-unwrapped = callPackage ../applications/blockchains/sparrow {
+    openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {};
+  };
+
+  sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix {
+    buildFHSUserEnv = buildFHSUserEnvBubblewrap;
   };
 
   sparsehash = callPackage ../development/libraries/sparsehash { };

From eb561a3af2ba2c5fc6f9abb6dcf38beb348663ca Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Wed, 8 Mar 2023 15:03:15 -0500
Subject: [PATCH 018/247] sparrow: enable JavaFX

See #206643
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed295b8b008..c38309ab3487 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12269,6 +12269,7 @@ with pkgs;
 
   sparrow-unwrapped = callPackage ../applications/blockchains/sparrow {
     openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {};
+    openjdk = openjdk.override { enableJavaFX = true; };
   };
 
   sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix {

From 4d8df72e93261fd31157b74eb44bf8441f04547c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 16:58:50 +0100
Subject: [PATCH 019/247] xmlbeans: 5.0.2-20211014 -> 5.1.1-20220819, remove
 myself as maintainer

---
 pkgs/tools/misc/xmlbeans/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/tools/misc/xmlbeans/default.nix
index ce174b195412..f3702d0302c5 100644
--- a/pkgs/tools/misc/xmlbeans/default.nix
+++ b/pkgs/tools/misc/xmlbeans/default.nix
@@ -2,11 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "xmlbeans";
-  version = "5.0.2-20211014";
+  version = "5.1.1-20220819";
 
   src = fetchzip {
-    url = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip";
-    sha256 = "sha256-1o0kfBMhka/Midtg+GzpVDDygixL6mrfxtY5WrjLN+0=";
+    # old releases are deleted from the cdn
+    url = "https://web.archive.org/web/20230313151507/https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip";
+    sha256 = "sha256-TDnWo1uJWL6k6Z8/uaF2LBNzRVQMHYopYze/2Fb/0aI=";
   };
 
   postPatch = ''
@@ -34,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://xmlbeans.apache.org/";
     downloadPage = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [ ];
   };
 }

From e4959cfe9788ccc641250580d4b26af6e68aed6d Mon Sep 17 00:00:00 2001
From: huantian <davidtianli@gmail.com>
Date: Thu, 1 Dec 2022 14:44:59 -0700
Subject: [PATCH 020/247] unityhub: 2.3.2 -> 3.4.1

---
 pkgs/development/tools/unityhub/default.nix | 142 ++++++++++++++++----
 1 file changed, 113 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index 4a6ca92e964b..cc56aea7df42 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -1,45 +1,129 @@
-{ lib, fetchurl, appimageTools  }:
+{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
+, extraPkgs ? pkgs: [ ]
+, extraLibs ? pkgs: [ ]
+}:
 
-appimageTools.wrapType2 rec {
+stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "2.3.2";
+  version = "3.4.1";
 
   src = fetchurl {
-    # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage
-    url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";
-    sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";
+    url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
+    sha256 = "sha256-/P6gPLSRGfwEN801cyNrZTpHyZKO+4tU6cFvLz8ERuo=";
   };
 
-  extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr
-    alsa-lib cups libcap fontconfig freetype pango
-    cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb
-    libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
 
-    libX11 libXcursor libXdamage libXfixes libXrender libXi
-    libXcomposite libXext libXrandr libXtst libSM libICE libxcb
+  fhsEnv = buildFHSUserEnv {
+    name = "${pname}-fhs-env";
+    runScript = "";
 
-    libselinux pciutils libpulseaudio libxml2 icu clang cacert
-  ]);
+    # Seems to be needed for GTK filepickers to work in FHSUserEnv
+    profile = "XDG_DATA_DIRS=\"\$XDG_DATA_DIRS:/usr/share/\"";
 
-  extraInstallCommands =
-    let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in
-    ''
-      install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications
-      substituteInPlace $out/share/applications/unityhub.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}'
-      install -m 444 -D ${appimageContents}/unityhub.png \
-        $out/share/icons/hicolor/64x64/apps/unityhub.png
-    '';
+    targetPkgs = pkgs: with pkgs; [
+      xorg.libXrandr
+
+      # GTK filepicker
+      gsettings-desktop-schemas
+      hicolor-icon-theme
+
+      # Bug Reporter dependencies
+      fontconfig
+      freetype
+      lsb-release
+    ] ++ extraPkgs pkgs;
+
+    multiPkgs = pkgs: with pkgs; [
+      # Unity Hub ldd dependencies
+      cups
+      gtk3
+      expat
+      libxkbcommon
+      lttng-ust_2_12
+      krb5
+      alsa-lib
+      nss_latest
+      libdrm
+      mesa
+      nspr
+      atk
+      dbus
+      at-spi2-core
+      pango
+      xorg.libXcomposite
+      xorg.libXext
+      xorg.libXdamage
+      xorg.libXfixes
+      xorg.libxcb
+      xorg.libxshmfence
+      xorg.libXScrnSaver
+      xorg.libXtst
+
+      # Unity Hub additional dependencies
+      libva
+      openssl_1_1
+      cairo
+      xdg-utils
+      libnotify
+      libuuid
+      libsecret
+      udev
+      libappindicator
+      wayland
+      cpio
+      icu
+      libpulseaudio
+
+      # Editor dependencies
+      libglvnd # provides ligbl
+      xorg.libX11
+      xorg.libXcursor
+      glib
+      gdk-pixbuf
+      libxml2
+      zlib
+      clang
+      git # for git-based packages in unity package manager
+    ] ++ extraLibs pkgs;
+  };
+
+  unpackCmd = "dpkg -x $curSrc src";
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv opt/ usr/share/ $out
+
+    # `/opt/unityhub/unityhub` is a shell wrapper that runs `/opt/unityhub/unityhub-bin`
+    # Which we don't need and overwrite with our own custom wrapper
+    makeWrapper ${fhsEnv}/bin/${pname}-fhs-env $out/opt/unityhub/unityhub \
+      --add-flags $out/opt/unityhub/unityhub-bin \
+      --argv0 unityhub
+
+    # Link binary
+    mkdir -p $out/bin
+    ln -s $out/opt/unityhub/unityhub $out/bin/unityhub
+
+    # Replace absolute path in desktop file to correctly point to nix store
+    substituteInPlace $out/share/applications/unityhub.desktop \
+      --replace /opt/unityhub/unityhub $out/opt/unityhub/unityhub
+
+    runHook postInstall
+  '';
 
   meta = with lib; {
+    description = "Official Unity3D app to download and manage Unity Projects and installations";
     homepage = "https://unity3d.com/";
-    description = "Game development tool";
-    longDescription = ''
-      Popular development platform for creating 2D and 3D multiplatform games
-      and interactive experiences.
-    '';
     license = licenses.unfree;
+    maintainers = with maintainers; [ tesq0 huantian ];
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ tesq0 ];
   };
 }

From 17ea94881f78ff37d0123bc67ee82471d6d014ca Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Thu, 22 Dec 2022 13:29:17 -0600
Subject: [PATCH 021/247] octavePackages: add automatic updating script based
 on Python's

This script is heavily based on the script used to update all python
libraries at
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py

The Octave Packages' website uses YAML as their basis, so we must
reformat to use YAML instead of JSON.
---
 maintainers/scripts/update-octave-packages    | 468 ++++++++++++++++++
 maintainers/scripts/update-octave-shell.nix   |  12 +
 .../octave/build-octave-package.nix           |  12 +-
 3 files changed, 491 insertions(+), 1 deletion(-)
 create mode 100755 maintainers/scripts/update-octave-packages
 create mode 100644 maintainers/scripts/update-octave-shell.nix

diff --git a/maintainers/scripts/update-octave-packages b/maintainers/scripts/update-octave-packages
new file mode 100755
index 000000000000..00a1646184d5
--- /dev/null
+++ b/maintainers/scripts/update-octave-packages
@@ -0,0 +1,468 @@
+#!/usr/bin/env nix-shell
+#!nix-shell update-octave-shell.nix -i python3
+
+"""
+Update a Octave package expression by passing in the `.nix` file, or the directory containing it.
+You can pass in multiple files or paths.
+
+You'll likely want to use
+``
+  $ ./update-octave-libraries ../../pkgs/development/octave-modules/**/default.nix
+``
+to update all non-pinned libraries in that folder.
+"""
+
+import argparse
+import os
+import pathlib
+import re
+import requests
+import yaml
+from concurrent.futures import ThreadPoolExecutor as Pool
+from packaging.version import Version as _Version
+from packaging.version import InvalidVersion
+from packaging.specifiers import SpecifierSet
+import collections
+import subprocess
+import tempfile
+
+INDEX = "https://raw.githubusercontent.com/gnu-octave/packages/main/packages"
+"""url of Octave packages' source on GitHub"""
+
+EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip']
+"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+
+PRERELEASES = False
+
+GIT = "git"
+
+NIXPGKS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip()
+
+import logging
+logging.basicConfig(level=logging.INFO)
+
+
+class Version(_Version, collections.abc.Sequence):
+
+    def __init__(self, version):
+        super().__init__(version)
+        # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
+        # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
+        self.raw_version = version
+
+    def __getitem__(self, i):
+        return self._version.release[i]
+
+    def __len__(self):
+        return len(self._version.release)
+
+    def __iter__(self):
+        yield from self._version.release
+
+
+def _get_values(attribute, text):
+    """Match attribute in text and return all matches.
+
+    :returns: List of matches.
+    """
+    regex = '{}\s+=\s+"(.*)";'.format(attribute)
+    regex = re.compile(regex)
+    values = regex.findall(text)
+    return values
+
+def _get_unique_value(attribute, text):
+    """Match attribute in text and return unique match.
+
+    :returns: Single match.
+    """
+    values = _get_values(attribute, text)
+    n = len(values)
+    if n > 1:
+        raise ValueError("found too many values for {}".format(attribute))
+    elif n == 1:
+        return values[0]
+    else:
+        raise ValueError("no value found for {}".format(attribute))
+
+def _get_line_and_value(attribute, text):
+    """Match attribute in text. Return the line and the value of the attribute."""
+    regex = '({}\s+=\s+"(.*)";)'.format(attribute)
+    regex = re.compile(regex)
+    value = regex.findall(text)
+    n = len(value)
+    if n > 1:
+        raise ValueError("found too many values for {}".format(attribute))
+    elif n == 1:
+        return value[0]
+    else:
+        raise ValueError("no value found for {}".format(attribute))
+
+
+def _replace_value(attribute, value, text):
+    """Search and replace value of attribute in text."""
+    old_line, old_value = _get_line_and_value(attribute, text)
+    new_line = old_line.replace(old_value, value)
+    new_text = text.replace(old_line, new_line)
+    return new_text
+
+
+def _fetch_page(url):
+    r = requests.get(url)
+    if r.status_code == requests.codes.ok:
+        return list(yaml.safe_load_all(r.content))[0]
+    else:
+        raise ValueError("request for {} failed".format(url))
+
+
+def _fetch_github(url):
+    headers = {}
+    token = os.environ.get('GITHUB_API_TOKEN')
+    if token:
+        headers["Authorization"] = f"token {token}"
+    r = requests.get(url, headers=headers)
+
+    if r.status_code == requests.codes.ok:
+        return r.json()
+    else:
+        raise ValueError("request for {} failed".format(url))
+
+
+SEMVER = {
+    'major' : 0,
+    'minor' : 1,
+    'patch' : 2,
+}
+
+
+def _determine_latest_version(current_version, target, versions):
+    """Determine latest version, given `target`, returning the more recent version.
+    """
+    current_version = Version(current_version)
+
+    def _parse_versions(versions):
+        for v in versions:
+            try:
+                yield Version(v)
+            except InvalidVersion:
+                pass
+
+    versions = _parse_versions(versions)
+
+    index = SEMVER[target]
+
+    ceiling = list(current_version[0:index])
+    if len(ceiling) == 0:
+        ceiling = None
+    else:
+        ceiling[-1]+=1
+        ceiling = Version(".".join(map(str, ceiling)))
+
+    # We do not want prereleases
+    versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
+
+    if ceiling is not None:
+        versions = SpecifierSet(f"<{ceiling}").filter(versions)
+
+    return (max(sorted(versions))).raw_version
+
+
+def _get_latest_version_octave_packages(package, extension, current_version, target):
+    """Get latest version and hash from Octave Packages."""
+    url = "{}/{}.yaml".format(INDEX, package)
+    yaml = _fetch_page(url)
+
+    versions = list(map(lambda pv: pv['id'], yaml['versions']))
+    version = _determine_latest_version(current_version, target, versions)
+
+    try:
+        releases = [v if v['id'] == version else None for v in yaml['versions']]
+    except KeyError as e:
+        raise KeyError('Could not find version {} for {}'.format(version, package)) from e
+    for release in releases:
+        if release['url'].endswith(extension):
+            sha256 = release['sha256']
+            break
+    else:
+        sha256 = None
+    return version, sha256, None
+
+
+def _get_latest_version_github(package, extension, current_version, target):
+    def strip_prefix(tag):
+        return re.sub("^[^0-9]*", "", tag)
+
+    def get_prefix(string):
+        matches = re.findall(r"^([^0-9]*)", string)
+        return next(iter(matches), "")
+
+    # when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set
+    # this allows us to work with packages which live outside of octave-modules
+    attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"octavePackages.{package}")
+    try:
+        homepage = subprocess.check_output(
+            ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\
+            .decode('utf-8')
+    except Exception as e:
+        raise ValueError(f"Unable to determine homepage: {e}")
+    owner_repo = homepage[len("https://github.com/"):]  # remove prefix
+    owner, repo = owner_repo.split("/")
+
+    url = f"https://api.github.com/repos/{owner}/{repo}/releases"
+    all_releases = _fetch_github(url)
+    releases = list(filter(lambda x: not x['prerelease'], all_releases))
+
+    if len(releases) == 0:
+        raise ValueError(f"{homepage} does not contain any stable releases")
+
+    versions = map(lambda x: strip_prefix(x['tag_name']), releases)
+    version = _determine_latest_version(current_version, target, versions)
+
+    release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases))
+    prefix = get_prefix(release['tag_name'])
+    try:
+        sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\
+            .decode('utf-8').strip()
+    except:
+        # this may fail if they have both a branch and a tag of the same name, attempt tag name
+        tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags")
+        sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\
+            .decode('utf-8').strip()
+
+
+    return version, sha256, prefix
+
+def _get_latest_version_git(package, extension, current_version, target):
+    """NOTE: Unimplemented!"""
+    # attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"octavePackages.{package}")
+    # try:
+    #     download_url = subprocess.check_output(
+    #         ["nix", "--extra-experimental-features", "nix-command", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.url"])\
+    #         .decode('utf-8')
+    # except Exception as e:
+    #     raise ValueError(f"Unable to determine download link: {e}")
+
+    # with tempfile.TemporaryDirectory(prefix=attr_path) as new_clone_location:
+    #     subprocess.run(["git", "clone", download_url, new_clone_location])
+    #     newest_commit = subprocess.check_output(
+    #         ["git" "rev-parse" "$(git branch -r)" "|" "tail" "-n" "1"]).decode('utf-8')
+    pass
+
+
+FETCHERS = {
+    'fetchFromGitHub'   :   _get_latest_version_github,
+    'fetchurl'          :   _get_latest_version_octave_packages,
+    'fetchgit'          :   _get_latest_version_git,
+}
+
+
+DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
+
+
+FORMATS = {
+    'setuptools'        :   DEFAULT_SETUPTOOLS_EXTENSION,
+}
+
+def _determine_fetcher(text):
+    # Count occurrences of fetchers.
+    nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
+    if nfetchers == 0:
+        raise ValueError("no fetcher.")
+    elif nfetchers > 1:
+        raise ValueError("multiple fetchers.")
+    else:
+        # Then we check which fetcher to use.
+        for fetcher in FETCHERS.keys():
+            if 'src = {}'.format(fetcher) in text:
+                return fetcher
+
+
+def _determine_extension(text, fetcher):
+    """Determine what extension is used in the expression.
+
+    If we use:
+    - fetchPypi, we check if format is specified.
+    - fetchurl, we determine the extension from the url.
+    - fetchFromGitHub we simply use `.tar.gz`.
+    """
+    if fetcher == 'fetchurl':
+        url = _get_unique_value('url', text)
+        extension = os.path.splitext(url)[1]
+
+    elif fetcher == 'fetchFromGitHub' or fetcher == 'fetchgit':
+        if "fetchSubmodules" in text:
+            raise ValueError("fetchFromGitHub fetcher doesn't support submodules")
+        extension = "tar.gz"
+
+    return extension
+
+
+def _update_package(path, target):
+
+    # Read the expression
+    with open(path, 'r') as f:
+        text = f.read()
+
+    # Determine pname. Many files have more than one pname
+    pnames = _get_values('pname', text)
+
+    # Determine version.
+    version = _get_unique_value('version', text)
+
+    # First we check how many fetchers are mentioned.
+    fetcher = _determine_fetcher(text)
+
+    extension = _determine_extension(text, fetcher)
+
+    # Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo
+    successful_fetch = False
+    for pname in pnames:
+        if fetcher == "fetchgit":
+            logging.warning(f"You must update {pname} MANUALLY!")
+            return { 'path': path, 'target': target, 'pname': pname,
+                     'old_version': version, 'new_version': version }
+        try:
+            new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
+            successful_fetch = True
+            break
+        except ValueError:
+            continue
+
+    if not successful_fetch:
+        raise ValueError(f"Unable to find correct package using these pnames: {pnames}")
+
+    if new_version == version:
+        logging.info("Path {}: no update available for {}.".format(path, pname))
+        return False
+    elif Version(new_version) <= Version(version):
+        raise ValueError("downgrade for {}.".format(pname))
+    if not new_sha256:
+        raise ValueError("no file available for {}.".format(pname))
+
+    text = _replace_value('version', new_version, text)
+    # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts
+    # sri hashes have been the default format since nix 2.4+
+    sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
+
+
+    # fetchers can specify a sha256, or a sri hash
+    try:
+        text = _replace_value('sha256', sri_hash, text)
+    except ValueError:
+        text = _replace_value('hash', sri_hash, text)
+
+    if fetcher == 'fetchFromGitHub':
+        # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
+        # in which no string value is meant to be substituted. However, we can just overwrite the previous value.
+        regex = '(rev\s+=\s+[^;]*;)'
+        regex = re.compile(regex)
+        matches = regex.findall(text)
+        n = len(matches)
+
+        if n == 0:
+            raise ValueError("Unable to find rev value for {}.".format(pname))
+        else:
+            # forcefully rewrite rev, incase tagging conventions changed for a release
+            match = matches[0]
+            text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";')
+            # incase there's no prefix, just rewrite without interpolation
+            text = text.replace('"${version}";', 'version;')
+
+    with open(path, 'w') as f:
+        f.write(text)
+
+        logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
+
+    result = {
+        'path'  : path,
+        'target': target,
+        'pname': pname,
+        'old_version'   : version,
+        'new_version'   : new_version,
+        #'fetcher'       : fetcher,
+        }
+
+    return result
+
+
+def _update(path, target):
+
+    # We need to read and modify a Nix expression.
+    if os.path.isdir(path):
+        path = os.path.join(path, 'default.nix')
+
+    # If a default.nix does not exist, we quit.
+    if not os.path.isfile(path):
+        logging.info("Path {}: does not exist.".format(path))
+        return False
+
+    # If file is not a Nix expression, we quit.
+    if not path.endswith(".nix"):
+        logging.info("Path {}: does not end with `.nix`.".format(path))
+        return False
+
+    try:
+        return _update_package(path, target)
+    except ValueError as e:
+        logging.warning("Path {}: {}".format(path, e))
+        return False
+
+
+def _commit(path, pname, old_version, new_version, pkgs_prefix="octave: ", **kwargs):
+    """Commit result.
+    """
+
+    msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}'
+
+    try:
+        subprocess.check_call([GIT, 'add', path])
+        subprocess.check_call([GIT, 'commit', '-m', msg])
+    except subprocess.CalledProcessError as e:
+        subprocess.check_call([GIT, 'checkout', path])
+        raise subprocess.CalledProcessError(f'Could not commit {path}') from e
+
+    return True
+
+
+def main():
+
+    epilog = """
+environment variables:
+  GITHUB_API_TOKEN\tGitHub API token used when updating github packages
+    """
+    parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog)
+    parser.add_argument('package', type=str, nargs='+')
+    parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
+    parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
+    parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use octavePackages.${pname}: instead of octave: ${pname}: when making commits')
+
+    args = parser.parse_args()
+    target = args.target
+
+    packages = list(map(os.path.abspath, args.package))
+
+    logging.info("Updating packages...")
+
+    # Use threads to update packages concurrently
+    with Pool() as p:
+        results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages)))
+
+    logging.info("Finished updating packages.")
+
+    commit_options = {}
+    if args.use_pkgs_prefix:
+        logging.info("Using octavePackages. prefix for commits")
+        commit_options["pkgs_prefix"] = "octavePackages."
+
+    # Commits are created sequentially.
+    if args.commit:
+        logging.info("Committing updates...")
+        # list forces evaluation
+        list(map(lambda x: _commit(**x, **commit_options), results))
+        logging.info("Finished committing updates")
+
+    count = len(results)
+    logging.info("{} package(s) updated".format(count))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/maintainers/scripts/update-octave-shell.nix b/maintainers/scripts/update-octave-shell.nix
new file mode 100644
index 000000000000..51d4844c79f3
--- /dev/null
+++ b/maintainers/scripts/update-octave-shell.nix
@@ -0,0 +1,12 @@
+{ nixpkgs ? import ../.. { }
+}:
+with nixpkgs;
+let
+  pyEnv = python3.withPackages(ps: with ps; [ packaging requests toolz pyyaml ]);
+in
+mkShell {
+  packages = [
+    pyEnv
+    nix-prefetch-scripts
+  ];
+}
diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix
index 065992f91271..30f9bc3b5e1c 100644
--- a/pkgs/development/interpreters/octave/build-octave-package.nix
+++ b/pkgs/development/interpreters/octave/build-octave-package.nix
@@ -62,13 +62,21 @@ let
   ]
   ++ nativeBuildInputs;
 
+  passthru' = {
+    updateScript = [
+      ../../../../maintainers/scripts/update-octave-packages
+      (builtins.unsafeGetAttrPos "pname" octave.pkgs.${attrs.pname}).file
+    ];
+  }
+  // passthru;
+
   # This step is required because when
   # a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; };
   # (a // b).test = [ "c" "d" ];
   # This used to mean that if a package defined extra nativeBuildInputs, it
   # would override the ones for building an Octave package (the hook and Octave
   # itself, causing everything to fail.
-  attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" ];
+  attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" "passthru" ];
 
 in stdenv.mkDerivation ({
   packageName = "${fullLibName}";
@@ -121,5 +129,7 @@ in stdenv.mkDerivation ({
   # together with Octave.
   dontInstall = true;
 
+  passthru = passthru';
+
   inherit meta;
 } // attrs')

From be699cf06b37f1ec9e5a22b7b3273ea15827d445 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 23 Dec 2022 10:48:21 -0600
Subject: [PATCH 022/247] octavePackages: run update script on all packages

octavePackages.arduino: 0.7.0 -> 0.10.0

octavePackages.audio: 2.0.3 -> 2.0.5

octavePackages.bim: 1.1.5 -> 1.1.6

octavePackages.communications: 1.2.3 -> 1.2.4

octavePackages.control: 3.3.1 -> 3.4.0

octavePackages.dicom: 0.4.0 -> 0.5.1

octavePackages.ga: 0.10.2 -> 0.10.3

octavePackages.general: 2.1.1 -> 2.1.2

octavePackages.generate_html: 0.3.2 -> 0.3.3

octavePackages.image: 2.12.0 -> 2.14.0

octavePackages.instrument-control: 0.7.0 -> 0.8.0

octavePackages.interval: 3.2.0 -> 3.2.1

octavePackages.io: 2.6.3 -> 2.6.4

octavePackages.mapping: 1.4.1 -> 1.4.2

octavePackages.msh: 1.0.10 -> 1.0.12

octavePackages.nan: 3.6.0 -> 3.7.0

octavePackages.ncarray: 1.0.4 -> 1.0.5

octavePackages.netcdf: 1.0.14 -> 1.0.16

octavePackages.ocl: 1.1.1 -> 1.2.0

octavePackages.octclip: 2.0.1 -> 2.0.3

octavePackages.octproj: 2.0.1 -> 3.0.2

octavePackages.optim: 1.6.1 -> 1.6.2

octavePackages.optiminterp: 0.3.6 -> 0.3.7

octavePackages.signal: 1.4.2 -> 1.4.3

octavePackages.sockets: 1.2.1 -> 1.4.0

octavePackages.statistics: 1.4.2 -> 1.5.2

octavePackages.stk: 2.6.1 -> 2.7.0

octavePackages.strings: 1.2.0 -> 1.3.0

octavePackages.struct: 1.0.17 -> 1.0.18

octavePackages.video: 2.0.0 -> 2.0.2

octavePackages.windows: 1.6.1 -> 1.6.3

octavePackages.zeromq: 1.5.3 -> 1.5.5
---
 pkgs/development/octave-modules/arduino/default.nix           | 4 ++--
 pkgs/development/octave-modules/audio/default.nix             | 4 ++--
 pkgs/development/octave-modules/bim/default.nix               | 4 ++--
 pkgs/development/octave-modules/communications/default.nix    | 4 ++--
 pkgs/development/octave-modules/control/default.nix           | 4 ++--
 pkgs/development/octave-modules/dicom/default.nix             | 4 ++--
 pkgs/development/octave-modules/ga/default.nix                | 4 ++--
 pkgs/development/octave-modules/general/default.nix           | 4 ++--
 pkgs/development/octave-modules/generate_html/default.nix     | 4 ++--
 .../development/octave-modules/instrument-control/default.nix | 4 ++--
 pkgs/development/octave-modules/interval/default.nix          | 4 ++--
 pkgs/development/octave-modules/io/default.nix                | 4 ++--
 pkgs/development/octave-modules/mapping/default.nix           | 4 ++--
 pkgs/development/octave-modules/msh/default.nix               | 4 ++--
 pkgs/development/octave-modules/nan/default.nix               | 4 ++--
 pkgs/development/octave-modules/ncarray/default.nix           | 4 ++--
 pkgs/development/octave-modules/netcdf/default.nix            | 4 ++--
 pkgs/development/octave-modules/ocl/default.nix               | 4 ++--
 pkgs/development/octave-modules/octclip/default.nix           | 4 ++--
 pkgs/development/octave-modules/octproj/default.nix           | 4 ++--
 pkgs/development/octave-modules/optim/default.nix             | 4 ++--
 pkgs/development/octave-modules/optiminterp/default.nix       | 4 ++--
 pkgs/development/octave-modules/signal/default.nix            | 4 ++--
 pkgs/development/octave-modules/sockets/default.nix           | 4 ++--
 pkgs/development/octave-modules/statistics/default.nix        | 4 ++--
 pkgs/development/octave-modules/stk/default.nix               | 4 ++--
 pkgs/development/octave-modules/strings/default.nix           | 4 ++--
 pkgs/development/octave-modules/struct/default.nix            | 4 ++--
 pkgs/development/octave-modules/video/default.nix             | 4 ++--
 pkgs/development/octave-modules/windows/default.nix           | 4 ++--
 pkgs/development/octave-modules/zeromq/default.nix            | 4 ++--
 31 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/octave-modules/arduino/default.nix b/pkgs/development/octave-modules/arduino/default.nix
index fd97c55a40e9..3cd5838590f8 100644
--- a/pkgs/development/octave-modules/arduino/default.nix
+++ b/pkgs/development/octave-modules/arduino/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "arduino";
-  version = "0.7.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0r0bcq2zkwba6ab6yi6czbhrj4adm9m9ggxmzzcd9h40ckqg6wjv";
+    sha256 = "sha256-p9SDTXkIwnrkNXeVhzAHks7EL4NdwBokrH2j9hqAJqQ=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix
index c0b4551ceca7..6e00dd05fdd4 100644
--- a/pkgs/development/octave-modules/audio/default.nix
+++ b/pkgs/development/octave-modules/audio/default.nix
@@ -9,11 +9,11 @@
 
 buildOctavePackage rec {
   pname = "audio";
-  version = "2.0.3";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1431pf7mhxsrnzrx8r3hsy537kha7jhaligmp2rghwyxhq25hs0r";
+    sha256 = "sha256-/4akeeOQnvTlk9ah+e8RJfwJG2Eq2HAGOCejhiIUjF4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index 5dc8ca88710d..56865493e46b 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "bim";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0y70w8mj80c5yns1j7nwngwwrxp1pa87kyz2n2yvmc3zdigcd6g8";
+    sha256 = "sha256-pv64swrPlgopBlubpAlfoD9KJlOSgF9wdbgdHHTcr9c=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/communications/default.nix b/pkgs/development/octave-modules/communications/default.nix
index 6c517ec6e5b6..8348aba3c3e9 100644
--- a/pkgs/development/octave-modules/communications/default.nix
+++ b/pkgs/development/octave-modules/communications/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "communications";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1r4r0cia5l5fann1n78c1qdc6q8nizgb09n2fdwb76xnwjan23g3";
+    sha256 = "sha256-SfA81UP0c7VgroxSA/RZVVKZ4arl8Uhpf324F7yGFTo=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index 79dbb99fadff..c265fe71d492 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "3.3.1";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0vndbzix34vfzdlsz57bgkyg31as4kv6hfg9pwrcqn75bzzjsivw";
+    sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix
index e16b6447805e..e8f02deff546 100644
--- a/pkgs/development/octave-modules/dicom/default.nix
+++ b/pkgs/development/octave-modules/dicom/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "dicom";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "131wn6mrv20np10plirvqia8dlpz3g0aqi3mmn2wyl7r95p3dnza";
+    sha256 = "sha256-0qNqjpJWWBA0N5IgjV0e0SPQlCvbzIwnIgaWo+2wKw0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/ga/default.nix b/pkgs/development/octave-modules/ga/default.nix
index a5265a4ce450..83d444959423 100644
--- a/pkgs/development/octave-modules/ga/default.nix
+++ b/pkgs/development/octave-modules/ga/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "ga";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0s5azn4n174avlmh5gw21zfqfkyxkzn4v09q4l9swv7ldmg3mirv";
+    sha256 = "sha256-cbP7ucua7DdxLL422INxjZxz/x1pHoIq+jkjrtfaabE=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/general/default.nix b/pkgs/development/octave-modules/general/default.nix
index 52ad9af93b0f..8dabd86ef933 100644
--- a/pkgs/development/octave-modules/general/default.nix
+++ b/pkgs/development/octave-modules/general/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "general";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0jmvczssqz1aa665v9h8k9cchb7mg3n9af6b5kh9b2qcjl4r9l7v";
+    sha256 = "sha256-owzRp5dDxiUo2uRuvUqD+EiuRqHB2sPqq8NmYtQilM8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/generate_html/default.nix b/pkgs/development/octave-modules/generate_html/default.nix
index 83f3a65bedc2..2082aa7f8207 100644
--- a/pkgs/development/octave-modules/generate_html/default.nix
+++ b/pkgs/development/octave-modules/generate_html/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "generate_html";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1ai4h7jf9fqi7w565iprzylsh94pg4rhyf51hfj9kfdgdpb1abfs";
+    sha256 = "sha256-CHJ0+90+SNXmslLrQc+8aetSnHK0m9PqEBipFuFjwHw=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/instrument-control/default.nix b/pkgs/development/octave-modules/instrument-control/default.nix
index 17d9186da745..0b5429bd278c 100644
--- a/pkgs/development/octave-modules/instrument-control/default.nix
+++ b/pkgs/development/octave-modules/instrument-control/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "instrument-control";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0cdnnbxihz7chdkhkcgy46pvkij43z9alwr88627z7jaiaah6xby";
+    sha256 = "sha256-g3Pyz2b8hvg0MkFGA7cduYozcAd2UnqorBHzNs+Uuro=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/interval/default.nix b/pkgs/development/octave-modules/interval/default.nix
index 0891a6143852..8cf9d555678c 100644
--- a/pkgs/development/octave-modules/interval/default.nix
+++ b/pkgs/development/octave-modules/interval/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "interval";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0a0sz7b4y53qgk1xr4pannn4w7xiin2pf74x7r54hrr1wf4abp20";
+    sha256 = "sha256-OOUmQnN1cTIpqz2Gpf4/WghVB0fYQgVBcG/eqQk/3Og=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix
index 57058c5f95de..42effce5a045 100644
--- a/pkgs/development/octave-modules/io/default.nix
+++ b/pkgs/development/octave-modules/io/default.nix
@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "io";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "044y8lfp93fx0592mv6x2ss0nvjkjgvlci3c3ahav76pk1j3rikb";
+    sha256 = "sha256-p0pAC70ZIn9sB8WFiS3oec165S2CDaH2nxo+PolFL1o=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix
index 26cea27a7253..2c91fad72264 100644
--- a/pkgs/development/octave-modules/mapping/default.nix
+++ b/pkgs/development/octave-modules/mapping/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "mapping";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0wj0q1rkrqs4qgpjh4vn9kcpdh94pzr6v4jc1vcrjwkp87yjv8c0";
+    sha256 = "sha256-mrUQWqC15Ul5AHDvhMlNStqIMG2Zxa+hB2vDyeizLaI=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index a4e876c8128f..8ce1341419c0 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -13,11 +13,11 @@
 
 buildOctavePackage rec {
   pname = "msh";
-  version = "1.0.10";
+  version = "1.0.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1mb5qrp9y1w1cbzrd9v84430ldy57ca843yspnrgbcqpxyyxbgfz";
+    sha256 = "sha256-7xbB+RXq5SE7Ke5rNwSo/mqdSZTzCLXRhS4zdfGz55s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/nan/default.nix b/pkgs/development/octave-modules/nan/default.nix
index 3a972b76fdc6..e71d984a5eac 100644
--- a/pkgs/development/octave-modules/nan/default.nix
+++ b/pkgs/development/octave-modules/nan/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "nan";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1zxdg0yg5jnwq6ppnikd13zprazia6w6zpgw99f62mc03iqk5c4q";
+    sha256 = "sha256-d9J6BfNFeM5LtMqth0boSPd9giYU42KBnxrsUCmKK1s=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/ncarray/default.nix b/pkgs/development/octave-modules/ncarray/default.nix
index 10db554c87fc..c028ba7f1d3e 100644
--- a/pkgs/development/octave-modules/ncarray/default.nix
+++ b/pkgs/development/octave-modules/ncarray/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "ncarray";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0v96iziikvq2v7hczhbfs9zmk49v99kn6z3lgibqqpwam175yqgd";
+    sha256 = "sha256-HhQWLUA/6wqYi6TP3PC+N2zgi4UojDxbG9pgQzFaQ8c=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index 9292da6918cd..1eed28253580 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "netcdf";
-  version = "1.0.14";
+  version = "1.0.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1wdwl76zgcg7kkdxjfjgf23ylzb0x4dyfliffylyl40g6cjym9lf";
+    sha256 = "sha256-1Lr+6xLRXxSeUhM9+WdCUPFRZSWdxtAQlxpiv4CHJrs=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix
index 095b386e0736..21ba508500e9 100644
--- a/pkgs/development/octave-modules/ocl/default.nix
+++ b/pkgs/development/octave-modules/ocl/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "ocl";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0ayi5x9zk9p4zm0qsr3i94lyp5468c9d1a7mqrqjqpdvkhrw0xnm";
+    sha256 = "sha256-jQdwZwQNU3PZZFa3lp0hIr0GDt/XFHLJoq4waLI4gS8=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index 43bcfcd7d849..d8c607c391bd 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "octclip";
-  version = "2.0.1";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "05ijh3izgfaan84n6zp690nap9vnz0zicjd0cgvd1c6askm7vxql";
+    sha256 = "sha256-u6wvCibdkLgmC8Q2LlpVLfXR3LYtssYlO2cRqYPmmR8=";
   };
 
   # The only compilation problem is that no formatting specifier was provided
diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index 4bb2962ed6e1..0f76ab684708 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "octproj";
-  version = "2.0.1";
+  version = "3.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1mb8gb0r8kky47ap85h9qqdvs40mjp3ya0nkh45gqhy67ml06paq";
+    sha256 = "sha256-G2Ajnt4KGaq9hdXHLHL+6d9lGb83wkMHZqswNijwSzs=";
   };
 
   # The sed changes below allow for the package to be compiled.
diff --git a/pkgs/development/octave-modules/optim/default.nix b/pkgs/development/octave-modules/optim/default.nix
index 57a606d3d58d..5a99fc3f9a68 100644
--- a/pkgs/development/octave-modules/optim/default.nix
+++ b/pkgs/development/octave-modules/optim/default.nix
@@ -9,11 +9,11 @@
 
 buildOctavePackage rec {
   pname = "optim";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1175bckiryz0i6zm8zvq7y5rq3lwkmhyiky1gbn33np9qzxcsl3i";
+    sha256 = "sha256-VUqOGLtxla6GH1BZwU8aVXhEJlwa3bW/vzq5iFUkeH4=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/optiminterp/default.nix b/pkgs/development/octave-modules/optiminterp/default.nix
index 8409a10104e6..d830c563f73c 100644
--- a/pkgs/development/octave-modules/optiminterp/default.nix
+++ b/pkgs/development/octave-modules/optiminterp/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "optiminterp";
-  version = "0.3.6";
+  version = "0.3.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "05nzj2jmrczbnsr64w2a7kww19s6yialdqnsbg797v11ii7aiylc";
+    sha256 = "sha256-ubh/iOZlWTOYsTA6hJfPOituNBKTn2LbBnx+tmmSEug=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix
index b879b9f313a8..2579efc51889 100644
--- a/pkgs/development/octave-modules/signal/default.nix
+++ b/pkgs/development/octave-modules/signal/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "signal";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "YqTgYRfcxDw2FpkF+CVdAVSBypgq6ukBOw2d8+SOcGI=";
+    sha256 = "sha256-VFuXVA6+ujtCDwiQb905d/wpOzvI/Db2uosJTOqI8zk=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/sockets/default.nix b/pkgs/development/octave-modules/sockets/default.nix
index 688bd6a0e929..690c775f67e9 100644
--- a/pkgs/development/octave-modules/sockets/default.nix
+++ b/pkgs/development/octave-modules/sockets/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "sockets";
-  version = "1.2.1";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "18f1zpqcf6h9b4fb0x2c5nvc3mvgj1141f1s8d9gnlhlrjlq8vqg";
+    sha256 = "sha256-GNwFLNV1u3UKJp9lhLtCclD2VSKC9Mko1hBoSn5dTpI=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index 61133ec49e54..8067f257d3e7 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "statistics";
-  version = "1.4.2";
+  version = "1.5.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0iv2hw3zp7h69n8ncfjfgm29xaihdl5gp2slcw1yf23mhd7q2xkr";
+    sha256 = "sha256-JtXwR7bfFcRu6zRD1gGYG06Txmcu42w2C+zMXEiFf/U=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix
index 16ac7b7d03dc..fa67936d2bcd 100644
--- a/pkgs/development/octave-modules/stk/default.nix
+++ b/pkgs/development/octave-modules/stk/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "stk";
-  version = "2.6.1";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1rqndfankwlwm4igw3xqpnrrl749zz1d5pjzh1qbfns7ixwrm19a";
+    sha256 = "sha256-vIf+XDLvLNOMwptFCgiqfl+o3PIQ+KLpsJhOArd7gMM=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix
index cf5acd36855b..1d57aaf7f6a2 100644
--- a/pkgs/development/octave-modules/strings/default.nix
+++ b/pkgs/development/octave-modules/strings/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "strings";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1b0ravfvq3bxd0w3axjfsx13mmmkifmqz6pfdgyf2s8vkqnp1qng";
+    sha256 = "sha256-agpTD9FN1qdp+BYdW5f+GZV0zqZMNzeOdymdo27mTOI=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/octave-modules/struct/default.nix b/pkgs/development/octave-modules/struct/default.nix
index bd173aab1e37..91597d94f03e 100644
--- a/pkgs/development/octave-modules/struct/default.nix
+++ b/pkgs/development/octave-modules/struct/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "struct";
-  version = "1.0.17";
+  version = "1.0.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0cw4cspkm553v019zsj2bsmal0i378pm0hv29w82j3v5vysvndq1";
+    sha256 = "sha256-/M6n3YTBEE7TurtHoo8F4AEqicKE85qwlAkEUJFSlM4=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index 57868e83f55e..985ec3cfbf4e 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "video";
-  version = "2.0.0";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0s6j3c4dh5nsbh84s7vnd2ajcayy1gn07b4fcyrcynch3wl28mrv";
+    sha256 = "sha256-bZNaRnmJl5UF0bQMNoEWvoIXJaB0E6/V9eChE725OHY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/windows/default.nix b/pkgs/development/octave-modules/windows/default.nix
index bed63aef9263..2bcff7c48ea3 100644
--- a/pkgs/development/octave-modules/windows/default.nix
+++ b/pkgs/development/octave-modules/windows/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "windows";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "110dh6jz088c4fxp9gw79kfib0dl7r3rkcavxx4xpk7bjl2l3xb6";
+    sha256 = "sha256-U5Fe5mTn/ms8w9j6NdEtiRFZkKeyV0I3aR+zYQw4yIs=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/zeromq/default.nix b/pkgs/development/octave-modules/zeromq/default.nix
index 557a43a9820c..33c0d70464af 100644
--- a/pkgs/development/octave-modules/zeromq/default.nix
+++ b/pkgs/development/octave-modules/zeromq/default.nix
@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "zeromq";
-  version = "1.5.3";
+  version = "1.5.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1h0pb2pqbnyiavf7r05j8bqxqd8syz16ab48hc74nlnx727anfwl";
+    sha256 = "sha256-MAZEpbVuragVuXrMJ8q5/jU5cTchosAtrAR6ElLwfss=";
   };
 
   preAutoreconf = ''

From 4ddd5e48b7007128e8abe32fee65e4fdd708ef67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Mar 2023 18:51:18 -0700
Subject: [PATCH 023/247] python310Packages.etils: 1.0.0 -> 1.1.0

Changelog: https://github.com/google/etils/blob/v1.1.0/CHANGELOG.md
---
 pkgs/development/python-modules/etils/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index bcb47a4fac70..31dd7cac40fa 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "1.0.0";
+  version = "1.1.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0QmC93AkIr6oY11ShLi+1in1GRn8EirB4eSr9F7I94U=";
+    hash = "sha256-eipJUHeaKB70x+WVriFZkLFcHYxviwonhQCSr1rSxkE=";
   };
 
   nativeBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   passthru.optional-dependencies = rec {
     array-types = enp;
+    eapp = [ absl-py /* FIXME package simple-parsing */ ] ++ epy;
     ecolab = [ jupyter numpy mediapy ] ++ enp ++ epy;
     edc = epy;
     enp = [ numpy ] ++ epy;
@@ -53,8 +54,8 @@ buildPythonPackage rec {
     etree = array-types ++ epy ++ enp ++ etqdm;
     etree-dm = [ dm-tree ] ++ etree;
     etree-jax = [ jax ] ++ etree;
-    etree-tf = [ tensorflow etree ] ++ etree;
-    all = array-types ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm
+    etree-tf = [ tensorflow ] ++ etree;
+    all = array-types ++ eapp ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm
       ++ etree ++ etree-dm ++ etree-jax ++ etree-tf;
   };
 
@@ -73,14 +74,13 @@ buildPythonPackage rec {
   ++ passthru.optional-dependencies.all;
 
   disabledTests = [
-    "test_repr" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143
     "test_public_access" # requires network access
-    "test_resource_path" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143
   ];
 
   doCheck = false; # error: infinite recursion encountered
 
   meta = with lib; {
+    changelog = "https://github.com/google/etils/blob/v${version}/CHANGELOG.md";
     description = "Collection of eclectic utils for python";
     homepage = "https://github.com/google/etils";
     license = licenses.asl20;

From 62501a21e890f9b62cf2095d4ab0601ce7820ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Mar 2023 19:01:02 -0700
Subject: [PATCH 024/247] python310Packages.testcontainers: fix build

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

diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix
index 4a3c41009850..4da0d7702317 100644
--- a/pkgs/development/python-modules/testcontainers/default.nix
+++ b/pkgs/development/python-modules/testcontainers/default.nix
@@ -9,6 +9,8 @@ buildPythonPackage rec {
   pname = "testcontainers";
   version = "3.7.1";
 
+  format = "setuptools";
+
   src = fetchFromGitHub {
     owner = "testcontainers";
     repo = "testcontainers-python";
@@ -16,6 +18,10 @@ buildPythonPackage rec {
     hash = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM=";
   };
 
+  postPatch = ''
+    echo "${version}" > VERSION
+  '';
+
   buildInputs = [
     deprecation
     docker

From 79700ec6ed926fd1db76fec445d6d6c7d3ea83cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Mar 2023 19:21:16 -0700
Subject: [PATCH 025/247] python310Packages.tables: remove cython from
 requirements.txt

Transitive dependencies should not require Cython.
---
 pkgs/development/python-modules/tables/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index c2a2cd5e11a8..cb6670c785db 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -55,6 +55,7 @@ buildPythonPackage rec {
       --replace "return 0" "assert result.wasSuccessful(); return 0" \
       --replace "return 1" "assert result.wasSuccessful(); return 1"
     substituteInPlace requirements.txt \
+      --replace "cython>=0.29.21" "" \
       --replace "blosc2~=2.0.0" "blosc2"
   '';
 

From f6b69b23c91ffc05b8a69162a4f68e9625ecca6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Mar 2023 20:02:55 -0700
Subject: [PATCH 026/247] python310Packages.blosc2: remove pytest from
 runtime-requirements.txt

Transitive dependencies should not require pytest.
---
 pkgs/development/python-modules/blosc2/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index 027dd0ca8e19..87f23b04dcf0 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -35,6 +35,11 @@ buildPythonPackage rec {
     hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements-runtime.txt \
+      --replace "pytest" ""
+  '';
+
   nativeBuildInputs = [
     cmake
     cython

From 1c1e0891cc5d7a013370f9480a8e99ed501f82f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 15 Mar 2023 23:11:11 -0700
Subject: [PATCH 027/247] python310Packages.scooby: fix build

---
 pkgs/development/python-modules/scooby/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 0bd037a74fc7..ba9049e3ac7a 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "python_requires='>=3.7.*'" "python_requires='>=3.7'"
+  '';
+
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [

From dc937802ba1d00a0ff9211a73934bd0d788221ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 17 Mar 2023 14:13:32 +0100
Subject: [PATCH 028/247] dnscontrol: 3.27.2 -> 3.28.0

Diff: https://github.com/StackExchange/dnscontrol/compare/v3.27.2...v3.28.0
---
 pkgs/applications/networking/dnscontrol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index ef6d723f3bbe..3145b015b4ef 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "3.27.2";
+  version = "3.28.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2U5DlXnW+mCxGfdjikeMm+k+KyxDwjXmjGrH3uq4lJo=";
+    sha256 = "sha256-LIW5z8xb7o9oah6P3GvhzXTPRoBNuxYfZlGq4l0KS8M=";
   };
 
-  vendorHash = "sha256-h0n0dR1iqeVEFvcDeMlfBu7mlrSNloAih2ZhT3ML1FI=";
+  vendorHash = "sha256-fd3pf23Cw85RVYDrI9LYQIF0d3+o5VG+qqcN1c/xhuY=";
 
   ldflags = [ "-s" "-w" ];
 

From 91faebb585c5c0c5efbc32440a512e26c127a279 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Mar 2023 08:32:29 +0000
Subject: [PATCH 029/247] minio: 2023-02-27T18-10-45Z -> 2023-03-13T19-46-17Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index ff5063441299..d66397c761ca 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -15,16 +15,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2023-02-27T18-10-45Z";
+  version = "2023-03-13T19-46-17Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-0Qz64uNe5rkHOUepzCYUdeyP1ZXzY3Bi1LUvQw2quPA=";
+    sha256 = "sha256-dv1u/D0tU1PD6YfrDFICIC1S0Y4xgNcwYSTl9rJlufs=";
   };
 
-  vendorHash = "sha256-b/2/VTIVJyWNm6j+GyhbOKsIl9B0Nqw2fbpBw20Wicw=";
+  vendorHash = "sha256-iBgvfnXQnh5ZV8QsK6nK6hiHVB7l+ui7tVTGfa/Vuhc=";
 
   doCheck = false;
 

From 5bb320c54774b0742b98322dcfd5849d77db07c5 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 11 Mar 2023 15:46:06 +0100
Subject: [PATCH 030/247] gitkraken: 9.1.1 -> 9.2.1

---
 .../applications/version-management/gitkraken/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 434da9188ef7..2b7533ded60c 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -10,24 +10,24 @@ with lib;
 
 let
   pname = "gitkraken";
-  version = "9.1.1";
+  version = "9.2.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      sha256 = "sha256-CbIKdErthpMnVIuv+EJsWBRixMDG8h9aQ2XcmqpzKUc=";
+      sha256 = "sha256-JyfbCFh76b2ZWQ8J1xhsp8LYeFGdgJcUDgBCJWHf0Rk=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      sha256 = "sha256-J6ruK1UE0A9VG1tUHeSUDEL4wqRmUnOH8ftKHIIQuVc=";
+      sha256 = "sha256-sXWgxl+j78r/OhkMkQMQ6iUPz+SY+QDS4pvLErJTeRQ=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      sha256 = "sha256-cjz/pbV+uV6tbhj3NXDfZ93hgxFtNYhFIh6+jG4pFtU=";
+      sha256 = "sha256-1IsNJMfqpi+s2bHkB6Uo6FacvuRdLpkF+ctmi5b2Lto=";
     };
   };
 

From b7ca098c7bb10a3866d7d359e4e09a10692afc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 19 Mar 2023 21:42:26 +0100
Subject: [PATCH 031/247] python310Packages.aiocontextvars: drop useless
 pytest-runner

---
 .../development/python-modules/aiocontextvars/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix
index 09eb8b0dbcff..9684dc406ad6 100644
--- a/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/pkgs/development/python-modules/aiocontextvars/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytest-runner
 , pytestCheckHook
 , pytest-asyncio
 , isPy27
@@ -20,9 +19,10 @@ buildPythonPackage rec {
     sha256 = "0a2gmrm9csiknc8n3si67sgzffkydplh9d7ga1k87ygk2aj22mmk";
   };
 
-  buildInputs = [
-    pytest-runner
-  ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
+  '';
 
   nativeCheckInputs = [
     pytestCheckHook

From a10f3197fc893c98a74ae3bb3610b95559951e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 20 Mar 2023 01:11:23 +0100
Subject: [PATCH 032/247] systemd-lib: fix building -.slice (root slice)

The error was:

dirname: invalid option -- '.'
Try 'dirname --help' for more information.
---
 nixos/lib/systemd-lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index c6c8753d5325..a21450708fe5 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -24,7 +24,7 @@ in rec {
         }
         ''
           name=${shellEscape name}
-          mkdir -p "$out/$(dirname "$name")"
+          mkdir -p "$out/$(dirname -- "$name")"
           echo -n "$text" > "$out/$name"
         ''
     else

From c0baa0ddf2f25bbad3011de14fb392d83162c551 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Mon, 20 Mar 2023 09:57:14 +0800
Subject: [PATCH 033/247] wit-bindgen: init at 0.4.0

---
 pkgs/tools/misc/wit-bindgen/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/wit-bindgen/default.nix

diff --git a/pkgs/tools/misc/wit-bindgen/default.nix b/pkgs/tools/misc/wit-bindgen/default.nix
new file mode 100644
index 000000000000..e26079da481a
--- /dev/null
+++ b/pkgs/tools/misc/wit-bindgen/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "wit-bindgen";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "bytecodealliance";
+    repo = "wit-bindgen";
+    rev = "wit-bindgen-cli-${version}";
+    hash = "sha256-OLBuzYAeUaJrn9cUqw6nStE468TqTUXeUnfkdMO0D3w=";
+  };
+
+  cargoHash = "sha256-blaSgQZweDmkiU0Tck9qmIgpQGDZhgxb1+hs6a4D6Qg=";
+
+  # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
+  # However, GitHub Actions ensures a proper build.
+  # See also:
+  #   https://github.com/bytecodealliance/wit-bindgen/actions
+  #   https://github.com/bytecodealliance/wit-bindgen/blob/main/.github/workflows/main.yml
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A language binding generator for WebAssembly interface types";
+    homepage = "https://github.com/bytecodealliance/wit-bindgen";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ xrelkd ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b5ef1079c13..1aae6b2db497 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13386,6 +13386,8 @@ with pkgs;
 
   wimboot = callPackage ../tools/misc/wimboot { };
 
+  wit-bindgen = callPackage ../tools/misc/wit-bindgen { };
+
   wire = callPackage ../development/tools/wire { };
 
   wireguard-tools = callPackage ../tools/networking/wireguard-tools { };

From 52162c69e574c6b1cefe7cba99bc1a02d5ba8bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 20 Mar 2023 15:21:12 +0100
Subject: [PATCH 034/247] git-open: 2.1.0 -> 3.0.0, drop inactive maintainer,
 remove git from the wrapper

git-open is supposed to be used as a git subcommand like `git open`
which requires git to function. This makes using overrides easier and
reduces useless rebuilds.
---
 .../version-management/git-open/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix
index 2c57ca1f8401..42e23dcd32e3 100644
--- a/pkgs/applications/version-management/git-open/default.nix
+++ b/pkgs/applications/version-management/git-open/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-open";
-  version = "2.1.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
     rev = "v${version}";
-    sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0";
+    sha256 = "sha256-Bag2rI2uR7ilkg2ozjR8tPXqKz5XjiY7WAUJKTVTXd8=";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper pandoc ];
@@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp git-open $out/bin
+    mv git-open $out/bin
     installManPage git-open.1
     wrapProgram $out/bin/git-open \
-      --prefix PATH : "${lib.makeBinPath [ git gnugrep ]}" \
+      --prefix PATH : "${lib.makeBinPath [ gnugrep ]}" \
       --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
   '';
 
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     description = "Open the GitHub page or website for a repository in your browser";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ jlesquembre SuperSandro2000 ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

From cd3ffbdfe6869c35c483bc7cec348e8d5365c2b3 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 20 Mar 2023 22:50:11 +0800
Subject: [PATCH 035/247] nixos/zram: add writebackDevice option and
 corresponding test

---
 nixos/modules/config/zram.nix  | 20 ++++++++++++++++++++
 nixos/tests/zram-generator.nix | 34 ++++++++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 4df646cf2796..991387ea9b2b 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -82,12 +82,30 @@ in
           {command}`cat /sys/class/block/zram*/comp_algorithm`
         '';
       };
+
+      writebackDevice = lib.mkOption {
+        default = null;
+        example = "/dev/zvol/tarta-zoot/swap-writeback";
+        type = lib.types.nullOr lib.types.path;
+        description = lib.mdDoc ''
+          Write incompressible pages to this device,
+          as there's no gain from keeping them in RAM.
+        '';
+      };
     };
 
   };
 
   config = lib.mkIf cfg.enable {
 
+    assertions = [
+      {
+        assertion = cfg.writebackDevice == null || cfg.swapDevices <= 1;
+        message = "A single writeback device cannot be shared among multiple zram devices";
+      }
+    ];
+
+
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isModule "ZRAM")
     ];
@@ -112,6 +130,8 @@ in
                 zram-size = if cfg.memoryMax != null then "min(${size}, ${toString cfg.memoryMax} / 1024 / 1024)" else size;
                 compression-algorithm = cfg.algorithm;
                 swap-priority = cfg.priority;
+              } // lib.optionalAttrs (cfg.writebackDevice != null) {
+                writeback-device = cfg.writebackDevice;
               };
           })
           devices));
diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix
index 3407361d2824..2be7bd2e05b1 100644
--- a/nixos/tests/zram-generator.nix
+++ b/nixos/tests/zram-generator.nix
@@ -1,18 +1,36 @@
 import ./make-test-python.nix {
   name = "zram-generator";
 
-  nodes.machine = { ... }: {
-    zramSwap = {
-      enable = true;
-      priority = 10;
-      algorithm = "lz4";
-      swapDevices = 2;
-      memoryPercent = 30;
-      memoryMax = 10 * 1024 * 1024;
+  nodes = {
+    single = { ... }: {
+      virtualisation = {
+        emptyDiskImages = [ 512 ];
+      };
+      zramSwap = {
+        enable = true;
+        priority = 10;
+        algorithm = "lz4";
+        swapDevices = 1;
+        memoryPercent = 30;
+        memoryMax = 10 * 1024 * 1024;
+        writebackDevice = "/dev/vdb";
+      };
+    };
+    machine = { ... }: {
+      zramSwap = {
+        enable = true;
+        priority = 10;
+        algorithm = "lz4";
+        swapDevices = 2;
+        memoryPercent = 30;
+        memoryMax = 10 * 1024 * 1024;
+      };
     };
   };
 
   testScript = ''
+    single.wait_for_unit("systemd-zram-setup@zram0.service")
+
     machine.wait_for_unit("systemd-zram-setup@zram0.service")
     machine.wait_for_unit("systemd-zram-setup@zram1.service")
     zram = machine.succeed("zramctl --noheadings --raw")

From 024e69c09fa4750258605323f0dfdb16993b6afb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 04:37:30 +0000
Subject: [PATCH 036/247] python310Packages.myst-docutils: 0.18.1 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix
index ad86e90303c2..3a51d240c5ae 100644
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "myst-docutils";
-  version = "0.18.1";
+  version = "1.0.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0=";
+    hash = "sha256-fbh97Z/5TnnMHj2bGZ4UvJkPpYtrTTcFOgpLWgHUYk0=";
   };
 
   nativeBuildInputs = [

From ecb43a2bd683059a68aa401a6d48519a6ad92c6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 08:05:36 +0000
Subject: [PATCH 037/247] watchmate: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix
index 8053d8bd2a71..176a582d0ebe 100644
--- a/pkgs/applications/misc/watchmate/default.nix
+++ b/pkgs/applications/misc/watchmate/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchmate";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "azymohliad";
     repo = "watchmate";
     rev = "v${version}";
-    hash = "sha256-LwtlI6WCOO24w8seUzyhCp51pfEiCM+iL6lu/J6v4PQ=";
+    hash = "sha256-+E1tyDfFSu3J89fXd75bdYxh+Z1zTwKL6AmMTNQBEYY=";
   };
 
-  cargoHash = "sha256-MD0eWZDpCevBY1Y3Gzgk13qCFtL7QOPDATv8MA+Q5go=";
+  cargoHash = "sha256-xfgO2MInUAidgqN1B7byMIzHD19IzbnBvRMo7Ir10hk=";
 
   nativeBuildInputs = [
     pkg-config

From 59e995cc410e9024d4f2c24e14a309147b26c86a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Mar 2023 10:02:04 +0000
Subject: [PATCH 038/247] python310Packages.rpmfile: 1.0.8 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix
index e5d656795c2a..3004a75d77fe 100644
--- a/pkgs/development/python-modules/rpmfile/default.nix
+++ b/pkgs/development/python-modules/rpmfile/default.nix
@@ -5,11 +5,11 @@
 }:
 buildPythonPackage rec {
   pname = "rpmfile";
-  version = "1.0.8";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e56cfc10e1a7d953b1890d81652a89400c614f4cdd9909464aece434d93c3a3e";
+    sha256 = "sha256-ZxcHe1QxdG2GBIPMNrnJy6Vd8SRgZ4HOtwsks2be8Cs=";
   };
 
   # Tests access the internet

From d1ed3cc0809ef631617a488ac71e2eaa2ee0945b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 12:41:32 -0400
Subject: [PATCH 039/247] frawk: 0.4.7 -> 0.4.8

Changelog: https://github.com/ezrosent/frawk/releases/tag/v0.4.8
---
 pkgs/tools/text/frawk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix
index 74afabac33bd..1f975823fa1d 100644
--- a/pkgs/tools/text/frawk/default.nix
+++ b/pkgs/tools/text/frawk/default.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "frawk";
-  version = "0.4.7";
+  version = "0.4.8";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-fqOFFkw+mV9QLTH3K6Drk3kDqU4wrQTj7OQrtgYuD7M=";
+    sha256 = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA=";
   };
 
-  cargoSha256 = "sha256-G39/CESjMouwPQJBdsmd+MBusGNQmyNjw3PJSFBCdSk=";
+  cargoSha256 = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs=";
 
   buildInputs = [ libxml2 ncurses zlib ];
 

From 4babb8cf8988807b39dbbd69f2b3f91f2a7391bf Mon Sep 17 00:00:00 2001
From: Aroun <zahrun@murena.io>
Date: Tue, 21 Mar 2023 23:54:48 +0530
Subject: [PATCH 040/247] podman: add pointer to related nix option

---
 pkgs/applications/virtualization/podman/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 120bd2670f64..8db3c0e90fa4 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -145,6 +145,11 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://podman.io/";
     description = "A program for managing pods, containers and container images";
+    longDescription = ''
+      Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers. Podman runs containers on Linux, but can also be used on Mac and Windows systems using a Podman-managed virtual machine. Podman is based on libpod, a library for container lifecycle management that is also contained in this repository. The libpod library provides APIs for managing containers, pods, container images, and volumes.
+
+      To install on NixOS, please use the option `virtualisation.podman.enable = true`.
+    '';
     changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ marsam ] ++ teams.podman.members;

From 6aeea7045d4ffa527bf778ccd416eb2bfcabe320 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:06:28 +0800
Subject: [PATCH 041/247] cinnamon.cinnamon-common: 5.6.7 -> 5.6.8

https://github.com/linuxmint/cinnamon/compare/5.6.7...5.6.8

One of the substitutions has been upstreamed.
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index ef3013f2e404..e50e14ea8d94 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -72,13 +72,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "5.6.7";
+  version = "5.6.8";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-oBD9jpZSOB7R3bbMv1qOQkkQyFTKkNnNagJ1INeA0s4=";
+    hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic=";
   };
 
   patches = [
@@ -159,8 +159,6 @@ stdenv.mkDerivation rec {
 
     sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
 
-    sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
-
     sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
       -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
 

From f0e5ad300fb2508fea47111991ab030e2b88cc34 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:11:29 +0800
Subject: [PATCH 042/247] cinnamon.cinnamon-settings-daemon: 5.6.1 -> 5.6.2

https://github.com/linuxmint/cinnamon-settings-daemon/compare/5.6.1...5.6.2
---
 pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 1fcc9fb6a29a..5f7ad87d83cb 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "5.6.1";
+  version = "5.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE=";
+    hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k=";
   };
 
   patches = [

From a8a542ebdf9a670c6968d81910709a31c67b1199 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:14:04 +0800
Subject: [PATCH 043/247] cinnamon.muffin: 5.6.3 -> 5.6.4

https://github.com/linuxmint/muffin/compare/5.6.3...5.6.4
---
 pkgs/desktops/cinnamon/muffin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 58a9008e3387..ba4eb95a5e95 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "5.6.3";
+  version = "5.6.4";
 
   outputs = [ "out" "dev" "man" ];
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE=";
+    hash = "sha256-NnQ7KF979HnsEc4X/Wf1YOfUvByHvVIdTAcJyUjhsp8=";
   };
 
   patches = [

From 4d120a8c5ca88b8aed0bf45a2295ac3ac649893a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:16:04 +0800
Subject: [PATCH 044/247] cinnamon.nemo: 5.6.3 -> 5.6.4

https://github.com/linuxmint/nemo/compare/5.6.3...5.6.4
---
 pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index e25db028fa86..3e9a3e81eb1f 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "5.6.3";
+  version = "5.6.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-CuG0s2gtuYwuIvti5xGiGJa5C5IcruFtNhv6s1vcuUA=";
+    sha256 = "sha256-zvELN9ggfmfIEPeD0VEWM25kRi8RWA/aKlrdO5dKX1k=";
   };
 
   patches = [

From 11105fb41b0f1f4ea50e1f29fbd3ab1dc1119cd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 02:19:33 +0000
Subject: [PATCH 045/247] kubeshark: 38.5 -> 39.4

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

diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix
index c7abd03ccd7e..fc5a65508758 100644
--- a/pkgs/applications/networking/cluster/kubeshark/default.nix
+++ b/pkgs/applications/networking/cluster/kubeshark/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "38.5";
+  version = "39.4";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = version;
-    sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk=";
+    sha256 = "sha256-Z32FuQPh9wG2XNMAfC9Zg7G9j8btNxTcYRl+Z5f5gM8=";
   };
 
-  vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc=";
+  vendorHash = "sha256-stpWIqLQ2PTjocuekkOI/D7QvkxX4NI1YTKIh3V6c4c=";
 
   ldflags = let t = "github.com/kubeshark/kubeshark"; in [
    "-s" "-w"

From 880d20ffed3c841b1e1896c40b63559c125c17b8 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 22:48:56 -0400
Subject: [PATCH 046/247] cargo-bundle: init at unstable-2023-03-17

---
 .../tools/rust/cargo-bundle/default.nix       | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-bundle/default.nix

diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/development/tools/rust/cargo-bundle/default.nix
new file mode 100644
index 000000000000..f29d9aba8294
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-bundle/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, stdenv
+, darwin
+, libxkbcommon
+, wayland
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "cargo-bundle";
+  # the latest stable release fails to build on darwin
+  version = "unstable-2023-03-17";
+
+  src = fetchFromGitHub {
+    owner = "burtonageo";
+    repo = "cargo-bundle";
+    rev = "eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4";
+    hash = "sha256-alO+Q9IK5Hz09+TqHWsbjuokxISKQfQTM6QnLlUNydw=";
+  };
+
+  cargoHash = "sha256-h+QPbwYTJk6dieta/Q+VAhYe8/YH/Nik6gslzUn0YxI=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+  ] ++ lib.optionals stdenv.isLinux [
+    libxkbcommon
+    wayland
+  ];
+
+  meta = with lib; {
+    description = "Wrap rust executables in OS-specific app bundles";
+    homepage = "https://github.com/burtonageo/cargo-bundle";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b31acb068c1..8b016f0d466f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16016,6 +16016,7 @@ with pkgs;
   cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { };
   cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { };
   cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { };
+  cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { };
   cargo-cache = callPackage ../development/tools/rust/cargo-cache {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From d518cb007a8e5b88b3fbbce902280aedab60455a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 04:12:23 +0000
Subject: [PATCH 047/247] awscli2: 2.11.2 -> 2.11.4

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

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 9068b9160179..65b6eb0301e1 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -37,14 +37,14 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.11.2"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.11.4"; # N.B: if you change this, check if overrides are still up-to-date
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    hash = "sha256-GFdkE+XClm0L5Y+ZSwMW8gieNoRmNL3K8kVPxpH510k=";
+    hash = "sha256-vue0daG+s7DdIWXZIRS7pjbQKlnxT3xZxGLTmwWWNpQ=";
   };
 
   postPatch = ''

From 70158dcee6169e3d10cca6bae60438148898f7f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 07:43:42 +0000
Subject: [PATCH 048/247] belle-sip: 5.2.23 -> 5.2.37

---
 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 b40ea68a48a6..2a0abc3a338e 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.23";
+  version = "5.2.37";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "sha256-c73PCM+bRz6CjGRY2AapEcvKC1UqyEfzb7qsicmrkQU=";
+    sha256 = "sha256-e5CwLzpvW5ktv5R8PZkNmSXAi/SaTltJs9LY26iKsLo=";
   };
 
   nativeBuildInputs = [ cmake ];

From 35968448705a98631fe169b1b4aac0bb21a1c184 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 16:07:13 +0800
Subject: [PATCH 049/247] timezonemap: Fix crashes when running in GLib 2.76

ref: https://salsa.debian.org/cinnamon-team/libtimezonemap/-/merge_requests/3
---
 pkgs/development/libraries/timezonemap/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix
index ae8c956d88cd..25efaa6518c6 100644
--- a/pkgs/development/libraries/timezonemap/default.nix
+++ b/pkgs/development/libraries/timezonemap/default.nix
@@ -1,6 +1,8 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , autoreconfHook
 , fetchbzr
+, fetchpatch
 , pkg-config
 , gtk3
 , glib
@@ -20,6 +22,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wCJXwgnN+aZVerjQCm8oT3xIcwmc4ArcEoCh9pMrt+E=";
   };
 
+  patches = [
+    # Fix crashes when running in GLib 2.76
+    # https://bugs.launchpad.net/ubuntu/+source/libtimezonemap/+bug/2012116
+    (fetchpatch {
+      url = "https://git.launchpad.net/ubuntu/+source/libtimezonemap/plain/debian/patches/timezone-map-Never-try-to-access-to-free-d-or-null-values.patch?id=88f72f724e63df061204f6818c9a1e7d8c003e29";
+      sha256 = "sha256-M5eR0uaqpJOeW2Ya1Al+3ZciXukzHpnjJTMVvdO0dPE=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook

From 25c1820914c4b336042daf2d2c79c92453d51e7e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 21 Mar 2023 15:51:17 +0800
Subject: [PATCH 050/247] qt6.qtbase: add patch to fix handling of variable
 fonts

---
 pkgs/development/libraries/qt-6/default.nix   |  1 +
 .../qt-6/patches/qtbase-variable-fonts.patch  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-6/patches/qtbase-variable-fonts.patch

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 2577806b5c43..f0cfc91ac014 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -59,6 +59,7 @@ let
           ./patches/qtbase-qmake-mkspecs-mac.patch
           ./patches/qtbase-qmake-pkg-config.patch
           ./patches/qtbase-tzdir.patch
+          ./patches/qtbase-variable-fonts.patch
           # Remove symlink check causing build to bail out and fail.
           # https://gitlab.kitware.com/cmake/cmake/-/issues/23251
           (fetchpatch {
diff --git a/pkgs/development/libraries/qt-6/patches/qtbase-variable-fonts.patch b/pkgs/development/libraries/qt-6/patches/qtbase-variable-fonts.patch
new file mode 100644
index 000000000000..96952d1ad160
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/patches/qtbase-variable-fonts.patch
@@ -0,0 +1,26 @@
+From 9ba9c690fb16188ff524b53def104e68e45cf5c3 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao@nichi.co>
+Date: Tue, 21 Mar 2023 15:48:49 +0800
+Subject: [PATCH] Deal with a font face at index 0 as Regular for Variable
+ fonts
+
+Reference: https://bugreports.qt.io/browse/QTBUG-111994
+---
+ src/gui/text/unix/qfontconfigdatabase.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp
+index 9b60cf2963..5a42ef6a68 100644
+--- a/src/gui/text/unix/qfontconfigdatabase.cpp
++++ b/src/gui/text/unix/qfontconfigdatabase.cpp
+@@ -554,6 +554,7 @@ void QFontconfigDatabase::populateFontDatabase()
+             FcObjectSetAdd(os, *p);
+             ++p;
+         }
++        FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
+         fonts = FcFontList(nullptr, pattern, os);
+         FcObjectSetDestroy(os);
+         FcPatternDestroy(pattern);
+-- 
+2.39.2
+

From f4385d6010a6de5e78f495436917431654d09410 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 21 Mar 2023 15:59:24 +0800
Subject: [PATCH 051/247] nixosTests.noto-fonts-cjk-qt-default-weight: init

---
 nixos/tests/all-tests.nix                     |  1 +
 .../noto-fonts-cjk-qt-default-weight.nix      | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 nixos/tests/noto-fonts-cjk-qt-default-weight.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ff2549395a0b..7e089801cd37 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -487,6 +487,7 @@ in {
   nomad = handleTest ./nomad.nix {};
   non-default-filesystems = handleTest ./non-default-filesystems.nix {};
   noto-fonts = handleTest ./noto-fonts.nix {};
+  noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix {};
   novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
   nscd = handleTest ./nscd.nix {};
   nsd = handleTest ./nsd.nix {};
diff --git a/nixos/tests/noto-fonts-cjk-qt-default-weight.nix b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix
new file mode 100644
index 000000000000..678013cf3ab9
--- /dev/null
+++ b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix
@@ -0,0 +1,30 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+  name = "noto-fonts-cjk-qt";
+  meta.maintainers = with lib.maintainers; [ oxalica ];
+
+  nodes.machine = {
+    imports = [ ./common/x11.nix ];
+    fonts = {
+      enableDefaultFonts = false;
+      fonts = [ pkgs.noto-fonts-cjk-sans ];
+    };
+  };
+
+  testScript =
+    let
+      script = pkgs.writers.writePython3 "qt-default-weight" {
+        libraries = [ pkgs.python3Packages.pyqt6 ];
+      } ''
+        from PyQt6.QtWidgets import QApplication
+        from PyQt6.QtGui import QFont, QRawFont
+
+        app = QApplication([])
+        f = QRawFont.fromFont(QFont("Noto Sans CJK SC", 20))
+
+        assert f.styleName() == "Regular", f.styleName()
+      '';
+    in ''
+      machine.wait_for_x()
+      machine.succeed("${script}")
+    '';
+})

From e53aee6938d10e667b6a8f693eda551bf3820982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 09:49:23 +0000
Subject: [PATCH 052/247] python310Packages.vispy: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index d69d9722d334..3822e11438d8 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "vispy";
-  version = "0.12.1";
+  version = "0.12.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4AiBwdD5ssCOtuJuk2GtveijqW54eO5sHhmefFhyIk8=";
+    hash = "sha256-FBwt3MwRWFVbyJ8JAQxLHXVEh+gWNXMz8x55WnFGoCQ=";
   };
 
   patches = [

From da984a5bcf83eb635e9cf2ce3f9fc1cc62aa9346 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 10:05:22 +0000
Subject: [PATCH 053/247] python310Packages.azure-keyvault-administration:
 4.2.0 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
index eddb6f05ad0d..07d608dfa56f 100644
--- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-administration";
-  version = "4.2.0";
+  version = "4.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-2Xuyx1dAJRgiDEetQu1qnzTua7l/G5eSWOTI/UI/z00=";
+    hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY=";
   };
 
   propagatedBuildInputs = [

From 99c0cbe9b54bd54143b5b5400c2e5ca5a644bcd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 10:39:24 +0000
Subject: [PATCH 054/247] python310Packages.fakeredis: 2.10.1 -> 2.10.2

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

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 379fa2b7d06b..b71ba532c2e6 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.10.1";
+  version = "2.10.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5jtI7EemKi0w/ezr/jLFQFndvqOjVE0SUm1urluKusY=";
+    hash = "sha256-ZQC8KNHM6Nnytkr6frZMl5mBVPkpduWZwwooCPymbFY=";
   };
 
   nativeBuildInputs = [

From 25de6520f3292a9c03f358dd3b9f3a03d29451af Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Wed, 8 Mar 2023 11:15:31 +0100
Subject: [PATCH 055/247] python3Packages.cairo-lang: 0.10.0 -> 0.10.1

---
 .../python-modules/cairo-lang/default.nix     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/cairo-lang/default.nix b/pkgs/development/python-modules/cairo-lang/default.nix
index 2e7ef7420273..d183b607b31a 100644
--- a/pkgs/development/python-modules/cairo-lang/default.nix
+++ b/pkgs/development/python-modules/cairo-lang/default.nix
@@ -31,28 +31,16 @@
 
 buildPythonPackage rec {
   pname = "cairo-lang";
-  version = "0.10.0";
+  version = "0.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchzip {
     url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip";
-    hash = "sha256-+PE7RSKEGADbue63FoT6UBOwURJs7lBNkL7aNlpSxP8=";
+    hash = "sha256-MNbzDqqNhij9JizozLp9hhQjbRGzWxECOErS3TOPlAA=";
   };
 
-  # TODO: remove a substantial part when https://github.com/starkware-libs/cairo-lang/pull/88/files is merged.
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "lark-parser" "lark"
-
-    substituteInPlace starkware/cairo/lang/compiler/parser_transformer.py \
-      --replace 'value, meta' 'meta, value' \
-      --replace 'value: Tuple[CommaSeparatedWithNotes], meta' 'meta, value: Tuple[CommaSeparatedWithNotes]'
-    substituteInPlace starkware/cairo/lang/compiler/parser.py \
-      --replace 'standard' 'basic'
-  '';
-
   nativeBuildInputs = [
     pythonRelaxDepsHook
   ];
@@ -99,6 +87,10 @@ buildPythonPackage rec {
     "pytest-asyncio"
   ];
 
+  postFixup = ''
+    chmod +x $out/bin/*
+  '';
+
   # There seems to be no test included in the ZIP release…
   # Cloning from GitHub is harder because they use a custom CMake setup
   # TODO(raitobezarius): upstream was pinged out of band about it.

From dd34d1fd5206faea3ede81e3e0b95c0e79ac519e Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Wed, 22 Mar 2023 15:02:27 +0100
Subject: [PATCH 056/247] appflowy: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index e8910d950929..a7fa809de1fa 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "appflowy";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
-    sha256 = "sha256-WuEwhJ1YhbldFfisfUsp3GCV2vQy9oTam6BkL/7QEgI=";
+    sha256 = "sha256-H4xVUXC7cRCgC1fHMXPucGRTBlGRcyzskhNBaNVGAns=";
     stripRoot = false;
   };
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mv AppFlowy/* ./
+    cd AppFlowy/
 
     mkdir -p $out/opt/
     mkdir -p $out/bin/
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # Add missing libraries to appflowy using the ones it comes with
-    makeWrapper $out/opt/app_flowy $out/bin/appflowy \
+    makeWrapper $out/opt/AppFlowy $out/bin/appflowy \
       --set LD_LIBRARY_PATH "$out/opt/lib/" \
       --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}"
   '';

From ca1718417d1cd712ee6473bae5ecb5393397b656 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:11:26 -0700
Subject: [PATCH 057/247] dcs: orphan

---
 pkgs/tools/text/dcs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix
index e33c1b44cdf2..5edc7896afac 100644
--- a/pkgs/tools/text/dcs/default.nix
+++ b/pkgs/tools/text/dcs/default.nix
@@ -40,7 +40,7 @@ buildGoModule {
     description = "Debian Code Search";
     homepage = "https://github.com/Debian/dcs";
     license = licenses.bsd3;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
     broken = stdenv.isAarch64
       || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin
   };

From 7ad416d08cbacb6c3c04a42ff741f4a19b60c48e Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:11:33 -0700
Subject: [PATCH 058/247] perlPackages.CSSMinifier: orphan

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 69b06d6ed22f..b89dedfb4e99 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5329,7 +5329,6 @@ let
     meta = {
       description = "Perl extension for minifying CSS";
       license = with lib.licenses; [ artistic1 ];
-      maintainers = teams.determinatesystems.members;
     };
   };
 

From b8f4d35d67ff1cc254c0262090e5db79954056d1 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:11:58 -0700
Subject: [PATCH 059/247] honeytrap: orphan

---
 pkgs/tools/security/honeytrap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/tools/security/honeytrap/default.nix
index 735d5d69bd8a..91d1c367182b 100644
--- a/pkgs/tools/security/honeytrap/default.nix
+++ b/pkgs/tools/security/honeytrap/default.nix
@@ -23,6 +23,6 @@ buildGoModule {
     description = "Advanced Honeypot framework";
     homepage = "https://github.com/honeytrap/honeytrap";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From a9bda02eb5b384924296931fb8c41e7756747f96 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:12:17 -0700
Subject: [PATCH 060/247] cve-bin-tool: orphan

---
 pkgs/tools/security/cve-bin-tool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index c8a72a88429c..94a7ce224097 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -82,6 +82,6 @@ buildPythonApplication rec {
     description = "CVE Binary Checker Tool";
     homepage = "https://github.com/intel/cve-bin-tool";
     license = licenses.gpl3Plus;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 4b7c7b3d22b94ab593b875164fcf9b09970a9784 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:12:49 -0700
Subject: [PATCH 061/247] xorex: orphan

---
 pkgs/tools/security/xorex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/xorex/default.nix b/pkgs/tools/security/xorex/default.nix
index 84919f548262..a1a6e655996a 100644
--- a/pkgs/tools/security/xorex/default.nix
+++ b/pkgs/tools/security/xorex/default.nix
@@ -33,6 +33,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "XOR Key Extractor";
     homepage = "https://github.com/Neo23x0/xorex";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From e1e728fe3cf4bbeb7eb85d4e30605cc47f539857 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:13:22 -0700
Subject: [PATCH 062/247] earlybird: orphan

---
 pkgs/tools/security/earlybird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/tools/security/earlybird/default.nix
index 30916acda720..eb13b38c158f 100644
--- a/pkgs/tools/security/earlybird/default.nix
+++ b/pkgs/tools/security/earlybird/default.nix
@@ -21,6 +21,6 @@ buildGoModule {
     description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
     homepage = "https://github.com/americanexpress/earlybird";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 0de73583eef67eb7b0af43d4b3ea3429f4a2d215 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:13:46 -0700
Subject: [PATCH 063/247] flare-floss: orphan

---
 pkgs/tools/security/flare-floss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix
index 841858517875..e8fc5aeff24c 100644
--- a/pkgs/tools/security/flare-floss/default.nix
+++ b/pkgs/tools/security/flare-floss/default.nix
@@ -70,6 +70,6 @@ py.pkgs.buildPythonPackage rec {
     description = "Automatically extract obfuscated strings from malware";
     homepage = "https://github.com/mandiant/flare-floss";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 6a2917cc10946a2f7116f95c2f2cb607bce02a5b Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:14:19 -0700
Subject: [PATCH 064/247] yarGen: orphan

---
 pkgs/tools/security/yarGen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/yarGen/default.nix b/pkgs/tools/security/yarGen/default.nix
index 8a2d51b8e197..4003c7e996ec 100644
--- a/pkgs/tools/security/yarGen/default.nix
+++ b/pkgs/tools/security/yarGen/default.nix
@@ -53,6 +53,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "A generator for YARA rules";
     homepage = "https://github.com/Neo23x0/yarGen";
     license = licenses.bsd3;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 24d1e5c6e88508e48a23f5f8a95d7646bb6ae96b Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:14:50 -0700
Subject: [PATCH 065/247] zoekt: orphan

---
 pkgs/tools/text/zoekt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix
index 9710932cde69..22059ebbf230 100644
--- a/pkgs/tools/text/zoekt/default.nix
+++ b/pkgs/tools/text/zoekt/default.nix
@@ -29,6 +29,6 @@ buildGoModule {
     description = "Fast trigram based code search";
     homepage = "https://github.com/google/zoekt";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From d7dd74ea455fe6e629f9d970f247c9b2cec3a598 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:15:20 -0700
Subject: [PATCH 066/247] cyclonedx-python: orphan

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

diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix
index 97dfd8310da5..03b5ba031112 100644
--- a/pkgs/tools/misc/cyclonedx-python/default.nix
+++ b/pkgs/tools/misc/cyclonedx-python/default.nix
@@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects";
     homepage = "https://github.com/CycloneDX/cyclonedx-python";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 7eee98187631789a1166c4ae6e72cd39bbdbd795 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:15:57 -0700
Subject: [PATCH 067/247] python3Packages.telfhash: orphan

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

diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix
index b2cb3c3ac953..40198cddb681 100644
--- a/pkgs/development/python-modules/telfhash/default.nix
+++ b/pkgs/development/python-modules/telfhash/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Symbol hash for ELF files";
     homepage = "https://github.com/trendmicro/telfhash";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From b38c3cab29804b88ac70c018f68d0058820bf40b Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:16:29 -0700
Subject: [PATCH 068/247] python3Packages.pymaven-patch: orphan

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

diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix
index f74c959cfd74..602399b2d024 100644
--- a/pkgs/development/python-modules/pymaven-patch/default.nix
+++ b/pkgs/development/python-modules/pymaven-patch/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Python access to maven";
     homepage = "https://github.com/nexB/pymaven";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From ceb167f2e3e4c8678c618ba15a638f5870e52300 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:16:57 -0700
Subject: [PATCH 069/247] python3Packages.typecode: orphan

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

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index 3c5ccce3a713..c9f9ba7220a9 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/nexB/typecode";
     changelog = "https://github.com/nexB/typecode/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From ff2f01c0dc593daec96f40c64e0447fc7d35f9c8 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:17:15 -0700
Subject: [PATCH 070/247] python3Packages.banal: orphan

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

diff --git a/pkgs/development/python-modules/banal/default.nix b/pkgs/development/python-modules/banal/default.nix
index 793de7d3a765..066fba0b5c95 100644
--- a/pkgs/development/python-modules/banal/default.nix
+++ b/pkgs/development/python-modules/banal/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Commons of banal micro-functions for Python";
     homepage = "https://github.com/pudo/banal";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From b8e54e0ad9e386ae8b2d2b3325a50f64a0b46ac1 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:17:37 -0700
Subject: [PATCH 071/247] python3Packages.viv-utils: orphan

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

diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index f80d32e96376..8829279a1859 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/williballenthin/viv-utils";
     changelog = "https://github.com/williballenthin/viv-utils/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From a42adbfb6e915f3cfb4f398467431d9e66d7179c Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:17:57 -0700
Subject: [PATCH 072/247] python3Packages.plugnplay: orphan

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

diff --git a/pkgs/development/python-modules/plugnplay/default.nix b/pkgs/development/python-modules/plugnplay/default.nix
index 259fe96028a9..a0eda76e4ddf 100644
--- a/pkgs/development/python-modules/plugnplay/default.nix
+++ b/pkgs/development/python-modules/plugnplay/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "A Generic plug-in system for python applications";
     homepage = "https://github.com/daltonmatos/plugnplay";
     license = licenses.gpl2Only;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 41b9e809cd3cf8ffc394c20f66546c3a45a4da41 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:18:19 -0700
Subject: [PATCH 073/247] python3Packages.normality: orphan

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

diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix
index 208898731b7a..5770b61718a4 100644
--- a/pkgs/development/python-modules/normality/default.nix
+++ b/pkgs/development/python-modules/normality/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Micro-library to normalize text strings";
     homepage = "https://github.com/pudo/normality";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 47241f510850dec5e57e98417804f626775a8491 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:18:38 -0700
Subject: [PATCH 074/247] python3Packages.rpmfile: orphan

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

diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix
index e5d656795c2a..7da1f609b74f 100644
--- a/pkgs/development/python-modules/rpmfile/default.nix
+++ b/pkgs/development/python-modules/rpmfile/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Read rpm archive files";
     homepage = "https://github.com/srossross/rpmfile";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 3a2fecdd2dbb5b321e639a330d2a7e345e159f88 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:19:02 -0700
Subject: [PATCH 075/247] python3Packages.woodblock: orphan

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

diff --git a/pkgs/development/python-modules/woodblock/default.nix b/pkgs/development/python-modules/woodblock/default.nix
index 7497ad154890..c74a6ba78820 100644
--- a/pkgs/development/python-modules/woodblock/default.nix
+++ b/pkgs/development/python-modules/woodblock/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "A framework to generate file carving test data";
     homepage = "https://github.com/fkie-cad/woodblock";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 28986236f2475c938ec1cc6c6d877e668c08324f Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:19:21 -0700
Subject: [PATCH 076/247] python3Packages.python-registry: orphan

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

diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix
index 324afa93579e..ef5ba5b438be 100644
--- a/pkgs/development/python-modules/python-registry/default.nix
+++ b/pkgs/development/python-modules/python-registry/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Pure Python parser for Windows Registry hives";
     homepage = "https://github.com/williballenthin/python-registry";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 65571f0f3d2626dd0426ecbe0e23d235a3fe674f Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:19:40 -0700
Subject: [PATCH 077/247] python3Packages.intbitset: orphan

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

diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index aa2fc70eb0de..620ead1afe2e 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/inveniosoftware/intbitset";
     changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst";
     license = licenses.lgpl3Plus;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 84cf9ff2a5d82cf214009cc7a534927127dd1311 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:19:59 -0700
Subject: [PATCH 078/247] python3Packages.spdx-tools: orphan

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

diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix
index d1e66d676464..08897adcc1de 100644
--- a/pkgs/development/python-modules/spdx-tools/default.nix
+++ b/pkgs/development/python-modules/spdx-tools/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/spdx/tools-python";
     changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 963ed2c7a34ceab5bf5b5495c5c5de48d0bff888 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:20:17 -0700
Subject: [PATCH 079/247] python3Packages.requirements-parser: orphan

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

diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix
index af6592cadae5..11fe8edf6a10 100644
--- a/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/pkgs/development/python-modules/requirements-parser/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Pip requirements file parser";
     homepage = "https://github.com/davidfischer/requirements-parser";
     license = licenses.bsd2;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From d9080e4b47a15b8830c12c4bd6049adc1c220ccf Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:20:33 -0700
Subject: [PATCH 080/247] python3Packages.multimethod: orphan

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

diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix
index 90e596a51166..cc0ec79acdfe 100644
--- a/pkgs/development/python-modules/multimethod/default.nix
+++ b/pkgs/development/python-modules/multimethod/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://coady.github.io/multimethod/";
     changelog = "https://github.com/coady/multimethod/tree/v${version}#changes";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From d061f2b407f350e36e53a2917ff2f2bca9ce6c08 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:20:53 -0700
Subject: [PATCH 081/247] python3Packages.liblzfse: orphan

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

diff --git a/pkgs/development/python-modules/liblzfse/default.nix b/pkgs/development/python-modules/liblzfse/default.nix
index 90533cc30206..687d1df765b4 100644
--- a/pkgs/development/python-modules/liblzfse/default.nix
+++ b/pkgs/development/python-modules/liblzfse/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Python bindings for LZFSE";
     homepage = "https://github.com/ydkhatri/pyliblzfse";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From f8296b2f66b8dd8f9be8e206d10fbfa829bd76c6 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:21:15 -0700
Subject: [PATCH 082/247] python3Packages.fingerprints: orphan

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

diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix
index 30437950b460..05affeb93cb5 100644
--- a/pkgs/development/python-modules/fingerprints/default.nix
+++ b/pkgs/development/python-modules/fingerprints/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "A library to generate entity fingerprints";
     homepage = "https://github.com/alephdata/fingerprints";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 0c503e09946d1a203bd3a27ab29c038cadf8f8e1 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:21:32 -0700
Subject: [PATCH 083/247] python3Packages.qiling: orphan

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

diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix
index 0b008f86f884..c9854e345276 100644
--- a/pkgs/development/python-modules/qiling/default.nix
+++ b/pkgs/development/python-modules/qiling/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://qiling.io/";
     changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}";
     license = licenses.gpl2Only;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 93cb2f16af77d6fe33e2b1da74a0dab3138f197c Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:21:49 -0700
Subject: [PATCH 084/247] python3Packages.scancode-toolkit: orphan

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

diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index fb2194e963c1..9d50a87e3c48 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -159,6 +159,6 @@ buildPythonPackage rec {
     description = "Tool to scan code for license, copyright, package and their documented dependencies and other interesting facts";
     homepage = "https://github.com/nexB/scancode-toolkit";
     license = with licenses; [ asl20 cc-by-40 ];
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From a198268950cac56cb925cc339c5de8c34d821b18 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:22:14 -0700
Subject: [PATCH 085/247] python3Packages.cxxfilt: orphan

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

diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix
index 117b12145764..8b9c8f979c21 100644
--- a/pkgs/development/python-modules/cxxfilt/default.nix
+++ b/pkgs/development/python-modules/cxxfilt/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle ";
     homepage = "https://github.com/afq984/python-cxxfilt";
     license = licenses.bsd2;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 3a546dacb29a25a31bf848ee0cf17314272a19da Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:22:38 -0700
Subject: [PATCH 086/247] python3Packages.saneyaml: orphan

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

diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix
index 9dd89af51fdf..acbaca9ff018 100644
--- a/pkgs/development/python-modules/saneyaml/default.nix
+++ b/pkgs/development/python-modules/saneyaml/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "A PyYaml wrapper with sane behaviour to read and write readable YAML safely";
     homepage = "https://github.com/nexB/saneyaml";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From ba0af25e23279a4c95940f7b94ecf3fdb79b8b13 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:22:56 -0700
Subject: [PATCH 087/247] python3Packages.tern: orphan

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

diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix
index 2e95c6acc2fc..3b2701960f87 100644
--- a/pkgs/development/python-modules/tern/default.nix
+++ b/pkgs/development/python-modules/tern/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tern-tools/tern";
     changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}";
     license = licenses.bsd2;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 62c404f206ee35cc95cb462e8bdb96a38e71c02b Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:23:20 -0700
Subject: [PATCH 088/247] python3Packages.vivisect: orphan

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

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 931a052d24f4..6a844ebc0ab5 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vivisect/vivisect";
     changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From b0fc8558b8625cb90de213430c6efc55e7021c08 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:23:35 -0700
Subject: [PATCH 089/247] python3Packages.gemfileparser: orphan

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

diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix
index b9bcacf02a48..a87073e82a91 100644
--- a/pkgs/development/python-modules/gemfileparser/default.nix
+++ b/pkgs/development/python-modules/gemfileparser/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python";
     homepage = "https://github.com/gemfileparser/gemfileparser";
     license = with licenses; [ gpl3Plus /* or */ mit ];
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 46b6a80327f3ee4e37bf8a39f3d5348cd921f07e Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:23:48 -0700
Subject: [PATCH 090/247] python3Packages.plugincode: orphan

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

diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix
index 831109f8e48a..9153c64e719a 100644
--- a/pkgs/development/python-modules/plugincode/default.nix
+++ b/pkgs/development/python-modules/plugincode/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Library that provides plugin functionality for ScanCode toolkit";
     homepage = "https://github.com/nexB/plugincode";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 878a1f611bd4508e6c5ea5d5f6f96f1d03526cee Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:24:04 -0700
Subject: [PATCH 091/247] python3Packages.urlpy: orphan

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

diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix
index cd03957e00e1..f03b8b564508 100644
--- a/pkgs/development/python-modules/urlpy/default.nix
+++ b/pkgs/development/python-modules/urlpy/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Simple URL parsing, canonicalization and equivalence";
     homepage = "https://github.com/nexB/urlpy";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 9a5fcebd6e71f12360e6ed3d1839ce2705d80f2a Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:24:19 -0700
Subject: [PATCH 092/247] python3Packages.commoncode: orphan

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

diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index acc8093b74f2..b5400b185f31 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -84,6 +84,6 @@ buildPythonPackage rec {
     description = "A set of common utilities, originally split from ScanCode";
     homepage = "https://github.com/nexB/commoncode";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 28f7bab28cf11b462fcb64bcf5703be9cd2428de Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:24:34 -0700
Subject: [PATCH 093/247] python3Packages.pyimpfuzzy: orphan

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

diff --git a/pkgs/development/python-modules/pyimpfuzzy/default.nix b/pkgs/development/python-modules/pyimpfuzzy/default.nix
index 43e1a1a2b82f..18ebf3231e37 100644
--- a/pkgs/development/python-modules/pyimpfuzzy/default.nix
+++ b/pkgs/development/python-modules/pyimpfuzzy/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "A Python module which calculates and compares the impfuzzy (import fuzzy hashing)";
     homepage = "https://github.com/JPCERTCC/impfuzzy";
     license = licenses.gpl2Only;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From bada6cef563c7456b02bb1e0a6bd1650dafb5f37 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:24:50 -0700
Subject: [PATCH 094/247] python3Packages.kaitaistruct: orphan

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

diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index f52851930488..c6f8ebf7eaf0 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Kaitai Struct: runtime library for Python";
     homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
     license = licenses.mit;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 0e0d2f1a1a62567e54b78f4b4be991ecae964b05 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:25:21 -0700
Subject: [PATCH 095/247] python3Packages.extractcode-libarchive: orphan

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

diff --git a/pkgs/development/python-modules/extractcode/libarchive.nix b/pkgs/development/python-modules/extractcode/libarchive.nix
index efb314fa4c5b..f1dd6f12959c 100644
--- a/pkgs/development/python-modules/extractcode/libarchive.nix
+++ b/pkgs/development/python-modules/extractcode/libarchive.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
     homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_libarchive-linux";
     license = with licenses; [ asl20 bsd2 ];
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From 2561d8cfa8fb083afac9ec76a7eb1d2ea49c7ad5 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:25:35 -0700
Subject: [PATCH 096/247] python3Packages.extractcode-7z: orphan

---
 pkgs/development/python-modules/extractcode/7z.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/extractcode/7z.nix b/pkgs/development/python-modules/extractcode/7z.nix
index 6e2db205e3ef..895253d5a458 100644
--- a/pkgs/development/python-modules/extractcode/7z.nix
+++ b/pkgs/development/python-modules/extractcode/7z.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
     homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_7z-linux";
     license = with licenses; [ asl20 lgpl21 ];
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From 9bffc3bac91da3fc599602c90379572a15114a57 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:25:47 -0700
Subject: [PATCH 097/247] python3Packages.extractcode: orphan

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

diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix
index 7b42f579ba2d..9f45b7178ee8 100644
--- a/pkgs/development/python-modules/extractcode/default.nix
+++ b/pkgs/development/python-modules/extractcode/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/nexB/extractcode";
     changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From 7c6ef93f41673581f915cbea5b12092e5fd302df Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:26:00 -0700
Subject: [PATCH 098/247] python3Packages.typecode-libmagic: orphan

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

diff --git a/pkgs/development/python-modules/typecode/libmagic.nix b/pkgs/development/python-modules/typecode/libmagic.nix
index 5668b62e200f..5110e5e2a5cf 100644
--- a/pkgs/development/python-modules/typecode/libmagic.nix
+++ b/pkgs/development/python-modules/typecode/libmagic.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
     homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/typecode_libmagic-linux";
     license = licenses.asl20;
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From fcfd9f35b1cbd9f76633fc0788e60c010812b895 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 22 Mar 2023 07:26:20 -0700
Subject: [PATCH 099/247] python3Packages.debian-inspector: orphan

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

diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix
index 7568f9af9129..cc6a4fffc422 100644
--- a/pkgs/development/python-modules/debian-inspector/default.nix
+++ b/pkgs/development/python-modules/debian-inspector/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Utilities to parse Debian package, copyright and control files";
     homepage = "https://github.com/nexB/debian-inspector";
     license = with licenses; [ asl20 bsd3 mit ];
-    maintainers = teams.determinatesystems.members;
+    maintainers = [ ];
   };
 }

From b3f83086acd7cf0e8bf14e978fa0b5375a1c9f5e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 22 Mar 2023 15:57:09 +0100
Subject: [PATCH 100/247] rspamd: 3.4 -> 3.5

https://github.com/rspamd/rspamd/commit/0c671194e81f702a5e26009b33612c3d36d52840
---
 pkgs/servers/mail/rspamd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index fcff16672f31..971865331a1d 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "sha256-KEIOyURdioyqD33K3rRTiysGO/zSEm6k29zqjzmK9Uk=";
+    hash = "sha256-3+ve5cPt4As6Hfvxw77waJgl2Imi9LpredFkYzTchbQ=";
   };
 
   hardeningEnable = [ "pie" ];

From 7b93912f0ee93567304ecaddd83b46104dc30191 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 22 Mar 2023 17:19:52 +0200
Subject: [PATCH 101/247] wayland-protocols: do not check with a non-BFD linker

---
 pkgs/development/libraries/wayland/protocols.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index f9dc3c4e8073..429fae7feb36 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
   pname = "wayland-protocols";
   version = "1.31";
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform && wayland.withLibraries;
+  # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

From 2607d40e5812f2d3fed91c4e115d475ef9f04b50 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 22 Mar 2023 18:36:27 +0300
Subject: [PATCH 102/247] mesa-demos: 8.5.0 -> 9.0.0

Now with vkgears!
---
 pkgs/tools/graphics/mesa-demos/default.nix    | 23 ++++++-------------
 .../graphics/mesa-demos/demos-data-dir.patch  | 13 -----------
 2 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/tools/graphics/mesa-demos/demos-data-dir.patch

diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix
index efc58c370736..558e9d5d92f9 100644
--- a/pkgs/tools/graphics/mesa-demos/default.nix
+++ b/pkgs/tools/graphics/mesa-demos/default.nix
@@ -1,29 +1,20 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl
 , freeglut, glew, libGL, libGLU, libX11, libXext, mesa
-, meson, ninja, pkg-config, wayland, wayland-protocols }:
+, meson, ninja, pkg-config, wayland, wayland-protocols
+, vulkan-loader, libxkbcommon, libdecor, glslang }:
 
 stdenv.mkDerivation rec {
   pname = "mesa-demos";
-  version = "8.5.0";
+  version = "9.0.0";
 
   src = fetchurl {
-    url = "https://archive.mesa3d.org/demos/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-zqLfCoDwmjD2NcTrGmcr+Qxd3uC4539NcAQWaO9xqsE=";
+    url = "https://archive.mesa3d.org/demos/${pname}-${version}.tar.xz";
+    sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs=";
   };
 
-  patches = [
-    # https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83
-    ./demos-data-dir.patch
-
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/demos/-/commit/b6d183f9943a275990aef7f08773e54c597572e5.patch";
-      sha256 = "4UdV+cxvNRqoT+Pdy0gkCPXJbhFr6CSCw/UOOB+rvuw=";
-    })
-  ];
-
   buildInputs = [
     freeglut glew libX11 libXext libGL libGLU mesa wayland
-    wayland-protocols
+    wayland-protocols vulkan-loader libxkbcommon libdecor glslang
   ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ;
   nativeBuildInputs = [ meson ninja pkg-config ];
 
diff --git a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch b/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch
deleted file mode 100644
index d2f22a675ce3..000000000000
--- a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 282c39629da54ba6d7e1e380ffcf70da15e48d83..0c15274bff62b43f95ca7d7c5e29cc2dbd3cc42f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -29,7 +29,7 @@ null_dep = dependency('', required : false)
- 
- demos_data_dir = '../data/'
- if get_option('with-system-data-files')
--  demos_data_dir = get_option('datadir') / 'mesa-demos'
-+  demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/'
- endif
- add_project_arguments(
-   '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir),

From 27f97953e06b3b9e7a4df4d43b26184db6a6625a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 22 Mar 2023 15:49:32 +0000
Subject: [PATCH 103/247] nixos/test-driver: accept non-\w* filenames

What the code was trying to do was helpfully add a directory and
extension if none were specified, but it did this by checking whether
the filename was composed of a very limited character set that didn't
even include dashes.

With this change, the intention of the code is clearer, and I can put
dashes in my screenshot names.
---
 nixos/lib/test-driver/test_driver/machine.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index 4929f2048ecc..9de98c217a58 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -737,9 +737,10 @@ class Machine:
             self.connected = True
 
     def screenshot(self, filename: str) -> None:
-        word_pattern = re.compile(r"^\w+$")
-        if word_pattern.match(filename):
-            filename = os.path.join(self.out_dir, f"{filename}.png")
+        if "." not in filename:
+            filename += ".png"
+        if "/" not in filename:
+            filename = os.path.join(self.out_dir, filename)
         tmp = f"{filename}.ppm"
 
         with self.nested(

From 98711504853d2ca1eea4e88c9b833496f23e9287 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 16:08:24 +0000
Subject: [PATCH 104/247] imgui: 1.89.3 -> 1.89.4

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

diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix
index 50495cb680e6..d4dc3c3aa278 100644
--- a/pkgs/development/libraries/imgui/default.nix
+++ b/pkgs/development/libraries/imgui/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "imgui";
-  version = "1.89.3";
+  version = "1.89.4";
 
   src = fetchFromGitHub {
     owner = "ocornut";
     repo = "imgui";
     rev = "v${version}";
-    sha256 = "sha256-hPUOqXMpjKNuWVo2RUq2Nw5i+p8PE8qmlyATV7y3Lgg=";
+    sha256 = "sha256-iBpJzfU8ATDilU/1zhV9T/1Zy22g8vw81cmkmJ5+6cg=";
   };
 
   dontBuild = true;

From 3d1d0bf910d1c0c37d4d37b523be425fdebb6459 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 22 Mar 2023 18:15:22 +0200
Subject: [PATCH 105/247] wayland: allow building without tests

---
 pkgs/development/libraries/wayland/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index bb764d641436..20b809560e89 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -9,6 +9,7 @@
 , expat
 , libxml2
 , withLibraries ? stdenv.isLinux
+, withTests ? stdenv.isLinux
 , libffi
 , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
 , graphviz-nox
@@ -24,6 +25,9 @@
 # Documentation is only built when building libraries.
 assert withDocumentation -> withLibraries;
 
+# Tests are only built when building libraries.
+assert withTests -> withLibraries;
+
 let
   isCross = stdenv.buildPlatform != stdenv.hostPlatform;
 in
@@ -50,7 +54,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Ddocumentation=${lib.boolToString withDocumentation}"
     "-Dlibraries=${lib.boolToString withLibraries}"
-    "-Dtests=${lib.boolToString withLibraries}"
+    "-Dtests=${lib.boolToString withTests}"
   ];
 
   depsBuildBuild = [

From 61f59e48e6987bb608514f7a4480e592a38e6ec0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 16:40:21 +0000
Subject: [PATCH 106/247] fluent-bit: 2.0.9 -> 2.0.10

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

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 2f430dea25c9..471bd9d62e6e 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "2.0.9";
+  version = "2.0.10";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "sha256-jHbxROO21cgbhEiWv9wQJyHWGGK14nGQuk9Fc9ufHqg=";
+    sha256 = "sha256-6bmtSsNjSy7+Q2MWJdrP+zaXKwV4CEiBjhdZju+RBLI=";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From a6f9791e4a3733f1fc7c412c70cefa5e7e19ec69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 17:07:38 +0000
Subject: [PATCH 107/247] govc: 0.30.2 -> 0.30.4

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

diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index 39aadcf8e384..767f7e31e5bd 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "govc";
-  version = "0.30.2";
+  version = "0.30.4";
 
   subPackages = [ "govc" ];
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "vmware";
     repo = "govmomi";
-    sha256 = "sha256-Jt71nrviElNj5UjWzdP51x3My59KAT+EtrQfodR3GfA=";
+    sha256 = "sha256-lYiyZ2sY58bzUtqcM6WIsooLldQAxibASM7xXKAeqJM=";
   };
 
   vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";

From b6c8fe1d882431aa961735d064abe5aeaeee6171 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:03 +0100
Subject: [PATCH 108/247] python310Packages.archinfo: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index eca1ca452480..eebbadb366be 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.42";
+  version = "9.2.43";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jDC4nmHg7OCo7mQ7iLeG7OFB1xAQxkKw1WZTyY2FBoY=";
+    hash = "sha256-j+JzLN6ila3PsTtxespvPKyH6NVO8eFncDw9qPFDLyQ=";
   };
 
   nativeBuildInputs = [

From 2e0cd87a128263f23f314646dacaa35cd33b1ecc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:07 +0100
Subject: [PATCH 109/247] python310Packages.ailment: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 0f1163d184f8..8b54c963ce3e 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.42";
+  version = "9.2.43";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-45wEnYx2/XvyVlew8rwPFSHZtj6NdZWPEEomkqBLNIw=";
+    hash = "sha256-Nww43TIIWHJo8tKNQoPYWHXzslnsBGftxfTCg3elo6w=";
   };
 
   nativeBuildInputs = [

From f1b96b21679e704acd77fd1d1f56eda694f325b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:12 +0100
Subject: [PATCH 110/247] python310Packages.pyvex: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 8c1290c40ebe..c21515dcce20 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.42";
+  version = "9.2.43";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5pp66sI15sdavyZD+xrTFqhAgjT89KswBE0MQ09Fdl4=";
+    hash = "sha256-X1lFSbVhHBhQ6Y1pbzjObAISqA6rBTpx0Ww5c6p+3LM=";
   };
 
   nativeBuildInputs = [

From 6b8bae783918156014ce221e0c1c734167365650 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:16 +0100
Subject: [PATCH 111/247] python310Packages.claripy: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index b955773143a2..7e8a3b015e28 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.42";
+  version = "9.2.43";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-94FEyPL9zjHBFC8L/Aij8OcS5GiBBEY1Tnm4N7zNW0g=";
+    hash = "sha256-g7kXjoJDzc+MPmGR6dO7mGi3LcJQem6pnLvbuoC9Pxw=";
   };
 
   nativeBuildInputs = [

From ea31bf98c1bd3d42ef72ff578d80a4bd4f415d2e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:20 +0100
Subject: [PATCH 112/247] python310Packages.cle: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index fc185cf3cdd7..4df88d99f9c1 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.42";
+  version = "9.2.43";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-NZPXpL4bnPXJHIPf+Jwt6vE7G43JAjhZhW2xeNSw3R8=";
+    hash = "sha256-GWChdbQRnoD6hRVONLcFNoW9vJO9iWKLnjd8xiA/7jI=";
   };
 
   nativeBuildInputs = [

From 95565d482fee097a04fb1c8953d878d74344da95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:18:25 +0100
Subject: [PATCH 113/247] python310Packages.angr: 9.2.42 -> 9.2.43

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index d726a0a27af1..5275670a42b2 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.42";
+  version = "9.2.43";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-EbOGAY7aqpWngy8ImdDt8dmJhc1UEiX0I8KY8TSump0=";
+    hash = "sha256-SHUuKF7rT2x7CxF9s6ntxniOjhf7asY7HJeMi38Dqrc=";
   };
 
   propagatedBuildInputs = [

From 50ddfb4b91140405e1cc32dc8c502d9ac715f204 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 22 Mar 2023 19:42:16 +0200
Subject: [PATCH 114/247] python310Packages.pymupdf: fix build on darwin

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 075444ca17bd..d1b4d15bc87d 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,15 +1,18 @@
 { lib
+, stdenv
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
-, mupdf
 , swig
+, xcbuild
+, mupdf
 , freetype
 , harfbuzz
 , openjpeg
 , jbig2dec
 , libjpeg_turbo
 , gumbo
-, pythonOlder
+, memstreamHook
 }:
 
 buildPythonPackage rec {
@@ -31,6 +34,8 @@ buildPythonPackage rec {
   '';
   nativeBuildInputs = [
     swig
+  ] ++ lib.optionals stdenv.isDarwin [
+    xcbuild
   ];
 
   buildInputs = [
@@ -41,6 +46,8 @@ buildPythonPackage rec {
     jbig2dec
     libjpeg_turbo
     gumbo
+  ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [
+    memstreamHook
   ];
 
   doCheck = false;
@@ -55,6 +62,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ teto ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From d815460b54b19b321c674bf91904a5cd3160d584 Mon Sep 17 00:00:00 2001
From: Paul Zeinlinger <paul.zeinlinger@gmail.com>
Date: Wed, 22 Mar 2023 18:44:26 +0100
Subject: [PATCH 115/247] headscale: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 8ebcde82a446..1df168ebe170 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "headscale";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     rev = "v${version}";
-    hash = "sha256-RqJrqY1Eh5/TY+vMAO5fABmeV5aSzcLD4fX7j1QDN6w=";
+    hash = "sha256-Y4fTCEKK7iRbfijQAvYgXWVa/6TlPikXnqyBI8b990s=";
   };
 
-  vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI=";
+  vendorHash = "sha256-R183PDeAUnNwNV8iE3b22S5hGPJG8aZQGdENGqcPCw8=";
 
   ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
 

From a00a372b6f54bde57255733d4f776bb1c2f21041 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:54:43 +0100
Subject: [PATCH 116/247] python310Packages.skodaconnect: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index 8ea58cbf7b73..e13bb2b57d80 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "skodaconnect";
-  version = "1.3.4";
+  version = "1.3.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "lendy007";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-bjFXrhwIGB50upL++VnrrfzFhxFOrxgYhoNZqkbvZ9w=";
+    hash = "sha256-gLk+Dj2x2OHa6VIIoA7FesDKtg180MuCud2nYk9mYpM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 40ec2c79547b08f97a293ad8888c32439f4cdf4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 17:57:40 +0000
Subject: [PATCH 117/247] dnsperf: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index d7b1dd365a27..5a7a76cdc66a 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dnsperf";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "DNS-OARC";
     repo = "dnsperf";
     rev = "v${version}";
-    sha256 = "sha256-dgPpuX8Geo20BV8g0uhjSdsZUOoC+Dnz4Y2vdMW6KjY=";
+    sha256 = "sha256-vZ2GPrlMHMe2vStjktbyLtXS5SoNzHbNwFi+CL1Z4VQ=";
   };
 
   nativeBuildInputs = [

From 525ba3e492446e6928d12c0ab79519924afe29d6 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 23 Dec 2022 09:28:08 -0600
Subject: [PATCH 118/247] octavePackages.strings: add pkg-config for build to
 pick up pcre(2)

---
 pkgs/development/octave-modules/strings/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix
index 1d57aaf7f6a2..77353faa4e84 100644
--- a/pkgs/development/octave-modules/strings/default.nix
+++ b/pkgs/development/octave-modules/strings/default.nix
@@ -2,7 +2,8 @@
 , stdenv
 , lib
 , fetchurl
-, pcre
+, pkg-config
+, pcre2
 }:
 
 buildOctavePackage rec {
@@ -14,8 +15,12 @@ buildOctavePackage rec {
     sha256 = "sha256-agpTD9FN1qdp+BYdW5f+GZV0zqZMNzeOdymdo27mTOI=";
   };
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [
-    pcre
+    pcre2
   ];
 
   # The gripes library no longer exists.

From 45b015a1650f7b89b3148c9fff3a7029d7d35be9 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 23 Dec 2022 10:49:46 -0600
Subject: [PATCH 119/247] octavePackages: use alternative fetchers for moved
 projects

Many projects moved from SourceForge to other hosting sites. Use an
appropriate fetcher for each of the packages that have moved to the
new sites.

octavePackages.bim: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.msh: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.statistics: fetchurl -> fetchFromGitHub

There was a migration from SourceForge to GitHub by the authors.

octavePackages.octclip: fetchurl -> fetchFromBitbucket

There was a migration from SourceForge to Bitbucket by the authors.

octavePackages.geometry: fetchurl -> fetchhg

Release 4.0.0 is broken. Revision
04965cda30b5f9e51774194c67879e7336df1710 was made shortly thereafter,
fixing a compilation bug.

The bug in question:
polygon.cpp:208:22:
error: static assertion failed: comparison object must be invocable as const
is_invocable_v<const _Compare&, const _Key&, const _Key&>,

octavePackages.octproj: fetchurl -> fetchFromBitbucket

There was a migration from SourceForge to Bitbucket by the authors.
---
 pkgs/development/octave-modules/bim/default.nix       | 10 ++++++----
 pkgs/development/octave-modules/geometry/default.nix  | 11 ++++++-----
 pkgs/development/octave-modules/msh/default.nix       | 10 ++++++----
 pkgs/development/octave-modules/octclip/default.nix   | 10 ++++++----
 pkgs/development/octave-modules/octproj/default.nix   | 10 ++++++----
 .../development/octave-modules/statistics/default.nix | 10 ++++++----
 6 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index 56865493e46b..dc018ae6143e 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -1,6 +1,6 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchFromGitHub
 , fpl
 , msh
 }:
@@ -9,9 +9,11 @@ buildOctavePackage rec {
   pname = "bim";
   version = "1.1.6";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-pv64swrPlgopBlubpAlfoD9KJlOSgF9wdbgdHHTcr9c=";
+  src = fetchFromGitHub {
+    owner = "carlodefalco";
+    repo = "bim";
+    rev = "v${version}";
+    sha256 = "sha256-hgFb1KFE1KJC8skIaeT/7h/fg1aqRpedGnEPY24zZSI=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/geometry/default.nix b/pkgs/development/octave-modules/geometry/default.nix
index b4bf57262fae..86ef985fd1b0 100644
--- a/pkgs/development/octave-modules/geometry/default.nix
+++ b/pkgs/development/octave-modules/geometry/default.nix
@@ -1,16 +1,17 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchhg
 , matgeom
 }:
 
 buildOctavePackage rec {
   pname = "geometry";
-  version = "4.0.0";
+  version = "unstable-2021-07-07";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1zmd97xir62fr5v57xifh2cvna5fg67h9yb7bp2vm3ll04y41lhs";
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/octave/${pname}";
+    rev = "04965cda30b5f9e51774194c67879e7336df1710";
+    sha256 = "sha256-ECysYOJMF4gPiCFung9hFSlyyO60X3MGirQ9FlYDix8=";
   };
 
   requiredOctavePackages = [
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index 8ce1341419c0..e147b9a9c2a2 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -1,6 +1,6 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchFromGitHub
 # Octave Dependencies
 , splines
 # Other Dependencies
@@ -15,9 +15,11 @@ buildOctavePackage rec {
   pname = "msh";
   version = "1.0.12";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-7xbB+RXq5SE7Ke5rNwSo/mqdSZTzCLXRhS4zdfGz55s=";
+  src = fetchFromGitHub {
+    owner = "carlodefalco";
+    repo = "msh";
+    rev = "v${version}";
+    sha256 = "sha256-UnMrIruzm3ARoTgUlMMxfjTOMZw/znZUQJmj3VEOw8I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix
index d8c607c391bd..c70a5ffc137a 100644
--- a/pkgs/development/octave-modules/octclip/default.nix
+++ b/pkgs/development/octave-modules/octclip/default.nix
@@ -1,15 +1,17 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchFromBitbucket
 }:
 
 buildOctavePackage rec {
   pname = "octclip";
   version = "2.0.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-u6wvCibdkLgmC8Q2LlpVLfXR3LYtssYlO2cRqYPmmR8=";
+  src = fetchFromBitbucket {
+    owner = "jgpallero";
+    repo = pname;
+    rev = "OctCLIP-${version}";
+    sha256 = "sha256-gG2b8Ix6bzO6O7GRACE81JCVxfXW/+ZdfoniigAEq3g=";
   };
 
   # The only compilation problem is that no formatting specifier was provided
diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index 0f76ab684708..3769f7f675b5 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -1,6 +1,6 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchFromBitbucket
 , proj # >= 6.3.0
 }:
 
@@ -8,9 +8,11 @@ buildOctavePackage rec {
   pname = "octproj";
   version = "3.0.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-G2Ajnt4KGaq9hdXHLHL+6d9lGb83wkMHZqswNijwSzs=";
+  src = fetchFromBitbucket {
+    owner = "jgpallero";
+    repo = pname;
+    rev = "OctPROJ-${version}";
+    sha256 = "sha256-d/Zf172Etj+GA0cnGsQaKMjOmirE7Hwyj4UECpg7QFM=";
   };
 
   # The sed changes below allow for the package to be compiled.
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index 8067f257d3e7..eba27ab49b2d 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -1,6 +1,6 @@
 { buildOctavePackage
 , lib
-, fetchurl
+, fetchFromGitHub
 , io
 }:
 
@@ -8,9 +8,11 @@ buildOctavePackage rec {
   pname = "statistics";
   version = "1.5.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-JtXwR7bfFcRu6zRD1gGYG06Txmcu42w2C+zMXEiFf/U=";
+  src = fetchFromGitHub {
+    owner = "gnu-octave";
+    repo = "statistics";
+    rev = "release-${version}";
+    sha256 = "sha256-+Eye29vH4HBfaZRzRNY6J0+wWjh6aCvnq7hZ7M34L2M=";
   };
 
   requiredOctavePackages = [

From 59742a5e0446a204c27ea9ab3458521674ea75f9 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 23 Dec 2022 10:39:25 -0600
Subject: [PATCH 120/247] octavePackages.octproj: unmark as broken

This package broke when Octave went to version 7.1.
nixpkgs commit 8399907be3c008b6e12863364d6f7848f52034b1 fixed this.

Octave's 7.2 release built the fix into Octave itself, so this is also
a non-issue now.
---
 pkgs/development/octave-modules/octproj/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix
index 3769f7f675b5..bc0dd4ea2132 100644
--- a/pkgs/development/octave-modules/octproj/default.nix
+++ b/pkgs/development/octave-modules/octproj/default.nix
@@ -30,6 +30,5 @@ buildOctavePackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ KarlJoad ];
     description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
-    broken = true; # error: unlink: operation failed: No such file or directory
   };
 }

From 3d87986dd0ee8ff63769512f4edebce105fae209 Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 23 Dec 2022 11:05:53 -0600
Subject: [PATCH 121/247] octavePackages.mapping: add gdal library for reading
 raster files

---
 pkgs/development/octave-modules/mapping/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/octave-modules/mapping/default.nix b/pkgs/development/octave-modules/mapping/default.nix
index 2c91fad72264..13d7fd5dd526 100644
--- a/pkgs/development/octave-modules/mapping/default.nix
+++ b/pkgs/development/octave-modules/mapping/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , io # >= 2.2.7
 , geometry # >= 4.0.0
+, gdal
 }:
 
 buildOctavePackage rec {
@@ -14,6 +15,10 @@ buildOctavePackage rec {
     sha256 = "sha256-mrUQWqC15Ul5AHDvhMlNStqIMG2Zxa+hB2vDyeizLaI=";
   };
 
+  buildInputs = [
+    gdal
+  ];
+
   requiredOctavePackages = [
     io
     geometry

From e8afe3afc47a418eb056a998e347fc2e2baaa637 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 15 Mar 2023 13:54:28 +0000
Subject: [PATCH 122/247] =?UTF-8?q?octavePackages.statistics:=201.5.2=20?=
 =?UTF-8?q?=E2=86=92=201.5.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index eba27ab49b2d..433a70f19bdc 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -6,13 +6,13 @@
 
 buildOctavePackage rec {
   pname = "statistics";
-  version = "1.5.2";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "statistics";
-    rev = "release-${version}";
-    sha256 = "sha256-+Eye29vH4HBfaZRzRNY6J0+wWjh6aCvnq7hZ7M34L2M=";
+    rev = "refs/tags/release-${version}";
+    sha256 = "sha256-gFauFIaXKzcPeNvpWHv5FAxYQvZNh7ELrSUIvn43IfQ=";
   };
 
   requiredOctavePackages = [

From acd9116d47894543238b7b94ddaff97a9b43a8a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 19:30:39 +0100
Subject: [PATCH 123/247] python310Packages.pvo: 0.2.2 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index 2931c00a5a5e..b7c54cd21350 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pvo";
-  version = "0.2.2";
+  version = "1.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-pvoutput";
     rev = "v${version}";
-    hash = "sha256-2/O81MnFYbdOrzLiTSoX7IW+3ZGyyE/tIqgKr/sEaHI=";
+    hash = "sha256-6oVACUnK8WVlEx047CUXmSXQ0+M3xnSvyMHw5Wttk7M=";
   };
 
   nativeBuildInputs = [

From e0cf12cd1b01d731295eef6bc01cfcf4f35c0073 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 19:32:22 +0100
Subject: [PATCH 124/247] python310Packages.oralb-ble: 0.17.5 -> 0.17.6

Changelog: https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v0.17.6
---
 pkgs/development/python-modules/oralb-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix
index 689cd7903368..5eb5d0ce83fe 100644
--- a/pkgs/development/python-modules/oralb-ble/default.nix
+++ b/pkgs/development/python-modules/oralb-ble/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "oralb-ble";
-  version = "0.17.5";
+  version = "0.17.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Lwrr5XzU2pbx3cYkvYtHgXFhGnz3cMBnNFWCpuY3ltg=";
+    hash = "sha256-6LnZ+Y68sl0uA5i764n4fFJnPeo+bAi/xgEvTK6LkXY=";
   };
 
   nativeBuildInputs = [

From c102e4e84c0ac00e2af1d3fe4a5cf76bc992c561 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 19:38:49 +0100
Subject: [PATCH 125/247] python310Packages.pvo: add changelog to meta

---
 pkgs/development/python-modules/pvo/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index b7c54cd21350..a6d90a17a199 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-pvoutput";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-6oVACUnK8WVlEx047CUXmSXQ0+M3xnSvyMHw5Wttk7M=";
   };
 
@@ -55,6 +55,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to interact with the PVOutput API";
     homepage = "https://github.com/frenck/python-pvoutput";
+    changelog = "https://github.com/frenck/python-pvoutput/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 73e5363e774d30b044fc8be441f3d4265d6a64bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 19:39:10 +0100
Subject: [PATCH 126/247] python310Packages.pvo: update disabled

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

diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index a6d90a17a199..6f3f698fe2c7 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   version = "1.0.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "frenck";

From 11df8eb0289c9fca4cde30220758d002362b7201 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:04:28 +0100
Subject: [PATCH 127/247] python310Packages.gvm-tools: 23.2.0 -> 23.3.0

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

diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 378d9f720363..f5811221949d 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "23.2.0";
+  version = "23.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk=";
+    hash = "sha256-sv34PwOEWGsIgSNpUcqvwjJ+6FSrmpXNB5gc47EjFU0=";
   };
 
   nativeBuildInputs = [

From 2eae6d5faf1c4c59f1a4bde0ef7524bd17a85d4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:06:19 +0100
Subject: [PATCH 128/247] python310Packages.gvm-tools: add changelog to meta

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

diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index f5811221949d..9c7d70822eb0 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -48,6 +48,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Collection of APIs that help with remote controlling a Greenbone Security Manager";
     homepage = "https://github.com/greenbone/gvm-tools";
+    changelog = "https://github.com/greenbone/gvm-tools/releases/tag/v${version}";
     license = with licenses; [ gpl3Plus ];
     maintainers = with maintainers; [ fab ];
   };

From 1b578a6734b5dfdd562a0fffbdba7422eda6faf3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:09:15 +0100
Subject: [PATCH 129/247] kubeaudit: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/tools/security/kubeaudit/default.nix
index dab0586e7298..09cc5f996011 100644
--- a/pkgs/tools/security/kubeaudit/default.nix
+++ b/pkgs/tools/security/kubeaudit/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "kubeaudit";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-+aHJMCwV4en30BufqzSK0yBaJCzLBfOXWTkJCsBCfVA=";
+    hash = "sha256-e6No8Md/KZUFNtPJOrSdv1GlGmxX7+tmWNjQGFdtJpc=";
   };
 
-  vendorSha256 = "sha256-DVXevOOQQjMhZ+9HLlQpKA1mD4FkIkGtq+Ur8uKTcwU=";
+  vendorSha256 = "sha256-IxrAJaltg7vo3SQRC7OokSD5SM8xiX7iG8ZxKYEe9/E=";
 
   postInstall = ''
     mv $out/bin/cmd $out/bin/$pname

From 7372e71e447c8492847c3c179c1602faf6fb067c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:11:08 +0100
Subject: [PATCH 130/247] kubeaudit: add changelog to meta

---
 pkgs/tools/security/kubeaudit/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/tools/security/kubeaudit/default.nix
index 09cc5f996011..b38a4b8fe593 100644
--- a/pkgs/tools/security/kubeaudit/default.nix
+++ b/pkgs/tools/security/kubeaudit/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-e6No8Md/KZUFNtPJOrSdv1GlGmxX7+tmWNjQGFdtJpc=";
   };
 
@@ -26,6 +26,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Audit tool for Kubernetes";
     homepage = "https://github.com/Shopify/kubeaudit";
+    changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From b386a85afc555f38fa7d51fbb24e2e4d26277875 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:21:43 +0100
Subject: [PATCH 131/247] python310Packages.ulid-transform: 0.4.2 -> 0.5.1

Changelog: https://github.com/bdraco/ulid-transform/releases/tag/v0.5.1
---
 pkgs/development/python-modules/ulid-transform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix
index 171b1dc499a9..4d899fc76740 100644
--- a/pkgs/development/python-modules/ulid-transform/default.nix
+++ b/pkgs/development/python-modules/ulid-transform/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "ulid-transform";
-  version = "0.4.2";
+  version = "0.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-eRLmA/8fKfG0qEl0QbX6FziEviU34uU7SP0iyZmbku8=";
+    hash = "sha256-tgCNjvI9e7GpZKG8Q6tykU+WKBPGm0FTsw3gwUU3+so=";
   };
 
   nativeBuildInputs = [

From 517ae00bdeba732e1d222648ace0ed2549f92189 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:31:19 +0100
Subject: [PATCH 132/247] python310Packages.yalexs-ble: 2.1.0 -> 2.1.1

Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.1/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 8075bf8a7d37..68c7681c5ce7 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.1.0";
+  version = "2.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-BF2jGEFtUYckFNJwddLGjwQYIhYKhM7q6Q2mCil6Z3Y=";
+    hash = "sha256-tYdm6XrjltQtN9m23GB9WDWLbXb4pMNiLQWpxxeqsLY=";
   };
 
   nativeBuildInputs = [

From cc9ecf858af7c01f3d81aabd0d74b44b8a3bfeb9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:45:22 +0100
Subject: [PATCH 133/247] python310Packages.fakeredis: 2.10.1 -> 2.10.2

Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.10.2
---
 pkgs/development/python-modules/fakeredis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 379fa2b7d06b..b71ba532c2e6 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.10.1";
+  version = "2.10.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5jtI7EemKi0w/ezr/jLFQFndvqOjVE0SUm1urluKusY=";
+    hash = "sha256-ZQC8KNHM6Nnytkr6frZMl5mBVPkpduWZwwooCPymbFY=";
   };
 
   nativeBuildInputs = [

From d0a0946dc3ffe62d9e0bfd7c1f829c57e8da703b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 20:46:20 +0100
Subject: [PATCH 134/247] python310Packages.teslajsonpy: 3.7.4 -> 3.7.5

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

diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 96a96c50504e..fda171a9bd87 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.7.4";
+  version = "3.7.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-A/UliJWJ1gSDNG1IMcJup33elyxTxuGK/y/001WJnV8=";
+    hash = "sha256-MOFC8jMJsBernY1/aFobgBNsnt7MYjSUPVoum0e4hUg=";
   };
 
   nativeBuildInputs = [

From e2f8de8ba77077f4cb6c214fd23a3235147e2a2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:46:43 +0100
Subject: [PATCH 135/247] python310Packages.peaqevcore: 13.3.0 -> 13.4.0

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

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 3e9d3534a314..faf02dc337f0 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "13.3.0";
+  version = "13.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1faEVqSGhRr+CaRHgZMS093fSC3hBgK2CX0oCxAIjCU=";
+    hash = "sha256-USDqlZZ8w4A2KC4xGVCkgEuMxGK8ez5+/M6nSe3/46c=";
   };
 
   postPatch = ''

From 8d231244fd9712f702dea6c21461826f8eea2a57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 21:09:13 +0100
Subject: [PATCH 136/247] ghauri: init at 1.1.8

---
 pkgs/tools/security/ghauri/default.nix | 39 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/ghauri/default.nix

diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix
new file mode 100644
index 000000000000..92f1e9e1b0bc
--- /dev/null
+++ b/pkgs/tools/security/ghauri/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "ghauri";
+  version = "1.1.8";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "r0oth3x49";
+    repo = "ghauri";
+    rev = "refs7tags/${version}";
+    hash = "sha256-WEWiWu8U7DmRjj42BEBXA3CHTyJh2Apz59ImFrmQXEk=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    chardet
+    colorama
+    requests
+    tldextract
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "ghauri"
+  ];
+
+  meta = with lib; {
+    description = "Tool for detecting and exploiting SQL injection security flaws";
+    homepage = "https://github.com/r0oth3x49/ghauri";
+    changelog = "https://github.com/r0oth3x49/ghauri/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50efe061c492..d672228de9b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4872,6 +4872,8 @@ with pkgs;
 
   gh-ost = callPackage ../tools/misc/gh-ost { };
 
+  ghauri = callPackage ../tools/security/ghauri { };
+
   ghdorker = callPackage ../tools/security/ghdorker { };
 
   ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {}

From 6d903cec7e3040a694c2c24c395f401db735545a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Wed, 22 Mar 2023 21:30:23 +1100
Subject: [PATCH 137/247] cdrkit: fix darwin build

Fix source issues and required deps.
---
 pkgs/tools/cd-dvd/cdrkit/default.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index efa663809949..de54827071c6 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
+{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl, iconv, darwin}:
 
 stdenv.mkDerivation rec {
   pname = "cdrkit";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ libcap zlib bzip2 perl ];
+  buildInputs = [ zlib bzip2 perl ] ++
+    lib.optionals stdenv.isLinux [ libcap ] ++
+    lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]);
 
   hardeningDisable = [ "format" ];
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW=";
@@ -18,11 +20,31 @@ stdenv.mkDerivation rec {
   # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
   patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];
 
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace libusal/scsi-mac-iokit.c \
+      --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
+    substituteInPlace genisoimage/sha256.c \
+      --replace "<endian.h>" "<machine/endian.h>"
+    substituteInPlace genisoimage/sha512.c \
+      --replace "<endian.h>" "<machine/endian.h>"
+    substituteInPlace genisoimage/sha256.h \
+      --replace "__THROW" ""
+    substituteInPlace genisoimage/sha512.h \
+      --replace "__THROW" ""
+  '';
+
   preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace include/xconfig.h.in \
         --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD"
   '';
 
+  postConfigure = lib.optionalString stdenv.isDarwin ''
+    for f in */CMakeFiles/*.dir/link.txt ; do
+      substituteInPlace "$f" \
+        --replace "-lrt" "-framework IOKit"
+    done
+  '';
+
   postInstall = ''
     # file name compatibility with the old cdrecord (growisofs wants this name)
     ln -s $out/bin/genisoimage $out/bin/mkisofs
@@ -49,6 +71,6 @@ stdenv.mkDerivation rec {
 
     homepage = "http://cdrkit.org/";
     license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From c62c9ae27a76a7839aec8efa28868537f3ebae1c Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 22 Mar 2023 17:19:26 -0400
Subject: [PATCH 138/247] ruff: 0.0.257 -> 0.0.258

Diff: https://github.com/charliermarsh/ruff/compare/v0.0.257...v0.0.258

Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.258
---
 pkgs/development/tools/ruff/Cargo.lock  | 11 ++++++-----
 pkgs/development/tools/ruff/default.nix |  8 ++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock
index 358421cebae7..d94322e0546d 100644
--- a/pkgs/development/tools/ruff/Cargo.lock
+++ b/pkgs/development/tools/ruff/Cargo.lock
@@ -780,7 +780,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.257"
+version = "0.0.258"
 dependencies = [
  "anyhow",
  "clap 4.1.8",
@@ -1982,7 +1982,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.257"
+version = "0.0.258"
 dependencies = [
  "anyhow",
  "bisection",
@@ -1990,7 +1990,6 @@ dependencies = [
  "chrono",
  "clap 4.1.8",
  "colored",
- "criterion",
  "dirs",
  "fern",
  "glob",
@@ -2025,6 +2024,7 @@ dependencies = [
  "schemars",
  "semver",
  "serde",
+ "serde_json",
  "shellexpand",
  "smallvec",
  "strum",
@@ -2063,7 +2063,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.257"
+version = "0.0.258"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2091,6 +2091,7 @@ dependencies = [
  "ruff",
  "ruff_cache",
  "ruff_diagnostics",
+ "ruff_python_stdlib",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -2210,7 +2211,6 @@ name = "ruff_python_stdlib"
 version = "0.0.0"
 dependencies = [
  "once_cell",
- "regex",
  "rustc-hash",
 ]
 
@@ -2505,6 +2505,7 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
+ "indexmap",
  "itoa",
  "ryu",
  "serde",
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index cecbb999484b..bf008c43d980 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.0.257";
+  version = "0.0.258";
 
   src = fetchFromGitHub {
     owner = "charliermarsh";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-PkKUQPkZtwqvWhWsO4Pej/T1haJvMP7HpF6XjZSoqQg=";
+    hash = "sha256-rlMghh6NmyIJTdjf6xmzVuevXh/OrBqhx+CkvvQwlng=";
   };
 
   # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
@@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0=";
-      "libcst_derive-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0=";
       "pep440_rs-0.2.0" = "sha256-wDJGz7SbHItYsg0+EgIoH48WFdV6MEg+HkeE07JE6AU=";
       "rustpython-ast-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc=";
-      "rustpython-common-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc=";
-      "rustpython-compiler-core-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc=";
-      "rustpython-parser-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc=";
       "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";
     };
   };

From a5e81d739ef6e7bfdfa29e31c84c1de3d2b6ab6c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 22 Mar 2023 23:01:34 +0100
Subject: [PATCH 139/247] chromium: 111.0.5563.64 -> 111.0.5563.110

https://chromereleases.googleblog.com/2023/03/stable-channel-update-for-desktop_21.html

This update includes 8 security fixes.

CVEs:
CVE-2023-1528 CVE-2023-1529 CVE-2023-1530 CVE-2023-1531 CVE-2023-1532
CVE-2023-1533 CVE-2023-1534
---
 .../browsers/chromium/upstream-info.json           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 14e256a92b21..befc5b89fa92 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "111.0.5563.64",
-    "sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x",
-    "sha256bin64": "0rnqrjnybghb4h413cw3f54ga2x76mfmf1fp2nnf59c1yml4r4vf",
+    "version": "111.0.5563.110",
+    "sha256": "0rd7hxa02dy64xwhkwk8v71hqmbvyzcnqldvxpvdr8khn5rnrpa9",
+    "sha256bin64": "18ph8di5g235jrsc0xpwf58f2sx2mmaz25g1921d3fqva8s1vri0",
     "deps": {
       "gn": {
         "version": "2022-12-12",
@@ -12,10 +12,10 @@
       }
     },
     "chromedriver": {
-      "version": "111.0.5563.41",
-      "sha256_linux": "160khwa4x6w9gv5vkvalwbx87r6hrql0y0xr7zvxsir1x6rklwm2",
-      "sha256_darwin": "0z5q9r39jd5acyd79yzrkgqkvv3phdkyq4wvdsmhnpypazg072l6",
-      "sha256_darwin_aarch64": "0xiagydqnywzrpqq3i7363zhiywkp8ra9ygb2q1gznb40rx98pbr"
+      "version": "111.0.5563.64",
+      "sha256_linux": "0f4v6hds5wl43hnmqxmzidlg5nqgr4iy04hmrmvzaihsdny3na8s",
+      "sha256_darwin": "0izdp36d4wid5hmz8wcna3gddly7nbkafqqf5k1ikb2jgx9ipp8f",
+      "sha256_darwin_aarch64": "0yzn7bibj36wrc980s9sa8cl0qds01n9i88jk95afx5lk5zb8rgc"
     }
   },
   "beta": {

From f1f4cc5dd62e33fc874bd61dc7b282b1b68866ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 22:16:37 +0000
Subject: [PATCH 140/247] aws-vault: 7.1.1 -> 7.1.2

---
 pkgs/tools/admin/aws-vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 2b47b6b7a5a3..fa766f6ec4f9 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "aws-vault";
-  version = "7.1.1";
+  version = "7.1.2";
 
   src = fetchFromGitHub {
     owner = "99designs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ydg//2t+B02eXwnwsmECx+I8oluPf6dKntz7L6gWV88=";
+    sha256 = "sha256-MlzK9ENCm1P3Nir/bwo9slWwiuaIqF4icV1Sm0WvUS8=";
   };
 
   vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s=";

From 841417745c50099ae55a26042ecd40c82ca715be Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Mar 2023 21:13:15 +0100
Subject: [PATCH 141/247] grafana: 9.4.3 -> 9.4.7

Sadly, upstream doesn't publish proper changelogs anymore[1] and there's
also quite a gap - this is the first time a release was published for
9.4.x since 9.4.3, so I decided to skim through the commit log on my own[2].

While there are no apparent problematic changes for us, but only
bugfixes, internal changes and a few doc fixes, I found at least one
security patch[3] fixing XSS in the graphite datasource settings, hence
the corresponding PR will get a security label.

[1] https://github.com/grafana/grafana/releases/tag/v9.4.7
    / https://github.com/grafana/grafana/commit/adcdf190bbf5c1972a01388a334756617185ac7a
[2] https://github.com/grafana/grafana/compare/v9.4.3...v9.4.7
[3] https://github.com/grafana/grafana/commit/ef2eb2b6bf1d7c0fb781e3e05d0d1aecd6dd438a
---
 pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 24813af5a29d..b3162a4c6791 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "9.4.3";
+  version = "9.4.7";
 
   excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
 
@@ -10,15 +10,15 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "sha256-LYUbypPXoWwWA4u2JxhUS/lozQNo2DCFGDPCmNP3GoE=";
+    sha256 = "sha256-vhGFZjxO20M3fQhXlEDDkad/yOyFOu48sHZ63MEnWIA=";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "sha256-aq6/sMfYVebxh46+zxphfWttFN4vBpUgCLXobLWVozk=";
+    sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0=";
   };
 
-  vendorSha256 = "sha256-atnlEdGDiUqQkslvRlPSi6VC5rEvRVV6R2Wxur3geew=";
+  vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM=";
 
   nativeBuildInputs = [ wire ];
 

From b780344698497b99f44dd46d6c14ddccc0f50ed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 22:34:04 +0000
Subject: [PATCH 142/247] nushell: 0.77.0 -> 0.77.1

---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index f07d17e00fbd..69957209cf24 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -26,7 +26,7 @@
 
 rustPlatform.buildRustPackage (
   let
-    version =  "0.77.0";
+    version =  "0.77.1";
     pname = "nushell";
   in {
   inherit version pname;
@@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-cffAxuM12wdd7IeLbKSpL6dpvpZVscA8nMOh3jFqY3E=";
+    sha256 = "sha256-MheKGfm72cxFtMIDj8VxEN4VFB1+tLoj+ujzL/7n8YI=";
   };
 
-  cargoSha256 = "sha256-OcYE9d3hO3JtxF3REWev0Rz97Kr9l7P7nUxhIb5fhi0=";
+  cargoSha256 = "sha256-oUeoCAeVP2MBAhJfMptK+Z3n050cqpIIgnUroRVBYjg=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]

From c33cce281f060b98643f0aa3fec0edcfb6be74bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 23:28:32 +0000
Subject: [PATCH 143/247] checkSSLCert: 2.61.0 -> 2.62.0

---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 202f1ce13fe8..466747adcaba 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.61.0";
+  version = "2.62.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    hash = "sha256-BePgfyVtEhm81kDtjRt0P6O9zgWA4f+5pH//w9PxD8w=";
+    hash = "sha256-AAQLJ+dipWTPgRJWACF7DS4IHnDQ6z/ddjW9f/6h734=";
   };
 
   nativeBuildInputs = [

From 53c2bb7b496c6ba2966f43c30fe172790b1811d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Mar 2023 23:45:11 +0000
Subject: [PATCH 144/247] watchexec: 1.21.1 -> 1.22.0

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

diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index d1fa01a3bdf0..bde4a0d3af2c 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchexec";
-  version = "1.21.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-RwzbPMSQqEdsJ+EEZBP8Tn8AueLmvDJcPFzdFg1/bro=";
+    sha256 = "sha256-5CDiiDmUQllsi07OrhCSERkPOOhQoYSNInGewaBGLzw=";
   };
 
-  cargoSha256 = "sha256-xugAMfg9S/gGtiry78xX6JaSHWlFofo2qZaBjh0fHec=";
+  cargoHash = "sha256-peHAS+/UvEn0CB94ybhSwu2v7RON0FzVnlhVUJSRQrM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3c7f1ceab26a27dbfeb5ecb3cf461aa091dbd82c Mon Sep 17 00:00:00 2001
From: Avinash Jois <avinash@neuralink.com>
Date: Wed, 22 Mar 2023 19:35:59 -0500
Subject: [PATCH 145/247] wavedrom-cli: add missing giflib dep

---
 pkgs/development/node-packages/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 44c3eca6597b..375d73aef9d1 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -625,6 +625,7 @@ final: prev: {
     # These dependencies are required by
     # https://github.com/Automattic/node-canvas.
     buildInputs = with pkgs; [
+      giflib
       pixman
       cairo
       pango

From a53ae00ec5c6dc07c9f9c2125c043716359e55cb Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 15 Mar 2023 17:49:44 -0700
Subject: [PATCH 146/247] focus-stack: init at 1.4

---
 .../graphics/focus-stack/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/graphics/focus-stack/default.nix

diff --git a/pkgs/applications/graphics/focus-stack/default.nix b/pkgs/applications/graphics/focus-stack/default.nix
new file mode 100644
index 000000000000..11de5d144452
--- /dev/null
+++ b/pkgs/applications/graphics/focus-stack/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, which
+, ronn
+, opencv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "focus-stack";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "PetteriAimonen";
+    repo = "focus-stack";
+    rev = version;
+    hash = "sha256-SoECgBMjWI+n7H6p3hf8J5E9UCLHGiiz5WAsEEioJsU=";
+  };
+
+  nativeBuildInputs = [ pkg-config which ronn ];
+  buildInputs = [ opencv ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with lib; {
+    description = "Fast and easy focus stacking";
+    homepage = "https://github.com/PetteriAimonen/focus-stack";
+    license = licenses.mit;
+    maintainers = with maintainers; [ paperdigits ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8086a44fe793..d5e6fac5f7c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29565,6 +29565,8 @@ with pkgs;
 
   focus = callPackage ../tools/X11/focus { };
 
+  focus-stack = callPackage ../applications/graphics/focus-stack { };
+
   focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { };
 
   foliate = callPackage ../applications/office/foliate { };

From c5ab8fd93f9315988a17a9dfbd7127760466c6bb Mon Sep 17 00:00:00 2001
From: YisuiDenghua <bileiner@gmail.com>
Date: Wed, 8 Mar 2023 00:12:29 +0800
Subject: [PATCH 147/247] ciel: init at 3.1.4

---
 .../tools/package-management/ciel/default.nix | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/tools/package-management/ciel/default.nix

diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix
new file mode 100644
index 000000000000..0fe289011640
--- /dev/null
+++ b/pkgs/tools/package-management/ciel/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, bash
+, dbus
+, fetchFromGitHub
+, fetchpatch
+, installShellFiles
+, libgit2
+, libssh2
+, openssl
+, pkg-config
+, rustPlatform
+, systemd
+, xz
+, zlib
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ciel";
+  version = "3.1.4";
+
+  src = fetchFromGitHub {
+    owner = "AOSC-Dev";
+    repo = "ciel-rs";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-b8oTVtDcxrV41OtfuthIxjbgZTANCfYHQLRJnnEc93c=";
+  };
+
+  cargoHash = "sha256-11/Yf1hTKYRsQKzvwYXgyPuhIZwshwSJ8sNykUQRdoo=";
+
+  nativeBuildInputs = [ pkg-config installShellFiles ];
+
+  # ciel has plugins which is actually bash scripts.
+  # Therefore, bash is required for plugins to work.
+  buildInputs = [ bash systemd dbus openssl libssh2 libgit2 xz zlib ];
+
+  patches = [
+    # cli,completions: use canonicalize path to find libexec location
+    # FIXME: remove this patch after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged
+    (fetchpatch {
+      name = "use-canonicalize-path-to-find-libexec.patch";
+      url = "https://github.com/AOSC-Dev/ciel-rs/pull/16.patch";
+      sha256 = "sha256-ELK2KpOuoBS774apomUIo8q1eXYs/FX895G7eBdgOQg=";
+    })
+  ];
+
+  postInstall = ''
+    mv -v "$out/bin/ciel-rs" "$out/bin/ciel"
+
+    # From install-assets.sh
+    install -Dm555 -t "$out/libexec/ciel-plugin" plugins/*
+
+    # Install completions
+    installShellCompletion --cmd ciel \
+      --bash completions/ciel.bash \
+      --fish completions/ciel.fish \
+      --zsh completions/_ciel
+  '';
+
+  meta = with lib; {
+    description = "A tool for controlling AOSC OS packaging environments using multi-layer filesystems and containers.";
+    homepage = "https://github.com/AOSC-Dev/ciel-rs";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ yisuidenghua ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ea88d5c30d6..306d2735e828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -406,6 +406,8 @@ with pkgs;
 
   chrysalis = callPackage ../applications/misc/chrysalis { };
 
+  ciel = callPackage ../tools/package-management/ciel { };
+
   circt = callPackage ../development/compilers/circt { };
 
   classicube = callPackage ../games/classicube { };

From a6e16caa14a86b3185044fa2e6c8a6b5f564c759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 01:07:07 +0000
Subject: [PATCH 148/247] firefox-devedition-bin-unwrapped: 112.0b3 -> 112.0b5

---
 .../firefox-bin/devedition_sources.nix        | 802 +++++++++---------
 1 file changed, 401 insertions(+), 401 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 39ead4ec8b0a..d995760924c9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,1005 +1,1005 @@
 {
-  version = "112.0b3";
+  version = "112.0b5";
   sources = [
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ach/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ach/firefox-112.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "e57b1ededa40aa75d41b3d02818b51e036d375113b2ab0741a8fbee1fe9bf13b";
+      sha256 = "05859db46d62c1c66035a21012f384d7392a42a443f21fae27b1c22519e1a787";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/af/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/af/firefox-112.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "cd4e84f83a3b40963beeb12099ac73a6bb8156e9bd570e66f6cb05c64e98f60d";
+      sha256 = "49f9073e4426000dcdc008a8f9f52edbdcd7f89d0f6af4463e06ad3c70d493af";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/an/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/an/firefox-112.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "9bb35806691ab3bd5ee8787f9ff481526e3338dfa3e144102da41919dd31b62d";
+      sha256 = "6b07b832993b5142dbd619d8d2e39d7394346be6f1b5580dc6f62fd50226cfd2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ar/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ar/firefox-112.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "a642626e88dd7deb5772ba7a0c1b51f40c2b66f594a4f86d20f987c8181d00c1";
+      sha256 = "a248911af735ce319b559dd97f87734b54377ad70b22aa51f989433ee809f3df";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ast/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ast/firefox-112.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "66b15ec4adc0e0e7a488a0f31978cb393ec38368d2e7958eb963df38071b09e0";
+      sha256 = "835f1935904afdd4081d82d6c73ebfe6159fa94acd10dda826ccf0b14b86b54c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/az/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/az/firefox-112.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "a8d3a28801f742f0df740aa5b990c7e68560fe2b081da82d1e5a83e4ee85366b";
+      sha256 = "63f778e01748faa999374a82f72b58342e72fcc159f0b385ad393d96a9bf1001";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/be/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/be/firefox-112.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "36eaf7ae3bd154c000d1ab79eb8228afe6ae2f9483fb78f310190bd747db4e51";
+      sha256 = "e1a9652fcd7b34ddddf80d2c4d1f7d13a44e382af722bf5a2d2f3a1a6d328fdb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bg/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bg/firefox-112.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "382d95ea56473c3966b52dc2f6bda24e4dfb66b373a6a8a99225827e701557eb";
+      sha256 = "e90ff246ea24f285a51d10b31957301b6cc9f104d3cbb8913521ed9413449092";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bn/firefox-112.0b5.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "3cf42bf9169069cdc6d3a0aa87c29e03b433edfd2a23208b1943b5ea46199620";
+      sha256 = "ee9f1665f8c76806fb8ead80b492ab39756d010ab70703b9a806bd511f5b2e5e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/br/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/br/firefox-112.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "7a224d793a2a6e683b85b3aaa12150aeb3ba3b18ef090fe97282c601a8448bf3";
+      sha256 = "4fc531ffe5ee4970e51723f741df9b1a0d32e0e67497c7296302e2aabdb66c3c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bs/firefox-112.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "974c55c2c73f5a83e4d55a67069ae631777e88feddee29779ebed76a8996b25f";
+      sha256 = "374fac7c2633e37e148d75ba8ad919e6f9101d155835f624c3bd3f72a5564c52";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ca-valencia/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca-valencia/firefox-112.0b5.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "15514539e852b9de5ff89504b10caad0d3226d525b3e3a17c0c67cca4aa195c9";
+      sha256 = "9a3467b62347a6c022721100f694212b06cdb30d056741bfa393759068352331";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ca/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca/firefox-112.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "82a02c5bdebd8f83001fbeeac6b3536e43c4a4fe80e4e19b325cbe257f8832ad";
+      sha256 = "cfd738a5fcdd6b0fc9f07b8a4c6f85e9f38740af7c797a488aa249d86ce49114";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cak/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cak/firefox-112.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "45a890dada14cd04266e545cde19b8efed4e44d3558a8ebf91071fe39d9c56d2";
+      sha256 = "0508c53ff3ae20712559c429f676b2dcfc5488f15746a5e802b759ae4b9af92e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cs/firefox-112.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "e6f11d459f19ee07aed63af08147c868ca4543cace39dcce6b25f2d7bee0a9d1";
+      sha256 = "4f2dac86bc0d29fb86667a93f172a1077e6e18dadc8c9b1c80917cc48d186a5b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cy/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cy/firefox-112.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "cd6efb16563398edc9f4f1095fdb6d6b8cadb8d9493268cea65f27db41d19f60";
+      sha256 = "947a766e64dc318162ce24c02a4e53498a8b261807a2e2f02df348aabe6fd203";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/da/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/da/firefox-112.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3db61ad7a84158d33f59cd26d5f5cd1550294355fef85e391e89fca8b2c50cb2";
+      sha256 = "557d3e24d92af23c2d7847aa156fb961ea6d00b677935eb37573e5d10a431e70";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/de/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/de/firefox-112.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "6b854360174cd07b0de9421a180fc839842ca77f4bfb8e700eb521fa4f33a93b";
+      sha256 = "b0ace6526a07016e2b8a7413ee27ba282458854eeca0a563977b6a7dc79df517";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/dsb/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/dsb/firefox-112.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "12e6d2e821d7121d307db00160938e71b9b4720d3c9434905d5055982ade3393";
+      sha256 = "a7d34883dee70a0a1a354b19302af4e0a7dd605294489c3e732322fd9b27d471";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/el/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/el/firefox-112.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "371327a0648fda5662d29566cb2a7a346cfeede13f550ddbef2ded062205be9d";
+      sha256 = "1dd23fcfa7d21fa0abd534b7fafcde2ebb68cc5d1082849b65ca853e8c97542e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-CA/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-CA/firefox-112.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "d3052f9193cf01cd47e24b46ddafb3f4ec91a2736e14716c7ab5999e20dd9576";
+      sha256 = "bb07562373692afbb647ff83293e2c73be125ef3d5865e042f6f068e459df240";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-GB/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-GB/firefox-112.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b08f74332230977e284494677fc4e9232ccae00a7ae292188b236db8a1a77c63";
+      sha256 = "b0bd2e1e75672b70e66ddef4d69a30cee469178fea807a76fbd3f4a3b54f8377";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-US/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-US/firefox-112.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "7cf065c28504caff212ac1a5951ccf55935d5297d86e7706c6bad8769a057cd9";
+      sha256 = "d367fac2132309c669bb0e4419d27756ad1c500e8f3753d4ea6020eb7f7ad53c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/eo/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eo/firefox-112.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "4b0d270c9e9b9dfce056346ed759171633220dcf9ce10c2eeffab67dbb042e2a";
+      sha256 = "6fbf9f27f70308525b487d2ae308eeb3c704725113f1c23e03c166c1632452c3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-AR/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-AR/firefox-112.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "a5b52bd527574b67fde4fa53f359f0bc170c11ea2aadbfd6e83292baf7040d5d";
+      sha256 = "ff5859cd53d94135463d638ca0ea0cfad310f261dece75342d4860baf9e07832";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-CL/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-CL/firefox-112.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "c65147ba46db65aba0ddee56582737cec6e5a10938bf84a400e7e4a49d42080c";
+      sha256 = "22853be89138a70b5a45f1b983bf3d27f872d2ecea8127512848eca9335bc67c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-ES/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-ES/firefox-112.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "65dc25f4cc20993499b559ea6067e246a290936b0d3a9b256fd23b87ea6e6031";
+      sha256 = "495c74d78b711eee03f2d376675547aa1bbcacc93817f1141a1cacb9d7a7b359";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-MX/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-MX/firefox-112.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "2202045f098a1a97e99602317cb2da5fb15314d50dfd402532f377d1608cdde1";
+      sha256 = "cec7c4d65ffd6ce0608f0063c9634f2a9624e0bace5cbe159f9171ae2a0747ec";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/et/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/et/firefox-112.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "15925524cb70a22313056fdf4ae64a64ad69602427e7669246d1b78c18402f84";
+      sha256 = "99f6dbfce8f79360d5fe9360b5d2f7e8b721ac9de7ddd958e24c8a8c1608a563";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/eu/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eu/firefox-112.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3ded3a5ce384edadb247d64363ca3dff75a3823ac46e08f216e4cbe9f3edcf36";
+      sha256 = "1198890563e45116380b57ee3ec576458b58935a584ecd561bc05b8750808c1e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fa/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fa/firefox-112.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "1848b01b6587a54aee1560a3bd022d1123568ec4140d0245bf600756f05d46b8";
+      sha256 = "cc0bfefb8df93dbf384dd65b23da2ebbc1cc7d3a7c068f72a3ceea58a24e7fd1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ff/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ff/firefox-112.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "3ecaa69f7cabb7be8a30092272b2f49d46e4e62f1fc7840e8feee1c8d0ee2793";
+      sha256 = "ad9d500e301fb94c09d3ea334c9590462eacb7732ab3c43ff9184f09d05e3e94";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fi/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fi/firefox-112.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "78fa445d08a4b440781845d88a7c82d3611ac9b82a0c8af08d02cdb04f272fa9";
+      sha256 = "216540e1c2fc59f946ebb0c3968045f928784fc38873bc96d9f5317bfae56df6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fr/firefox-112.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "260a0040101780c2e00db7a60efe650fc3f51018fcc1141731105eff6cbedd61";
+      sha256 = "84897d974fcc365287bab6d9e941c03c6aa464fba22b5968e3f5a41d21f8ac7f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fur/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fur/firefox-112.0b5.tar.bz2";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "57e5d139a02da32c2661d1ccf9807833e41b832bd82179ba058e0d495bbb0266";
+      sha256 = "e03d8761e955becb1f6f542e697d7d64aaf90d1abac9ff0dfe0ae698aab91830";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fy-NL/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fy-NL/firefox-112.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "dd260153557b5d8885705b0c8420221fb00ef02c5d9c0b3e84edcfad753a0b8a";
+      sha256 = "e0cb84ee39ed5d8b7cd21bd8283e233a0547a98ff703d15ec001bf30049748ed";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ga-IE/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ga-IE/firefox-112.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "bfa198861aad8e947d32d7940f804910292554da1e51949cd8d79ede0fb2008b";
+      sha256 = "ce2e7c971f787470f38e3b7a96d9670892de6480bb4fe8ac45bcdb0049033265";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gd/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gd/firefox-112.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "819095c08894d05feb0d44c130a3b5423004be008c8e500452fd3d70cacbaf4f";
+      sha256 = "461f3d05b8d1b587111c952be55138d54b6747d9340278e0650f4f963cdb378a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gl/firefox-112.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "6435bf73f5c8cd6c0d6fc5de9c8738825e4b90c18f8ce102aa5578f08119e8e7";
+      sha256 = "25664e36f13283c637337b94cc7d90c296a854bb21de1f139b6682a2b39503aa";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gn/firefox-112.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "0f382a0055296028525d976682c446db34c344c8e5c60da4b1ef310c4336a540";
+      sha256 = "360fbd631fdbeb8ebc876920c8346a4f0f4d903ff931014db197b0ed0170512c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gu-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gu-IN/firefox-112.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "e3abd677f40ba06ed106618f7db88e356ace039eeca06b8b26632b3586775d7e";
+      sha256 = "42229ebfea176d3c0bf174115025fe9bd9d0303821618a2843a48364980c87e5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/he/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/he/firefox-112.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "07da17a77cdd997bc3e29e094021a5e3c905158eed91e925817875b15c4ad703";
+      sha256 = "eef8c9609920d4ab26030e697465c38783f6f8c9688d2f2ead3d6d572d57a8f6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hi-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hi-IN/firefox-112.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "c1b57d4502d6f0b6c681ed8fd57ae71e7ddf5402fcb0fe8192e1aa1911858dc7";
+      sha256 = "cdf20283ad2698a16c1977c75d1ff424f75008d2166585d41ef92b1293729ed0";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hr/firefox-112.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "3cb02a002dce1485ef4d5f155e31bb31edb23cb4137b6aff83201a414651103c";
+      sha256 = "9441a3683dd0a51360ab84d8c0adcf9bad148e37025e6484995bcdc141acdb67";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hsb/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hsb/firefox-112.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b7e9a66521d6f215959e1a2c634220652841e4911ec8133028b98946f5c8a234";
+      sha256 = "6a30c59deb36336392794867d12b4c6fbeaf4c8c2f4e98c843bc96799a877a2e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hu/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hu/firefox-112.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "634f7c497e2a035d80bc001eebaf4d27cb691969a40453dbb2f709efd137837f";
+      sha256 = "4ba34af1efa0f1b52858c200035d696e60417f36ff4884c88fee01e2589eddcd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hy-AM/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hy-AM/firefox-112.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "009a01b2f81d1d3562320af0e9be9950de81170336d5cc647d214c6b270cc098";
+      sha256 = "c20eac2ee61c73b0d5065b7842a4f5daecd3b29d5d508e6aac8512301da428cf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ia/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ia/firefox-112.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "f60b71734abc1575b610a8414e5d1be5dd96bab01f79260f999f4a8b88df836b";
+      sha256 = "9c5aa72cb38a505f289df411bf458ec0aadca322b19819b6098ff08d74bf9fe3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/id/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/id/firefox-112.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "cce8c6353b58fcfe871ae28990687c9d83f86b0aa42e4c559ee40c0f321b7132";
+      sha256 = "46146a6c4fcd09e091202a20b4a352bbc9dacb84d7459a40079f7b95681d6ad2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/is/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/is/firefox-112.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "72978d2ad47eb8551a0187d5e507fe903df94933145b807128295fb107ba240c";
+      sha256 = "ff47754b70642cc10c151015f67465b4e334945a9d1861f194da6a0ffbd3a549";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/it/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/it/firefox-112.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "7c50bafb10dffbcf696f05722fc16afcc7068a67385da62004dff3f0eded6fbe";
+      sha256 = "e67c8c532ddd34cb1dd1195e116e87af8cabae73e4c734614cc8605cf0c2670b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ja/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ja/firefox-112.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "99400cdac52938f8ef06a83e6be72f8fc98ad58779a4a0e98e53205a5f9891c1";
+      sha256 = "022aee39de289422088628f9b71de28a3d9b994ad87f489c0f4491e7279106bb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ka/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ka/firefox-112.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "7893b5942d6690fdf87d2804a7f7a7387d12eb21e6510290c2b0119504b330b7";
+      sha256 = "05ee2bf3ee4c90f879b4410ada592c9feb53df9129df23f711896a5fd9e1d349";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kab/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kab/firefox-112.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "7786d72e0cd3f490c5de8ac65b3bce715c7309b9575de0a9e15482b2bf67c215";
+      sha256 = "c50c4992077a7cec127be1c648d431a69bca9f135b247e8d17339716c35c6301";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kk/firefox-112.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "75ba7ac074a02a562084f0f1fc953b6ca5c950d2303b38f9778ec61b93f4ced1";
+      sha256 = "86bb3a893d3a93b54fb7c9de260fce58f33b7157d9ac67f8cf2e1206153d22b5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/km/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/km/firefox-112.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "73c251a288ffe023b2af77c9b8ce9cd1fe80507d604c809de24fded569d26c03";
+      sha256 = "a0b3a731be915fb4a60bd2fc665733bda240596f1a0560139fa2315343b61ece";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kn/firefox-112.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "c105dd1dfa3c78c1d497e93c86f21eb331fb76bc0adc567c0aea78980bfe557d";
+      sha256 = "72a4374de710898854a360c8582c1395bf2956084c0cbaba550c1c0e3f9d6cf7";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ko/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ko/firefox-112.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "dd7b894ce8ff9497a2a74f2abe4a4f8500d182e9e8621f8bcda0f9ae33fa50c5";
+      sha256 = "dccf0da734efcd432d6b3a0f2355e076389abab2195124f47fd718484dc40bdf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lij/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lij/firefox-112.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "1441f6c930d7b596fb63455349b9aafd7974add6bd44892ffa979a9fbe927d79";
+      sha256 = "5f6be135e9246d5a866c89afab8cd0e97f57153073cb91d9171fc4710a08175e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lt/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lt/firefox-112.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "981b3f79d9ada6e2bc8073bfb773ead1bda5b6cfd75fba92c70ca7730de9c65b";
+      sha256 = "cbe6953543c0d4ed357e963a4fa224bc93a4a6d7b5df3df6519c10427ea0e296";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lv/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lv/firefox-112.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "e58b6eb1f69450190ef8af7eaaff691db40f0d83aebcd37d42e50c480273fec2";
+      sha256 = "7aa9b425e18a65ea87a1ea8f9c53fdbd6c0cea6c1f8e1de969084a30d4fd3ae9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/mk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mk/firefox-112.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "345a4eae66d43762e3f73604db40af23fe2bcfd688f4ebc80b9213cf0ef6e88e";
+      sha256 = "149e4d575764ad523b63983b36eac28a0966a7c33b0e54e7e525e75f6cad8511";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/mr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mr/firefox-112.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "ae72a0f726ba76b53604352bf4f05e2a915d24cc0486aec9023f6757893c20b8";
+      sha256 = "7b89022dfa8ec90607844004a82f6c064b768f0ff26bf4bab96c0f46d0c45321";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ms/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ms/firefox-112.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "b110ec4f541a703623362f484d321733b02dd73f94298e83bcca06d14e4c1078";
+      sha256 = "efd9c123189f5cba21a1177f245403bd0b40acfef72a8bf696be3221c87c06c2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/my/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/my/firefox-112.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "3578b73a70f1e7622d9571547dc1c00ff64acb0184cf12d19c2fa954dcf2b1b4";
+      sha256 = "7d644179700df173a9111c41f3de5863f5d7d72d0552d2fcd99bbfd129b9a3b1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nb-NO/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nb-NO/firefox-112.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "528823fa659ad107af4d2deb9447e09390dcde49df5b2ceae18bf6019ce86f9d";
+      sha256 = "233080da37207e934405f033e397d32dee4897b10a96372eafaad1c7c7202b6c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ne-NP/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ne-NP/firefox-112.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "10ea6251a44e1d660daaab2de2ea751c43d9ba62ab382da68784c51a19db7144";
+      sha256 = "df8970e2b5cc7f96f3cbc22ea55d88919737478e1984ff651dc691577bbf27e9";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nl/firefox-112.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "ee912bc5d6f77d9ebbe622bb4c44816ca353d9a2fa958c78300d010afebe8605";
+      sha256 = "4c36621ccfe5532781bccf8c4b75889db028b4926f955f2f6f69ecea586c0f74";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nn-NO/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nn-NO/firefox-112.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2e29c06803163982532b8544b16557b2256b9e807ef01aed9aa55b885423c025";
+      sha256 = "fb08d40b78af79860daa81c061405375ea119a382abf428c62da5a2688de38aa";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/oc/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/oc/firefox-112.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "e48bcadbe6a0aaf4f82405e108227a3dc6464b2f238ba2e63af1e29de27ad2cd";
+      sha256 = "28c50833f976fcd589e842a85e1befdc9272703491bb224048d7ff7ff9c6a83f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pa-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pa-IN/firefox-112.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "33449c4a8d01afdc668a5688c4deaa4a8062c5518493ad925ac30331444ab7ff";
+      sha256 = "e494e1b1e3c2a7847bd45305f98afe3427ba33145f85890ba01664cd383e4590";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pl/firefox-112.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "1cbbd2b62fe8474f695b356ec2e2c9eed1d7e5d783a30261f8fb94541bd94a44";
+      sha256 = "46aa243e6466aad2cf4c9caee954cd420dd5ad095581574d7692f92b7feee57b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pt-BR/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-BR/firefox-112.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "da227e808f6eceb763e755c182e284d8420c78d21a54b123c0ce0ca3fe98b224";
+      sha256 = "e30ce279396acf88a40ae40ac6831ca3a85d6a1051bc3554b51e8a3285d350ad";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pt-PT/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-PT/firefox-112.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "dc3feac7b8c6812972f6db923a9a862531d53776e688afbd4e386e219268a4cf";
+      sha256 = "1dbd434d60463d59779a4aea948b7fd694f9c0eeb13d62531c3259b45190018f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/rm/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/rm/firefox-112.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "f20a8d3c30e998ffc2f7bee58f9bac7d498ef5fa945258b37625cabc96db1d70";
+      sha256 = "5740e389e978ee285273fb24d12f5fb23b40741c429eecfe44b91f82d27ae414";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ro/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ro/firefox-112.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "695ac8be0d011bb2178ff83d9477e87acdd7bbc038f1918a6ed7003a8e5aaa62";
+      sha256 = "6c77aed73265b6c74cfc2f8126277c806b2d4f9629cbebcab15ddeae697c5477";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ru/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ru/firefox-112.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "b863d9df045678a7da526eb6374a46714929135f26fd16bf51d6601533cbccef";
+      sha256 = "0b8b9125a9dd6cbbf76e8f1b060ccbbfbae123b537d427a8ec608fef87effa98";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sc/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sc/firefox-112.0b5.tar.bz2";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "3ebdfabc9b3bb7d16e22ace41752dac95902696359d94290b0c0cbda4fe5b952";
+      sha256 = "08780b4d08bfcfbcb260019e55ceffdce03819e3c50b26f8b0260a854a3f178e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sco/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sco/firefox-112.0b5.tar.bz2";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "f5275409ba4cbaad5c6c000e37f3a43978841174cf3a8c668c080ee3d83cca23";
+      sha256 = "f76f8d4975a5803ae59ed8d7429914d0a67782f3c6ebe8de74c21c9b3dc422f7";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/si/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/si/firefox-112.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "d4356e1cde77634ddd0d21196ac0e1d8724fc846760247f0efaf923e531a5759";
+      sha256 = "3ddec5b1eda9ff9dadfa28274b237db1e070bba7602445d0659e56b4d83f5c32";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sk/firefox-112.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "01d765520fe5cf21d9acfda005d7389f8ef571e9a50e7171ed13c1fe61bee55b";
+      sha256 = "7ba092acc5e90f2f0978e3d462946e647e1cfb20fa076f071668ad7e9a575dfe";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sl/firefox-112.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "7c17e0c3f0d54a0442d2dc477841694bc19baa754fc78a9b4907c5021ed2d733";
+      sha256 = "dbeea39152cfd7515830d7e4a543d6c7bf91768ae39035cf817b2e919c1cc9be";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/son/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/son/firefox-112.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "ed6c1e71f069eb3d5d0f2bd323c5975a1a942098337eccfc379762c5cace88f1";
+      sha256 = "c3b4392bdd6eaf3f7cb4abd769a2389ffd9605b80b52a99a6084973a9c9eed16";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sq/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sq/firefox-112.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "e0ebbc5a258e063061966e6821e1ca6a456434bbbd3bce19f4f4af850e3771c7";
+      sha256 = "372d6f5232a746679a3773ba3ee74762427f9b529f9bb681c8359dd0d5adb6c1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sr/firefox-112.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "6179d94334dbc538a51b78c7fa9c5f196303c15ba62ae1e1b1aef3517cb35493";
+      sha256 = "edf3164ba81dae459415f8c41f0fac09372080d3fe413eb282789d3026db8f83";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sv-SE/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sv-SE/firefox-112.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "72dd39536c1a347fe361f24296527e0cb8d286a0c1ba9c22c64ac241fceadf9c";
+      sha256 = "6a5da09f8f5dff0cd147af8b45c341f301b1716b9eebb0cc7bc348124c5fb242";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/szl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/szl/firefox-112.0b5.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "04b65243a3e83303ef6652fa2bac659eefa9ae24fa4d6ebe86d9e42eb7284010";
+      sha256 = "df07280e6be3573342c5421de2e7137e63fbe691590ab9cc442e63827803dcd8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ta/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ta/firefox-112.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "97fc15b676769745379f214fb2e62b7f72f548662e83e57a3b0e1bf8ef4df543";
+      sha256 = "44d8ad4cd0dfccef357ef7b2d212a913cafc0433f2aa9a3672fd1df1e2a72c98";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/te/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/te/firefox-112.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "6db551aef6ccfd580caa82b7417363e30a5d9e2245ea0665934e06b8845d2843";
+      sha256 = "70488686b28265481ddb882ea66ae03309828353a04123d46e33e19edb0f4c60";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/th/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/th/firefox-112.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "41dc623390a68e8656eb0b53ba650957b59bf387da6890be504c62d34eeadf69";
+      sha256 = "70d3bf27c80954553b88fbdb486b310c19726e5953e91edd159e61fda76de6fc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/tl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tl/firefox-112.0b5.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "68dd617d3d235220320fa89131d5389834dfd3a44745275cbc25c9098562b5c2";
+      sha256 = "3126646299c67c74a59801c694e48e5f5402b14a636b4917253259967edbfce3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/tr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tr/firefox-112.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1b2d3fa1bd5de96479d08f00577a894758892b4a18a279f1f3696d2122158112";
+      sha256 = "2ea8edfff3d4fc495e37d108cd5c8f7d003b929f82d065936a80e6daf4fc7d99";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/trs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/trs/firefox-112.0b5.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aec06a7a1df817b1bae3b16c6eee7511a0bc1eb46f4187c6a28bf2f9e9b71461";
+      sha256 = "fb29e43f65dbf2a550c5d25a170be28a05e96a1f4e3e735835be8db111220b06";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/uk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uk/firefox-112.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "8dcd765b443e12b7c60387b310aca511a3b30dac289f898201443597d09d9efe";
+      sha256 = "7a3111f74b3bc9333ebd2ce2db0c1d34c55196710bfe628be37924636feccf3e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ur/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ur/firefox-112.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "90a35015ee6c338d8648966d9d638006fbd6e3b4b138468e43455827171f286c";
+      sha256 = "dcd147e968ce2a97d36a3c2cc8b6c8c224e1f548623c30febf301d1870924315";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/uz/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uz/firefox-112.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "56af3aef03a6b7c9c5629c127229d82a89b9c915f899807e0c93e18106f52dc8";
+      sha256 = "9421f0b5848d2f15954539d59ae5ec92c4206abb48e608ed26dc5a5c55346b61";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/vi/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/vi/firefox-112.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "1bdde032a2a72adac2766e8fa8b820f0bf72848740cd20b1a2415d8787108311";
+      sha256 = "f3b4f54631e37488ed3444058eed40d060c82eeb67f423ba8a3d500dbfa4ad8f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/xh/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/xh/firefox-112.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "e7a56495c0b1a20c8a924e4059130d27484a8890ed0a8b08b1f7856a54bd3982";
+      sha256 = "ec40e4e8f37f561f8a49a014ef538e7e8d3b78dfa526657cc64f8784ee1f945a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/zh-CN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-CN/firefox-112.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "b8e0ec651631a9c36cdff888737ad68067fa051746027556371830f014809996";
+      sha256 = "c4f780ebe92916044c71c48cb58e7dc10c08ff0ad7446d01a3ec5fdbf6c04e70";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/zh-TW/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-TW/firefox-112.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "6bb2518c47a9d80bcd9a2864055f83e40aa6c4e6112fd0c4b6bcd2592bf2c700";
+      sha256 = "7556349dda4963f88d79a58de2fd2d557411997485bb16dacd90be297c58769d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ach/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ach/firefox-112.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "782a506de4a8f7503adadcd51ba1ce935ad582117fd72b22f39f259b1e640300";
+      sha256 = "8c8d1a43cbb010798570dca68fea1502a8d9ec0711bf3c69c2ddd173a3538317";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/af/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/af/firefox-112.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "dcc741cf514463cb19759cc9777b2e3001ce3b4e264a5b41b320983ae8f202fa";
+      sha256 = "7c89e0f7270caf1ef3a69c5514da97cce715f4e3a52ee545ef5aa78cf03dd55c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/an/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/an/firefox-112.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "c6e7d3f48c3782c9371781792bd0af8fbf3006f6c65c117456f91abc8fbe978d";
+      sha256 = "355596b7006d114efc0a1c75cde51d01cfda3dfa06bd59fc0dd9ce036a54b77b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ar/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ar/firefox-112.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "9dea98e726d1695e4eea476d0bd6fe468c56e64ba32c13328e2e61ed56ef1fdc";
+      sha256 = "c43c434a8f090343dd718d3549860ca6056ea75cd0a805eb74ac44a7475717ce";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ast/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ast/firefox-112.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "56a1bb8bcf150bf7a6ad83461087fdb0e4423cb5a2f733ac64472857883263b6";
+      sha256 = "c64aca4b338c1633fb0e64f1c5992121dc29908c34d776aa569ebf58fed065fb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/az/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/az/firefox-112.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "7573b3eb5bb90e30bccf59159913a6845a977a3a47c2ca48bddfdd9af92cd792";
+      sha256 = "0370b48bd8b3c7f27fa6cc715acfdb0f8d065aaaac00c15250a47bdf7d481faa";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/be/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/be/firefox-112.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "41dad366f588666ec5852ad825db8a9f58d76118bf7a962812c8d1404cfe7d5c";
+      sha256 = "c12a416339347b843990068f016d1fe199efecffeb57c4555f2fbbe71d6e37d0";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bg/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bg/firefox-112.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "d9c1154e772d273178c1d387fa24d87db485fd053e57aace85729b77c54cb335";
+      sha256 = "d0587424301145187f35ce7474485517e9440f3e4c5e92eb3565a97c39c42d1a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bn/firefox-112.0b5.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "bfb570519ac184db711e93722be32011ecde6a9c3bf892f1d797404d2642a37b";
+      sha256 = "68cd8fb4716dcb2a10b5c332c10d1f8c47ec79b0fc344275b3ac23086cb0b89a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/br/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/br/firefox-112.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "c559b1d447a67330bb7b61d1ffee6859dcafffb719b857023a43ec00926135db";
+      sha256 = "7386b53e5c4eabc0f1ac191b6a93acca5b3fb38ce0f5006a0e94f3050d790281";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bs/firefox-112.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "9eccc67bb8c33d89ac30d3bc35d95ff77a929a6177bbefd9b4c23dd0f3d42f42";
+      sha256 = "40686fd813e59c155ca4b08c9bf138be20ec655efdeeea9201f78f7b11615422";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ca-valencia/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca-valencia/firefox-112.0b5.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "3015b91aaddd49f1dfd406c615ba8e16128c02a46e562c07e13c89f4f3a6cf46";
+      sha256 = "b16cd0d27edd8a3477bea72326e9104734c276602b94299b58acdeba10ed1620";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ca/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca/firefox-112.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "5e38759676dcb0251e8ba689ba849a5d7291e26adc46371b9157bfad05c22b03";
+      sha256 = "f0e81d340f00c1ded4df4d0967c1183d4ef18c8f3864fdb520ffa32cec2fabfe";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cak/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cak/firefox-112.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "706d5c05a294516e4a1a1ec58f36cbca8d8767e22d3bed4083269dd41d980512";
+      sha256 = "d6c1545923f780491c3b4d6789b55303c107c533375ffb04401781be56e7315f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cs/firefox-112.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "55f7efc0ea8a63e9e9e27a2653c54084008d7b6ec3cd23ceebcee5a3c0072fa4";
+      sha256 = "5af2de24992583982afbb684c9c6e58a4d98eb35ee89d6cad6e9bd18bbecb470";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cy/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cy/firefox-112.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "f093f7096c1e8f1a9ddee3e562cacb2cb5cec38918d85650ea74748f4e071f33";
+      sha256 = "3aa0dfa96a072c9a2a333666e419e000ab36861058b1cbce6abc11d935fa03be";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/da/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/da/firefox-112.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "8d24056fef5994f599cac5ad2866638ba6c562313525a63ad6289679b372ffec";
+      sha256 = "6998603e2c5524c38b7b89bec452fc658956b55561c94fc4b0fe08691ec978e3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/de/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/de/firefox-112.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "e8185d3b38ba5dca3bf2fafd29633c263413e9280bfb47fcbf7c81ff8715e72c";
+      sha256 = "d5b59dc00dc63ad988c9db7f770e31f9e5ea68fb15db894dd3fe90d78797932a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/dsb/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/dsb/firefox-112.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "f894e0dda44302fac3b827c1dad08d70455d178d7bcb9bb36ac141c0efb1d14e";
+      sha256 = "526ac2c06239a7176422bf37757be3117a3b349e3f2c97c379ed797596047b54";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/el/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/el/firefox-112.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "6a59549e560e3f59d2ba3e7e61007a67c37f95dbfb6f9ec510ad84014bff5cec";
+      sha256 = "9af390e46e28c9a5e3ab3646a04363ae618303d11bdb1661c0d1e5413e5c5b87";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-CA/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-CA/firefox-112.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "2a05fe4603a09451d72c04b84c5c7b422001a6fb7928145a1b56d8bf04e377ff";
+      sha256 = "bb012f07f4e13d95d1ab24bebc9c655dabcf5a3d03e2cce578402cbf9274eb2a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-GB/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-GB/firefox-112.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "a12c0289e601781bc5d1fa79d3f7f6c732e11146fa3cef520d2b5eb30982c4bd";
+      sha256 = "943f1fe86afa3c0f7ae8d348fc7c80e08a57d5117d1eb4c848b7ca3b75214e1d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-US/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-US/firefox-112.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "6a298b5b103b336901d764c836e3d60f30af20a5c5c78457bc0cb971e50d8722";
+      sha256 = "ef7b243ce04c41fd438b20522f7f90f47b903c513812606945cf9326ed183cb1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/eo/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eo/firefox-112.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "6be54c23b9308035f74700811a721e5cedbacf1e768ebd60be0d20c616908870";
+      sha256 = "3e058915748fa0f50b1b439d5d933ef79f98cc6ff6112fe9a3ea0f9ff34f868f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-AR/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-AR/firefox-112.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "f8d298e2687c1100169a9506c64e80af04238c466051b7d19d1cba2aa5ba3e5c";
+      sha256 = "e90bfaaa61c2569ecd6090f151cdbf9c2765ef6fe79ec301f23609ee0006f91c";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-CL/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-CL/firefox-112.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "c70624ad6cda8258508574a1f45c59135273e95886255bf946d482c8b63f5569";
+      sha256 = "9c0a842c4ad9915e2ae03358277dd60e7935c736b1dd04c66795fa99c90a3dfc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-ES/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-ES/firefox-112.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "8d0010b356cc73af0ad318839a94525ff74afe4dc9f47cd57b1fce68ae8874fd";
+      sha256 = "8f37a758563eddf6f397785c79bd9233f4dd19a9830562ea821e64123c31cb64";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-MX/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-MX/firefox-112.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "4c4124f17c6d35622f8b2124986feead6345fd78d0cf5351799f918c6688c719";
+      sha256 = "547f4f9ffce5a7ea5ceabc4ba402eb42ec0ce539e5bd4e51374f2dae17ca7949";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/et/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/et/firefox-112.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "7569b5bc8412f940f3a7ab02f4367e32cb6083b728c5ebccca2451cbb87cab41";
+      sha256 = "eff697113a52e31069e4961354eaafe78972dff7a68737fb6153a42780265c43";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/eu/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eu/firefox-112.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "4fce029fe12a79541b7d8730312f39bcf69452893bbbfb9a3070ce1012e06ae2";
+      sha256 = "b9f9aa5538b44f8365276f54f75bcee5725f915f1d57c2816b09254b8fd1d07e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fa/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fa/firefox-112.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "905583e9baac407f6d0b0bed71eb53832255a4ed41f85aa15bc2217b5cef4fe6";
+      sha256 = "a48b03b41e7fe9f75b8b596ced9fa45c1f6fd709d67413691b93c53193156e75";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ff/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ff/firefox-112.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "9be82455755511a71d175f1ecfa1c7bc061f0c1c70d14f3b7586aa0ecea3b936";
+      sha256 = "03b86fe75130b180be97340616f9a5995bcb5e81d9900912fa9a324e0d409182";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fi/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fi/firefox-112.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "0291357fce8f41f4028ab4b853b5fe44309bf74291b7723f1099bd5a0733cc90";
+      sha256 = "e9c3a886e6491d23631f724058d9d435cc9c0e60de3cb5b33ea3acfa8babb0ce";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fr/firefox-112.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "01227292176a119d9e17f34118602852597e3ebb1c0684da48cc54cb01a74143";
+      sha256 = "dcb7513622428d5c91f32667a055e61072fe0d5039545bc683194b36d6bb49a3";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fur/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fur/firefox-112.0b5.tar.bz2";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "e3243a58db9b734d0d546dfbd541a5f95bc7864e105a0bb8c82c568140c8d718";
+      sha256 = "33fdd12569cf1b8eec60ded795559286e7cfa41b2db58bfd9c7f4887000a6b82";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fy-NL/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fy-NL/firefox-112.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "08b8d962520d7f535b2a22524f1e0ee0241553078f275a0bf5c5cfc4396c5a62";
+      sha256 = "d95f0bc82184d007d55de86caaf84ac442ba56c840b6798dcfd5b8cc2854c4e6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ga-IE/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ga-IE/firefox-112.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "51b5544de3863239296221d4bda811a779a5e2e097d696b9ad0c53318ab21ec0";
+      sha256 = "48d23034a37bdd46385b9974eaa4569c080b4a873e00e33be0abcc8e945e1f42";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gd/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gd/firefox-112.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "e1be896634e7447dc02e100d352ea378a04c9a48c7735573cc12f3f36cacf19f";
+      sha256 = "b1facf79a7b6fc22d75307954dbb189a72644ee665a2d8dba1706b5421c6e96b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gl/firefox-112.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "11af15b06eecd43200b1a44dc436f07314a1a3a13cf92ffc1a0c07a05e0f8101";
+      sha256 = "769315eb7186ef37227a43a96ee2a67634d9020f47fef673de9dafa66a2d7436";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gn/firefox-112.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "f50f0a2c1ddb6b5917c50c14e21ac0307636815183c2a2820d76d02af4a346ac";
+      sha256 = "fb48fe024c20a025084fbe6f261f756b2b609b72ffc59e9645b0bb88ccc00746";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gu-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gu-IN/firefox-112.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "8951afcb8683055425603c6afec5695a9003f56d22c810d562d864bf9e3c2eaa";
+      sha256 = "f5854e070c36bd433025d60c28ddcfd3ae73dd7f4787198dafb6b1e917cb3975";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/he/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/he/firefox-112.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c90624e515e29b1673a2e90c6e074f69bcd64ce41245f5f6fd7bc5c7e4da05f1";
+      sha256 = "b71d3776631872e549ac310638b51828c8b1b7a600943c73d65b5e9121e10b9e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hi-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hi-IN/firefox-112.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "3e04d4cb6bd72daa95deece94eba17771642bbc29390814e71100815f392b4fe";
+      sha256 = "61cb5d112085b4185ba21ce1277aebb43701970404a632cd255d2b010a8ca5dd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hr/firefox-112.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "e265fb7834fd3ca59cdb9df4b6b9917a6f55bdf9e91aefc97b9c96323f3c1127";
+      sha256 = "0b3151de29c64199f4be91dd499f4e5b142dc5832fce7465b5ac709b103d2c06";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hsb/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hsb/firefox-112.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "982e34f5b8b73bdc8cec8709e84a36edbb709eae77450d192aa6d044262f4f64";
+      sha256 = "7935f0cddb2f8d79fb3295b286a5ac8a62f5dfe54b72aafa7ed4d90cd09e7e81";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hu/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hu/firefox-112.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "d0251ef3b42f1a29f6f585966ec3e480102cd993a063d01f5e9bed2251fa6190";
+      sha256 = "ef39a9bd38c4e697b2acfc385e4f4b6bf64ee5196530a1f96d922a80f5e96811";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hy-AM/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hy-AM/firefox-112.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "349a3d5089a53869a7111b9c757e64edbe849ceb7dfbb5a31b20c67dea3c8d36";
+      sha256 = "e4a35e4eb59270c98784fd5956d7576703b8d6f374e63ff99f859b4618a0e957";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ia/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ia/firefox-112.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "3373521a73b0002818e31a16af040caa5c425068aa11c8c65f706a74633bc10f";
+      sha256 = "f9f6c8df9633b5b04212ca108115b32b7b7d670e105e5eabf971ab6c87ade854";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/id/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/id/firefox-112.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "4b5364f6d737b2d0584c0c2f4bc432f2225e6234a9415919515b40656ede8258";
+      sha256 = "fea802d675e2ccd2b389e81d3ef2766fa3083ece7a68450f33914421fe8081b5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/is/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/is/firefox-112.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "2d73b59fa27b20ace8dd17edb6d6394130f4652ff98b1a2a0529cf0bb9dbf06a";
+      sha256 = "e2a5ea9a8cfe0d769c9b61f5a452e144973017c2e65d6ad03e190413c04a2430";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/it/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/it/firefox-112.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "23859f3a5344ce24afbbd0bea73081681f11cf5ff3a86f94d86ea79eeeb3585d";
+      sha256 = "211864798e0ff9fb06f10fe9e0c36ab5617ef5447cf24d03b5127f3a456a6249";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ja/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ja/firefox-112.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "edd4d2a102e6fe2cb248052547030823a7fc7b678e7a368f5ccfe44b40666eb0";
+      sha256 = "ad7dba75cc991240315eabd9c99a3d643c8cc9d403f679162961be5c7f9da198";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ka/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ka/firefox-112.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "1b0da095cd57de75e3a561c75c5edd27711d2ec3e729434c7df592e9b183fe15";
+      sha256 = "9a27a1b23da7c17881466ee52f0fd55de6069fbac45721e74c575a65d39924c5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kab/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kab/firefox-112.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7a56c0e4064a763b17094ec70638492c6cdd6c6f69a8589e2040e24d897aa042";
+      sha256 = "f9b89268fb6cea643117779d845ca607de48b680c8331123ff9a2213a49c6aab";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kk/firefox-112.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "c69e27d1c72d8b92d1c746e1d1a82dbcef16cfac301d76df1d87daf96c8f84d7";
+      sha256 = "b3995abef49360a373e73d612683a9de37df9da3172f754855977b2a350f02c2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/km/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/km/firefox-112.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "181036a27c3e995970c4fdb6c49ff5106b8bddf44c933089f83cb371b4fa946d";
+      sha256 = "b113f611be572fad8d707ef089d1113a840f47341960b0180ce8c8d958c0fac1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kn/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kn/firefox-112.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "42c50fdf664789ef2c71219af68ece68fbf123425ce97b9530bd4582cb6e5045";
+      sha256 = "43376fca7535feb95e083abf2cd695d452cb7c3d9e5136d617340f37bfd695e1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ko/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ko/firefox-112.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "093a9fef2162dfb01b8cef075d5ad17a7d1e1a05421fed72091e755e6f24709b";
+      sha256 = "cab18f93e0ca6b56d5bbd269e33fc80e16e8048a359d81d6e272582c6c6e9a76";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lij/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lij/firefox-112.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "f2df830ea94dcf0b221df59d5c565f39a8439583df2a54a20e247a578e7d6862";
+      sha256 = "69c0416f559a64bb806ae7e3eca236ec13621cb8ab634e1aea901fdcb80180d6";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lt/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lt/firefox-112.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "144584c9b7cbca0e93e55051b92617e8e88433028c36a0ce0b1a0ac4ef916f5a";
+      sha256 = "ab662f5812d14e544255c1e708b9c1961ad6d9d37de25986aa4069beb568d9a2";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lv/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lv/firefox-112.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "bcfb4c9f2dcf63819e2a02467da496297ce5295d5ddd59afaaf088eae3048b40";
+      sha256 = "39ba8132bb0178ebf707115a2a3c6a6eb2bcda82a3132a21ca8f8fc77f861312";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/mk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mk/firefox-112.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "7637384ed32fe32d5c3c39e24722721e6f9007770b7732546022b8b6a9e4aca9";
+      sha256 = "124b53c31c874fb32f7f006dd48332d44bb9a139947e52952eeb484d17247ddb";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/mr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mr/firefox-112.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "e1d4cacdaf6ad2131b8958a903d20700c41249e3c3a031a93150061369664b49";
+      sha256 = "58e7e6b526f00187cad5e032323c39d4efd58a9fd8e2e0a6ca46eca4f45e1c6f";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ms/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ms/firefox-112.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "9228c55f475cc8bafe7cfeac1cd999e2c283332cff82d02d46bcb790e2edc946";
+      sha256 = "fe19152b27b2ad3ba6bcaa127713a0a9191f7c81529ade02e48817f5f6cc12c4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/my/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/my/firefox-112.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "3d32e3bcc5a3c3a7aa4a7e09647ec068348395aeb126a6976b73a085792206f2";
+      sha256 = "6c39c38301d6e5d845c4a4ad34685d8017cb874665aba823e62cce651b388f56";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nb-NO/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nb-NO/firefox-112.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "de10b1023c99dbf3685c83e58bd7bed49f63cf8add9d2856b5a263627fcbc460";
+      sha256 = "e297b652111781206672b3c6191897080c3d6dff63e74f7f62c6a0f4292a3389";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ne-NP/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ne-NP/firefox-112.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "6979b4661584af6bc162b13546b562c11f67accd514e9c52570891ed410dd88b";
+      sha256 = "9d25913a2e07c874ede15a3849b396586a32b614ef29087774f244c40a33225e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nl/firefox-112.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "bc2082e9edee95fe539ad7bf2b90a80a3f008184c4dd062f39e390a30c6c004d";
+      sha256 = "ed3398198b475c4c369a340dbdddb687bdd8b5e0c397e981b3f2489d6e575447";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nn-NO/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nn-NO/firefox-112.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "9fdbe924ca5261e5545249a3d43e4a0a39f25d8142e5f507255bd2ba15ffc272";
+      sha256 = "91376b1de28595e2050fc0c56024cc89ec4143b590c51612218c2a822860834d";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/oc/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/oc/firefox-112.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "e065dfac06020ac1706e1b70d6fefde8db5ed1357ab6be22797e323fb2dced44";
+      sha256 = "4ef41fadb4b297b781c8a24fd64302e6e348b455101c5450d9b3011e3bf1d638";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pa-IN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pa-IN/firefox-112.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c7e9807983dd169ed6e3aa259a5df2560f4fc3698a0cefefafecf12ee439753d";
+      sha256 = "ca8122bcee87fc1384ea0ebebcf501e659987c58bd8a6a2a54f78681ca6df264";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pl/firefox-112.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "12da595e9effda46d10a994dede3b4136226aa77c1cee7d1c6638087d9108d25";
+      sha256 = "6e9835f4ccf62810d4e9500f05bfe7b9be205b8103be642ded328bc85aa84c21";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pt-BR/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-BR/firefox-112.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "a7891b30d7d937ca349983149532ed7d219f4f90397cb1ea63778ca4c193216d";
+      sha256 = "e9dd785fd994226e747586ab38a2bc503760938180c0aec1e3966ac35776cf85";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pt-PT/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-PT/firefox-112.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "77d749c7cbe970c41265bcfe9a3f0afc3f02a5e3880a382b01cb00afbd41e2b8";
+      sha256 = "9f37f69dbdf6748da01c3fa9c581e44184091ac0ad85101da7d58f7115a3cdc4";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/rm/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/rm/firefox-112.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "6ef950ba883d56eb53ef9b9110943a73153c2fdf91b7b0d3669818fa5b3ad0b4";
+      sha256 = "752b66437a1684c36847ed36f65005e9ca4156b05c93dcadcb842370792ab252";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ro/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ro/firefox-112.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "4e56a8ec4627f7bda6a3ca26b650ea87b5c191d8876bdc53656ac614e8c70a51";
+      sha256 = "3c5e8aed8dddf11964e3070d539377a82e63827ef1517553ae784565a0c241fc";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ru/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ru/firefox-112.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "7c12dcaf2d417758f020fe7ab9832b07442123c7645eda1e35dbd83a0706ae51";
+      sha256 = "b626cfce29b6bce883513057dc4571a489f5e0c392c7222e9853cac419923165";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sc/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sc/firefox-112.0b5.tar.bz2";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "8ed09b4c916b66908db19a0befb8bf3da8ef9c59bb92b7f1120bf76a250e427a";
+      sha256 = "d96abbf55494f33262ba3edf2552b96ba71defb0318a36118a8cbd26dd3ec4a0";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sco/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sco/firefox-112.0b5.tar.bz2";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "5507399e27aab620dff5d291861e9b4b50c286ae6ea96640054c38d31a7c606b";
+      sha256 = "b352cf61ef75da6f2ec0c8fd6a16e90aa72961a82ceb7a014dfcb0a9ba35277b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/si/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/si/firefox-112.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "e52843ba33be6c94c7e830ee4fb87797f2ace8f2d51ffe37cc67f1505d005d71";
+      sha256 = "a4ebfa843e140b8b7015fc6945dcc166211882662f00a6c4eb27d2334cb2fc97";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sk/firefox-112.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "abdc186a7073cb6c8ddceee41c171e3d3264248d4b47ca62690138229f9d8432";
+      sha256 = "83d58804619b82afc9431d048c16cd3738dfa75bf9d6e069b1f020a2b628df1a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sl/firefox-112.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6dee4c5fffa8ed99c8d63e0cdda2cc016c2b602dc9ccd752ef079185814a8dde";
+      sha256 = "1c36099781dc219b1cca5d9796f3df67f0a10412c7dc494f2a8cfb53e4668ee8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/son/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/son/firefox-112.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "d39151298291a03418ea28b664a3b134a785c1771577b98da72387e6e4489fec";
+      sha256 = "4f27373905fed3827c1b74ce3de095d435e4dcc9a163d40690e072cbe42141c5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sq/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sq/firefox-112.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "788747a5e18a6c1d0ebd3be7cdfa93bb74d20b611877f277ea6ebe298db7d0f4";
+      sha256 = "5080273f3461bf27473fbd4d435d5efc50f6e15ed7cb382f000db313a4df49d7";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sr/firefox-112.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "1e67fb9b784efd5edb2cbc403683b40334fc99ae78828c165ffcd9da17f41a8a";
+      sha256 = "d8589c74b96f1a162d1d37c9e280216af7769cb7f08c151a530fa1d44bf6311b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sv-SE/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sv-SE/firefox-112.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "fbd66fe3e44e325c07bdfa17c9d8f20b426efcadfba6c40f461f409e54a58e48";
+      sha256 = "4026373c960ffc40beda3f9dd04b13d274d751247abe23631efe517b57ea23d8";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/szl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/szl/firefox-112.0b5.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "63f4a05b0bdea660fc2d68e227f819f1f3c99a6bd5f9b38c695a4ddff743a250";
+      sha256 = "697404cbd67c589db561ebc2261fe15af6f272609d17cc5ecd6c434d95cb55e1";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ta/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ta/firefox-112.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "79a8c2104bb20ce0c8699b2b0c7ab8423293a4f82fc9c9bafd1a0d29f55ac99b";
+      sha256 = "187b26a699a3b7f4182433ba6a458420434137ae44fa662eb88e35d592de1dbf";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/te/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/te/firefox-112.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "cc3a1ca4e73d654bc2024c09c59bc26c4af1ddbf6b37c95af35e0dc07277d43d";
+      sha256 = "c21f404ae4626101fa63c7c5fb06a515ad76f5113196f8d5490adb1556808d80";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/th/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/th/firefox-112.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "e962ca885ccac7043703f1aa2c5bf56e48e1f16b83661b55c64b88ae81dffa2e";
+      sha256 = "8623f5d172c3148faeb0e67ee22aed2586dba858b3c8283ad8f5a05ab32d493a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/tl/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tl/firefox-112.0b5.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "5082d1c3816428d5f5fbddf281fe44d6f7061416a50ccb98b554d4adc392f8f4";
+      sha256 = "b5609b75505ca2a27839ec7519eb4f21f2d84f8eda89b6b76b958b73c7b5e5cd";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/tr/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tr/firefox-112.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "8cc6288f0f4606f04b68b5cdf200a137233e9e88619104f782cbb712057d24c3";
+      sha256 = "8239a21e49341ea63dec6e000d7854925b8885550148f1bdeed190fdacd54627";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/trs/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/trs/firefox-112.0b5.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "98276c238aca6e97500648469468cd8a53e17738d24fa10d101ed7e613137734";
+      sha256 = "e7ecd2309bb66c2b635430e6f001c742d4e67eccc7d3278d64ff0086481ce037";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/uk/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uk/firefox-112.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6e21e02b409b954a9250e19db256837ff9b82975a7596bd8585349205836ba92";
+      sha256 = "15eac212a24278055f27bbf9bb7d2bce298ad40d8474a09a64a8d6a82253a730";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ur/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ur/firefox-112.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "f48380e3a1ad9c9e10f3856a4911d5c47d21a49a4bcd2fdef06115ea6191cccd";
+      sha256 = "5d59b25da307aef5d9baacb68059d04e5125e9f8c9ad72d229b6f59aed2cc856";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/uz/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uz/firefox-112.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "294c51f2f1e39bdac52cb2dcf92a1fc8fe079574a25f23cf8474271677ba81e5";
+      sha256 = "b66c8cc522829e6415bf452542d792946c62d6911ecdd8977dc36854a96bb59a";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/vi/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/vi/firefox-112.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "9ce99076eb37b3fea5d4dd146fa7553fa522593feeeb254a229fd270880d014d";
+      sha256 = "b24e0038f2f8147c9dfa79acfd195e5ce8cfe27f5d7ace9a591a21dcda8889a5";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/xh/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/xh/firefox-112.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "39216b22c3d02baa9fb62ab112ea5765ed916569240c423661f0c64da975e37d";
+      sha256 = "ba5d40a5cd4653e3f3381b25dee1c7a579986fa187e6a1c9fd6d81bd29c0a73e";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/zh-CN/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-CN/firefox-112.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7eea15b7eed1de587e8407079ee157c380455d1d66d0294723025009181a6aaf";
+      sha256 = "5b978f0f36e894eda54f0f690edc7e1fa156b898d550e747a8c5b712bbe2846b";
     }
-    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/zh-TW/firefox-112.0b3.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-TW/firefox-112.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "c08c80b3354a77a98cbf9cf44928254b76249c2a7fc1b3777118488c7c55446f";
+      sha256 = "7d4b52012de5cd28dd21b89c04f2ed1f392fa8637c07747e34619812daf40146";
     }
     ];
 }

From 6416b89123b32c1e4c83d147a723db549e6970b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 01:56:37 +0000
Subject: [PATCH 149/247] topgrade: 10.3.2 -> 10.3.3

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index a9d5aa4e5866..72c31163dbf1 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "10.3.2";
+  version = "10.3.3";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     rev = "v${version}";
-    hash = "sha256-yYRKNiX8JvCP44+mdLIOSjpxaVDz1YUNrj/IZ0bC72Y=";
+    hash = "sha256-LhTUzY2WrauWHYZU5jA6fn3DDheUgfxCPvjVTwUvF4w=";
   };
 
-  cargoHash = "sha256-2b6TOkjoycPA8rwca3nT212Yxl6q2Hmvv0f4Ic9hnWM=";
+  cargoHash = "sha256-ONLZrZjhNcli7ul6fDgVEKm2MS3YYIfPnHS+dmpJHu0=";
 
   nativeBuildInputs = [
     installShellFiles

From 8883bb63d2b5f24ed4ba132cbaf63fa13f37a3c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 02:14:40 +0000
Subject: [PATCH 150/247] drush: 8.4.11 -> 8.4.12

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

diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index c06a566fb59a..bd1c71109963 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drush";
-  version = "8.4.11";
+  version = "8.4.12";
 
   src = fetchurl {
     url = "https://github.com/drush-ops/drush/releases/download/${version}/drush.phar";
-    sha256 = "sha256-4DD16PQHGZzAGwmm/WNeZ/dDKnlQslcb35AkpiJs5tQ=";
+    sha256 = "sha256-YtD9lD621LJJAM/ieL4KWvY4o4Uqo3+FWgjGYGdQQaw=";
   };
 
   dontUnpack = true;

From 1860169db725f3434818da33001098f910e53fa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 02:23:40 +0000
Subject: [PATCH 151/247] goreman: 0.3.14 -> 0.3.15

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

diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix
index a7fa7424e052..57d7b46f54cf 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/pkgs/tools/system/goreman/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "goreman";
-  version = "0.3.14";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "goreman";
     rev = "v${version}";
-    sha256 = "sha256-FskP0/mqmPTkI0Pj22aweOcr9SqlcFfFaZYgot2wY90=";
+    sha256 = "sha256-Z6b245tC6UsTaHTTlKEFH0egb5z8HTmv/554nkileng=";
   };
 
   vendorHash = "sha256-Qbi2GfBrVLFbH9SMZOd1JqvD/afkrVOjU4ECkFK+dFA=";

From 6f52aa868cc6d42ded66c14b60bcd70169856a0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 02:25:00 +0000
Subject: [PATCH 152/247] lxgw-neoxihei: 1.007 -> 1.009

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

diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix
index 2ca2473b3647..6b93826d4d99 100644
--- a/pkgs/data/fonts/lxgw-neoxihei/default.nix
+++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix
@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.007";
+  version = "1.009";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-ChYpRCw8DAo8bo6fJ+5LyF+FGmER+4nY2aEx1GIROdU=";
+    hash = "sha256-Q7rrgqrjALLY2y40mNfNmzSeGwcVwhZUmDj08nlWsao=";
   };
 
   dontUnpack = true;

From aa410839cdbdeecf016dcc21fbf544eb0f1ad2a1 Mon Sep 17 00:00:00 2001
From: yuzukicat <yuzuki.cat@kamisu66.com>
Date: Thu, 23 Mar 2023 11:26:00 +0900
Subject: [PATCH 153/247] emacsPackages.mind-wave packaging

---
 .../manual-packages/mind-wave/default.nix     | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix
new file mode 100644
index 000000000000..336cd510479f
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, pkgs
+, melpaBuild
+, substituteAll
+}:
+# To use this package with emacs-overlay:
+# nixpkgs.overlays = [
+#   inputs.emacs-overlay.overlay
+#   (final: prev: {
+#     emacs30 = prev.emacsGit.overrideAttrs (old: {
+#       name = "emacs30";
+#       version = inputs.emacs-upstream.shortRev;
+#       src = inputs.emacs-upstream;
+#     });
+#     emacsWithConfig = prev.emacsWithPackagesFromUsePackage {
+#       config = let
+#         readRecursively = dir:
+#           builtins.concatStringsSep "\n"
+#           (lib.mapAttrsToList (name: value:
+#             if value == "regular"
+#             then builtins.readFile (dir + "/${name}")
+#             else
+#               (
+#                 if value == "directory"
+#                 then readRecursively (dir + "/${name}")
+#                 else []
+#               ))
+#           (builtins.readDir dir));
+#       in
+#         # your home-manager config
+#         readRecursively ./home/modules/emacs;
+#       alwaysEnsure = true;
+#       package = final.emacs30;
+#       extraEmacsPackages = epkgs: [
+#         epkgs.use-package
+#         (epkgs.melpaBuild rec {
+#           # ...
+#         })
+#       ];
+#       override = epkgs:
+#         epkgs
+#         // {
+#           # ...
+#         };
+#     };
+#   })
+# ];
+melpaBuild rec {
+  pname = "mind-wave";
+  version = "20230322.1348"; # 13:48 UTC
+  src = pkgs.fetchFromGitHub {
+    owner = "manateelazycat";
+    repo = "mind-wave";
+    rev = "2d94f553a394ce73bcb91490b81e0fc042baa8d3";
+    sha256 = "sha256-6tmcPYAEch5bX5hEHMiQGDNYEMUOvnxF1Vq0VVpBsYo=";
+  };
+  commit = "2d94f553a394ce73bcb91490b81e0fc042baa8d3";
+  # elisp dependencies
+  packageRequires = [
+    pkgs.emacsPackages.markdown-mode
+  ];
+  buildInputs = [
+    (pkgs.python3.withPackages (ps:
+      with ps; [
+        openai
+        epc
+        sexpdata
+        six
+      ]))
+  ];
+  recipe = pkgs.writeText "recipe" ''
+    (mind-wave
+    :repo "manateelazycat/mind-wave"
+    :fetcher github
+    :files
+    ("mind-wave.el"
+    "mind-wave-epc.el"
+    "mind_wave.py"
+    "utils.py"))
+  '';
+  doCheck = true;
+  passthru.updateScript = pkgs.unstableGitUpdater {};
+  meta = with lib; {
+    description = " Emacs AI plugin based on ChatGPT API ";
+    homepage = "https://github.com/manateelazycat/mind-wave";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [yuzukicat];
+  };
+}

From f3d22c3f3cf262eaf29b3895a15c3089867b55a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 02:38:11 +0000
Subject: [PATCH 154/247] automatic-timezoned: 1.0.72 -> 1.0.75

---
 pkgs/tools/system/automatic-timezoned/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix
index 53472de63516..88c1bc15b831 100644
--- a/pkgs/tools/system/automatic-timezoned/default.nix
+++ b/pkgs/tools/system/automatic-timezoned/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "1.0.72";
+  version = "1.0.75";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-JOf10wGpOwJTvBvaeoBPKWm6f3B6K9ZsJaKkkzwkM7Y=";
+    sha256 = "sha256-soEVET3aVK77UJjhXq/cwK9QWAJWQu5TEjyHEKfqKeY=";
   };
 
-  cargoHash = "sha256-4vzu77BLxJeVQgpI+g16XrqWt94r93v6Wz9wwFcbKlQ=";
+  cargoHash = "sha256-xux+8hix2FzZqxOmos1g0SAcVVajJUCO9qGl0LNtOlk=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

From 32759a00da1fdaaba82611b96601e16851879849 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 03:25:31 +0000
Subject: [PATCH 155/247] python310Packages.upcloud-api: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix
index 379a3ebd2d5d..94ac09bff63f 100644
--- a/pkgs/development/python-modules/upcloud-api/default.nix
+++ b/pkgs/development/python-modules/upcloud-api/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "upcloud-api";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-python-api";
-    rev = "v${version}";
-    sha256 = "1kkgrn97pw4k49ys97hjrvh2j8y2p2r9970v9csgrk5wci4562wm";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-thmrbCpGjlDkHIZwIjRgIVMplaypiKByFS/nS8F2LXA=";
   };
 
   propagatedBuildInputs = [

From 5c305b5a8fe74fd3558aab0aee28916039e11f50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 04:42:32 +0000
Subject: [PATCH 156/247] checkpolicy: 3.3 -> 3.5

---
 pkgs/os-specific/linux/checkpolicy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 52cf0a3ec037..5b08739667d5 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "checkpolicy";
-  version = "3.3";
+  version = "3.5";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${se_url}/${version}/checkpolicy-${version}.tar.gz";
-    sha256 = "118l8c2vvnnckbd269saslr7adv6rdavr5rv0z5vh2m1lgglxj15";
+    sha256 = "sha256-eqSKsiIqC5iBER1tf3DDAU09kziCfZ4C3xBaaMDfXbw=";
   };
 
   nativeBuildInputs = [ bison flex ];

From d35aead486d7885d192bbe912fd1eb70131dd98a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 05:02:30 +0000
Subject: [PATCH 157/247] sarasa-gothic: 0.40.3 -> 0.40.4

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

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index a15e0d50ae0b..c8a3a65a00b7 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "sarasa-gothic";
-  version = "0.40.3";
+  version = "0.40.4";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-    hash = "sha256-lhjsmsgFEXMX5byp50qRoHoX9nuKcsrAp6NGDdfXo3I=";
+    hash = "sha256-PVlozsWYomsQKp8WxHD8+pxzlTmIKGPK71HDLWMR9S0=";
   };
 
   sourceRoot = ".";

From c9d19defb1cc575c083bcfa92a8d5242a016243e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 06:04:09 +0100
Subject: [PATCH 158/247] ocamlPackages.mirage-net: use Dune 3

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

diff --git a/pkgs/development/ocaml-modules/mirage-net/default.nix b/pkgs/development/ocaml-modules/mirage-net/default.nix
index bc7ae7d96b3c..bf4992df76f4 100644
--- a/pkgs/development/ocaml-modules/mirage-net/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-net/default.nix
@@ -6,11 +6,11 @@ buildDunePackage rec {
   pname = "mirage-net";
   version = "4.0.0";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz";
-    sha256 = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4=";
+    hash = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4=";
   };
 
   propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ];

From f2aa79b5e11d3c87d090089f87e7071bdbebfa16 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 06:04:15 +0100
Subject: [PATCH 159/247] ocamlPackages.mirage-runtime: use Dune 3

---
 pkgs/development/ocaml-modules/mirage/runtime.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index 8182b7b5ef53..0b7d929f5a8e 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -8,6 +8,7 @@ buildDunePackage rec {
   inherit (functoria-runtime) src version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ];
   checkInputs = [ alcotest ];

From 33cffcde611ae2c6b62456f016ca0916e42d5401 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 06:04:19 +0100
Subject: [PATCH 160/247] ocamlPackages.tuntap: use Dune 3

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

diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix
index 2bbf89c61273..e5db86d7fee4 100644
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/pkgs/development/ocaml-modules/tuntap/default.nix
@@ -6,9 +6,9 @@ buildDunePackage rec {
   pname = "tuntap";
   version = "2.0.0";
 
-  useDune2 = true;
+  duneVersion = "3";
 
-  minimumOCamlVersion = "4.04.2";
+  minimalOCamlVersion = "4.04.2";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz";

From b174387ba919dddd50e347f18012343dcb6ba4fa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 06:04:25 +0100
Subject: [PATCH 161/247] =?UTF-8?q?ocamlPackages.macaddr:=205.3.0=20?=
 =?UTF-8?q?=E2=86=92=205.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ipaddr/cstruct.nix  | 2 ++
 pkgs/development/ocaml-modules/ipaddr/default.nix  | 7 +++++--
 pkgs/development/ocaml-modules/ipaddr/sexp.nix     | 6 ++++--
 pkgs/development/ocaml-modules/macaddr/cstruct.nix | 2 ++
 pkgs/development/ocaml-modules/macaddr/default.nix | 9 +++++----
 pkgs/development/ocaml-modules/macaddr/sexp.nix    | 6 ++++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
index c2621584f34f..07abfc967343 100644
--- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
 
   inherit (ipaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ipaddr cstruct ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index c4eefb637fb5..6e1170375dcd 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage
 , macaddr, domain-name, stdlib-shims
-, ounit, ppx_sexp_conv
+, ounit2, ppx_sexp_conv
 }:
 
 buildDunePackage rec {
@@ -8,9 +8,12 @@ buildDunePackage rec {
 
   inherit (macaddr) version src;
 
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
+
   propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
 
-  checkInputs = [ ppx_sexp_conv ounit ];
+  checkInputs = [ ppx_sexp_conv ounit2 ];
   doCheck = true;
 
   meta = macaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
index 373b5a87e495..a74236c5aa0c 100644
--- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
@@ -1,5 +1,5 @@
 { lib, buildDunePackage
-, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv
+, ipaddr, ipaddr-cstruct, ounit2, ppx_sexp_conv
 }:
 
 buildDunePackage rec {
@@ -7,9 +7,11 @@ buildDunePackage rec {
 
   inherit (ipaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ipaddr ];
 
-  checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ];
+  checkInputs = [ ipaddr-cstruct ounit2 ppx_sexp_conv ];
   doCheck = true;
 
   meta = ipaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
index db543c0574e1..863491e0b7fb 100644
--- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
@@ -7,6 +7,8 @@ buildDunePackage {
 
   inherit (macaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ macaddr cstruct ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index 7eb74ff064d0..ab2126843a27 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -1,19 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, ppx_sexp_conv, ounit
+, ppx_sexp_conv, ounit2
 }:
 
 buildDunePackage rec {
   pname = "macaddr";
-  version = "5.3.0";
+  version = "5.4.0";
 
   minimalOCamlVersion = "4.04";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
-    sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
+    hash = "sha256-WmYpG/cQtF9+lVDs1WIievUZ1f7+iZ2hufsdD1HHNeo=";
   };
 
-  checkInputs = [ ppx_sexp_conv ounit ];
+  checkInputs = [ ppx_sexp_conv ounit2 ];
   doCheck = true;
 
   meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix
index 1f03c1326a53..5d096dfececd 100644
--- a/pkgs/development/ocaml-modules/macaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix
@@ -1,5 +1,5 @@
 { lib, buildDunePackage
-, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit
+, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit2
 }:
 
 buildDunePackage {
@@ -7,9 +7,11 @@ buildDunePackage {
 
   inherit (macaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ppx_sexp_conv ];
 
-  checkInputs = [ macaddr-cstruct ounit ];
+  checkInputs = [ macaddr-cstruct ounit2 ];
   doCheck = true;
 
   meta = macaddr.meta // {

From 283218b5cb20f1375fdb8c0dd061937139f30806 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 05:28:52 +0000
Subject: [PATCH 162/247] glooctl: 1.13.10 -> 1.13.11

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

diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
index 415e395ea705..3cf79268f70c 100644
--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.13.10";
+  version = "1.13.11";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-PsdaGVBEslcBMNCj1NQozwbrRx1Nx7Z5+jtZLCrJwDU=";
+    hash = "sha256-K3tk55YPgBSF0YrxSw8zypnzgwEiyEPAAbiGyuKId9o=";
   };
 
   subPackages = [ "projects/gloo/cli/cmd" ];
-  vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4=";
+  vendorHash = "sha256-BRF4kc2Yers3jV2YqG7koycFK34i8NqTcuyt1oGXzsU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4b8b50fed723044476137b18c162905dca07aaa6 Mon Sep 17 00:00:00 2001
From: Phil Dyer <phildyer@protonmail.com>
Date: Thu, 23 Mar 2023 12:48:13 +1000
Subject: [PATCH 163/247] tuxedo-keyboard: fix building of tuxedo-keyboard
 kernel module

---
 pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
index cf0a5a99a69c..c3b4fbf82ebb 100644
--- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }:
+{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders, pahole }:
 
 stdenv.mkDerivation rec {
   pname = "tuxedo-keyboard-${kernel.version}";
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM=";
   };
 
-  buildInputs = [ linuxHeaders ];
+  buildInputs = [
+    pahole
+    linuxHeaders
+  ];
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
 

From 81c1d0eef5899a628b3461cdbe71a03d5a77ab69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:06:01 +0000
Subject: [PATCH 164/247] =?UTF-8?q?terraform-providers.aiven:=204.1.2=20?=
 =?UTF-8?q?=E2=86=92=204.1.3?=
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 cadb4c56cead..804dd7b65158 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -28,11 +28,11 @@
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "aiven": {
-    "hash": "sha256-MKxLfR2yV4/LYqQ/yZt44JAHIEinO8078ikWPBD/HXo=",
+    "hash": "sha256-wVgfT/1o5Hz7xbX3OOfjF2P5bhV7kPxnXZOU/3erRpk=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.1.2",
+    "rev": "v4.1.3",
     "spdx": "MIT",
     "vendorHash": "sha256-wz1Wy/4GI8/Wlu828RX7OE+XJHzCS/X45tW3Jb7Tx3E="
   },

From 968fffa67fcaa04fceefa41a006bf85308be8aac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:06:57 +0000
Subject: [PATCH 165/247] =?UTF-8?q?terraform-providers.digitalocean:=202.2?=
 =?UTF-8?q?6.0=20=E2=86=92=202.27.1?=
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 804dd7b65158..d68a75fc3855 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -301,11 +301,11 @@
     "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
   },
   "digitalocean": {
-    "hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=",
+    "hash": "sha256-fnABnzEMDJBzUl6/K1rgWdW4oCqrKZ+3RSXVvT1sHVk=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.26.0",
+    "rev": "v2.27.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 4e5a976b3825c7754d4e07b94b360a20288b0953 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:08:12 +0000
Subject: [PATCH 166/247] =?UTF-8?q?terraform-providers.gitlab:=2015.9.0=20?=
 =?UTF-8?q?=E2=86=92=2015.10.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 d68a75fc3855..2cd93d760a5f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -429,13 +429,13 @@
     "vendorHash": null
   },
   "gitlab": {
-    "hash": "sha256-nBmb+wHl6FEHIH/P9SsDCtvDKVHzcL4/iaQwtuSjbVg=",
+    "hash": "sha256-bn02BLLSgdo7/Oh95rNOxVUVvwflSvU43DOsii5LM0E=",
     "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
     "owner": "gitlabhq",
     "repo": "terraform-provider-gitlab",
-    "rev": "v15.9.0",
+    "rev": "v15.10.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM="
+    "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g="
   },
   "google": {
     "hash": "sha256-RLWfaJX7ytU8xKcXUp+ON2//rO6R0cw0beXdiH9E3SU=",

From 489c8b2caedc16417babc523cdafcbbcc57234d7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:08:25 +0000
Subject: [PATCH 167/247] =?UTF-8?q?terraform-providers.gridscale:=201.18.0?=
 =?UTF-8?q?=20=E2=86=92=201.18.1?=
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 2cd93d760a5f..b5e7ab474a11 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -476,11 +476,11 @@
     "vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0="
   },
   "gridscale": {
-    "hash": "sha256-deEP1x5rGIgX/CcRK4gWYbCsV1IKY7CFkwQl+uKhbEk=",
+    "hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
     "homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
     "owner": "gridscale",
     "repo": "terraform-provider-gridscale",
-    "rev": "v1.18.0",
+    "rev": "v1.18.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From a50421ada987ebd6ab66d209dac94f34b91130df Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:10:22 +0000
Subject: [PATCH 168/247] =?UTF-8?q?terraform-providers.newrelic:=203.17.1?=
 =?UTF-8?q?=20=E2=86=92=203.18.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 b5e7ab474a11..4cb69e9d25c3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -765,13 +765,13 @@
     "vendorHash": null
   },
   "newrelic": {
-    "hash": "sha256-EJpIITB6OF6TuFgQ4e9UIP7zaaFGc6DgR1fJ1pK2isc=",
+    "hash": "sha256-2MbzXcdtP4O+zWGhBCp+uryVJmZoA2kXDe8AH3vZ0zA=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.17.1",
+    "rev": "v3.18.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-QL9uEO89PwU8UFbLWCytXpzgrVeXKmaPmFm844ABAvI="
+    "vendorHash": "sha256-dEbJTeHWhfR+8o/s4fi4I0sio1uuh6OIzJhVF5Rup04="
   },
   "nomad": {
     "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",

From 3a3b5207b94455cb84e7b22994fb14e586aaf86b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:13:53 +0000
Subject: [PATCH 169/247] =?UTF-8?q?terraform-providers.spotinst:=201.106.1?=
 =?UTF-8?q?=20=E2=86=92=201.108.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 4cb69e9d25c3..b47ffe3da9a9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1045,13 +1045,13 @@
     "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
   },
   "spotinst": {
-    "hash": "sha256-fa6mEFNNAAp3E8W9U3VpICgKX3SGcQGQtce8DO+cUbY=",
+    "hash": "sha256-4zD2/0s7zeZhreM1dauJ6BSMxTKL16HH530bNCiKNv4=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.106.1",
+    "rev": "v1.108.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TxTw+13HJDHDdLhGjM3SXOL87RJdRFs0Y+t/oK81DfI="
+    "vendorHash": "sha256-Ac8cWoaTj18DFZOf8FYbI9FPb17GcA9r7ZkOMNV7iI4="
   },
   "stackpath": {
     "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",

From 1aad1127547d60cbc7723584aff281bcaefa0025 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:15:25 +0000
Subject: [PATCH 170/247] =?UTF-8?q?terraform-providers.statuscake:=202.0.6?=
 =?UTF-8?q?=20=E2=86=92=202.1.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 b47ffe3da9a9..1f82dfb4dc0d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1063,13 +1063,13 @@
     "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U="
   },
   "statuscake": {
-    "hash": "sha256-PcA0t/G11w9ud+56NdiRXi82ubJ+wpL4XcexT1O2ADw=",
+    "hash": "sha256-yky6aCRK1I9NOEWcz6n6uvU+6HBJcLPQr1LLVO+34jE=",
     "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake",
     "owner": "StatusCakeDev",
     "repo": "terraform-provider-statuscake",
-    "rev": "v2.0.6",
+    "rev": "v2.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-0D36uboEHqw968MKqkgARib9R04JH5FlXAfPL8OEpgU="
+    "vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s="
   },
   "sumologic": {
     "hash": "sha256-1BwhcyEJs7Xm+p2ChA9K7g+qBzqoh3eyAT9qKMfHB1g=",

From d25311fad4b5bea9b63f34eb1e96f76e41276c19 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:16:25 +0000
Subject: [PATCH 171/247] =?UTF-8?q?terraform-providers.oci:=204.112.0=20?=
 =?UTF-8?q?=E2=86=92=204.113.0?=
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 1f82dfb4dc0d..90fe28eee72c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -811,11 +811,11 @@
     "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
   },
   "oci": {
-    "hash": "sha256-OceXVqPbjJnPNKbf5vKzbTBEES1+CNCa/dTfPFgdACM=",
+    "hash": "sha256-KxhX9QJ7VssZz388xhmNsyDcnDKxu5MDL0nDWMOfEXQ=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v4.112.0",
+    "rev": "v4.113.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 9dda81ca70352da84bf4122eb3173cf79ff89ad2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 07:08:56 +0000
Subject: [PATCH 172/247] railway: 3.0.12 -> 3.0.13

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

diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix
index 7cac6d50d66c..0dc9249d5589 100644
--- a/pkgs/development/tools/railway/default.nix
+++ b/pkgs/development/tools/railway/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "3.0.12";
+  version = "3.0.13";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-2RdB/X62/9HKKax+Y+RYPrLEHsWwzOwzJ1Go930bYN0=";
+    hash = "sha256-ZLzIbA/eIu8cP9F6xSl8exFXDuyw7cYLAy0Zg+dJEzw=";
   };
 
-  cargoHash = "sha256-Aozg/Pyo7JlTEXul3MEfGLwbRo/qjogWeAUHzK8xssc=";
+  cargoHash = "sha256-1CqGs1pT/QaA+fFfuhP/O74wpFeVCHFsubIIo+UVLf8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 2dff193f3d86c94d46e285738527c5f736ba0543 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:24:37 +0100
Subject: [PATCH 173/247] linux: 4.14.310 -> 4.14.311

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 199223931572..bd7ad55a35e0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.14.310";
+  version = "4.14.311";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb";
+    sha256 = "1mbwrgjz575qxg4gwi2fxc94kprmiblwap3jix0mj4887zllqgw0";
   };
 } // (args.argsOverride or {}))

From 72cd47a8c1ab6171b2532aa48f9b7b9121a7565b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:24:49 +0100
Subject: [PATCH 174/247] linux: 4.19.278 -> 4.19.279

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 71b933e9c4b3..ce742ba681ac 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.278";
+  version = "4.19.279";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv";
+    sha256 = "104qkyflkfkp8iyshpirb9q708vvsgfbxfwgl0dnas3k7nyc6v3k";
   };
 } // (args.argsOverride or {}))

From db9b3233fc3236b7b433b1e96db32cd507759f38 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:25:00 +0100
Subject: [PATCH 175/247] linux: 5.10.175 -> 5.10.176

---
 pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 61cad1f4a564..f95140a162ac 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.175";
+  version = "5.10.176";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2";
+    sha256 = "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf";
   };
 } // (args.argsOverride or {}))

From 609bd9bceec1d98bc3fa626a6feb388ba76ea233 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:25:12 +0100
Subject: [PATCH 176/247] linux: 5.15.103 -> 5.15.104

---
 pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 07d686d21bff..22430aac13fd 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.103";
+  version = "5.15.104";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8";
+    sha256 = "0m3bscml2mvafbj5k9a3qa8akfxms8wfpzsr687lfblr17735ibi";
   };
 } // (args.argsOverride or { }))

From 8d7db2427d33a79778c5514ea9a0bec2eb76302c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:25:22 +0100
Subject: [PATCH 177/247] linux: 5.4.237 -> 5.4.238

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index abffbf2eddb5..8116724d67b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.237";
+  version = "5.4.238";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p";
+    sha256 = "07x9ibcshsm451qcpawv3l0z7g8w8jg79h6dfdmbm3jrhpdb58kh";
   };
 } // (args.argsOverride or {}))

From 25ee2ea037dccf8d0a8af880c12e894852597978 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:25:34 +0100
Subject: [PATCH 178/247] linux: 6.1.20 -> 6.1.21

---
 pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix
index 45bbb81937a4..dedef194a00c 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.1.20";
+  version = "6.1.21";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn";
+    sha256 = "0fnr2pw4pi0vnkpv8hfipya09cgdz6ghks7p6vdl2d71dawb2g5k";
   };
 } // (args.argsOverride or { }))

From 51b22f7f5baf57fd5565117c07931e3a20b11c9f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:25:49 +0100
Subject: [PATCH 179/247] linux: 6.2.7 -> 6.2.8

---
 pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix
index bdc0d119e49c..41a48a5e0d5d 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.2.7";
+  version = "6.2.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3";
+    sha256 = "0rgn8k9rhk819bazcaz7fbk5ba1hph02izqrw06ag0rgsj3svl7y";
   };
 } // (args.argsOverride or { }))

From 29b3bf6fb05529e3f5783578a00f80ae2ee504e3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:26:03 +0100
Subject: [PATCH 180/247] linux-rt_5_10: 5.10.168-rt83 -> 5.10.175-rt84

---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 98e4847ba4f2..45b28337304b 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.10.168-rt83"; # updated by ./update-rt.sh
+  version = "5.10.175-rt84"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "171mmgkjdsn6gx6z8kr5d80aygn4jjf8jc9zfh7m2c4dpab2azdn";
+    sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "08nz84yyjd8ffxhpiksqikhkhrn9a9x5mbfrz317sx6mf55wyxm0";
+      sha256 = "13pqr6lhngig7g2s1qb27vq8x9b3wilz7gx820icdlvdxx1mi27p";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From c4e51ce8678c3ca3aef498667eb8d8d5b3f431d5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:26:28 +0100
Subject: [PATCH 181/247] linux_latest-libre: 19109 -> 19160

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 3bf3951f7605..502da0c944a1 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19109";
-    sha256 = "1z8qbfrn489bsi4grpw5dzw8f5jzml0swngfflh8flb80zcq0s2p";
+    rev = "19160";
+    sha256 = "1fgfb35f1lhizb3p5d6p04pkff5c2k7x3yayb4ns1225l8klspqb";
   }
 , ...
 }:

From 79148a9f3b89f06c0003f3a6bf3057ef50278957 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:27:31 +0100
Subject: [PATCH 182/247] linux/hardened/patches/4.14: 4.14.309-hardened1 ->
 4.14.310-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 32432898e69b..750fa6989282 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,12 +2,12 @@
     "4.14": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-4.14.309-hardened1.patch",
-            "sha256": "0j9dnrxn75qigfv2jq8aa76jli80bi56hriy205qar99vgp59a8a",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.309-hardened1/linux-hardened-4.14.309-hardened1.patch"
+            "name": "linux-hardened-4.14.310-hardened1.patch",
+            "sha256": "1bzxmniyld257xiaickb7rkzr9myg6bzczj6srf0c0wwz6zrdza3",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.310-hardened1/linux-hardened-4.14.310-hardened1.patch"
         },
-        "sha256": "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09",
-        "version": "4.14.309"
+        "sha256": "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb",
+        "version": "4.14.310"
     },
     "4.19": {
         "patch": {

From 0272420a3c4557e61dcea80e6640d19045d27d64 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:27:42 +0100
Subject: [PATCH 183/247] linux/hardened/patches/4.19: 4.19.277-hardened1 ->
 4.19.278-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 750fa6989282..f9e8038514aa 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,12 +12,12 @@
     "4.19": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-4.19.277-hardened1.patch",
-            "sha256": "16q0lc5nzzf372mlkjvg8vr67afnz0jxwv3zvvg6ip3k7gljphfz",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.277-hardened1/linux-hardened-4.19.277-hardened1.patch"
+            "name": "linux-hardened-4.19.278-hardened1.patch",
+            "sha256": "13vx0xqgfigdyb9x59728z2idzv0nisif6vpx73n08m99gax2y88",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.278-hardened1/linux-hardened-4.19.278-hardened1.patch"
         },
-        "sha256": "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn",
-        "version": "4.19.277"
+        "sha256": "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv",
+        "version": "4.19.278"
     },
     "5.10": {
         "patch": {

From c818f30da7e101eb9f22f71802984482b2b32f2a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:27:54 +0100
Subject: [PATCH 184/247] linux/hardened/patches/5.10: 5.10.174-hardened1 ->
 5.10.175-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f9e8038514aa..329bf371c927 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -22,12 +22,12 @@
     "5.10": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.10.174-hardened1.patch",
-            "sha256": "0zgp7jl16227fjj9j5zwahxa5xbkp2gkznpvzh68sanwd04qzby3",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.174-hardened1/linux-hardened-5.10.174-hardened1.patch"
+            "name": "linux-hardened-5.10.175-hardened1.patch",
+            "sha256": "0jxiccf3m0bih5c4sl44pxfnf9vs3fc66jvnp2q2l45a9dqr6ssh",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.175-hardened1/linux-hardened-5.10.175-hardened1.patch"
         },
-        "sha256": "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig",
-        "version": "5.10.174"
+        "sha256": "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2",
+        "version": "5.10.175"
     },
     "5.15": {
         "patch": {

From 4634bbc4c5bd1b037b25a8e817dffe0a6a70a2a8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:28:08 +0100
Subject: [PATCH 185/247] linux/hardened/patches/5.15: 5.15.102-hardened1 ->
 5.15.103-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 329bf371c927..55c96b89ca75 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.15.102-hardened1.patch",
-            "sha256": "05cxqcwr6fh2v69n4s30gs0pdw5i8h8kvrp3kzz0n2zb2afg6c8z",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.102-hardened1/linux-hardened-5.15.102-hardened1.patch"
+            "name": "linux-hardened-5.15.103-hardened1.patch",
+            "sha256": "1ci35f146qfl6km86ram5qs5v6x41ny7708j5lxz3fhx2533fm82",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.103-hardened1/linux-hardened-5.15.103-hardened1.patch"
         },
-        "sha256": "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724",
-        "version": "5.15.102"
+        "sha256": "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8",
+        "version": "5.15.103"
     },
     "5.4": {
         "patch": {

From 9791cc4323f4660ebe0befcb35676b0a3a7ba58c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:28:19 +0100
Subject: [PATCH 186/247] linux/hardened/patches/5.4: 5.4.236-hardened1 ->
 5.4.237-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 55c96b89ca75..8921a48c0e61 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "5.4": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.4.236-hardened1.patch",
-            "sha256": "07540gv79ah7n2vvmqa5nq0rjh6y0al78wmqwlzc2xdfmahk63mj",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.236-hardened1/linux-hardened-5.4.236-hardened1.patch"
+            "name": "linux-hardened-5.4.237-hardened1.patch",
+            "sha256": "0agnw7p1ylly09p7fvvnp7lgkgfrvbw33wc38ds3y0qhg5gghnby",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.237-hardened1/linux-hardened-5.4.237-hardened1.patch"
         },
-        "sha256": "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c",
-        "version": "5.4.236"
+        "sha256": "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p",
+        "version": "5.4.237"
     },
     "6.1": {
         "patch": {

From 8ee5702c66c7444fb56a48d505ac4f429f5a8793 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Mar 2023 08:28:33 +0100
Subject: [PATCH 187/247] linux/hardened/patches/6.1: 6.1.19-hardened1 ->
 6.1.20-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 8921a48c0e61..a064aec07434 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -52,11 +52,11 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-6.1.19-hardened1.patch",
-            "sha256": "0ax948idfyzpd7x8cp89m9lrwy30d4clj8z7ih919iji5nggjmvh",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.19-hardened1/linux-hardened-6.1.19-hardened1.patch"
+            "name": "linux-hardened-6.1.20-hardened1.patch",
+            "sha256": "1lz9ms716kzjn3sgrqxqi7q1zdrf6f81wn6xgv5kk1a2mcc3zw4p",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.20-hardened1/linux-hardened-6.1.20-hardened1.patch"
         },
-        "sha256": "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy",
-        "version": "6.1.19"
+        "sha256": "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn",
+        "version": "6.1.20"
     }
 }

From 40f52d9003c5cb4929a346529d2ff1357bd89d6c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 09:38:42 +0200
Subject: [PATCH 188/247] ogre1_9: cleanup

---
 pkgs/development/libraries/ogre/1.9.x.nix | 53 -----------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 pkgs/development/libraries/ogre/1.9.x.nix

diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
deleted file mode 100644
index 7548ed48e7ae..000000000000
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ fetchFromGitHub, stdenv, lib
-, cmake, libGLU, libGL
-, freetype, freeimage, zziplib, xorgproto, libXrandr
-, libXaw, freeglut, libXt, libpng, boost, ois
-, libX11, libXmu, libSM, pkg-config
-, libXxf86vm, libICE
-, libXrender
-, withNvidiaCg ? false, nvidia_cg_toolkit
-, withSamples ? false }:
-
-stdenv.mkDerivation rec {
-  pname = "ogre";
-  version = "1.9.1";
-
-  src = fetchFromGitHub {
-    owner = "OGRECave";
-    repo = "ogre";
-    rev = "v${version}";
-    sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg";
-  };
-
-  # fix for ARM. sys/sysctl.h has moved in later glibcs, and
-  # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't
-  # needed anyway.
-  postPatch = ''
-    substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \
-      --replace '#include <sys/sysctl.h>' ""
-  '';
-
-  cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
-    ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
-           ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
-    ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
-
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs =
-   [ libGLU libGL
-     freetype freeimage zziplib xorgproto libXrandr
-     libXaw freeglut libXt libpng boost ois
-     libX11 libXmu libSM
-     libXxf86vm libICE
-     libXrender
-   ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
-
-  meta = {
-    description = "A 3D engine";
-    homepage = "https://www.ogre3d.org/";
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-    license = lib.licenses.mit;
-  };
-}

From 26f55176e77696556658c04f2167db02f401d6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 23 Mar 2023 08:45:41 +0100
Subject: [PATCH 189/247] Revert #222072: "directx-shader-compiler: remove
 workaround"

This reverts commit c11df45c3daa6c4064f03f1bd8287a013ca56016.
Apparently it was premature; amdvlk just didn't build, e.g. on Hydra:
https://hydra.nixos.org/build/213225424
Fixes #216294.
---
 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 7d9a94559982..1b72f6026898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24705,7 +24705,10 @@ with pkgs;
 
   directx-headers = callPackage ../development/libraries/directx-headers { };
 
-  directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { };
+  directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
+    # https://github.com/NixOS/nixpkgs/issues/216294
+    stdenv = if stdenv.cc.isGNU && stdenv.isi686 then gcc11Stdenv else stdenv;
+  };
 
   dkimproxy = callPackage ../servers/mail/dkimproxy { };
 

From ae0f402b4c60af3f0130d80ff70d400e02f761a2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 10:22:17 +0200
Subject: [PATCH 190/247] aerospike: mark as insecure

---
 pkgs/servers/nosql/aerospike/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index f35b1285da40..9c0d034d7b3a 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.agpl3;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kalbasit ];
+    knownVulnerabilities = [ "CVE-2020-13151" ];
   };
 }

From 43c964b1bec4ece6a6611bd4dd2b282b5c013da0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 23 Mar 2023 09:22:10 +0100
Subject: [PATCH 191/247] elixir-ls: fix build

---
 pkgs/development/beam-modules/elixir-ls/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index acf73d094a2b..dd7ea4cacf74 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -36,7 +36,7 @@ mixRelease  {
   # of the no-deps-check requirement
   buildPhase = ''
     runHook preBuild
-    mix do compile --no-deps-check, elixir-ls.release
+    mix do compile --no-deps-check, elixir_ls.release
     runHook postBuild
   '';
 

From 1ea1361aed8c3794c0fb3c5d132048f669779f5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 09:14:33 +0000
Subject: [PATCH 192/247] rocminfo: 5.4.3 -> 5.4.4

---
 pkgs/development/tools/rocminfo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix
index 30d4c5a81e26..61488b806e88 100644
--- a/pkgs/development/tools/rocminfo/default.nix
+++ b/pkgs/development/tools/rocminfo/default.nix
@@ -18,7 +18,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.4.3";
+  version = "5.4.4";
   pname = "rocminfo";
 
   src = fetchFromGitHub {

From 9bc28cfe7357eec6474558700310545664d24704 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 10:34:07 +0000
Subject: [PATCH 193/247] oh-my-posh: 14.14.1 -> 14.14.3

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

diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index cb9a69065071..5a2c7dae9b32 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "14.14.1";
+  version = "14.14.3";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-EdW9LnSYSa8ulXKSJz3LBktVlDev7CLVOZL9qAytjcQ=";
+    hash = "sha256-Rxsc77M30aDuDgOtXWF2sQkzv2Xv4sxZ5JlkaqO/AbI=";
   };
 
-  vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0=";
+  vendorHash = "sha256-eMmp67B2udc8mhpVq2nHX+v1l1h3dXvjVXenZqCA6m4=";
 
   sourceRoot = "source/src";
 

From 98f89cf43cdb83576b60007c0fbdfe90d17bc401 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Thu, 23 Mar 2023 12:01:51 +0100
Subject: [PATCH 194/247] polarizationsolver: set a pep compliant version
 string

---
 .../python-modules/polarizationsolver/default.nix           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix
index 363dcdc4908b..d7385bd9f642 100644
--- a/pkgs/development/python-modules/polarizationsolver/default.nix
+++ b/pkgs/development/python-modules/polarizationsolver/default.nix
@@ -19,6 +19,12 @@ buildPythonPackage rec {
     hash = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU=";
   };
 
+  # setup.py states version="dev", which is not a valid version string for setuptools
+  # There has never been a formal stable release, so let's say 0.0 here.
+  postPatch = ''
+    substituteInPlace ./setup.py --replace 'version="dev",' 'version="0.0",'
+  '';
+
   propagatedBuildInputs = [
     numpy
     periodictable

From 612ce7218d092b32d5134498ff50a17b84b1227b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 11:15:33 +0000
Subject: [PATCH 195/247] minizip-ng: 3.0.8 -> 3.0.9

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

diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix
index 4fc4974b0129..8c53d6f566ef 100644
--- a/pkgs/development/libraries/minizip-ng/default.nix
+++ b/pkgs/development/libraries/minizip-ng/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minizip-ng";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = finalAttrs.pname;
     rev = finalAttrs.version;
-    sha256 = "sha256-Vzp+5fQBJoO1pG7j8LwC2/B/cOgM/exhKyb3zHuy89Y=";
+    sha256 = "sha256-yuHJUy/Ed7dutmosmcbedz5nZoCc5imLDOXikIde8bs=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 89589f1ffdacaa91c93cc70c4ec5e9eea3840e6b Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <appleprincess@appleprincess.io>
Date: Thu, 23 Mar 2023 11:12:01 +0000
Subject: [PATCH 196/247] exploitdb: 2023-03-22 -> 2023-03-23

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 0c513dad0dde..7ccd4417d2cf 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-03-22";
+  version = "2023-03-23";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-8kh4m27KU7drAXmpBTp34YvSmZ5cqFPSaXqedyGOwuY=";
+    hash = "sha256-g8dijq9GsMZdkVX/dFEdCPyUX2L5gDOEAqQTckW6HZk=";
   };
 
   nativeBuildInputs = [

From 01124da5439d6ae5b38846113c75c10502b58e94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 12:39:40 +0000
Subject: [PATCH 197/247] nixpacks: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 861d4877e428..2de8989830c3 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1IJboAy0GYgkysY84+wHHOulA/aiux7pgCtxfr0CFV8=";
+    sha256 = "sha256-eAniM4o7TshGhO5jGrCZz+Rs5n5Q24tvIWMWebKAWAs=";
   };
 
-  cargoHash = "sha256-kAou5pPOwbOZ9n8+fQJ4+Hh9x7wrY898R5XTuUEvF2o=";
+  cargoHash = "sha256-0Y4hHuWB7NY7rRJImNIrxlEffrT9055ThQGqJlMeDMM=";
 
   # skip test due FHS dependency
   doCheck = false;

From 1b0e903593e95e86d084451bfa99d27245b2e3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 17:00:06 +0100
Subject: [PATCH 198/247] datalad: fix src hash

---
 pkgs/applications/version-management/datalad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix
index cd2c26ea8d42..dfbb4e7db9e0 100644
--- a/pkgs/applications/version-management/datalad/default.nix
+++ b/pkgs/applications/version-management/datalad/default.nix
@@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "datalad";
     repo = pname;
     rev = version;
-    hash = "sha256-6uWOKsYeNZJ64WqoGHL7AsoK4iZd24TQOJ1ECw+K28Y=";
+    hash = "sha256-F5UFW0/XqntrHclpj3TqoAwuHJbiiv5a7/4MnFoJ1dE=";
   };
 
   nativeBuildInputs = [ installShellFiles git ];

From 90040062f206fb5259a8577d2fdf2fc5cf89fed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 17:01:45 +0100
Subject: [PATCH 199/247] python310Packages.annexremote: fix src hash

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

diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix
index c38a32c81d19..46e937eb8dae 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/pkgs/development/python-modules/annexremote/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Lykos153";
     repo = "AnnexRemote";
     rev = "v${version}";
-    sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi";
+    sha256 = "sha256-h03gkRAMmOq35zzAq/OuctJwPAbP0Idu4Lmeu0RycDc=";
   };
 
   nativeCheckInputs = [

From 614ad50d03739214a64e36c26eff6f49007c94c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 17:04:44 +0100
Subject: [PATCH 200/247] dvc: fix src hash

---
 pkgs/applications/version-management/dvc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index f76f413ea661..d83cf81e73de 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "iterative";
     repo = pname;
     rev = version;
-    hash = "sha256-2h+fy4KMxFrVtKJBtA1RmJDZv0OVm1BxO1akZzAw95Y=";
+    hash = "sha256-P0J+3TNHGqMw3krfs1uLnf8nEiIBK6UrrB37mY+fBA0=";
   };
 
   postPatch = ''

From 6176066e29ee936eed44d7e6d041cc916116a01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 17:15:51 +0100
Subject: [PATCH 201/247] python310Packages.debugpy: fix src hash

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

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 95f2d8b21eef..236a4982f67e 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo=";
+    hash = "sha256-jEhvpPO3QeKjPiOMxg2xOWitWtZ6UCWyM1WvnbrKnFI=";
   };
 
   patches = [

From b1fe611fa9c69a54717de94b41e1a563b264aecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 17:16:07 +0100
Subject: [PATCH 202/247] coursier: remove zsh completion which was removed
 upstream, remove nixfmt formatting in update script

---
 pkgs/development/tools/coursier/default.nix | 35 ++++-----------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 3374d4ee7fa0..af5edab074bf 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -1,24 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
 , coreutils, git, gnused, nix, nixfmt }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "coursier";
   version = "2.1.0-RC6";
 
-  zshCompletion = fetchurl {
-    url =
-      "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
-    sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh";
-  };
-
-  repo = "git@github.com:coursier/coursier.git";
-in stdenv.mkDerivation rec {
-  inherit version;
-
-  pname = "coursier";
-
   src = fetchurl {
-    url =
-      "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
+    url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
     sha256 = "0b52qp0jb2bhb649r6cca0yd1cj8wsyp0f1j3pnmir6rizjwkm5q";
   };
 
@@ -28,28 +16,18 @@ in stdenv.mkDerivation rec {
     install -Dm555 $src $out/bin/cs
     patchShebangs $out/bin/cs
     wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin
-
-    # copy zsh completion
-    install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_cs
   '';
 
   passthru.updateScript = writeScript "update.sh" ''
     #!${stdenv.shell}
     set -o errexit
-    PATH=${
-      lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ]
-    }
+    PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused nix ]}
     oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
-    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags https://github.com/coursier/coursier.git 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
     if [ "$oldVersion" != "$latestTag" ]; then
       nixpkgs="$(git rev-parse --show-toplevel)"
       default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix"
       update-source-version ${pname} "$latestTag" --version-key=version --print-changes
-      url="${builtins.head zshCompletion.urls}"
-      completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g")
-      completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)"
-      sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix"
-      nixfmt "$default_nix"
     else
       echo "${pname} is already up-to-date"
     fi
@@ -57,8 +35,7 @@ in stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://get-coursier.io/";
-    description =
-      "A Scala library to fetch dependencies from Maven / Ivy repositories";
+    description = "Scala library to fetch dependencies from Maven / Ivy repositories";
     license = licenses.asl20;
     maintainers = with maintainers; [ adelbertc nequissimus ];
   };

From 5907b939fb25847873f2530eee15124ae45c692b Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 13 Mar 2023 17:45:13 -0400
Subject: [PATCH 203/247] python311Packages.debugpy: disable 3.11 build until
 supported

---
 pkgs/development/python-modules/debugpy/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 236a4982f67e..69097a585be6 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , pythonOlder
+, pythonAtLeast
 , fetchFromGitHub
 , fetchpatch
 , substituteAll
@@ -22,7 +23,9 @@ buildPythonPackage rec {
   version = "1.6.6";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  # Currently doesn't support 3.11:
+  # https://github.com/microsoft/debugpy/issues/1107
+  disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
 
   src = fetchFromGitHub {
     owner = "microsoft";

From 20842ac039563e221d5ad05461ce1858ca50cb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 21 Mar 2023 01:51:00 +0100
Subject: [PATCH 204/247] nixos/gitea: disable updater by default

---
 nixos/modules/services/misc/gitea.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 014c5b16097c..e019e431a189 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -365,6 +365,8 @@ in
     ];
 
     services.gitea.settings = {
+      "cron.update_checker".ENABLED = lib.mkDefault false;
+
       database = mkMerge [
         {
           DB_TYPE = cfg.database.type;

From c685b5a98915360742c9c1398affd9538455eace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Thu, 23 Mar 2023 14:58:36 +0100
Subject: [PATCH 205/247] dvc: mark broken due to none existing dependency

---
 pkgs/applications/version-management/dvc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index d83cf81e73de..47cd6eb099c6 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -98,5 +98,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://dvc.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ cmcdragonkai fab ];
+    broken = true; # requires new python package: dvc-studio-client
   };
 }

From db4683a0d2438eac0bc1301e05e21619b3416977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 13:04:00 +0000
Subject: [PATCH 206/247] mimir: 2.6.0 -> 2.7.1

---
 pkgs/servers/monitoring/mimir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix
index 9858cdd818e5..f151d31d5959 100644
--- a/pkgs/servers/monitoring/mimir/default.nix
+++ b/pkgs/servers/monitoring/mimir/default.nix
@@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
 buildGoModule rec {
   pname = "mimir";
-  version = "2.6.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     rev = "${pname}-${version}";
     owner = "grafana";
     repo = pname;
-    sha256 = "sha256-MOuLXtjmk9wjQMF2ez3NQ7YTKJtX/RItKbgfaANXzhU=";
+    sha256 = "sha256-5rj7qTomHiplCMcAsKCquH5Z94Syk43Ggoq+Mo1heQA=";
   };
 
   vendorSha256 = null;

From 2a7e1e022894a320c433047e8424fe0f1a05a9a1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:27:49 +0200
Subject: [PATCH 207/247] stdenv: fix error with patterned platforms

---
 pkgs/stdenv/generic/check-meta.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 178367f6061d..4c218b24d11d 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -113,6 +113,7 @@ let
 
   showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (lib.lists.toList value));
   showLicense = showLicenseOrSourceType;
+  showPlatforms = value: lib.optionalString (builtins.isList value && builtins.all builtins.isString value) (toString value);
   showSourceType = showLicenseOrSourceType;
 
   pos_str = meta: meta.position or "«unknown-file»";
@@ -368,7 +369,7 @@ let
     else if !allowBroken && attrs.meta.broken or false then
       { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }
     else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
-      { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${toString attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
+      { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }
 

From 8926c5a2feb813d816567613f183a2f63abfa01b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 13 Nov 2022 03:36:43 +0100
Subject: [PATCH 208/247] libsegfault: init unstable-2022-11-13

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

diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix
new file mode 100644
index 000000000000..e3a27c212847
--- /dev/null
+++ b/pkgs/development/libraries/libsegfault/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, meson
+, ninja
+, boost
+, libbacktrace
+, unstableGitUpdater
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libsegfault";
+  version = "unstable-2022-11-13";
+
+  src = fetchFromGitHub {
+    owner = "jonathanpoelen";
+    repo = "libsegfault";
+    rev = "8bca5964613695bf829c96f7a3a14dbd8304fe1f";
+    sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    boost
+    libbacktrace
+  ];
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = with lib; {
+    description = "Implementation of libSegFault.so with Boost.stracktrace";
+    homepage = "https://github.com/jonathanpoelen/libsegfault";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a630cad3ba0..4b8f49e83eca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21394,6 +21394,8 @@ with pkgs;
 
   libsecret = callPackage ../development/libraries/libsecret { };
 
+  libsegfault = callPackage ../development/libraries/libsegfault { };
+
   libserdes = callPackage ../development/libraries/libserdes { };
 
   libserialport = callPackage ../development/libraries/libserialport { };

From 1352481e8eba83675cec9287b08c3c8d422b88e6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:52:18 +0200
Subject: [PATCH 209/247] wayland: use epoll-shim on unix platforms

---
 pkgs/development/libraries/wayland/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 20b809560e89..0e01e571254c 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -11,6 +11,7 @@
 , withLibraries ? stdenv.isLinux
 , withTests ? stdenv.isLinux
 , libffi
+, epoll-shim
 , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
 , graphviz-nox
 , doxygen
@@ -82,6 +83,8 @@ stdenv.mkDerivation rec {
     libxml2
   ] ++ lib.optionals withLibraries [
     libffi
+  ] ++ lib.optionals (withLibraries && !stdenv.hostPlatform.isLinux) [
+    epoll-shim
   ] ++ lib.optionals withDocumentation [
     docbook_xsl
     docbook_xml_dtd_45

From a29c4b0bf543f64a87688732c66c24f49412ed8c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 14:10:44 +0100
Subject: [PATCH 210/247] ocamlPackages.bls12-381: use Dune 3

---
 .../development/ocaml-modules/bls12-381-signature/default.nix | 2 ++
 pkgs/development/ocaml-modules/bls12-381/default.nix          | 1 +
 pkgs/development/ocaml-modules/bls12-381/gen.nix              | 2 +-
 pkgs/development/ocaml-modules/bls12-381/legacy.nix           | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
index db0a383f925e..e7ca964750e0 100644
--- a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
+++ b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
@@ -16,6 +16,8 @@ buildDunePackage rec {
     sha256 = "sha256-KaUpAT+BWxmUP5obi4loR9vVUeQmz3p3zG3CBolUuL4=";
   };
 
+  duneVersion = "3";
+
   minimalOCamlVersion = "4.08";
 
   propagatedBuildInputs = [ bls12-381 ];
diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix
index 6c1ff541c5f9..8330ce3e2bc3 100644
--- a/pkgs/development/ocaml-modules/bls12-381/default.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/default.nix
@@ -14,6 +14,7 @@ buildDunePackage rec {
   };
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   propagatedBuildInputs = [
     ff-sig
diff --git a/pkgs/development/ocaml-modules/bls12-381/gen.nix b/pkgs/development/ocaml-modules/bls12-381/gen.nix
index 7949fe20438a..2eaf616a77b1 100644
--- a/pkgs/development/ocaml-modules/bls12-381/gen.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/gen.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
     sha256 = "qocIfQdv9rniOUykRulu2zWsqkzT0OrsGczgVKALRuk=";
   };
 
-  useDune2 = true;
+  duneVersion = "3";
 
   minimalOCamlVersion = "4.08";
 
diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix
index c72157c677e7..596001da06ae 100644
--- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/legacy.nix
@@ -13,7 +13,9 @@
 buildDunePackage rec {
   pname = "bls12-381-legacy";
 
-  inherit (bls12-381-gen) version src useDune2 doCheck;
+  inherit (bls12-381-gen) version src doCheck;
+
+  duneVersion = "3";
 
   minimalOCamlVersion = "4.08";
 

From cc766b2e44f90e1fb6338d82832e6de80a04ae50 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2023 14:10:51 +0100
Subject: [PATCH 211/247] =?UTF-8?q?ocamlPackages.hex:=201.4.0=20=E2=86=92?=
 =?UTF-8?q?=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/hex/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 4a6123ebd3a6..42c1b5d5c13b 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,19 +1,18 @@
-{ lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }:
+{ lib, fetchurl, buildDunePackage, cstruct }:
 
 buildDunePackage rec {
   pname = "hex";
-  version = "1.4.0";
+  version = "1.5.0";
 
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.02";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-v${version}.tbz";
-    sha256 = "07b9y0lmnflsslkrm6xilkj40n8sf2hjqkyqghnk7sw5l0plkqsp";
+    url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-${version}.tbz";
+    hash = "sha256-LmfuyhsDBJMHowgxtc1pS8stPn8qa0+1l/vbZHNRtNw=";
   };
 
-  propagatedBuildInputs = [ bigarray-compat cstruct ];
+  propagatedBuildInputs = [ cstruct ];
   doCheck = true;
 
   meta = {

From fc8420f3793e9b43f0906a35d7aea87e33f23653 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 17:18:00 +0100
Subject: [PATCH 212/247] ocamlPackages.shared-memory-ring: use Dune 3

---
 .../ocaml-modules/shared-memory-ring/default.nix       | 10 +++++-----
 .../ocaml-modules/shared-memory-ring/lwt.nix           |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
index 0b4974f910c9..17dee792007b 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
@@ -2,19 +2,20 @@
 , buildDunePackage
 , fetchurl
 , ppx_cstruct
-, mirage-profile
 , cstruct
+, lwt
 , ounit
-, stdlib-shims
 }:
 
 buildDunePackage rec {
   pname = "shared-memory-ring";
   version = "3.1.1";
 
+  duneVersion = "3";
+
   src = fetchurl {
     url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz";
-    sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
+    hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
   };
 
   buildInputs = [
@@ -22,13 +23,12 @@ buildDunePackage rec {
   ];
 
   propagatedBuildInputs = [
-    mirage-profile
     cstruct
-    stdlib-shims
   ];
 
   doCheck = true;
   checkInputs = [
+    lwt
     ounit
   ];
 
diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
index e3ae1ef2e3dc..dc34be8ed746 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
@@ -14,6 +14,8 @@ buildDunePackage {
 
   inherit (shared-memory-ring) version src;
 
+  duneVersion = "3";
+
   buildInputs = [
     ppx_cstruct
   ];

From 580bb886228f454ffaec89025cba75d284445649 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 17:18:05 +0100
Subject: [PATCH 213/247] =?UTF-8?q?ocamlPackages.mirage-logs:=201.2.0=20?=
 =?UTF-8?q?=E2=86=92=201.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/mirage-logs/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix
index 7aabd51b819a..e54a8bc1b3e2 100644
--- a/pkgs/development/ocaml-modules/mirage-logs/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, logs, lwt, mirage-clock, mirage-profile, ptime
-, alcotest, stdlib-shims
+, logs, lwt, mirage-clock, ptime
+, alcotest
 }:
 
 buildDunePackage rec {
   pname = "mirage-logs";
-  version = "1.2.0";
+  version = "1.3.0";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz";
-    sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
+    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz";
+    hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA=";
   };
 
-  propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];
+  propagatedBuildInputs = [ logs lwt mirage-clock ptime ];
 
   doCheck = true;
   checkInputs = [ alcotest ];

From fa448b51e0034926d70ea13dd7fcb9c25b3a1aab Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 17:18:08 +0100
Subject: [PATCH 214/247] ocamlPackages.mirage-profile: use Dune 3

---
 pkgs/development/ocaml-modules/mirage-profile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix
index ef856e021273..2aba97944e17 100644
--- a/pkgs/development/ocaml-modules/mirage-profile/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@@ -7,7 +7,7 @@ buildDunePackage rec {
   pname = "mirage-profile";
   version = "0.9.1";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz";

From 76786cd4fc7b52d842d2d3813163167867eca0f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 09:22:58 -0700
Subject: [PATCH 215/247] gitlab-runner: 15.9.1 -> 15.10.0 (#222532)

---
 .../tools/continuous-integration/gitlab-runner/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 6dad681809da..f4c651a8e855 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
 
 let
-  version = "15.9.1";
+  version = "15.10.0";
 in
 buildGoModule rec {
   inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
   # For patchShebangs
   buildInputs = [ bash ];
 
-  vendorHash = "sha256-3PtbUVIRCyBBqbfbntOUHBd9p+DWMQt4w+C8enqNiAA=";
+  vendorHash = "sha256-ASmhcaywnVb62lPZk1+0hHme7IgXylnk8DryhCjQ6dc=";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "sha256-J8wcTU2bilhEKwOAVgaJk743b66TLndYOxc1k+S/cBg=";
+    sha256 = "sha256-HwG23eqTPQFvziRKhbMdl5O4OlrC9lgha92J2hzRRS8=";
   };
 
   patches = [

From 669846d0f16dda31a93cfdf7358e1c08b3453e58 Mon Sep 17 00:00:00 2001
From: Aroun <zahrun@murena.io>
Date: Thu, 23 Mar 2023 22:00:53 +0530
Subject: [PATCH 216/247] freefilesync: add wrapGAppsHook

---
 pkgs/applications/networking/freefilesync/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix
index b7e7ab298655..4d1310335ecc 100644
--- a/pkgs/applications/networking/freefilesync/default.nix
+++ b/pkgs/applications/networking/freefilesync/default.nix
@@ -10,6 +10,7 @@
 , openssl
 , wxGTK32
 , gitUpdater
+, wrapGAppsHook
 }:
 
 gcc12Stdenv.mkDerivation rec {
@@ -45,6 +46,7 @@ gcc12Stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    wrapGAppsHook
     pkg-config
   ];
 

From ee4ed757274fe821392eb66ad5f2d2022ffa966c Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-devel@meterriblecrew.net>
Date: Thu, 23 Mar 2023 16:47:52 +0100
Subject: [PATCH 217/247] groff: Fix ghostscript and html output, add X11
 support

---
 pkgs/tools/text/groff/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index f6adca208fcf..ae250f2efeea 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, fetchpatch, perl
-, enableGhostscript ? false, ghostscript # for postscript and html output
+, enableGhostscript ? false
+, ghostscript, gawk, libX11, libXaw, libXt, libXmu # for postscript and html output
 , enableHtml ? false, psutils, netpbm # for html output
 , enableIconv ? false, iconv
 , enableLibuchardet ? false, libuchardet # for detecting input file encoding in preconv(1)
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
 
   # Parallel build is failing for missing depends. Known upstream as:
   #   https://savannah.gnu.org/bugs/?62084
+  #   fixed, planned release: 1.23.0
   enableParallelBuilding = false;
 
   patches = [
@@ -47,10 +49,15 @@ stdenv.mkDerivation rec {
       --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
       --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
       --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
-    substituteInPlace tmac/www.tmac \
+    substituteInPlace tmac/www.tmac.in \
       --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
       --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
       --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
+    substituteInPlace contrib/groffer/roff2.pl \
+      --replace "'gs'" "'${lib.getBin ghostscript}/bin/gs'"
+    substituteInPlace contrib/pdfmark/pdfroff.sh \
+      --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \
+      --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk"
   '';
 
   strictDeps = true;
@@ -58,7 +65,7 @@ stdenv.mkDerivation rec {
     # Required due to the patch that changes .ypp files.
     ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison;
   buildInputs = [ perl bash ]
-    ++ lib.optionals enableGhostscript [ ghostscript ]
+    ++ lib.optionals enableGhostscript [ ghostscript gawk libX11 libXaw libXt libXmu ]
     ++ lib.optionals enableHtml [ psutils netpbm ]
     ++ lib.optionals enableIconv [ iconv ]
     ++ lib.optionals enableLibuchardet [ libuchardet ];
@@ -66,13 +73,14 @@ stdenv.mkDerivation rec {
   # Builds running without a chroot environment may detect the presence
   # of /usr/X11 in the host system, leading to an impure build of the
   # package. To avoid this issue, X11 support is explicitly disabled.
-  # Note: If we ever want to *enable* X11 support, then we'll probably
-  # have to pass "--with-appresdir", too.
-  configureFlags = [
+  configureFlags = lib.optionals (!enableGhostscript) [
     "--without-x"
+  ] ++ [
     "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
   ] ++ lib.optionals enableGhostscript [
-    "--with-gs=${ghostscript}/bin/gs"
+    "--with-gs=${lib.getBin ghostscript}/bin/gs"
+    "--with-awk=${lib.getBin gawk}/bin/gawk"
+    "--with-appresdir=${placeholder "out"}/lib/X11/app-defaults"
   ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "gl_cv_func_signbit=yes"
   ];

From 19217369841af150089f1b554a771dfba5621b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Mar 2023 15:08:58 -0700
Subject: [PATCH 218/247] corrosion: 0.3.4 -> 0.3.5

Diff: https://github.com/corrosion-rs/corrosion/compare/v0.3.4...v0.3.5

Changelog: https://github.com/corrosion-rs/corrosion/blob/v0.3.5/RELEASES.md
---
 pkgs/development/tools/build-managers/corrosion/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix
index 1f8e04c08082..0907923e6fcd 100644
--- a/pkgs/development/tools/build-managers/corrosion/default.nix
+++ b/pkgs/development/tools/build-managers/corrosion/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "corrosion";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "corrosion-rs";
     repo = "corrosion";
     rev = "v${version}";
-    hash = "sha256-g2kA1FYt6OWb0zb3pSQ46dJMsSZpT6kLYkpIIN3XZbI=";
+    hash = "sha256-r/jrck4RiQynH1+Hx4GyIHpw/Kkr8dHe1+vTHg+fdRs=";
   };
 
   cargoRoot = "generator";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     inherit src;
     sourceRoot = "${src.name}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-088qK9meyqV93ezLlBIjdp1l/n+pv+9afaJGYlXEFQc=";
+    hash = "sha256-d4ep2v1aMQJUiMwwM0QWZo8LQosJoSeVIEx7JXkXHt8=";
   };
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;

From 4bb70cfa285a65042cd19ed3640355581ec852ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Mar 2023 16:53:44 -0700
Subject: [PATCH 219/247] python310Packages.clevercsv: 0.7.5 -> 0.7.6

Diff: https://github.com/alan-turing-institute/CleverCSV/compare/refs/tags/v0.7.5...v0.7.6

Changelog: https://github.com/alan-turing-institute/CleverCSV/blob/v0.7.6/CHANGELOG.md
---
 pkgs/development/python-modules/clevercsv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index 22416afa6ebe..fdd2e1f894c1 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "clevercsv";
-  version = "0.7.5";
+  version = "0.7.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig=";
+    hash = "sha256-mdsznhxTykEGZAFvTRZTCM11fR4tkwfpa95k7udE33c=";
   };
 
   propagatedBuildInputs = [
@@ -64,7 +64,7 @@ buildPythonPackage rec {
       with CSV files.
     '';
     homepage = "https://github.com/alan-turing-institute/CleverCSV";
-    changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/master/CHANGELOG.md";
+    changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

From 6ae1c1641d1d5922262f949235c5da3c70c09f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 22 Mar 2023 18:15:02 -0700
Subject: [PATCH 220/247] python310Packages.ocrmypdf: 14.0.3 -> 14.0.4

Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v14.0.3...v14.0.4

Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v14.0.4/docs/release_notes.rst
---
 pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index cd1aad3d6a37..92d906407ce1 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "14.0.3";
+  version = "14.0.4";
 
   disabled = pythonOlder "3.8";
 
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA=";
+    hash = "sha256-SLWpMkXq5DlmVgDfRAHtYfEUAVpVKgtnJKO2ffyH5cU=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 79afcc7ccebb108713a94ef67f07d1bea798f7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 22 Mar 2023 18:53:10 -0700
Subject: [PATCH 221/247] abcmidi: 2023.02.08 -> 2023.03.15

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index a83c1c81c416..fd153b8f768d 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2023.02.08";
+  version = "2023.03.15";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g=";
+    hash = "sha256-hLKaPfMZ5nmKRREvto2qd07mj88wEWADfFHNC+FZjIE=";
   };
 
   meta = with lib; {

From 92be697638ebc7300fa093a0a00daac314bc056d Mon Sep 17 00:00:00 2001
From: Finn Krein <finn@krein.moe>
Date: Thu, 23 Mar 2023 17:30:11 +0100
Subject: [PATCH 222/247] xwayland: Add support for the X Security extension

Enabling the security extension is needed to properly run  xauth on wayland.
For example `ssh -X` is not going to work properly without this.
---
 pkgs/servers/x11/xorg/xwayland.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index c76295cec83f..a4635177f2ff 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -96,6 +96,7 @@ stdenv.mkDerivation rec {
   ];
   mesonFlags = [
     (lib.mesonBool "xwayland_eglstream" true)
+    (lib.mesonBool "xcsecurity" true)
     (lib.mesonOption "default_font_path" defaultFontPath)
     (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin")
     (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb")

From 7c48c824bd594dcc90bcb22e4246a09ba7bf8117 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 23 Mar 2023 21:35:05 +0300
Subject: [PATCH 223/247] grafanaPlugins.redis-datasource: init at 2.1.1

---
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 .../grafana/plugins/redis-datasource/default.nix    | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index a99a71cffd1c..68a5d6ec1934 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -10,4 +10,5 @@
   grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
   grafana-polystat-panel = callPackage ./grafana-polystat-panel { };
   grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };
+  redis-datasource = callPackage ./redis-datasource { };
 }
diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix
new file mode 100644
index 000000000000..c5b9823d015a
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin rec {
+  pname = "redis-datasource";
+  version = "2.1.1";
+  zipHash = "sha256-Qhdh2UYOq/El08jTheKRa3f971QKeVmMWiA6rnXNUi4=";
+  meta = with lib; {
+    description = "Redis Data Source for Grafana";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ azahi ];
+    platforms = platforms.unix;
+  };
+}

From 6c4f7960cda8f54663bdaf4f6bd37c4696f2b861 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 23 Mar 2023 21:35:34 +0300
Subject: [PATCH 224/247] grafanaPlugins.redis-app: init at 2.2.1

---
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 .../grafana/plugins/redis-app/default.nix           | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index 68a5d6ec1934..fce76761b300 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -10,5 +10,6 @@
   grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
   grafana-polystat-panel = callPackage ./grafana-polystat-panel { };
   grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };
+  redis-app = callPackage ./redis-app { };
   redis-datasource = callPackage ./redis-datasource { };
 }
diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix
new file mode 100644
index 000000000000..f3dedc247bdb
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin rec {
+  pname = "redis-app";
+  version = "2.2.1";
+  zipHash = "sha256-1ZzJaGhlM6CaTecj69aqJ9fqN7wYSsiDCMTRVkZJUb0=";
+  meta = with lib; {
+    description = "Redis Application plugin for Grafana";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ azahi ];
+    platforms = platforms.unix;
+  };
+}

From 8ae67494ca10e5e3e3d099c5a30e4bf537d8754e Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 23 Mar 2023 21:35:55 +0300
Subject: [PATCH 225/247] grafanaPlugins.redis-explorer-app: init at 2.1.1

---
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 .../grafana/plugins/redis-explorer-app/default.nix  | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index fce76761b300..163de4c96025 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -12,4 +12,5 @@
   grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };
   redis-app = callPackage ./redis-app { };
   redis-datasource = callPackage ./redis-datasource { };
+  redis-explorer-app = callPackage ./redis-explorer-app { };
 }
diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix
new file mode 100644
index 000000000000..e58da0bebd83
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin rec {
+  pname = "redis-explorer-app";
+  version = "2.1.1";
+  zipHash = "sha256-t5L9XURNcswDbZWSmehs/JYU7NoEwhX1If7ghbi509g=";
+  meta = with lib; {
+    description = "Redis Explorer plugin for Grafana";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ azahi ];
+    platforms = platforms.unix;
+  };
+}

From 8454084ffca01cfbd190caf94c0adc5626bbbc27 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 23 Mar 2023 12:37:35 +0300
Subject: [PATCH 226/247] nixos/hidpi: remove harder

We can't agree on what the right settings are (see #222236), so let's make the users choose.
---
 .../manual/release-notes/rl-2305.section.md   | 11 +++----
 nixos/modules/config/fonts/fontconfig.nix     |  4 +++
 nixos/modules/config/fonts/fonts.nix          | 29 +------------------
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index deeda73d2fb5..6178b96698d2 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -179,6 +179,12 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
 
+- The catch-all `hardware.video.hidpi.enable` option was removed. Users on high density displays may want to:
+
+  - Set `services.xserver.upscaleDefaultCursor` to upscale the default X11 cursor for higher resolutions
+  - Adjust settings under `fonts.fontconfig` according to preference
+  - Adjust `console.font` according to preference, though the kernel will generally choose a reasonably sized font
+
 - The `baget` package and module was removed due to being unmaintained.
 
 ## Other Notable Changes {#sec-release-23.05-notable-changes}
@@ -258,11 +264,6 @@ In addition to numerous new and upgraded packages, this release has the followin
     [headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
     can be directly written as attribute-set in Nix within this option.
 
-- The `hardware.video.hidpi.enable` was renamed to `fonts.optimizeForVeryHighDPI` to be consistent with what it actually does.
-  They disable by default: antialiasing, hinting and LCD filter for subpixel rendering. They can be overridden if you experience problems with font rendering.
-  On Xorg, the default cursor is upscaled.
-  Please see the documentation for the new option to decide if you want to keep it enabled.
-
 - `nixos/lib/make-disk-image.nix` can now mutate EFI variables, run user-provided EFI firmware or variable templates. This is now extensively documented in the NixOS manual.
 
 - `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion.
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index f9c6e5be226b..e5b0ec7639e3 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -218,6 +218,8 @@ let
     paths = cfg.confPackages;
     ignoreCollisions = true;
   };
+
+  fontconfigNote = "Consider manually configuring fonts.fontconfig according to personal preference.";
 in
 {
   imports = [
@@ -229,6 +231,8 @@ in
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
+    (mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote)
+    (mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote)
   ] ++ lib.forEach [ "enable" "substitutions" "preset" ]
      (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
        The fonts.fontconfig.ultimate module and configuration is obsolete.
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index efbd554582fc..87cf837e7c80 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -13,13 +13,10 @@ let
       pkgs.unifont
       pkgs.noto-fonts-emoji
     ];
-
 in
-
 {
   imports = [
     (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
-    (mkRenamedOptionModule [ "hardware" "video" "hidpi" "enable" ] [ "fonts" "optimizeForVeryHighDPI" ])
   ];
 
   options = {
@@ -42,33 +39,9 @@ in
           and families and reasonable coverage of Unicode.
         '';
       };
-
-      optimizeForVeryHighDPI = mkOption {
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Optimize configuration for very high-density (>200 DPI) displays:
-            - disable subpixel anti-aliasing
-            - disable hinting
-            - automatically upscale the default X11 cursor
-        '';
-      };
     };
 
   };
 
-  config = mkMerge [
-    { fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; }
-    (mkIf cfg.optimizeForVeryHighDPI {
-      services.xserver.upscaleDefaultCursor = mkDefault true;
-      # Conforms to the recommendation in fonts/fontconfig.nix
-      # for > 200DPI.
-      fonts.fontconfig = {
-        antialias = mkDefault false;
-        hinting.enable = mkDefault false;
-        subpixel.lcdfilter = mkDefault "none";
-      };
-    })
-  ];
-
+  config = { fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; };
 }

From 4b77b5e37525ebaf11526583c8a16aaf783db523 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 23 Mar 2023 19:51:27 +0100
Subject: [PATCH 227/247] ungoogled-chromium: 111.0.5563.65 -> 111.0.5563.111

---
 .../networking/browsers/chromium/upstream-info.json       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index befc5b89fa92..989b178c7f88 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,8 +45,8 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "111.0.5563.65",
-    "sha256": "1wg84pd50zi5268snkiahnp5191c66bqkbvdz2z8azivm95lwqwp",
+    "version": "111.0.5563.111",
+    "sha256": "0r03p8m92fwsi8z1i8qjwllbb68gkspnzwynvmag3jy5kyk4vprv",
     "sha256bin64": null,
     "deps": {
       "gn": {
@@ -56,8 +56,8 @@
         "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
       },
       "ungoogled-patches": {
-        "rev": "111.0.5563.65-1",
-        "sha256": "06mfm2gaz1nbwqhn2jp34pm52rw1q99i9fq7wh19m0qasdpidis9"
+        "rev": "111.0.5563.111-1",
+        "sha256": "1m8kf8af5zjc5mgdccppyfbl6bxlwcnb6rw58q5020a810x7y6f8"
       }
     }
   }

From 8135739538b1a6cc33926b6a39b238156bacdea0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 23 Mar 2023 19:51:27 +0100
Subject: [PATCH 228/247] chromiumBeta: 112.0.5615.29 -> 112.0.5615.39

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index befc5b89fa92..fd5b475ddc3b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "112.0.5615.29",
-    "sha256": "0k9dn1gzfr2j353ppza1nypj0a4b27p9n742cms3z8583da8kw6p",
-    "sha256bin64": "04m77ndsfygpb1g11iyscvfszgykbr5n3s6bh1shnpkpdbvx3dki",
+    "version": "112.0.5615.39",
+    "sha256": "12q4wxlgcqqflsxvcbx00228l1hjzb940ichywhiwmndxjjdvrgg",
+    "sha256bin64": "0b5c02wlmywhkxgdlnwys1djknicvqxcichxgazgpxbjmr8mmzwv",
     "deps": {
       "gn": {
         "version": "2023-02-17",

From 3eba6e019d56bdc453611bf54926a43b95b0a1d4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:02:34 +0200
Subject: [PATCH 229/247] pick-colour-picker: drop preDistPhases

---
 .../graphics/pick-colour-picker/default.nix       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix
index 774a8b19dd34..137a858820ac 100644
--- a/pkgs/applications/graphics/pick-colour-picker/default.nix
+++ b/pkgs/applications/graphics/pick-colour-picker/default.nix
@@ -22,6 +22,11 @@ buildPythonPackage rec {
     fetchSubmodules = false;
   };
 
+  postPatch = ''
+    sed "s|sys\.prefix|'\.'|g" -i setup.py
+    sed "s|os.environ.get('SNAP'), \"usr\"|'$out'|g" -i pick/__main__.py
+  '';
+
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook
@@ -37,16 +42,6 @@ buildPythonPackage rec {
     gtk3
   ];
 
-  preDistPhases = [ "fixupIconPath" ];
-
-  fixupIconPath = ''
-    pickLoc="$out/${python.sitePackages}/pick"
-    shareLoc=$(echo "$out/${python.sitePackages}/nix/store/"*)
-    mv "$shareLoc/share" "$out/share"
-
-    sed "s|os.environ.get('SNAP'), \"usr\"|'$out'|g" -i "$pickLoc/__main__.py"
-    '';
-
   meta = with lib; {
     homepage = "https://kryogenix.org/code/pick/";
     license = licenses.mit;

From c9a74cf40f72c5fbcfc5be04c50fd96e9154a5b3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 23 Mar 2023 21:56:41 +0300
Subject: [PATCH 230/247] nixos/fontconfig: time capsule

---
 nixos/modules/config/fonts/fontconfig.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index e5b0ec7639e3..5781679241ef 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -7,6 +7,19 @@ This module generates a package containing configuration files and link it in /e
 Fontconfig reads files in folder name / file name order, so the number prepended to the configuration file name decide the order of parsing.
 Low number means high priority.
 
+NOTE: Please take extreme care when adjusting the default settings of this module.
+People care a lot, and I mean A LOT, about their font rendering, and you will be
+The Person That Broke It if it changes in a way people don't like.
+
+See prior art:
+- https://github.com/NixOS/nixpkgs/pull/194594
+- https://github.com/NixOS/nixpkgs/pull/222236
+- https://github.com/NixOS/nixpkgs/pull/222689
+
+And do not repeat our mistakes.
+
+- @K900, March 2023
+
 */
 
 { config, pkgs, lib, ... }:

From 65041d46953f32f92c08fd07f859b27b22bb9b23 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Thu, 23 Mar 2023 00:13:06 +0100
Subject: [PATCH 231/247] vscode-extensions.vscjava.vscode-gradle: init at
 3.12.2023032100

---
 .../editors/vscode/extensions/default.nix      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ce9a7660b181..bcfb9c032e38 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2953,6 +2953,24 @@ let
         };
       };
 
+      vscjava.vscode-gradle = buildVscodeMarketplaceExtension rec {
+        mktplcRef = {
+          name = "vscode-gradle";
+          publisher = "vscjava";
+          version = "3.12.6";
+          sha256 = "sha256-j4JyhNGsRlJmS8Wj38gLpC1gXVvdPx10cgzP8dXmmNo=";
+        };
+
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/vscjava.vscode-gradle/changelog";
+          description = "A Visual Studio Code extension for Gradle build tool";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-gradle";
+          homepage = "https://github.com/microsoft/vscode-gradle";
+          license = lib.licenses.mit;
+          maintainers = with lib.maintainers; [ rhoriguchi ];
+        };
+      };
+
       vscjava.vscode-java-debug = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-java-debug";

From bc17a9670efed9c27b1981f52021bf92f53e84f8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 23 Mar 2023 22:16:36 +0300
Subject: [PATCH 232/247] bootil: fix eval

---
 pkgs/development/libraries/bootil/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index a2045e381436..dab559afdace 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation {
     license = licenses.free;
     maintainers = with maintainers; [ abigailbuccaneer ];
     # Build uses `-msse` and `-mfpmath=sse`
+    platforms = platforms.all;
     badPlatforms = [ "aarch64-linux" ];
   };
 }

From 19ce5c743ce0f3ccca24d3079ba83b16004b8d89 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:42:24 +0200
Subject: [PATCH 233/247] sope: make build less illegal

---
 pkgs/development/libraries/sope/default.nix | 44 +++++++++++++++------
 pkgs/servers/web-apps/sogo/default.nix      |  2 -
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix
index 1a6a9770362e..0b61047377f3 100644
--- a/pkgs/development/libraries/sope/default.nix
+++ b/pkgs/development/libraries/sope/default.nix
@@ -1,4 +1,4 @@
-{ gnustep, lib, fetchFromGitHub , libxml2, openssl
+{ gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl
 , openldap, mariadb, libmysqlclient, postgresql }:
 
 gnustep.stdenv.mkDerivation rec {
@@ -12,20 +12,36 @@ gnustep.stdenv.mkDerivation rec {
     hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "sope-no-unnecessary-vars.patch";
+      url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch";
+      hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk=";
+    })
+    (fetchpatch {
+      name = "sope-fix-wformat.patch";
+      url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch";
+      hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98=";
+    })
+  ];
+
   hardeningDisable = [ "format" ];
   nativeBuildInputs = [ gnustep.make ];
-  buildInputs = lib.flatten ([ gnustep.base libxml2 openssl ]
+  buildInputs = [ gnustep.base libxml2 openssl ]
     ++ lib.optional (openldap != null) openldap
     ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]
-    ++ lib.optional (postgresql != null) postgresql);
-
-  postPatch = ''
-    # Exclude NIX_ variables
-    sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure
-  '';
+    ++ lib.optional (postgresql != null) postgresql;
 
+  # Configure directories where files are installed to. Everything is automatically
+  # put into $out (thanks GNUstep) apart from the makefiles location which is where
+  # makefiles are read from during build but also where the SOPE makefiles are
+  # installed to in the install phase. We move them over after the installation.
   preConfigure = ''
-    export DESTDIR="$out"
+    mkdir -p /build/Makefiles
+    ln -s ${gnustep.make}/share/GNUstep/Makefiles/* /build/Makefiles
+    cat <<EOF > /build/GNUstep.conf
+    GNUSTEP_MAKEFILES=/build/Makefiles
+    EOF
   '';
 
   configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ]
@@ -33,10 +49,12 @@ gnustep.stdenv.mkDerivation rec {
     ++ lib.optional (mariadb != null) "--enable-mysql"
     ++ lib.optional (postgresql != null) "--enable-postgresql";
 
-  # Yes, this is ugly.
-  preFixup = ''
-    cp -rlPa $out/nix/store/*/* $out
-    rm -rf $out/nix/store
+  env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
+
+  # Move over the makefiles (see comment over preConfigure)
+  postInstall = ''
+    mkdir -p $out/share/GNUstep/Makefiles
+    find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \;
   '';
 
   meta = with lib; {
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index 93cb0e1bbbcb..b04a33eb9ee9 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -65,8 +65,6 @@ gnustep.stdenv.mkDerivation rec {
     for bin in $out/bin/*; do
       wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf
     done
-
-    rmdir $out/nix
   '';
 
   passthru.tests.sogo = nixosTests.sogo;

From 6efc090d5c15048c23bcceaab000ef3eef1bd932 Mon Sep 17 00:00:00 2001
From: llathasa-veleth <llathasa@outlook.com>
Date: Thu, 23 Mar 2023 22:56:56 +0300
Subject: [PATCH 234/247] fetch-scm: init at 0.1.5

---
 pkgs/tools/misc/fetch-scm/default.nix | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/fetch-scm/default.nix

diff --git a/pkgs/tools/misc/fetch-scm/default.nix b/pkgs/tools/misc/fetch-scm/default.nix
new file mode 100644
index 000000000000..cd8026c19298
--- /dev/null
+++ b/pkgs/tools/misc/fetch-scm/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, guile }:
+
+stdenv.mkDerivation rec {
+  pname = "fetch-scm";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "KikyTokamuro";
+    repo = "fetch.scm";
+    rev = "v${version}";
+    sha256 = "sha256-H89VCNAYnTwVEqyInATvLHIB7ioe2zvIGTAM2MUo7+g=";
+  };
+
+  dontBuild = true;
+
+  buildInputs = [ guile ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 fetch.scm $out/bin/fetch-scm
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "System information fetcher written in GNU Guile Scheme";
+    homepage = "https://github.com/KikyTokamuro/fetch.scm";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ vel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d8a457f7786..53960556f3ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4715,6 +4715,8 @@ with pkgs;
 
   fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
 
+  fetch-scm = callPackage ../tools/misc/fetch-scm { };
+
   filebench = callPackage ../tools/misc/filebench { };
 
   filebot = callPackage ../applications/video/filebot { };

From 022436c47b71f260bbebc3b2e6eccf427a675cce Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 23 Mar 2023 16:09:47 -0400
Subject: [PATCH 235/247] nixos/logrotate: fix typo

---
 nixos/modules/services/logging/logrotate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index 1799e9282b3b..b056f96c3630 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -187,7 +187,7 @@ in
           A configuration file automatically generated by NixOS.
         '';
         description = lib.mdDoc ''
-          Override the configuration file used by MySQL. By default,
+          Override the configuration file used by logrotate. By default,
           NixOS generates one automatically from [](#opt-services.logrotate.settings).
         '';
         example = literalExpression ''

From e0591b2e56b0010869307b7b836ae7d14e03fa97 Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Thu, 23 Mar 2023 03:49:38 +0100
Subject: [PATCH 236/247] ocamlPackages.cohttp_static_handler: init at 0.15.0

---
 pkgs/development/ocaml-modules/janestreet/0.15.nix | 9 +++++++++
 pkgs/top-level/ocaml-packages.nix                  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix
index 7433c116b68f..bf61ae1d939c 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@@ -254,6 +254,15 @@ with self;
     propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ];
   };
 
+  cohttp_static_handler = janePackage {
+    duneVersion = "3";
+    pname = "cohttp_static_handler";
+    version = "0.15.0";
+    hash = "sha256-ENaH8ChvjeMc9WeNIhkeNBB7YK9vB4lw95o6FFZI1ys=";
+    meta.description = "A library for easily creating a cohttp handler for static files";
+    propagatedBuildInputs = [ cohttp-async ];
+  };
+
   core = janePackage {
     pname = "core";
     version = "0.15.1";
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d1e599d8970f..e6da9aca10cb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -895,6 +895,7 @@ let
 
     magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
 
+
     mariadb = callPackage ../development/ocaml-modules/mariadb {
       inherit (pkgs) mariadb;
     };

From 089467fefb3d6c0a568a379af110de4447c6dc2f Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Thu, 23 Mar 2023 03:50:11 +0100
Subject: [PATCH 237/247] ocamlPackages.owee: 0.4 -> 0.6

---
 pkgs/development/ocaml-modules/owee/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix
index 7b15437a7ed2..3b8e6f58cfb2 100644
--- a/pkgs/development/ocaml-modules/owee/default.nix
+++ b/pkgs/development/ocaml-modules/owee/default.nix
@@ -2,19 +2,20 @@
 
 buildDunePackage rec {
   minimalOCamlVersion = "4.06";
-  useDune2 = true;
+  duneVersion = "2";
   pname = "owee";
-  version = "0.4";
+  version = "0.6";
 
   src = fetchurl {
-    url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz";
-    sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb";
+    url =
+      "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz";
+    sha256 = "sha256-GwXV5t4GYbDiGwyvQyW8NZoYvn4qXlLnjX331Bj1wjM=";
   };
 
-  meta = {
+  meta = with lib; {
     description = "An experimental OCaml library to work with DWARF format";
     homepage = "https://github.com/let-def/owee/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.vbgl ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ vbgl alizter ];
   };
 }

From 1d9610bb9330f12b615d697a5ff063314859fa3b Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Thu, 23 Mar 2023 17:48:54 +0100
Subject: [PATCH 238/247] ocamlPackages.magic-trace: init at 1.1.0

---
 .../ocaml-modules/magic-trace/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/magic-trace/default.nix

diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix
new file mode 100644
index 000000000000..1f1417f67275
--- /dev/null
+++ b/pkgs/development/ocaml-modules/magic-trace/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler
+, core_unix, owee, ppx_jane, shell }:
+
+buildDunePackage rec {
+  pname = "magic-trace";
+  version = "1.1.0";
+
+  minimalOCamlVersion = "4.12";
+  duneVersion = "3";
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = "magic-trace";
+    rev = "v${version}";
+    sha256 = "sha256-615AOkrbQI6vRosA5Kz3Epipe9f9+Gs9+g3bVl5gzBY=";
+  };
+
+  buildInputs = [ async cohttp_static_handler core_unix owee ppx_jane shell ];
+
+  meta = with lib; {
+    description =
+      "Collects and displays high-resolution traces of what a process is doing";
+    license = licenses.mit;
+    maintainers = [ maintainers.alizter ];
+    homepage = "https://github.com/janestreet/magic-trace";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e6da9aca10cb..3f8667af9ae7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -895,6 +895,7 @@ let
 
     magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
 
+    magic-trace = callPackage ../development/ocaml-modules/magic-trace { };
 
     mariadb = callPackage ../development/ocaml-modules/mariadb {
       inherit (pkgs) mariadb;

From d1833117a89aca751b0a12220c933c33e9e74a03 Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Thu, 23 Mar 2023 18:37:20 +0100
Subject: [PATCH 239/247] ocamlPackages.spacetime_lib: patch for compat with
 owee 0.6

---
 .../ocaml-modules/spacetime_lib/default.nix        |  5 +++--
 .../ocaml-modules/spacetime_lib/spacetime.diff     | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff

diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index 442d06e4f698..7e2e4002c1ea 100644
--- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix
+++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
@@ -6,8 +6,7 @@ lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version)
 buildDunePackage rec {
   pname = "spacetime_lib";
   version = "0.3.0";
-
-  useDune2 = true;
+  duneVersion = "2";
 
   src = fetchFromGitHub {
     owner = "lpw25";
@@ -16,6 +15,8 @@ buildDunePackage rec {
     sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p";
   };
 
+  patches = [ ./spacetime.diff ];
+
   propagatedBuildInputs = [ owee ];
 
   preConfigure = ''
diff --git a/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff b/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
new file mode 100644
index 000000000000..baad34ce08b5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff
@@ -0,0 +1,14 @@
+diff --git a/src/elf_locations.ml b/src/elf_locations.ml
+index a08b359..0db9274 100644
+--- a/src/elf_locations.ml
++++ b/src/elf_locations.ml
+@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter =
+     | Some section ->
+       let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in
+       let rec aux () =
+-        match Owee_debug_line.read_chunk body with
++        let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in
++        match Owee_debug_line.read_chunk body ~pointers_to_other_sections with
+         | None -> ()
+         | Some (header, chunk) ->
+           (* CR-soon mshinwell: fix owee .mli to note that [state] is

From 0da7dcb9eab2a3ffaeaaf64fc16c48486e209d4b Mon Sep 17 00:00:00 2001
From: "\"Gaetan Lepage\"" <"gaetan@glepage.com">
Date: Thu, 23 Mar 2023 21:34:43 +0100
Subject: [PATCH 240/247] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 494 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   2 +-
 2 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9172ea07dbdf..e1590a823a4c 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -29,12 +29,12 @@ final: prev:
 
   ChatGPT-nvim = buildVimPluginFrom2Nix {
     pname = "ChatGPT.nvim";
-    version = "2023-03-14";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "jackMort";
       repo = "ChatGPT.nvim";
-      rev = "3008b38171b3137448fe33c5edc1bba2641bfcad";
-      sha256 = "1szk6xjpaacnxifciq1kr92iwx0vvy4yq41wrcqm1yqvsfabiwy2";
+      rev = "8797871b5d11d256834b1c474ca9016dd0137dcb";
+      sha256 = "0ns20hwxcybcp8lj5bh0qdxspj01q85zdln6g1ckc3acwhkrg3z2";
     };
     meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
   };
@@ -173,12 +173,12 @@ final: prev:
 
   LazyVim = buildVimPluginFrom2Nix {
     pname = "LazyVim";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "11d414c35841b35604e98cdc2d05e756da3c9421";
-      sha256 = "0l9hqml1sb92s8gqhd1gqd9sysx0p3hxwwpzbxaf5n3laicwgnnz";
+      rev = "c4572fcec877053df89e7aba3bcd52a0ca5c7df7";
+      sha256 = "0bbzmzkra9dj2a7j9lnss2fdl0h93r7n8cy5dfnlq80ynryfnsc5";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
@@ -365,12 +365,12 @@ final: prev:
 
   SpaceVim = buildVimPluginFrom2Nix {
     pname = "SpaceVim";
-    version = "2023-03-14";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "SpaceVim";
       repo = "SpaceVim";
-      rev = "c4433b123182ef7f0437bf764b8f27649dd9c3a7";
-      sha256 = "14wgvk58f61fdwp7cr2x2vid2n58vwknfa1q3gibrbglf825vd8x";
+      rev = "73a7242daa785fc66a887ab1864dc1c9432d7cbe";
+      sha256 = "09zv4wjnb1gfwq718gavpb5s2cwf7a057h3g8d8gs5x3vrxs6sda";
     };
     meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
   };
@@ -437,12 +437,12 @@ final: prev:
 
   YouCompleteMe = buildVimPluginFrom2Nix {
     pname = "YouCompleteMe";
-    version = "2023-03-09";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "aaebb55b6536d780a684201e9b214c034441c98f";
-      sha256 = "0xi6qp2idl168v0nb91h3pda32m2dd11zdd2bz18vnch4b48rdy5";
+      rev = "9f4d1011ce90f76cb91f8cfc3db63c7557672efa";
+      sha256 = "1ircjhjw0q132y9gih9i8m1q17pg148a5vfbbs8nzhxsbl5l61k5";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -523,12 +523,12 @@ final: prev:
 
   ai-vim = buildVimPluginFrom2Nix {
     pname = "ai.vim";
-    version = "2023-03-14";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "aduros";
       repo = "ai.vim";
-      rev = "bf90f0978882022f9efb014ee2583e4350ac82d1";
-      sha256 = "0441h9in8rvx6slv9gr786k01fgq8scpkkw9z7nc6pah6lm5xhaf";
+      rev = "03e5f7ee4a34208148e3d51521dfcf9c674e82f9";
+      sha256 = "1p1a28z5whk6srxnn5xlcrn9zxijj43hlrn4m6v2s6n1nj7az73y";
     };
     meta.homepage = "https://github.com/aduros/ai.vim/";
   };
@@ -571,12 +571,12 @@ final: prev:
 
   alpha-nvim = buildVimPluginFrom2Nix {
     pname = "alpha-nvim";
-    version = "2023-03-13";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "goolord";
       repo = "alpha-nvim";
-      rev = "3847d6baf74da61e57a13e071d8ca185f104dc96";
-      sha256 = "04bg8as2yrrv0yzwi0ppvj3xpfp1jbcf1cfcml1w8h7wg0cqkb2p";
+      rev = "dafa11a6218c2296df044e00f88d9187222ba6b0";
+      sha256 = "0qsm73hjdg82xvd1pdi30splm2031n4s9wk1llmh0pllwz97zllc";
     };
     meta.homepage = "https://github.com/goolord/alpha-nvim/";
   };
@@ -715,12 +715,12 @@ final: prev:
 
   aurora = buildVimPluginFrom2Nix {
     pname = "aurora";
-    version = "2023-03-12";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "560fb5aa401bee5f2ee86084f338f300ff57aede";
-      sha256 = "1avznnh7z48nshxab7d3rlkcjqanwx9x95rxpzbg4vcn3fp1szb6";
+      rev = "7a3ea3e6747ddd1acbe898e0b4193213aba36b86";
+      sha256 = "00piglfjix84bldyvqgcxrb1nvcgaajc5015g2svkbr0rn1zcyql";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -1075,12 +1075,12 @@ final: prev:
 
   ccc-nvim = buildVimPluginFrom2Nix {
     pname = "ccc.nvim";
-    version = "2023-03-19";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "uga-rosa";
       repo = "ccc.nvim";
-      rev = "100dfb923e12051c95ec10c2cb41cd29104505a6";
-      sha256 = "1923dn9pmg0qy0a6vmgplq350a7x1nqljyz25vdwhmwvmiy6643y";
+      rev = "3d2020703c10385970032acda4f2efe0679458d1";
+      sha256 = "09iakiv13q3gmyn21az5zz1jf34iw3n5hs2nr7zih956irkj2w03";
     };
     meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
   };
@@ -1123,12 +1123,12 @@ final: prev:
 
   circles-nvim = buildVimPluginFrom2Nix {
     pname = "circles.nvim";
-    version = "2023-03-17";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "projekt0n";
       repo = "circles.nvim";
-      rev = "50c5d9a1d7427d10e67b1b0ef60682ad28da49e2";
-      sha256 = "1c9v54xkcpx4ng3p5379s1wqwj4zz3rcfsvcakzmh5y9hc4xzgnp";
+      rev = "1e54101b36457baf33555380f1dac56db5d17e62";
+      sha256 = "1vvd0c9mjiqpgd63b5vkkmnbg8a00yw8k02mk410r5hlzx1c3axx";
     };
     meta.homepage = "https://github.com/projekt0n/circles.nvim/";
   };
@@ -1615,12 +1615,12 @@ final: prev:
 
   cmp-tabnine = buildVimPluginFrom2Nix {
     pname = "cmp-tabnine";
-    version = "2023-02-23";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-tabnine";
-      rev = "a6cb553143573861d2d98da86ceb3074c87fc536";
-      sha256 = "1w2g2zdhdw15mmy3pigx059kvfhr192w92yxpfqnsqf80dhvf56s";
+      rev = "4c8a0db92e75c848fb066edd280072389db80d24";
+      sha256 = "19ypgjd3hfiw3qvjzx543x9i3pk09qj0wr89w2rbngsj4sypfm4h";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
   };
@@ -1963,12 +1963,12 @@ final: prev:
 
   compiler-explorer-nvim = buildVimPluginFrom2Nix {
     pname = "compiler-explorer.nvim";
-    version = "2023-03-07";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "krady21";
       repo = "compiler-explorer.nvim";
-      rev = "0e1c954923915e45bbd0806b65d9171a0384546b";
-      sha256 = "0ag6p4k3fgwz7lzd3n8nwbnfi2nrcqandlsambcmzhgma4zi59j4";
+      rev = "ddb8a72022139be35d02c747d5d009172c9d64ca";
+      sha256 = "0z9ngh66g02ssxgh0403h9w1j9zmpamvap0lmy7gacy20w471g1i";
     };
     meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
   };
@@ -2299,12 +2299,12 @@ final: prev:
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2023-03-16";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "6e0a35343fc37a2a2ca5ab1734d60fcc06c4cf01";
-      sha256 = "14av4336k72djlc0wnaaj3j53brczmhf4iwib6ywzka1rjhkyp2r";
+      rev = "cf924ac83fa218d30faf9fb47ac0b628b2706276";
+      sha256 = "0lc876mwazx33vy4aq98k6gcrblc3kndg530gmc1lj89hlldsgvb";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -2395,12 +2395,12 @@ final: prev:
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol.nvim";
-    version = "2023-03-09";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "50a9e70da17020af11562d6eb07b310f106c4ecf";
-      sha256 = "085amk2agpal2y3hd10m7wwbyhcqbqya1frvcfk0ghlxmiq0ak3s";
+      rev = "99644305ccaa49feacc1c44f6e579ba49da8d72f";
+      sha256 = "06473gh7jb9y2xyhsd4x75h0imkylxxcgbxjv4sigdbcg0gk6qm9";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -2769,24 +2769,24 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2023-02-27";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "bc581eccc5a5f7f2cebbe48df23080f2178f32bc";
-      sha256 = "09p4p4a5mvy5n3an4rfb8hzm9bc76jgsjg5hmravl1faz176h8vp";
+      rev = "2da3ba0d8b45a722db9d8e868a90dc0a9e28efec";
+      sha256 = "1d3fljmw3nzv2ni2qsxd33z758bzraha0ykdngf9ck7jxjs19y5m";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
-    version = "2023-03-17";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "0ba62c40b9718c3c72672547f60cf17979e69e68";
-      sha256 = "1z71m74h6z7v7jjl4fdannh36s6bvj6z9q5pyyijm1xmc5nygllj";
+      rev = "7f4e4dfc58c480d154116614e616d90aac77204d";
+      sha256 = "19n774gw5dwvyvr78hin4ry1k40af3gnbgxq5fsbsl76hyxz9jms";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -2855,12 +2855,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2023-03-02";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "164a44fe8655ff66073189bf6b0a718bfaffa0c0";
-      sha256 = "19n2sa0frq62qppfp0j82vqp83pf44sv5lzk2avrv0clc55ncggl";
+      rev = "2bb00fed357891e37a2f1313cd77e008ad353006";
+      sha256 = "0nq91h3941rzk5bclizfqbklfvx3ikhr9nlf2zgg8cwrkfv4779l";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -2891,12 +2891,12 @@ final: prev:
 
   fastfold = buildVimPluginFrom2Nix {
     pname = "fastfold";
-    version = "2023-03-16";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "6c54411f97bc408ab81294375c8f551775a2da8b";
-      sha256 = "0bdzj559v5plg6yf4v403867wrjr2mnlfdsc4h3y5kvpym1n0yb2";
+      rev = "ab3d199d288a51708c3181a25aba1f9de2050b89";
+      sha256 = "1fw00kwpc1jnh2py4xb8wcxq4vsd4b4qri1xpx7bvc81k0zgzwyk";
     };
     meta.homepage = "https://github.com/konfekt/fastfold/";
   };
@@ -3012,12 +3012,12 @@ final: prev:
 
   flatten-nvim = buildVimPluginFrom2Nix {
     pname = "flatten.nvim";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "flatten.nvim";
-      rev = "6a11200f7cda8490577438b26f724a80d41f7460";
-      sha256 = "1jxxls2f0321hxcxlysf8b2bj7r4ykwws1xs7q1d6anqb5sn8g57";
+      rev = "a5e0679035a154b2c3eab376c5e51141e07c6910";
+      sha256 = "05q4hyd9dgs6937pc2knwhk6419420ivcrjj4937zfrs6dcc7z9q";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
   };
@@ -3228,12 +3228,12 @@ final: prev:
 
   fzf-lua = buildVimPluginFrom2Nix {
     pname = "fzf-lua";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "941cebb1d5bc8fa05364cb524bad5c7f080ec513";
-      sha256 = "05hwzy00rh6afcmypzxjq075iszladmi2wd77vcb0j0h7wyj3k0v";
+      rev = "79a74aebab4cd5fca460c61dc47e5e1d7a54b01e";
+      sha256 = "077ckb2lwg5lfjvin7rf76qmik0vy0f2aczkp789wl8yrn6isca6";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -3384,12 +3384,12 @@ final: prev:
 
   gitsigns-nvim = buildNeovimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2023-03-06";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "b1f9cf7c5c5639c006c937fc1819e09f358210fc";
-      sha256 = "0069gpcvh96c2a29i9ymidsifxhjqxmm4vx1m7c5frrxxrsba5li";
+      rev = "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb";
+      sha256 = "0vczni4xa71anp948fs3lbcw9yniypbirp668j0yiminlkfi7j1i";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -3444,12 +3444,12 @@ final: prev:
 
   go-nvim = buildVimPluginFrom2Nix {
     pname = "go.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "933ff9f0d84975122ec62ef98f78511db5c313c1";
-      sha256 = "02pr6c8ljv34xd9h6y01i71l8nrapspyg1dm8vcybl5jjq85xrmv";
+      rev = "c02634a8350d559eeed94f78c67016fa6d80a8bf";
+      sha256 = "1bsc6zfrqxws2cqvf385wjjdhmxm2q15fg4hxf0hpkn9s6ipnkyy";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
   };
@@ -3564,24 +3564,24 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2023-03-12";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "4a6582f4137f4f303eb7d54ee31403ac0b675774";
-      sha256 = "11n7hhwcjq5g583q6qq81ixhh3nprwbcgkz4r70p0sb9r6f0m1wj";
+      rev = "984d4bb876cccfeada376e86ba5babae59da1cce";
+      sha256 = "0xmlndmrwzcizqyhis0qkg7hb78f0jk3bm8ay7az4nvikjz94mri";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
 
   gruvbox-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox.nvim";
-    version = "2023-03-19";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "035f8a35d7e08833e75720feeff11f3461c80903";
-      sha256 = "0x4vi836nwz1jvnl940di98d1yfjsblgdw1iij1fa6njy8i1hz9f";
+      rev = "488acf89979463d3ab77f8a5d35a11a2c809ac19";
+      sha256 = "0m65ixwniz9vcnl8wz9gxqwdcf737m2jd4k3pgm7aphk7ks6b45m";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
   };
@@ -3647,12 +3647,12 @@ final: prev:
 
   haskell-tools-nvim = buildNeovimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-03-19";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "e709e1f82c1b8e8cc16e39e7350a0b7820cd79fe";
-      sha256 = "0gpvv5q3kndcglwkrpfys5zpz3l9r882fn84g971s6q9ainp3fdv";
+      rev = "580587aac975b93d9d908f48f7c1df56fdef1c2d";
+      sha256 = "1x8fy7ph6nbz84masqv5q5l61yq2w9hik6l90m35ig2r1jhkp2fx";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -3695,12 +3695,12 @@ final: prev:
 
   heirline-nvim = buildVimPluginFrom2Nix {
     pname = "heirline.nvim";
-    version = "2023-03-19";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "heirline.nvim";
-      rev = "2666c2514354c61c14d4142ee7b2b2c93455e8e4";
-      sha256 = "12x9c2qbi8ac22zpjjndxa0ccms8y74pj1y9ds5hfvwpnm5g5s23";
+      rev = "ab080c47581cdecb8a5b4ec79c5c19fecb5bcd2b";
+      sha256 = "06r8naxqpc4ih8xdz03jckir06mgl12zr2h8f77dnclfwpl4jvq5";
     };
     meta.homepage = "https://github.com/rebelot/heirline.nvim/";
   };
@@ -4127,12 +4127,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPluginFrom2Nix {
     pname = "kanagawa.nvim";
-    version = "2023-03-16";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "d8800c36a7f3bcec953288926b00381c028ed97f";
-      sha256 = "18dhhl9vyz8sd860ajz6190ab9zb2l6067w6730i4d1nchil4swg";
+      rev = "0133b85255d476afda403f3e9cd0310fe5af3f57";
+      sha256 = "183vlqr0cx822xxhf0yca46lbjynagnnwrczfjaa30vjv1cr3344";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -4223,12 +4223,12 @@ final: prev:
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "887eb75591520a01548134c4623617b639289d0b";
-      sha256 = "14kncmkrjgfkw1wynhgqslgybmzalnq9ps07k7kbccpsjmqafggp";
+      rev = "a80422f21750fcbf0e90b26da877d4024d76f116";
+      sha256 = "0cjw2aakslmaipyqfxn7ghr35sshlhcymhvdhgpyypd8crxs3ip0";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -4295,12 +4295,12 @@ final: prev:
 
   legendary-nvim = buildVimPluginFrom2Nix {
     pname = "legendary.nvim";
-    version = "2023-03-15";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "6a80114cc2014383e761531cdfc03c8e2920e0ba";
-      sha256 = "189yhb73mm3kwkm854xfcv1pxxva7j8nfcjb2l2dr139nbhvpw3v";
+      rev = "ee9e14955c9aa280e08b5600f7eb53e7c2578cd7";
+      sha256 = "1lh6nfwb1q4690qqn6vfjimw3qmq9fz7fa3vi3kk55q4sdy0rw0h";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -4631,12 +4631,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-zero.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "81ddfbae430f374769e18ac6207a6f0834816d97";
-      sha256 = "1hixlk15ri1fayi80df9ll631gab687g422z2v6nc4bd0jl4lf7k";
+      rev = "56ce3384695a982efaa8f6c1995255671757182c";
+      sha256 = "0jlm7fwc7rl5ayqf00ix6ynzxsmnrd3g68mhkxy4qyaf746wnpy8";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
   };
@@ -4666,12 +4666,12 @@ final: prev:
 
   lsp_signature-nvim = buildVimPluginFrom2Nix {
     pname = "lsp_signature.nvim";
-    version = "2023-02-02";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550";
-      sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3";
+      rev = "1882019270be445a8cad4353f1530574f2b2d02d";
+      sha256 = "1gs39ai4bk7pfn1q4pq3hb4cwixb39c65pf1pfwc3blv3a539d4j";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
   };
@@ -4738,12 +4738,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2023-03-13";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "a835e3d680c5940b61780c6af07885db95382478";
-      sha256 = "0rwwan01b7z5q41b7kxq655z4q450jpyryf02yi5yy85w3yc477w";
+      rev = "025886915e7a1442019f467e0ae2847a7cf6bf1a";
+      sha256 = "0wchv8a93xfyr3y22nvqcnqm5wis0j6vslcrbzzfyaza5adjvpmx";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4847,24 +4847,24 @@ final: prev:
 
   mason-tool-installer-nvim = buildVimPluginFrom2Nix {
     pname = "mason-tool-installer.nvim";
-    version = "2023-01-26";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "WhoIsSethDaniel";
       repo = "mason-tool-installer.nvim";
-      rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576";
-      sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0";
+      rev = "a6c4d7df448a78b0a05fd2065bef11ed52bee51c";
+      sha256 = "187xhyda6jqayg547vl4n5j1jrz5m8h367wnbh66vnhfcrm51rvd";
     };
     meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
   };
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "a192887fd0c29275cf2acb4a83bcbdf63399f8df";
-      sha256 = "0vqr4sm49x0mcd250mc39nsax49dlzyx9al8nkbxc5k881w4f93f";
+      rev = "9f4e06029b1d8cd3bb4438f6b3de6d5c42d2d8d1";
+      sha256 = "115b00q3m7jsmh2nvn5hk4zd95mxwl2bddvcdxg4vjxhgn8z3yx5";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -4931,12 +4931,12 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2023-03-14";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "41023bb1de7e8cf973ae9cf3066e01f3c8f3617d";
-      sha256 = "1z56qwksk5pfynch8ygi3qygv0hg0y80vc88asnxzn322iviyn34";
+      rev = "9f8b92998a9964e03535c2c7e0708958e23e261a";
+      sha256 = "1c1wywn7hpagcwdp2vnrrlf60vvqs9rl0p5g3m94jcrs6yihbqib";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -5291,12 +5291,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "bc531ca41ba55d87416b4b3ade606ff81236389b";
-      sha256 = "129dbq4dgqpyab66iqbpkfndlsbx84i8s6z8b08gavq35nrq81qc";
+      rev = "f28a0c750a40ceec22eb97dd8111ef2203ff7cc1";
+      sha256 = "02hkr0l2d61c9gbp24xdi9az1snim1qkkkbf4wz7qfzhr0p6b3z8";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5315,12 +5315,12 @@ final: prev:
 
   neodev-nvim = buildVimPluginFrom2Nix {
     pname = "neodev.nvim";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neodev.nvim";
-      rev = "0a8e312923671e78499b2e204f0f678379ba92c1";
-      sha256 = "1n9l21dcwh2g5rps7kn761qbmdy822q67djlgrlmd9gml45s0klz";
+      rev = "e027abc6d2a9c1efead2f697da8df2c0ed66b8ff";
+      sha256 = "1iw0l2g76wfd6j9jk6ixm0l5nq9kq4kd36hgj98a2ag87mjdgk4s";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
   };
@@ -5483,12 +5483,12 @@ final: prev:
 
   neotest-haskell = buildVimPluginFrom2Nix {
     pname = "neotest-haskell";
-    version = "2023-03-19";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "ac8906a04536f3c175e5923d2370e1e3689cfc42";
-      sha256 = "1plg50ksw57459r3bjgi3nykbkaiw1yan0r6lhlpaa20jpmn1x7m";
+      rev = "9edce09399f144526857073f0fa1b17ffb2a5909";
+      sha256 = "03g01j7znm1wra8yyqd6m5912npji2fp1mkzkq7acfyvsnysx4ii";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -5627,12 +5627,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2023-03-13";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "53cdaa583138698f4a0a4a9d2abaf761c8960407";
-      sha256 = "0hhfaa5pq9c52qa92fzwan7lx3qf7ym0kwsm4vzf28m86vrzfrlv";
+      rev = "9b6e3a470ac12fb2ce3de2162bb80bd0b47736f6";
+      sha256 = "1l1qfj8pbw1icd4795ly0m1iyam80m5pr0ixg0hw0v4vga2vjvg3";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -5663,12 +5663,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "d720836cb35bda8134cba3545516d9e7bee56c7d";
-      sha256 = "0nlz3zqm0dz82ddam81fap0yn4pxbal5ah2cqqh1qf1lv0sj1kb9";
+      rev = "bfd61997f62b52aa9fe5ec59590956d1bb7fe605";
+      sha256 = "13h1vk99rdzsibfzpw96pc2k3zlrih5q6ggw813b7sbfdca82lkw";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5711,12 +5711,12 @@ final: prev:
 
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "92b058ad183fccd3b970f03ae49094596a6c735b";
-      sha256 = "0k6nl575m3kfq4xls12kr0zpq924q58y8qp4y034xzfzvbibim8n";
+      rev = "f8b1a72a7bce56d9e9ed054708dc855d57dec085";
+      sha256 = "1dci8aqlny9saq8w1rjwpdknz3cpk4rqmiijdav26djdb85ghwb1";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
@@ -5771,12 +5771,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-03-17";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "456a983ce9843123e51b955f50925077ca7207d5";
-      sha256 = "1w3mfkx6va981sykv33b2amzfnx0whh8qpj9jkgib9hnv5iw10j8";
+      rev = "0180603b6f3cee40f83c6fc226b9ac5f85e691c4";
+      sha256 = "1min0civzm1d6pfi5ixh1g66wvbfd38y65m9n4jb5l3grfa8ysci";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -5843,12 +5843,12 @@ final: prev:
 
   nvim-base16 = buildVimPluginFrom2Nix {
     pname = "nvim-base16";
-    version = "2023-03-07";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "nvim-base16";
-      rev = "22bad36cd64e85afb0c9d0e9b92106b5ea6dabc6";
-      sha256 = "1yv1vr32qwk0k92hwf6fjklbb1rfxzrswlsymfq6w4dvc4dc8vch";
+      rev = "db9ac827d833236b2b7bbacf6ec3a92f96b88890";
+      sha256 = "0kxp2dbpdqi8q1rnfmmbxziyr01d7dlqq6wmvjr8vzspxyr5ar0d";
     };
     meta.homepage = "https://github.com/RRethy/nvim-base16/";
   };
@@ -5927,14 +5927,14 @@ final: prev:
 
   nvim-cokeline = buildVimPluginFrom2Nix {
     pname = "nvim-cokeline";
-    version = "2023-01-10";
+    version = "2023-03-22";
     src = fetchFromGitHub {
-      owner = "noib3";
+      owner = "willothy";
       repo = "nvim-cokeline";
-      rev = "dc72c4a8dcbcc4763e33899876512b15c2d2aa4e";
-      sha256 = "0lqzzycim4g1x5715845mcp4rrabgpl37jk7mrhh2k4mciraxwmg";
+      rev = "29ff4654b106ca08cdb649120d8f296fb00723f4";
+      sha256 = "02kbvp689m8fbhhf759zngg2wyy2awws55hp905nzq4vzk8sxp82";
     };
-    meta.homepage = "https://github.com/noib3/nvim-cokeline/";
+    meta.homepage = "https://github.com/willothy/nvim-cokeline/";
   };
 
   nvim-colorizer-lua = buildVimPluginFrom2Nix {
@@ -6143,12 +6143,12 @@ final: prev:
 
   nvim-highlite = buildVimPluginFrom2Nix {
     pname = "nvim-highlite";
-    version = "2023-03-13";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "66883ed6de7dccd6a7d3dbfd9116f4bd440440d5";
-      sha256 = "0q6gdb9z5fdrr9vq8ilyzfs5a0l1pwryvrlyfrswpasj3x1vlcg0";
+      rev = "26a272937f1f3ff5c38d67662c5d7cc76148a4a5";
+      sha256 = "07w1bygcs3myfarp2zpm21clyc0abmrglpwqkdj0z4azd4wa1cqz";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
   };
@@ -6179,12 +6179,12 @@ final: prev:
 
   nvim-jdtls = buildVimPluginFrom2Nix {
     pname = "nvim-jdtls";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "34202bc141620858159616ff79bd8a3c48c34214";
-      sha256 = "1ia9vizq59rwb99cf6jhhq1jhxrrzk85ysxvgwf37c0f9vbivvpw";
+      rev = "f8fb45e05e638e5c67e884f3039abcda7abc2d2d";
+      sha256 = "0pr98bmfh0jx8jbwnzidbdjpxkg2fg4i4scbyimkbpbq5isxnq7h";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
   };
@@ -6239,12 +6239,12 @@ final: prev:
 
   nvim-lint = buildVimPluginFrom2Nix {
     pname = "nvim-lint";
-    version = "2023-03-04";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "cadebae41e11610ba22a7c95dcf5ebc0f8af8f13";
-      sha256 = "0v3ywf8cbv52h02dc04q5d59zxj3ag87rcgjxnzb7zz89kbb1dbg";
+      rev = "b16e6e424ddfb12d4b3a699c1dc41ba0f3b503da";
+      sha256 = "1rr7kz8512r8svl4yadrjhn1b9pdz36p4jvflnsha7bxznmsc6bx";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
   };
@@ -6263,12 +6263,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-03-20";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "736c39e4bab977f0171c78328415c6402c58e64a";
-      sha256 = "1079bdrnrlw4qkpibpnkznkpnih71r8zxl2s47ad8hvvr586k9ld";
+      rev = "c6105c449683b944b5d2138fcf82f18c657249e9";
+      sha256 = "08rkj9yfygkn7map3wgg0ggvh3i8yb5kpqid1q3a02c810xppn7w";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6335,12 +6335,12 @@ final: prev:
 
   nvim-navic = buildVimPluginFrom2Nix {
     pname = "nvim-navic";
-    version = "2023-03-20";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "smiteshp";
       repo = "nvim-navic";
-      rev = "f1ffbc3f5736add66c31e02f4c53d238e040600b";
-      sha256 = "0djb5n86ypd94gb06fgf7p25sina1xfrnb7894v4pga9fc1fl4fp";
+      rev = "ca34afcd15c7f6dd0836fc4fca2e37024bfa5019";
+      sha256 = "05nlb1880zaghcags6b751h89k9x3aw7hiapvigip877lpch0nfs";
     };
     meta.homepage = "https://github.com/smiteshp/nvim-navic/";
   };
@@ -6371,12 +6371,12 @@ final: prev:
 
   nvim-notify = buildVimPluginFrom2Nix {
     pname = "nvim-notify";
-    version = "2023-03-14";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-notify";
-      rev = "02047199e2752223c77c624160f720ca227944a9";
-      sha256 = "0rsykf1w0ra2xpxzcfy8l41r0h7d2nyj5r1hmzz6766x0pmpaw5i";
+      rev = "50d037041ada0895aeba4c0215cde6d11b7729c4";
+      sha256 = "0nzqj6j9j0cvi0mckqggfgyc8a6cdyr6z2qwkzk30yqjs39fnh66";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-notify/";
   };
@@ -6491,12 +6491,12 @@ final: prev:
 
   nvim-surround = buildVimPluginFrom2Nix {
     pname = "nvim-surround";
-    version = "2023-03-15";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "2de4bf5a39d4df02aafb8fd038feac9337778acf";
-      sha256 = "06149bf5w6cc125pf0hdm7yacfqqzwzdwraka0062c2mxqml2w0k";
+      rev = "056f69ed494198ff6ea0070cfc66997cfe0a6c8b";
+      sha256 = "0nkfb13jrhczw2y3wd5qr183l50wy8jk0chkiw66x4388gqnz9lm";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
   };
@@ -6527,24 +6527,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2023-03-20";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "a50723e35f57f89fb67019127a16d90f16edfef8";
-      sha256 = "0k7q6isrnk9qqymiz5vzkspq5ff5m4bkb66ayn8bsp6v7qdrkzyz";
+      rev = "aa9971768a08caa4f10f94ab84e48d2ceb30b1c0";
+      sha256 = "1yq7a1baf85vhzycnys13jl3chhlixfa5gcqm97pzh3rz5y6g8ys";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-03-20";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "25b656a4b771ee7d440e506280b9ae546d6f7233";
-      sha256 = "02qg57wkrg2if1kbailyy2qw84c1wfa9rmv8cv8ljzxfqhf9f380";
+      rev = "87cf2abeb6077ac19a1249d0b06f223aa398a0a0";
+      sha256 = "1zq55kfjaf3gsm3l4xv210fzzidg2bk6r6bk551y7jgvf6j6fapm";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -6555,8 +6555,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "446a463500ea2ee22c9b44f059b1117997f5aaeb";
-      sha256 = "0l6jwqg6i0z5w0q3z7956rc3wc3w2h320237clvxvkq3brf33f0a";
+      rev = "88d1627285f7477883516ef60521601862dae7a1";
+      sha256 = "1kdda1jsa9zxbz6bgjxlzbx97f0dqxvl9k8lkcg5wx2nsmdyn4i0";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
@@ -6575,12 +6575,12 @@ final: prev:
 
   nvim-treesitter-refactor = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-refactor";
-    version = "2022-05-13";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-refactor";
-      rev = "75f5895cc662d61eb919da8050b7a0124400d589";
-      sha256 = "1wpszy4mga9piq5c5ywgdw15wvff8l8a7a6agygfv1rahfv3087j";
+      rev = "b216290a2a47c856cf95cdc35e0c8d2c6306d89a";
+      sha256 = "1xd2bgbz0zm9qn9az15akv062cahi7xlkvhf98phjnrnppdcp6jm";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
   };
@@ -6658,12 +6658,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPluginFrom2Nix {
     pname = "nvim-web-devicons";
-    version = "2023-03-20";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "467d135bbefa6fbe8380c8b6498228f8b21244a6";
-      sha256 = "0818nwd132cxlnrwx086z15b7m7845b7rfh0wypl51hszkqbz6p3";
+      rev = "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f";
+      sha256 = "1hzmp6vfz4kfj7rid2br1gi438wsy435dy76n5fqqqsw67l86iza";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -6754,12 +6754,12 @@ final: prev:
 
   oil-nvim = buildVimPluginFrom2Nix {
     pname = "oil.nvim";
-    version = "2023-03-19";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "08c4b71ef156329aafc4e6741b9c47b06255dde4";
-      sha256 = "0z7qmgkqvracdwmccyk2cgaqjaxizv8wjwp8j26ad6ja7zpbplhb";
+      rev = "4b05ebdf202bf61ce240f40558822fe5564d02ea";
+      sha256 = "0caafnxg0apz14fj4ppv8pba2633dlv9fa8bzfqznsavx3w1xwhj";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -6791,12 +6791,12 @@ final: prev:
 
   onedark-nvim = buildVimPluginFrom2Nix {
     pname = "onedark.nvim";
-    version = "2023-03-06";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "navarasu";
       repo = "onedark.nvim";
-      rev = "4497678c6b1847b663c4b23000d55f28a2f846ce";
-      sha256 = "05809lpabxliha56pjg0973wv3p3nmz6z76kxyw1r9x69ds9z34h";
+      rev = "dd640f6cfb0e370cfd3db389f04b172508848bd3";
+      sha256 = "1ymv9mjbjhmmsyh5pm2jh883mvhh8rlcy3d7513vvdifriyxy2mz";
     };
     meta.homepage = "https://github.com/navarasu/onedark.nvim/";
   };
@@ -6899,12 +6899,12 @@ final: prev:
 
   oxocarbon-nvim = buildVimPluginFrom2Nix {
     pname = "oxocarbon.nvim";
-    version = "2023-03-18";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "nyoom-engineering";
       repo = "oxocarbon.nvim";
-      rev = "84c8563d608b7ecbf7b4fd3b4828e1a087cb39d9";
-      sha256 = "1i6msmal2krd7rbfdqk849y9lp3sfjmdk1bmk7d0axx2fq3jyfvf";
+      rev = "fc236ef07361a1596081f242940f97af3ba26db1";
+      sha256 = "0pvhfj7vslz1imqr4q583450p6x22ba4ir8d3cmci02rm7q8qx9m";
     };
     meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
   };
@@ -7645,12 +7645,12 @@ final: prev:
 
   sg-nvim = buildVimPluginFrom2Nix {
     pname = "sg.nvim";
-    version = "2023-03-18";
+    version = "2023-03-20";
     src = fetchFromGitHub {
       owner = "sourcegraph";
       repo = "sg.nvim";
-      rev = "7d198a86b2f4fceafa195aafe2bc7425d196eff1";
-      sha256 = "0zgyz1w9s6yfkcc1dgxsp8svshnfxlxhpiplrsqc4j30ph0kb3nh";
+      rev = "8432c5fb3934aff8f3b466c009cd9e7bb1bf771a";
+      sha256 = "09r3brjb0dn46yfsjgiwbaqzdgq43isna4bphwkpg1mfxd3mgm52";
     };
     meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
   };
@@ -7790,12 +7790,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2023-03-14";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "be321c982bf109b182fb38af2302da838fcaaa02";
-      sha256 = "05i01pqcp68ba9z9pcx2nkr6f8b9ilf5nvjnvgw1h037sv576kg1";
+      rev = "bf1e4d016a08cc3fb2a3060309d00e04dbd4fc22";
+      sha256 = "1mipgz1g0w0y2ghha0lsq8zjw4nqi0a8l6kfzk3jsjfbxji4cl2p";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -7910,12 +7910,12 @@ final: prev:
 
   splitjoin-vim = buildVimPluginFrom2Nix {
     pname = "splitjoin.vim";
-    version = "2023-03-04";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "26ca36c698eeb9d7257562b0102fd9735a8ba2ac";
-      sha256 = "1j0j62j1y69n8kkiibx8canhb52v0q04kpdmwxvxsgy23slnl289";
+      rev = "2c8cd19a7be5b3d7baec3eeac086eef576896e12";
+      sha256 = "0ij5l0z5hf7878gzfyz8ldvl6pjgjpbd7js26dpvgq8jlz5r5nb7";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -8345,12 +8345,12 @@ final: prev:
 
   telescope-file-browser-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-file-browser.nvim";
-    version = "2023-03-09";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-file-browser.nvim";
-      rev = "94fe37a1ea217dd2f90d91222bc1531521146ac3";
-      sha256 = "0qqck9cw709x8xbk5l2slnrmhm7dqagzvn22k5k3i6d6n37yw6qs";
+      rev = "24389d847f931e3822c5babdd308d20e2e8c638f";
+      sha256 = "1dgd1ipmi17wjpslv7ilqjjjfg9sw2s4ig15simh92h3ipr3bpv3";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
   };
@@ -8466,12 +8466,12 @@ final: prev:
 
   telescope-project-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-project.nvim";
-    version = "2022-12-23";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-project.nvim";
-      rev = "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972";
-      sha256 = "0br4skyavnsk41s45z5qw0ny7g2lamd60c6clmwyrvim6hgqx12b";
+      rev = "fa081e35ba7397e5147a51ece693aa3afda167fc";
+      sha256 = "0bpqqkrw2s3hx8am4q1xizh1srxhnm9fxajnxv1cj1vxy0inkihk";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
   };
@@ -8562,12 +8562,12 @@ final: prev:
 
   telescope-nvim = buildNeovimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2023-02-26";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "a3f17d3baf70df58b9d3544ea30abe52a7a832c2";
-      sha256 = "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22";
+      rev = "942fe5faef47b21241e970551eba407bc10d9547";
+      sha256 = "0i9j8fm5739vqzxnpvifsyfggw7xlpf77nk22l500qpw4spksb1b";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -8718,12 +8718,12 @@ final: prev:
 
   tint-nvim = buildVimPluginFrom2Nix {
     pname = "tint.nvim";
-    version = "2022-09-27";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "levouh";
       repo = "tint.nvim";
-      rev = "f6a259861ba8c0d88afc2ef05140ddf345eb0296";
-      sha256 = "0ffbi9nrmr1hrlkvh09xvcdqrxfi66msm9g4xg8ja3zj3gqvi3z0";
+      rev = "51e9144fa3cd3f2492a282ccadc8bd3355653f5c";
+      sha256 = "0fzxyph6qj0rcxysvap3awr5xv3hj56z5ma1gm5jp8b4fm72cgrh";
     };
     meta.homepage = "https://github.com/levouh/tint.nvim/";
   };
@@ -8815,12 +8815,12 @@ final: prev:
 
   tokyonight-nvim = buildVimPluginFrom2Nix {
     pname = "tokyonight.nvim";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "edffa82026914be54c8220973b0385f61d3392f0";
-      sha256 = "1a1ydipnlbzxbfn12d1crzwcb6rk5vky4q65yg788gb963qh16f7";
+      rev = "1b0c88094548a62641ece1e668fa9a234e1c539e";
+      sha256 = "0mf9f955bd587kd3mxvvhqdn7p639pfqi1wfbz1wds1hizkdfmrk";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -8875,12 +8875,12 @@ final: prev:
 
   trim-nvim = buildVimPluginFrom2Nix {
     pname = "trim.nvim";
-    version = "2023-03-04";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "cappyzawa";
       repo = "trim.nvim";
-      rev = "f33e8856b8fa085bed9d7dd36a8ff2c34aaf0c36";
-      sha256 = "14wr23kclfs1hvp5bpyd112q3b21m0vckywypbhi16v87781aks0";
+      rev = "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e";
+      sha256 = "1r4p93siid35q1r9kj8cgyin6i8zg033ifvamf19052mpnwli824";
     };
     meta.homepage = "https://github.com/cappyzawa/trim.nvim/";
   };
@@ -8995,12 +8995,12 @@ final: prev:
 
   unison = buildVimPluginFrom2Nix {
     pname = "unison";
-    version = "2023-03-15";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "511ad1f01cf61f6732de9ef833f6b525afc513d4";
-      sha256 = "1nxsnp1m7nr4jcqwxy2f08m6z7571h03vhvp1fksc0amxjv1yx5p";
+      rev = "437864dcde91e29b186bed09c72944019dddf10d";
+      sha256 = "1hxxan9g035xm6rh6rz9wxrxqfy8qfwp95mi179fxi71xbj2j77m";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -9895,12 +9895,12 @@ final: prev:
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2023-03-18";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "1822415b1150e2158da62f928274269d2c02d529";
-      sha256 = "069vjwsll7v1428pb009ph9fij2sxd5j746kw8546368ndj572xy";
+      rev = "db7631c9b9ea72ccc830e9fda0a8284c43f2beed";
+      sha256 = "0jqbj2ggddhw9bgri1ngi2kcv15qispqngbd1vsfxcjn6c90arsz";
     };
     meta.homepage = "https://github.com/google/vim-codefmt/";
   };
@@ -9991,12 +9991,12 @@ final: prev:
 
   vim-cool = buildVimPluginFrom2Nix {
     pname = "vim-cool";
-    version = "2022-12-23";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "romainl";
       repo = "vim-cool";
-      rev = "80c19445728d70595c2f72d0436527e28292ebd9";
-      sha256 = "1imhhsf5rhj13gchddfkgadn5z5i96gnw822nmx0ddcdvrm6kisf";
+      rev = "80536b9f2e23292708a64f2e7bcf5e596f9faf24";
+      sha256 = "102c1jggwf6kpykcaiwx5shiq9p48a999parw3gzf3hk0ay9krxb";
     };
     meta.homepage = "https://github.com/romainl/vim-cool/";
   };
@@ -10519,12 +10519,12 @@ final: prev:
 
   vim-flake8 = buildVimPluginFrom2Nix {
     pname = "vim-flake8";
-    version = "2022-08-16";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "nvie";
       repo = "vim-flake8";
-      rev = "03316eab49fddce2fc9cea84588e623a658b35aa";
-      sha256 = "0n1aqyrgy2822qf0cnr8yz1zdfsvk31w7miarnklp5ahim3pjbbn";
+      rev = "5b950566e20d877184a06b1d2fe8bad0998b3ece";
+      sha256 = "1mpj8n38fr1gfp65cah4w141cw381ms17zwmvl2iga2hz60rnz0d";
     };
     meta.homepage = "https://github.com/nvie/vim-flake8/";
   };
@@ -10615,12 +10615,12 @@ final: prev:
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2023-03-09";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "5b52a0f395065d6cb7b65a00a5e17eaf9ebd64d5";
-      sha256 = "1skvg3w7aaj0cnjx6fdrbfdn46yi62j14jcb46b832a05zgsymq7";
+      rev = "309c68117eca3a95349093012e5886a184c1812d";
+      sha256 = "1inslzavlygwx5s5nzqnw663y36d9wszi4lfaz16b3jf60xx1907";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -11529,12 +11529,12 @@ final: prev:
 
   vim-maktaba = buildVimPluginFrom2Nix {
     pname = "vim-maktaba";
-    version = "2022-11-02";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
-      rev = "5d416e84d024538f5e5cf25c394d081802f0a35e";
-      sha256 = "13filvmaxr0dvc44f3ah80g8jhkrn3rqkwqj1a7wxjv6a6xa083z";
+      rev = "fe95bb10f6bb250943a44632107f6a3d76ce5f28";
+      sha256 = "1qsb44miq1yl23k3qmybmxg7kwqjf1yf7ma7w8g6lr716asmyawl";
     };
     meta.homepage = "https://github.com/google/vim-maktaba/";
   };
@@ -13115,12 +13115,12 @@ final: prev:
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2023-02-13";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "c63b94c1e5089807f4532e05f087351ddb5a207c";
-      sha256 = "1czd0k91im222ljz6jbggj5k4v2wvb6r1gql1w4ri56s07hc3rbx";
+      rev = "3995a9419dbea1d93ab916bc8f53ee9f19435223";
+      sha256 = "00m4gvk2wk1jx72wf6mdhnrzwmppraykk4ha4pxb3l3p853idgng";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
   };
@@ -13835,12 +13835,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2023-03-11";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "93fd1058697394789b413ae70b19428533ebf7b1";
-      sha256 = "1grqrpmffl0wk5fnhcp6fpykwjdvqg9qpkdni02869z4xcih9n39";
+      rev = "ac20c79b6b516472ac6a252f47867f12a3c7e05b";
+      sha256 = "1qqwrkrchzv24jswvnd3zy333pwbjslzpj6yqh0caf0b5qhcwbkc";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -13848,12 +13848,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2023-03-16";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "7c1bc9b8ad6c6bddc0194aeb27b34bd1107880f2";
-      sha256 = "1y836x6gva2w4x62r3vwllvibgl4iyi534fg7jvvigaxfff7qj40";
+      rev = "5a6e46e2b8a96e79d5cab98e50a9b9109715d940";
+      sha256 = "0ah361mg1qlpkx6vwaj7x8a2ja717njinq2ax4fhcr8z34h4q0ra";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -13872,12 +13872,12 @@ final: prev:
 
   vimwiki = buildVimPluginFrom2Nix {
     pname = "vimwiki";
-    version = "2023-03-18";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
-      rev = "72d02207b021b968a185ed68b949c7a15f82c3d4";
-      sha256 = "1v88r8wlpgkkr9f0hzkkmysi1n27ihqxrhzpg6qfdcddq0zj6528";
+      rev = "dec6a9ecab3e5ec9ceff28b84cabb5c62d05ee9f";
+      sha256 = "0wwjgilirv05x7nigagwdz37csbzhhch60iri1ly6armn8r0j0ix";
     };
     meta.homepage = "https://github.com/vimwiki/vimwiki/";
   };
@@ -13956,12 +13956,12 @@ final: prev:
 
   which-key-nvim = buildVimPluginFrom2Nix {
     pname = "which-key.nvim";
-    version = "2023-03-19";
+    version = "2023-03-21";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "d1afcd48f309af58fdb43adc4581bf4b5684768b";
-      sha256 = "0fi373y7db1g0gdchgrkamf3nmdjjdgi4l8yw17y3b7w5g5x92q0";
+      rev = "87b1459b3e0be0340da2183fc4ec8a00b2960678";
+      sha256 = "0y1jypz17rap62hrbqm6207rjmv3gcj8i7c6na0jfd34nh82pmi0";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
@@ -14197,12 +14197,12 @@ final: prev:
 
   zk-nvim = buildVimPluginFrom2Nix {
     pname = "zk-nvim";
-    version = "2023-02-06";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "mickael-menu";
       repo = "zk-nvim";
-      rev = "0413c52500cd0133b0cd8e7e7d43084855ac1760";
-      sha256 = "0yw7fi9z4rlb2vpm2qp6sm118hjz5vzix6nl7h654vp12zzqrs0g";
+      rev = "50fc25b88fb28829ec7f5e5a4d4b458fca21a550";
+      sha256 = "1z46x7mdyad64q5b1biyy2bdmqdbl3xbw288rdwjjhwa34mb9h7j";
     };
     meta.homepage = "https://github.com/mickael-menu/zk-nvim/";
   };
@@ -14233,12 +14233,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-03-13";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "128af65c3a23c94b324dc8d7f02a34feee8722d4";
-      sha256 = "0xdmv27l46iashajsvsiakk8j0zixcshvfn6ixg402z7gidxzvbr";
+      rev = "eb4e73bfc5c364e86f08fbc8680e975a56638b1b";
+      sha256 = "1xf22v477v073hppsw40iik6rx6354n7zmir6wp2yy41hkl6mlvf";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -14305,12 +14305,12 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-03-09";
+    version = "2023-03-22";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "lspsaga.nvim";
-      rev = "db6cdf51bf5ae45e4aa65760e597cf0d587c66ee";
-      sha256 = "1zpra73xf320wbi4cfrlzriyklgpgcbdmaphd88lvpkqy5shrfwy";
+      rev = "04617d1f5b1cfbdd2a99d9765ef04fc6ae415622";
+      sha256 = "1jgf7sm0755a1vcbfm1wxmkv6alrbpyfzrrfbi3100hh4c9khxg6";
     };
     meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
   };
@@ -14353,12 +14353,12 @@ final: prev:
 
   rose-pine = buildVimPluginFrom2Nix {
     pname = "rose-pine";
-    version = "2023-03-19";
+    version = "2023-03-23";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "69f015b9522b468b320fbd56eb4ae72af4d5074f";
-      sha256 = "0c1gj2ynn0n8f3r6blwkh47jqqmjfi1q7x023zddd1fqa7y7ram9";
+      rev = "17723f76ea78cdd71fd0007b7b760683b60a5e43";
+      sha256 = "03axwa83pjzpjhcszdz2nfansxjwf8hbl2sgii4xnkwmbi1qwih2";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 2983b9c4d1bb..02c6f7ec74b5 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -793,7 +793,7 @@ self: super: {
         pname = "sg-nvim-rust";
         inherit (old) version src;
 
-        cargoHash = "sha256-z3ZWHhqiJKFzVcFJadfPU6+ELlnvEOAprCyStszegdI=";
+        cargoHash = "sha256-GN7KM3fkeOcqmyUwsPMw499kS/eYqh8pbyPgMv4/NN4=";
 
         nativeBuildInputs = [ pkg-config ];
 

From cc14c50c6d0f16deee7617052c68d7b7a3b82e55 Mon Sep 17 00:00:00 2001
From: "\"Gaetan Lepage\"" <"gaetan@glepage.com">
Date: Thu, 23 Mar 2023 21:35:51 +0100
Subject: [PATCH 241/247] vimPlugins.inc-rename-nvim: init at 2023-01-29

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e1590a823a4c..86b6fa4bfe23 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3872,6 +3872,18 @@ final: prev:
     meta.homepage = "https://github.com/lewis6991/impatient.nvim/";
   };
 
+  inc-rename-nvim = buildVimPluginFrom2Nix {
+    pname = "inc-rename.nvim";
+    version = "2023-01-29";
+    src = fetchFromGitHub {
+      owner = "smjonas";
+      repo = "inc-rename.nvim";
+      rev = "21c23c379342a731a0c90f226601ec0434627b26";
+      sha256 = "06y92kb2g6qrpf31mq4j2l8v450i2zp36xm2adr4n0x68rxxa59b";
+    };
+    meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
+  };
+
   increment-activator = buildVimPluginFrom2Nix {
     pname = "increment-activator";
     version = "2021-09-16";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index cff1c845d678..a21406e36a92 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -324,6 +324,7 @@ https://github.com/cocopon/iceberg.vim/,,
 https://github.com/idris-hackers/idris-vim/,,
 https://github.com/edwinb/idris2-vim/,,
 https://github.com/lewis6991/impatient.nvim/,,
+https://github.com/smjonas/inc-rename.nvim/,HEAD,
 https://github.com/nishigori/increment-activator/,,
 https://github.com/haya14busa/incsearch-easymotion.vim/,,
 https://github.com/haya14busa/incsearch.vim/,,

From 3c2ac03bdc3166091072ca2027a27ef00e12a4b6 Mon Sep 17 00:00:00 2001
From: "\"Gaetan Lepage\"" <"gaetan@glepage.com">
Date: Thu, 23 Mar 2023 21:36:06 +0100
Subject: [PATCH 242/247] vimPlugins.nvim-treesitter: update grammars

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

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 35b6299d104f..354c2a0fe7ee 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -69,6 +69,17 @@
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
   };
+  bass = buildGrammar {
+    language = "bass";
+    version = "27f110d";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-bass";
+      rev = "27f110dfe79620993f5493ffa0d0f2fe12d250ed";
+      hash = "sha256-OmYtp2TAsAjw2fgdSezHUrP46b/QXgCbDeJa4ANrtvY=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-bass";
+  };
   beancount = buildGrammar {
     language = "beancount";
     version = "f3741a3";
@@ -590,12 +601,12 @@
   };
   glimmer = buildGrammar {
     language = "glimmer";
-    version = "40cfb72";
+    version = "bc1c685";
     src = fetchFromGitHub {
       owner = "alexlafroscia";
       repo = "tree-sitter-glimmer";
-      rev = "40cfb72a53654cbd666451ca04ffd500257c7b73";
-      hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A=";
+      rev = "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af";
+      hash = "sha256-CDXyynCsnmOvOs1rs9e29tNHosywTvGM0UyWVtwMqZ8=";
     };
     meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
   };
@@ -1597,12 +1608,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "4cb5b36";
+    version = "d2b64d8";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "4cb5b36d70687bfe4687c68483b4dacde309ae6f";
-      hash = "sha256-7YkVPuQS8NGcHXHwgFTZ4kWL01AnNeOGxdY8xFISSzY=";
+      rev = "d2b64d85d0cab5edeffe44243134033e6ff07c02";
+      hash = "sha256-Mo87yEF0YGF9t+bXvxuULtlOWAFKyBDjU6rF6eOXLao=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };

From b46c97e1dc27f78bcc1c72e9999e07c9b49ace6e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Mar 2023 23:47:11 +0200
Subject: [PATCH 243/247] stdenv: generalise showPlatforms

---
 pkgs/stdenv/generic/check-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 4c218b24d11d..1118e6837f29 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -113,7 +113,9 @@ let
 
   showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (lib.lists.toList value));
   showLicense = showLicenseOrSourceType;
-  showPlatforms = value: lib.optionalString (builtins.isList value && builtins.all builtins.isString value) (toString value);
+  showPlatforms = attrs: toString (builtins.filter
+    (system: lib.meta.availableOn (lib.systems.elaborate { inherit system; }) attrs)
+    lib.platforms.all);
   showSourceType = showLicenseOrSourceType;
 
   pos_str = meta: meta.position or "«unknown-file»";
@@ -369,7 +371,7 @@ let
     else if !allowBroken && attrs.meta.broken or false then
       { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }
     else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
-      { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; }
+      { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs}` but not on requested ‘${hostPlatform.system}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }
 

From c6b64a9bfe371759fb52af271b09e1b3c1eb549c Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 23 Mar 2023 18:20:09 -0300
Subject: [PATCH 244/247] shellhub-agent: 0.11.6 -> 0.11.7

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/applications/networking/shellhub-agent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix
index 7b908075902e..006ef3ea0a02 100644
--- a/pkgs/applications/networking/shellhub-agent/default.nix
+++ b/pkgs/applications/networking/shellhub-agent/default.nix
@@ -9,18 +9,18 @@
 
 buildGo120Module rec {
   pname = "shellhub-agent";
-  version = "0.11.6";
+  version = "0.11.7";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    sha256 = "eZLQzy3lWwGM6VWFbsJ6JuGC+/dZnoymZgNtM8CPBM4=";
+    sha256 = "d5ESQQgBPUFe2tuCbeFIqiWPpr9wUczbXLc5QdXurXY=";
   };
 
   modRoot = "./agent";
 
-  vendorSha256 = "sha256-7kDPo24I58Nh7OiHj6Zy40jAEaXSOmbcczkgJPXBItU=";
+  vendorSha256 = "sha256-/85rIBfFBpXYrsCBDGVzXfAxO6xXQ8uTL2XeEPKQwDQ=";
 
   ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
 

From b150ab2435b04635b9624f5d966439b090ab2cf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 22:19:53 +0000
Subject: [PATCH 245/247] python310Packages.mautrix: 0.19.6 -> 0.19.7

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

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 6ceab3ef3362..66c040f66f35 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.19.6";
+  version = "0.19.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "python";
-    rev = "v${version}";
-    hash = "sha256-Km6Lh4iKUBwQcsChTrV9yCaPhVBINJotp/5XnPfoOMk=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-uL4eNMe+NXyE+kLy87zZPNBDuMnAt3KHT01ryFVfBZU=";
   };
 
   propagatedBuildInputs = [

From 24f9df3b9fe7411250b91120c3a6d2eb08392dd4 Mon Sep 17 00:00:00 2001
From: Infinitive Witch <infinitivewitch@disroot.org>
Date: Thu, 23 Mar 2023 19:32:41 -0300
Subject: [PATCH 246/247] komikku: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix
index fcdac2aa0626..f2e0a2e76067 100644
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/applications/graphics/komikku/default.nix
@@ -18,7 +18,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.15.0";
+  version = "1.16.0";
 
   format = "other";
 
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-dmi8a9Gf4ixq5oW6ewDGZYRmxY2qmUrD42DfjskRpHk=";
+    hash = "sha256-SzK86uzdGnNFNtbvw56n3AxjxcCBjHFs9wD98TVggAo=";
   };
 
   nativeBuildInputs = [

From 09a4d16b85344e03e6526b4f70d1f4609ef5e6f8 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Thu, 23 Mar 2023 22:03:24 +0100
Subject: [PATCH 247/247] dino: 0.4.1 -> 0.4.2

https://github.com/dino/dino/releases/tag/v0.4.2

Fixes CVE-2023-28686: https://dino.im/security/cve-2023-28686/
---
 .../networking/instant-messengers/dino/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 37195c117f10..7d296e417bd6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dino";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
     rev = "v${version}";
-    sha256 = "sha256-1czey1/Zn96JneCUnhPMyffG9FVV4bA9aidNB7Ozkpo=";
+    sha256 = "sha256-85Sh3UwoMaa+bpL81gIKtkpCeRl1mXbs8Odux1FURdQ=";
   };
 
   postPatch = ''