diff --git a/nixos/modules/services/security/aesmd.nix b/nixos/modules/services/security/aesmd.nix
index 04bd3c4bb10c..4197a11fd373 100644
--- a/nixos/modules/services/security/aesmd.nix
+++ b/nixos/modules/services/security/aesmd.nix
@@ -1,6 +1,5 @@
 {
   config,
-  options,
   pkgs,
   lib,
   ...
@@ -20,7 +19,6 @@ let
     ;
 
   cfg = config.services.aesmd;
-  opt = options.services.aesmd;
 
   sgx-psw = cfg.package;
 
@@ -28,10 +26,10 @@ let
     with cfg.settings;
     pkgs.writeText "aesmd.conf" (
       concatStringsSep "\n" (
-        optional (whitelistUrl != null) "whitelist url = ${whitelistUrl}"
+        optional (defaultQuotingType != null) "default quoting type = ${defaultQuotingType}"
+        ++ optional (qplLogLevel != null) "qpl log level = ${qplLogLevel}"
         ++ optional (proxy != null) "aesm proxy = ${proxy}"
         ++ optional (proxyType != null) "proxy type = ${proxyType}"
-        ++ optional (defaultQuotingType != null) "default quoting type = ${defaultQuotingType}"
         ++
           # Newline at end of file
           [ "" ]
@@ -45,6 +43,12 @@ in
 
           services.aesmd.package = pkgs.sgx-psw.override { debug = true; };
     '')
+    (mkRemovedOptionModule [
+      "services"
+      "aesmd"
+      "settings"
+      "whitelistUrl"
+    ] "sgx-psw-v2.28 no longer supports Intel enclave signer cert whitelist management.")
   ];
 
   options.services.aesmd = {
@@ -66,54 +70,50 @@ in
       example = literalExpression "pkgs.sgx-azure-dcap-client";
       description = "Custom quote provider library to use.";
     };
-    settings = mkOption {
-      description = "AESM configuration";
-      default = { };
-      type = types.submodule {
-        options.whitelistUrl = mkOption {
-          type = with types; nullOr str;
-          default = null;
-          example = "http://whitelist.trustedservices.intel.com/SGX/LCWL/Linux/sgx_white_list_cert.bin";
-          description = "URL to retrieve authorized Intel SGX enclave signers.";
-        };
-        options.proxy = mkOption {
-          type = with types; nullOr str;
-          default = null;
-          example = "http://proxy_url:1234";
-          description = "HTTP network proxy.";
-        };
-        options.proxyType = mkOption {
-          type =
-            with types;
-            nullOr (enum [
-              "default"
-              "direct"
-              "manual"
-            ]);
-          default = if (cfg.settings.proxy != null) then "manual" else null;
-          defaultText = literalExpression ''
-            if (config.${opt.settings}.proxy != null) then "manual" else null
-          '';
-          example = "default";
-          description = ''
-            Type of proxy to use. The `default` uses the system's default proxy.
-            If `direct` is given, uses no proxy.
-            A value of `manual` uses the proxy from
-            {option}`services.aesmd.settings.proxy`.
-          '';
-        };
-        options.defaultQuotingType = mkOption {
-          type =
-            with types;
-            nullOr (enum [
-              "ecdsa_256"
-              "epid_linkable"
-              "epid_unlinkable"
-            ]);
-          default = null;
-          example = "ecdsa_256";
-          description = "Attestation quote type.";
-        };
+    settings = {
+      proxy = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "http://proxy_url:1234";
+        description = "HTTP network proxy.";
+      };
+      proxyType = mkOption {
+        type =
+          with types;
+          nullOr (enum [
+            "default"
+            "direct"
+            "manual"
+          ]);
+        default = if (cfg.settings.proxy != null) then "manual" else null;
+        defaultText = literalExpression ''
+          if (cfg.settings.proxy != null) then "manual" else null
+        '';
+        example = "default";
+        description = ''
+          Type of proxy to use. The `default` uses the system's default proxy.
+          If `direct` is given, uses no proxy.
+          A value of `manual` uses the proxy from
+          {option}`services.aesmd.settings.proxy`.
+        '';
+      };
+      defaultQuotingType = mkOption {
+        # sgx-psw 2.28 removed EPID attestation
+        type = with types; nullOr (enum [ "ecdsa_256" ]);
+        default = null;
+        example = "ecdsa_256";
+        description = "Attestation quote type.";
+      };
+      qplLogLevel = mkOption {
+        type =
+          with types;
+          nullOr (enum [
+            "info"
+            "error"
+          ]);
+        default = null;
+        example = "error";
+        description = "Log level for the default quote provider library.";
       };
     };
   };
@@ -131,8 +131,6 @@ in
     systemd.services.aesmd =
       let
         storeAesmFolder = "${sgx-psw}/aesm";
-        # Hardcoded path AESM_DATA_FOLDER in psw/ae/aesm_service/source/oal/linux/aesm_util.cpp
-        aesmDataFolder = "/var/opt/aesmd/data";
       in
       {
         description = "Intel Architectural Enclave Service Manager";
@@ -154,13 +152,8 @@ in
         unitConfig.AssertPathExists = [ "/dev/sgx_enclave" ];
 
         serviceConfig = {
-          # Run with elevated privileges to create /var/opt/aesmd/... before
-          # dropping to DynamicUser.
-          ExecStartPre = ''
-            +${lib.getExe' pkgs.coreutils "install"} -m 644 -D \
-                "${storeAesmFolder}/data/white_list_cert_to_be_verify.bin" \
-                "${aesmDataFolder}/white_list_cert_to_be_verify.bin"
-          '';
+          # Hardcoded path AESM_DATA_FOLDER in psw/ae/aesm_service/source/oal/linux/aesm_util.cpp
+          ExecStartPre = "+${lib.getExe' pkgs.coreutils "mkdir"} -p -m 755 /var/opt/aesmd/data";
           ExecStart = "${sgx-psw}/bin/aesm_service --no-daemon";
           ExecReload = ''${pkgs.coreutils}/bin/kill -SIGHUP "$MAINPID"'';
 
diff --git a/nixos/tests/aesmd.nix b/nixos/tests/aesmd.nix
index f541cba289bf..2d51f2400817 100644
--- a/nixos/tests/aesmd.nix
+++ b/nixos/tests/aesmd.nix
@@ -14,8 +14,8 @@
         enable = true;
         settings = {
           defaultQuotingType = "ecdsa_256";
+          qplLogLevel = "info";
           proxyType = "direct";
-          whitelistUrl = "http://nixos.org";
         };
       };
 
@@ -74,17 +74,17 @@
           machine.succeed(f"sudo -u sgxtest test {op} {socket_path}")
           machine.fail(f"sudo -u nosgxtest test {op} {socket_path}")
 
-      with subtest("Copies white_list_cert_to_be_verify.bin"):
-        whitelist_path = "/var/opt/aesmd/data/white_list_cert_to_be_verify.bin"
-        whitelist_perms = machine.succeed(
-          f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/stat -c '%a' {whitelist_path}"
+      with subtest("Creates aesmd data directory"):
+        data_dir = "/var/opt/aesmd/data"
+        data_dir_perms = machine.succeed(
+          f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/stat -c '%a' {data_dir}"
         ).strip()
-        assert "644" == whitelist_perms, f"white_list_cert_to_be_verify.bin has permissions {whitelist_perms}"
+        assert data_dir_perms == "755", f"{data_dir} has permissions {data_dir_perms}"
 
       with subtest("Writes and binds aesm.conf in service namespace"):
         aesmd_config = machine.succeed(f"nsenter -m -t {main_pid} ${pkgs.coreutils}/bin/cat /etc/aesmd.conf")
-
-        assert aesmd_config == "whitelist url = http://nixos.org\nproxy type = direct\ndefault quoting type = ecdsa_256\n", "aesmd.conf differs"
+        expected = "default quoting type = ecdsa_256\nqpl log level = info\nproxy type = direct\n"
+        assert aesmd_config == expected, f"aesmd.conf\n\nactual:\n{aesmd_config}\n---\n\nexpected:\n{expected}"
 
       with subtest("aesmd.service without quote provider library has correct LD_LIBRARY_PATH"):
         status, environment = machine.systemctl("show --property Environment --value aesmd.service")
diff --git a/nixos/tests/web-apps/goupile/default.nix b/nixos/tests/web-apps/goupile/default.nix
index 66134685aca3..f38606830871 100644
--- a/nixos/tests/web-apps/goupile/default.nix
+++ b/nixos/tests/web-apps/goupile/default.nix
@@ -114,7 +114,7 @@ in
           machine.succeed("run-goupile-test")
       finally:
           out_dir = os.environ.get("out", os.getcwd())
-          machine.copy_from_vm("/tmp/videos", out_dir)
+          machine.copy_from_machine("/tmp/videos", out_dir)
     '';
 
   # Debug interactively with:
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 23e821f4494e..1955de70d183 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "153.0b13";
+  version = "154.0b4";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d";
+    sha512 = "1dae1edf7b97891224d186f469e31cfa0d2c4fbbdfd6d03f74c03b4421902739fee8d359c66b3c2c431318a4212b0e6221456a233fd6a141c96122f3c6e62bea";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index 633d5c6bb451..f66bb27327d4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,797 @@
 {
-  version = "140.12.1esr";
+  version = "153.0.1esr";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/af/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/af/thunderbird-153.0.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "be9018fd65fea36f04564f34277e82700dd6f6ea1a08a2141d7e8b1fd18d7aaf";
+      sha256 = "c254b1df124a869d386635af99add326308fbc6fcb4fd6e1a78a1cf7b17cdf9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ar/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ar/thunderbird-153.0.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "79deb45cd4b928e501498a0367882a9b05ef986f636f6d4decaad3dbf4b89880";
+      sha256 = "f2675fb2b1a66bb21bc412216361adcdc44314bfa2439b4ba98d53431b379fb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ast/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ast/thunderbird-153.0.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "ecf4361deb934a3a81434b58c6835eeaf226a7265a58b198572a03641858675e";
+      sha256 = "bf98d5580b81b1db31d87d1ce5979d04ac520de563b1bb04b1263d99c9fad0db";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/be/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/be/thunderbird-153.0.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "be21c4c898d1454573db61e7ee4b8428bb7656d5b9de839f43cc06bf18fc596c";
+      sha256 = "0afca657f2b8d558fa25150f8cb918ac0495f222e42493b01b2860f4331701ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/bg/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/bg/thunderbird-153.0.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "c14361f950b6fdacb576dcd1cfe751db826ff433cc7df7faa6463b654410a479";
+      sha256 = "91cf450c64d9735e0acd7d80600b16ab2f0ac1118ee83050d201c6df0f204901";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/br/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/br/thunderbird-153.0.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "e049cefec62df1fa31eeb9cfb0959d07ca6a2ed61fbc1e4b19b392d974900769";
+      sha256 = "036b4b071ec103f70c5b457c3fd23b9848845d0039941a59f5743c84381beed8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ca/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ca/thunderbird-153.0.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6f4a3318fec4a757750e586a4a97370c8db4320cb3033aa251a8eed21d18aa48";
+      sha256 = "7c7abc74b3c2349e4fb4219eee95404b25e20e978f5eade4d370568a25ebe832";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cak/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/cak/thunderbird-153.0.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f42fa814fe765c1f99acb1747708f0f485847020de43a82c62e72e5834e2c3d7";
+      sha256 = "6dbb25230554ebd99a0fec62960f3d02c1f1b02c506a328b6be149b2ae43177e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cs/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/cs/thunderbird-153.0.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "57f774c07dfe8145b3cb0dbd95f65c7f8e97aef3123774f43a2608b5159b03f6";
+      sha256 = "f64a125b1ce30cdc75ff9ecb6de4c6ec0398fba79ceaa0b4adf614873bfe0a18";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cy/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/cy/thunderbird-153.0.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "9cd18105b3ec4b7026e6eeb09610ebdc7e16e3f7d2f6af91b216a2356c97d6e6";
+      sha256 = "6120f453cc499b7b1390bcb255313ba92928175d6a7f94513c3541f645679ba3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/da/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/da/thunderbird-153.0.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "765ceeec2296798053febab1a1e32dbe142738db72b88945e619aa238713682f";
+      sha256 = "d9d27becc215bc3473c5e734a85ccf8b39327e7c87345ca44e8de44f3fbaf0f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/de/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/de/thunderbird-153.0.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "15ba511fb57c09b50b061b4bb164e21391b70a875dd5d0ee3a26fba414326f07";
+      sha256 = "dca3b067e41975be3953daafe8c1a1efeafb4f5a7faf82607b5701d83d2ecc63";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/dsb/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/dsb/thunderbird-153.0.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "dbf0bf70808da40282e32e1a75e0ed6f21af8fe47faf59888fcdd6be60a5f8b0";
+      sha256 = "dbdbbb02311f7b7d96c6fd0294164f135f8c685798697ffbe101ab088f71dc7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/el/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/el/thunderbird-153.0.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "4a9c787562473045724653302b2de0bca5626571633246a373ae1b06e57ba904";
+      sha256 = "33355fbd0aa7ca081afae475faedf782944f852d570623c84cc174ff5e49c9d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-CA/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/en-CA/thunderbird-153.0.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "4514da1947cc1733e29b19c4130283415caf6271df1e670779001d2544fbaf35";
+      sha256 = "0dee081d54c2d1ee8452c0809085b158f416a36b2bbcfc07ee61c98bb2f55dfc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-GB/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/en-GB/thunderbird-153.0.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "31a404d71ff2d3e6c6e0dfea7201cc5bb926fe22d0f57f2e6577384846c699ad";
+      sha256 = "4fb75e8bbe4fe2c16528807ef559d232f593b84719883fc88a4e80f2228bfbcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-US/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/en-US/thunderbird-153.0.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "9219a4dce3e4fa5b70678df7841151264d27ebbfdd0da8fa3dcb1c42f39afc9d";
+      sha256 = "80803c07b6a001a4ba86c8856505ea5db1b36c3d6d16f218fad4f3e683658618";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-AR/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/es-AR/thunderbird-153.0.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "4f2e575099db2aae498212b1cff6ec9f400f13e620d36a708b7dae0b4d26d19d";
+      sha256 = "9b324705c4ba7e454f873cf7ee1ebdfe17fd41a23ea4ae2fbc278fa1aefabb26";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-ES/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/es-ES/thunderbird-153.0.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "4c1c55cba2a2a9bd0bac06e3de6c53bbbdf83ca762d3dc2df7b8d5e7fcafb44f";
+      sha256 = "b21af68ba24f5f67ccd13d0c7125c8e56b3e122875d4ad2746f0c99c9b42ebd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-MX/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/es-MX/thunderbird-153.0.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "33db312a8bcf41d818db437b322c10a93742457440ac89766fc54e2990185785";
+      sha256 = "04dd4a52fd994e588af3d5d09e9d03fa90af14df0cf8bcf0ea171b8591790d69";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/et/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/et/thunderbird-153.0.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "890b21ffe3bc46cc16cbd568bd3c7c773688466b86508972c4bcf9ebd147c943";
+      sha256 = "739dea063f35565d0b148db9dc407b2d849831dc91b321b7ad8ccf988d16ddf8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/eu/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/eu/thunderbird-153.0.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "5219c5671612d0d2a0caf687769a1f44509ccece02a160804d89c1dc462a3602";
+      sha256 = "436b6b3dbcd94a5581b036ae2d911ddb13199c9f2818c460352a23bd7fbc22d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fi/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/fi/thunderbird-153.0.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "e95521bd64512ada8c370e3fe90c79bbf0b05e2b496dd199e1b041d6300ed657";
+      sha256 = "cced07d6d7affad4ae93a1473794d9b290e6b717aff74ea20f87fceb92957abd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fr/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/fr/thunderbird-153.0.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "2aa93022829facf005b19544247f5c12ff7cecc5f0794ec9526a95eeddf822ab";
+      sha256 = "90a4af6a26edf9b935271358cad880ed9b5aad5f49105b702eed8c940f0348bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fy-NL/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/fy-NL/thunderbird-153.0.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5be868b0a147da456afcd3ddf77a298fb70772f7bc63440e4861e470e91a64d5";
+      sha256 = "565b2cffa8da04668209d58a644f4cdd3d65b58f83f784524654ece01990e298";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ga-IE/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ga-IE/thunderbird-153.0.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "aa5c6b581f29e3075dfb648928c15a5adcecbf20933ebdff70e0849206e581c6";
+      sha256 = "f06c7076c5160df03a3416c0ba739fe0e7887e479975c4747c473d88d004b61d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gd/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/gd/thunderbird-153.0.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "16664961711bd9b9538747e107d429b1934ac1fe8310fd643febe7698324de93";
+      sha256 = "ace03818aa21e6b94f37516e5aae5f5433543c65e7737930dce4d4f841eb1eaa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gl/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/gl/thunderbird-153.0.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "6ff317dde8a319983a01f2b46466eebb8f2225eb2c88d5950f437616ebe84507";
+      sha256 = "968a7af793dcc009490c4044053260f41aa1528582b4f0369256c81382388c80";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/he/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/he/thunderbird-153.0.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e0bea2a1252ea3ea6529ea51059e732b03d45095ef3adc7ea7fdde36d83ad398";
+      sha256 = "3ae289767301055a2918058dc1ceab0dece45ba292bc8f891cecda32e423ed92";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hr/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/hr/thunderbird-153.0.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "1d298936666fac71a516acb54278ffe7e8ac1b5d37139d275624c48a793f2ebe";
+      sha256 = "73c5dca14382aeb3dabacf1aa32d636e96dc63e601cbe23308e3b63c498b7d57";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hsb/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/hsb/thunderbird-153.0.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "a46bda6771c5d83aaec24439de21c33a97f01cfbb712dd7d111a4baf589209dd";
+      sha256 = "e9ff552f2ce30c832b27563ac1cec94bed6708efe1a1f0bb853777a5f99614cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hu/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/hu/thunderbird-153.0.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "ebc0c1b12e90a53ae35652ccbe9181773a382fa02ecc29a74f29fca684f41362";
+      sha256 = "ae072529181ce8b2581207ea4f63ab54fb011269da9b0b2f9b793a6e49963b94";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hy-AM/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/hy-AM/thunderbird-153.0.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "0b54dc71db19e9d7e28402bee8b98c8d244fb8eac708621f0b5e168ec9662883";
+      sha256 = "33852d3c8da1c8980408fdf5b0e00e23e4470ee237fe5087f228d4c1d3f8d873";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/id/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/id/thunderbird-153.0.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "94e241fbd784980ae83d8d7238e8e30602d405827be3609b89a0a67d031cc99e";
+      sha256 = "48b4c8444f3559e89a2afb64f2068a91b92214984a400eef194fd485a0cb7e79";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/is/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/is/thunderbird-153.0.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "7c9fbe81d96274b8657a966ae7b093bc3e2a8f7e35ef256d175a6c2fc06d4d90";
+      sha256 = "b23ab3f78e2eba14a51898e652b4ca1bfba122c4c5a3085a3797a8c4c6cb4cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/it/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/it/thunderbird-153.0.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "17c912a8dbca2be4abfd29af189137e72b64213a2eaa2848a19fd5a1493f1635";
+      sha256 = "9eca88ab911bc92742f607fc088edc3f717fda3157b8909144a352d09cea657e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ja/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ja/thunderbird-153.0.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "dab5b64a874c14f6f9b07224e93ac2cc35f4f787e7faf57eb6e04030d1041cbf";
+      sha256 = "5ad10204603bd4a97f8c1cfef5c9f7759ea25fd790f13b199885e101132b2536";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ka/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ka/thunderbird-153.0.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "115d44e3d91e5018d426c2dbd204cefa019bd671c65a7bac125bb27614e6a5db";
+      sha256 = "4521bad27945deac3ffa81b6e472d94c319a57e55652dadc39497564f84b063c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kab/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/kab/thunderbird-153.0.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "dd5168e203131682bf80b0e7dfbaa7e212dbd375cf886861412eca7a1d0db7bf";
+      sha256 = "7cc905a86beef02eb8bf93bca7db057f20f8da816197859e954f7cc7e09eb114";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kk/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/kk/thunderbird-153.0.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "755d97a8987dd5bd8fdc5612ce687e162713670483b3c55e7b44c7dd042a91ae";
+      sha256 = "dc4560cea47c92ff727058236a16562be2605aaf6dc4cc7ca816b4617a9e1156";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ko/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ko/thunderbird-153.0.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "30687136cfa82e455667604e42f495e83a21ef90b19c865de4f7099013ff3cbf";
+      sha256 = "742ebc1f8303fc19c668a35048f36b14787d43389348b65d2e13918c079285a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lt/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/lt/thunderbird-153.0.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "f087ff1203bc99e78ebd04ac80527f547ca13da3c63fecf379ab30e130c2a526";
+      sha256 = "b1cf553bbc0552f04b4e62a71b778445ee210326a1df4f37385d3567f21e302a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lv/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/lv/thunderbird-153.0.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9fa7035fd9e39c727486d52ce5dc56bd17bf753758d5a5a693f7b33ee5736087";
+      sha256 = "9068a4630240b22a2e4959e8face13ea6f7de358b3ca3a71ad6df0d5a5844b89";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ms/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ms/thunderbird-153.0.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "7983e316aa18d324ba9fbca057d96ec0028575d126c32ae045176ddef811dbe4";
+      sha256 = "22cfde6f03067482d282643f9e52be077e10c34124d59f19327c9c306c68fff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nb-NO/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/nb-NO/thunderbird-153.0.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "d7921d8bf450eaa33646d3ae66c7645ccb88eb6486edee48134efec9759bd229";
+      sha256 = "dbf3568a88aab8435dbe73fd8e466b7360836f923479705091fbc662624361cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nl/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/nl/thunderbird-153.0.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "5a55d46fb87a2737986c6cb28c35140063040dfa9a734025504c5e818d896840";
+      sha256 = "844befab9c2615b459cbea69c96cd9629a34f27ea6a28aef5e3c39d999f68bb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nn-NO/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/nn-NO/thunderbird-153.0.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "fe501181a77c26d9653dea39ad93fc1d822ad1759ce4d39942eea10b2b85366c";
+      sha256 = "60de0fa2e8e59cd27850a0cb97b0a4d1740b598ca766f9893655eae3517c179d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pa-IN/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/pa-IN/thunderbird-153.0.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c8a3393940e824e07c3754be6a923d94fe18520eeeeb687234ce5dca7150c0e7";
+      sha256 = "670bea9d165a825735ee5e71453942996f9a3e89ae7346c8a45d44936cca7751";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pl/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/pl/thunderbird-153.0.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "a9491c647a326d167c4d48cd6ed12ae6dbeda56d74a327f52200c2a4be1160d3";
+      sha256 = "9cd62a8a4a78b7d8a8c7a86887c02a4162ad62704a26f3d22cf1ee693d0610bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-BR/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/pt-BR/thunderbird-153.0.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "1136d4946243d708dbc1c9da8e049d19c4e36c66f0c985820e37d78738ac7f6b";
+      sha256 = "001d34c6757a207bc07e24a0c55d3d747a0422fc890c19eaa2fb2230c4442760";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-PT/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/pt-PT/thunderbird-153.0.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "e23622710ac085886fd024e3190de0970aa51f9997ee58867f502f43b3cf631b";
+      sha256 = "96bf502e6c26dbae3408bd8a100820a461cbbed0054d62d3cd029922741ad47a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/rm/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/rm/thunderbird-153.0.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "5d151b3715a3dd26bb38a2c5d8c10214c9f23bce42018009a9add87b8ed69e17";
+      sha256 = "f2a65d278e109b95e7d637a84fb4109c340c3899addfee56f7f2fed864002433";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ro/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ro/thunderbird-153.0.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "0b113061d80cbaf5cb535634ce373167d6a64cb1f3237d33633d2fea125f8e4d";
+      sha256 = "fa5266626341219183c98d69a47995dae6c2b59626150dc7fdb6887c96b8a7f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ru/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/ru/thunderbird-153.0.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "7a39a7d6b459e27f321fdd38f39a95958c5032d3ecfcc051ac2ac44949d527c2";
+      sha256 = "c91855c40676f79d49fd0f04e19319307f1686f20a2526270839cd47e5d756b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sk/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/sk/thunderbird-153.0.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "63d73b38596f78719f3223e9bb2943e1e984f415d82ce6a2c33587c8e1c49e43";
+      sha256 = "e44e7e3d72dd68a71d8fd4331464d1678e4c7bb39f03b4d1ccb57530bc7443fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sl/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/sl/thunderbird-153.0.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "aceafcf6797834e8b4718b57124c0a1c4ef4457bf3e70e23ad5140c40ce2cf2d";
+      sha256 = "51d495d20e83604694af17af1b01d35efb200fa72adbdc1a47231560a46d94e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sq/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/sq/thunderbird-153.0.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "2ee339035fe6d9507a8e52879ed56982ed534f7cae580fd7ae46656607626042";
+      sha256 = "7ac882b3a3512861d3eb453233b47cc67ff1400e7e19287a7b046abea2ad07b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sr/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/sr/thunderbird-153.0.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "69bd23d5426be0eff640aa012a27375c1af0810dcdeeeab04760112bdad0a798";
+      sha256 = "8c0b53b481b41def0b483d619d1fbef8e0ae4c28440ab9adb3dcef4c42106771";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sv-SE/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/sv-SE/thunderbird-153.0.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "3860304e7c2690ce4596022744f2a4108f4e0850eea9c35fc5e5f3030119b403";
+      sha256 = "00f401fdf3264f96e4acc8b6fd28bbe10a487998852c47b131428d4d24b7fb0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/th/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/th/thunderbird-153.0.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "165ac84909adc334bc47b8c9df7cd5450fee5c4d645da893b1f337d4c36dc0ce";
+      sha256 = "9988206d8b84d4d2a1be0e32acf68442ea752ad7fb47d4764a35f0d34c5f9b1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/tr/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/tr/thunderbird-153.0.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "03ec5cda6b9e65b5a0763e354d39ff96586a8d1013f217354b8c0b44634aac28";
+      sha256 = "d45736457b4622549e08cbd78793ea71716fc3803b16e394c5342092f959ff49";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uk/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/uk/thunderbird-153.0.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "1fcfc649b3313e17d0a74a1ffef8ca05935632d7ae0efdd2c546555cd099cabc";
+      sha256 = "2dcc178b403ec301e3bc16cb6910e91880de225b68612adc2eb9e4a3aaf5147e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uz/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/uz/thunderbird-153.0.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "7385491cd07d147b598f8c95c0522b9d9eece19a3bb02b21112deeb419f78ede";
+      sha256 = "b845e9ee80471aa084ac4f4093151f74e714a10058de393509abec7ba8189d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/vi/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/vi/thunderbird-153.0.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "bddfaa6a2c41872e4b3a739163d1090e8173f08538dba53a5779087a58cde745";
+      sha256 = "72f317789a1457bf3a98d1659105553bba29abc37e044af12c4117c01d18da51";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-CN/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/zh-CN/thunderbird-153.0.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "d6a5a5ede7339f087c4ef4c246895be9e09200bbc7b4940d3d103c4c636d6aed";
+      sha256 = "9c0b723220b0faf35356c780d96d7691f23fa0b88b7a5dc9ccfba244076c050d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-TW/thunderbird-140.12.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/linux-x86_64/zh-TW/thunderbird-153.0.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7bffdbc3af3158652c2a1ae7fc824d26b7d57daa5bb8d65ef2137eb33bd3a2eb";
+      sha256 = "edb40d7991f5abb116efc91ce5f4fd60cf6d9c2fcc803c129aac4da76f3079ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/af/thunderbird-140.12.1esr.tar.xz";
-      locale = "af";
-      arch = "linux-i686";
-      sha256 = "b520b52478ceab0508b3ba28b4ba22b2c2ee3e7e6d683bd30591191af35ebe48";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ar/thunderbird-140.12.1esr.tar.xz";
-      locale = "ar";
-      arch = "linux-i686";
-      sha256 = "3251114ee3d1d01a51ab60d486c0251020986f87acec3e83ff19102c3d530b8b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ast/thunderbird-140.12.1esr.tar.xz";
-      locale = "ast";
-      arch = "linux-i686";
-      sha256 = "eabc7ae14de3b38dc7897b12214ac9a2564deaa3d98ef0893a704c6f5884478d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/be/thunderbird-140.12.1esr.tar.xz";
-      locale = "be";
-      arch = "linux-i686";
-      sha256 = "0be307dc8bedbedae132ca4a3c72e0437f7b625badf607ab6509eb0cd32129c9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/bg/thunderbird-140.12.1esr.tar.xz";
-      locale = "bg";
-      arch = "linux-i686";
-      sha256 = "5b9adf440bd069833843b02c00204971397b8a1e39a87b94da28e327d981fce7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/br/thunderbird-140.12.1esr.tar.xz";
-      locale = "br";
-      arch = "linux-i686";
-      sha256 = "01b47cbc9deb1d16b89b0965bcad20d51c60cc4cf26821264b080d410bca51a3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ca/thunderbird-140.12.1esr.tar.xz";
-      locale = "ca";
-      arch = "linux-i686";
-      sha256 = "5badc5fbddda73bfbe828ee095d27cd1c5f49d8787a9e4821fd09c26fd9f8885";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cak/thunderbird-140.12.1esr.tar.xz";
-      locale = "cak";
-      arch = "linux-i686";
-      sha256 = "4dccbba36bcd3f06e477e6d543e772e69a0635845d26d64f01a06010f858babc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cs/thunderbird-140.12.1esr.tar.xz";
-      locale = "cs";
-      arch = "linux-i686";
-      sha256 = "150838ded74553e561087eca0444ae6e9e46896540d91687431b5089ca83c37d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cy/thunderbird-140.12.1esr.tar.xz";
-      locale = "cy";
-      arch = "linux-i686";
-      sha256 = "f3e0a6c27e254772ca18c6937391186ce9126c57bec71dc71cd46e9dd9b17687";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/da/thunderbird-140.12.1esr.tar.xz";
-      locale = "da";
-      arch = "linux-i686";
-      sha256 = "f835517b095eb3e64f1cb84f7adce45a1af69d865ad26c563d926e97de3a2b44";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/de/thunderbird-140.12.1esr.tar.xz";
-      locale = "de";
-      arch = "linux-i686";
-      sha256 = "14c624a29ee80726352dca7101d6395e971a10ca9397d5a2b1c20cf106c61e64";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/dsb/thunderbird-140.12.1esr.tar.xz";
-      locale = "dsb";
-      arch = "linux-i686";
-      sha256 = "f9b99a02515378fcac4ce2cd2b65cfb647ef845750362a6d6a3ac61e98eba687";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/el/thunderbird-140.12.1esr.tar.xz";
-      locale = "el";
-      arch = "linux-i686";
-      sha256 = "3ed79ad13c821ad87c66376ce4f9283c19300added87a88d4d8735331ac44c7b";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-CA/thunderbird-140.12.1esr.tar.xz";
-      locale = "en-CA";
-      arch = "linux-i686";
-      sha256 = "698015ad0c3ef52a9abf38d20c5f4ab8f434f2450926a06a5c0840115121b4d1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-GB/thunderbird-140.12.1esr.tar.xz";
-      locale = "en-GB";
-      arch = "linux-i686";
-      sha256 = "1ac015e0f4bd8848bb95b6c2201b8167abbfc45421d800348a488ba0f3119edf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-US/thunderbird-140.12.1esr.tar.xz";
-      locale = "en-US";
-      arch = "linux-i686";
-      sha256 = "a21ca02982f3d88b03039b699bba90a77e0a7cbdeddfd51bed5e6a7ac29876e1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-AR/thunderbird-140.12.1esr.tar.xz";
-      locale = "es-AR";
-      arch = "linux-i686";
-      sha256 = "9781223342677c21b3b806df269a911e18954bab50df3829c67bf8d542f38953";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-ES/thunderbird-140.12.1esr.tar.xz";
-      locale = "es-ES";
-      arch = "linux-i686";
-      sha256 = "5aa5a3540b03a3ab3a7b7394467ce1985563ba8f51e92c449d5c82a14c3fa3f6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-MX/thunderbird-140.12.1esr.tar.xz";
-      locale = "es-MX";
-      arch = "linux-i686";
-      sha256 = "92b2b8bd6cd999376709cdaf196a76041cd5a26e789fb9b2ffe3e712183555c5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/et/thunderbird-140.12.1esr.tar.xz";
-      locale = "et";
-      arch = "linux-i686";
-      sha256 = "7886929abd458a1d1b734a205bed81d94993409ced11f031a5a53d546ec8765c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/eu/thunderbird-140.12.1esr.tar.xz";
-      locale = "eu";
-      arch = "linux-i686";
-      sha256 = "cca8aff9c6273d4145ec746d4b1cbfbca78bde4b663d0afc35ad8fa1b8576b4d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fi/thunderbird-140.12.1esr.tar.xz";
-      locale = "fi";
-      arch = "linux-i686";
-      sha256 = "7c1f5997171892e340f92c4de01f3f609b2f6a7c0a5189350823f39e6e7948f3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fr/thunderbird-140.12.1esr.tar.xz";
-      locale = "fr";
-      arch = "linux-i686";
-      sha256 = "5cbcd9928838c44896a903d4a42fb06be0ad12175da8c972a40cdaf14ea2a3a9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fy-NL/thunderbird-140.12.1esr.tar.xz";
-      locale = "fy-NL";
-      arch = "linux-i686";
-      sha256 = "7b3e22f7974d1a802e2445a04b1138b32560cf84425ae1c4d728dbfe333680d5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ga-IE/thunderbird-140.12.1esr.tar.xz";
-      locale = "ga-IE";
-      arch = "linux-i686";
-      sha256 = "87d459dd414167e12f97caa0d927b71e2a234d0ed12707978e1969b5aec03c3d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gd/thunderbird-140.12.1esr.tar.xz";
-      locale = "gd";
-      arch = "linux-i686";
-      sha256 = "83c6e9c09917d70484b86dc4b318449f5e92677e93266792ad72a4681fe4e206";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gl/thunderbird-140.12.1esr.tar.xz";
-      locale = "gl";
-      arch = "linux-i686";
-      sha256 = "f64dd91c64096cc6e06a455f952e41577511522caa939f08cce80d206a15508f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/he/thunderbird-140.12.1esr.tar.xz";
-      locale = "he";
-      arch = "linux-i686";
-      sha256 = "146089027ae517144c2f51576b1802f6a13f6fd9a58f451d61d09c70ec63429c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hr/thunderbird-140.12.1esr.tar.xz";
-      locale = "hr";
-      arch = "linux-i686";
-      sha256 = "a4ebb133d33be440bbafc4f3b87e0c5bc30c53834b8e990edcdf49766bfeb99a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hsb/thunderbird-140.12.1esr.tar.xz";
-      locale = "hsb";
-      arch = "linux-i686";
-      sha256 = "ad15e52932683f5408eea7749abd3745787b1d603afd283c8b380bcf5a313e4e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hu/thunderbird-140.12.1esr.tar.xz";
-      locale = "hu";
-      arch = "linux-i686";
-      sha256 = "562f1b5e58b7912b2c72a9dc72e14d4bf13f702a3aadae3a72cf697e9ee2eb19";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hy-AM/thunderbird-140.12.1esr.tar.xz";
-      locale = "hy-AM";
-      arch = "linux-i686";
-      sha256 = "0dc244101322a521e28598fad1cbd93ebdd0d2165a1d7fe126fc293b9c95ad92";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/id/thunderbird-140.12.1esr.tar.xz";
-      locale = "id";
-      arch = "linux-i686";
-      sha256 = "f6494040521b1aff5aa3be06167856a0d8ce699e6cb37a892cdfaa0070da4419";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/is/thunderbird-140.12.1esr.tar.xz";
-      locale = "is";
-      arch = "linux-i686";
-      sha256 = "e1597ef6a1313ee50f09f6fdd049c6f360d029c08ef23ce8b29925d82402365a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/it/thunderbird-140.12.1esr.tar.xz";
-      locale = "it";
-      arch = "linux-i686";
-      sha256 = "8e98a32d07b24259d51b3bf3752f3b85848403b1f59c57f51536330d0567471f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ja/thunderbird-140.12.1esr.tar.xz";
-      locale = "ja";
-      arch = "linux-i686";
-      sha256 = "ef83364088cee448f1a4e3b24661a78f615f51e8dad920b483e3234d4cd8f1b4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ka/thunderbird-140.12.1esr.tar.xz";
-      locale = "ka";
-      arch = "linux-i686";
-      sha256 = "3be9730bf6abe81eccb7d830b535ec5148b53cf2c1263aa400a2d2ecabcf7b38";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kab/thunderbird-140.12.1esr.tar.xz";
-      locale = "kab";
-      arch = "linux-i686";
-      sha256 = "84c9602022538c9dd109b70ef61041fe7418b772c35639f0bfb0fba8467c17b0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kk/thunderbird-140.12.1esr.tar.xz";
-      locale = "kk";
-      arch = "linux-i686";
-      sha256 = "888ed5bbe5e873bdd12b0688d5c3be8f4121dc4fdd8021e91e18512fd6ae597c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ko/thunderbird-140.12.1esr.tar.xz";
-      locale = "ko";
-      arch = "linux-i686";
-      sha256 = "11016f84ca55fdf8ba66895ec43c5c7c4ce45d36c1c8d877cf36a579c2a94e73";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lt/thunderbird-140.12.1esr.tar.xz";
-      locale = "lt";
-      arch = "linux-i686";
-      sha256 = "95a570c146e17c523d30194740f94a08cda05ba63d653865269af90bc953b89d";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lv/thunderbird-140.12.1esr.tar.xz";
-      locale = "lv";
-      arch = "linux-i686";
-      sha256 = "629ae06a9940b3bab1163ade2329adc3126ea41f4bfa1312e1e36786ce87e0a2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ms/thunderbird-140.12.1esr.tar.xz";
-      locale = "ms";
-      arch = "linux-i686";
-      sha256 = "1f692dbe750aaf4f05f95632352bc67c6da69488b632ef89641f74829af1c173";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nb-NO/thunderbird-140.12.1esr.tar.xz";
-      locale = "nb-NO";
-      arch = "linux-i686";
-      sha256 = "a481cbbc9888681e9b49c121b2ca94300fd427665b976b0ae124b6dbbb4d8987";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nl/thunderbird-140.12.1esr.tar.xz";
-      locale = "nl";
-      arch = "linux-i686";
-      sha256 = "a04d5ee21a69490b5ec0529704ec4f4f7db301f4a66bd15083ac945cbd549dfd";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nn-NO/thunderbird-140.12.1esr.tar.xz";
-      locale = "nn-NO";
-      arch = "linux-i686";
-      sha256 = "df72af0af915afb82253c85de7984ef29574b44cd179cd23f54ac59558768542";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pa-IN/thunderbird-140.12.1esr.tar.xz";
-      locale = "pa-IN";
-      arch = "linux-i686";
-      sha256 = "5a15e3a2362e53f3e9e1bf1ac9383e3bc120d5348894f8c6383af684345e2da1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pl/thunderbird-140.12.1esr.tar.xz";
-      locale = "pl";
-      arch = "linux-i686";
-      sha256 = "e4bda61c36cf9427f8086c6c84199c0599bac72008982a4ac2da89a26cffe8c6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-BR/thunderbird-140.12.1esr.tar.xz";
-      locale = "pt-BR";
-      arch = "linux-i686";
-      sha256 = "55ae0e5c95927befdf768469648dd1e60cbabc6fee17b19726e249a491dd43db";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-PT/thunderbird-140.12.1esr.tar.xz";
-      locale = "pt-PT";
-      arch = "linux-i686";
-      sha256 = "e7c26ade8ecc4b3e6917cb795f68945066feaa0079d5ccf0d50ce1edb770b5a9";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/rm/thunderbird-140.12.1esr.tar.xz";
-      locale = "rm";
-      arch = "linux-i686";
-      sha256 = "c77e809f87f7d13a3567952673f2d0b4c37dbac7cb95212500c693847cd6b41a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ro/thunderbird-140.12.1esr.tar.xz";
-      locale = "ro";
-      arch = "linux-i686";
-      sha256 = "c6062ca4e6626dc448e47362a5ed29de48e1d2ebb439d77d28d9478a2c0b4949";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ru/thunderbird-140.12.1esr.tar.xz";
-      locale = "ru";
-      arch = "linux-i686";
-      sha256 = "91c801faf58e6fc5794ca084b70bda15fa504d7b23b8a2b7a8db7bf75275ce65";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sk/thunderbird-140.12.1esr.tar.xz";
-      locale = "sk";
-      arch = "linux-i686";
-      sha256 = "72b93a682e47e2e246890ea6971ddc46ee586153549d70cc66b7f603a82c3227";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sl/thunderbird-140.12.1esr.tar.xz";
-      locale = "sl";
-      arch = "linux-i686";
-      sha256 = "4f442bd3a070de0a640527aa077ce480c1b18f16353425baf7efd179d19425c2";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sq/thunderbird-140.12.1esr.tar.xz";
-      locale = "sq";
-      arch = "linux-i686";
-      sha256 = "23fde29af4fbba7e20a01923b1abe259d296a74871a4ef370c0624a4a28f3a0f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sr/thunderbird-140.12.1esr.tar.xz";
-      locale = "sr";
-      arch = "linux-i686";
-      sha256 = "445c0654200decad0fdaf7612d9d24c20de827e19054bc619cb5cb65a28b06b8";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sv-SE/thunderbird-140.12.1esr.tar.xz";
-      locale = "sv-SE";
-      arch = "linux-i686";
-      sha256 = "04c8955cbd2cf75e2ec0d95abcd594e5a4de5a43f5387e4f37079254c3f61335";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/th/thunderbird-140.12.1esr.tar.xz";
-      locale = "th";
-      arch = "linux-i686";
-      sha256 = "c63fda92f76c6c4c921adfbf06822297665c981cd501b29ec332eb5794816942";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/tr/thunderbird-140.12.1esr.tar.xz";
-      locale = "tr";
-      arch = "linux-i686";
-      sha256 = "d4adaf76dfd82ce79ce77fff7b039471f5d308228efa7bddcc13b37f9b680060";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uk/thunderbird-140.12.1esr.tar.xz";
-      locale = "uk";
-      arch = "linux-i686";
-      sha256 = "280cd0d5a55af237fab2f2682a006b7f1e988fdaf02b9a44cda96f55658b6229";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uz/thunderbird-140.12.1esr.tar.xz";
-      locale = "uz";
-      arch = "linux-i686";
-      sha256 = "492146aa92ced6882a6a55a4780c28f88bae944fa074a3aa1a5859cfd9fa58ec";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/vi/thunderbird-140.12.1esr.tar.xz";
-      locale = "vi";
-      arch = "linux-i686";
-      sha256 = "9236344e5284f7fa5b04daef9d2dc0ba09ce21498aa4f2b8ecf35957f23d068f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-CN/thunderbird-140.12.1esr.tar.xz";
-      locale = "zh-CN";
-      arch = "linux-i686";
-      sha256 = "9cb9de006d389c13fd00fb0cf9df69139ff18c0b4ece994a2d4b0072f29ea770";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-TW/thunderbird-140.12.1esr.tar.xz";
-      locale = "zh-TW";
-      arch = "linux-i686";
-      sha256 = "92456256948e38efdde5ea801d0c373f0592707d1bb1178b2f1adbb60ae64213";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/af/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/af/Thunderbird%20153.0.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "0fef87105a73ba05dfdf6be92d472d4d5c982481506697a7d2a0add172842a8d";
+      sha256 = "549a5597a8025a61b2416f685a0a4cd5df70c189b712b532bb882057e2a2f64f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ar/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ar/Thunderbird%20153.0.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "28f6c9eab299bc3694d2ef7ae6138889fdae6ed7b7de78c6a9aada87fe4f38a6";
+      sha256 = "7428806d51f8de57f2639dd47f6651ce07eee899499045b9fb3174d1e4a36ca5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ast/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ast/Thunderbird%20153.0.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "63869bd4c720fd47ef289b217c5db2bce68518efe0f8345d1e3a44df51e8bc17";
+      sha256 = "3240ab85e8c6fa1b08f64264f79443e6d7bb1a94821635cb812dbf0a85facb0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/be/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/be/Thunderbird%20153.0.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "a5bcf4f3fee19b0b6c841669a83476759b75c0c7084fd01c0f2c45f84310a566";
+      sha256 = "1ff12040b0ddf14b7f1841c68a75ea0c8c0c28c380cb72911694bafbb603882a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/bg/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/bg/Thunderbird%20153.0.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "4b211c162a1ec29de5ad8d106c0a629600113c778491126c5897aad5228b0eff";
+      sha256 = "891be572593281f8b184217509f613c814de946900d1ff94ec23a3effeb9682c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/br/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/br/Thunderbird%20153.0.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "65985864e75f7d8d994070c8708d4ef8dfd3a00cd6dbd977a4fa30cad7e1cb57";
+      sha256 = "69b8a5facb9aa9ae850653f346ccf2904463120e4708fa41c50a39827d6d395d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ca/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ca/Thunderbird%20153.0.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "bebe335a26e384ee788885bb8b737b68b4fb8d6edad0c165425d9609079bca41";
+      sha256 = "ab2359f70e651c0c1b4d064c2ccc6da10abae426f107d1038612d5708dd9c4f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cak/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/cak/Thunderbird%20153.0.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "e94d4fe036361140e747c46ce55166603356f5d46bac4746e14a9363c1519f2f";
+      sha256 = "37214ff560dfca37c2741998004c519cad4df08e93b4915898ef62027f5994a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cs/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/cs/Thunderbird%20153.0.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "248cdafa7e62f4b49f914bdc6b5ee69643b754f68d86cd88018d7618e47d70b8";
+      sha256 = "89e107e0d7f389c63417c03531f90ad3154878384bdd2c1268ce0be16b35dbec";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cy/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/cy/Thunderbird%20153.0.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "dea95b3c3658ca476f48add5c9bcf89cee784d8076bfd951364168c519b8a7a7";
+      sha256 = "0b08c74675e0bafadec6a9ea3580d306e4e0d12d01d7cfcb3e7a49fa394c53c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/da/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/da/Thunderbird%20153.0.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "976a52ff8776cd75a90a8e3b3ac00026c96ba041f4e76a5de889d010851d4261";
+      sha256 = "8ad5bfe50edf56877a26f94676b7d562afb2236ad322cc4498bdda30a68d8c38";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/de/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/de/Thunderbird%20153.0.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "6fcb167da688ba52bce4477c62c8fe07c67f14718fadcd3719fd49bff63f8c80";
+      sha256 = "2ad3b84a0d3209cb0cba79e55f81eabd72b326e19a80350186b5eea2296e7a40";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/dsb/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/dsb/Thunderbird%20153.0.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "f3ac9ff7d9d24ffd6b267adda98af7944ad259a40600c4bd02d77097c551373e";
+      sha256 = "f50a54410a80eca47b2e1dd0f610aa04a40d38e12ec1d13bf2a5bc9a0b0905a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/el/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/el/Thunderbird%20153.0.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "481796c07b5d469746f9833e0cd5e8e3bfe1cf91216d6e4809b3e3d976f6a942";
+      sha256 = "93c7f61021510a986ae4a062280002ab41e73c5d0ead4e9521f38bb8e2635e1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-CA/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/en-CA/Thunderbird%20153.0.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "6f004764e0139d8ff51ac098d572c5a68351d144d203fa68b797490daa72c9cc";
+      sha256 = "9af58b7072a95d33ed0ad0b004c743d1fcec52cd52cf6e108c1759937070f36c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-GB/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/en-GB/Thunderbird%20153.0.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "a814bbb9e61deeb5395b11c1dba1f7202dfd4813319f5011d8f99bcd203c941e";
+      sha256 = "35458235b5383fa83778600276edae699b3fe89e290bd8db3fdf8b8dfaa2912e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-US/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/en-US/Thunderbird%20153.0.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "a7545590281d0d75bfcf107c5b281e45b5a09d64229ebfce33592c423b581006";
+      sha256 = "56773d41a4ccdea3a489b5bbcdbfe2251b09fc8813a5b1e54c4bd24e90f46a4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-AR/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/es-AR/Thunderbird%20153.0.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "0c36eeff28151332752f6144bba01d9dc5955fa31776824080b920cf474880d7";
+      sha256 = "a975333433bc1ebf73d4ab5913931343f9ce850b66ff74e496293624147471a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-ES/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/es-ES/Thunderbird%20153.0.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "f4d7bde33c2502435d4e9ab95fc82ce9b1a46f17697bb14b7fd64f51d1fd3d11";
+      sha256 = "2d2a43bcfba7bd493e42e73efb7ca3c3f1659a65106082845542eec686eca5c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-MX/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/es-MX/Thunderbird%20153.0.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "8b7d7252754f16e811e9ef1fc9aae774eb37ef1442dd9676ec8b4e70abd3f39f";
+      sha256 = "0f31f9aeb79f89295e6b8171be6fec58f9b8d97c7182836e2ba6734e12930d80";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/et/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/et/Thunderbird%20153.0.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "b330eb3fe10cd519f80676baa6936697efb9b9d095f7a166180cc36e6d7ee949";
+      sha256 = "b5a76c452737e22d61da7de348a0ca758a5dedc9529cd7b5359d2230ded58958";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/eu/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/eu/Thunderbird%20153.0.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "cfb69e8ebce5203178f0bb3a900849dff0f0444d72a16458b68c2e465f7c1217";
+      sha256 = "7b29e18b0e41e4b773d99d937052a730c4b69e83a471d42c5cbb8fcc8d436b3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fi/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/fi/Thunderbird%20153.0.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "2dacdc3c560f643d7fc967f306f53a872a7cc7558f2a3073ca85ff19a71bd347";
+      sha256 = "de6206d8651a36a60cabb1d7b78965089dcd4b7db90d8cad4d5ba28cdf7ac771";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fr/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/fr/Thunderbird%20153.0.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "3d5369d321de23abeb62ad1993342d6d6d71f2da56d0d2ab98011c46ac884876";
+      sha256 = "afd0f310a5d14e64bf1da2a1cc4b39a241ad5100c1d225c4e3cff5f2cf252e65";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fy-NL/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/fy-NL/Thunderbird%20153.0.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "020f9670a519155d05e772a20eaf35ef4aca8075cacd19873f1be23c84d49eaa";
+      sha256 = "3ef0b39ec84d648f08a05029c17bf76f8c4f7fe44c596bb3e3342b5e7f8963b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ga-IE/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ga-IE/Thunderbird%20153.0.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "d7724a80711c879d559c167088fe41aa1e6531ea38757d1aaae4fe3d043b2796";
+      sha256 = "dbb3a77479c959d4f135ab988bb2c89362617febf6cc786d978dbff54aec6ebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gd/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/gd/Thunderbird%20153.0.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "b6022adc6fc36979a66f8d74bd6e0476673882d6ac60ef0b22d2e59cefffefb3";
+      sha256 = "96e621d1c07918fd27544c60ee383cd48ddad4e2e5b768f5499d65bc2026779c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gl/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/gl/Thunderbird%20153.0.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "9b9878870596d85f78d511e37d4df4cf504bc61f1dcd5cf184989401b525f9a6";
+      sha256 = "201d26707ab952c31a969da76b21af1495f83aa430bb707690d831dee37b9545";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/he/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/he/Thunderbird%20153.0.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "f83d4794e193d00d14bc41b27e955372b9a2af3d6172520ea34433a0a0d20372";
+      sha256 = "ba59ca920123adfc42580fd53622b5a7221d4b46bf763931e939a49d1ba67dca";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hr/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/hr/Thunderbird%20153.0.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "8ccaffcfe95a610c00760bb4998be5ad8024bf2805f06d4bcd029ddfccaac0f9";
+      sha256 = "46ddc1459c9bdd3f70c270314a9d540bae94585403b267ab5f3bb341fb90f490";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hsb/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/hsb/Thunderbird%20153.0.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "69bd5f6eaa17c39817680fd9813043a383b564715bcbfdf85342f27d684de10e";
+      sha256 = "c01e306f751826fd17d162c2e197f0d06098e8472a071ba032df90121cf54968";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hu/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/hu/Thunderbird%20153.0.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "406c258b687c966f1c9bf0d28ff5a47f7cf2716fb20d99a88b512da12b6fc2a7";
+      sha256 = "4d550c5d2c461e5882b943dcb333ea8279a8b33f3a348dd7948f5d20a4c542e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hy-AM/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/hy-AM/Thunderbird%20153.0.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "182d1415b28855c5524aa6cab0fbd59d5bcb29f0464f5f06b70fff042e0256bd";
+      sha256 = "b02662feb1e8dd6ddb3390933f1e1aa141e584c12736546389e3e92a21fa460d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/id/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/id/Thunderbird%20153.0.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "94f5a03cffe7cb69d998fac6a24a448ea60b1fd22e75cd085eebb6abcf674916";
+      sha256 = "80d72d91005dce1ea10f48cfc94f6533facfc4bd34999906c49e02e2faf734bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/is/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/is/Thunderbird%20153.0.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "a6d3624410ac4186f669f7b7115b180ae547fd4c94b508e2cf78b655167fd4dc";
+      sha256 = "da0e30379923a6279855387c46c4553b3ce065a3c537d80a2b73869bd69cdecf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/it/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/it/Thunderbird%20153.0.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "592e9b1bf6ccaf7aa7c380e494910b95dd3975c06b9c069e41b319d744fb5184";
+      sha256 = "7a7fd8403d9b032f8be604464a7eeb0c0b8708be8f6c6192cd478be4c4da2164";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ja-JP-mac/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ja-JP-mac/Thunderbird%20153.0.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "fbe32356a00e8d5feb31387bce6e8345d9cfbf4e598646496fa84e0616717e4a";
+      sha256 = "08918f2819bd4de3a99287169729dbd157bb05e1a54538c5c7c3e7e4ba45988d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ka/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ka/Thunderbird%20153.0.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "260e84ba60f95110adef65b12e8e4f3af0b119e3d56c4610fea9f5015158e5d7";
+      sha256 = "1606ea3e455498167d4e8e45833d757d06643ff21d8f4e34004486bdf550f1ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kab/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/kab/Thunderbird%20153.0.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "fb4fd0e9652a1417b415d4df450e670753f915a05b32de6418e64e61cfd9a84f";
+      sha256 = "65012a2df74c31bd5dfbb58635a8479a3b88352df36e769e1e0ee167ecf90158";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kk/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/kk/Thunderbird%20153.0.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "41f4d663cc28831c7f33d364e18bc50ea4895dd1edbb4e71750ca42c5554f546";
+      sha256 = "d72ce90f64a82dabe72b3273607aead6d9e8a14e10dd002164a200589ef8c69c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ko/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ko/Thunderbird%20153.0.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "8788bf49e1d6b94dfd582510fabfb6db11f3d7b1d70a41f3116600f6f7244fe4";
+      sha256 = "1e07ff089ae037287ac075433d76da8ce4ac5974a2fb368b6398f5705aed8222";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lt/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/lt/Thunderbird%20153.0.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "d3202d63ae54f07a911d8d96bdb3a6cca4c798b31e6478a4d7be39246a614fee";
+      sha256 = "1d386090853a3092da9352cd0c6768c6c845b70cd242ecbe56be630ba2d36751";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lv/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/lv/Thunderbird%20153.0.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "89947413ee7e30f81d794aedd4f553fc84d25ed52556b48daa93b959cd2d4d80";
+      sha256 = "99e272ea04306b1527b063f17f8c659e89a24145b6cbbf576de5f8a11f2e57b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ms/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ms/Thunderbird%20153.0.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "d9fb626dd801eb542717767276fa8ab50615134d3c8fa6a6249a97a8b0a4d530";
+      sha256 = "e1d4085a92be62866c5bdc694b603845ee2f3ebbb683c5f5a5e46c44b5a60835";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nb-NO/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/nb-NO/Thunderbird%20153.0.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "361a10aeb578c2d00b4af934890b9d19fa6673308a3d8373d567944849980a27";
+      sha256 = "e354e72817b83588be11c2d7bfad8a4d4907ea1b6beea5c55bbe13e942939ff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nl/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/nl/Thunderbird%20153.0.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "bae2ec71f7164d27bf51895026f61c5bfc5726e841df2407164b96ac6aa9d6ee";
+      sha256 = "a8af603810428f968eb19b9e8c3e65ab77d7ac308daa2540798d878a1a7670d8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nn-NO/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/nn-NO/Thunderbird%20153.0.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "ad720bc0279ebe05dae45b4504fe3b59a5cb26cade9fb0552e7563b92424c9ae";
+      sha256 = "9942008e688eefeef674355865eb54d146ae7131adf55bcaeb478908a0bfa4fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pa-IN/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/pa-IN/Thunderbird%20153.0.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "4864c13e90c6002412f52a4ad4edf68f34ea595bfbdf73ae58d84445d243805e";
+      sha256 = "5076d32671135252f4b14cde05bed3803727019478d1f5f2a3ba6fcc38b6fc16";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pl/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/pl/Thunderbird%20153.0.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "5132c04421c86392a2b20f92a25c0f40760b106cededa99a32779b1376b2f3aa";
+      sha256 = "67f3d0da068d3fc6ca3543502ff8af4dc081c8bf7012262dcdc24673e7524fb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-BR/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/pt-BR/Thunderbird%20153.0.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "044b80f53e19945a95905cb14397038cb9031c8e87cd0c821f289cd72d94c6c7";
+      sha256 = "e251fd4a50940cfbc62bfe9ac948910020c11c92c9fc7891c631e059f7da367f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-PT/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/pt-PT/Thunderbird%20153.0.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "98898d9bef060de7f1d015ba41cb6d18970c621c6164ac2eae2fed5a1f5d0339";
+      sha256 = "b48ad6bb09f8e0dc38d7bf3a6d33a63f83bf101b9de6c8ab33268ba34bebb8bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/rm/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/rm/Thunderbird%20153.0.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "3f36fee7c1133c5b0e88c9653a1a1e4c6885dbd3e08656571ab11522092b443f";
+      sha256 = "8243f3d92ec6f39dc3ee58acc9729e1d6b3481ceeb8c40383a95ac0cd6eae370";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ro/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ro/Thunderbird%20153.0.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "7a92082eea4fd402b6268f9afd0edd1e628538a934c0043128622282ad4e2acd";
+      sha256 = "31f0aad850f1442f308f179cc1cd7a0e82659b7f3057d0d1e63edf9499e2e251";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ru/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/ru/Thunderbird%20153.0.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "23e1ca559b2b38d001704b5e4a412186a09f822c1f6da7e05f6c809ca79f908f";
+      sha256 = "6e011940c252971f26d34e0f5c0e2156b198ea956d08210d900b09b78e1188a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sk/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/sk/Thunderbird%20153.0.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "e22c2f92dd219666bb93279cd99b3c488e6a5ccc090b6c5f9a5d5dc53d0e8d7c";
+      sha256 = "d525ff0cd9508a3fd1bae097ec6a2a155caef436899234b62cde59d37523a360";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sl/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/sl/Thunderbird%20153.0.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "7229fdbe391154c0a5d2282f61c3e11d7fc226230a13552b4d4df1cb25cbc0e3";
+      sha256 = "360aa1caf8a72897301fe45845bccd7f50a5f68621b519d29ab4b82cbe847a46";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sq/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/sq/Thunderbird%20153.0.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "4fd15f38178e96fad7192587e557165bcafbe6b303ee0a5b46c48357e92348f3";
+      sha256 = "dc18ea14c87f4b2141fc1efe650d658c11df432a2e3097e2b866a815a717f5a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sr/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/sr/Thunderbird%20153.0.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "c7ae5528e9dc77069eccf1194273c1e47f784884a0c463e10b20c2bec4f2d614";
+      sha256 = "64de5c202a20dc5648c8b89c23c585e4c1b05d81e8f5271ab114c192a30aec08";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sv-SE/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/sv-SE/Thunderbird%20153.0.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "deb300d744da7c1ab6a64993b1f468ff6b9be32e8911569631b623a037208420";
+      sha256 = "43f172130773f6312f31afa36c2346f757c5d21f423f98fd8d009291e5d6d343";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/th/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/th/Thunderbird%20153.0.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "7554039b6255191f1c270dd5c3d9582cc9d0c2c4d904adf1260da99b6d6e413e";
+      sha256 = "7c7432759d49ae93a91b7a49e25c0b942f835fc1a668ad11c5ab36f3112cd5c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/tr/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/tr/Thunderbird%20153.0.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "18fa954a199e7b6d4520741f09e7549f33a0cd96111f8cc4228eb79a634af116";
+      sha256 = "9c4bc42f5bff5ad8364b1c036e0e4fed1ba65b09e1454f768b8ab96ae28d659b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uk/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/uk/Thunderbird%20153.0.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "ce9fe5b139dc104f300e834eca6d091832af90152537ff11729353e1314d05fb";
+      sha256 = "f2237a4a33109033af9a1f9cd1a1c06369641e486d59e09b98c274e0f7406446";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uz/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/uz/Thunderbird%20153.0.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "1417676c77fff78b411e532eddb17fc22f7c2eb92fa3a996de9135bdca4cd30b";
+      sha256 = "f72b86b3afe3f556d2b61c8f6f0624bd6752955bc938b50bb50eb011b434da4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/vi/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/vi/Thunderbird%20153.0.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "b2711b07f3db0980744c4576e95d5ad10846710e95dd1b75352eafc2b1052491";
+      sha256 = "2df54f057ed1999b3f829df99d62dfe96333445a7595642b15409d2c6aa28510";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-CN/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/zh-CN/Thunderbird%20153.0.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "a29458425d6fc8bd85307629ebcb841fa38d8e47a8dc419c38db1ad047663493";
+      sha256 = "fcbb1160f7be5e5d589e16372fa08070636091ea0b64dc4155e0a05d042c7b3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-TW/Thunderbird%20140.12.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/153.0.1esr/mac/zh-TW/Thunderbird%20153.0.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "10154c8457e2e1fb74355485b8d9afd251d134a7c189fca2886564b223683a1b";
+      sha256 = "50614bd2cb852ac97a9515472cb36bde9879ea69b70844a65996844741a109a7";
     }
   ];
 }
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index b392057b53fc..61cf8e96cfab 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -41,7 +41,10 @@ let
           service-identity
           libtorrent-rasterbar.dev
           libtorrent-rasterbar.python
-          setuptools
+          # pkg_resources was removed in setuptools>=82; deluge 2.2.0 still uses it
+          # standard-pkg-resources is an independent PyPI redistribution providing it
+          # TODO: remove once deluge migrates off pkg_resources
+          standard-pkg-resources
           setproctitle
           pillow
           rencode
diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index dd6dceeb4f7c..00d0ccf51fc4 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2026-05-02";
+  version = "0-unstable-2026-07-19";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "6df9b9832d0e4a1532040c0d4eba5b12bd795f79";
-    hash = "sha256-MOGVRIxlxyJk4LCW5iVtukV4fAnVoc+wORw2REGRyPc=";
+    rev = "51a71636fe38bc51cee54861689318ffb7d2e434";
+    hash = "sha256-DsY1Tto4M1/+tNVtAxdk1NvrEFxMgzZsiylmprSZtTM=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables
diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index 853007379864..61eee0e56f03 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "async-profiler";
-  version = "4.3";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "async-profiler";
     repo = "async-profiler";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wysOjirCfxm0SmwDW7GS+S73lAT8/0g4avu7T5+qy2Q=";
+    hash = "sha256-H3NBWyCjyuQkQ7HZ+B8ycBGIvQWdQDkx2SpQr+0gL08=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix
index f6c4d9b3b4d2..327f4de33041 100644
--- a/pkgs/by-name/be/betterleaks/package.nix
+++ b/pkgs/by-name/be/betterleaks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "betterleaks";
-  version = "1.6.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "betterleaks";
     repo = "betterleaks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2VjvTS2qOUH8W+hFm4xA3xCGZZs+oP1KQOSq6FBLjaw=";
+    hash = "sha256-tJk63QED2J0XV893M57xekVJrT50Dbqs0BoK5urDsSc=";
   };
 
-  vendorHash = "sha256-UBzobzZeIYzP+mU3+9GRF4lAs+cpqkIt+3mBpTN1BN8=";
+  vendorHash = "sha256-vwy3GJV7MPRxmM7ztwghKit5HZWnz+IyWNX5v/TKkfY=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix
index 48d21c728e1a..ce7b303d73ee 100644
--- a/pkgs/by-name/br/breitbandmessung/sources.nix
+++ b/pkgs/by-name/br/breitbandmessung/sources.nix
@@ -1,11 +1,11 @@
 {
-  version = "3.11.0";
+  version = "3.12.0";
   x86_64-linux = {
-    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb";
-    sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg=";
+    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.0-linux.deb";
+    sha256 = "sha256-3wQVUNTjFgoFBpy0Gl1r/FEdgqRrdjM3SFqPpl6z6O4=";
   };
   aarch64-darwin = {
-    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg";
-    sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50=";
+    url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.0-mac.dmg";
+    sha256 = "sha256-QuJaNTyBAVQb3SCHNjnhd5klxTrH/9/J56Mxl6l/sKs=";
   };
 }
diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix
index 989efdb51f4b..62b08c029d11 100644
--- a/pkgs/by-name/cl/claude-agent-acp/package.nix
+++ b/pkgs/by-name/cl/claude-agent-acp/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-agent-acp";
-  version = "0.60.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "agentclientprotocol";
     repo = "claude-agent-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=";
+    hash = "sha256-DBWsdGNbjkC1CzGwCpySOr07ruGkDdybfjkXI+3HXtA=";
   };
 
-  npmDepsHash = "sha256-dJeUPTcGN616YVKLcsiGgSn8wb7NhJZuZmPRHeUxR4U=";
+  npmDepsHash = "sha256-qx6IQzrndzPIcPhMZUOrZE8S3amfhoeMhg+gadZmHdk=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index de7b52ea5a8e..3f048ce4adf1 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
-  version = "3.2.4";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${tag-prefix}@${finalAttrs.version}";
-    hash = "sha256-Ea281W/CT/TfFNFMKV7xQzXnMo/25mCAB/Gs9ofyUU4=";
+    hash = "sha256-BqssEX4AcqOJJRe4H0ChbpCJE2Zw1TsOdL7sqc8kv2s=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-F1A0y4uZczVqzce0FfugCaU5Y2qqMZQXy7T6oqlgkbA=";
+    hash = "sha256-yFppXHv3sBcS8YYERYLTuRPw2jmhi1G+taiPVH1Vix4=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix
index d68121e4b43a..cda799d3a0fb 100644
--- a/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/pkgs/by-name/ff/ffsubsync/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "ffsubsync";
-  version = "0.4.31";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smacke";
     repo = "ffsubsync";
     tag = finalAttrs.version;
-    hash = "sha256-j9E4h2de2EOtYpuxKFbPOxZ5FBRO0EkbZhJdx5RiPn8=";
+    hash = "sha256-n9bYQgbBHGRJl79EiK7pTMDCcbI4ALudZUNc2SU0Wgg=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -36,6 +36,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     webrtcvad
   ];
 
+  # webrtcvad provides the same import as upstream's wheel-only dependency.
+  pythonRemoveDeps = [ "webrtcvad-wheels" ];
+
   nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
   pythonImportsCheck = [ "ffsubsync" ];
@@ -51,7 +54,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/smacke/ffsubsync";
     description = "Automagically synchronize subtitles with video";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      davinci42
+    ];
     mainProgram = "ffsubsync";
   };
 })
diff --git a/pkgs/by-name/ge/gerrit/3_12.nix b/pkgs/by-name/ge/gerrit/3_12.nix
new file mode 100644
index 000000000000..ba29a8965a1c
--- /dev/null
+++ b/pkgs/by-name/ge/gerrit/3_12.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./generic.nix {
+  version = "3.12.9";
+  hash = "sha256-iSMxBrJ+M3/I+X3dxBOUHmcEQ0VqLjq38mUJuII3hUY=";
+}
diff --git a/pkgs/by-name/ge/gerrit/3_13.nix b/pkgs/by-name/ge/gerrit/3_13.nix
new file mode 100644
index 000000000000..05fc0e9f8b0d
--- /dev/null
+++ b/pkgs/by-name/ge/gerrit/3_13.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./generic.nix {
+  version = "3.13.8";
+  hash = "sha256-7/S+SuXItnBabW0e5h/n9tezhW5sV/Ix8CmEOdx9EYA=";
+}
diff --git a/pkgs/by-name/ge/gerrit/3_14.nix b/pkgs/by-name/ge/gerrit/3_14.nix
new file mode 100644
index 000000000000..def281e86922
--- /dev/null
+++ b/pkgs/by-name/ge/gerrit/3_14.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./generic.nix {
+  version = "3.14.2";
+  hash = "sha256-OuM96W9++2QKD2O2IwkzDjmBaC9Ej/6ReHY/Rwujuno=";
+}
diff --git a/pkgs/by-name/ge/gerrit/generic.nix b/pkgs/by-name/ge/gerrit/generic.nix
new file mode 100644
index 000000000000..3dac7c181b80
--- /dev/null
+++ b/pkgs/by-name/ge/gerrit/generic.nix
@@ -0,0 +1,71 @@
+{
+  fetchurl,
+  nix-update-script,
+  hash,
+  lib,
+  nixosTests,
+  stdenvNoCC,
+  version,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gerrit";
+  inherit version;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchurl {
+    url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
+    inherit hash;
+  };
+
+  buildCommand = ''
+    mkdir -p "$out"/webapps/
+    ln -s ${finalAttrs.src} "$out"/webapps/gerrit-${finalAttrs.version}.war
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--url=https://github.com/GerritCodeReview/gerrit"
+        "--version-regex=v(${lib.versions.majorMinor finalAttrs.version}\\.[0-9]+)"
+        "--override-filename=pkgs/by-name/ge/gerrit/${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}.nix"
+      ];
+    };
+    # A list of plugins that are part of the gerrit.war file.
+    # Use `java -jar gerrit.war ls | grep plugins/` to generate that list.
+    plugins = [
+      "codemirror-editor"
+      "commit-message-length-validator"
+      "delete-project"
+      "download-commands"
+      "gitiles"
+      "hooks"
+      "plugin-manager"
+      "replication"
+      "reviewnotes"
+      "singleusergroup"
+      "webhooks"
+    ];
+    tests.gerrit = nixosTests.gerrit.extendNixOS {
+      module = {
+        services.gerrit.package = finalAttrs.finalPackage;
+      };
+    };
+  };
+
+  meta = {
+    homepage = "https://www.gerritcodereview.com/index.md";
+    license = lib.licenses.asl20;
+    description = "Web based code review and repository management for the git version control system";
+    changelog = "https://www.gerritcodereview.com/${lib.versions.majorMinor finalAttrs.version}.html";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with lib.maintainers; [
+      flokli
+      zimbatm
+      felixsinger
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 4d7c87408399..011b6d0b64d3 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -1,62 +1,3 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  gitUpdater,
-  nixosTests,
-}:
+{ callPackage }:
 
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gerrit";
-  version = "3.14.2";
-
-  src = fetchurl {
-    url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
-    hash = "sha256-OuM96W9++2QKD2O2IwkzDjmBaC9Ej/6ReHY/Rwujuno=";
-  };
-
-  buildCommand = ''
-    mkdir -p "$out"/webapps/
-    ln -s ${finalAttrs.src} "$out"/webapps/gerrit-${finalAttrs.version}.war
-  '';
-
-  passthru = {
-    updateScript = gitUpdater {
-      url = "https://gerrit.googlesource.com/gerrit";
-      rev-prefix = "v";
-      allowedVersions = "^[0-9\\.]+$";
-    };
-    # A list of plugins that are part of the gerrit.war file.
-    # Use `java -jar gerrit.war ls | grep plugins/` to generate that list.
-    plugins = [
-      "codemirror-editor"
-      "commit-message-length-validator"
-      "delete-project"
-      "download-commands"
-      "gitiles"
-      "hooks"
-      "plugin-manager"
-      "replication"
-      "reviewnotes"
-      "singleusergroup"
-      "webhooks"
-    ];
-    tests = {
-      inherit (nixosTests) gerrit;
-    };
-  };
-
-  meta = {
-    homepage = "https://www.gerritcodereview.com/index.md";
-    license = lib.licenses.asl20;
-    description = "Web based code review and repository management for the git version control system";
-    changelog = "https://www.gerritcodereview.com/${lib.versions.majorMinor finalAttrs.version}.html";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with lib.maintainers; [
-      flokli
-      zimbatm
-      felixsinger
-    ];
-    platforms = lib.platforms.unix;
-  };
-})
+callPackage ./3_14.nix { }
diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index f4f0ac8f918c..8d276be81072 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -6,13 +6,14 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "google-java-format";
   version = "1.36.0";
+  __structuredAttrs = true;
 
   src = fetchurl {
-    url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
     sha256 = "sha256-I2lt4F3SDYXBRJyN6fJBkDB5lQj1NWVw6Xn3+W5Z2NY=";
+    url = "https://github.com/google/google-java-format/releases/download/v${finalAttrs.version}/google-java-format-${finalAttrs.version}-all-deps.jar";
   };
 
   dontUnpack = true;
@@ -23,17 +24,17 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,share/${pname}}
-    install -D ${src} $out/share/${pname}/google-java-format-${version}-all-deps.jar
+    mkdir -p $out/{bin,share/${finalAttrs.pname}}
+    install -D ${finalAttrs.src} $out/share/${finalAttrs.pname}/google-java-format-${finalAttrs.version}-all-deps.jar
 
-    makeWrapper ${jre}/bin/java $out/bin/${pname} \
-      --argv0 ${pname} \
+    makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \
+      --argv0 ${finalAttrs.pname} \
       --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" \
       --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" \
       --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" \
       --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" \
       --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" \
-      --add-flags "-jar $out/share/${pname}/google-java-format-${version}-all-deps.jar"
+      --add-flags "-jar $out/share/${finalAttrs.pname}/google-java-format-${finalAttrs.version}-all-deps.jar"
 
     runHook postInstall
   '';
@@ -50,4 +51,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     mainProgram = "google-java-format";
   };
-}
+})
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index e0928c3290dc..05df6f58d43c 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "halloy";
-  version = "2026.7.2";
+  version = "2026.8";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = finalAttrs.version;
-    hash = "sha256-+qFHwlwRxVN4W9DG+gY5N6um+JARD+3EiLlsD7R9Tpc=";
+    hash = "sha256-OPSitjgfiBbqCNa3dIBHrFCP7097vsF78H5aCbtvPAI=";
   };
 
-  cargoHash = "sha256-/nFtOJXpusIlc7orGv013qzad8fdfQr32c8DAlccHIA=";
+  cargoHash = "sha256-LBJmiUxCHUZM1nzF7rCapKPELqdSLNdz2am7ivHSK98=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix
index 9a78f84bcded..39de6c86ab09 100644
--- a/pkgs/by-name/ha/harmonoid/package.nix
+++ b/pkgs/by-name/ha/harmonoid/package.nix
@@ -16,7 +16,7 @@
   mpv-unwrapped,
 }:
 let
-  version = "0.3.22";
+  version = "0.3.32";
   url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}";
   url =
     {
@@ -28,9 +28,9 @@ let
       or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
   hash =
     {
-      x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg=";
-      aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ=";
-      aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w=";
+      x86_64-linux = "sha256-ICnghYC25CLf5kzB6tUC/ocKI+J5HA7zyK9dEkLOWWE=";
+      aarch64-linux = "sha256-j9Pveq7iULBUVF7ochHWS9VynlJlk14m3KLRyAcNKiA=";
+      aarch64-darwin = "sha256-BrhumTPD7SjK9LRUp5giy5h7LdSrhQyVUXE1Crr0LXI=";
     }
     .${stdenv.hostPlatform.system};
 in
diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 69af58260a74..683621d50caa 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.17.17";
+  version = "3.17.61";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-Fu8qBiRWLZBK2Qn+fVPi7TVeqK+/ZD5a/c5yvPnypWo=";
+    sha256 = "sha256-4iDzS4ONDbCzXun2cB+t2c276VmKzIyB6OdeXEb3E6M=";
   };
 
-  vendorHash = "sha256-tGvreLuxaRswjCGzroCRRDZR4QadQKLrX9Hz3u22VZ0=";
+  vendorHash = "sha256-Rupnzj1kw0den6O0RZ5Fg5pZWRsfLuor3ntAiQjfIn8=";
 
   subPackages = [ "cmd" ];
 
diff --git a/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json b/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json
index 34fca93f94eb..30e233794173 100644
--- a/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json
+++ b/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json
@@ -3,7 +3,7 @@
     "description": "KeePassXC integration with native messaging support",
     "path": "@out@/bin/keepassxc-proxy",
     "type": "stdio",
-    "allowed_extensions": [
+    "allowed_origins": [
         "chrome-extension://iopaggbpplllidnfmcghoonnokmjoicf/",
         "chrome-extension://oboonakemofpalcgghocfoadofidjkkk/",
         "chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/"
diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix
index ba8479582ca4..517a3d8208b8 100644
--- a/pkgs/by-name/lo/local-ai/tests.nix
+++ b/pkgs/by-name/lo/local-ai/tests.nix
@@ -50,7 +50,7 @@ in
         # check if following issue is still valid
         # https://github.com/mudler/LocalAI/issues/2207
         machine.succeed("${jq}/bin/jq --exit-status '.[] | select(.name == \"api_call\").metrics | debug | any(.labels.path == \"/metricsls\" and .count == \"1\")' metrics.json")
-        machine.copy_from_vm("metrics.json")
+        machine.copy_from_machine("metrics.json")
       '';
   };
 
@@ -101,11 +101,11 @@ in
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json")
 
               machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json")
-              machine.copy_from_vm("embeddings.json")
+              machine.copy_from_machine("embeddings.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json")
 
               machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
-              machine.copy_from_vm("metrics.json")
+              machine.copy_from_machine("metrics.json")
             '';
         };
 
@@ -206,21 +206,21 @@ in
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json")
 
               machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" requests.chat-completions} --output chat-completions.json")
-              machine.copy_from_vm("chat-completions.json")
+              machine.copy_from_machine("chat-completions.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"chat.completion\"' chat-completions.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .choices | first.message.content | split(\" \") | last | tonumber == 3' chat-completions.json")
 
               machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" requests.edit-completions} --output edit-completions.json")
-              machine.copy_from_vm("edit-completions.json")
+              machine.copy_from_machine("edit-completions.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"edit\"' edit-completions.json")
               machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString requests.edit-completions.max_tokens}' edit-completions.json")
 
               machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json")
-              machine.copy_from_vm("completions.json")
+              machine.copy_from_machine("completions.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json")
 
               machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
-              machine.copy_from_vm("metrics.json")
+              machine.copy_from_machine("metrics.json")
             '';
         };
 
@@ -289,14 +289,14 @@ in
               machine.succeed("${jq}/bin/jq --exit-status 'debug' models.json")
 
               machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav")
-              machine.copy_from_vm("out.wav")
+              machine.copy_from_machine("out.wav")
 
               machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json")
-              machine.copy_from_vm("transcription.json")
+              machine.copy_from_machine("transcription.json")
               machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json")
 
               machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
-              machine.copy_from_vm("metrics.json")
+              machine.copy_from_machine("metrics.json")
             '';
         };
     }
diff --git a/pkgs/by-name/ma/mame/package.nix b/pkgs/by-name/ma/mame/package.nix
index 18f3de878d65..17d7731dc776 100644
--- a/pkgs/by-name/ma/mame/package.nix
+++ b/pkgs/by-name/ma/mame/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   alsa-lib,
-  SDL2,
-  SDL2_ttf,
+  sdl3,
+  sdl3-ttf,
   copyDesktopItems,
   expat,
   fetchurl,
@@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CC=${stdenv.cc.targetPrefix}cc"
     "CXX=${stdenv.cc.targetPrefix}c++"
     "TOOLS=1"
+    "OSD=sdl3"
     "USE_LIBSDL=1"
     # "USE_SYSTEM_LIB_ASIO=1"
     "USE_SYSTEM_LIB_EXPAT=1"
@@ -84,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
     pugixml
     glm
-    SDL2
-    SDL2_ttf
+    sdl3
+    sdl3-ttf
     sqlite
     libsForQt5.qtbase
   ]
@@ -135,11 +136,9 @@ stdenv.mkDerivation (finalAttrs: {
   # This replaces the `sw_vers` call with the macOS version actually being
   # targeted, so everything gets linked correctly.
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    for file in scripts/src/osd/{mac,sdl}.lua; do
-      substituteInPlace "$file" --replace-fail \
-        'backtick("sw_vers -productVersion")' \
-        "os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'"
-      done
+    substituteInPlace scripts/src/osd/sdl3.lua --replace-fail \
+      'backtick("sw_vers -productVersion")' \
+      "os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'"
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix
index bb69fb838287..0869dd5bd805 100644
--- a/pkgs/by-name/ma/mariadb-connector-java/package.nix
+++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix
@@ -7,16 +7,16 @@
 
 maven.buildMavenPackage rec {
   pname = "mariadb-connector-java";
-  version = "3.5.7";
+  version = "3.5.10";
 
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-j";
     tag = version;
-    hash = "sha256-ScdrBSJKbVyD/omPrxiZvuaa5uOo2d3SqX/ozalMWHk=";
+    hash = "sha256-6xdqlk+B7h19M2BxtH00u+No/znlN4qNAP0ozxy8+W8=";
   };
 
-  mvnHash = "sha256-CiUXHrabVX+ragocKbd4erIWr7J4kuWYcKYCDycpIrs=";
+  mvnHash = "sha256-dX3SqMSSgk6aOtjzC/e3418KMllbD+7V/vFeaZ9fE5s=";
 
   doCheck = false; # Requires networking
 
diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index d869968dff47..dd60553b4b25 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-continuwuity";
-  version = "26.7.1";
+  version = "26.7.2";
 
   src = fetchFromGitea {
     domain = "forgejo.ellis.link";
     owner = "continuwuation";
     repo = "continuwuity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gdTj7y1fwTG0CNWeK/0An6WM8YEeiw7TOuTjh1Zbe50=";
+    hash = "sha256-uE38tYYgze2q4hgW1mzk5CLTD3ezAwCnj+RQOmZtCdw=";
   };
 
-  cargoHash = "sha256-nhL4GRmw49n+UlHUKHcEJPoT/BNm+6eatqz/m+zjahg=";
+  cargoHash = "sha256-DZsRr0Xt/7HnlNCZfXK4dUILK/uEOnSD+r26OxvycD0=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index 11a55d3ed405..16260e110379 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -40,7 +40,7 @@ assert
 
 pythonPackages.buildPythonApplication (finalAttrs: {
   pname = "music-assistant";
-  version = "2.9.9";
+  version = "2.9.10";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     owner = "music-assistant";
     repo = "server";
     tag = finalAttrs.version;
-    hash = "sha256-ooe+QW+7S5LCgpin5/2g4L8+UDtr4TGZRpeR5F/tqZo=";
+    hash = "sha256-v9xFW83/v8CjKa04oql1yGQKB58VQtFmXZTN/KMN/gM=";
   };
 
   patches = [
@@ -195,6 +195,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
       "dlna"
       "fastmcp_server"
       "jellyfin"
+      "heos"
       "mpd"
       "msx_bridge"
       "opensubsonic"
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 9ac2b0a5ec6f..e21bc88f9efc 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.9.9";
+  version = "2.9.10";
   builtins = [
     "builtin"
     "coverartarchive"
@@ -148,8 +148,6 @@
     ];
     lrclib = ps: [
     ];
-    motherearthradio = ps: [
-    ];
     mpd =
       ps: with ps; [
         python-mpd2
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index e22691e3cc36..299785cffdf5 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -27,20 +27,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "2.31.4";
+  version = "2.32.6";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-lmkCT1o5LSC1ORd+Jozr9hkJu2znMpFO97jTWYOnga0=";
+    hash = "sha256-wWm6vGyJ2I2SBU38gRGaZG2FR5FBxH6V/sWQwn5B4Ac=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 4;
-    hash = "sha256-ejJ0ihsLdIXbNllDtoi7Yd1u4x61Czxm6d8zJ9Fj7p8=";
+    hash = "sha256-D8CKJxU2RoMjNrqIgGDE3mFBjc0kqFLQzT/DdUpiNmY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/noctalia-greeter/package.nix b/pkgs/by-name/no/noctalia-greeter/package.nix
index b8468ea63925..bef1e641a1ec 100644
--- a/pkgs/by-name/no/noctalia-greeter/package.nix
+++ b/pkgs/by-name/no/noctalia-greeter/package.nix
@@ -8,25 +8,41 @@
   pkg-config,
   wayland-scanner,
 
+  bashNonInteractive,
   cairo,
   fontconfig,
   freetype,
   glib,
-  gtk4,
   libGL,
   librsvg,
   libwebp,
   libxkbcommon,
+  nlohmann_json,
   pango,
+  stb,
+  tomlplusplus,
   wayland,
   wayland-protocols,
+  wlroots_0_20,
 
   nix-update-script,
 }:
 
+let
+  # nixpkgs stb doesn't have stb_image_resize2.h which noctalia-greeter needs
+  stb' = stb.overrideAttrs {
+    version = "0-unstable-2025-10-26";
+    src = fetchFromGitHub {
+      owner = "nothings";
+      repo = "stb";
+      rev = "f1c79c02822848a9bed4315b12c8c8f3761e1296";
+      hash = "sha256-BlyXJtAI7WqXCTT3ylww8zoG0hBxaojJnQDvdQOXJPE=";
+    };
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "noctalia-greeter";
-  version = "1.0.0";
+  version = "1.1.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -34,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia-greeter";
-    rev = "367ab83dcd9190010f093cfe0e123ba132a75b5a";
-    hash = "sha256-/jQ/lkgjaH5EOTZRXk4YZaFrjrKhq/fzZsU6nm7wPt0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3t/+o8Cbve8z43IekUNBj7Ecn/T+v7+p4Ivgs3IEQtk=";
   };
 
   nativeBuildInputs = [
@@ -46,18 +62,22 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    bashNonInteractive
     cairo
     fontconfig
     freetype
     glib
-    gtk4
     libGL
     librsvg
     libwebp
     libxkbcommon
+    nlohmann_json
     pango
+    stb'
+    tomlplusplus
     wayland
     wayland-protocols
+    wlroots_0_20
   ];
 
   passthru.updateScript = nix-update-script { };
@@ -65,10 +85,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "`greetd` greeter for Noctalia";
     homepage = "https://github.com/noctalia-dev/noctalia-greeter";
-    changelog = "https://github.com/noctalia-dev/noctalia-greeter/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dtomvan
+      samiser
       spacedentist
     ];
     mainProgram = "noctalia-greeter-session";
diff --git a/pkgs/by-name/ol/olivetin/3k.nix b/pkgs/by-name/ol/olivetin/3k.nix
index 67812e8ddc6c..008be82216ca 100644
--- a/pkgs/by-name/ol/olivetin/3k.nix
+++ b/pkgs/by-name/ol/olivetin/3k.nix
@@ -16,18 +16,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "olivetin";
-  version = "3000.17.3";
+  version = "3000.18.1";
 
   src = fetchFromGitHub {
     owner = "OliveTin";
     repo = "OliveTin";
     tag = finalAttrs.version;
-    hash = "sha256-fC+J1ejRDQDe3LfCNuZrt52mvXUxw8eMScCk1wsuQCo=";
+    hash = "sha256-74G/klFYD2dXBnTI6Pe1qArM3ZGFralsmGZJ2HlNN24=";
   };
 
   modRoot = "service";
 
-  vendorHash = "sha256-33tP6bZgwOTAXBgxfdbq1Dn73uVJE5dYR1drlxBe7eo=";
+  vendorHash = "sha256-QslY0UIdr0EXYxYfWe7URfEYroLEZ+Dm26Q4hpLxkJI=";
 
   subPackages = [ "." ];
 
@@ -75,14 +75,14 @@ buildGoModule (finalAttrs: {
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-+Afw5Q+3u24+eDk6yxN3WiyKmLtodaq9uk/mAKAz/G4=";
+    outputHash = "sha256-+U6WTWVVZI5QBAquhpNwbJQDp5GlDNL9T0xYEssF0TM=";
   };
 
   webui = buildNpmPackage {
     pname = "olivetin-webui";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-c76uc+t/hRZKRGeOnqbjAK7KbaWncBkovtjMm7pgGUs=";
+    npmDepsHash = "sha256-uXbUAREi9jyKqLwrA5bNDpnJ41QUbwYrk9PJDhTqV7U=";
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
diff --git a/pkgs/by-name/on/oniux/package.nix b/pkgs/by-name/on/oniux/package.nix
index b7540163375b..45ea7b149cfe 100644
--- a/pkgs/by-name/on/oniux/package.nix
+++ b/pkgs/by-name/on/oniux/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oniux";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
     owner = "tpo/core";
     repo = "oniux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ys6RjLyfhoAIiIlf8pv971txPubobY627jhk84HZhsw=";
+    hash = "sha256-04JywbJ//qgA56/5C4DZOliryZCnO0K3/0lyevFz7hk=";
   };
 
-  cargoHash = "sha256-4sXCZ2P4HFsW3g/CSIB2gwBMSddNXzdIav1tSWWOO9A=";
+  cargoHash = "sha256-a0hV4q288IWFC1a1jTvgkXAVyKGm8OnsRHwShnQjywI=";
 
   nativeBuildInputs = [
     perl
diff --git a/pkgs/by-name/oq/oq/package.nix b/pkgs/by-name/oq/oq/package.nix
index 966db6613904..ba93ac3dfeed 100644
--- a/pkgs/by-name/oq/oq/package.nix
+++ b/pkgs/by-name/oq/oq/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   crystal,
   jq,
   libxml2,
@@ -18,6 +19,13 @@ crystal.buildCrystalPackage rec {
     sha256 = "sha256-AgUVHlk39J1V1Vv91FjglT4mSbP4IHiRlTrlfmrJxfY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Blacksmoke16/oq/commit/151b5b1d60ed1cafa9fc2a1ec175dcd1732a3961.diff";
+      hash = "sha256-xWZ1U2A1ClwviSdGMvBeBgA16qKLuUzdBRmJblM7DAc=";
+    })
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libxml2 ];
   nativeCheckInputs = [ jq ];
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 563fb6bc5ad9..2eccbf9ae49f 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,29 +1,26 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-06-03
+# Last updated: 2026-07-30
 { fetchurl }:
-let
-  any-darwin = {
-    version = "6.9.96-2026-05-28";
+{
+  aarch64-darwin = {
+    version = "6.9.98-2026-07-20";
     src = fetchurl {
-      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/045f4292/QQ_6.9.96_260528_01.dmg";
-      hash = "sha256-cMgWMXfKtL4ZLBrjGhROpCMNAHtFIdnZRfyi9XtsIjI=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/7ee184e7/QQ_6.9.98_260710_01.dmg";
+      hash = "sha256-pDkK46kO5KxcGcDaQptKkgkH4XYEVUrUhxHvIXT1be4=";
     };
   };
-in
-{
-  aarch64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.29-2026-05-28";
+    version = "3.2.31-2026-07-20";
     src = fetchurl {
-      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_arm64_01.deb";
-      hash = "sha256-W82MzaQB+/oYIafDx1j4SiU8MXVo8LnC10QmokdJ6aY=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/c390e792/QQ_3.2.31_260710_arm64_01.deb";
+      hash = "sha256-rGBDcfXEhqz2y/g91mfmIu4fSH0Mi9QlYn3m1o/jSXQ=";
     };
   };
   x86_64-linux = {
-    version = "3.2.29-2026-05-28";
+    version = "3.2.31-2026-07-20";
     src = fetchurl {
-      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_amd64_01.deb";
-      hash = "sha256-HjgoB5ZzyUmUvA9HgNXYUoZHY5kgZZhi1J0cLyoZjiU=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/c390e792/QQ_3.2.31_260710_amd64_01.deb";
+      hash = "sha256-AvZ3/rHOAe0pOjx3YeXdhb15k29X3KpM21MXiuMOPW0=";
     };
   };
 }
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 4fd611d19616..a99d688469b9 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-httpd";
-  version = "0.26.0";
+  version = "0.27.0";
 
   env.RADICLE_VERSION = finalAttrs.version;
 
@@ -29,10 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "/Cargo.toml"
       "/Cargo.lock"
     ];
-    hash = "sha256-zSU8B5IwOEUS9d4Y/UWJ6eD0p3zvp0nWVgJmZ/kVB1Q=";
+    hash = "sha256-OJrHV5WdFNzoYrOkqpN1ctrJDB3JTJhH54q/C6IV9ZU=";
   };
 
-  cargoHash = "sha256-rdW+WLkQ4UEn6hRZfgJhJkJWb7A26MayXVnVwAlLAG8=";
+  cargoHash = "sha256-FjYhw27pAX9Tilgm/Tg18Vkv4/K5kEFJAbhv1mDY0rg=";
 
   nativeBuildInputs = [
     asciidoctor
diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index 3fb38f32625f..da6aaeadf404 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.70.0";
+  version = "0.72.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kvcxBrP6vzbhtzgFqMfTZwQlCJ6wnaAYbCNLotGQnK4=";
+    hash = "sha256-rekotcO5RMwCAlyqz9tsH3MrlLyr0sMxrW5sqXykV2c=";
   };
 
-  cargoHash = "sha256-UoZqxpcLZqXxZYTfLIaqMa/1gkIn9Ntmk2qsnaTmV7s=";
+  cargoHash = "sha256-aipz3siZhSau3en7udAvuHp3egXFQa/+a8UVu5W/NKM=";
 
   doCheck = false; # test requires network access
 
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 659112af119e..96dd5c8acb64 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -69,13 +69,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "servo";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-DfUjByBtDcOShExuBBLSHmgP9CPMSdkovw9QeGRDYaA=";
+    tag = finalAttrs.version;
+    hash = "sha256-oA6fFvSajUHFxyu5kgT3BZ8oxWNMdkdaov6tVkxgNrE=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-N0MUtL0HslJHEQUCB0iMbXGdD9hA6GRqcmdSjjhsu8E=";
+  cargoHash = "sha256-kFuW2RoE37ClYAEcEcRudQoUsRsjbUeEBbz/6d96FPU=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
diff --git a/pkgs/by-name/so/socalabs-sn76489/package.nix b/pkgs/by-name/so/socalabs-sn76489/package.nix
index 972c0a30a45c..e728dd901040 100644
--- a/pkgs/by-name/so/socalabs-sn76489/package.nix
+++ b/pkgs/by-name/so/socalabs-sn76489/package.nix
@@ -29,7 +29,7 @@
   enableVST2 ? false,
 }:
 let
-  version = "1.1.5";
+  version = "1.1.7";
 in
 stdenv.mkDerivation {
   pname = "socalabs-sn76489";
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     owner = "FigBug";
     repo = "SN76489";
     tag = "v${version}";
-    hash = "sha256-dQ697B0mhdIC0ltdY2EnErLNAGRKA6ARONX/kR3OLyI=";
+    hash = "sha256-gTFQ4Aibj2uesx0NRTM7H7diEzlic33Tl6gAzWUikxQ=";
     fetchSubmodules = true;
     preFetch = ''
       # can't clone using ssh
diff --git a/pkgs/by-name/so/socalabs-voc/package.nix b/pkgs/by-name/so/socalabs-voc/package.nix
index 51c2e57714bb..c91d1e716bb9 100644
--- a/pkgs/by-name/so/socalabs-voc/package.nix
+++ b/pkgs/by-name/so/socalabs-voc/package.nix
@@ -30,13 +30,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "socalabs-voc";
-  version = "1.1.5";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "FigBug";
     repo = "Voc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t9z+qnboGfHUcOp9WmfWXG7ss8VTkz8cv5qUMy//3AE=";
+    hash = "sha256-k+0oU157bXtwmGSccl2E4GUaRw9UYhQJ0dfQSdrK6GI=";
     fetchSubmodules = true;
     preFetch = ''
       # can't clone using ssh
diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index c5cf0d1e851b..e5e3fa27af2f 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus";
-  version = "2.0.4";
+  version = "2.1.0";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = "solarus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dgsRxP0tZQjwlQhgEd8RwPtO/oU62xyy8WrHECBRMjQ=";
+    hash = "sha256-Uq5KRgPzwga7inEVNZ1ObtgtUy+Ld6xzYTNVX6k2nks=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix
index 6ccd61e600f7..6920919b8d90 100644
--- a/pkgs/by-name/sp/spruce/package.nix
+++ b/pkgs/by-name/sp/spruce/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spruce";
-  version = "1.35.13";
+  version = "1.35.14";
 
   src = fetchFromGitHub {
     owner = "geofffranks";
     repo = "spruce";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-A1B9xFXqjxV34aPdg7tHOZIzQQR6boHTTO0ao2osiTY=";
+    hash = "sha256-EKhspLsuovnzJVFyp8+0cUSA+kRzPwJ0YHN5iUe5NRM=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/st/stalwart-proxy/package.nix b/pkgs/by-name/st/stalwart-proxy/package.nix
index a6af64bbe33b..480e7efd60b3 100644
--- a/pkgs/by-name/st/stalwart-proxy/package.nix
+++ b/pkgs/by-name/st/stalwart-proxy/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proxy";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "proxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CAT05X9z8VBoDyZhVdMCUgpMtUe4wJvvROQc/sYHROs=";
+    hash = "sha256-hLVxno+1hsCoMQK5HfTswIbUZkytjcO8Sgddfga/kDA=";
   };
   __structuredAttrs = true;
   __darwinAllowLocalNetworking = true;
-  cargoHash = "sha256-JXKqLM9rosaeCQP+UnY49FI6dpTEfd//jUhTEHoeKqU=";
+  cargoHash = "sha256-8TiWM3kqCsqtkTBh4cl4CeLEeM2PZq+FZNw0omcb7ME=";
   # `Result::unwrap()` on an `Err` value: Tls("platform verifier: unexpected error: No CA certificates were loaded from the system")
   nativeCheckInputs = [
     cacert
diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json
index 047791732301..148482db4c2e 100644
--- a/pkgs/by-name/st/stirling-pdf/deps.json
+++ b/pkgs/by-name/st/stirling-pdf/deps.json
@@ -1,100 +1,6 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://build.shibboleth.net/maven/releases": {
-  "net/shibboleth#parent/11.3.5": {
-   "pom": "sha256-eiTicASF7qCHNw8dym/gKR14k9OMEaq/6Xd4T9k7gIw="
-  },
-  "net/shibboleth#parent/17.1.6": {
-   "pom": "sha256-aNv/XNcQQnaE2RkPqDD+f6Qeh4bw3L4KnFCJ4eOHw8g="
-  },
-  "net/shibboleth#shib-networking/9.1.6": {
-   "jar": "sha256-Ww5GLaPgvmLBGQR4SLTo5a8OJfXjCby05QaTioYzj74=",
-   "pom": "sha256-8FG81s/DfZGF1YpnTOh5iZ2doFWhbbPBLJqsHK6C2oU="
-  },
-  "net/shibboleth#shib-security/9.1.6": {
-   "jar": "sha256-kOubnfH+6FFByJ+2YsT6oP4h3YYpT36OFmq4mPasZ9A=",
-   "pom": "sha256-Dr66teDUxKCJjrIIgYn8noqlTCVVamzF+QDmoPWEeOE="
-  },
-  "net/shibboleth#shib-shared-parent/9.1.6": {
-   "pom": "sha256-j4sB3+mRMM0/QoznqI6NOrx3sqxXVUrdc8b16RMcpWg="
-  },
-  "net/shibboleth#shib-support/9.1.6": {
-   "jar": "sha256-xlSJQYwyKJxfp6f+sa2NUHXk4K0U/RcLlZ61krU/BVo=",
-   "pom": "sha256-riBk/pidZt1CAKUWtTE5YzWAT+16mEIWTwpdDVSf7PU="
-  },
-  "net/shibboleth#shib-velocity/9.1.6": {
-   "jar": "sha256-mVU61oIHyVUhkSilUh3Oxi1HbaVlCao6VIpmI0AtdhU=",
-   "pom": "sha256-8UOidJfxQAGbjkNG+XagOfJISPIJFrwzHNj15ygbo4Q="
-  },
-  "org/opensaml#opensaml-bom/4.3.0": {
-   "pom": "sha256-TfzHzZaiZFxuKN+fFm8OWysaRKoQmzEAzbDuF+AeAtI="
-  },
-  "org/opensaml#opensaml-core-api/5.1.6": {
-   "jar": "sha256-NY2Z8rkgSj9EplQqKhGzzoCTKLq3xveKjQnpk7W2EjI=",
-   "pom": "sha256-KLydV1CtSAjvRiPnua7lbNwvXWbYbSxsSfB7X3nt1hg="
-  },
-  "org/opensaml#opensaml-core-impl/5.1.6": {
-   "jar": "sha256-p9Py9PeDT6qobb8jK9uLX3/bdjOwaqiWInmWicl+rPw=",
-   "pom": "sha256-lDTcZGlRP9OnrTuvPCOxCk0DUjg1YHhLR6OcPGHUt+0="
-  },
-  "org/opensaml#opensaml-messaging-api/5.1.6": {
-   "jar": "sha256-O4XvHBaRIIm85hCbzXBxJASSFmTzI+ODrO7A7AeXly4=",
-   "pom": "sha256-A7jojHwsel7XGAp7fbM3FXZ9I85amClvWzjZ26meNd4="
-  },
-  "org/opensaml#opensaml-parent/4.3.0": {
-   "pom": "sha256-Xp2y8tw5OINadvUzSZfXnIeBURyLaMH232s4QwaQAxk="
-  },
-  "org/opensaml#opensaml-parent/5.1.6": {
-   "pom": "sha256-1k/F9INWa1g1+d2UHHFgbJftsIKD3OI7Cn+ezOQxV9Q="
-  },
-  "org/opensaml#opensaml-profile-api/5.1.6": {
-   "jar": "sha256-dur3E8hULBZJZYzwDkXs08GYEvJmy9swbarhG/b2o+c=",
-   "pom": "sha256-b6x+EVSFJyNYQzzZ0a4vY9UbjQMZokb7lIdmlK+wI8s="
-  },
-  "org/opensaml#opensaml-saml-api/4.3.0": {
-   "pom": "sha256-hrUKkkxqSM1wzsy+3khWt4PS+uJUWQkK///VY860nV8="
-  },
-  "org/opensaml#opensaml-saml-api/5.1.6": {
-   "jar": "sha256-lPBZ8oagnmdj2wpGOLETOH8dxBBHynrR+jdALZhWtO4=",
-   "pom": "sha256-AJuIQlzZcbavF4SqEBYuuyd6/4vkGOHvFrldSKfmP8A="
-  },
-  "org/opensaml#opensaml-saml-impl/4.3.0": {
-   "pom": "sha256-xXkdPjmSgcUM688VsRD0di1o8N4t7N8toHpQb21PndE="
-  },
-  "org/opensaml#opensaml-saml-impl/5.1.6": {
-   "jar": "sha256-z1cqxCYb97Jgnjb87IAC3CUTeu+za35FCcHuInLzc30=",
-   "pom": "sha256-WsNwzuck0q/9QTgSZvNJNryeS/V7zz4nwnjXAHeXO2I="
-  },
-  "org/opensaml#opensaml-security-api/5.1.6": {
-   "jar": "sha256-WRp/0A2Ob8OwRYYQkSGtWiqlo3DeQb/L4hcMIKTxfzY=",
-   "pom": "sha256-p2+jySSXit4I2+HjqLPX5G32LBAKcx4nUMFmQ3R+ms4="
-  },
-  "org/opensaml#opensaml-security-impl/5.1.6": {
-   "jar": "sha256-PTI7fOq8+MvAPgVR0MB3+7S5r6aHTf6ZiJjot1Yf+So=",
-   "pom": "sha256-75bpXyDyXyq0m1nzuqJttMLGmcbhTseg5uXzvHNj/l4="
-  },
-  "org/opensaml#opensaml-soap-api/5.1.6": {
-   "jar": "sha256-iTZQK4KevjruTlhjxY7DoavTKO7boRJi0bU8lpsSesY=",
-   "pom": "sha256-NaUOG8SvqQxiuE4udAql31PegaRljeAAn7fw6kS9rO4="
-  },
-  "org/opensaml#opensaml-soap-impl/5.1.6": {
-   "jar": "sha256-viV1dvA/lhUtX99P6K+t2ynpYvQMaZ8DpVUhcZpob+Q=",
-   "pom": "sha256-tehuGTUBL8IZH3u5DYz4Ru+5zIIFMXCOMhru3UDcnwY="
-  },
-  "org/opensaml#opensaml-storage-api/5.1.6": {
-   "jar": "sha256-WDucdSqeGVk3+i63zjXTEz1VASr1pSgyIDUykUpoxYs=",
-   "pom": "sha256-bkxutjl4NC28TWCfXT1zugOS4RJtI7bcgt9KNkzrZhw="
-  },
-  "org/opensaml#opensaml-xmlsec-api/5.1.6": {
-   "jar": "sha256-5Z62Vb0/a/+MFQp4GAB2YkU0mqD6syywRl59IgP6+GE=",
-   "pom": "sha256-0tHFYo4LMh7YT7sFOv/lBApMy8jydZ+/MFRyN4tmc3U="
-  },
-  "org/opensaml#opensaml-xmlsec-impl/5.1.6": {
-   "jar": "sha256-emdGM8hYG1nGzp4U7Y2W6y1wxW03rU2hSSV5v1dlK4A=",
-   "pom": "sha256-bmywWOHZroZQYymviIzY232xu6QG1vKh9du234BARyg="
-  }
- },
  "https://plugins.gradle.org/m2": {
   "com/diffplug/durian#durian-collect/1.2.0": {
    "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
@@ -113,23 +19,23 @@
    "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
    "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
   },
-  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.4.0": {
-   "pom": "sha256-qJGqi+ZCZ2IVBb6uY6jeAqGACX3PO/wnBZ38b510pEA="
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.5.0": {
+   "pom": "sha256-e2OlaOqqqJg6bI53vUe5HCKHVsx6edJi7MYPWh8zzo0="
   },
-  "com/diffplug/spotless#spotless-lib-extra/4.5.0": {
-   "jar": "sha256-dU+ATAnfouuNU5YzEdK+aPG0pWIQEdy1UNcC6tKGUdk=",
-   "module": "sha256-Bf7t0gVQynxXCeUc7zgpPFADpcx/qrdU6dusW3Vd4KU=",
-   "pom": "sha256-UPJN+KOGtZ48rS2ylhjHOYgEgZAQYENCsX5jxubdPGU="
+  "com/diffplug/spotless#spotless-lib-extra/4.6.0": {
+   "jar": "sha256-ho9O9vCcjdbpdvX44TqUWErLPPMgu58JT2ZRDfW2A+w=",
+   "module": "sha256-zSUBCqIo+uAURznndwg1mj9svO4W91h7z4UjT91DX38=",
+   "pom": "sha256-MoY2uafCJbYxl8Dm3IfYIftzgINJwFpMY/Ho6hc57SA="
   },
-  "com/diffplug/spotless#spotless-lib/4.5.0": {
-   "jar": "sha256-mM2f5ktjmNp6kPL9kG7wq8Gg5tZvUZ/mrwilhde7bak=",
-   "module": "sha256-AlNtIagrdaWmOaPNQWCgg5oanDXy3EwP9FJBtHafXTU=",
-   "pom": "sha256-SvSliKd1rChPrVC/EUkkZwAE9rgKCSkT9QSOb9Gj2fI="
+  "com/diffplug/spotless#spotless-lib/4.6.0": {
+   "jar": "sha256-UL64DqEpIJgmO7gBW1WGRFKi0IB1gxHbQyFkzlCdDYs=",
+   "module": "sha256-iusnUGPKZwJTfK48GExNmqX+6f7KhPcShH1ViplbysA=",
+   "pom": "sha256-D+1Hx5JmvvntudPgpkKUiV6Gb2fyzSPDtpBSb8k87AI="
   },
-  "com/diffplug/spotless#spotless-plugin-gradle/8.4.0": {
-   "jar": "sha256-oHy1L8S4IhcWeW63AyMQakSjMZ7Itk5ugFb+gn+UOLo=",
-   "module": "sha256-lQhXXODePA1p+l+xrTWo2/iQKuoQVe/E0328FjyHMmc=",
-   "pom": "sha256-d0glMskp8EZGF/iXUT/CJNeuMlFeNIKaPO3F5WlH59s="
+  "com/diffplug/spotless#spotless-plugin-gradle/8.5.0": {
+   "jar": "sha256-RsI5vj2fEDna/l4Z37FtRiP8M7N+wMBCHdNWqoEev/8=",
+   "module": "sha256-E03bo8ZkJZ7YRKVSshsxtkd2hbC32Tmbzti4BxA04FE=",
+   "pom": "sha256-5KopOyPFsV9svw4Bzh418mS6DGHEOsRlepQ4eLsSthQ="
   },
   "com/fasterxml#oss-parent/75": {
    "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0="
@@ -207,9 +113,9 @@
   "commons-codec#commons-codec/1.17.1": {
    "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
   },
-  "commons-codec#commons-codec/1.20.0": {
-   "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=",
-   "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys="
+  "commons-codec#commons-codec/1.21.0": {
+   "jar": "sha256-TahRy2q/uYv+nrd8Xl/Ef1QU+ii5TiG3/ZpkZwXcFn8=",
+   "pom": "sha256-sjBBa6b1v534/Lbn9KbCa4+w/oXONx0T1YRu03aDCbc="
   },
   "commons-io#commons-io/2.16.1": {
    "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
@@ -290,6 +196,9 @@
   "org/apache#apache/35": {
    "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
   },
+  "org/apache#apache/37": {
+   "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M="
+  },
   "org/apache/commons#commons-compress/1.27.1": {
    "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw="
   },
@@ -325,12 +234,12 @@
   "org/apache/commons#commons-parent/85": {
    "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
   },
-  "org/apache/commons#commons-parent/91": {
-   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
-  },
   "org/apache/commons#commons-parent/92": {
    "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM="
   },
+  "org/apache/commons#commons-parent/96": {
+   "pom": "sha256-LNMom0TvpTBS2c2vPwVUSDOlIKaC+cf/1AOgC7sVf5o="
+  },
   "org/apache/httpcomponents#httpcomponents-parent/13": {
    "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M="
   },
@@ -370,12 +279,12 @@
    "jar": "sha256-gs86Kvdmw7yHT202ufIKi5mo8Jdi3HduiiJ6Rdjaqvs=",
    "pom": "sha256-yHzwb1qsRlY4Dx1EGyRZ++Bm7IErKUab0LP8uLsgV0o="
   },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": {
-   "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.6.0.202603022253-r": {
+   "pom": "sha256-Gyfwh66N5oI7rDQ3iMszFe/S5dKaEXZm/nWj/WVGwpc="
   },
-  "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": {
-   "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=",
-   "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ="
+  "org/eclipse/jgit#org.eclipse.jgit/7.6.0.202603022253-r": {
+   "jar": "sha256-oZv0QZBRZ7Oual3VjxlUq/skOt1CDjggcF3VvePjVgM=",
+   "pom": "sha256-juyILa3+FAIv6OGJcofDRVCyfUhhaZGs3vBHcPJkJoo="
   },
   "org/eclipse/platform#org.eclipse.osgi/3.24.100": {
    "jar": "sha256-0g+JIDBZb7wsJdoArNvSdQ93zv1oE2wzo+J5uJSYZ6g=",
@@ -474,6 +383,10 @@
    "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",
    "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="
   },
+  "org/junit#junit-bom/5.14.2": {
+   "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=",
+   "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8="
+  },
   "org/junit#junit-bom/5.9.3": {
    "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
    "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
@@ -584,6 +497,13 @@
   }
  },
  "https://repo.maven.apache.org/maven2": {
+  "args4j#args4j-site/2.0.28": {
+   "pom": "sha256-eeFR+5OfbJyNj5rlnlsOeoYt1aaZtNSVRwTnziXU+sg="
+  },
+  "args4j#args4j/2.0.28": {
+   "jar": "sha256-EbAppgLnh+K8COs7d+2hpPXosmPSLjxdYiDNXFHzCxg=",
+   "pom": "sha256-H4Ick2YLf6VzaSwwXKlwkuq2R87+zPyz9UdxEXw3N9M="
+  },
   "biz/aQute/bnd#biz.aQute.bnd.annotation/7.1.0": {
    "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
    "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
@@ -603,9 +523,17 @@
    "jar": "sha256-j3AzxXm5n6DZ1t3LlEiHW15LV3w1AAInjORpl9Z4tzc=",
    "pom": "sha256-cZEYGCECwlM+kqL2fANRAmTmFgVxpzishj51cSQXMj0="
   },
-  "com/bucket4j#bucket4j_jdk17-core/8.18.0": {
-   "jar": "sha256-DOjQqUKkmM6iYAb3Sub9G+1pUnJg3TuJeN8Z/haia4U=",
-   "pom": "sha256-ZIEK/GLmDET5YYHtnXSjAVA0QMX+y9WWtBfd+U16nUE="
+  "com/bucket4j#bucket4j_jdk17-core/8.19.0": {
+   "jar": "sha256-YDiFZjeZ4gP34XOUMV/b3FhP4CFkNhTYo0tJtT5hjHQ=",
+   "pom": "sha256-8bhzDzG0shjjzcw6BmW3cluLCZQBgDE/qA/2YFvhrfg="
+  },
+  "com/bucket4j#bucket4j_jdk17-lettuce/8.19.0": {
+   "jar": "sha256-rU+7Ydrh+s0ECwZLwu9Qi+couKChs5vWdHv1LfDXjQc=",
+   "pom": "sha256-D2F0M8DDGryFWq7+vjSluP1nrX566sjtj+KHcWp7nUQ="
+  },
+  "com/bucket4j#bucket4j_jdk17-redis-common/8.19.0": {
+   "jar": "sha256-p+og8gDLIpCZrc8+gMQlj5HvYrob9aTK9WUTmb8VrZQ=",
+   "pom": "sha256-4Tnf8308Ekal3WZiW/L8JIO+lRdvcLHWHZuMRc+ATDQ="
   },
   "com/coveo#saml-client/5.0.0": {
    "jar": "sha256-cgI4UPOCtJ2FbfvKbBKym87l6gmJQEQleG4UbkuUXIo=",
@@ -640,9 +568,6 @@
   "com/fasterxml/jackson#jackson-bom/2.19.1": {
    "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
   },
-  "com/fasterxml/jackson#jackson-bom/2.21.1": {
-   "pom": "sha256-jXx43eEPTQjnKWzvCEzzC3etzqejbiPRUgeT/exj/yg="
-  },
   "com/fasterxml/jackson#jackson-bom/2.21.2": {
    "pom": "sha256-vGxUnmMpJ7udigraIMhGe1AH07eXx/XbA6m2DR3lm+M="
   },
@@ -715,6 +640,33 @@
    "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=",
    "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA="
   },
+  "com/github/docker-java#docker-java-api/3.4.2": {
+   "jar": "sha256-Z4nWj5WQTPJ0pkEP38xVMJdryUGXyFaQlFm7jGTbVXs=",
+   "pom": "sha256-XZTShVo2NqawsyHOTQL846UhFZvMPxWqX3YJycwMYYA="
+  },
+  "com/github/docker-java#docker-java-api/3.7.1": {
+   "pom": "sha256-jTWG1wgOB4enISvtT2/hGlTVL5q+7KX4m+4gjGMIsWw="
+  },
+  "com/github/docker-java#docker-java-parent/3.4.2": {
+   "pom": "sha256-ZEWE+f5lQvtha3fA+RLb7zm7RYP0eX6uaAXxBymH72Y="
+  },
+  "com/github/docker-java#docker-java-parent/3.7.1": {
+   "pom": "sha256-eOZzQ04OGkuCWGOo/k1kF/SVr/3Oe00wjzd0RHpzsP8="
+  },
+  "com/github/docker-java#docker-java-transport-zerodep/3.4.2": {
+   "jar": "sha256-WCt3LgxS+p0kcQYX72EGVUZe3ZopMLDbdfyGZ9ao0Cs=",
+   "pom": "sha256-z5zk8OucYAWVt+iE+So/SvS3ZLR7ZKl96/TzSI0Uelw="
+  },
+  "com/github/docker-java#docker-java-transport-zerodep/3.7.1": {
+   "pom": "sha256-1y9psvQLp5HzsyyrTxZczBGDb/GBHQUzdRzy3MV0le0="
+  },
+  "com/github/docker-java#docker-java-transport/3.4.2": {
+   "jar": "sha256-vJmBIk/cLUcmVm/HI0cGAc6xQ3gmXIZbTCAxRqTjl2U=",
+   "pom": "sha256-eHHbIs6S2rk1Xaj35L1uI6BoEC54zvpACo2AQbi1zJc="
+  },
+  "com/github/docker-java#docker-java-transport/3.7.1": {
+   "pom": "sha256-O675mY7uojjvRDL+LOD/Dur5D+jToD/Qal4iSBS+SRY="
+  },
   "com/github/jai-imageio#jai-imageio-core/1.4.0": {
    "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=",
    "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw="
@@ -743,10 +695,17 @@
   "com/google/code/gson#gson-parent/2.13.2": {
    "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0="
   },
+  "com/google/code/gson#gson-parent/2.14.0": {
+   "pom": "sha256-grD2aUxXWKuLsH4FYwII1Q9YnUteBP0KBG1Zzfe6PR0="
+  },
   "com/google/code/gson#gson/2.13.2": {
    "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=",
    "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y="
   },
+  "com/google/code/gson#gson/2.14.0": {
+   "jar": "sha256-LL0Rm/GWHCh4gxCWPcgLpl9Yze7B3ROci9sSQPqiw28=",
+   "pom": "sha256-H6ASLA43MxkmQoYcNr5Mb3maeVMnojvdKSJpG26bpIA="
+  },
   "com/google/errorprone#error_prone_annotations/2.41.0": {
    "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
   },
@@ -754,12 +713,19 @@
    "jar": "sha256-U2S8byLnLpgZXkBqWNO6HAn/oR3qBylZLLhw3C3kBW0=",
    "pom": "sha256-2AyImkpvcR9pRfvueeBewkexeKVn6dWr9Y6ybr8KB1I="
   },
+  "com/google/errorprone#error_prone_annotations/2.48.0": {
+   "jar": "sha256-tJxclYMW7WegnGmd2pqnScr0NNUdhj3qWZ7zakm5yFU=",
+   "pom": "sha256-GJ4JrQSJwyXpDaqp1cj0BjMGAvo2Zgm8oHy82tA6udo="
+  },
   "com/google/errorprone#error_prone_parent/2.41.0": {
    "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
   },
   "com/google/errorprone#error_prone_parent/2.47.0": {
    "pom": "sha256-I2ipkMemMJXh0NREWdWkCS8Osx+FYr0SzfDhyHe2poU="
   },
+  "com/google/errorprone#error_prone_parent/2.48.0": {
+   "pom": "sha256-sz+opFyfF5SlAIwLLYOoTrKLXQEXptFW8AP58JvnQQ8="
+  },
   "com/google/guava#failureaccess/1.0.3": {
    "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
    "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
@@ -888,6 +854,36 @@
    "module": "sha256-yEQahybbGk+dTzngaOu0LfalnWR+MqnGHBW1OQ7VklI=",
    "pom": "sha256-CPvpfh4ugVoUyvFv9ayHCFEb713ec51gwHE5UYdtomM="
   },
+  "com/stirling#jpdfium-natives-darwin-arm64/1.0.2": {
+   "jar": "sha256-Jy3uCtUMP9v7CnP0Ax223rRCMG5uxUHpl4JcOR+c4WY=",
+   "module": "sha256-x1gci7X676q26K4oKG1P/1THjPVo8ofwT/c2Zxb5OkY=",
+   "pom": "sha256-4BlPDsF6qNpIsPt1sGe3PDoDXeTNPIR/KJ2nZKVdtlQ="
+  },
+  "com/stirling#jpdfium-natives-darwin-x64/1.0.2": {
+   "jar": "sha256-MOknHnAXXSuX9EicEI02bxeD0CZ7u5RD4uPfuMUa7JQ=",
+   "module": "sha256-ftSn7FE43X1Daf5S3JtKdV5Z284/wIVayo5dXlOVH0g=",
+   "pom": "sha256-Niue51BiUHVNrKTOWoYlX5JvR2KVkSrZK09LlfkDrv4="
+  },
+  "com/stirling#jpdfium-natives-linux-arm64/1.0.2": {
+   "jar": "sha256-PyV9SSpu26fjnBVSjWPk7ZdeqNd+w84to80fyB6RJJQ=",
+   "module": "sha256-PehWG6orSRJ/x/TMaTH7E0nSclIQFc5apD6Tzg1rtPk=",
+   "pom": "sha256-vkeoUt2Ol7DbFPuRqA3bfv3RHhmefEQctCfnBGu0PiM="
+  },
+  "com/stirling#jpdfium-natives-linux-x64/1.0.2": {
+   "jar": "sha256-SL8w09JO+B07MMq0/I9zNf11YcoiyIHOzVw+bkOa2fY=",
+   "module": "sha256-8mm3odjyo8gozfNk8YaFBGP17Wggr1QfY89zoIa6REE=",
+   "pom": "sha256-0YRWllBTpznT+9RfdlyseRMezCs3JxtEEWHkNMCSTLg="
+  },
+  "com/stirling#jpdfium-natives-windows-x64/1.0.2": {
+   "jar": "sha256-x+zlqBIhD+qUBFbYNQIYiSsDgKLYZFoObz8h5QaYbv8=",
+   "module": "sha256-B8lrv5noknHeZGIO2spu4fDzJ+KD7MpQSGuz5jW/BEo=",
+   "pom": "sha256-h5aXa6biCbWGtWe+Z7sbOBVU8fjfDshdBusdpvPoiOw="
+  },
+  "com/stirling#jpdfium/1.0.2": {
+   "jar": "sha256-m5vQo+K1whZs+3LV8etFnT047pTIayWhCB98lZ636+Y=",
+   "module": "sha256-iLo6iB9ancv1mXJFZ1oNBMRwZrx5vDEcmCGFm+Ti07U=",
+   "pom": "sha256-d6xFgvn13+/ancvKfseKA+cDSckKlHXYmI6bNNbv0KU="
+  },
   "com/sun/activation#all/1.2.0": {
    "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
   },
@@ -945,6 +941,26 @@
   "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.6": {
    "pom": "sha256-ObTY7GM3l0Di+zGP13zuOG65h8IzTW5famTs5hTDj+M="
   },
+  "com/tngtech/archunit#archunit-junit5-api/1.4.2": {
+   "jar": "sha256-1RVEzEjhycgFZw2jh24ouysH6QmE9eST0VsGHRHbtx4=",
+   "pom": "sha256-w20V+8fAQOsZfozhjET4d4xd7IzoUuXAL0lbJITq7W0="
+  },
+  "com/tngtech/archunit#archunit-junit5-engine-api/1.4.2": {
+   "jar": "sha256-erpADbEkEysUKjh+3Sok5E79wUtMo7KpGBUsV3DRaf0=",
+   "pom": "sha256-0gzTmpWUeisN5vVPluY2q4E3kXB7y1sPvCnKLavXc5g="
+  },
+  "com/tngtech/archunit#archunit-junit5-engine/1.4.2": {
+   "jar": "sha256-lk99cEJhWtj3rESdF0KFrPwvuq9ccG337eeDf7fOKEU=",
+   "pom": "sha256-vTs/jEXOt4bLLTU3J35QiAsjgEux0K9VBeOgxZKE94U="
+  },
+  "com/tngtech/archunit#archunit-junit5/1.4.2": {
+   "jar": "sha256-zSZB30HHBZ4h1GMcB8C6KEkVphhrhn9MAHXVa+Q8nkw=",
+   "pom": "sha256-Ivkt37EdweOiUrNRvjP4gYWvw4koGsFQE5ZN2PL/QGk="
+  },
+  "com/tngtech/archunit#archunit/1.4.2": {
+   "jar": "sha256-bYrfaaPxCevhs5V2T+sH+Rnp4OKrXi6hQdLmJRun0X8=",
+   "pom": "sha256-BWGCmFRShtaX+m0Gb2Wuv/f2jo7IjL8sPn13zhjyZjY="
+  },
   "com/twelvemonkeys#twelvemonkeys/3.13.1": {
    "pom": "sha256-MY7BaWEIe8rvIqNKm9IZSFShQGs9OQ2Cx0m91y4lyVg="
   },
@@ -1120,9 +1136,12 @@
   "commons-io#commons-io/2.19.0": {
    "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA="
   },
-  "commons-io#commons-io/2.21.0": {
-   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
-   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
+  "commons-io#commons-io/2.20.0": {
+   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  },
+  "commons-io#commons-io/2.22.0": {
+   "jar": "sha256-K5p7H3JvuGIW29LIMh6r4CIdvVsb6BwY4ctTgRsQR1g=",
+   "pom": "sha256-ZCXOwOp2ADXvp3J33oX4n6bb7RR6s92VuNLLxVNArM8="
   },
   "commons-logging#commons-logging/1.3.6": {
    "jar": "sha256-+OrYlDQBCB3qCqgktbG6QKDk7Sl6VyoPAiWBUKC2I1c=",
@@ -1175,64 +1194,112 @@
   "io/jsonwebtoken#jjwt-root/0.13.0": {
    "pom": "sha256-1RQ/LH01XhRXBmg0cgHHGj4f7m0dqRFfhr0RfdfWSWo="
   },
+  "io/lettuce#lettuce-core/6.8.2.RELEASE": {
+   "jar": "sha256-QKVQddXyb9sgQGOjPnSzbcBK3EhD/+wkWNzdwVCp/QE=",
+   "pom": "sha256-YpaLrHKRkLgnfIX/F/2of+rZbP4n2M3llnKzG71Ej5M="
+  },
   "io/micrometer#micrometer-bom/1.16.4": {
    "pom": "sha256-MzctnkRE2kislUebqJKUK21O/ftHKZNcPV11MjfJfck="
   },
   "io/micrometer#micrometer-bom/1.16.5": {
    "pom": "sha256-PmDAwxRRYkpywnRzAZIrk4dCr5WCa9P2W/MySYjQJjw="
   },
-  "io/micrometer#micrometer-commons/1.16.4": {
-   "jar": "sha256-0TMHhAqAeKvtxZeRaMC+eHfS26TH22wBZlvkV1cSE8Q=",
-   "pom": "sha256-EnHQPB8vu6En0qwu1oAu7iH3WaQAIfdijTcu8RAZ+KI="
-  },
   "io/micrometer#micrometer-commons/1.16.5": {
    "jar": "sha256-sMyMYgRT73HiLWxOxcSWzBEvlktOgmufhxgvyXUSyPk=",
    "pom": "sha256-8LaEiLA1apDXrD48txBQGGez+mPrEtV41VdxhkifQpA="
   },
-  "io/micrometer#micrometer-core/1.16.4": {
-   "jar": "sha256-x+YAjw/IcLlBKKEhyg5Sd84krJtBZB6KOrtMJTmZSZU=",
-   "pom": "sha256-dMTyHtgq/dvWhPa7hi3E5pS8Xwyo1dJac0J/NnIfGUs="
-  },
   "io/micrometer#micrometer-core/1.16.5": {
    "jar": "sha256-KQgiLS7tlBHQ0qejclAmzW2Kj3o/6rcAl0YAmBAkgWQ=",
    "pom": "sha256-CI1/TDLQIbD4Pma/bfeo3wGVMrqllMicTuGsnH3uxzM="
   },
-  "io/micrometer#micrometer-jakarta9/1.16.4": {
-   "jar": "sha256-nqCbWaYiepO0NzazO+FAipA4BR4PPkFXTc+WsDQT30A=",
-   "pom": "sha256-OR76IHoYTylbx0VAK9jyA8PR+fcNPQSAlSqP1uxotqI="
-  },
   "io/micrometer#micrometer-jakarta9/1.16.5": {
    "jar": "sha256-9A4H3qEPSQXPMhvZ5xmoeyiEk8uxDAwKG65xlLWZatQ=",
    "pom": "sha256-+cHTYpRF9jjEvepkK1Vx1qQ3tiSXpU0LOfndO+pqZ3s="
   },
-  "io/micrometer#micrometer-observation/1.16.4": {
-   "jar": "sha256-3UEMakIlcxo0ZuVrgf8JfRTNCS28m5c4T9lv7sHMNq8=",
-   "pom": "sha256-sEWLWEDBsj9FI8doywyEmcZ5puTWxo5ah/TFbDjadi4="
-  },
   "io/micrometer#micrometer-observation/1.16.5": {
    "jar": "sha256-RAbzNTUYX/iWN16agaS4aU4ovyDBCJsk3gMl2H9j3+c=",
    "pom": "sha256-aB5lE9G41sIiflUsDq3tI+JLo8dn0BBQRfc3KStVrjM="
   },
-  "io/micrometer#micrometer-registry-prometheus/1.16.4": {
-   "jar": "sha256-tzOQ+wkH8Rwqg3ptWOrfmv5F5nubxsxBPomkNlnclhM=",
-   "pom": "sha256-nb//Clgkuz19CA+6vuMm9XGfgsyIVay/kgvZ4/0zdkA="
-  },
   "io/micrometer#micrometer-registry-prometheus/1.16.5": {
    "jar": "sha256-yO5mJ7qhRYpiXu46rwAFVctK83k10LjDax7AzD3TG6s=",
    "pom": "sha256-TMfbwdnZRmh9XZRGj01uqvPnwGybGufnhdMzS8CInpY="
   },
-  "io/micrometer#micrometer-tracing-bom/1.6.4": {
-   "pom": "sha256-Iw5SQasDKgT3VvOK60TBb3cmflg/2VfCZcqq7Zrv+WM="
-  },
   "io/micrometer#micrometer-tracing-bom/1.6.5": {
    "pom": "sha256-DN4vpHYDj89HUT15Td58p3dHgazFcXdHJcxe5m8cDXE="
   },
-  "io/netty#netty-bom/4.2.10.Final": {
-   "pom": "sha256-m53avElJ8n+DSPTKo0SwOATPfwuyhnStDjff84rrHF8="
-  },
   "io/netty#netty-bom/4.2.12.Final": {
    "pom": "sha256-Sx6sh5HJMaM9ni+4wINDJVLPh0adtBm30kNBeONPBww="
   },
+  "io/netty#netty-bom/4.2.3.Final": {
+   "pom": "sha256-l9nxng/skazXb+tRGEAgxxZqIKMbjkhsabvH5XWTggQ="
+  },
+  "io/netty#netty-buffer/4.2.12.Final": {
+   "jar": "sha256-IN/6DkLHuQuMEU0Axzvfj4/1s2PjGAtEk1myYJ4zlWE=",
+   "pom": "sha256-N8uv6YOYW1xbVVYZrbui7jVG9gJhvu7trTbPLKttzvE="
+  },
+  "io/netty#netty-codec-base/4.2.12.Final": {
+   "jar": "sha256-6iZ+EAY4b6JMQAiel3QJBAlbut2eUBTS6VOQeBbfniU=",
+   "pom": "sha256-miXClAcoC7waJWsgRJLbA39TFsX42BKhh6kp99l0qj0="
+  },
+  "io/netty#netty-codec-compression/4.2.12.Final": {
+   "jar": "sha256-uhIyMt1WJxB0S5i5kXCD22MnkZCGL4PzwMcqJPcUrhU=",
+   "pom": "sha256-gucgtDDQwyWUgxEgavy3nYD0XhrRZo9DiWsJI0G8AWs="
+  },
+  "io/netty#netty-codec-dns/4.2.12.Final": {
+   "jar": "sha256-dHPBl5/2UCygFGMqH1umCcdWzwVsK5DWhxt2HjR5Mms=",
+   "pom": "sha256-Um9njVt5VEysxS4TSU9GwV7OPYz8/5Amn4U+bRjfbhg="
+  },
+  "io/netty#netty-codec-http/4.2.12.Final": {
+   "jar": "sha256-Lpp0iTtz+puuvsHYgMJ0t1pi2y1Wo6pLp4Pzj9I1WAU=",
+   "pom": "sha256-HV2TrnoNkUXFM8cTBllh+5sD78SwikJKOepOJVHJWcg="
+  },
+  "io/netty#netty-codec-http2/4.2.12.Final": {
+   "jar": "sha256-VO752FVxCDx2ckvSY/YJgjp0FiBnZWQrXOE6sPCoB8w=",
+   "pom": "sha256-wCvESvbxO+K1EKbZcXaiBHjelw7F7L4dwjV5VhE/dRA="
+  },
+  "io/netty#netty-codec-marshalling/4.2.12.Final": {
+   "jar": "sha256-n+VE1BmeXR7VhLIDOdcEYY86DZ7g4K7sKObLGGMAnwo=",
+   "pom": "sha256-1YICe5PiHJqCeOoYuLQebhYUAq77d8lCL35QofN5UKw="
+  },
+  "io/netty#netty-codec-protobuf/4.2.12.Final": {
+   "jar": "sha256-j/lr78LmviXbZ9K3PDQ/slPKEBjt5oJoLxNX6FrSOJY=",
+   "pom": "sha256-E7TVb1xPfAP4vx2KkGFu3fecI+w7nA9mLZPj1tNJL4U="
+  },
+  "io/netty#netty-codec/4.2.12.Final": {
+   "jar": "sha256-/RNFeaAh5uEMAAP6CmT/VrQ/eYhaMOCQm+h1edMuRhA=",
+   "pom": "sha256-FuHLq7SlMf8as56dStfZ2zMo62Gfrfxbj3zZxagKY5Y="
+  },
+  "io/netty#netty-common/4.2.12.Final": {
+   "jar": "sha256-mwPk0I70w+TpcGUYb9PhSFMBUy70MD+fwpBJ3RNHW40=",
+   "pom": "sha256-PVWLvNf9+Mt/2+VsEQJCV4pIkYQnjLWE5/lHQf8O0gA="
+  },
+  "io/netty#netty-handler/4.2.12.Final": {
+   "jar": "sha256-ePpzRia8Z87zkZHRKEMl2VQA4e/LGz/nW1mvP6tpktk=",
+   "pom": "sha256-ViiYrLDYNGqD2g+CY3zlFCX1LuJIJFzhhpklWgbIvnw="
+  },
+  "io/netty#netty-parent/4.2.12.Final": {
+   "pom": "sha256-bv+/y4g0EQ9E7cLzBgeRrctwgf2gFgFE4pwX3sfwrMU="
+  },
+  "io/netty#netty-resolver-dns/4.2.12.Final": {
+   "jar": "sha256-UMHiU5BTx0fbLSdtLWm/qqve2fZE3EDswLF14Phj+tc=",
+   "pom": "sha256-Nzl0Tzyltqo9ewxifbfLm3AIOD04MSRll9OgSlFkg2E="
+  },
+  "io/netty#netty-resolver/4.2.12.Final": {
+   "jar": "sha256-UzvlcV+XtaNAmETAlbjdSrfimI/RkgzYJUWHPd3IEso=",
+   "pom": "sha256-Hg6+bYSCTcwKNAAf/cLHmDx8VrcW2ycbfpC+66/3xSY="
+  },
+  "io/netty#netty-transport-classes-epoll/4.2.12.Final": {
+   "jar": "sha256-9FgM0hZNEfPDWP57SF11qZwlQbds0SLo+w6EnQoSINU=",
+   "pom": "sha256-pwbxOwOeTXlAv+0ai6UK3Mz0YOjrrhgvFUTkg9Or6aA="
+  },
+  "io/netty#netty-transport-native-unix-common/4.2.12.Final": {
+   "jar": "sha256-GKsB1roPRLsqQ5MCCjDzofU5mOoMbinVB2trZS1MkCM=",
+   "pom": "sha256-DiIEn5AIOUVZdxT42ldJraMV7N209FvRIohEItQuhYo="
+  },
+  "io/netty#netty-transport/4.2.12.Final": {
+   "jar": "sha256-Wt2ZI27fldAF1Cm8DLl0hnh0m1sB/WlVeqf2O2Iy/qg=",
+   "pom": "sha256-+DlWDaKMQKQKE097exEnOg2hNexbgrt9F/7OyT6pygE="
+  },
   "io/opentelemetry#opentelemetry-bom-alpha/1.50.0-alpha": {
    "module": "sha256-motyKjX+LhSR/JEgCdMdXZ0XyRe/gYq2eumOKXyfxmg=",
    "pom": "sha256-gkb0AxHagYEEX+g3T0Vxm693rCteW2iYa6ljEQi2WIQ="
@@ -1261,6 +1328,11 @@
    "module": "sha256-cDXYCyd4P8iFB6PNi52z5dVwHdy5Gyne2oPemSe5vXY=",
    "pom": "sha256-c6XvkM/Nrys9ke0mX+my222OHRaa8jqnxe6Yy6pdpns="
   },
+  "io/projectreactor#reactor-core/3.8.5": {
+   "jar": "sha256-xKHMi85/XnQ61rNNzyygsQH0uS1WT+fgBkVTJL5iUoE=",
+   "module": "sha256-yEaOjNj1+FYyFWrNTxM4Bjg+8ikVh7SJbLwGubpHIJk=",
+   "pom": "sha256-fzFLGyJMxU7Ycj2xiZC8octbIaUZSyvAsr/O6TrLtUY="
+  },
   "io/prometheus#client_java/1.4.3": {
    "pom": "sha256-dmdgOlsaUgKU2Lnb9yRlgAlrENWQ2JcFboXMrDWVDQE="
   },
@@ -1455,6 +1527,13 @@
   "net/java#jvnet-parent/5": {
    "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
   },
+  "net/java/dev/jna#jna/5.13.0": {
+   "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=",
+   "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q="
+  },
+  "net/java/dev/jna#jna/5.18.1": {
+   "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
+  },
   "net/java/dev/stax-utils#stax-utils/20070216": {
    "jar": "sha256-fH/QiSyzNi7S5Dzi92yPGPLX/x03HtdJB3W3No8/7po=",
    "pom": "sha256-BKPo5xarrKTmj49f+ddxJuTWFR194VfKFalup9JRteQ="
@@ -1527,6 +1606,10 @@
    "jar": "sha256-APkyY8JnviAbiuUhtEpxNycbFmiENTQL9inbG6wKWEU=",
    "pom": "sha256-xwD5mOHXpqXArvHUzutrrH0XAt1tbtpzoX1n9dbyRn0="
   },
+  "org/apache/commons#commons-compress/1.24.0": {
+   "jar": "sha256-+/LF0nXlE8CPTk+1OXJtvzrCFCr5VrqT77mDJE8MNr0=",
+   "pom": "sha256-g1qmZTLHql7G6F+FKJ2NP6raDGmLmLmxpBC4pUmcMMU="
+  },
   "org/apache/commons#commons-compress/1.28.0": {
    "jar": "sha256-4VIpRSGEVvNkmjm8Sv1wzkvUZiIVGdun03jyFBpGQso=",
    "pom": "sha256-Az9MeNYy2ojQ646tl0/BSiZDks6/EqtsaNbOp63wxko="
@@ -1562,6 +1645,9 @@
   "org/apache/commons#commons-parent/54": {
    "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
   },
+  "org/apache/commons#commons-parent/61": {
+   "pom": "sha256-0+wtNYSB/lEmDBNbtg+lIRwvXhhaFOp/eNA6Fr2QmNc="
+  },
   "org/apache/commons#commons-parent/64": {
    "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
   },
@@ -1577,15 +1663,15 @@
   "org/apache/commons#commons-parent/88": {
    "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g="
   },
-  "org/apache/commons#commons-parent/91": {
-   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
-  },
   "org/apache/commons#commons-parent/92": {
    "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM="
   },
   "org/apache/commons#commons-parent/97": {
    "pom": "sha256-FDZty+9nppuyqP6cpyicIVOBxcJQk1QqSZ+dUjosrXs="
   },
+  "org/apache/commons#commons-parent/98": {
+   "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o="
+  },
   "org/apache/commons#commons-text/1.10.0": {
    "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
    "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
@@ -1606,10 +1692,17 @@
    "module": "sha256-IcH7KJaH1hb9GKUNgd8L8bewa4zP1Ghh1CuqXfXQJX8=",
    "pom": "sha256-CP5CqV2uwLpAU03pQ0cAC03bghw1ZP5WDFjI1vV3jgM="
   },
+  "org/apache/httpcomponents#httpclient/4.5.13": {
+   "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
+   "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
+  },
   "org/apache/httpcomponents#httpclient/4.5.14": {
    "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
    "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
   },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+   "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
+  },
   "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
    "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
   },
@@ -1658,11 +1751,6 @@
   "org/apache/logging#logging-parent/11.3.0": {
    "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
   },
-  "org/apache/logging/log4j#log4j-api/2.25.3": {
-   "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=",
-   "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=",
-   "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4="
-  },
   "org/apache/logging/log4j#log4j-api/2.25.4": {
    "jar": "sha256-xLZCp/BHJ1IV3hF+DjhH6yx3EdhKCqdDPns8CW2vNB0=",
    "module": "sha256-vtG2eRoxTiT5fbBjv2vQXTp/12wUUNbHtF/bvXpPWP8=",
@@ -1680,19 +1768,11 @@
   "org/apache/logging/log4j#log4j-bom/2.25.4": {
    "pom": "sha256-cxPTOftjKoYQ4RQLMpD8JNY3Q7mqYl4qC9Wd7UCjrlQ="
   },
-  "org/apache/logging/log4j#log4j-to-slf4j/2.25.3": {
-   "jar": "sha256-kKCSgDkMVKKKwVFN7XxSk/P+YvREi/NxtOJBUnLmej0=",
-   "module": "sha256-oXaPj8XLbB42RED1g9HFQGoUqZO9A+4de1dYXrrXUJg=",
-   "pom": "sha256-JnzbczCa9mht2FbfmpGEfHQE1zWHDaLhILLZzEfCbzY="
-  },
   "org/apache/logging/log4j#log4j-to-slf4j/2.25.4": {
    "jar": "sha256-17ePwKqqXoraOIsp1xiwqxh+USllvtCyWbtKspnxPbI=",
    "module": "sha256-g5iFkez2alL4vYyBlzsMaI1aCER5J6eAZA6yZwApWfA=",
    "pom": "sha256-tPPdJ8bmJiPdGiV0UvRLvUnhxhEMDHeFzeqtfbDhQ8M="
   },
-  "org/apache/logging/log4j#log4j/2.25.3": {
-   "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8="
-  },
   "org/apache/logging/log4j#log4j/2.25.4": {
    "pom": "sha256-+K6JBKKONPoEw103QGGdroNjJAG6HjE7r9fM9aMADew="
   },
@@ -1754,19 +1834,15 @@
    "jar": "sha256-rTnIQiwKkNVDd9U+EgDVloeedECriNsLHhX7BBCUDxE=",
    "pom": "sha256-sl1DnUt0EN2yOG5aBct6IMsvqZgLgJzBxuf0nOC8WyY="
   },
-  "org/apache/tomcat/embed#tomcat-embed-core/11.0.20": {
-   "pom": "sha256-YSs4OFnBY6JeL2fJYcBi4bEmycRQCibi8TLZctcW10k="
-  },
-  "org/apache/tomcat/embed#tomcat-embed-el/11.0.20": {
-   "jar": "sha256-YYpbaSFvSbT2RtT9SlDm6RBIJwIuZnDZOwpWL2mgnHA=",
-   "pom": "sha256-HnWlVFNyho0oRhiLLLq5GBoDhVm42XHy+YahYDQMrZw="
+  "org/apache/tomcat/embed#tomcat-embed-core/11.0.21": {
+   "pom": "sha256-ZsZ8YNNPrTY8km81vYTPYe/xzTCmoE906jkZNQ44I88="
   },
   "org/apache/tomcat/embed#tomcat-embed-el/11.0.21": {
    "jar": "sha256-N0XLdo9O10wvSvj8JFOZIUOZcBlxj3HJFdRUX9vvH7M=",
    "pom": "sha256-y6omxPCgRM12hrO3iUYvKFb3xQWzBnwhTuDOazcWdNU="
   },
-  "org/apache/tomcat/embed#tomcat-embed-websocket/11.0.20": {
-   "pom": "sha256-IYnFCq14YIeoURFx/M8zBui7Isp+CEluxhl0gsuy+f0="
+  "org/apache/tomcat/embed#tomcat-embed-websocket/11.0.21": {
+   "pom": "sha256-Ej4ZuWDWzzS4RKCho1B6H2LvWBLfX96GCB964Wk0V+Q="
   },
   "org/apache/velocity#velocity-engine-core/2.3": {
    "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=",
@@ -1880,6 +1956,10 @@
    "jar": "sha256-7lhWjqWUXc+YhVFQFlUYPcGE4j5FqOAT/f2QNhlOb3s=",
    "pom": "sha256-7IF1FsgxQaM/aV/49Nc8pt868mjDqzd+XO5+/8zKgUA="
   },
+  "org/bouncycastle#bc-jdk18on-bom/1.83": {
+   "module": "sha256-f9LoflQtKLgyIIewgLg60pWZssGzUAOuDgrmKiAgIe8=",
+   "pom": "sha256-aKi4X0QK23JLJ+ZXJphw4QlcVgJ/+oh6C1J3ZW+2ZqQ="
+  },
   "org/bouncycastle#bcmail-jdk15on/1.69": {
    "pom": "sha256-fWl5LshLpoLSSajkm4IU5Aq+TlsKhbRiOqmAK6p/kto="
   },
@@ -1889,13 +1969,13 @@
   "org/bouncycastle#bcpkix-jdk18on/1.77": {
    "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0="
   },
-  "org/bouncycastle#bcpkix-jdk18on/1.83": {
-   "jar": "sha256-08TGtwDHTvgWS7FeVJ2TlyG48U/A/4n+GbIgJDvPy9g=",
-   "pom": "sha256-AmbklH6pJ2AXKslf4UwuEzRJlT9Sa1smO/ql4i0MDe0="
+  "org/bouncycastle#bcpkix-jdk18on/1.84": {
+   "jar": "sha256-yH8W7Z5exhvJQVHp82RqxE5QzUSBIc6ENn+kt+x+wbs=",
+   "pom": "sha256-wSge1er48+QFVX56UgXLbzzfdT+E3psagVx16965mSo="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.83": {
-   "jar": "sha256-gs86Kvdmw7yHT202ufIKi5mo8Jdi3HduiiJ6Rdjaqvs=",
-   "pom": "sha256-yHzwb1qsRlY4Dx1EGyRZ++Bm7IErKUab0LP8uLsgV0o="
+  "org/bouncycastle#bcprov-jdk18on/1.84": {
+   "jar": "sha256-ZNbFphIfzZJxUt0YLL7Tmv4P2mQalw2bzAycsYWLJzE=",
+   "pom": "sha256-znq7SpG6XSpz/fF6PfR2LjYFoDksx5g+8vGuFs04TMM="
   },
   "org/bouncycastle#bcutil-jdk15on/1.69": {
    "pom": "sha256-p2e8fzQtGTKJfso8i6zHAEygOAv6dSnyOpc0VJZcffw="
@@ -1903,9 +1983,9 @@
   "org/bouncycastle#bcutil-jdk18on/1.77": {
    "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.83": {
-   "jar": "sha256-7n0OtOdN5wpzX3+za2BN1catNXINULkUYE2wQhFKAYU=",
-   "pom": "sha256-NQafSI8HXgWdVe3jqKgsi+FmOWqR2T56Fve4XT9ESiI="
+  "org/bouncycastle#bcutil-jdk18on/1.84": {
+   "jar": "sha256-s3ThaWNCH7nPsBzCDXrY/S+LgYjj7vDsColl4kX3YZo=",
+   "pom": "sha256-Cwy4GmXuFzfVEoY1Cp5WSJM2uPmQgZj+vQSUJD7qKXg="
   },
   "org/checkerframework#checker-qual/3.52.0": {
    "jar": "sha256-C1uxpL3E5LEhdIL+WY78qrTh+6ezf5QSY5F4/IEW/AU=",
@@ -1963,40 +2043,21 @@
   "org/eclipse/ee4j#project/2.0.0-M1": {
    "pom": "sha256-GGpzaiANE3/mHNM2ANNEUBqsCzVspfHOR3PlhsDJRwc="
   },
-  "org/eclipse/jetty#jetty-alpn-client/12.1.7": {
-   "jar": "sha256-DXRQWLudupVKL+ErAGzem3pzz/O2MKiB/vC5t1tWTLQ=",
-   "pom": "sha256-ZF6GiH+1RqZ7E8BxbSV0AJvcF2gzlhGc+Zkhz5RfJTg="
-  },
   "org/eclipse/jetty#jetty-alpn-client/12.1.8": {
    "jar": "sha256-kZU/SgNFkOfaxFiQOP4O90AOBM0uHlTAAn2IugxUXxg=",
    "pom": "sha256-4nR9Cjdo1r46kyH5x2161xMyEfhi1OhJTlORHSbvOB4="
   },
-  "org/eclipse/jetty#jetty-alpn-java-server/12.1.7": {
-   "jar": "sha256-TLsbt/2ovP8JTBro2cQp81z0g7zbEq9N4GVkbN7IujE=",
-   "pom": "sha256-4pkuyyJmc8IGjtXyuGZ4+e9aWE0F+aCUErnS/TMXlcM="
-  },
   "org/eclipse/jetty#jetty-alpn-java-server/12.1.8": {
    "jar": "sha256-Ns+W9eJUeS/weM5WJC/8Woyy3NG6+4Nk+NjbDyhgBNs=",
    "pom": "sha256-CYzzN/SZq5yFxy6ZCnyVO5hgj7OPrKGQfsxkHmlkBNY="
   },
-  "org/eclipse/jetty#jetty-alpn-server/12.1.7": {
-   "jar": "sha256-AQpKo4jt0sbZlW+dR1XACjlSrDJGFNf8MlpCXRsAbUQ=",
-   "pom": "sha256-DXwlAgGVJVrwCKyoBbfw7C+rYSdwwxw+4SoC2NKGuyc="
-  },
   "org/eclipse/jetty#jetty-alpn-server/12.1.8": {
    "jar": "sha256-fzUgTgg3FU9DSOgdzITRUYcFX8zAqSLMDHUd2ydT6N0=",
    "pom": "sha256-mxgNxhe8Zf7vyjqZU4E1jLOuGOUZu/0LLLf192Q6bgE="
   },
-  "org/eclipse/jetty#jetty-alpn/12.1.7": {
-   "pom": "sha256-m2K3A8wVn4eGAaA93OWTIxmoHXmLRc1ktK97/mswSzc="
-  },
   "org/eclipse/jetty#jetty-alpn/12.1.8": {
    "pom": "sha256-LfJfUa7gtRUl1+dCWLRHWZeu3LKnTHO52kQ5NvYqHEM="
   },
-  "org/eclipse/jetty#jetty-annotations/12.1.7": {
-   "jar": "sha256-kSOPL/LAcUqNJRHWmxvBxACnDXXLVsCbzW9qBl0tAmo=",
-   "pom": "sha256-ART7eSNiDOtRXSXpm9YNIpic++CG32mREUGDaEnhEQs="
-  },
   "org/eclipse/jetty#jetty-annotations/12.1.8": {
    "jar": "sha256-fO+ye0R4xOMNM3yishWEC7AJqsPixsaaML9B7R3okrM=",
    "pom": "sha256-CZ4yGnGGQXYSW127btcx20rguNY2pJJTCpTyYQLrC4k="
@@ -2007,138 +2068,73 @@
   "org/eclipse/jetty#jetty-bom/12.1.8": {
    "pom": "sha256-bJqdYfWY6aVLTV8cO/sAvqF4fST1XLTUEfboZtbJiGc="
   },
-  "org/eclipse/jetty#jetty-client/12.1.7": {
-   "jar": "sha256-+Mro/SRwb07HUuUKqu4BZoKmPhTas8Vff5zQ4Zz8zdE=",
-   "pom": "sha256-3aI60PrNZ2cbqReJIWsCIVv8EBEqH4yNcXYtAvwjbKA="
+  "org/eclipse/jetty#jetty-bom/9.4.45.v20220203": {
+   "pom": "sha256-6GaLKkTnymO8Jr36Iyevfj+X9wncvMXnsQnYH+w6VbY="
   },
   "org/eclipse/jetty#jetty-client/12.1.8": {
    "jar": "sha256-Rg1NdMlaWRv2wWvmOIGGQnt3PAEQYFs9MplV96RCEiw=",
    "pom": "sha256-26jhtwCIjJ+oxVCks5BQsT4W/duhyj0BHh7YxVLHuhY="
   },
-  "org/eclipse/jetty#jetty-core/12.1.7": {
-   "pom": "sha256-v0tmU9wW+meLGply0/uFMmKOongO+4gB1dc1S9bbYQA="
-  },
   "org/eclipse/jetty#jetty-core/12.1.8": {
    "pom": "sha256-iUrAFn9p/BOSFP5qRu81Vuoxu67IrgWPY3uc8x4m0io="
   },
-  "org/eclipse/jetty#jetty-http/12.1.7": {
-   "jar": "sha256-jw7R2OwYnLyqFtly/D4Slrl/+d/isoDv9ypbsKNfyn0=",
-   "pom": "sha256-I9cy16XsMhXY9eXlhArR2G9j6y4zPavneuY4CzzOc9k="
-  },
   "org/eclipse/jetty#jetty-http/12.1.8": {
    "jar": "sha256-MsNRmE/XTn25sxIPeqQ8A0qdf+KQOGdH/zGPTEIh2Us=",
    "pom": "sha256-DCi4i54+S05kI8zWJjcd5ykHaYNLOhw1YHMtXiaOhDQ="
   },
-  "org/eclipse/jetty#jetty-io/12.1.7": {
-   "jar": "sha256-oJ+7ZbRrluxC1iENq2UKbQSHnLozWqkhBr9d/50Kpuk=",
-   "pom": "sha256-kfELV/nTp/3jWDy3cVOO0sGjUD5atacfEg0yPV0YHEQ="
-  },
   "org/eclipse/jetty#jetty-io/12.1.8": {
    "jar": "sha256-xFpozu01JvXKCXR2jKph9mg8PVWRqBn7zzwEgKZKskU=",
    "pom": "sha256-dVmajLMrSwvAKolDr10y0QeSztMpVZRenwzn+VvWcjo="
   },
-  "org/eclipse/jetty#jetty-plus/12.1.7": {
-   "jar": "sha256-AR4+9WhdMta714wnqXrkR4Ftw5eJlo+qZzU6SToy2b0=",
-   "pom": "sha256-Hmw/dpV83tuJarQPZD1H0BaB1FvO06f1IwH/f6jCwyI="
-  },
   "org/eclipse/jetty#jetty-plus/12.1.8": {
    "jar": "sha256-kSo8QjxaiRH7B0UZAW1pm0Ih5yJTauZjFafC21ld9fk=",
    "pom": "sha256-DHPveS8RiyTsT58bk+dZCQYHrT2qBg1vYCcDm1X05T8="
   },
-  "org/eclipse/jetty#jetty-project/12.1.7": {
-   "pom": "sha256-eIO4Ip1M14TjnurehD0oaZ8Bsn1e69MZPBK6y7KHr4k="
-  },
   "org/eclipse/jetty#jetty-project/12.1.8": {
    "pom": "sha256-hZ8clGmMGVBcFDzh4h9D8pQhcBZlvDNU38LXBao6gpI="
   },
-  "org/eclipse/jetty#jetty-security/12.1.7": {
-   "jar": "sha256-WGrDYM47Qy1kceAEBlHbV2SR3UKb1PIIbyplzMrLv7k=",
-   "pom": "sha256-Jvsgn9Y/4oy2Ud6XZrIZ1eJxVh4Epzx5hRPCjBBFQvM="
-  },
   "org/eclipse/jetty#jetty-security/12.1.8": {
    "jar": "sha256-RK3Z7pW5Vdlpecx04y7HUeqAfrwPUTnrE63PwjcSxY8=",
    "pom": "sha256-OLElGts7MltXZLOH6jxQH0r9k41uphOuLJicgphCZ8w="
   },
-  "org/eclipse/jetty#jetty-server/12.1.7": {
-   "jar": "sha256-wKT03rsjfMGD2CqUgYTv4YKaWqHNbvI6N9Vjm/M/qfM=",
-   "pom": "sha256-mH25Scs+iAhQNiuXlKrStun8DvRsSBETrfk6Ccb91Hc="
-  },
   "org/eclipse/jetty#jetty-server/12.1.8": {
    "jar": "sha256-cbiGKnIwWuu2WQm4ufPJoMeQ7zJFxgVuVrSBF67COP4=",
    "pom": "sha256-w2I8/+mzl3IWwg10shibqFxpvDDv2Yy/jcFxGnweBRU="
   },
-  "org/eclipse/jetty#jetty-session/12.1.7": {
-   "jar": "sha256-ZmRjoKv+1fuVbom97/+fCGbPYvWN88rxrS8CfX2b9gU=",
-   "pom": "sha256-GzS6uAiEWlX9SVqsJqlwXR8xz19Z0ImiUxiZp0W2k6k="
-  },
   "org/eclipse/jetty#jetty-session/12.1.8": {
    "jar": "sha256-6+hN1BlC163aX30TBAldJ055FZmUUdhI6IfL1An5R+o=",
    "pom": "sha256-Lgkr5cJPlt57w+0YU3VQLFzF4hASyNoOViovqZUxKaQ="
   },
-  "org/eclipse/jetty#jetty-util/12.1.7": {
-   "jar": "sha256-jLhdgOScmp3yEa5PdQ++tc/2slmqXklaNsYvLseXDHA=",
-   "pom": "sha256-mtstfYegkvH37j1UZLrZ8iyMAF1LDbZGWAN9gySmmQ4="
-  },
   "org/eclipse/jetty#jetty-util/12.1.8": {
    "jar": "sha256-AEMnFfIMPdyNT+OwGXQlOndy8YMPdxLaca8wNIsByCI=",
    "pom": "sha256-2ttvRP4IoAh3i2Lz/46UQxAsQGqWXXer1OFmlGKKIg0="
   },
-  "org/eclipse/jetty#jetty-xml/12.1.7": {
-   "jar": "sha256-saZnxiRzhIBcmi24IkQvdLHe0v7FaVu2YYP9gZOwkF4=",
-   "pom": "sha256-6Gj7PtRtBsylV1MO4pf7ueaYNu9wlDeWFOy0WQmjSdU="
-  },
   "org/eclipse/jetty#jetty-xml/12.1.8": {
    "jar": "sha256-DY7vM11L0ZYeOIYdzpEo4NZbo6IdPnce9Pp4BF/rNRY=",
    "pom": "sha256-YEa0MzFhclZhrI2K2JAFVW4S5A9SWMK86nKweayrOA8="
   },
-  "org/eclipse/jetty/compression#jetty-compression-common/12.1.7": {
-   "jar": "sha256-D5QYNojsVFyeXhKU7crFS38ON8m3xquEQ3DL5Q2LqGs=",
-   "pom": "sha256-ET57e9N9EeOiLIn1PpLjowW7IKNiSem99ajRJOS+nX4="
-  },
   "org/eclipse/jetty/compression#jetty-compression-common/12.1.8": {
    "jar": "sha256-RvEtNIEV8xATDH325zYBfG59wDLxm5ag3CZY9W7EO/E=",
    "pom": "sha256-1ROIqrZYpyJaeAVRHQA+ZfaLZ0S6eIq/W+QwsezC3+Q="
   },
-  "org/eclipse/jetty/compression#jetty-compression-gzip/12.1.7": {
-   "jar": "sha256-2L1d1ldBkyh9QzyLBZp8MgvTv59ab2Kxjv/QP2hLwrM=",
-   "pom": "sha256-3BdvR1smPKtp3oiEXfg8W5+Ft/Wgz4f7+sd1htCMcIU="
-  },
   "org/eclipse/jetty/compression#jetty-compression-gzip/12.1.8": {
    "jar": "sha256-SCRVwuSyQ5EzVN/VLPKmi+z7mnR5wd6zhQGfl5JfCuA=",
    "pom": "sha256-dl52ndpDk2/Qe0//VqwoSESLrhoc4NyG8X+83krbZOA="
   },
-  "org/eclipse/jetty/compression#jetty-compression-server/12.1.7": {
-   "jar": "sha256-spHtfU9qu2MS0/q34bQ2+0AvCfiJw2LSuvZ8/kMJHCk=",
-   "pom": "sha256-w2jdSGcNbNYgIrefMJsJWG5YnnpzdGJsaPgZrGBxu9o="
-  },
   "org/eclipse/jetty/compression#jetty-compression-server/12.1.8": {
    "jar": "sha256-+reU31YJu+l+f/BNjV/zRGBI3Hr3ymTOUrvhnTHEIKU=",
    "pom": "sha256-RNKA32YwEJFdpAgYyi6QFLxID7VD+XnZeoq5Ka5uUpg="
   },
-  "org/eclipse/jetty/compression#jetty-compression/12.1.7": {
-   "pom": "sha256-4cftq/rThgd7EbLYmtl67z36ExI6gvQ0YlEQjkhFhHk="
-  },
   "org/eclipse/jetty/compression#jetty-compression/12.1.8": {
    "pom": "sha256-qV8RxaYrRTdzk+73vbH4BaTxIWb/5++jyc+sTpXof6I="
   },
-  "org/eclipse/jetty/ee#jetty-ee-webapp/12.1.7": {
-   "jar": "sha256-CTZtQObbo/I1pFksulMWb0uJuq2vI/YtB6gr2eXa3TQ=",
-   "pom": "sha256-/6Ph6KgzGnSH6hmLGyR5HAPuPtL8TC4mXteM/qxdqcg="
-  },
   "org/eclipse/jetty/ee#jetty-ee-webapp/12.1.8": {
    "jar": "sha256-6f7E2SuLC1tq3hgmiUTeKHEN+P6DQXwtVnDLQlQLCkU=",
    "pom": "sha256-9z3zxNRBbdI0rpEJF8Yk7lC3Dbfi06l1sD2s3Gp+VF8="
   },
-  "org/eclipse/jetty/ee#jetty-ee/12.1.7": {
-   "pom": "sha256-id72+SXP0VjuCeWcm8dy57knMjVLgVz+smaaAB4hqdY="
-  },
   "org/eclipse/jetty/ee#jetty-ee/12.1.8": {
    "pom": "sha256-2JMFMmNMUhu/i6wOTmv93LSJELUCqR1JqKz+XXH6FsM="
   },
-  "org/eclipse/jetty/ee11#jetty-ee11-annotations/12.1.7": {
-   "jar": "sha256-Jv593ID18+aOcXfv+ydxKhBq5hM4TwQWhD8stmXi7qo=",
-   "pom": "sha256-NqShKK0P7e1Ubu/Y8nGXl9DNFOHEJezBPXY7PY9E/8A="
-  },
   "org/eclipse/jetty/ee11#jetty-ee11-annotations/12.1.8": {
    "jar": "sha256-tVef6z/GfcoPnwvQAHVmwkGOJs4TXgM7mVnSy2Id55A=",
    "pom": "sha256-B9hIhYsjgKUzBow5fYFaa5iBJK2zSrSEO4UZ/G2NGds="
@@ -2149,163 +2145,83 @@
   "org/eclipse/jetty/ee11#jetty-ee11-bom/12.1.8": {
    "pom": "sha256-fdsX1uYjp3oCE0SHbFMhqFHhx5IopS+njTCDHt8Pync="
   },
-  "org/eclipse/jetty/ee11#jetty-ee11-plus/12.1.7": {
-   "jar": "sha256-/R01qbImNqnswI1tP20NLNlraAkEGvH+YpbNgL9Z+EA=",
-   "pom": "sha256-cxBws2RgSvhhpDW32iHQmqnNfnX+2mlRt++7KHXrRjo="
-  },
   "org/eclipse/jetty/ee11#jetty-ee11-plus/12.1.8": {
    "jar": "sha256-hb2ZyW5QrCzN1Djpcd59gsXda6GuI4lV2GD3bLGxcN8=",
    "pom": "sha256-rPQmWnPOWhD7joTNspqT5xzwLhR1zN02HgyYo/aiZHg="
   },
-  "org/eclipse/jetty/ee11#jetty-ee11-servlet/12.1.7": {
-   "jar": "sha256-igdfYbMWzTHl0apivK8mNYlhsA5NOL+LJp9xM89zTwI=",
-   "pom": "sha256-nTz2lvip6M0VpdR5EluEXx6ipkynio+Nq+L/Sn+5Iak="
-  },
   "org/eclipse/jetty/ee11#jetty-ee11-servlet/12.1.8": {
    "jar": "sha256-whIPn+Y5pc7PUlEmEsVa7CpTuy6JPGJ2dj/8nMER7PQ=",
    "pom": "sha256-HUaZZ/oaqJqBJMwFZoM51yMB1BIObLbAtw20qRZIXvQ="
   },
-  "org/eclipse/jetty/ee11#jetty-ee11-webapp/12.1.7": {
-   "jar": "sha256-IVMUQBYZkL7FnsCQxdbgkLf/UkyBh5LKaFFSNzsgej0=",
-   "pom": "sha256-M1bUfa7Id9C7GuzbP5nvqk+2hJVAPkNk3VfOi9o8u60="
-  },
   "org/eclipse/jetty/ee11#jetty-ee11-webapp/12.1.8": {
    "jar": "sha256-k6v4f8DNLUR1UvKy9NJ3sCQ+W95rTn9rrN1D5ysYT9c=",
    "pom": "sha256-RJ8ZPfeCM0imLxln5s6VLeh0ciVNiti9Yq47Yi64OeM="
   },
-  "org/eclipse/jetty/ee11#jetty-ee11/12.1.7": {
-   "pom": "sha256-2T79EmehHQ9i4xSb+5Fv7VWpqYE4Kj9GfWjvuPShklw="
-  },
   "org/eclipse/jetty/ee11#jetty-ee11/12.1.8": {
    "pom": "sha256-Gorww6gwNMZ3Ppx06XWrzcezwuS9+qiVLGkd6j/mTPY="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-client/12.1.7": {
-   "jar": "sha256-UF/Qkx0fx9mK76FNj5e5OnnLu2CDZPqzz02Br09Jdk4=",
-   "pom": "sha256-VeKoUrCWufNV1jJb1s2pmVIUxGJ8enbgCMoCmaxOIU4="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-client/12.1.8": {
    "jar": "sha256-TUeIztLlE/fIc/ITZSVautXY+P8A3Hb8aJ2CFTXudgg=",
    "pom": "sha256-mT3F9JQXY4OBzNfMb1aBrE5G3Y680jSVShHK31e+oyg="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-common/12.1.7": {
-   "jar": "sha256-e65Fsb0u0s5V6+tjs1JcUVS0LAYSM1EiHJ3qVswAV7E=",
-   "pom": "sha256-bODSqiUgHy4iHKIoqY1guyglrqT4wl+BypmL19xW120="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-common/12.1.8": {
    "jar": "sha256-MQKO+u1MakVz1/Jgg+Tsj35gGeSxUemzz/uzNXpie7k=",
    "pom": "sha256-KY15KaP/43+ZZv1BX1Y66WE4jbfl63hL4LmWb33VE3M="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-server/12.1.7": {
-   "jar": "sha256-9HEsMVLuB3vsP47fIghI65PLHELG/UywYWLa9vicpkc=",
-   "pom": "sha256-0l/Wkc6T7B9xecC/bA2CW4aU11sLSYqKvGkCBcxrXWM="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jakarta-server/12.1.8": {
    "jar": "sha256-vSZ0FZTzmnxnzH3PF5dCKKYM4dDSW8P1EbzmDq3uL8I=",
    "pom": "sha256-gzAdXKFu/tiR9g2vofwDbbDKuzLC4uM7hVJ3uMOIIHQ="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jetty-server/12.1.7": {
-   "jar": "sha256-2zAympvjcsyWJDR0/lzeeh3zsx2VjAYd0kfXhvAKhIk=",
-   "pom": "sha256-NPK2VVbrFr9PrIWzGuwBOOYJ0nMVpuF/E4eOx4Jlvwc="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-jetty-server/12.1.8": {
    "jar": "sha256-P9n9ct5ZVVZpwni3lg2R9u82OaGd47S258gCFJViTOo=",
    "pom": "sha256-1VamuHGQoQ9bBH7QBxSZ+aejTrwazPDaMufy0LPd0rc="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-servlet/12.1.7": {
-   "jar": "sha256-EZwnQmWXvtS7WTTOc8RcxexIwq2ByU9RuNSs2zlMTRM=",
-   "pom": "sha256-FFxA7EB5wlGL00xEONsQ4fwRk187oAu7G07c6YMl0Zs="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket-servlet/12.1.8": {
    "jar": "sha256-bkTVEouNRUwnxle9mT1HVNUCF+LtrSMhh7hTYCOhxJo=",
    "pom": "sha256-DuzqHNZ/h44fd7cPs4FMQALz2LD0tty1vd/uBZz3Iz0="
   },
-  "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket/12.1.7": {
-   "pom": "sha256-7MDQuVi1oaDh/Z+1Y5TnWQ4hD7ixxQYjJRXXjLhjtAU="
-  },
   "org/eclipse/jetty/ee11/websocket#jetty-ee11-websocket/12.1.8": {
    "pom": "sha256-H5z/IYoEa7cMrgt8+fuBG9BldW9RiEG43GdJlxNw9R4="
   },
-  "org/eclipse/jetty/http2#jetty-http2-common/12.1.7": {
-   "jar": "sha256-NdAYu/mJzbFJO77P5537TrAfFe1/G6GPZphReni7SO4=",
-   "pom": "sha256-uwaS//2N38+0GwadzJFUqeQUin2IoYKyktEWmxgApFY="
-  },
   "org/eclipse/jetty/http2#jetty-http2-common/12.1.8": {
    "jar": "sha256-+6Y4pTq9OYXQy1aO01Fwy3CNvdo2SqbAh6TlSkrYUMs=",
    "pom": "sha256-E/Vb3/5e1m8bDl/7CCFGMm7vvvhsd3okT2h+a7N5kc8="
   },
-  "org/eclipse/jetty/http2#jetty-http2-hpack/12.1.7": {
-   "jar": "sha256-QSH9F9r9Iw3N5KUxx8DexKKoSH3GoEofY76TRQ2mC7Q=",
-   "pom": "sha256-9xnq8L2RCrfQav12dJIw/W6pvYVGCdgHGFizzCaPlwA="
-  },
   "org/eclipse/jetty/http2#jetty-http2-hpack/12.1.8": {
    "jar": "sha256-frf8PRQg/MjATffN2ONfbpapJ/WkzEVXNNEIr3B5qJg=",
    "pom": "sha256-NH2Y8/knqJUCF5WUJGV+fyMlMbEik5y3Gwfr8Kkmj3o="
   },
-  "org/eclipse/jetty/http2#jetty-http2-server/12.1.7": {
-   "jar": "sha256-o4xHxSLHm/BALD5gtmItr+pjjmIeoSKg+rFMrt7B3so=",
-   "pom": "sha256-0QMb2I+urtmcESyInjAz4ow+TCKKXuISB7qtefmfvd8="
-  },
   "org/eclipse/jetty/http2#jetty-http2-server/12.1.8": {
    "jar": "sha256-5cmei33DhvbmGmYUWBKODApqQL4p3xMzcVMo4PX+soQ=",
    "pom": "sha256-lW5INFPqEllBlU3D10znENnmzXZEDMyS91c3tauMJEg="
   },
-  "org/eclipse/jetty/http2#jetty-http2/12.1.7": {
-   "pom": "sha256-SSYDrziC+6VSJ0DoBUZGtR4T58AIEseqkTc9fKRZ82A="
-  },
   "org/eclipse/jetty/http2#jetty-http2/12.1.8": {
    "pom": "sha256-gKR2mP3cZPExvQHzGC9JM2vyiwl9Vow00GJ2vtJU1/8="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.1.7": {
-   "jar": "sha256-ZoSkWSxk7e3+fWOmN7GiWn5baKp0YlTgJoNcHWzdLIE=",
-   "pom": "sha256-o3Op0dH5vuuN3DK7KLXEvAGtauttr7ZrYqG7HED1l54="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.1.8": {
    "jar": "sha256-fi2zeW52Cyf/uViAQ7O58gUUn9xX438VUjtzBlpQFtE=",
    "pom": "sha256-jDihyDQJyWTaZze+Je2oEjoxNdKDk3dZpLLNHjadUec="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.1.7": {
-   "jar": "sha256-py3EGZMiF5sulZh2mi7A5O+iWgc7hCyQHy1OGMOg/aA=",
-   "pom": "sha256-lmikq1rbcBpPOhbn90hI6/l0EGjlZombxx4RrgspJ8I="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.1.8": {
    "jar": "sha256-HVo2LjDvERVsgcKysS1mXlQB+K48R7XH9u5vt63OMOQ=",
    "pom": "sha256-qvPpFC43j0QsJ+r5PxRaWcMzjj2VyMBNVDwQN+Dzdog="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.1.7": {
-   "jar": "sha256-qsNyTU8pZ6AyUUl5PW8TvzkGGomBMINJtySR3MAwn2Y=",
-   "pom": "sha256-Kt4ivBQ3BrBjSwxkrZ533b2uVGjoFLATTyaIQxXlj98="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.1.8": {
    "jar": "sha256-2hqkRw6T0Y3H2Is61w4lm2xilxkrxwM2izw7dZrKr4U=",
    "pom": "sha256-gq+fYGbU5XikMXrdZQI44J9hNHO7pQisI+1Cb/4HsDA="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.1.7": {
-   "jar": "sha256-Bfh78PC8/vckB/WO32iHTCnq41MLsnbCRcDBYPCYN/4=",
-   "pom": "sha256-tnnl4Al6rJMx05iXaBLlcyqJtHANbY3sLA3AztEi0eg="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.1.8": {
    "jar": "sha256-MO+WkBgyV+Ww5WgzYnNZNB0VL5/1HGSuUrXijEC89IQ=",
    "pom": "sha256-crMtSCp7KvG/bfFV3Chv2DCtOndBUVzYhuJE5nffwpc="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.1.7": {
-   "jar": "sha256-gd/fbJN7IK0x6qqFgo2TkqBr7e7+S23WcI/xAnQY5ps=",
-   "pom": "sha256-LZl7IKqN2xcbN0U22ZUQPcltqObgzXqk3KJnDqaGYHk="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.1.8": {
    "jar": "sha256-mBdJ6axfSa6ccaw34dhk1gAPQ8J7o2uUfRC3fx1Pylc=",
    "pom": "sha256-Sh1Uq1JT258Z0Yg7iKBqlP0GsjgeaCGbmOCkrCpejdk="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket-jetty-server/12.1.7": {
-   "jar": "sha256-MSsSSANbkuw23Y0NB/3oHbwIPHCMVUsNLX2DuoHLf8c=",
-   "pom": "sha256-UHh+g0V5ZobMgMZ9F6wKbKli+hNjMNXRj66D6UaHTUg="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket-jetty-server/12.1.8": {
    "jar": "sha256-wWQG09MPYhbW4iolwDar+2gVIbrR5TNDg4htY2i+Yhs=",
    "pom": "sha256-fZMw27S4hK11rk/2UJ+3va6zKkcwegegYvWgrN991ZY="
   },
-  "org/eclipse/jetty/websocket#jetty-websocket/12.1.7": {
-   "pom": "sha256-7ik5Wx/oz2r/Ipqryj/5KuSfNitTT+C8TvskGq+ktPg="
-  },
   "org/eclipse/jetty/websocket#jetty-websocket/12.1.8": {
    "pom": "sha256-q/OEPucjRgV6n5gzrnRYOykvCIUzluOf3wvdlCOkldM="
   },
@@ -2368,13 +2284,6 @@
    "jar": "sha256-5x89QI82qJY0u7mEIgRR/BnLrRbYuzoL3B6JIAAh7fA=",
    "pom": "sha256-Dr+JZYMYoE9CkpL7RHFr4p8nq9+KBHfu7oXyCrGBrR4="
   },
-  "org/hibernate/orm#hibernate-core/7.2.7.Final": {
-   "jar": "sha256-fETYrudTxMmLIZD4v42WXXiYd5pwqZy+mXZ7qeFpARU=",
-   "pom": "sha256-ebzzbk5RTWTpIlpcvcuQM1bEebBsRKey695YAcantT4="
-  },
-  "org/hibernate/search#hibernate-search-bom/8.2.2.Final": {
-   "pom": "sha256-yEQk4HUV3LTnbNE+w9up1WgyL2nh782aoByocdkv24A="
-  },
   "org/hibernate/search#hibernate-search-bom/8.3.0.Final": {
    "pom": "sha256-rTA228LCnKccrDyAWDr4NCKYNkfYqA9LmJmd7n00RZQ="
   },
@@ -2385,9 +2294,6 @@
   "org/infinispan#infinispan-bom/15.2.6.Final": {
    "pom": "sha256-u5OCufYvaxwsp5SsAO/N9r9Jgimo1jJg/li5dezIuG4="
   },
-  "org/infinispan#infinispan-bom/16.1.0.Dev02": {
-   "pom": "sha256-HQiV4DQDjxc4+WwKwKxRKF1TXvFqiX+RUoIQN3obbkE="
-  },
   "org/infinispan#infinispan-bom/16.1.3": {
    "pom": "sha256-/eUzwbp3B2nw2ogRH5xgKBDYYOsWHFqIdFcMM/s1pqw="
   },
@@ -2398,6 +2304,9 @@
    "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=",
    "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc="
   },
+  "org/jacoco#org.jacoco.agent/0.8.13/runtime": {
+   "jar": "sha256-R+cAzLD9ueJ8UkE1P4Fhk49OU8NWHdNeBjxf6I3DNJs="
+  },
   "org/jacoco#org.jacoco.ant/0.8.13": {
    "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=",
    "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744="
@@ -2405,6 +2314,10 @@
   "org/jacoco#org.jacoco.build/0.8.13": {
    "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM="
   },
+  "org/jacoco#org.jacoco.cli/0.8.13": {
+   "jar": "sha256-I589wznLfE1SOzIuLughlTLl23MBG9owGMrFMGAfg9A=",
+   "pom": "sha256-FGVk+6dstSSnsWLXKD4ZH4VmtoGMSCbDfhK926Z16Sc="
+  },
   "org/jacoco#org.jacoco.core/0.8.13": {
    "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=",
    "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08="
@@ -2423,6 +2336,9 @@
   "org/jetbrains#annotations/13.0": {
    "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
   },
+  "org/jetbrains#annotations/17.0.0": {
+   "pom": "sha256-g5DuC03/f1aLEzbgYfaU5312GlBRaa7Ylk51SCyZDu0="
+  },
   "org/jetbrains#annotations/24.0.1": {
    "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=",
    "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA="
@@ -2441,9 +2357,6 @@
   "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.9.0": {
    "pom": "sha256-bX/zZcDvHNN2+1SxoWyAoh7Vj+tGwz80ULbPIuKxNT0="
   },
-  "org/jmolecules#jmolecules-bom/2025.0.0": {
-   "pom": "sha256-MiFyJtFVyacdi+kJiDx3TF/9n7iuqpUkD1mQfA4275Q="
-  },
   "org/jmolecules#jmolecules-bom/2025.0.2": {
    "pom": "sha256-19pW5hKtkYCw5/uv75E+mZaUIYMykkdbzCTZt79K2HI="
   },
@@ -2470,6 +2383,10 @@
    "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
    "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
   },
+  "org/junit#junit-bom/5.10.3": {
+   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+  },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
@@ -2510,10 +2427,6 @@
    "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
    "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
   },
-  "org/junit#junit-bom/6.0.0": {
-   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
-   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
-  },
   "org/junit#junit-bom/6.0.1": {
    "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=",
    "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg="
@@ -2557,6 +2470,9 @@
    "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=",
    "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0="
   },
+  "org/kohsuke#pom/8": {
+   "pom": "sha256-HvoC08DxECQxnG4li7nHb2JVqPowKg2AAaJTpL6NfOM="
+  },
   "org/latencyutils#LatencyUtils/2.0.3": {
    "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=",
    "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig="
@@ -2681,9 +2597,21 @@
    "jar": "sha256-yrHNZ8+iXCXeQ0jlMimAKCiKh3ugHHfRYZ/kVBYZM4c=",
    "pom": "sha256-KTQ79/n1Jz41ElfEm8EDoHXwsf9SS5tivYSUKZVmsb8="
   },
-  "org/projectlombok#lombok/1.18.44": {
-   "jar": "sha256-xukb/cNYux77Je4YXpWq+bYABD5fgdA712rvwBA1v4Y=",
-   "pom": "sha256-OVHse72PKj1jcndGuCxzpU0+xEqe4l/8L2PGmW6eUGo="
+  "org/postgresql#postgresql/42.7.11": {
+   "jar": "sha256-GYGzHTmTxYcCeDwc3fEKNOSMH0E9cP8ctt7woUNIRkc=",
+   "pom": "sha256-RDynyNg1qdOWYwhwZmhFpwx6io1Or1xS4hB2/KjYNZ4="
+  },
+  "org/projectlombok#lombok/1.18.46": {
+   "jar": "sha256-AfexoBXjPiti1fXzcFMwY1erFBX9GB/Lp3lPXRmMESY=",
+   "pom": "sha256-KU6YfPJrN+2d4bl9MgOQkNJ8WH0OBM6irkd2b6cDiZU="
+  },
+  "org/reactivestreams#reactive-streams/1.0.4": {
+   "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+   "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+  },
+  "org/rnorth/duct-tape#duct-tape/1.0.8": {
+   "jar": "sha256-Mc7xLd7JedH4bXz3CMQaF9pSPQXGhf1mQunQsq3bckA=",
+   "pom": "sha256-Jjb2bevm4SQ3Yy8jpnubyWGwNjMAnlJSeju8hx9AabQ="
   },
   "org/seleniumhq/selenium#selenium-bom/4.37.0": {
    "pom": "sha256-RPEDRxkvwDC27s5Y8NEPWKpTvCgwVyvb8QD6H3G6vB4="
@@ -2750,71 +2678,36 @@
   "org/springdoc#springdoc-openapi/3.0.3": {
    "pom": "sha256-Xy6nRNQfujUohddAT7/Avgl4e2aMYC+iNEmPOgueCc4="
   },
-  "org/springframework#spring-aop/7.0.6": {
-   "jar": "sha256-0CqeHjCpuFsCxeVLDoZ0WmVwEbHdEkAoubw4fun0OmU=",
-   "module": "sha256-im8Xa0K7hiMpWN5huhcDsFE3afsQcAbWaxpmoXXlnTk=",
-   "pom": "sha256-OmoQ6FzjfxaWCVdWOYXMDkx1Vf9NGCFFwJIPoFOd0nk="
-  },
   "org/springframework#spring-aop/7.0.7": {
    "jar": "sha256-wFA7fzGDaPN/DQ4FV/ZeVyzr32HPnDGKfLyteCSw8oQ=",
    "module": "sha256-89AvInYK4yXmmFU3wvcAsvObVKV9P5gW4++QHn7Z/Eg=",
    "pom": "sha256-5Lk8y4EMmn3hIZ37F8Try0aHVk4NG5OmmQu8OpgLve4="
   },
-  "org/springframework#spring-aspects/7.0.6": {
-   "jar": "sha256-oaamr2rj8Ki8wduUAlVCIz9D/Js9rsiiGwGuT+AByFA=",
-   "module": "sha256-juAhRDtqEnjWDkbAudZDRJdG+rUK1iCLsO35pCyKBdc=",
-   "pom": "sha256-ofanZeP7XYixo2K33MPD1OyeIN9ehelUx6GbkrqvD08="
-  },
   "org/springframework#spring-aspects/7.0.7": {
    "jar": "sha256-qkoiKfTKmF3Zyj+2YMf7dD4lhiUIepl0bTutTBuH8bs=",
    "module": "sha256-MacJLAmKtzKbXAGalvJvskKAI8qzKHEMa/IkZzautKA=",
    "pom": "sha256-s5bd9oyXC2SXtsZZ/td1LUpjjO+b6IvfGqDeciHW7OY="
   },
-  "org/springframework#spring-beans/7.0.6": {
-   "jar": "sha256-Xnic8+fI7nSMJs5q3NdvUMTx32tN7tcFSDx6Ow9tmR8=",
-   "module": "sha256-ahcFzEVHFy/eAq8zRVQmnQu2GcvVRlnHGjeV2obKQ2w=",
-   "pom": "sha256-/Mk5mcn+7Q62o91kJ7Jp3k0b/Nq2rwZb9Kf50dtRld8="
-  },
   "org/springframework#spring-beans/7.0.7": {
    "jar": "sha256-E3db5CaabMguvO5hmp/vFUXJCuVMb7qEoNjG15/2h3o=",
    "module": "sha256-WpbuprqJtLZ37rR3qUCMeM9qKElbzTQNpOfL8OThsGk=",
    "pom": "sha256-iwdvUSMA17GyzxsYWo7MhoRVKfCj4R4vgFWAM4JFWUs="
   },
-  "org/springframework#spring-context-support/7.0.6": {
-   "jar": "sha256-9IgZ2xBhW0FZCHvENVcDaaHvsfOS3fsNzXPsx9bEKzs=",
-   "module": "sha256-O2nrsw1EgEK/xmz1+Minnf9OcI9CvdLUpDMvtiZqJDo=",
-   "pom": "sha256-c1lBO7QFHpHABZE3U8qyTcA9F2F72FOviIMemWe0Uys="
-  },
   "org/springframework#spring-context-support/7.0.7": {
    "jar": "sha256-wqUM7NNCrmvffHCugVDKBVajyoQ1rdY27sOmmcCKShY=",
    "module": "sha256-gKSlvLHRUuSCiaoAs0GTIW/WdsWArB0swJVd1lHQ7WA=",
    "pom": "sha256-C7cTfyhfNu6je8V9WxxqFUogCr5b0GwGy3lzt6T4dOw="
   },
-  "org/springframework#spring-context/7.0.6": {
-   "jar": "sha256-uikg1p2WaDQlwObMNxdxXY7BIlmI3LGmAXgVtwzynWY=",
-   "module": "sha256-s06MP6khFf1yLZF5RKzoFbP0Ees4v5xIRieQ8eu83V0=",
-   "pom": "sha256-MpgB2uZOLWPw5p4H59wzwAxEcAB+r+BkBnc0NnYS/eQ="
-  },
   "org/springframework#spring-context/7.0.7": {
    "jar": "sha256-SiUgUP2FlcWSLE15Vyj4quSV5BFxs6lYsM7jSbXjWGs=",
    "module": "sha256-4tPsjUJvGGWoYOClaCFzM4FG2X6NVFnH0BwcWydKkBc=",
    "pom": "sha256-eRIlh5u6tHmSqBChPvQNbx74EZ2zk7kMOirbv9cREg4="
   },
-  "org/springframework#spring-core/7.0.6": {
-   "jar": "sha256-z7eoJVdIyGxZtzYRzKFo50dts42GIcmSy28cxV81fo4=",
-   "module": "sha256-pYMAlwbW27NyvPAfosNcJIOdqAAQy9Atqz6lK7lpp9k=",
-   "pom": "sha256-FC2hGRhzB/0SAlqQJtYulQt0QhTJt8/Qgl5q6I0wftU="
-  },
   "org/springframework#spring-core/7.0.7": {
    "jar": "sha256-nhwT7W1pACqufrxLfS0dB+MJATovu2OrJmvqhgEil4U=",
    "module": "sha256-kGfzR6oMhumLbEslGecUGTbBfWAplzHukM43Rsu+Xcw=",
    "pom": "sha256-QQ754R/UyLt8a0dUd/Pv4nWIVg0Ye9yHVuYDxGDeuUY="
   },
-  "org/springframework#spring-expression/7.0.6": {
-   "jar": "sha256-FLEaKUjO4TZ+9mG1bXU9xwURm2u1O6v3BKIiHTfu1Cc=",
-   "module": "sha256-S18VYL1hGQdQ1D0/E9Zx6bpwqOjie7X9f1hbNvv79sc=",
-   "pom": "sha256-Aliqm0fCtHyFOWMiaFq4S0bW99ezuV2tQ8wsyBTTt+w="
-  },
   "org/springframework#spring-expression/7.0.7": {
    "jar": "sha256-PCPX62K7P73cCtHX+UvpTRUYQk8cmhtN5rG2kG6NDFQ=",
    "module": "sha256-ByhHw73//Mvv0aQPVU6omdVOSylgzN37C8nXeYQcKSY=",
@@ -2840,61 +2733,36 @@
    "module": "sha256-6apmYMEqVIBrM6sgp+h1Zd5Aq30HXHceyV2v6FAuNJU=",
    "pom": "sha256-eXzUb/4oYGqLqEW0jslgo3irKX3BpFBmgedJ5yLsybA="
   },
-  "org/springframework#spring-jdbc/7.0.6": {
-   "jar": "sha256-c4os6s76074eSNBw5yPe9Hd4tqCdhEYeivjmOeAyPEA=",
-   "module": "sha256-FqtXyCpc/T4HNApA4yUMSdCT0hzkB/QGts7fZDgjUao=",
-   "pom": "sha256-BWMGqNaPzukXRIMWH6tgO0T7TVPnUpw3cVPLZyzpSYM="
-  },
   "org/springframework#spring-jdbc/7.0.7": {
    "jar": "sha256-e/h2DryhRFcGgSXdzvLKGxezFH4B0WGqwjRjYmzRI6U=",
    "module": "sha256-/2Vl0ASWw5H8YB+KLf4qmLVN0k5qwNmfW+GJfpV+U8g=",
    "pom": "sha256-8SmDhJKYsDjdFceJJPh2dO610Wj2QcD+6ykVOpZ2JaU="
   },
-  "org/springframework#spring-orm/7.0.6": {
-   "jar": "sha256-RXxIg34bYH6Iq6a0BW892imBV87FhOKuba8kBR4Hx6g=",
-   "module": "sha256-+N0oGOl1OjfjzRjxNeiCOEIEUveu8rTtviD1OoLAK2c=",
-   "pom": "sha256-t3ludc77ZwyAA/U+P31JfICErwZx/z82Zo9tRITOlEo="
-  },
   "org/springframework#spring-orm/7.0.7": {
    "jar": "sha256-5JuLjuSvDMMizz3y1y7gPaTw72/EsQVxfjLJXlEQVpk=",
    "module": "sha256-9ClPUcJGeeaCFtp53MkxU/KkN0VZ1vUoMlSJChbYWFE=",
    "pom": "sha256-dx+38Q9fpC2+C6+CszkTPtd76FF4vdXltUWWj+9Muy0="
   },
-  "org/springframework#spring-test/7.0.6": {
-   "jar": "sha256-qgmctmbUMLZl1SolRt3wQKjZai+gZVH09FqFHZb7bjc=",
-   "module": "sha256-TQjmIVrfZ+9+0It/ddS3mOzSseK3K0Cj7NaasRucHAk=",
-   "pom": "sha256-CgCscSJxWXL3K8d4h6vbYUyMnaGTM7DA9BTHtJYnCSg="
+  "org/springframework#spring-oxm/7.0.7": {
+   "jar": "sha256-rlui2MmlpqDpx5cgLLcqVVjT/u1RzV0/WYHFJ7u8EXQ=",
+   "module": "sha256-Mw4BF2WqOSdeNYNuJNWCChiCGnukJLD9IrNwJvNLI20=",
+   "pom": "sha256-Z9JPjcmjyDyJRk40CSb5zoP3o79V/vD4k74EpMhZsuM="
   },
   "org/springframework#spring-test/7.0.7": {
    "jar": "sha256-ntX9plILefH1NxSy8weJGhnF/BgYEWn+gdUnLv1zqTQ=",
    "module": "sha256-dKDBLmSAGUqmDOAgab/h9CiCBF9xLq+JcNNtnD/kOdc=",
    "pom": "sha256-H3HYJS5rJ81hg/X+kQ7JWxHJmh14vI/z+S+uAJV42dU="
   },
-  "org/springframework#spring-tx/7.0.6": {
-   "jar": "sha256-ungklrvIeDHgKuUCsAiN4YHLoalRjKiw8v/q39LLgJI=",
-   "module": "sha256-QI7LgWNLJL553bNzLmkJCGiGJdhrAH1GpraHeFKisWU=",
-   "pom": "sha256-FbXCD1y2Ceuc27ATT3I5p67+C2gpE0/2aYwo9erCQUs="
-  },
   "org/springframework#spring-tx/7.0.7": {
    "jar": "sha256-1lF6AWS74fdSWtbxrWIZE7OpzolGDnVYATAxavAir/0=",
    "module": "sha256-DA3dEXu/8StdFk+6/+8HiB7zV5tUg8GZobHd72jnq3w=",
    "pom": "sha256-vLJrAsrnNNQiS13/Ox8d0aUQLxOVSUvN2efnaW6dkyE="
   },
-  "org/springframework#spring-web/7.0.6": {
-   "jar": "sha256-amP/t7dE8+SK0ElXb2NpfWNcMIn1UTeTaOBqItLQRsk=",
-   "module": "sha256-7KTmUDcvJOnZWrpbDk767zqCe3e6HRgBaIWp97QESZw=",
-   "pom": "sha256-HdUgoxjJ7E34QeNjm0kkacchba/NISKT6hmzV8AUjQ8="
-  },
   "org/springframework#spring-web/7.0.7": {
    "jar": "sha256-28kpjYOEn7AlV5H7hrgOmWz8SCgBzkh5SBrXM9IlxRg=",
    "module": "sha256-pr9Z7LzcVY91ZKHvZFaXoI+I1CKQ4/p6I+o7A/qO3D4=",
    "pom": "sha256-MOx1cnJ5tml46fGwel3oSvyzCGm9ba578DeU+/aPlNI="
   },
-  "org/springframework#spring-webmvc/7.0.6": {
-   "jar": "sha256-/I3s681dAvM922+QDns0JBxqD6qCyUWFnFqNVsouDjA=",
-   "module": "sha256-qh5ri6yE7AzFzE3VtsiqSmfK1sKBnjdNavs4C+GWHfk=",
-   "pom": "sha256-Mp9wHqlQGxRy29rJjtL6EExidpHIRSle2cMfHJU1LRw="
-  },
   "org/springframework#spring-webmvc/7.0.7": {
    "jar": "sha256-QcDG7SJEzbzYSplVtLJxfoRm4g6CM1sEPqnOdo3DjZw=",
    "module": "sha256-w09Ehim8rcWcQzrNE2xEK3lnSPqEWHpXwMr5AYmTSgk=",
@@ -2914,487 +2782,292 @@
   "org/springframework/batch#spring-batch-bom/6.0.3": {
    "pom": "sha256-gM/L8eVFdL7J8FGjCk32HQ4o4N3/FqjJyMJ7t2007VM="
   },
-  "org/springframework/boot#spring-boot-actuator-autoconfigure/4.0.5": {
-   "jar": "sha256-YpG7UMOBSldOgn5Vb2LVqmZfdvnXIW2BjxOdbyC5M7g=",
-   "module": "sha256-nD4kwFhyedE3IRt3FECJdDukj0anR5QjL+923fpAmx8=",
-   "pom": "sha256-RAfvAWVnbCDba/ziqg1y9g1VdG/CxJHXqNjV5GHSbus="
-  },
   "org/springframework/boot#spring-boot-actuator-autoconfigure/4.0.6": {
    "jar": "sha256-0reY0C0x++IN+hKPVh5528lqRgpn4LaartHgeCZzjAI=",
    "module": "sha256-5+DeZLqYXJ6rS3H0cBL+k3TSLKQjCQZLrkblz7gbALQ=",
    "pom": "sha256-PVnqNT16smOar38Px1uGP6/K/+558iZiHrZWDagHWXA="
   },
-  "org/springframework/boot#spring-boot-actuator/4.0.5": {
-   "jar": "sha256-WzbDZWHAxi8jvoJDiDXjLbxXa4cdlWMzylslipUT/Lg=",
-   "module": "sha256-aKdDBoI+pTl613aTgemm4cRYkQJrsdLYOICP6LBC/JI=",
-   "pom": "sha256-JtNJpPSVXKpw8ZlX6GPe0ZZfy/b4xt4MQjJKzqNiBYc="
-  },
   "org/springframework/boot#spring-boot-actuator/4.0.6": {
    "jar": "sha256-xbSQIFPGGSPYHm+umGTzlt1a2pI+FFvDOAV7Or8PHtQ=",
    "module": "sha256-zz8RWMQReGk5ILL/XFYV8V9sgGxoWf1xXW51Ib9rPLo=",
    "pom": "sha256-20ZBUJcRF8Yxz6Fx3e7AvJme5Wz8AzNe4CdKuANp21Q="
   },
-  "org/springframework/boot#spring-boot-autoconfigure/4.0.5": {
-   "jar": "sha256-9ApuYF4R6vIbt8BCdmARDdLMzFd+mTRxKmBOVmtEBMA=",
-   "module": "sha256-u3eXKQzRJ7d+ovSWbkncwH1+FYq7JVZwTVBn1VWZkIE=",
-   "pom": "sha256-UQ+7zBylZcsA9wvVZE6WQsDMwnK37Nt+S1PBjxDcO7Q="
-  },
   "org/springframework/boot#spring-boot-autoconfigure/4.0.6": {
    "jar": "sha256-poqaVvGXarnWaecyiJ3p3nPxJi74hU0O/3CAbM+NxoQ=",
    "module": "sha256-6YXllDRI/nOHMoIM7T4wld0j0FA8O0ddoDkIYPNGah0=",
    "pom": "sha256-+MgVd0bpF9d6gx74BPRO+jkrCzd+xFCFblqPOOiVh0w="
   },
-  "org/springframework/boot#spring-boot-cache/4.0.5": {
-   "jar": "sha256-UTkp2yNxLkkGoj5v4vV+lAMpb+7ied9IZ9ZuJ/B+5qA=",
-   "module": "sha256-OBRq2bkMmknocUcfc5dVkd4X/izJpa/n/QeKUFnpB2Q=",
-   "pom": "sha256-zPXlCGGX6zQdvSB2cBPdM8uY0qq4UxuAXKUKbsRr3K0="
-  },
   "org/springframework/boot#spring-boot-cache/4.0.6": {
    "jar": "sha256-Xvw7z9JyvCNZx5ZrCwIzpTOFVti2bnDQn1+J921pkQ8=",
    "module": "sha256-cwmGWzoN9LBShbzdcr/avfJr9DouRA/GjWUvbNY/U1c=",
    "pom": "sha256-Df05Q1FXrCG1IkJGU+MqeRn07OrcaWsI92gCI15l4c4="
   },
-  "org/springframework/boot#spring-boot-data-commons/4.0.5": {
-   "jar": "sha256-b3AI72jF14aH0aHLrse8fE3ba8aVsechiKsopksfgKU=",
-   "module": "sha256-I4i/QSayRxHwuk+qmkJI09wN9OFeUpjAZVxVC1Btb1A=",
-   "pom": "sha256-19Gb6xvrr9lRfB2Pma+HDtaIamxVCenKXV7dvBaPhaQ="
-  },
   "org/springframework/boot#spring-boot-data-commons/4.0.6": {
    "jar": "sha256-x1yZA0AJ1n5D/H9owuC9t4U5KVORexG748dIIf2AKCo=",
    "module": "sha256-FpqETkmT1L/iIqmFhboRwY5MDj5QNjFeHeQnw6wHekU=",
    "pom": "sha256-cIkmnGJ8OlJDK7QazZbFJXViyNJtrlEr9SqwMqNtqfg="
   },
-  "org/springframework/boot#spring-boot-data-jpa/4.0.5": {
-   "jar": "sha256-Z/o3Zp7EjJlrrhDOzThA9QeL7yvx+FSNinIrVIgAm1c=",
-   "module": "sha256-z72IkDFY0z4EZnFxBx4EoDw4aXwpjeuRLr5c89fYFy0=",
-   "pom": "sha256-sxmkEkkEK6x2X0/AaFvripB6+RAGRCjdl9VWnKf1fo4="
-  },
   "org/springframework/boot#spring-boot-data-jpa/4.0.6": {
    "jar": "sha256-9b+aO2Zkd0y1D5xvOhUSBLV2rSdiY4KnR3qEKzI+g9k=",
    "module": "sha256-NzJCn6SaIcI2aoPSHAUoi6lY1E8Fdw9kustG+Br4vV0=",
    "pom": "sha256-ZB3HRzOoigD6+Jky39nbEgdjUEUiBJ++tU6TMhALk3g="
   },
+  "org/springframework/boot#spring-boot-data-redis/4.0.6": {
+   "jar": "sha256-RBuynR37ixtdxMEnrn738nyjeEkzTNl/D2z4Tmkhg20=",
+   "module": "sha256-cR5pe+aRtSYb7Ubi8J8cruaOT6ooLYPSU85qDGTZl7o=",
+   "pom": "sha256-O4N4Q5VUSc5EUaWmUgmMNOKkDy6laFc6Blt/Hnvo01g="
+  },
   "org/springframework/boot#spring-boot-dependencies/4.0.5": {
    "pom": "sha256-bvJiVf9HiNx7c4S7p/oUc2V18TqXZwCgBdrqNHjS1F4="
   },
   "org/springframework/boot#spring-boot-dependencies/4.0.6": {
    "pom": "sha256-jBGAcWlNyHndpnyC1E4VKEUSgypSrpZV06639wabORI="
   },
-  "org/springframework/boot#spring-boot-devtools/4.0.5": {
-   "jar": "sha256-tQYbWOL7OaKBFtGc91Lqt+TOUeOONRP3vZJjrfSPx/E=",
-   "module": "sha256-aeYQQzX4BRZj9LvTx0meP8c12P5dFBziHRGdG+9Bpxg=",
-   "pom": "sha256-RHOVrVPoNT86LISNbJuIfg5eDxkU1iCOHzUxz0Lv2X8="
-  },
-  "org/springframework/boot#spring-boot-health/4.0.5": {
-   "jar": "sha256-/zt+ZaXK37r3pCKsOwFHFm3nHwqe1gs6fwwWwdDqprA=",
-   "module": "sha256-8HyymAgHonBEPdtSAp8TXK0nPo9TVu/bo5DEfGOJ3rk=",
-   "pom": "sha256-FIY96eTwy9G7GkwV3T9fCDl16QtOtHOWf9q9QMX8dmw="
+  "org/springframework/boot#spring-boot-devtools/4.0.6": {
+   "jar": "sha256-CJL/z8dJchpR0P5k7z8YL+uL/0dUNyMtmKyshLOkMs4=",
+   "module": "sha256-c/RKp7S4QqxqvNkSf5J20Bqk6fgi80eFhelh25FdZeo=",
+   "pom": "sha256-a1nFAmKIHhsvv6l4LJ5NtFuUNCNc+5hwFvgbkiWUJ+I="
   },
   "org/springframework/boot#spring-boot-health/4.0.6": {
    "jar": "sha256-B9/U9WmVWI+mx33Dr8sm81Wf+zTuudvHKarXD+VR8Lw=",
    "module": "sha256-fcXG5PabW1ohpYf8Sx5aPXNjykAAzPFrPn37TH9TQ5o=",
    "pom": "sha256-JIK8Q6pTrKDHORU7ihx3yLcC0cFuuxcZiMKNyyaxiIw="
   },
-  "org/springframework/boot#spring-boot-hibernate/4.0.5": {
-   "jar": "sha256-UBmF05RpvQgZsTG8Pg7say6yLDtEXbX/lzCMh7ZiR0o=",
-   "module": "sha256-1vY/X4frq8JDuNM+dihSTk6K5MMGGAjt6YJfTq2Euts=",
-   "pom": "sha256-5Zg7v7v4nBlIcxkkY4MVMF7oDAugFY0h1L540OyH8S0="
-  },
   "org/springframework/boot#spring-boot-hibernate/4.0.6": {
    "jar": "sha256-K9+QwcOyx7VhnsmhgbEErcY0DTzcHNkmkZi3Gde0kqw=",
    "module": "sha256-DlNiEUAIwii9EORDV/Z474azp65r3zGiouwd2mMpiV8=",
    "pom": "sha256-39+NxbrRBTVxjx/3uskqE2756dkWcXXQkCBTZHVXYOA="
   },
-  "org/springframework/boot#spring-boot-http-converter/4.0.5": {
-   "jar": "sha256-5bCS1RcoxrBkuRCLPHSa/ahqo1SQDBZKriIvIQUXcVY=",
-   "module": "sha256-yndK/vQEj/neY/rRRjXX+7sCM3FAvjZ8ce84RqdD25w=",
-   "pom": "sha256-gUzFgFCB32eTI9xG5CXyGjMMvVTx2cFrKnobaW7nGn4="
-  },
   "org/springframework/boot#spring-boot-http-converter/4.0.6": {
    "jar": "sha256-0Bg3tfxz+qaXz6wHkSN45/JPkld0phZm2abXHSD3OUs=",
    "module": "sha256-9T3gk3ktn9oabkugq0TNTrBq+S0aVaDoQWTmfjTLvNg=",
    "pom": "sha256-eeyFYxHVWrO57jjppR+YUBSj29bKEmTX+3xrMUIq0mI="
   },
-  "org/springframework/boot#spring-boot-jackson/4.0.5": {
-   "jar": "sha256-g3dug1XGC/Us+lxvgnEpG1Q5TIqeJxmxgZNlxNUVxto=",
-   "module": "sha256-zvePGdQKHWlKZkVDZYNx09PzhI8FceISEHdlaJYMjj8=",
-   "pom": "sha256-2108yipeTl1W8lqyVVClrAuk4N/uVZP17hb/LjpoWkw="
-  },
   "org/springframework/boot#spring-boot-jackson/4.0.6": {
    "jar": "sha256-gvuCj0wPPkaPBVPy4CVQetIHYdsCUDfOA7Xxf+WZicg=",
    "module": "sha256-h586dKitkvu73X14VSGmRm3W/27UQEP+BK8LBQB9BlQ=",
    "pom": "sha256-+VjMcoMltBsesNMMr9nkOjM1vVeAAr4oGZPcdhdfoP4="
   },
-  "org/springframework/boot#spring-boot-jdbc/4.0.5": {
-   "jar": "sha256-b5/haXopkMN9/1fVEQjOZ5x0i/J0SJtab2tVIAS477w=",
-   "module": "sha256-3HT8p10HNFo3YqVGktFg5zp61eRlXK73z8ZdD9TtGCA=",
-   "pom": "sha256-x51if1ovOQZXxVRlh6qFiIdywHRXgapEuLvJUzO+xuI="
-  },
   "org/springframework/boot#spring-boot-jdbc/4.0.6": {
    "jar": "sha256-oYrz2ByWF1ss5D4nb875vfhCoaAmSza9mzHJVxwDGpI=",
    "module": "sha256-biBCobuiR9as5o31o/Gu15kcUIp5n3VTW3/USdUbFM4=",
    "pom": "sha256-/CLiqJ6jOLoO8a9nKB7yNWqoR/ouh4gszoy3A5Kus9g="
   },
-  "org/springframework/boot#spring-boot-jetty/4.0.5": {
-   "jar": "sha256-4EXPVbdZsl1e9fZeE0miUXKEJZfj2qQ1XHCzhxRXyUs=",
-   "module": "sha256-8OT223quhVkhiZPflyuOEUqjbfz2+J7StvQwOk8tFLU=",
-   "pom": "sha256-N9LXfeapOmK6tfiRaR7mlCTme9KrysMc6pqIR2b0QWA="
-  },
   "org/springframework/boot#spring-boot-jetty/4.0.6": {
    "jar": "sha256-UnTzgSw6oDzFfhLyfMFdwoeG9neHkcPAyCqdrpCK7dw=",
    "module": "sha256-4mWDFed1PPH2RyCqEK5AffWeSSjkJ5LE+LIKlifj/78=",
    "pom": "sha256-Q+gJ3i0cI65mjlXtUVwGiZmN0I1FT1yayCE6cAn4kv0="
   },
-  "org/springframework/boot#spring-boot-jpa/4.0.5": {
-   "jar": "sha256-tlWuBmtQETuiftGuyihAl4Waza1jmrmV8zms4NF9QJ0=",
-   "module": "sha256-0fSvI+ZSm7CAP+G3AmTfGPvafz3EYphBGiYksT7HZ30=",
-   "pom": "sha256-Ley9UptOQBMnFmGXly4ynXO/DylW909sOR8ZYgYVPBg="
-  },
   "org/springframework/boot#spring-boot-jpa/4.0.6": {
    "jar": "sha256-mUAc2uMd6T/+qxoQBgpvMmR35CxElHviWnTx0CPxMfY=",
    "module": "sha256-y8RmUGoAJUVvblfwGIbBDQoAi1HXksCqx9qIo9R0AkI=",
    "pom": "sha256-NVZtuu86oUErjwb/N6R6TM5037KX9C/OFwyK94xxIcw="
   },
-  "org/springframework/boot#spring-boot-mail/4.0.5": {
-   "jar": "sha256-lPlQSIptdVo26BMUYkQQlHL3Ql2UPA0NyOKnkYnItPc=",
-   "module": "sha256-SlP7plJtf+Rp41jRh3ooOS6bOPHyn79uJso5x+k89ZU=",
-   "pom": "sha256-pb3SmgF8seTZ3hZ8oC0NYCW+tkzDAIX2dcdSiPI6Cgw="
-  },
   "org/springframework/boot#spring-boot-mail/4.0.6": {
    "jar": "sha256-Wj7WNsIoDNhZTeaK96Qb6OBeCEgaWHJSWnLvPqXeSIQ=",
    "module": "sha256-heajTkW1sZaRP+cAmE3kt3gN84fC8nWXt2SKh032Zrk=",
    "pom": "sha256-NRw/lTOtuVTuR/9GtDSbdq4cx2yytjeKyJED14o2dOs="
   },
-  "org/springframework/boot#spring-boot-micrometer-metrics/4.0.5": {
-   "jar": "sha256-TLeoyiGxejG11rbKHlV8RmsPnO2AvV8DWbWq05DbAAQ=",
-   "module": "sha256-DObr/E+fYc/RB2jVtdZqMYC4JRf5Rco27JUSUVVMvRs=",
-   "pom": "sha256-xWVr+W0ZhlCFJUFzGDMsSuj/M50WaMvqA0nmXH3U+RU="
-  },
   "org/springframework/boot#spring-boot-micrometer-metrics/4.0.6": {
    "jar": "sha256-oh4eQVwearMlKzdFEQ8HF+YCy2sf+lnS8qKbw6tFvbA=",
    "module": "sha256-9o864VKvFihqLn4/f3QwPUbuMZRFTGM1YwE3k5yBmcE=",
    "pom": "sha256-IrB33aHDIz1IK7pfRKwud2FJdH74FE8tZhgh2Of1s6M="
   },
-  "org/springframework/boot#spring-boot-micrometer-observation/4.0.5": {
-   "jar": "sha256-WenzbuLzSSr+DtIaD4H18uATG4mq8AHqAkStPpyTmz4=",
-   "module": "sha256-w02uiCU/liaS1AskA2xNYgvKXroAhcNI5HF0Tl9+Zmg=",
-   "pom": "sha256-ADoa4NDZhDw/fdzTpe8Tn8VhUj3F42R5h29iPhSNKIE="
-  },
   "org/springframework/boot#spring-boot-micrometer-observation/4.0.6": {
    "jar": "sha256-NoS0eVWrgLp5aRigdhC3lX9KZjZsO2e1G/jrTNxt9/Y=",
    "module": "sha256-CLCuExDKJBvfun588BlRbR5mE+RAFVCaK7DRN52DD78=",
    "pom": "sha256-RV+LN9C1vU8LGZSpY/WQ0Zb9zmk3Aj+3krV/g/bOuKI="
   },
-  "org/springframework/boot#spring-boot-persistence/4.0.5": {
-   "jar": "sha256-rdkhkxIbbZKidVckrX5ZYXt3K1QdS876+W5VLuR4psc=",
-   "module": "sha256-esde4n/ycSJyU5KNa5HLVP3nGAAZ8jtgOMtdBPBiBGU=",
-   "pom": "sha256-beGbItPt8/pnTlBpt9ODuw0LOQ4uPDMMRybw4csLSx0="
+  "org/springframework/boot#spring-boot-netty/4.0.6": {
+   "jar": "sha256-zDKvk4oVc7nAW75exGxSiK9Qb1q81YLL2GtD+jdJNuQ=",
+   "module": "sha256-nR4c2ffHPIFhEqhU0zoXp9U6KnthLrE4cIjum+Km/Vw=",
+   "pom": "sha256-jbNZaAe5LMszFwb9eT5qVkdc9kcCcQCgswa0+pMCj+E="
   },
   "org/springframework/boot#spring-boot-persistence/4.0.6": {
    "jar": "sha256-DHCLoZUBJizwdTl6fAihGsj5PnRb+dvjfiCaEvRkuDQ=",
    "module": "sha256-r9QtbAOphazN+IkW6wp1rPc5cGkzTSuHuKXfIozoXSw=",
    "pom": "sha256-FTNxPSkRQCL8v6IrB6BIwvEcgjPuuM8Uoz1qF3ANUps="
   },
-  "org/springframework/boot#spring-boot-resttestclient/4.0.5": {
-   "jar": "sha256-0Nu4LxKzGj6rF7CO3bUy4NSNqqaUuJ33Xv0dC2HB9z0=",
-   "module": "sha256-mFd1PKMGaf9AZKha5SRgVzwR1A/8AY/J4AiuRsOU72w=",
-   "pom": "sha256-qn4ig5RA8OUfl83bTGbebeHCJgte/zLpad0Bkh9EUjg="
-  },
-  "org/springframework/boot#spring-boot-security-oauth2-client/4.0.5": {
-   "jar": "sha256-GCHgkdKqFXskn7vaKJSFSxSbp+tSpN3/vZIamZU2fyE=",
-   "module": "sha256-tw+3vfVHv48dShvuLKEreO3LwgY9yGutmwRiP9Shw/Q=",
-   "pom": "sha256-p1vXO0fdpfljbFpsP8YJ2214D+G1YYVullYkIHESkw4="
+  "org/springframework/boot#spring-boot-resttestclient/4.0.6": {
+   "jar": "sha256-Z1+kuOIUjSVnpJgHCfBGwCk3su7AYhPqIevdZDNlSvw=",
+   "module": "sha256-Q5XbyvZsQIFhIBrUXTEizQEZWkc760s77W+J5cwBS4c=",
+   "pom": "sha256-4IRX/6HH5IFKIJJ4cAOJdPgxMwRMUPv/siCWXnhexqs="
   },
   "org/springframework/boot#spring-boot-security-oauth2-client/4.0.6": {
    "jar": "sha256-1DU0Gl2vnwi49F8cYM26ffL7wmuzJh4r/gnVH0QkmRk=",
    "module": "sha256-0Qbr8cRHZTcmlLGfYKfS9WiRD0lTdUY2JBWF5rDajvE=",
    "pom": "sha256-c8oEN6nDPlAjoVZpSGBO3zi7ujxHDQp2UyAZnyKHExA="
   },
-  "org/springframework/boot#spring-boot-security/4.0.5": {
-   "jar": "sha256-KvkFbACKn/Ue9PvxVk9IxVAkjgpyscHOUiDOmJ0lrws=",
-   "module": "sha256-/a84dupJHYtK0r1DOnxwUVE9VlgVRtxwpAsgL0m4j7w=",
-   "pom": "sha256-V+KXmVxKafeSk/VfLSTlSbKUMatlO1AI19t2PYUgvzU="
+  "org/springframework/boot#spring-boot-security-oauth2-resource-server/4.0.6": {
+   "jar": "sha256-g0/lhlzM6qfeB90gEUzO+i4IdnAdlb2gzWcI+24KWGQ=",
+   "module": "sha256-l9KgjLRFB4OrOAx2MSg5AxOKnm3mYWiQsU7Q/zaVyyo=",
+   "pom": "sha256-kD66Ajkrt0QfrTNIJUZCFhocQQ3R3A/98z9Sf2Ei3oo="
   },
   "org/springframework/boot#spring-boot-security/4.0.6": {
    "jar": "sha256-8Z53UqUaxUA1r0MjGxNoPtOG/u2AcDtGcE3XrTH1TdA=",
    "module": "sha256-dPnj2lsPJDGqh8saZVzZCBFkYsjHnLKs1ijXLpuobVM=",
    "pom": "sha256-Fj/H9vboSvt+UvAW1E7obk9Uue7o7Hzrsh634AeWp9o="
   },
-  "org/springframework/boot#spring-boot-servlet/4.0.5": {
-   "jar": "sha256-L+eFWHEQoPKAigBNv7MdkJ2mqS/vCrsUvrHwhbgNvnY=",
-   "module": "sha256-gl9Ko191aYUSHpADKTqrKJJozGbQHeF5k/U/A7qHZuU=",
-   "pom": "sha256-ZCf/UvRQu5uvWt/Xt0FHVIbepzn7OIYV51wSOMLbaAs="
-  },
   "org/springframework/boot#spring-boot-servlet/4.0.6": {
    "jar": "sha256-8vdeveKW4Q4Bu4jrcBXerfNu+InlUmcXYzhmRU0SULQ=",
    "module": "sha256-mYK+6u+nXQEZrI2Ba7udMr71G/6L1lcoPwpQ1buCK4M=",
    "pom": "sha256-P9khjiKxsyjAmb+ZXWiXTHLaUHn1SqEaZIefC8r9n1M="
   },
-  "org/springframework/boot#spring-boot-sql/4.0.5": {
-   "jar": "sha256-NTOGxbO811TqLsNUmQjxuAMYbm3gHNYkiUf8nQAwZH4=",
-   "module": "sha256-33V7RQ0ngNaEr49Z1jw/M0aymCVo1cLRDOjHdNeyILk=",
-   "pom": "sha256-FStk+cNuyPr1+UgWzp2jSwxlFEl1PRU5rCLqdIoN3jc="
-  },
   "org/springframework/boot#spring-boot-sql/4.0.6": {
    "jar": "sha256-qpjLpqAZXOCmzEjgdfN/SxFYfZHxAEs7N7R6WYl95hU=",
    "module": "sha256-fgsylQzf5YZIGManC72BIFObjEQETkfR6Tb6YgIo/1E=",
    "pom": "sha256-7iq2bArFrXm45V30YHZSMEQwxlmkvXfXu3+CI2ZLkhI="
   },
-  "org/springframework/boot#spring-boot-starter-actuator/4.0.5": {
-   "jar": "sha256-+0rWxCv4xgrSOKDWSmMHAwfVwMWRVwaraeyrazV3z24=",
-   "module": "sha256-hf1AvazZv/quR+usGbUwgZzSZnRQmoJkwtyAbTZZ7TM=",
-   "pom": "sha256-SIelRt+2bSyuc1xCXIaR1N5RKcpaTP7PU2NkhhYr0Ng="
-  },
   "org/springframework/boot#spring-boot-starter-actuator/4.0.6": {
    "jar": "sha256-4dx5kjvCgVrMTciMmFcVU0kQr1Z99wf3W5bMou1pKoU=",
    "module": "sha256-MIgnCjjAnUJvVQswzpKY5FkZZveDDyf8d0t5WPmYcII=",
    "pom": "sha256-bRD9MM4RRxr0n5hu03wGjoFN5Slp4ev7yTgYkMI87vA="
   },
-  "org/springframework/boot#spring-boot-starter-aspectj/4.0.5": {
-   "jar": "sha256-gk8CJ1Js+VTLZMuuk/8wC4r5x/iSLDAEJgFpHFJUOVY=",
-   "module": "sha256-ovzeS2pTjsEN/vUfKXnqxfYKTQxbchAbkGUFeKeBLwA=",
-   "pom": "sha256-89+92CbsVCWjSMmUsEHh9RhA4hiTHRYho5XtO6Lrd6o="
-  },
   "org/springframework/boot#spring-boot-starter-aspectj/4.0.6": {
    "jar": "sha256-kyPUz7mV5BF6upePeJXPc1jo1fS7xPKecIUUmvUmuF8=",
    "module": "sha256-3WEyUXxut0b5SAjQMbh48D+wDF92M8JN3dy1utfnCqw=",
    "pom": "sha256-j974hJTwcl6d8Ef/u7QcHpJUIcgW7SM71Vkzjc1RSjM="
   },
-  "org/springframework/boot#spring-boot-starter-cache/4.0.5": {
-   "jar": "sha256-xPD6MdHyQPE308OGL96myYzck/tIZVIvZG6w49eaXrU=",
-   "module": "sha256-ShKk9X/zMRA7Ld7UbGsHJ4AAg93Fju8AUUwCIHJDKUU=",
-   "pom": "sha256-YTBcFxFd9tcpd0xYyElpOfIQW6Mz4ui21Xjl+9/Lo5M="
-  },
   "org/springframework/boot#spring-boot-starter-cache/4.0.6": {
    "jar": "sha256-TwC//0/eZTD+8TsjRbLDIdi62dZr36mz49Ly2YQ0UlM=",
    "module": "sha256-f9S3UUkQ91vN4+CAMTIwgLPnKeZH4zAlMO0hxzgwrno=",
    "pom": "sha256-33ZRZAhRhLAsXFMZfYGM945W5C43hAxNSOTdJJ5Pqoc="
   },
-  "org/springframework/boot#spring-boot-starter-data-jpa/4.0.5": {
-   "jar": "sha256-QYaJ0aqNPr4feqd+Ccg7hO5x8DBESNSSodwQPmivoBs=",
-   "module": "sha256-qg6B3Wopo8RRI79rUkMmzVuJIeMLmZYSzfgyQAGOYsA=",
-   "pom": "sha256-zL+BziYDNKDNvLOtZ77w55JKacyEHcjXYzDInQKydCE="
-  },
   "org/springframework/boot#spring-boot-starter-data-jpa/4.0.6": {
    "jar": "sha256-pKIkkzH6LSZ8GddIQTLLgYvvVqSHT2mIQ5ZOCzTdzEg=",
    "module": "sha256-OJQByWPujiZbIopCKERVMqGHy44XqQlop7VFCBFKRcY=",
    "pom": "sha256-HQKBg5nWlrjMGCHv9zYpSMpbVL0nsiOzoY9pM13Sblw="
   },
-  "org/springframework/boot#spring-boot-starter-jackson-test/4.0.5": {
-   "jar": "sha256-PnrYCe4q3Vc2/IjzEZ4e2Ep/5abNRtCuXGCNYxCtT7s=",
-   "module": "sha256-/tk4IvR65XA/mkvbvXiTfUyjuDYHUc8NY8hSpLmYogI=",
-   "pom": "sha256-OCy+laUiq/+7XO6HLP6uMN+LYd1cG4jAAwDPWB1gqKw="
+  "org/springframework/boot#spring-boot-starter-data-redis/4.0.6": {
+   "jar": "sha256-sCsOVuT3qNjTKHrVjSqhI9OT+h7LRIHmMqlRMp57Qr4=",
+   "module": "sha256-s31Fek6gwPQEoXjoA3dm1ApmNtwWjlF4jgXjDcchbNE=",
+   "pom": "sha256-7t1GsGi93k1TIN/KDOMdxDlKCj4Y7AvEOKjQOAq7UeA="
   },
-  "org/springframework/boot#spring-boot-starter-jackson/4.0.5": {
-   "jar": "sha256-KVJ2HW0xLuzSDRmZD36q5uYQ13Q9QFN+7OrWWmhaRtA=",
-   "module": "sha256-imXCQ/OKu+ytQ99qRmoKUc3U7kQERKo8knhaNoLXRiw=",
-   "pom": "sha256-vugxymtllOJzEf5bOKsu+mv0O5WSUZnt93zxeLyg+U0="
+  "org/springframework/boot#spring-boot-starter-jackson-test/4.0.6": {
+   "jar": "sha256-Z63wfUndUCYqCe6lX+2a9SJUxFfUypH3P61W/z+/5vw=",
+   "module": "sha256-H2DJ1djZzHEaODrrWs8Xl2yugops/3e9NloONLotCx0=",
+   "pom": "sha256-BptofvesxlFwn8bNlry+ZR9qOZ9oQxhETekAeGMXYkY="
   },
   "org/springframework/boot#spring-boot-starter-jackson/4.0.6": {
    "jar": "sha256-eKP7zjLkG5GFo+oyJ19JRSms6ZV48+wQWy+gPfIEPoM=",
    "module": "sha256-iYpsGqtA/1hnzJBsrTj9pWUqzQV2Rs5atUyjFgjluks=",
    "pom": "sha256-GHxcIdzMFNqR/lNhK4RDBzbOeJV7UbAcFy6B9t8PfxA="
   },
-  "org/springframework/boot#spring-boot-starter-jdbc/4.0.5": {
-   "jar": "sha256-Bxv0TFLnBvVD1BEQ01XIJ8lv4F4KE+fojfupJRBNP10=",
-   "module": "sha256-lF308Q9IeJ4KetOwdBbjFdFPWK9/QJl/JZVE3NJhy4A=",
-   "pom": "sha256-mJap4X+uZcTdBLaEJT0RGnxze3etHbC+HL9JmzpK+O0="
-  },
   "org/springframework/boot#spring-boot-starter-jdbc/4.0.6": {
    "jar": "sha256-DNlKZR0b4gnHAb5OzFm0cVounFPzs1BpAMd12vqaa/E=",
    "module": "sha256-aZ3F+EsxRaWJ12xZiEgIRf4o6w+fFYjIL4h18cO7sGY=",
    "pom": "sha256-Ef2sEl0pz2eloQX6OAqjvUylAixU4zyerEA9DrI+AbQ="
   },
-  "org/springframework/boot#spring-boot-starter-jetty-runtime/4.0.5": {
-   "jar": "sha256-bLBlBmQKkPKmkmLaOsLQKYNGurS6YiK2EZMbnSBmfyo=",
-   "module": "sha256-Xa655ERP1PZevI2OntCmSQeEZYdmRs5wcljanb8rN2s=",
-   "pom": "sha256-IfJ/WWiX3fc67l4qIItrmLsd6XaHTRRzUQE/Hp+DYHs="
-  },
   "org/springframework/boot#spring-boot-starter-jetty-runtime/4.0.6": {
    "jar": "sha256-pfitfR1NOxbyVlmuMNSZ34yATzC9lOMu0IbZhD81HGc=",
    "module": "sha256-0aQHWfR9NDMkJcU6pqA0lnue0VXzAx78vgM4hc5x84c=",
    "pom": "sha256-JgxqrAv6fTQxbSVaAjyj8cm0cTChf98KWQdBbnrODV4="
   },
-  "org/springframework/boot#spring-boot-starter-jetty/4.0.5": {
-   "jar": "sha256-NTtm3yyjsAA9Xbwhl6uN5COli2tys2VdS8x+HMR0DNU=",
-   "module": "sha256-5ZSShdDVpyTc3k1xtuYDFTGg3EGmlHy0PWqXQxbranU=",
-   "pom": "sha256-EtgMkBECuQVndyMJuce68k8wxAnAwNoeukEmbEv0Ipo="
-  },
   "org/springframework/boot#spring-boot-starter-jetty/4.0.6": {
    "jar": "sha256-vfIUPr20MUqUyOU8Sy3nkzrQDfAE57zbxjzl6GPrp2I=",
    "module": "sha256-Cc8ESGjMBSr1HWYYXEFOD/eljBl/7we+SeJfQ55f5LA=",
    "pom": "sha256-was6gstwWLVvRaepZJfCJsE2IjhSYtN/h9QjSB439b8="
   },
-  "org/springframework/boot#spring-boot-starter-logging/4.0.5": {
-   "jar": "sha256-rGR0l5i6NafPdz9hVFrP/i/qQobsJHPNKORCBoMYcnQ=",
-   "module": "sha256-y8zFLWMIyRZ0CuMwxrYGeHKKWP5gYD5iXwBdXk5LDuo=",
-   "pom": "sha256-Y6siluSj+HD8EzHBALzy7PHuCs7gYzGAenQm6XaQEe8="
-  },
   "org/springframework/boot#spring-boot-starter-logging/4.0.6": {
    "jar": "sha256-q9HaQq9a/E9gZUlP07UNGkeMdiHOoLAMM+8OmcCYu5E=",
    "module": "sha256-+y74WT19aUD72/et5Y5ejpu55SdfcYU1tRoJz8Nr72M=",
    "pom": "sha256-zCPEfsM/R5YiF9KqqFfnZ7K2CeR0r0xHQaCA8J0U5RU="
   },
-  "org/springframework/boot#spring-boot-starter-mail/4.0.5": {
-   "jar": "sha256-6LKDVzYDW5x46nD87AI/UNZob3r3GyHl4Lxki2S68/Q=",
-   "module": "sha256-04ei6aSWY9vNzLORZnp1kxh7k9PZ4kTupqG6dKSwdCM=",
-   "pom": "sha256-Cl/vxOVFnqbJ7rcJCD6gbpOvtlsVIlnTi0ledQxS4ek="
-  },
   "org/springframework/boot#spring-boot-starter-mail/4.0.6": {
    "jar": "sha256-UElncCl254XSvsgXFVRqxlQNqhljKANqSsmq33M+cvE=",
    "module": "sha256-KBeHvJSNqwJDvYZCoAUxHiQDQpB8xvNNsZUmWboS/Ps=",
    "pom": "sha256-ZVB4iprq0S3MakZgz2ygOW12FbTJ9Ownzo8k+z4lAaM="
   },
-  "org/springframework/boot#spring-boot-starter-micrometer-metrics/4.0.5": {
-   "jar": "sha256-eKN6qHjDuJmSn9F9MfPVybltiCp9msuwt/YtFU0PS6w=",
-   "module": "sha256-J1bzBNduhB0ey85UapIN/l2+Q2OzTDJjh+QqufGAWD4=",
-   "pom": "sha256-yv4T4PHHSYyzcs7oGG5FW5ycIRd4C+cjjtEheudyJQU="
-  },
   "org/springframework/boot#spring-boot-starter-micrometer-metrics/4.0.6": {
    "jar": "sha256-fj2hqdra1U4Ii9dk1L/GrwYRrVLuBZMmb71JppRtIAg=",
    "module": "sha256-HsT6zkwuSdWl2ECYVp0bfEqL+ggpXN3+jn3VyVFJSVE=",
    "pom": "sha256-y8Y/eRvvv14lLxxkmDVIbzoLjbb5IdRxH3mYPWFEoj8="
   },
+  "org/springframework/boot#spring-boot-starter-oauth2-resource-server/4.0.6": {
+   "jar": "sha256-UbjOmJ3tRrJNh08QD4BAYPQ6+JBqmFnPrTMtTI7uJjk=",
+   "module": "sha256-cg1MHYw2hAdL0lUq108nlyP0d88jW5Sjl0ff8yMXwuk=",
+   "pom": "sha256-ZdAUhWebD5Ji7TIlllZhUk1Eduu0TfHavVhvOYUlF8U="
+  },
   "org/springframework/boot#spring-boot-starter-parent/4.0.5": {
    "pom": "sha256-lEUWG1cN/NEp8jR+nVQORBScsLzjaDfGaMiujY2SuhI="
   },
-  "org/springframework/boot#spring-boot-starter-security-oauth2-client/4.0.5": {
-   "jar": "sha256-2npZ4Ptw/v1Q7H82F+wN0/q3DLYEq+MbitSzz52Yqgc=",
-   "module": "sha256-HR2Lldu9A1foZGgf5P5KBvwLo3VRu7ViUbZHBtr5bHA=",
-   "pom": "sha256-xSWdpZI/pr9Ex3+eBbKreU9/M1U3ULrH8XiYY30hn0Y="
-  },
   "org/springframework/boot#spring-boot-starter-security-oauth2-client/4.0.6": {
    "jar": "sha256-dWVPTnIYDw2V9KD4W1KDZbnz48eYZQCC9HeXbWynPs0=",
    "module": "sha256-Kul7nFqZa8lpJiMLblGvJ4y6fKsjdXftXZxZn64PeYw=",
    "pom": "sha256-TArxVjJpNf6f3lxL1EVgHD3+hctjEWBK3LpRpWBGWqA="
   },
-  "org/springframework/boot#spring-boot-starter-security/4.0.5": {
-   "jar": "sha256-vVLfph8wHNtcj7JFrsN+IatQX4Bh7HlaswAUXET5GC8=",
-   "module": "sha256-7ljECSWgZkK7bk8kJeDGhpb/7QptzC9bWxsXlABj3dg=",
-   "pom": "sha256-B3VApe/+gB1wawC+6vHz2LDJdrU+vxlVT7DYJpeeFxI="
-  },
   "org/springframework/boot#spring-boot-starter-security/4.0.6": {
    "jar": "sha256-lN8pM8M4hkfyPWT44f19FdO3UthoTpH3xYJy06DbcOo=",
    "module": "sha256-vS+pb96/b1KWYsesmeARgXnUkOgsuG/6tQftvIdVpQM=",
    "pom": "sha256-FpMnWMU/l8cV7EtV4E/xJMlZ/qTFzwiqHqR9jUEsWME="
   },
-  "org/springframework/boot#spring-boot-starter-test/4.0.5": {
-   "jar": "sha256-4b73IrDoAEqbCzXrS5RTD0FfTANANxJ9xwhArwfKDX4=",
-   "module": "sha256-aU97P8FaIUjnqW0tpyNl7SKNgLQsLhK/LDup0SoTRB0=",
-   "pom": "sha256-TfgEU07Kd/mcTqi6FlLimeLUGmJMvXkPN6vpJpGPFo8="
-  },
   "org/springframework/boot#spring-boot-starter-test/4.0.6": {
    "jar": "sha256-cGjmKaC3nIOO1FT+o3yUyxpqxwW3wUjJAueOj8ZjS5k=",
    "module": "sha256-x7Ao3P6DtaPqEqhD0yIUFv8vrjM3nzBZn7FnO99Rpjc=",
    "pom": "sha256-6xRUlKzBKtHJf0K6XVIfg6lfxvzj7moEz79u0beEJfk="
   },
-  "org/springframework/boot#spring-boot-starter-tomcat-runtime/4.0.5": {
-   "module": "sha256-oQdzmpqroO2E8jpexs2mQm6zthG5YmigrXSAQMvM8B8=",
-   "pom": "sha256-LkSkuryKUzWvsMfcUyhY536Mgld7AVEOrq8GCYVN0gI="
+  "org/springframework/boot#spring-boot-starter-tomcat-runtime/4.0.6": {
+   "module": "sha256-Rd2WTXoZTrPCc9rMp+wzg0yxCB9mPRbhAFjTIpjT88s=",
+   "pom": "sha256-13+msogwDX79ta9NVsN1gEyMdJnyK+cSB8f+KBjcFfk="
   },
-  "org/springframework/boot#spring-boot-starter-tomcat/4.0.5": {
-   "module": "sha256-chY21Ng49AyQj6gDKtuNGcr5w5dk5+hg0ocqvjah4yM=",
-   "pom": "sha256-J112yINLJWrc5LimpemRYxude6PvJdfpdx7eOiMnOU4="
+  "org/springframework/boot#spring-boot-starter-tomcat/4.0.6": {
+   "module": "sha256-V2Qa88iDPTRJv40TjGLn181apaq2OJA4I367/hCNhOw=",
+   "pom": "sha256-7GqIX6+fOc6dpB6pCl6n9O1ul7cpjD7VPpN5mN2pZjQ="
   },
-  "org/springframework/boot#spring-boot-starter-webmvc-test/4.0.5": {
-   "jar": "sha256-CK1cjli/E5euhiWX8zx+uQVQypRK69PK8V5/lOTk0xs=",
-   "module": "sha256-LaLAC42sWh+YAGVgy2D1Clro1WMMUtlbMlwvUyuk9T8=",
-   "pom": "sha256-o8QNXANbKHzbT3fuxi5rcaAB1bi4X14IFLuuFAIm3Xo="
-  },
-  "org/springframework/boot#spring-boot-starter-webmvc/4.0.5": {
-   "jar": "sha256-pZ7SgV5VMZV3JmIKX2yA0uRvjD7yuLNchJxmHnO3ygY=",
-   "module": "sha256-SAft3PkbsLnzWyEJsRL9LYY6U/FVAzzO1DmvUFe/AJY=",
-   "pom": "sha256-+Cux750W09j47YTjggpANO6pP/ecml0yxmnJvSVhrQ8="
+  "org/springframework/boot#spring-boot-starter-webmvc-test/4.0.6": {
+   "jar": "sha256-UkSG30xuEZbYgaEq7jk+0VXm5f2F8zPqNgx6IGsjKuU=",
+   "module": "sha256-TiCssbbg8A8REhgAM9da0IgeKbS61C4YLgQ+UX+MMXE=",
+   "pom": "sha256-1bP0oSvMtFavRtSsUCP74rwWCxuXFg+ep+Id7Gp5QR0="
   },
   "org/springframework/boot#spring-boot-starter-webmvc/4.0.6": {
    "jar": "sha256-oyO7HXLWgKnkkr3PE3Ma6f9EO5bM5oByrCsT/h/o/4I=",
    "module": "sha256-nC/rKLUgABlp+uQu8ETXzOnpyuBrrcrzGfbSrKq/ZEg=",
    "pom": "sha256-1Ekm9hJiITwpCk8UjN4RWQ2OpFg7Dsac6eoOWmSYnCg="
   },
-  "org/springframework/boot#spring-boot-starter/4.0.5": {
-   "jar": "sha256-pmr03CZ+d99I+RHs4B3IJbbJB1pm0ZlLBn2D5E4vKoE=",
-   "module": "sha256-CkG9g+QE0GVpH0dgGdBaRGVolQAW9JAgolh1ccORJnQ=",
-   "pom": "sha256-7ldQxBwxDpMvIrbURdLv5RCfoxk9FMeE0yM2JxDg128="
-  },
   "org/springframework/boot#spring-boot-starter/4.0.6": {
    "jar": "sha256-TLDtHPJTqpO26Ao51p5opI/0oB1gw8EnUzEytGvbeQo=",
    "module": "sha256-tlAmA3gkjwJ/U2cH7ZsA/GV90073q8UT7Rf9HcDfhrM=",
    "pom": "sha256-VYOks8/DVqVFmqNlgclxOzKgX3X+H8euWa/EiNvpteY="
   },
-  "org/springframework/boot#spring-boot-test-autoconfigure/4.0.5": {
-   "jar": "sha256-BfbPymp/EEutZGqzE66l7yI0ecZVK7/MPNBN7iavpjo=",
-   "module": "sha256-ANhn06SD6UEja5UKr9LAel7cr8r4kEy5L3vgPkUHZE4=",
-   "pom": "sha256-TQHqcZysbCQMKNGGdm5VIeM9G3vqOW1Pi+o8XRGjKbc="
-  },
   "org/springframework/boot#spring-boot-test-autoconfigure/4.0.6": {
    "jar": "sha256-3rGkq/6r7RTvb1AbWMEhXwoki6JP+e+IZR4Wd0oy7ok=",
    "module": "sha256-yEWv+wC4cVp0UzmT0kMfy+wEFB4itJNSgusjs2U+VB8=",
    "pom": "sha256-8lgs03ToHn+SCFUjtazHKCsTuv+11nz2MIw/FQfuNwg="
   },
-  "org/springframework/boot#spring-boot-test/4.0.5": {
-   "jar": "sha256-0PPe126cMTLTpI1zTSn3HznkMlIDbnW3CQeEBR+Y6Gk=",
-   "module": "sha256-9ZoSksLAwzebEHalBdl52Eiu0ZJAM5mbf2+HZU03WXs=",
-   "pom": "sha256-0R9Exfc8O7YtEuLQbhrnGVUozg3VyP6N3SuxnsPslfA="
-  },
   "org/springframework/boot#spring-boot-test/4.0.6": {
    "jar": "sha256-M3VwbfoLAhOOXO9CCL1vJY1FuQ2X+vz4Wa7yXuImdFU=",
    "module": "sha256-WIapyoStv+wkGfj0Qc/lnEs7HIGMgZ0bS+q3DsSejCA=",
    "pom": "sha256-FcjmJwNI75St23jDa0M+lFUSQc3iaFDmE/pTrh/rZbU="
   },
-  "org/springframework/boot#spring-boot-tomcat/4.0.5": {
-   "module": "sha256-u/9+4v8k8rj7pyZVOv6CZSxmFZtY+4HpxsPp7VlIp1U=",
-   "pom": "sha256-C4oUPDVfdW3kR87TW7KLUpIwVSBKz+VhvLwBBBhZYfo="
-  },
-  "org/springframework/boot#spring-boot-transaction/4.0.5": {
-   "jar": "sha256-ZP69yrJ8TBy3TMUl5XbwSWodG2tXtxhZzJ2h6omMdTc=",
-   "module": "sha256-zMYGoJzy5mD2I2d5fXvHzrvFacSXFnKPxD/l1louDsA=",
-   "pom": "sha256-CWRUdz0PoFA9F/Y+WKuXfFU0spSsB4QekvM4zTQbOCg="
+  "org/springframework/boot#spring-boot-tomcat/4.0.6": {
+   "module": "sha256-xKFl5IJ1qG9aria+dU9styLaryrML08eDmE8tNu1V5k=",
+   "pom": "sha256-tyljBZKDF0U9+NPI2BfCEKV6ZlOsd+e2hhqW+lAWnlU="
   },
   "org/springframework/boot#spring-boot-transaction/4.0.6": {
    "jar": "sha256-euVoXLftyeDXiLqqbAytTvY8nWgmRG8gWA9vCDn8qpA=",
    "module": "sha256-N1yXLk2qzeHZeiYt9rIkgryRpHekzLMfOonzXkYXKIg=",
    "pom": "sha256-yWP9XRLyMjIYPYFg0TxDqWNtyS3WAuAiCiSQArRKf2I="
   },
-  "org/springframework/boot#spring-boot-validation/4.0.5": {
-   "jar": "sha256-uOkSZCLvtxZBYM9rjIaZ3dWJTnrpXnKg2TW5nC0X+PQ=",
-   "module": "sha256-l8a48NDpNzEo6mGSEiUL5dKnHEGZOQMD7sYb4nD+/Pw=",
-   "pom": "sha256-+DfORx5rzvLTysH99N+x7Dy2n+s3O6g0t35OwFhWg8A="
-  },
   "org/springframework/boot#spring-boot-validation/4.0.6": {
    "jar": "sha256-YJQKdr0ZxsW+4pZZR3JNZyJSodH0DKd36cvQnbTE45U=",
    "module": "sha256-PW/rw1OerubQmyEBo6KLIuiAMsjstZd567gYPr5U6Vo=",
    "pom": "sha256-WDirBaoRrkZ5AcpF8nVJXaFx8SGIOJm3jZovqPyR11o="
   },
-  "org/springframework/boot#spring-boot-web-server/4.0.5": {
-   "jar": "sha256-IhNGF23diNbAdzvbPTeUitm8iDJlhix8k2XdmhY9rC8=",
-   "module": "sha256-ThZ750hM82Wvlp5gEo8h/cZVC8Ll0uiIhRfc99UY0sg=",
-   "pom": "sha256-AzYb+NRqQPePMCbt0j+kS4n5OKlqa6ghqRd0IvlhweQ="
-  },
   "org/springframework/boot#spring-boot-web-server/4.0.6": {
    "jar": "sha256-113MRd17Ca6YFtdKrnctwirH/ubKaejglPK2kyKdxVY=",
    "module": "sha256-f0Ko/l8l5NaRjRme/JlKi70MbmJ7PIPRSsqfdlIeTvI=",
    "pom": "sha256-cDeuiAq1wCpBbIJmunlHCt6HceAdSGTMQIaywEWJwGE="
   },
-  "org/springframework/boot#spring-boot-webmvc-test/4.0.5": {
-   "jar": "sha256-R538t/BlE0oY0eUzu5GgPZtJBGZuzv/R4bwm8WdyeqI=",
-   "module": "sha256-YsVEOXv0J10ANDlv03Sg3X2/hGEBpJ8RiXdVURTKp+c=",
-   "pom": "sha256-cBGtc5BoOOUOpiTg/cgIAL+IdC9p7TVNeF7I6BzduI0="
-  },
-  "org/springframework/boot#spring-boot-webmvc/4.0.5": {
-   "jar": "sha256-NgX2/4unZaV9oih6Lu2rnM3lR3cIZJe9ij5eOBn+hwc=",
-   "module": "sha256-mB8l1qXAUxe8AIjIYtVy5sQX0v0fB7LKb9ZXXFdMwAw=",
-   "pom": "sha256-9eYQJ0LP0OMIHb+dyBkNbgiUAmUcRFao+92hvKsfIXA="
+  "org/springframework/boot#spring-boot-webmvc-test/4.0.6": {
+   "jar": "sha256-uzN33LXlKaJESH9XLUx0d0yCLXVA+WEGbQO+SnXAdfY=",
+   "module": "sha256-S0dm1vVp0dDSGLVtGLCg1FDgviMYnEAtFUnLTSU4d90=",
+   "pom": "sha256-9XoPwKw9Imp/hR/xDh1KO7JLx/7yGvHqyCttN4uchdY="
   },
   "org/springframework/boot#spring-boot-webmvc/4.0.6": {
    "jar": "sha256-YaH+gYlEIC8nXGO87dA0nUMzDh9wDsZ0RbPFtbHL3/I=",
    "module": "sha256-O4c3vqlQQf7sAEio1x2DvJj591PQ7j3DIP19DDnXP/g=",
    "pom": "sha256-xKzJ6ix3mvrP/fem+NlldIsIofUGDplbdWolwGleYOc="
   },
-  "org/springframework/boot#spring-boot/4.0.5": {
-   "jar": "sha256-CRcVjECloS9ciip5Os4uVWr00Es2MqOpMhDuai3n7ss=",
-   "module": "sha256-sjTRpuGTghi0OJKaUo4Q925pAMXAkE86ZX+mBlh/BaA=",
-   "pom": "sha256-wqg6Q1ufyW7N9WvYOy6nEyxWNDrnSU+D3x95CfP6MDY="
-  },
   "org/springframework/boot#spring-boot/4.0.6": {
    "jar": "sha256-Fj0Md8x+i2otUj5dDrw6/oONM9yJFixhOnWmO8GXueY=",
    "module": "sha256-LvumSxeZAULgBmh7hCmniMzvx96PZLGygsmFz0gnLNM=",
@@ -3412,37 +3085,28 @@
   "org/springframework/data#spring-data-bom/2025.1.5": {
    "pom": "sha256-0nf8VDBSUR7WZe6wWu9zpph8sC6UW3LwcCjcLfJbUiw="
   },
-  "org/springframework/data#spring-data-commons/4.0.4": {
-   "jar": "sha256-zLxgnB2KwPrsQ+HyoZYIr4jlyrjr4FIq5/DRYHUYK7o=",
-   "pom": "sha256-az3p1O8l9lLg2Ef7Z+pv9VIqaiRXghJHDvG3utdnBkA="
-  },
   "org/springframework/data#spring-data-commons/4.0.5": {
    "jar": "sha256-t1yVe3mEl0NbkWjJZ3+uPFysWDHRutzygLK7TFexLk8=",
    "pom": "sha256-wBu0IJebS/Xkaz1jDzrU+SWnz5bJPpO/I99UZm+8Oh8="
   },
-  "org/springframework/data#spring-data-jpa-parent/4.0.4": {
-   "pom": "sha256-rqEMXjN7ztapeHn2TDGg6jxywqReCWC7fHxmo6qRfdw="
-  },
   "org/springframework/data#spring-data-jpa-parent/4.0.5": {
    "pom": "sha256-TuMhqrXLxzj0EhephMgfEm3Abcqu708jjQLm8PJdQLw="
   },
-  "org/springframework/data#spring-data-jpa/4.0.4": {
-   "jar": "sha256-u9SFwrjtxn6B37gQe6Iy2O3pAOeLDpj6GyNn15xdPd8=",
-   "pom": "sha256-7JHsTDEJlp91YRxKfhevu97Cx5zBKJaBsmJMZylA/uE="
-  },
   "org/springframework/data#spring-data-jpa/4.0.5": {
    "jar": "sha256-r2Ddw59w3er5fh3ZiVzTV8iEqC9+hj7ALolHrabWBRI=",
    "pom": "sha256-Mt73to2AFkbOABPG7VYnsMNDYESG/qPgzxdngWjRkfU="
   },
-  "org/springframework/data/build#spring-data-build/4.0.4": {
-   "pom": "sha256-C9+knC7YaPlEpNiY8fdsG73JOnvk5lUZBzjZPoCn9oE="
+  "org/springframework/data#spring-data-keyvalue/4.0.5": {
+   "jar": "sha256-Ua0MGVxqAPUuF7ljQNVClPzkwHvViNql2tt8HvzmXhU=",
+   "pom": "sha256-B/rTDESU5wkwXG/Hv3RS/bOXXJSATtyhdAQqlWjqv/o="
+  },
+  "org/springframework/data#spring-data-redis/4.0.5": {
+   "jar": "sha256-ZebC+QD1Im3XFCn79BNtWr5785NB6TAUcS56siI5JOw=",
+   "pom": "sha256-Tpnt2lXXjWRF/WNGyPsFh3bGN35IdUzbe362vfBxcfE="
   },
   "org/springframework/data/build#spring-data-build/4.0.5": {
    "pom": "sha256-ev1THh08uRqgSMNaLTqQsHRHD2A3A4T4KtUQz6D+DaY="
   },
-  "org/springframework/data/build#spring-data-parent/4.0.4": {
-   "pom": "sha256-oLXdlevaSEKt//NWw4kIrwBTXJg7QhJCG2hj7US1zeE="
-  },
   "org/springframework/data/build#spring-data-parent/4.0.5": {
    "pom": "sha256-Mvp9lqiOeaG8q32Jxl1Iq7677UZUmMNAIHU/8r/nxGY="
   },
@@ -3469,81 +3133,46 @@
    "module": "sha256-x9gJrWe019T3wGUAEMGcjOQnsJQ7RMBVl8tCKiMlcM0=",
    "pom": "sha256-7brA3IB3Yq46m7M7EtQDVo83pDYYjchBh6CT4iF9jeA="
   },
-  "org/springframework/security#spring-security-config/7.0.4": {
-   "jar": "sha256-hjHqfVEx/9GOco5VzMBukU2gVCMI6o8BZpbf8hT9OYQ=",
-   "module": "sha256-5Bbkdf1ZPeC7lI0ReD81ENfziYc2FhKWlD2dffJkx14=",
-   "pom": "sha256-BIC1XOe4g38svsXUB7VMF+ZMTU/uIvq3EhoVWaD4P2U="
-  },
   "org/springframework/security#spring-security-config/7.0.5": {
    "jar": "sha256-NoIoX4ZoGpO921wU2LLfoRGqaAmxlbjBLRiXwXgdL94=",
    "module": "sha256-fTZbY5dpg6QWLRq4N0D46CNJ9iM6iW8LqWlETw8SYCw=",
    "pom": "sha256-6mNVLZ+Y+OLiEybsekdlCHyNqHpCcZf77VFtAGo5NLI="
   },
-  "org/springframework/security#spring-security-core/7.0.4": {
-   "jar": "sha256-8XeusAo14SmANQJidUd2gXnp+v6FsWkZVMUf3rSMrz0=",
-   "module": "sha256-c1VF47fmg9Vkh0+m17/fmRYz2k48fqg8ssnncokfZOI=",
-   "pom": "sha256-dZJ124AFx57y+V9BvChiqBIbUib5StblYShLY9ZB/Bo="
-  },
   "org/springframework/security#spring-security-core/7.0.5": {
    "jar": "sha256-NEv77YAlAxeBIYy9eJH2uf11DU9SySP3WUjV57Efwuo=",
    "module": "sha256-pjJ6Wq7uRpiAo5PMLzmGk9s6uLVqvJV+z4IxUrHsQyA=",
    "pom": "sha256-cuJGjbvjbWDarVC8qq6ZZFyTa8MBTRSCkwNSJSjIc+E="
   },
-  "org/springframework/security#spring-security-crypto/7.0.4": {
-   "jar": "sha256-4vJ/3nXx263Ny3GEVI0btR+eH00yec4Z8cIyix9n7Rw=",
-   "module": "sha256-V+3hVSOoltCIO6+ydU4Rr0GqifDYwQRcTCs7Af3Tres=",
-   "pom": "sha256-ysjQzV11YbyiBuHek1aQTHSJHa5C0odiSLDo2e4uQ8g="
-  },
   "org/springframework/security#spring-security-crypto/7.0.5": {
    "jar": "sha256-+i2+fOauqLOwzIK80JtbTvAwzaxRuF5U14XYXxo9Qtk=",
    "module": "sha256-IaUCjbPfuL49RoQICpaXSbMdHmYn0adVIYUTnSmzPtg=",
    "pom": "sha256-50txeP5doBSHA6JFcTsxw8fN6/5v6rEJUdB5MBHiyEs="
   },
-  "org/springframework/security#spring-security-oauth2-client/7.0.4": {
-   "jar": "sha256-TpmsQEyCj1oTdVhneTz1FKWxMasF7n8GMJTCeQRXjdw=",
-   "module": "sha256-wGZ4aHKdaT/m+8TnLvSzzhYLCTzlhYyzlUT6iShk3/Q=",
-   "pom": "sha256-IVAWYfdFM5riFFZCPEc1wJBay960Np6G2cYUp6gAFOk="
-  },
   "org/springframework/security#spring-security-oauth2-client/7.0.5": {
    "jar": "sha256-nFvjqT+rKut1Miq2hLCEX3jGJEZFAOcmh+XWjSUSsk4=",
    "module": "sha256-uPZvxFdEtMuBXUtKJ57korquM7CXwhVO+kf5+NfjPoA=",
    "pom": "sha256-Q9th/QSG4fh/EBCinu8z4nj6gaRpjIp+SNZy/Jz1hWQ="
   },
-  "org/springframework/security#spring-security-oauth2-core/7.0.4": {
-   "jar": "sha256-DiNi7ufWwZt69gbx6x2qNeGEL6kqEmflY8IO2sSf6KM=",
-   "module": "sha256-WX+cReFTh6gP8lAEbtiGRWEAv2R8RA5Xvc+4rPEPjgM=",
-   "pom": "sha256-yq7LtCZY5XEEqPwdnHo7B340YhNXNuoaPgAaBmLI4A0="
-  },
   "org/springframework/security#spring-security-oauth2-core/7.0.5": {
    "jar": "sha256-Pl06hVVD1LgFVR0WhafOAezDLHu4T4VXmlb92P6ShuY=",
    "module": "sha256-mENEQPwA4xu3xwju5QzjEJIMu9MP87oDw8Kgje+5hrU=",
    "pom": "sha256-Q2S1oeFdcgmFkC/jeByJ4bhMSj3A3uzaLGI3z0UMd7o="
   },
-  "org/springframework/security#spring-security-oauth2-jose/7.0.4": {
-   "jar": "sha256-benuV5qZDZDvFi3/7irKMip7XbK2RVpfSq5LldZAqdA=",
-   "module": "sha256-OfuTuhVhk5jxVPiYtm0W+yyO8clAFMubyLWjuIQlrY0=",
-   "pom": "sha256-mQQEKtXyVu0qPcl8FF0H6Lx90sbWXBhZtnBTTTQnGE4="
-  },
   "org/springframework/security#spring-security-oauth2-jose/7.0.5": {
    "jar": "sha256-bE8eaDmy+pYMiWGz2WSSXkSJbLiDqvrI9FaIcBZXcDo=",
    "module": "sha256-D0NL0/pc7UAvmJgDXJ9LkZhydiufJLtEo7StQdC3qVw=",
    "pom": "sha256-oko9gTJacKysAY0dSzh5yo8u3iT+khZTCwFQ7nv8wh8="
   },
-  "org/springframework/security#spring-security-saml2-service-provider/7.0.4": {
-   "jar": "sha256-41gyFFUCsk3+3f9ZWF2l8cvIQ5tnrkEmWY9aJ4JIF9I=",
-   "module": "sha256-jejb6a1SnXnKvcwd2+PZeY/siVR4Y2NNOBnl27l/mIQ=",
-   "pom": "sha256-MvKnUq1dtFpypFPyUJOiASQsOFxx3ZdbXvDcw6qnobE="
+  "org/springframework/security#spring-security-oauth2-resource-server/7.0.5": {
+   "jar": "sha256-iUJKSLJuFQfe0Zl91A6B2hygXx+TaucaHK32q7rWCek=",
+   "module": "sha256-jEaCx4p170AIPsDmsBn8azmdT+Erbrj9nlNdk9Yirg8=",
+   "pom": "sha256-Mg+Af1yMbz3p0gU7Tj6GnEIT8ODmLwmWBKoQltnM428="
   },
   "org/springframework/security#spring-security-saml2-service-provider/7.0.5": {
    "jar": "sha256-WcyVn9nxQllnKIS5Iy4ZpcApTVwu/rxd3Mp1HHhG7VQ=",
    "module": "sha256-3bICxIwovrzwxAYoFUvKBe5PkTevJ2wyplir3pVJcQw=",
    "pom": "sha256-rwaJoeb+ZLQTDyuITdJaE1JWVKJQ1ELhE/cXMxDSllk="
   },
-  "org/springframework/security#spring-security-web/7.0.4": {
-   "jar": "sha256-YskkdJkQVGuILglpkJpz3jJAAY4S/dJ2b9lxQ8PzAK4=",
-   "module": "sha256-IZm9UnV0gan8YpKvEzrM8Q5Z3WcGaQfqf2Qkpxd4QRU=",
-   "pom": "sha256-+IhMy+gQttN8gIKKQBbCIar156SRjpVAxSGsxDPlFlU="
-  },
   "org/springframework/security#spring-security-web/7.0.5": {
    "jar": "sha256-RhbxOv4jNgDfrYz6TvFHLDeKCApsv1FnOcd52SZ+29k=",
    "module": "sha256-cmRiwQN1ted8DGmuEHZAStYA4emOAI0gPxFBILv3yuk=",
@@ -3557,11 +3186,6 @@
    "module": "sha256-0sRMKo21d0nDvzqGTFeUZeQljWy1g3DT+fNqKRQexno=",
    "pom": "sha256-kgg/9irYXyiE1+HZ5AApij2Fqv7YuG8mj+BJjMiNe3Q="
   },
-  "org/springframework/session#spring-session-core/4.0.2": {
-   "jar": "sha256-TCUhtxtwUbRTE0FplOXAzs9Uoywcf9BqeYdcF2LO40M=",
-   "module": "sha256-c9tqrz+vBMSGmmD1u0iZ2VIKXPxbadcXF3WF10ypxzk=",
-   "pom": "sha256-9MtAbZJovF1frUfLX6Xde37kujJvCdpnGJbMvY/vi+M="
-  },
   "org/springframework/session#spring-session-core/4.0.3": {
    "jar": "sha256-wc0Fx9Lsqtc8uECYcQNLg0O5a4Mel6KB935gxL2HtnM=",
    "module": "sha256-xpMUyi/JtsYHBDLKmzkwIA7XvOWt/Em6P/9jA8uzkJU=",
@@ -3581,8 +3205,17 @@
    "jar": "sha256-v8yh9rLEoNTg/YUoj3y9qUg68kFeZtHbacJmHDX/UR8=",
    "pom": "sha256-fftfinQkB6hvrZXwM6zdAp4DIRgHAyB3bScXmTlXMAY="
   },
-  "org/testcontainers#testcontainers-bom/2.0.3": {
-   "pom": "sha256-/IQ6LTIby99a5ugFEYESr/69A8fl+IJTKp0XIx87Xyc="
+  "org/testcontainers#junit-jupiter/1.21.4": {
+   "jar": "sha256-kt8qb9Z8MKy1s1IRGFWAM/cRx5c/q19FlyEf8/0T9BY=",
+   "pom": "sha256-HwphNbP+f3N5YcpDBXSZQ5bqjY5OCR8BUUd0EWsJEk0="
+  },
+  "org/testcontainers#localstack/1.21.4": {
+   "jar": "sha256-4aNPKc9LvTf+E/s9Cz8oc77J1WHidM7234xD3c7XU64=",
+   "pom": "sha256-+Sp2eIP57TTFgy6YMBiwWi/8PSmENzZZvaHCgHGMeaA="
+  },
+  "org/testcontainers#minio/1.21.4": {
+   "jar": "sha256-yUF6P2YNrBNgn7MoAy/jwEeYCbEs9nLeT3giQzuC2io=",
+   "pom": "sha256-3iRZURWiCFa66GlMj5cUY6iGnv0y9W7NHzZdbjMuM4U="
   },
   "org/testcontainers#testcontainers-bom/2.0.4": {
    "pom": "sha256-Ua73WDIROPjgGuJ2k4FJLj66Aew2jgM+yAgcHYchStI="
@@ -3590,6 +3223,13 @@
   "org/testcontainers#testcontainers-bom/2.0.5": {
    "pom": "sha256-u7oTdgIfv04UZjph8QzRr/FKXXT7VfGhS+b9beg9fu8="
   },
+  "org/testcontainers#testcontainers/1.21.4": {
+   "jar": "sha256-6oGpyjN7uufug/NyuS1VFAx6uXa85z/xt58t0VHKlhA=",
+   "pom": "sha256-ucSUsVkj1/2U15O9Hn1FiH91A1AmXq7r9+KJGRgDKHQ="
+  },
+  "org/testcontainers#testcontainers/2.0.5": {
+   "pom": "sha256-eIOaqo402hxIPetX5PODqARaus2lVJvHmEDyV5SWMQM="
+  },
   "org/verapdf#core/1.28.2": {
    "jar": "sha256-hHsNWsnv+nbTENuS37jhGmfJT3AnH1SXH8vHWjWKvwE=",
    "pom": "sha256-E2UJcFzRbZjVjKoPotfmIWArLKh1vNGXwk+OfuVWNg4="
@@ -3646,13 +3286,163 @@
    "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=",
    "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0="
   },
+  "redis/clients/authentication#redis-authx-core/0.1.1-beta2": {
+   "jar": "sha256-zFbtsIs9+FYs3awQjcphkH0hzErQTeBen10bAQWDkK8=",
+   "pom": "sha256-ts6SnYo8uaOsuaueqQioOyDvMVbVTdNYnxkkMir/+yU="
+  },
+  "software/amazon/awssdk#annotations/2.44.12": {
+   "jar": "sha256-4oFB7qgB9O1AWWmK2RZScNIaCRWIVeZMRm9kLIBJY8w=",
+   "pom": "sha256-AJXd/hbqAysb+4zkRUKoGSa34fU9gxPlIJmOJmlzr0E="
+  },
+  "software/amazon/awssdk#apache-client/2.44.12": {
+   "jar": "sha256-mlPS2KyquIX6CLTVH/d16tSZLSV9uPO79+OWGbSDdic=",
+   "pom": "sha256-aTAhK8uWiyt5xdVe+LQPPddXrdM8sjARFl34SILT/xc="
+  },
+  "software/amazon/awssdk#arns/2.44.12": {
+   "jar": "sha256-jo39bipMtkbhSmg10tTmywGQES3xNQkLmSajWWf06Zc=",
+   "pom": "sha256-Sl1yEN103BXCwg7GaSAMVOIIvuTGN2xz4WvCl2EjMlg="
+  },
+  "software/amazon/awssdk#auth/2.44.12": {
+   "jar": "sha256-C9l1zEt7NfN08/pPz4xqgSuzxvFHXe/+6XxCuAcp6M8=",
+   "pom": "sha256-TtVDyi/o0tBvOvvzzOqf05sCiayOp4pwuix8m592X3c="
+  },
+  "software/amazon/awssdk#aws-core/2.44.12": {
+   "jar": "sha256-Cmbm06Ii9pohu4kcevUcggnQ7oOQA6uDKpwPaySG1E0=",
+   "pom": "sha256-7IHrHG54/AJhrZ2a4a6or8h8N1cQrcGU6uJiUe8URw8="
+  },
+  "software/amazon/awssdk#aws-query-protocol/2.44.12": {
+   "jar": "sha256-0VsomlUT9HTZfQQ0AvTvRRX3+ayYp2CF2ZwNp/U3O2Q=",
+   "pom": "sha256-O7NUPDGVpSpuLbTxKJQU5+Y220n1DKe7hfHH4Xb4JyU="
+  },
+  "software/amazon/awssdk#aws-sdk-java-pom/2.44.12": {
+   "pom": "sha256-6aq/S1Ga8j34WuqqD3jQ8WfrlDE1arB4pAoo4/hkki0="
+  },
+  "software/amazon/awssdk#aws-xml-protocol/2.44.12": {
+   "jar": "sha256-UfkKE/Om50iH0P5GZWzCtdjtdTWtCVP1ZF5DG4vEdQI=",
+   "pom": "sha256-Cnqfbctx7Q5yaHnCBjvJTqV/hDG+IG0o8yegN0l2uBc="
+  },
+  "software/amazon/awssdk#bom-internal/2.44.12": {
+   "pom": "sha256-u+Eo0vgfUD29dFzhPAzbUtF5GYb2lQjDGCRC7YXJ8Pw="
+  },
+  "software/amazon/awssdk#checksums-spi/2.44.12": {
+   "jar": "sha256-ckFEv8hiVTmc37UzevnMMWG8hAeCSfF63wXPvB20N8Q=",
+   "pom": "sha256-wRzAXcIAO/HuChGHVfcRU2dencawkKOvI1wmddSJN0c="
+  },
+  "software/amazon/awssdk#checksums/2.44.12": {
+   "jar": "sha256-hfW4QJnL+YXAyE9blIWzzjVsq66Pl2rIJKHQ1nZ3ymE=",
+   "pom": "sha256-+7aUu/bijEpYQfyMEx5VVXLxO5a6H0kzHnOs21/GB2o="
+  },
+  "software/amazon/awssdk#core/2.44.12": {
+   "pom": "sha256-rG4x7WVYFUyROBLnDYF7LLo7frtVb9geCRMqiVpxJ+w="
+  },
+  "software/amazon/awssdk#crt-core/2.44.12": {
+   "jar": "sha256-gdRDol4mkNXx8KyCvkOBU7G69H9h1/7IyupeouWTnS0=",
+   "pom": "sha256-01FLRreyaB8IOrgdGP87UZwqrWgJ29upRIYTf+R4PRo="
+  },
+  "software/amazon/awssdk#endpoints-spi/2.44.12": {
+   "jar": "sha256-K+TLBkoCCI4U8W7794HOW1i1k8DJB6CkxNY4GglpNqw=",
+   "pom": "sha256-nzQWR5ibhp9ZR73JDVRh94UsiWVMYEKfjkBkuGNxUpw="
+  },
+  "software/amazon/awssdk#http-auth-aws-eventstream/2.44.12": {
+   "jar": "sha256-KGBgQnz4jlSDDg09WqXeUReej9xpj/z3teSnlzI9/AQ=",
+   "pom": "sha256-cbrpm3aUpBFK48471pPm/skiwCzFsi7KNl2OkxxZ9Ps="
+  },
+  "software/amazon/awssdk#http-auth-aws/2.44.12": {
+   "jar": "sha256-8S8feYgRf/nijeN74HP8dMyywegpOt8eKJE3yUmTjeM=",
+   "pom": "sha256-wx5lDYsIuAeNml/bYkl9Ql8mE7X6qFgJIXMF3mT60HA="
+  },
+  "software/amazon/awssdk#http-auth-spi/2.44.12": {
+   "jar": "sha256-q2WiSUh7CXMBJ+5UH3iFcWg+NP/zbUfoufnUIEvRHfM=",
+   "pom": "sha256-g9cA0oxfMhX813jAOZSD12ewMkyJEhpGR9KsKP+wXmE="
+  },
+  "software/amazon/awssdk#http-auth/2.44.12": {
+   "jar": "sha256-wMxKJFzNWB+MZ5Fv98+/5dz7E3LNu6/V102l5psHM0g=",
+   "pom": "sha256-L4I3rHa/Drzr1tat7O5PaToM5eTcr4zFbRycqPXMukQ="
+  },
+  "software/amazon/awssdk#http-client-spi/2.44.12": {
+   "jar": "sha256-ozlMTxJMc3TVrkIg48q8WOtb6qmmb8hW6W3/Hnh6Qfw=",
+   "pom": "sha256-Th0btRuNPLMgKCxKkfC2pQADss7XMVj6PtdC5ZJBJ+Y="
+  },
+  "software/amazon/awssdk#http-clients/2.44.12": {
+   "pom": "sha256-AMAllIJqeoRy4WGgzNd420E9MG0cHG8KB+Kb3W1cFBk="
+  },
+  "software/amazon/awssdk#identity-spi/2.44.12": {
+   "jar": "sha256-rB759gQBMxdCbrQcu8JO/vIodxQ6eCDGs4bHkGw1WX0=",
+   "pom": "sha256-dywfDsIRjdzOxc3LE/pR1z5pfCLMRxMVXP8Za0JCziI="
+  },
+  "software/amazon/awssdk#json-utils/2.44.12": {
+   "jar": "sha256-4Pf6nzTAJZch4tQs1eHP4RT/MWRZpWYOeqNkpLpoyvM=",
+   "pom": "sha256-/KWAguxnrzk66bNRnymQsZMyYlQDB0bGrfzaJbdCWD0="
+  },
+  "software/amazon/awssdk#metrics-spi/2.44.12": {
+   "jar": "sha256-nzVqfvzwKsvqj/coNBGyfHXa8Ehtz1Z4o63T8vPKCOs=",
+   "pom": "sha256-2m8158qrO6dRcxSuVDb1zbyAYVznvhvJlXoTaLwrKZ4="
+  },
+  "software/amazon/awssdk#netty-nio-client/2.44.12": {
+   "jar": "sha256-rJh7qcSNQ0ig/prhJ21p/Siu48stQJa8b97SM49mNK0=",
+   "pom": "sha256-rNFCrg8aZIc0XqFv2oApFxKhT6rnaF4eEIbUq3NqzRs="
+  },
+  "software/amazon/awssdk#profiles/2.44.12": {
+   "jar": "sha256-Kx6TKfH4v3Wxg+SDqgaPnDwPwct1xRM1+/umhE3nJUA=",
+   "pom": "sha256-OSQE2QrEbn0nKw3hoy/siBzc7dZRnhWM+TXXzYc+YWU="
+  },
+  "software/amazon/awssdk#protocol-core/2.44.12": {
+   "jar": "sha256-EDGHvu4Wk/iqx95Ar96EW/jI++uLFCNqMGuz8NnTa9M=",
+   "pom": "sha256-8RE1x3/18q2HrRAtVsAhTZqorbvfEMiaKP5GS002El4="
+  },
+  "software/amazon/awssdk#protocols/2.44.12": {
+   "pom": "sha256-sXFppss5gFFyz1YF8ODzwLjt2/Pzq7ZnNORB8M6MgLw="
+  },
+  "software/amazon/awssdk#regions/2.44.12": {
+   "jar": "sha256-tr9NUZngH/tXZ5pj+gIu09BXiUC5LaGbgtMztcOTpqQ=",
+   "pom": "sha256-1C61PAQA0Q9qiIU1PPVZg1eTLZIE3vcEztYYQhzDoxQ="
+  },
+  "software/amazon/awssdk#retries-spi/2.44.12": {
+   "jar": "sha256-Yjk1vfTGzynInuWhAuPcZq2JvZA3iNuONBGjlPWs0Oo=",
+   "pom": "sha256-urULW2J9WM+NxMxo9qKH/uuy2WhsRBVYWTnl+QQBwTc="
+  },
+  "software/amazon/awssdk#retries/2.44.12": {
+   "jar": "sha256-0s/sTut3aHoY/rHfn5zzQ1jVQ2VvPiObFr83M3mXRmk=",
+   "pom": "sha256-Z8ytRLsOjArtjN7fPb2EICqoa/bw92cjd3uF39XxqPo="
+  },
+  "software/amazon/awssdk#s3/2.44.12": {
+   "jar": "sha256-zD0rweY9ofs2JRdXpwh6+hFNPLE3wijOFXdu7EjpQDU=",
+   "pom": "sha256-+MhO62JJBQv3zUIO/b6Mh51qd7pMoXbG3xb4CgadlRc="
+  },
+  "software/amazon/awssdk#sdk-core/2.44.12": {
+   "jar": "sha256-nF5A607EUcHz5UwwK744j1d9sg1ijHZE0uSYJ/DsrqE=",
+   "pom": "sha256-YrA+OPBGeNHgG7Bh1M6SAHFq3Zb3PG5nNCuMgi1xVSI="
+  },
+  "software/amazon/awssdk#services/2.44.12": {
+   "pom": "sha256-wcZvElJeVfmTMXz/DepM49uLwhw2K+SquiUCldfCeeM="
+  },
+  "software/amazon/awssdk#third-party-jackson-core/2.44.12": {
+   "jar": "sha256-2f0M26qi5lVbiHZu5GR0rq4wma5L8EwxveJZrMjFnro=",
+   "pom": "sha256-poG1vigc9QsJUwJyUOULb1pSPfoBPUKbKlQEOnU+W/k="
+  },
+  "software/amazon/awssdk#third-party/2.44.12": {
+   "pom": "sha256-rFyFjy89XtctHEiimdkxLXesJyg3QmusqCJ1F9g/GCE="
+  },
+  "software/amazon/awssdk#url-connection-client/2.44.12": {
+   "jar": "sha256-JbtxDZkeUgJT5uAoa/thyVL+vjdA5fsX0pClf0NWEIM=",
+   "pom": "sha256-1tkok2cObTh8JhQtDsKb+j6QfmMG7nIKHsYluOYP0Bk="
+  },
+  "software/amazon/awssdk#utils-lite/2.44.12": {
+   "jar": "sha256-Q791PCxZ5aHJr/+SayveJjbssZ/57kwUUWpCcb4Dezw=",
+   "pom": "sha256-8PXvziEjsDmXqo32zykQ9A5ETW7wXAd7qNoUC+v2IDE="
+  },
+  "software/amazon/awssdk#utils/2.44.12": {
+   "jar": "sha256-pjzwTkwYwouhKLi78HEFyq2nfcPWNPt3OFTgMtVgQ1I=",
+   "pom": "sha256-gqYWH77dpD4y70LHcAYZQ0IHGlRuMy0JxwmnYusoP68="
+  },
+  "software/amazon/eventstream#eventstream/1.0.1": {
+   "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=",
+   "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w="
+  },
   "technology/tabula#tabula/1.0.5": {
    "jar": "sha256-0xB/NyGu3/bPO8Ob+XnVZLvQV75gVrNUsMcHSKN9O0I=",
    "pom": "sha256-mGSPnQ0/apzUwEEAVK/5AHcjGAy2Mk0Xe9ULwUKF1iE="
   },
-  "tools/jackson#jackson-base/3.1.0": {
-   "pom": "sha256-SJlqUQiUU3caUU8YO+xxEVba/8voy7FUISS8HuPzXGs="
-  },
   "tools/jackson#jackson-base/3.1.2": {
    "pom": "sha256-cLeSujP055WEWZ0gJt89RjdNbDcOFVWE4g3bqYLsKrk="
   },
@@ -3662,21 +3452,11 @@
   "tools/jackson#jackson-bom/3.1.2": {
    "pom": "sha256-vg5eRYB/TeVRTR55M/rPc4gSGz3ZvzGjqz+HogBlCqI="
   },
-  "tools/jackson/core#jackson-core/3.1.0": {
-   "jar": "sha256-TdOD+WtRubmsS3S98cFQ3wEARD4dofukgPV9oJotzvc=",
-   "module": "sha256-xCmkd4tW+L6sZhHi1m9wn/WzNSvVq6XKttqqz/1ydug=",
-   "pom": "sha256-gm7btuGKf7kydoYXFtS6mvtIEOLa+TXQbYPa80+cm1g="
-  },
   "tools/jackson/core#jackson-core/3.1.2": {
    "jar": "sha256-u7AHY/WZjwOibyHkftUA8lPH/FwVj6PopB2/l6p0Fv0=",
    "module": "sha256-nTb0dEnZ6TnNEHcOTaPYVc6h9KbSfVBJX3YQTp07n24=",
    "pom": "sha256-PHY46PnAnIkkT3coVSEJNvC5rmAHlUl9as3tpyOn6rk="
   },
-  "tools/jackson/core#jackson-databind/3.1.0": {
-   "jar": "sha256-G/VFSh1Ymifdu5HuFvMfFpsIUwhD9S9eg/YsZQxkUWs=",
-   "module": "sha256-GD86rez6To0WF9ffgJKqYhtoP5jGBAP6MzpMwQq8zy0=",
-   "pom": "sha256-ivk5XYOG4DkhDRJBX61spqLutiMm+Gohyhrz0CdH42g="
-  },
   "tools/jackson/core#jackson-databind/3.1.2": {
    "jar": "sha256-CjZrHC9jIeRmwpcIR7ElGl3HIBtoDzIFlCMLd7/I3bI=",
    "module": "sha256-6JInXdaRVAn7PJRIAyB5rZZfTtQtVb9wqCLcV9UtcpY=",
@@ -3692,8 +3472,97 @@
   }
  },
  "https://repository.jboss.org": {
-  "org/jboss#jboss-parent/52": {
-   "pom": "sha256-BhW0KeOiGg1r2SXQnt4pN4kgNCcrTNBLuathfVfnK0I="
+  "net/shibboleth#parent/11.3.5": {
+   "pom": "sha256-eiTicASF7qCHNw8dym/gKR14k9OMEaq/6Xd4T9k7gIw="
+  },
+  "net/shibboleth#parent/17.1.6": {
+   "pom": "sha256-aNv/XNcQQnaE2RkPqDD+f6Qeh4bw3L4KnFCJ4eOHw8g="
+  },
+  "net/shibboleth#shib-networking/9.1.6": {
+   "jar": "sha256-Ww5GLaPgvmLBGQR4SLTo5a8OJfXjCby05QaTioYzj74=",
+   "pom": "sha256-8FG81s/DfZGF1YpnTOh5iZ2doFWhbbPBLJqsHK6C2oU="
+  },
+  "net/shibboleth#shib-security/9.1.6": {
+   "jar": "sha256-kOubnfH+6FFByJ+2YsT6oP4h3YYpT36OFmq4mPasZ9A=",
+   "pom": "sha256-Dr66teDUxKCJjrIIgYn8noqlTCVVamzF+QDmoPWEeOE="
+  },
+  "net/shibboleth#shib-shared-parent/9.1.6": {
+   "pom": "sha256-j4sB3+mRMM0/QoznqI6NOrx3sqxXVUrdc8b16RMcpWg="
+  },
+  "net/shibboleth#shib-support/9.1.6": {
+   "jar": "sha256-xlSJQYwyKJxfp6f+sa2NUHXk4K0U/RcLlZ61krU/BVo=",
+   "pom": "sha256-riBk/pidZt1CAKUWtTE5YzWAT+16mEIWTwpdDVSf7PU="
+  },
+  "net/shibboleth#shib-velocity/9.1.6": {
+   "jar": "sha256-mVU61oIHyVUhkSilUh3Oxi1HbaVlCao6VIpmI0AtdhU=",
+   "pom": "sha256-8UOidJfxQAGbjkNG+XagOfJISPIJFrwzHNj15ygbo4Q="
+  },
+  "org/opensaml#opensaml-bom/4.3.0": {
+   "pom": "sha256-TfzHzZaiZFxuKN+fFm8OWysaRKoQmzEAzbDuF+AeAtI="
+  },
+  "org/opensaml#opensaml-core-api/5.1.6": {
+   "jar": "sha256-NY2Z8rkgSj9EplQqKhGzzoCTKLq3xveKjQnpk7W2EjI=",
+   "pom": "sha256-KLydV1CtSAjvRiPnua7lbNwvXWbYbSxsSfB7X3nt1hg="
+  },
+  "org/opensaml#opensaml-core-impl/5.1.6": {
+   "jar": "sha256-p9Py9PeDT6qobb8jK9uLX3/bdjOwaqiWInmWicl+rPw=",
+   "pom": "sha256-lDTcZGlRP9OnrTuvPCOxCk0DUjg1YHhLR6OcPGHUt+0="
+  },
+  "org/opensaml#opensaml-messaging-api/5.1.6": {
+   "jar": "sha256-O4XvHBaRIIm85hCbzXBxJASSFmTzI+ODrO7A7AeXly4=",
+   "pom": "sha256-A7jojHwsel7XGAp7fbM3FXZ9I85amClvWzjZ26meNd4="
+  },
+  "org/opensaml#opensaml-parent/4.3.0": {
+   "pom": "sha256-Xp2y8tw5OINadvUzSZfXnIeBURyLaMH232s4QwaQAxk="
+  },
+  "org/opensaml#opensaml-parent/5.1.6": {
+   "pom": "sha256-1k/F9INWa1g1+d2UHHFgbJftsIKD3OI7Cn+ezOQxV9Q="
+  },
+  "org/opensaml#opensaml-profile-api/5.1.6": {
+   "jar": "sha256-dur3E8hULBZJZYzwDkXs08GYEvJmy9swbarhG/b2o+c=",
+   "pom": "sha256-b6x+EVSFJyNYQzzZ0a4vY9UbjQMZokb7lIdmlK+wI8s="
+  },
+  "org/opensaml#opensaml-saml-api/4.3.0": {
+   "pom": "sha256-hrUKkkxqSM1wzsy+3khWt4PS+uJUWQkK///VY860nV8="
+  },
+  "org/opensaml#opensaml-saml-api/5.1.6": {
+   "jar": "sha256-lPBZ8oagnmdj2wpGOLETOH8dxBBHynrR+jdALZhWtO4=",
+   "pom": "sha256-AJuIQlzZcbavF4SqEBYuuyd6/4vkGOHvFrldSKfmP8A="
+  },
+  "org/opensaml#opensaml-saml-impl/4.3.0": {
+   "pom": "sha256-xXkdPjmSgcUM688VsRD0di1o8N4t7N8toHpQb21PndE="
+  },
+  "org/opensaml#opensaml-saml-impl/5.1.6": {
+   "jar": "sha256-z1cqxCYb97Jgnjb87IAC3CUTeu+za35FCcHuInLzc30=",
+   "pom": "sha256-WsNwzuck0q/9QTgSZvNJNryeS/V7zz4nwnjXAHeXO2I="
+  },
+  "org/opensaml#opensaml-security-api/5.1.6": {
+   "jar": "sha256-WRp/0A2Ob8OwRYYQkSGtWiqlo3DeQb/L4hcMIKTxfzY=",
+   "pom": "sha256-p2+jySSXit4I2+HjqLPX5G32LBAKcx4nUMFmQ3R+ms4="
+  },
+  "org/opensaml#opensaml-security-impl/5.1.6": {
+   "jar": "sha256-PTI7fOq8+MvAPgVR0MB3+7S5r6aHTf6ZiJjot1Yf+So=",
+   "pom": "sha256-75bpXyDyXyq0m1nzuqJttMLGmcbhTseg5uXzvHNj/l4="
+  },
+  "org/opensaml#opensaml-soap-api/5.1.6": {
+   "jar": "sha256-iTZQK4KevjruTlhjxY7DoavTKO7boRJi0bU8lpsSesY=",
+   "pom": "sha256-NaUOG8SvqQxiuE4udAql31PegaRljeAAn7fw6kS9rO4="
+  },
+  "org/opensaml#opensaml-soap-impl/5.1.6": {
+   "jar": "sha256-viV1dvA/lhUtX99P6K+t2ynpYvQMaZ8DpVUhcZpob+Q=",
+   "pom": "sha256-tehuGTUBL8IZH3u5DYz4Ru+5zIIFMXCOMhru3UDcnwY="
+  },
+  "org/opensaml#opensaml-storage-api/5.1.6": {
+   "jar": "sha256-WDucdSqeGVk3+i63zjXTEz1VASr1pSgyIDUykUpoxYs=",
+   "pom": "sha256-bkxutjl4NC28TWCfXT1zugOS4RJtI7bcgt9KNkzrZhw="
+  },
+  "org/opensaml#opensaml-xmlsec-api/5.1.6": {
+   "jar": "sha256-5Z62Vb0/a/+MFQp4GAB2YkU0mqD6syywRl59IgP6+GE=",
+   "pom": "sha256-0tHFYo4LMh7YT7sFOv/lBApMy8jydZ+/MFRyN4tmc3U="
+  },
+  "org/opensaml#opensaml-xmlsec-impl/5.1.6": {
+   "jar": "sha256-emdGM8hYG1nGzp4U7Y2W6y1wxW03rU2hSSV5v1dlK4A=",
+   "pom": "sha256-bmywWOHZroZQYymviIzY232xu6QG1vKh9du234BARyg="
   }
  }
 }
diff --git a/pkgs/by-name/st/stirling-pdf/fix-cargo-lock.patch b/pkgs/by-name/st/stirling-pdf/fix-cargo-lock.patch
deleted file mode 100644
index 78d4caddc442..000000000000
--- a/pkgs/by-name/st/stirling-pdf/fix-cargo-lock.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock
-index 87d5531..39b03ed 100644
---- a/frontend/src-tauri/Cargo.lock
-+++ b/frontend/src-tauri/Cargo.lock
-@@ -1966,7 +1966,7 @@ dependencies = [
-  "js-sys",
-  "log",
-  "wasm-bindgen",
-- "windows-core 0.61.2",
-+ "windows-core 0.62.2",
- ]
- 
- [[package]]
-@@ -6041,6 +6041,19 @@ dependencies = [
-  "windows-core 0.61.2",
- ]
- 
-+[[package]]
-+name = "windows-core"
-+version = "0.61.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-+dependencies = [
-+ "windows-implement",
-+ "windows-interface",
-+ "windows-link 0.1.3",
-+ "windows-result 0.3.4",
-+ "windows-strings 0.4.2",
-+]
-+
- [[package]]
- name = "windows-core"
- version = "0.62.2"
diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix
index 47d96968363e..a95f181e28af 100644
--- a/pkgs/by-name/st/stirling-pdf/package.nix
+++ b/pkgs/by-name/st/stirling-pdf/package.nix
@@ -12,8 +12,11 @@
   makeBinaryWrapper,
   nodejs,
   npmHooks,
+  pax-utils,
   pkg-config,
+  unzip,
   wrapGAppsHook3,
+  zip,
 
   glib-networking,
   jdk25,
@@ -25,7 +28,7 @@
   nixosTests,
 
   isDesktopVariant ? false,
-  withAdditionalFeatures ? true,
+  withAdditionalFeatures ? !isDesktopVariant,
   buildWithFrontend ? !isDesktopVariant,
 }:
 
@@ -35,36 +38,83 @@ assert isDesktopVariant -> !buildWithFrontend;
 let
   gradle = gradle_8;
   jre = jdk25;
+  # jpdfium 1.0.2's bundled x86_64 libicudata.so.74 has an erroneous executable
+  # PT_GNU_STACK; the arm64 archive was checked and already has a non-executable stack.
+  # Fixed upstream for the next natives release; remove when Stirling-PDF updates jpdfium.
+  # https://github.com/Stirling-Tools/Stirling-PDF/issues/6869
+  # https://github.com/Stirling-Tools/JPDFium/pull/19
+  patchJpdfium = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) ''
+    nativeJars=(
+      "$GRADLE_USER_HOME"/caches/modules-2/files-2.1/com.stirling/jpdfium-natives-linux-x64/*/*/jpdfium-natives-linux-x64-*.jar
+    )
+    if (( ''${#nativeJars[@]} != 1 )); then
+      echo "expected exactly one jpdfium native JAR, found ''${#nativeJars[@]}" >&2
+      exit 1
+    fi
+    nativeJar="''${nativeJars[0]}"
+
+    patchDir="$(mktemp -d)"
+    unzip -q "$nativeJar" natives/linux-x64/libicudata.so.74 -d "$patchDir"
+    scanelf -X -e "$patchDir/natives/linux-x64/libicudata.so.74"
+    touch --date=@315532800 "$patchDir/natives/linux-x64/libicudata.so.74"
+
+    chmod u+w "$nativeJar"
+    (cd "$patchDir" && zip -q -X "$nativeJar" natives/linux-x64/libicudata.so.74)
+
+    bootJars=( ./app/core/build/libs/stirling-pdf-*.jar )
+    if (( ''${#bootJars[@]} != 1 )); then
+      echo "expected exactly one Stirling-PDF JAR, found ''${#bootJars[@]}" >&2
+      exit 1
+    fi
+    bootJar="$(realpath "''${bootJars[0]}")"
+    nestedJar="BOOT-INF/lib/$(basename "$nativeJar")"
+    mkdir -p "$patchDir/$(dirname "$nestedJar")"
+    cp "$nativeJar" "$patchDir/$nestedJar"
+    touch --date=@315532800 "$patchDir/$nestedJar"
+
+    chmod u+w "$bootJar"
+    (cd "$patchDir" && zip -q -X -0 "$bootJar" "$nestedJar")
+    rm -rf "$patchDir"
+  '';
 in
 stdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+
   pname = "stirling-pdf" + lib.optionalString isDesktopVariant "-desktop";
-  version = "2.10.1";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "Stirling-Tools";
     repo = "Stirling-PDF";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qod8x8aB6qDxbRTE5rWUoqVka5kizfXJAWkKo5lhnFQ=";
+    hash = "sha256-2u4d9K4OEuOw9qE4YgpGXDvVLExVGUKAeXYNCySqy1c=";
   };
 
   patches = [
     # remove timestamp from the header of a generated .properties file
     ./remove-props-file-timestamp.patch
 
-    # upstream probably forgot to commit the lockfile after a bump
-    ./fix-cargo-lock.patch
+    # tests require network facilities intentionally unavailable in the Nix sandbox
+    ./skip-sandbox-incompatible-tests.patch
   ];
 
+  postPatch = lib.optionalString isDesktopVariant ''
+    # Nixpkgs does not produce artifacts for Stirling-PDF's upstream updater
+    # and does not have access to upstream's private signing key.
+    substituteInPlace frontend/editor/src-tauri/tauri.conf.json \
+      --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
+  '';
+
   npmRoot = "frontend";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src patches;
     postPatch = "cd ${finalAttrs.npmRoot}";
-    hash = "sha256-y+mviHatwhdIGCOKir1nnG/0Zm8oSoLKW345tU9upls=";
+    hash = "sha256-ujvSzang7n6DJZbNU/lDlG0x1265N5LJ6prkPbBYEic=";
   };
 
-  cargoRoot = "frontend/src-tauri";
+  cargoRoot = "frontend/editor/src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -75,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       cargoRoot
       ;
-    hash = "sha256-Tx6twcyFupNOzuXbW8uUulMJFObyPg/i2U0QnvyhIRQ=";
+    hash = "sha256-YhDFSmx6XK7x5wzQaPslyuaRbiX8W/X8y/Z0fxjbGwk=";
   };
 
   mitmCache = gradle.fetchDeps {
@@ -102,6 +152,9 @@ stdenv.mkDerivation (finalAttrs: {
     gradle
     jre # one of the tests also require that the `java` command is available on the command line
     makeBinaryWrapper
+    pax-utils
+    unzip
+    zip
   ]
   ++ lib.optionals (buildWithFrontend || isDesktopVariant) [
     nodejs
@@ -132,15 +185,18 @@ stdenv.mkDerivation (finalAttrs: {
 
     # this simulates what the desktop:jlink:jar would do
     gradle bootJar
-    install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar -t ./frontend/src-tauri/libs
+    ${patchJpdfium}
+    install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar -t ./frontend/editor/src-tauri/libs
 
     # creates as minimal jre via jlink
     task desktop:jlink:runtime
 
-    substituteInPlace frontend/src-tauri/stirling-pdf.desktop \
+    substituteInPlace frontend/editor/src-tauri/stirling-pdf.desktop \
       --replace-fail 'MimeType=application/pdf;' 'MimeType=application/pdf;x-scheme-handler/stirlingpdf;'
   '';
 
+  postBuild = lib.optionalString (!isDesktopVariant) patchJpdfium;
+
   # we use the installPhase from cargo-tauri-hook when we're building the desktop variant
   installPhase = lib.optionalString (!isDesktopVariant) ''
     runHook preInstall
@@ -177,6 +233,7 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode # java deps
+      binaryNativeCode # bundled jpdfium inside jar
     ];
   };
 })
diff --git a/pkgs/by-name/st/stirling-pdf/skip-sandbox-incompatible-tests.patch b/pkgs/by-name/st/stirling-pdf/skip-sandbox-incompatible-tests.patch
new file mode 100644
index 000000000000..8d8cc79ce66d
--- /dev/null
+++ b/pkgs/by-name/st/stirling-pdf/skip-sandbox-incompatible-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/app/core/src/test/java/stirling/software/SPDF/controller/api/misc/ConfigControllerTest.java b/app/core/src/test/java/stirling/software/SPDF/controller/api/misc/ConfigControllerTest.java
+index 2ed6bb29f..8c48c1da2 100644
+--- a/app/core/src/test/java/stirling/software/SPDF/controller/api/misc/ConfigControllerTest.java
++++ b/app/core/src/test/java/stirling/software/SPDF/controller/api/misc/ConfigControllerTest.java
+@@ -230,4 +230,5 @@ class ConfigControllerTest {
+     @Test
++    @org.junit.jupiter.api.Disabled("requires a non-loopback network interface")
+     void resolveFrontendUrl_fallsThroughOnLoopbackHost() {
+         System sys = mock(System.class);
+         when(applicationProperties.getSystem()).thenReturn(sys);
+@@ -251,4 +252,5 @@ class ConfigControllerTest {
+     @Test
++    @org.junit.jupiter.api.Disabled("requires a non-loopback network interface")
+     void resolveFrontendUrl_usesActualPortWhenServerPortIsEphemeral() {
+         System sys = mock(System.class);
+         when(applicationProperties.getSystem()).thenReturn(sys);
+diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/cluster/s3/S3ClientsTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/cluster/s3/S3ClientsTest.java
+index 8f57e15bc..143155191 100644
+--- a/app/proprietary/src/test/java/stirling/software/proprietary/cluster/s3/S3ClientsTest.java
++++ b/app/proprietary/src/test/java/stirling/software/proprietary/cluster/s3/S3ClientsTest.java
+@@ -16,4 +16,5 @@ class S3ClientsTest {
+     @Test
++    @org.junit.jupiter.api.Disabled("requires DNS access")
+     void validateEndpointHost_publicAwsHost_passes() {
+         assertThatCode(
+                         () ->
diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix
index f551e0fd2106..0cb4bf667030 100644
--- a/pkgs/by-name/sw/switchfin/package.nix
+++ b/pkgs/by-name/sw/switchfin/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "switchfin";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "dragonflylee";
     repo = "switchfin";
     rev = finalAttrs.version;
-    hash = "sha256-FSpzZSd4Yc/PoDv7DyZr2dNsXjl9mHChK+TKHKCbYBI=";
+    hash = "sha256-khfcFRRccWPYvxETgQC52BlLySKnhgSUdF4hv/8znEM=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix
index 48b4d617aa72..f61d71b3168d 100644
--- a/pkgs/by-name/vo/vorta/package.nix
+++ b/pkgs/by-name/vo/vorta/package.nix
@@ -6,19 +6,20 @@
   qt6Packages,
   borgbackup,
   versionCheckHook,
+  nix-update-script,
   makeFontsConf,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "vorta";
-  version = "0.11.0";
+  version = "0.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "borgbase";
     repo = "vorta";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/60KVJGKNz3aouv5jzubFlz+AxPEbRDSv4ZO9MEi3V0=";
+    hash = "sha256-6WY1UAB5Vr+5Az6UYq2DwXwjabcQr7A3QAEQ2/aIzfg=";
   };
 
   nativeBuildInputs = [
@@ -94,12 +95,17 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "tests/network_manager/test_darwin.py"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://github.com/borgbase/vorta/releases/tag/v${finalAttrs.version}";
     description = "Desktop Backup Client for Borg";
     homepage = "https://vorta.borgbase.com/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ma27 ];
+    maintainers = with lib.maintainers; [
+      ma27
+      stephsi
+    ];
     platforms = lib.platforms.linux;
     mainProgram = "vorta";
   };
diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix
index 77eb16013414..36fabd401746 100644
--- a/pkgs/by-name/wa/wakatime-cli/package.nix
+++ b/pkgs/by-name/wa/wakatime-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "wakatime-cli";
-  version = "2.22.2";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9OeWTjWoda8Hbiaej+UuNSvWtgEEK2MKy3PUqguyZ0U=";
+    hash = "sha256-AGlcBeurQajel+RmhEgwXm7eSClrcPMoEpHgW+lZJ8E=";
   };
 
-  vendorHash = "sha256-xrIvtUfOFOgcKJ+2VgUgOzF2Cwp3NPBf39yXgAHN/cQ=";
+  vendorHash = "sha256-XUvCcQMgFbtBLOB6DkD445SFDQ9rOdDFK8Lkd8d72ig=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/development/python-modules/django-postgres-extra/default.nix b/pkgs/development/python-modules/django-postgres-extra/default.nix
index 9a4538d4d444..f0cf350ff370 100644
--- a/pkgs/development/python-modules/django-postgres-extra/default.nix
+++ b/pkgs/development/python-modules/django-postgres-extra/default.nix
@@ -27,6 +27,10 @@ buildPythonPackage rec {
     hash = "sha256-/2qoXZ2f3un2cgJFAGMnQWBraJ7urkb0kHtcKKJsh6w=";
   };
 
+  postPatch = ''
+    echo '__version__ = "${version}"' > psqlextra/_version.py
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix
index 2c87e8d7887f..0383a4c8e91f 100644
--- a/pkgs/development/python-modules/genai-prices/default.nix
+++ b/pkgs/development/python-modules/genai-prices/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "genai-prices";
-  version = "0.0.71";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "genai-prices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IFBdpXJ0AE3UNNqUlOrYMIgRGeB87BYbNqb4GvtJkl0=";
+    hash = "sha256-mljmeZ9Xga0E4NM4FVz5lHNE1th45lrFzqAA6nCqPmw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/python";
diff --git a/pkgs/development/python-modules/standard-pkg-resources/default.nix b/pkgs/development/python-modules/standard-pkg-resources/default.nix
new file mode 100644
index 000000000000..ec2b827bfb87
--- /dev/null
+++ b/pkgs/development/python-modules/standard-pkg-resources/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  jaraco-text,
+  packaging,
+  platformdirs,
+  jaraco-envs,
+  jaraco-path,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "standard-pkg-resources";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "stephenfin";
+    repo = "standard-pkg_resources";
+    tag = "v${version}";
+    hash = "sha256-MdibVeBssPa/kiNAw7f4jTl4Y6JKFnDLshvrc/cFWXw=";
+  };
+
+  # This filter references the coverage module directly; drop it instead of pulling in coverage/pytest-cov as a dependency.
+  postPatch = ''
+    substituteInPlace pytest.ini \
+      --replace-fail "	ignore:Couldn't import C tracer:coverage.exceptions.CoverageWarning" ""
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    jaraco-text
+    packaging
+    platformdirs
+  ];
+
+  nativeCheckInputs = [
+    jaraco-envs
+    jaraco-path
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTests = [
+    # Fails against current setuptools_scm: it warns when a distribution's version is already set before it tries to infer one, which this test doesn't expect.
+    "test_version_resolved_from_egg_info"
+    # Requires internet access, unavailable in the Nix build sandbox.
+    "test_interop_pkg_resources_iter_entry_points"
+  ];
+
+  pythonImportsCheck = [ "pkg_resources" ];
+
+  meta = {
+    description = "Standalone redistribution of pkg_resources, extracted from setuptools";
+    homepage = "https://github.com/stephenfin/standard-pkg_resources";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ a-peirogon ];
+  };
+}
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 6b124472de72..cc6a730bc3da 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -3,7 +3,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  hatchling,
+  flit-core,
   pytestCheckHook,
   pytest-random-order,
   # dependencies
@@ -30,15 +30,15 @@
 
 buildPythonPackage rec {
   pname = "trezor";
-  version = "0.20.0";
+  version = "0.20.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TAmOIDFbJxZnOr3vQCgi5xiRAVmMfAPyN0ndIBDuJQQ=";
+    hash = "sha256-CrPOu0T+y1Mrd9WitAG1AYeh1wtyUabMLfVJTlL/31c=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [ flit-core ];
 
   dependencies = [
     click
diff --git a/pkgs/os-specific/linux/sgx/psw/cppmicroservices-compat.patch b/pkgs/os-specific/linux/sgx/psw/cppmicroservices-compat.patch
index c0044c3292d6..127ba22cae7f 100644
--- a/pkgs/os-specific/linux/sgx/psw/cppmicroservices-compat.patch
+++ b/pkgs/os-specific/linux/sgx/psw/cppmicroservices-compat.patch
@@ -1,87 +1,26 @@
-diff --git a/external/CppMicroServices/CMakeLists.txt b/external/CppMicroServices/CMakeLists.txt
-index 8d0aff3..44d45d9 100644
---- a/external/CppMicroServices/CMakeLists.txt
-+++ b/external/CppMicroServices/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # Extract the current version from the VERSION file
- file(STRINGS VERSION _version LIMIT_COUNT 1)
- 
--set(US_CMAKE_MINIMUM_REQUIRED_VERSION 3.2)
-+set(US_CMAKE_MINIMUM_REQUIRED_VERSION 3.10)
- 
- cmake_minimum_required(VERSION ${US_CMAKE_MINIMUM_REQUIRED_VERSION})
- 
 diff --git a/external/CppMicroServices/framework/include/cppmicroservices/AnyMap.h b/external/CppMicroServices/framework/include/cppmicroservices/AnyMap.h
-index 3f240f4..e8acef9 100644
+index 3f240f4..e9d5880 100644
 --- a/external/CppMicroServices/framework/include/cppmicroservices/AnyMap.h
 +++ b/external/CppMicroServices/framework/include/cppmicroservices/AnyMap.h
-@@ -25,6 +25,7 @@
- 
+@@ -25,6 +25,8 @@
+
  #include "cppmicroservices/Any.h"
- 
+
 +#include <cstdint>
++
  #include <string>
  #include <unordered_map>
- 
-diff --git a/external/CppMicroServices/framework/include/cppmicroservices/BundleEvent.h b/external/CppMicroServices/framework/include/cppmicroservices/BundleEvent.h
-index 9b36a9b..12894fa 100644
---- a/external/CppMicroServices/framework/include/cppmicroservices/BundleEvent.h
-+++ b/external/CppMicroServices/framework/include/cppmicroservices/BundleEvent.h
-@@ -25,6 +25,7 @@
- 
- #include "cppmicroservices/FrameworkExport.h"
- 
-+#include <cstdint>
- #include <iostream>
- #include <memory>
- 
-diff --git a/external/CppMicroServices/framework/include/cppmicroservices/Constants.h b/external/CppMicroServices/framework/include/cppmicroservices/Constants.h
-index 590a890..cf60926 100644
---- a/external/CppMicroServices/framework/include/cppmicroservices/Constants.h
-+++ b/external/CppMicroServices/framework/include/cppmicroservices/Constants.h
-@@ -25,6 +25,7 @@
- 
- #include "cppmicroservices/FrameworkConfig.h"
- 
-+#include <cstdint>
- #include <string>
- 
- namespace cppmicroservices {
-diff --git a/external/CppMicroServices/framework/include/cppmicroservices/FrameworkEvent.h b/external/CppMicroServices/framework/include/cppmicroservices/FrameworkEvent.h
-index 71caf1b..a29e87c 100644
---- a/external/CppMicroServices/framework/include/cppmicroservices/FrameworkEvent.h
-+++ b/external/CppMicroServices/framework/include/cppmicroservices/FrameworkEvent.h
-@@ -25,6 +25,7 @@
- 
- #include "cppmicroservices/FrameworkExport.h"
- 
-+#include <cstdint>
- #include <iostream>
- #include <memory>
- 
+
 diff --git a/external/CppMicroServices/framework/include/cppmicroservices/ServiceEvent.h b/external/CppMicroServices/framework/include/cppmicroservices/ServiceEvent.h
 index 451cb82..da7c5f0 100644
 --- a/external/CppMicroServices/framework/include/cppmicroservices/ServiceEvent.h
 +++ b/external/CppMicroServices/framework/include/cppmicroservices/ServiceEvent.h
 @@ -25,6 +25,8 @@
- 
+
  #include "cppmicroservices/ServiceReference.h"
- 
+
 +#include <cstdint>
 +
  US_MSVC_PUSH_DISABLE_WARNING(
    4251) // 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
- 
-diff --git a/psw/ae/aesm_service/source/CMakeLists.txt b/psw/ae/aesm_service/source/CMakeLists.txt
-index 5728e9b..0169263 100644
---- a/psw/ae/aesm_service/source/CMakeLists.txt
-+++ b/psw/ae/aesm_service/source/CMakeLists.txt
-@@ -30,7 +30,7 @@
- #
- 
- # [proj-begin]
--cmake_minimum_required(VERSION 3.0.0)
-+cmake_minimum_required(VERSION 3.10.0)
- project(ModularAESM VERSION 0.1.0)
- 
- 
+
diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix
index 738406006b2a..62707cb4d694 100644
--- a/pkgs/os-specific/linux/sgx/psw/default.nix
+++ b/pkgs/os-specific/linux/sgx/psw/default.nix
@@ -17,18 +17,18 @@
   which,
   debug ? false,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sgx-psw";
   # Version as given in se_version.h
-  version = "2.27.100.1";
+  version = "2.29.100.1";
   # Version as used in the Git tag
-  versionTag = "2.27";
+  versionTag = "2.29";
 
   src = fetchFromGitHub {
     owner = "intel";
-    repo = "linux-sgx";
-    rev = "sgx_${versionTag}";
-    hash = "sha256-hNmh4IgNJDNqt2xF8zBnD/x+saMyMk5hZLA3aOqzqEA=";
+    repo = "confidential-computing.sgx";
+    rev = "sgx_${finalAttrs.versionTag}";
+    hash = "sha256-gi4aNXHMHuPmc36JalALAXjIdn4COuXOZzC6dQRB6nU=";
     fetchSubmodules = true;
   };
 
@@ -39,37 +39,38 @@ stdenv.mkDerivation rec {
       # run user application enclaves, verify launch policies, produce remote
       # attestation quotes, and do platform certification.
       ae.prebuilt = fetchurl {
-        url = "https://download.01.org/intel-sgx/sgx-linux/${versionTag}/prebuilt_ae_${versionTag}.tar.gz";
+        url = "https://download.01.org/intel-sgx/sgx-linux/${finalAttrs.versionTag}/prebuilt_ae_${finalAttrs.versionTag}.tar.gz";
         hash = "sha256-Hlh96rYOyml2y50d8ASKz6U97Fl0hbGYECeZiG9nMSQ=";
       };
 
       # Pre-built ipp-crypto with mitigations.
       optlib.prebuilt = fetchurl {
-        url = "https://download.01.org/intel-sgx/sgx-linux/${versionTag}/optimized_libs_${versionTag}.tar.gz";
+        url = "https://download.01.org/intel-sgx/sgx-linux/${finalAttrs.versionTag}/optimized_libs_${finalAttrs.versionTag}.tar.gz";
         hash = "sha256-7mDTaLtpOQLHQ6Fv+FWJ2k/veJZPXIcuj7kOdRtRqhg=";
       };
 
       # Fetch the Data Center Attestation Primitives (DCAP) platform enclaves
       # and pre-built sgxssl.
       dcap = rec {
-        version = "1.24";
+        version = "1.26";
         filename = "prebuilt_dcap_${version}.tar.gz";
         prebuilt = fetchurl {
           url = "https://download.01.org/intel-sgx/sgx-dcap/${version}/linux/${filename}";
-          hash = "sha256-sc/eYIPdhwAyDk2Zh1HU6yuFlobqVy/4++m5OnQE3Bc=";
+          hash = "sha256-TXQ8xh0q9RKPyKqjMvxoQtIH2lxbhCiwpV+HvQxACaw=";
         };
       };
     in
     ''
       # Make sure this is the right version of linux-sgx
-      grep -q '"${version}"' "$src/common/inc/internal/se_version.h" \
-        || (echo "Could not find expected version ${version} in linux-sgx source" >&2 && exit 1)
+      grep -q '"${finalAttrs.version}"' "$src/common/inc/internal/se_version.h" \
+        || (echo "Could not find expected version ${finalAttrs.version} in linux-sgx source" >&2 && exit 1)
 
       tar -xzvf ${ae.prebuilt}     -C $sourceRoot/
       tar -xzvf ${optlib.prebuilt} -C $sourceRoot/
 
       # Make sure we use the correct version of prebuilt DCAP
-      grep -q 'ae_file_name=${dcap.filename}' "$src/external/dcap_source/QuoteGeneration/download_prebuilt.sh" \
+      grep -qE '(dcap_version=${dcap.version}|ae_file_name=${dcap.filename})' \
+        "$src/external/dcap_source/QuoteGeneration/download_prebuilt.sh" \
         || (echo "Could not find expected prebuilt DCAP ${dcap.filename} in linux-sgx source" >&2 && exit 1)
 
       tar -xzvf ${dcap.prebuilt} -C $sourceRoot/external/dcap_source prebuilt/
@@ -91,11 +92,7 @@ stdenv.mkDerivation rec {
     # build because the embedded zip file contents have different modified times.
     ./cppmicroservices-no-mtime.patch
 
-    # CppMicroServices is failing to build with CMake 4 and GCC 15
-    # PR: <https://github.com/intel/confidential-computing.sgx/pull/1098>
-    # - CMake 4 dropped support for <3.5 and warns on <3.10, so bump the
-    #   `cmake_minimum_required` to 3.10
-    # - Various header files now need `#include <cstdint>` to compile
+    # Add `#include <cstdint>` to CppMicroServices headers that GCC 15 needs
     ./cppmicroservices-compat.patch
   ];
 
@@ -270,7 +267,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Intel SGX Architectural Enclave Service Manager";
-    homepage = "https://github.com/intel/linux-sgx";
+    homepage = "https://github.com/intel/confidential-computing.sgx";
     maintainers = with lib.maintainers; [
       phlip9
       veehaitch
@@ -279,4 +276,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     license = lib.licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/sgx/psw/disable-downloads.patch b/pkgs/os-specific/linux/sgx/psw/disable-downloads.patch
index cce1522b8af6..ae302fa01bd9 100644
--- a/pkgs/os-specific/linux/sgx/psw/disable-downloads.patch
+++ b/pkgs/os-specific/linux/sgx/psw/disable-downloads.patch
@@ -1,27 +1,44 @@
 diff --git a/Makefile b/Makefile
-index 144f4e4..834c23e 100644
+index 597f167..f59bacc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -50,22 +50,17 @@ tips:
+@@ -25,12 +25,10 @@ tips:
  preparation:
  # As SDK build needs to clone and patch openmp, we cannot support the mode that download the source from github as zip.
  # Only enable the download from git
 -	git submodule update --init --recursive
  	cd external/dcap_source/external/jwt-cpp && git apply ../0001-Add-a-macro-to-disable-time-support-in-jwt-for-SGX.patch >/dev/null 2>&1 || \
  	git apply ../0001-Add-a-macro-to-disable-time-support-in-jwt-for-SGX.patch -R --check
+ 	cd external/dcap_source/external/wasm-micro-runtime && git apply ../0001-wasm-micro-runtime.patch >/dev/null 2>&1 || \
+ 	git apply ../0001-wasm-micro-runtime.patch -R --check
 -	./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild
  	cd external/openmp/openmp_code && git apply ../0001-Enable-OpenMP-in-SGX.patch >/dev/null 2>&1 ||  git apply ../0001-Enable-OpenMP-in-SGX.patch --check -R
- 	cd external/protobuf/protobuf_code && git apply ../sgx_protobuf.patch >/dev/null 2>&1 ||  git apply ../sgx_protobuf.patch --check -R
- 	cd external/protobuf/protobuf_code && git apply ../0001-bumped-protobuf-to-1.33.0.patch >/dev/null 2>&1 ||  git apply ../0001-bumped-protobuf-to-1.33.0.patch --check -R
--	cd external/protobuf/protobuf_code && git submodule update --init --recursive && cd third_party/abseil-cpp && git apply ../../../sgx_abseil.patch>/dev/null 2>&1 || git apply ../../../sgx_abseil.patch --check -R
- 	./external/sgx-emm/create_symlink.sh
- 	cd external/cbor && cp -r libcbor sgx_libcbor
- 	cd external/cbor/libcbor && git apply ../raw_cbor.patch >/dev/null 2>&1 || git apply ../raw_cbor.patch --check -R
+
+ 	# TODO refactor to remove duplication with the ./external/protobuf/Makefile.
+@@ -38,8 +36,7 @@ preparation:
+ 	# If you are adding a new patch over this one, write your patch's name to .sgx_patched
+ 	@if ! grep -q "sgx_protobuf" external/protobuf/protobuf_code/.sgx_patched 2>/dev/null; then \
+ 		cd external/protobuf/protobuf_code && \
+-		git apply ../sgx_protobuf.patch >/dev/null 2>&1 || git apply ../sgx_protobuf.patch --check -R && \
+-		git submodule update --init --recursive; \
++		git apply ../sgx_protobuf.patch >/dev/null 2>&1 || git apply ../sgx_protobuf.patch --check -R; \
+ 	fi
+ 	# If you are adding a new patch over this one, write your patch's name to .sgx_patched
+ 	@if ! grep -q "sgx_abseil" external/protobuf/abseil-cpp/.sgx_patched 2>/dev/null; then \
+@@ -52,8 +49,6 @@ preparation:
  	cd external/cbor/sgx_libcbor && git apply ../sgx_cbor.patch >/dev/null 2>&1 || git apply ../sgx_cbor.patch --check -R
  	cd external/ippcp_internal/ipp-crypto && git apply ../0001-IPP-crypto-for-SGX.patch > /dev/null 2>&1 || git apply ../0001-IPP-crypto-for-SGX.patch --check -R
  	cd external/ippcp_internal/ipp-crypto && mkdir -p build
 -	./download_prebuilt.sh
 -	./external/dcap_source/QuoteGeneration/download_prebuilt.sh
- 
+ 	cd external/libcxxrt/libcxxrt_code && git apply ../sgx_libcxxrt.patch >/dev/null 2>&1 || git apply ../sgx_libcxxrt.patch --check -R
+
  psw:
- 	$(MAKE) -C psw/ USE_OPT_LIBS=$(USE_OPT_LIBS)
+@@ -87,7 +82,6 @@ servtd_attest_preparation:
+ # Only enable the download from git
+ 	git submodule update --init --recursive external/dcap_source external/sgx-emm/emm_src external/libcxxrt/libcxxrt_code
+ 	./external/sgx-emm/create_symlink.sh
+-	./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild
+ 	cd external/libcxxrt/libcxxrt_code && (git apply ../sgx_libcxxrt.patch >/dev/null 2>&1 || git apply ../sgx_libcxxrt.patch --check -R)
+
+ ipp:
diff --git a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
index f59856bcf4f5..7d0b938ce017 100644
--- a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "kongo09";
   domain = "philips_airpurifier_coap";
-  version = "0.36.2";
+  version = "0.37";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "philips-airpurifier-coap";
     rev = "v${version}";
-    hash = "sha256-aVCfUuwPW+0L+OuOoLV0cPezZVKHtO39p/TK/gy2jdg=";
+    hash = "sha256-oPdjf6eOkkywFQMavbeBty5E5zb215qIBHWND5zaJBs=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
index 9af55cca103f..dd245f4eca95 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "mushroom";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
     rev = "v${version}";
-    hash = "sha256-M6p3nEV+t8nn4epM3qcu/F3cvLwSBIZ1Dh11bNIcsMw=";
+    hash = "sha256-S3nC6p35xG3Q33/XHlDF/h4qDXlKuoyMEtn0AywP/ag=";
   };
 
-  npmDepsHash = "sha256-GbU/qI63Ykwt1wnHVUnW1n54mhZsL/V+KxkEysZFGuM=";
+  npmDepsHash = "sha256-7bVJIo3N7y3v6ck//bHhMwTQRUqEsNqoavfMuZZwE50=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/test/make-binary-wrapper/combination/combination.c b/pkgs/test/make-binary-wrapper/combination/combination.c
index 8ce8a4722a0b..ae90263c45a5 100644
--- a/pkgs/test/make-binary-wrapper/combination/combination.c
+++ b/pkgs/test/make-binary-wrapper/combination/combination.c
@@ -3,31 +3,86 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
 
-void set_env_prefix(char *env, char *sep, char *prefix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing));
-        assert_success(setenv(env, val, 1));
-        free(val);
-    } else {
-        assert_success(setenv(env, prefix, 1));
+int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) {
+  unsigned long sep_len = strlen(sep);
+
+  // Check left side (if not at start)
+  if (env != ptr) {
+    if (ptr - env < sep_len)
+      return 0;
+    if (strncmp(sep, ptr - sep_len, sep_len) != 0) {
+      return 0;
     }
+  }
+  // Check right side (if not at end)
+  char *end_ptr = ptr + len;
+  if (*end_ptr != '\0') {
+    if (strncmp(sep, ptr + len, sep_len) != 0) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+void set_env_prefix(char *env, char *sep, char *prefix) {
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_prefix = strstr(existing_env, prefix);
+    unsigned long prefix_len = strlen(prefix);
+    // If the prefix already exists, remove the original
+    if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) {
+      if (existing_env == existing_prefix) {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_prefix - existing_env;
+      assert_success(asprintf(&val, "%s%s%.*s%s", prefix, sep,
+                              n_before, existing_env,
+                              existing_prefix + prefix_len + sep_len));
+    } else {
+      assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing_env));
+    }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, prefix, 1));
+  }
 }
 
 void set_env_suffix(char *env, char *sep, char *suffix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, "%s%s%s", existing, sep, suffix));
-        assert_success(setenv(env, val, 1));
-        free(val);
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_suffix = strstr(existing_env, suffix);
+    unsigned long suffix_len = strlen(suffix);
+    // If the suffix already exists, remove the original
+    if (existing_suffix && is_surrounded_by_sep(existing_env, existing_suffix, suffix_len, sep)) {
+      char *end_ptr = existing_suffix + suffix_len;
+      if (*end_ptr == '\0') {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_suffix - existing_env;
+      assert_success(asprintf(&val, "%.*s%s%s%s",
+                              n_before, existing_env,
+                              existing_suffix + suffix_len + sep_len,
+                              sep, suffix));
     } else {
-        assert_success(setenv(env, suffix, 1));
+      assert_success(asprintf(&val, "%s%s%s", existing_env, sep, suffix));
     }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, suffix, 1));
+  }
 }
 
 int main(int argc, char **argv) {
diff --git a/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c
index 579705d33e94..6a5107d5a4de 100644
--- a/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c
+++ b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c
@@ -3,19 +3,57 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
 
-void set_env_prefix(char *env, char *sep, char *prefix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing));
-        assert_success(setenv(env, val, 1));
-        free(val);
-    } else {
-        assert_success(setenv(env, prefix, 1));
+int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) {
+  unsigned long sep_len = strlen(sep);
+
+  // Check left side (if not at start)
+  if (env != ptr) {
+    if (ptr - env < sep_len)
+      return 0;
+    if (strncmp(sep, ptr - sep_len, sep_len) != 0) {
+      return 0;
     }
+  }
+  // Check right side (if not at end)
+  char *end_ptr = ptr + len;
+  if (*end_ptr != '\0') {
+    if (strncmp(sep, ptr + len, sep_len) != 0) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+void set_env_prefix(char *env, char *sep, char *prefix) {
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_prefix = strstr(existing_env, prefix);
+    unsigned long prefix_len = strlen(prefix);
+    // If the prefix already exists, remove the original
+    if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) {
+      if (existing_env == existing_prefix) {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_prefix - existing_env;
+      assert_success(asprintf(&val, "%s%s%.*s%s", prefix, sep,
+                              n_before, existing_env,
+                              existing_prefix + prefix_len + sep_len));
+    } else {
+      assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing_env));
+    }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, prefix, 1));
+  }
 }
 
 int main(int argc, char **argv) {
diff --git a/pkgs/test/make-binary-wrapper/prefix/prefix.c b/pkgs/test/make-binary-wrapper/prefix/prefix.c
index ea8fbdc64a84..205ecd0dcaef 100644
--- a/pkgs/test/make-binary-wrapper/prefix/prefix.c
+++ b/pkgs/test/make-binary-wrapper/prefix/prefix.c
@@ -3,19 +3,57 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
 
-void set_env_prefix(char *env, char *sep, char *prefix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing));
-        assert_success(setenv(env, val, 1));
-        free(val);
-    } else {
-        assert_success(setenv(env, prefix, 1));
+int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) {
+  unsigned long sep_len = strlen(sep);
+
+  // Check left side (if not at start)
+  if (env != ptr) {
+    if (ptr - env < sep_len)
+      return 0;
+    if (strncmp(sep, ptr - sep_len, sep_len) != 0) {
+      return 0;
     }
+  }
+  // Check right side (if not at end)
+  char *end_ptr = ptr + len;
+  if (*end_ptr != '\0') {
+    if (strncmp(sep, ptr + len, sep_len) != 0) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+void set_env_prefix(char *env, char *sep, char *prefix) {
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_prefix = strstr(existing_env, prefix);
+    unsigned long prefix_len = strlen(prefix);
+    // If the prefix already exists, remove the original
+    if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) {
+      if (existing_env == existing_prefix) {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_prefix - existing_env;
+      assert_success(asprintf(&val, "%s%s%.*s%s", prefix, sep,
+                              n_before, existing_env,
+                              existing_prefix + prefix_len + sep_len));
+    } else {
+      assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing_env));
+    }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, prefix, 1));
+  }
 }
 
 int main(int argc, char **argv) {
diff --git a/pkgs/test/make-binary-wrapper/suffix/suffix.c b/pkgs/test/make-binary-wrapper/suffix/suffix.c
index d33f86c070ca..d4cb2966704b 100644
--- a/pkgs/test/make-binary-wrapper/suffix/suffix.c
+++ b/pkgs/test/make-binary-wrapper/suffix/suffix.c
@@ -3,19 +3,59 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
 
-void set_env_suffix(char *env, char *sep, char *suffix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, "%s%s%s", existing, sep, suffix));
-        assert_success(setenv(env, val, 1));
-        free(val);
-    } else {
-        assert_success(setenv(env, suffix, 1));
+int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) {
+  unsigned long sep_len = strlen(sep);
+
+  // Check left side (if not at start)
+  if (env != ptr) {
+    if (ptr - env < sep_len)
+      return 0;
+    if (strncmp(sep, ptr - sep_len, sep_len) != 0) {
+      return 0;
     }
+  }
+  // Check right side (if not at end)
+  char *end_ptr = ptr + len;
+  if (*end_ptr != '\0') {
+    if (strncmp(sep, ptr + len, sep_len) != 0) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+void set_env_suffix(char *env, char *sep, char *suffix) {
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_suffix = strstr(existing_env, suffix);
+    unsigned long suffix_len = strlen(suffix);
+    // If the suffix already exists, remove the original
+    if (existing_suffix && is_surrounded_by_sep(existing_env, existing_suffix, suffix_len, sep)) {
+      char *end_ptr = existing_suffix + suffix_len;
+      if (*end_ptr == '\0') {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_suffix - existing_env;
+      assert_success(asprintf(&val, "%.*s%s%s%s",
+                              n_before, existing_env,
+                              existing_suffix + suffix_len + sep_len,
+                              sep, suffix));
+    } else {
+      assert_success(asprintf(&val, "%s%s%s", existing_env, sep, suffix));
+    }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, suffix, 1));
+  }
 }
 
 int main(int argc, char **argv) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b89195f115..030a7d6d714b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1080,6 +1080,12 @@ with pkgs;
 
   forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
 
+  gerrit_3_12 = callPackage ../by-name/ge/gerrit/3_12.nix { };
+
+  gerrit_3_13 = callPackage ../by-name/ge/gerrit/3_13.nix { };
+
+  gerrit_3_14 = callPackage ../by-name/ge/gerrit/3_14.nix { };
+
   github-cli = gh;
 
   git-credential-aol = callPackage ../by-name/gi/git-credential-email/git-credential-aol { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2239d01483c..c41bc881f6b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19474,6 +19474,8 @@ self: super: with self; {
   standard-pipes =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;
 
+  standard-pkg-resources = callPackage ../development/python-modules/standard-pkg-resources { };
+
   standard-sndhdr =
     if pythonAtLeast "3.13" then
       callPackage ../development/python-modules/standard-sndhdr { }