diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index db4aea04e5e0..b640ba8d5011 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -27,7 +27,7 @@ buildInputs = [
 ];
 ```
 
-These will export ANDROID_SDK_ROOT and ANDROID_NDK_ROOT to the SDK and NDK directories
+These will export `ANDROID_SDK_ROOT` and `ANDROID_NDK_ROOT` to the SDK and NDK directories
 in the specified Android build environment.
 
 ## Deploying an Android SDK installation with plugins {#deploying-an-android-sdk-installation-with-plugins}
@@ -39,24 +39,12 @@ with import <nixpkgs> {};
 
 let
   androidComposition = androidenv.composeAndroidPackages {
-    cmdLineToolsVersion = "8.0";
-    toolsVersion = "26.1.1";
-    platformToolsVersion = "30.0.5";
-    buildToolsVersions = [ "30.0.3" ];
-    includeEmulator = false;
-    emulatorVersion = "30.3.4";
-    platformVersions = [ "28" "29" "30" ];
-    includeSources = false;
-    includeSystemImages = false;
+    platformVersions = [ "34" "35" ];
     systemImageTypes = [ "google_apis_playstore" ];
     abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-    cmakeVersions = [ "3.10.2" ];
     includeNDK = true;
-    ndkVersions = ["22.0.7026061"];
-    useGoogleAPIs = false;
-    useGoogleTVAddOns = false;
     includeExtras = [
-      "extras;google;gcm"
+      "extras;google;auto"
     ];
   };
 in
@@ -69,27 +57,44 @@ exceptions are the tools, platform-tools and build-tools sub packages.
 
 The following parameters are supported:
 
-* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use
+* `cmdLineToolsVersion` specifies the version of the `cmdline-tools` package to use.
+  It defaults to the latest.
 * `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is
   obsolete, and currently only `26.1.1` is available, so there's not a lot of
-  options here, however, you can set it as `null` if you don't want it.
-* `platformsToolsVersion` specifies the version of the `platform-tools` plugin
+  options here, however, you can set it as `null` if you don't want it. It defaults
+  to the latest.
+* `platformToolsVersion` specifies the version of the `platform-tools` plugin.
+  It defaults to the latest.
 * `buildToolsVersions` specifies the versions of the `build-tools` plugins to
-  use.
+  use. It defaults to the latest.
 * `includeEmulator` specifies whether to deploy the emulator package (`false`
   by default). When enabled, the version of the emulator to deploy can be
-  specified by setting the `emulatorVersion` parameter.
+  specified by setting the `emulatorVersion` parameter. If set to
+  `"if-supported"`, it will deploy the emulator if it's supported by the system.
+* `includeCmake` specifies whether CMake should be included. It defaults to true
+  on x86-64 and Darwin platforms, and also supports `"if-supported"`.
 * `cmakeVersions` specifies which CMake versions should be deployed.
+  It defaults to the latest.
 * `includeNDK` specifies that the Android NDK bundle should be included.
-  Defaults to: `false`.
+  Defaults to `false` though can be set to `true` or `"if-supported"`.
 * `ndkVersions` specifies the NDK versions that we want to use. These are linked
   under the `ndk` directory of the SDK root, and the first is linked under the
-  `ndk-bundle` directory.
+  `ndk-bundle` directory. It defaults to the latest.
 * `ndkVersion` is equivalent to specifying one entry in `ndkVersions`, and
   `ndkVersions` overrides this parameter if provided.
 * `includeExtras` is an array of identifier strings referring to arbitrary
-  add-on packages that should be installed.
+  add-on packages that should be installed. Note that extras may not be compatible
+  with all platforms (for example, the Google TV head unit, which does not
+  have an aarch64-linux compile).
 * `platformVersions` specifies which platform SDK versions should be included.
+  It defaults to including only the latest API level, though you can add more.
+* `numLatestPlatformVersions` specifies how many of the latest API levels to include,
+  if you are using the default for `platformVersions`. It defaults to 1, though you can
+  increase this to, for example, 5 to get the last 5 years of Android API packages.
+* `minPlatformVersion` and `maxPlatformVersion` take priority over `platformVersions`
+  if both are provided. Note that `maxPlatformVersion` always defaults to the latest
+  Android SDK platform version, allowing you to specify `minPlatformVersion` to describe
+  the minimum SDK version your Android composition supports.
 
 For each platform version that has been specified, we can apply the following
 options:
@@ -108,9 +113,10 @@ For each requested system image we can specify the following options:
 * `systemImageTypes` specifies what kind of system images should be included.
   Defaults to: `default`.
 * `abiVersions` specifies what kind of ABI version of each system image should
-  be included. Defaults to: `armeabi-v7a`.
+  be included. Defaults to `armeabi-v7a` and `arm64-v8a`.
 
-Most of the function arguments have reasonable default settings.
+Most of the function arguments have reasonable default settings, preferring the latest
+versions of tools when possible.
 
 You can specify license names:
 
@@ -127,7 +133,8 @@ pull from:
   by running `generate.sh`, which in turn will call into `mkrepo.rb`.
 * `repoXmls` is an attribute set containing paths to repo XML files. If specified,
   it takes priority over `repoJson`, and will trigger a local build writing out a
-  repo.json to the Nix store based on the given repository XMLs.
+  repo.json to the Nix store based on the given repository XMLs. Note that this uses
+  import-from-derivation.
 
 ```nix
 {
@@ -312,27 +319,23 @@ android {
 
 ## Querying the available versions of each plugin {#querying-the-available-versions-of-each-plugin}
 
-repo.json provides all the options in one file now.
-
-A shell script in the `pkgs/development/mobile/androidenv/` subdirectory can be used to retrieve all
-possible options:
-
-```bash
-./querypackages.sh packages
-```
-
-The above command-line instruction queries all package versions in repo.json.
+All androidenv packages are available on [search.nixos.org](https://search.nixos.org).
+Note that `aarch64-linux` compatibility is currently spotty, though `x86_64-linux` and `aarch64-darwin`
+are well supported. This is because Google's repository definitions mark some packages for "all" architectures
+that are really only for `x86_64` or `aarch64`.
 
 ## Updating the generated expressions {#updating-the-generated-expressions}
 
 repo.json is generated from XML files that the Android Studio package manager uses.
-To update the expressions run the `generate.sh` script that is stored in the
+To update the expressions run the `update.sh` script that is stored in the
 `pkgs/development/mobile/androidenv/` subdirectory:
 
 ```bash
-./generate.sh
+./update.sh
 ```
 
+This is run automatically by the nixpkgs update script.
+
 ## Building an Android application with Ant {#building-an-android-application-with-ant}
 
 In addition to the SDK, it is also possible to build an Ant-based Android
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0efae325b6bc..645938338b63 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3639,6 +3639,11 @@
     githubId = 200617;
     name = "Ben Sima";
   };
+  bstanderline = {
+    name = "bstanderline";
+    github = "bstanderline";
+    githubId = 153822813;
+  };
   btlvr = {
     email = "btlvr@protonmail.com";
     github = "btlvr";
@@ -7851,6 +7856,12 @@
     githubId = 11705326;
     name = "Max Kochurov";
   };
+  fettgoenner = {
+    email = "paulmatti@protonmail.com";
+    github = "fettgoenner";
+    githubId = 92429150;
+    name = "Paul Meinhold";
+  };
   ffinkdevs = {
     email = "fink@h0st.space";
     github = "ffinkdevs";
@@ -17372,6 +17383,12 @@
     githubId = 7191115;
     name = "Nova Leary";
   };
+  novmar = {
+    email = "novotny@marnov.cz";
+    github = "novmar";
+    githubId = 26750149;
+    name = "Marcel Novotny";
+  };
   novoxd = {
     email = "radnovox@gmail.com";
     github = "novoxd";
@@ -19576,6 +19593,13 @@
     github = "qdlmcfresh";
     githubId = 10837173;
   };
+  qf0xb = {
+    name = "Quirin Brändli";
+    email = "development@qf0xb.de";
+    github = "QF0xB";
+    githubId = 37348361;
+    keys = [ { fingerprint = "9036 0B7D B6B7 8B75 E901  3D11 3FF8 C23C 46F2 CC90"; } ];
+  };
   qjoly = {
     email = "github@une-pause-cafe.fr";
     github = "qjoly";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 3746a1440746..dd74d1f080ac 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -597,6 +597,7 @@ with lib.maintainers;
   jitsi = {
     members = [
       cleeyv
+      novmar
       ryantm
       lassulus
       yayayayaka
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index c21e36403161..486b5f542ff4 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -101,7 +101,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](#opt-services.invoiceplane.sites._name_.enable).
 
-- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as [programs.k3b](#opt-programs.k3b.enable).
+- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as programs.k3b.
 
 - [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](#opt-programs.k40-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
 
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 3b833479033f..b0e6f9a10e9b 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -61,6 +61,11 @@
   - A new `pkgs.mattermost.buildPlugin` function has been added, which allows plugins to be built from source, including webapp frontends with a supported package-lock.json. See the Mattermost NixOS test and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-mattermost-plugins-build) for an example.
   - Note that the Mattermost module will create an account _without_ a well-known UID if the username differs from the default (`mattermost`). If you used Mattermost with a nonstandard username, you may want to review the module changes before upgrading.
 
+- androidenv has been updated:
+  - All versions specified in composeAndroidPackages now track latest. Android packages are automatically updated on unstable, and run the androidenv test suite on every update.
+  - Some androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org).
+  - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## New Modules {#sec-release-25.05-new-modules}
diff --git a/nixos/modules/programs/k3b.nix b/nixos/modules/programs/k3b.nix
index 3e9435d3dc60..4bb76e2e7966 100644
--- a/nixos/modules/programs/k3b.nix
+++ b/nixos/modules/programs/k3b.nix
@@ -1,50 +1,8 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 {
-  # interface
-  options.programs.k3b = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = ''
-        Whether to enable k3b, the KDE disk burning application.
-
-        Additionally to installing `k3b` enabling this will
-        add `setuid` wrappers in `/run/wrappers/bin`
-        for both `cdrdao` and `cdrecord`. On first
-        run you must manually configure the path of `cdrdae` and
-        `cdrecord` to correspond to the appropriate paths under
-        `/run/wrappers/bin` in the "Setup External Programs" menu.
-      '';
-    };
-  };
-
-  # implementation
-  config = lib.mkIf config.programs.k3b.enable {
-
-    environment.systemPackages = with pkgs; [
-      k3b
-      dvdplusrwtools
-      cdrdao
-      cdrtools
-    ];
-
-    security.wrappers = {
-      cdrdao = {
-        setuid = true;
-        owner = "root";
-        group = "cdrom";
-        permissions = "u+wrx,g+x";
-        source = "${pkgs.cdrdao}/bin/cdrdao";
-      };
-      cdrecord = {
-        setuid = true;
-        owner = "root";
-        group = "cdrom";
-        permissions = "u+wrx,g+x";
-        source = "${pkgs.cdrtools}/bin/cdrecord";
-      };
-    };
-
-  };
+  imports = [
+    (lib.mkRemovedOptionModule [ "programs" "k3b" "enable" ]
+      "Please add kdePackages.k3b to environment.systemPackages instead")
+  ];
 }
diff --git a/nixos/modules/services/web-apps/agorakit.nix b/nixos/modules/services/web-apps/agorakit.nix
index 583f68ee5881..b7c86d7585dd 100644
--- a/nixos/modules/services/web-apps/agorakit.nix
+++ b/nixos/modules/services/web-apps/agorakit.nix
@@ -13,6 +13,7 @@ let
 
   user = cfg.user;
   group = cfg.group;
+  php = lib.getExe pkgs.php82;
 
   # shell script for local administration
   artisan = pkgs.writeScriptBin "agorakit" ''
@@ -25,7 +26,7 @@ let
         exec "$@"
       fi
     }
-    sudo ${lib.getExe pkgs.php} artisan "$@"
+    sudo ${php} artisan "$@"
   '';
 
   tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;
@@ -447,9 +448,9 @@ in
           fi
 
           # migrate & seed db
-          ${pkgs.php}/bin/php artisan key:generate --force
-          ${pkgs.php}/bin/php artisan migrate --force
-          ${pkgs.php}/bin/php artisan config:cache
+          ${php} artisan key:generate --force
+          ${php} artisan migrate --force
+          ${php} artisan config:cache
         '';
     };
 
diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix
index 8f61a8ac9e97..217adb801236 100644
--- a/nixos/modules/services/web-apps/calibre-web.nix
+++ b/nixos/modules/services/web-apps/calibre-web.nix
@@ -4,7 +4,7 @@ let
   cfg = config.services.calibre-web;
   dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}";
 
-  inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types;
+  inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionals optionalString types;
 in
 {
   options = {
@@ -129,7 +129,10 @@ in
           "config_reverse_proxy_login_header_name = '${cfg.options.reverseProxyAuth.header}'"
         ]
         ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'"
-        ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"
+        ++ optionals cfg.options.enableBookConversion [
+          "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"
+          "config_binariesdir = '${pkgs.calibre}/bin/'"
+        ]
         ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'"
       );
     in
diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix
index 136720ef67b4..877490652989 100644
--- a/nixos/modules/services/web-apps/dolibarr.nix
+++ b/nixos/modules/services/web-apps/dolibarr.nix
@@ -312,7 +312,7 @@ in
       systemd.services."phpfpm-dolibarr".after = mkIf cfg.database.createLocally [ "mysql.service" ];
       services.phpfpm.pools.dolibarr = {
         inherit (cfg) user group;
-        phpPackage = pkgs.php.buildEnv {
+        phpPackage = pkgs.php83.buildEnv {
           extensions = { enabled, all }: enabled ++ [ all.calendar ];
           # recommended by dolibarr web application
           extraConfig = ''
@@ -339,13 +339,17 @@ in
         description = "dolibarr configuration file management via NixOS";
         wantedBy = [ "multi-user.target" ];
 
-        script = ''
-          # extract the 'main instance unique id' secret that the dolibarr installer generated for us, store it in a file for use by our own NixOS generated configuration file
-          ${pkgs.php}/bin/php -r "include '${cfg.stateDir}/conf.php'; file_put_contents('${cfg.stateDir}/dolibarr_main_instance_unique_id', \$dolibarr_main_instance_unique_id);"
+        script =
+          let
+            php = lib.getExe config.services.phpfpm.pools.dolibarr.phpPackage;
+          in
+          ''
+            # extract the 'main instance unique id' secret that the dolibarr installer generated for us, store it in a file for use by our own NixOS generated configuration file
+            ${php} -r "include '${cfg.stateDir}/conf.php'; file_put_contents('${cfg.stateDir}/dolibarr_main_instance_unique_id', \$dolibarr_main_instance_unique_id);"
 
-          # replace configuration file generated by installer with the NixOS generated configuration file
-          install -m 440 ${mkConfigFile "conf.php" cfg.settings} '${cfg.stateDir}/conf.php'
-        '';
+            # replace configuration file generated by installer with the NixOS generated configuration file
+            install -m 440 ${mkConfigFile "conf.php" cfg.settings} '${cfg.stateDir}/conf.php'
+          '';
 
         serviceConfig = {
           Type = "oneshot";
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 680257d23b21..880ae5f55994 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -192,7 +192,7 @@ in
             )
           );
         };
-        phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);
+        phpPackage = pkgs.php83.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);
         phpOptions = ''
           date.timezone = "${cfg.timezone}"
         '';
diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix
index 16263e70c2e8..00bb9bb7de2d 100644
--- a/nixos/modules/services/web-apps/monica.nix
+++ b/nixos/modules/services/web-apps/monica.nix
@@ -15,6 +15,8 @@ with lib; let
   user = cfg.user;
   group = cfg.group;
 
+  php = lib.getExe pkgs.php83;
+
   # shell script for local administration
   artisan = pkgs.writeScriptBin "monica" ''
     #! ${pkgs.runtimeShell}
@@ -26,7 +28,7 @@ with lib; let
         exec "$@"
       fi
     }
-    sudo ${pkgs.php}/bin/php artisan "$@"
+    sudo ${php} artisan "$@"
   '';
 
   tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;
@@ -419,8 +421,8 @@ in {
         fi
 
         # migrate & seed db
-        ${pkgs.php}/bin/php artisan key:generate --force
-        ${pkgs.php}/bin/php artisan setup:production -v --force
+        ${php} artisan key:generate --force
+        ${php} artisan setup:production -v --force
       '';
     };
 
@@ -432,7 +434,7 @@ in {
         Type = "oneshot";
         User = user;
         WorkingDirectory = "${monica}";
-        ExecStart = "${pkgs.php}/bin/php ${monica}/artisan schedule:run -v";
+        ExecStart = "${php} ${monica}/artisan schedule:run -v";
       };
     };
 
@@ -465,4 +467,3 @@ in {
     };
   };
 }
-
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index ed436dad32e0..8c5c45dbfc44 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -130,10 +130,17 @@ let
           --quiet \
           ${command}
       elif [[ "$USER" != nextcloud ]]; then
-        exec /run/wrappers/bin/sudo \
-          --preserve-env=CREDENTIALS_DIRECTORY \
-          --user=nextcloud \
-          ${command}
+        if [[ -x /run/wrappers/bin/sudo ]]; then
+          exec /run/wrappers/bin/sudo \
+            --preserve-env=CREDENTIALS_DIRECTORY \
+            --user=nextcloud \
+            ${command}
+        else
+          exec ${lib.getExe' pkgs.util-linux "runuser"} \
+            --whitelist-environment=CREDENTIALS_DIRECTORY \
+            --user=nextcloud \
+            ${command}
+        fi
       else
         exec ${command}
       fi
diff --git a/nixos/modules/services/web-apps/rutorrent.nix b/nixos/modules/services/web-apps/rutorrent.nix
index be2af96ae05b..d1c3c2eafe38 100644
--- a/nixos/modules/services/web-apps/rutorrent.nix
+++ b/nixos/modules/services/web-apps/rutorrent.nix
@@ -211,7 +211,7 @@ in
                   $throttleMaxSpeed = 327625*1024;
 
                   $pathToExternals = array(
-                    "php" 	=> "${pkgs.php}/bin/php",			// Something like /usr/bin/php. If empty, will be found in PATH.
+                    "php" 	=> "${pkgs.php82}/bin/php",			// Something like /usr/bin/php. If empty, will be found in PATH.
                     "curl"	=> "${pkgs.curl}/bin/curl",			// Something like /usr/bin/curl. If empty, will be found in PATH.
                     "gzip"	=> "${pkgs.gzip}/bin/gzip",			// Something like /usr/bin/gzip. If empty, will be found in PATH.
                     "id"	=> "${pkgs.coreutils}/bin/id",			// Something like /usr/bin/id. If empty, will be found in PATH.
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d44ac5ebd08d..98240a9f15e7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -341,8 +341,8 @@ in {
   documize = handleTest ./documize.nix {};
   documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
   doh-proxy-rust = handleTest ./doh-proxy-rust.nix {};
-  dokuwiki = handleTest ./dokuwiki.nix {};
-  dolibarr = handleTest ./dolibarr.nix {};
+  dokuwiki = runTest ./dokuwiki.nix;
+  dolibarr = runTest ./dolibarr.nix;
   domination = handleTest ./domination.nix {};
   dovecot = handleTest ./dovecot.nix {};
   drawterm = discoverTests (import ./drawterm.nix);
@@ -557,7 +557,7 @@ in {
   hub = handleTest ./git/hub.nix {};
   hydra = handleTest ./hydra {};
   i3wm = handleTest ./i3wm.nix {};
-  icingaweb2 = handleTest ./icingaweb2.nix {};
+  icingaweb2 = runTest ./icingaweb2.nix;
   ifm = handleTest ./ifm.nix {};
   iftop = handleTest ./iftop.nix {};
   immich = handleTest ./web-apps/immich.nix {};
@@ -725,7 +725,7 @@ in {
   mollysocket = handleTest ./mollysocket.nix { };
   monado = handleTest ./monado.nix {};
   monetdb = handleTest ./monetdb.nix {};
-  monica = handleTest ./web-apps/monica.nix {};
+  monica = runTest ./web-apps/monica.nix;
   mongodb = runTest ./mongodb.nix;
   mongodb-ce = runTest ({ config, ... }: {
     imports = [ ./mongodb.nix ];
@@ -797,15 +797,15 @@ in {
   nfs3 = handleTest ./nfs { version = 3; };
   nfs4 = handleTest ./nfs { version = 4; };
   nghttpx = handleTest ./nghttpx.nix {};
-  nginx = handleTest ./nginx.nix {};
-  nginx-auth = handleTest ./nginx-auth.nix {};
-  nginx-etag = handleTest ./nginx-etag.nix {};
-  nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};
-  nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};
+  nginx = runTest ./nginx.nix;
+  nginx-auth = runTest ./nginx-auth.nix;
+  nginx-etag = runTest ./nginx-etag.nix;
+  nginx-etag-compression = runTest ./nginx-etag-compression.nix;
+  nginx-globalredirect = runTest ./nginx-globalredirect.nix;
   nginx-http3 = handleTest ./nginx-http3.nix {};
-  nginx-mime = handleTest ./nginx-mime.nix {};
-  nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
-  nginx-moreheaders = handleTest ./nginx-moreheaders.nix {};
+  nginx-mime = runTest ./nginx-mime.nix;
+  nginx-modsecurity = runTest ./nginx-modsecurity.nix;
+  nginx-moreheaders = runTest ./nginx-moreheaders.nix;
   nginx-njs = handleTest ./nginx-njs.nix {};
   nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};
   nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
@@ -1257,7 +1257,7 @@ in {
   umurmur = handleTest ./umurmur.nix {};
   unbound = handleTest ./unbound.nix {};
   unifi = handleTest ./unifi.nix {};
-  unit-php = handleTest ./web-servers/unit-php.nix {};
+  unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = handleTest ./web-servers/unit-perl.nix {};
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
   upnp.nftables = handleTest ./upnp.nix { useNftables = true; };
@@ -1306,7 +1306,7 @@ in {
   weblate = handleTest ./web-apps/weblate.nix {};
   whisparr = handleTest ./whisparr.nix {};
   whoogle-search = handleTest ./whoogle-search.nix {};
-  wiki-js = handleTest ./wiki-js.nix {};
+  wiki-js = runTest ./wiki-js.nix;
   wine = handleTest ./wine.nix {};
   wireguard = handleTest ./wireguard {};
   wg-access-server = handleTest ./wg-access-server.nix {};
@@ -1314,7 +1314,7 @@ in {
   wmderland = handleTest ./wmderland.nix {};
   workout-tracker = handleTest ./workout-tracker.nix {};
   wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };
-  wordpress = handleTest ./wordpress.nix {};
+  wordpress = runTest ./wordpress.nix;
   wrappers = handleTest ./wrappers.nix {};
   writefreely = handleTest ./web-apps/writefreely.nix {};
   wstunnel = runTest ./wstunnel.nix;
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 6f7ee60fc193..ebbefd0dcfaf 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -1,6 +1,8 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+{ config, ... }:
 
 let
+  pkgs = config.node.pkgs;
+
   template-bootstrap3 = pkgs.stdenv.mkDerivation rec {
     name = "bootstrap3";
     version = "2022-07-27";
@@ -163,4 +165,4 @@ in {
             "curl -sSfL http://site1.local/rewrite-test | grep 'Hello, NixOS!'",
           )
   '';
-})
+}
diff --git a/nixos/tests/dolibarr.nix b/nixos/tests/dolibarr.nix
index 5d7098f763f5..5a67a4a66e77 100644
--- a/nixos/tests/dolibarr.nix
+++ b/nixos/tests/dolibarr.nix
@@ -1,62 +1,60 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "dolibarr";
-    meta.maintainers = [ ];
+{ ... }:
+{
+  name = "dolibarr";
+  meta.maintainers = [ ];
 
-    nodes.machine =
-      { ... }:
-      {
-        services.dolibarr = {
-          enable = true;
-          domain = "localhost";
-          nginx = {
-            forceSSL = false;
-            enableACME = false;
-          };
+  nodes.machine =
+    { ... }:
+    {
+      services.dolibarr = {
+        enable = true;
+        domain = "localhost";
+        nginx = {
+          forceSSL = false;
+          enableACME = false;
         };
-
-        networking.firewall.allowedTCPPorts = [ 80 ];
       };
 
-    testScript = ''
-      from html.parser import HTMLParser
-      start_all()
+      networking.firewall.allowedTCPPorts = [ 80 ];
+    };
 
-      csrf_token = None
-      class TokenParser(HTMLParser):
-        def handle_starttag(self, tag, attrs):
-          attrs = dict(attrs) # attrs is an assoc list originally
-          if tag == 'input' and attrs.get('name') == 'token':
-              csrf_token = attrs.get('value')
-              print(f'[+] Caught CSRF token: {csrf_token}')
-        def handle_endtag(self, tag): pass
-        def handle_data(self, data): pass
+  testScript = ''
+    from html.parser import HTMLParser
+    start_all()
 
-      machine.wait_for_unit("phpfpm-dolibarr.service")
-      machine.wait_for_unit("nginx.service")
-      machine.wait_for_open_port(80)
-      # Sanity checks on URLs.
-      # machine.succeed("curl -fL http://localhost/index.php")
-      # machine.succeed("curl -fL http://localhost/")
-      # Perform installation.
-      machine.succeed('curl -fL -X POST http://localhost/install/check.php -F selectlang=auto')
-      machine.succeed('curl -fL -X POST http://localhost/install/fileconf.php -F selectlang=auto')
-      # First time is to write the configuration file correctly.
-      machine.succeed('curl -fL -X POST http://localhost/install/step1.php -F "testpost=ok" -F "action=set" -F "selectlang=auto"')
-      # Now, we have a proper conf.php in $stateDir.
-      assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
-      machine.succeed('curl -fL -X POST http://localhost/install/step2.php --data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=auto"')
-      machine.succeed('curl -fL -X POST http://localhost/install/step4.php --data "testpost=ok&action=set&selectlang=auto"')
-      machine.succeed('curl -fL -X POST http://localhost/install/step5.php --data "testpost=ok&action=set&login=root&pass=hunter2&pass_verif=hunter2&selectlang=auto"')
-      # Now, we have installed the machine, let's verify we still have the right configuration.
-      assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
-      # We do not want any redirect now as we have installed the machine.
-      machine.succeed('curl -f -X GET http://localhost')
-      # Test authentication to the webservice.
-      parser = TokenParser()
-      parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))
-      machine.succeed(f'curl -f -X POST http://localhost/index.php?mainmenu=login&token={csrf_token}&username=root&password=hunter2')
-    '';
-  }
-)
+    csrf_token = None
+    class TokenParser(HTMLParser):
+      def handle_starttag(self, tag, attrs):
+        attrs = dict(attrs) # attrs is an assoc list originally
+        if tag == 'input' and attrs.get('name') == 'token':
+            csrf_token = attrs.get('value')
+            print(f'[+] Caught CSRF token: {csrf_token}')
+      def handle_endtag(self, tag): pass
+      def handle_data(self, data): pass
+
+    machine.wait_for_unit("phpfpm-dolibarr.service")
+    machine.wait_for_unit("nginx.service")
+    machine.wait_for_open_port(80)
+    # Sanity checks on URLs.
+    # machine.succeed("curl -fL http://localhost/index.php")
+    # machine.succeed("curl -fL http://localhost/")
+    # Perform installation.
+    machine.succeed('curl -fL -X POST http://localhost/install/check.php -F selectlang=auto')
+    machine.succeed('curl -fL -X POST http://localhost/install/fileconf.php -F selectlang=auto')
+    # First time is to write the configuration file correctly.
+    machine.succeed('curl -fL -X POST http://localhost/install/step1.php -F "testpost=ok" -F "action=set" -F "selectlang=auto"')
+    # Now, we have a proper conf.php in $stateDir.
+    assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
+    machine.succeed('curl -fL -X POST http://localhost/install/step2.php --data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=auto"')
+    machine.succeed('curl -fL -X POST http://localhost/install/step4.php --data "testpost=ok&action=set&selectlang=auto"')
+    machine.succeed('curl -fL -X POST http://localhost/install/step5.php --data "testpost=ok&action=set&login=root&pass=hunter2&pass_verif=hunter2&selectlang=auto"')
+    # Now, we have installed the machine, let's verify we still have the right configuration.
+    assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
+    # We do not want any redirect now as we have installed the machine.
+    machine.succeed('curl -f -X GET http://localhost')
+    # Test authentication to the webservice.
+    parser = TokenParser()
+    parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))
+    machine.succeed(f'curl -f -X POST http://localhost/index.php?mainmenu=login&token={csrf_token}&username=root&password=hunter2')
+  '';
+}
diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix
index 2039fbcb2bcd..08fc4f262c08 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@@ -1,76 +1,74 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "icingaweb2";
-    meta = {
-      maintainers = pkgs.lib.teams.helsinki-systems.members;
-    };
+{ pkgs, ... }:
+{
+  name = "icingaweb2";
+  meta = {
+    maintainers = pkgs.lib.teams.helsinki-systems.members;
+  };
 
-    nodes = {
-      icingaweb2 =
-        { config, pkgs, ... }:
-        {
-          services.icingaweb2 = {
-            enable = true;
+  nodes = {
+    icingaweb2 =
+      { config, pkgs, ... }:
+      {
+        services.icingaweb2 = {
+          enable = true;
 
-            modulePackages = with pkgs.icingaweb2Modules; {
-              particles = theme-particles;
-              spring = theme-spring;
+          modulePackages = with pkgs.icingaweb2Modules; {
+            particles = theme-particles;
+            spring = theme-spring;
+          };
+
+          modules = {
+            doc.enable = true;
+            migrate.enable = true;
+            setup.enable = true;
+            test.enable = true;
+            translation.enable = true;
+          };
+
+          generalConfig = {
+            global = {
+              module_path = "${pkgs.icingaweb2}/modules";
             };
+          };
 
-            modules = {
-              doc.enable = true;
-              migrate.enable = true;
-              setup.enable = true;
-              test.enable = true;
-              translation.enable = true;
+          authentications = {
+            icingaweb = {
+              backend = "external";
             };
+          };
 
-            generalConfig = {
-              global = {
-                module_path = "${pkgs.icingaweb2}/modules";
-              };
+          groupBackends = {
+            icingaweb = {
+              backend = "db";
+              resource = "icingaweb_db";
             };
+          };
 
-            authentications = {
-              icingaweb = {
-                backend = "external";
-              };
+          resources = {
+            # Not used, so no DB server needed
+            icingaweb_db = {
+              type = "db";
+              db = "mysql";
+              host = "localhost";
+              username = "icingaweb2";
+              password = "icingaweb2";
+              dbname = "icingaweb2";
             };
+          };
 
-            groupBackends = {
-              icingaweb = {
-                backend = "db";
-                resource = "icingaweb_db";
-              };
-            };
-
-            resources = {
-              # Not used, so no DB server needed
-              icingaweb_db = {
-                type = "db";
-                db = "mysql";
-                host = "localhost";
-                username = "icingaweb2";
-                password = "icingaweb2";
-                dbname = "icingaweb2";
-              };
-            };
-
-            roles = {
-              Administrators = {
-                users = "*";
-                permissions = "*";
-              };
+          roles = {
+            Administrators = {
+              users = "*";
+              permissions = "*";
             };
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
-      icingaweb2.wait_for_unit("multi-user.target")
-      icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    icingaweb2.wait_for_unit("multi-user.target")
+    icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")
+  '';
+}
diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix
index eb04b2571941..1042eee2e0ab 100644
--- a/nixos/tests/nginx-auth.nix
+++ b/nixos/tests/nginx-auth.nix
@@ -1,54 +1,52 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "nginx-auth";
+{ pkgs, ... }:
+{
+  name = "nginx-auth";
 
-    nodes = {
-      webserver =
-        { pkgs, lib, ... }:
-        {
-          services.nginx =
-            let
-              root = pkgs.runCommand "testdir" { } ''
-                mkdir "$out"
-                echo hello world > "$out/index.html"
-              '';
-            in
-            {
-              enable = true;
+  nodes = {
+    webserver =
+      { pkgs, lib, ... }:
+      {
+        services.nginx =
+          let
+            root = pkgs.runCommand "testdir" { } ''
+              mkdir "$out"
+              echo hello world > "$out/index.html"
+            '';
+          in
+          {
+            enable = true;
 
-              virtualHosts.lockedroot = {
-                inherit root;
-                basicAuth.alice = "pwofa";
-              };
+            virtualHosts.lockedroot = {
+              inherit root;
+              basicAuth.alice = "pwofa";
+            };
 
-              virtualHosts.lockedsubdir = {
-                inherit root;
-                locations."/sublocation/" = {
-                  alias = "${root}/";
-                  basicAuth.bob = "pwofb";
-                };
+            virtualHosts.lockedsubdir = {
+              inherit root;
+              locations."/sublocation/" = {
+                alias = "${root}/";
+                basicAuth.bob = "pwofb";
               };
             };
-        };
-    };
+          };
+      };
+  };
 
-    testScript = ''
-      webserver.wait_for_unit("nginx")
-      webserver.wait_for_open_port(80)
+  testScript = ''
+    webserver.wait_for_unit("nginx")
+    webserver.wait_for_open_port(80)
 
-      webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")
-      webserver.succeed(
-          "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"
-      )
+    webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")
+    webserver.succeed(
+        "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"
+    )
 
-      webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")
-      webserver.fail(
-          "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"
-      )
-      webserver.succeed(
-          "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"
-      )
-    '';
-  }
-)
+    webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")
+    webserver.fail(
+        "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"
+    )
+    webserver.succeed(
+        "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"
+    )
+  '';
+}
diff --git a/nixos/tests/nginx-etag-compression.nix b/nixos/tests/nginx-etag-compression.nix
index b012c8b1c15c..a194c6fd26b4 100644
--- a/nixos/tests/nginx-etag-compression.nix
+++ b/nixos/tests/nginx-etag-compression.nix
@@ -1,4 +1,5 @@
-import ./make-test-python.nix {
+{ ... }:
+{
   name = "nginx-etag-compression";
 
   nodes.machine =
diff --git a/nixos/tests/nginx-etag.nix b/nixos/tests/nginx-etag.nix
index e1154466d796..88aaefd0e476 100644
--- a/nixos/tests/nginx-etag.nix
+++ b/nixos/tests/nginx-etag.nix
@@ -1,4 +1,5 @@
-import ./make-test-python.nix {
+{ ... }:
+{
   name = "nginx-etag";
 
   nodes = {
@@ -85,7 +86,7 @@ import ./make-test-python.nix {
   testScript =
     { nodes, ... }:
     let
-      inherit (nodes.server.config.system.build) toplevel;
+      inherit (nodes.server.system.build) toplevel;
       newSystem = "${toplevel}/specialisation/pass-checks";
     in
     ''
diff --git a/nixos/tests/nginx-globalredirect.nix b/nixos/tests/nginx-globalredirect.nix
index 42dda6ccaab5..ba1c0623593b 100644
--- a/nixos/tests/nginx-globalredirect.nix
+++ b/nixos/tests/nginx-globalredirect.nix
@@ -1,29 +1,27 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "nginx-globalredirect";
+{ ... }:
+{
+  name = "nginx-globalredirect";
 
-    nodes = {
-      webserver =
-        { pkgs, lib, ... }:
-        {
-          services.nginx = {
-            enable = true;
-            virtualHosts.localhost = {
-              globalRedirect = "other.example.com";
-              # Add an exception
-              locations."/noredirect".return = "200 'foo'";
-            };
+  nodes = {
+    webserver =
+      { pkgs, lib, ... }:
+      {
+        services.nginx = {
+          enable = true;
+          virtualHosts.localhost = {
+            globalRedirect = "other.example.com";
+            # Add an exception
+            locations."/noredirect".return = "200 'foo'";
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      webserver.wait_for_unit("nginx")
-      webserver.wait_for_open_port(80)
+  testScript = ''
+    webserver.wait_for_unit("nginx")
+    webserver.wait_for_open_port(80)
 
-      webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")
-      webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")
-    '';
-  }
-)
+    webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")
+    webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")
+  '';
+}
diff --git a/nixos/tests/nginx-mime.nix b/nixos/tests/nginx-mime.nix
index 157b9f13f142..9752fc01370b 100644
--- a/nixos/tests/nginx-mime.nix
+++ b/nixos/tests/nginx-mime.nix
@@ -1,26 +1,24 @@
-import ./make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "nginx-mime";
-    meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
+{ lib, pkgs, ... }:
+{
+  name = "nginx-mime";
+  meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-    nodes = {
-      server =
-        { pkgs, ... }:
-        {
-          services.nginx = {
-            enable = true;
-            virtualHosts."localhost" = { };
-          };
+  nodes = {
+    server =
+      { pkgs, ... }:
+      {
+        services.nginx = {
+          enable = true;
+          virtualHosts."localhost" = { };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      server.start()
-      server.wait_for_unit("nginx")
-      # Check optimal size of types_hash
-      server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")
-      server.shutdown()
-    '';
-  }
-)
+  testScript = ''
+    server.start()
+    server.wait_for_unit("nginx")
+    # Check optimal size of types_hash
+    server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")
+    server.shutdown()
+  '';
+}
diff --git a/nixos/tests/nginx-modsecurity.nix b/nixos/tests/nginx-modsecurity.nix
index 892180f1cf73..f6aa58b79859 100644
--- a/nixos/tests/nginx-modsecurity.nix
+++ b/nixos/tests/nginx-modsecurity.nix
@@ -1,51 +1,49 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "nginx-modsecurity";
+{ ... }:
+{
+  name = "nginx-modsecurity";
 
-    nodes.machine =
-      {
-        config,
-        lib,
-        pkgs,
-        ...
-      }:
-      {
-        services.nginx = {
-          enable = true;
-          additionalModules = [ pkgs.nginxModules.modsecurity ];
-          virtualHosts.localhost =
-            let
-              modsecurity_conf = pkgs.writeText "modsecurity.conf" ''
-                SecRuleEngine On
-                SecDefaultAction "phase:1,log,auditlog,deny,status:403"
-                SecDefaultAction "phase:2,log,auditlog,deny,status:403"
-                SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"
-                SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"
-              '';
-              testroot = pkgs.runCommand "testroot" { } ''
-                mkdir -p $out
-                echo "<html><body>Hello World!</body></html>" > $out/index.html
-                echo "s3cret" > $out/secret.html
-              '';
-            in
-            {
-              root = testroot;
-              extraConfig = ''
-                modsecurity on;
-                modsecurity_rules_file ${modsecurity_conf};
-              '';
-            };
-        };
+  nodes.machine =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    {
+      services.nginx = {
+        enable = true;
+        additionalModules = [ pkgs.nginxModules.modsecurity ];
+        virtualHosts.localhost =
+          let
+            modsecurity_conf = pkgs.writeText "modsecurity.conf" ''
+              SecRuleEngine On
+              SecDefaultAction "phase:1,log,auditlog,deny,status:403"
+              SecDefaultAction "phase:2,log,auditlog,deny,status:403"
+              SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"
+              SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"
+            '';
+            testroot = pkgs.runCommand "testroot" { } ''
+              mkdir -p $out
+              echo "<html><body>Hello World!</body></html>" > $out/index.html
+              echo "s3cret" > $out/secret.html
+            '';
+          in
+          {
+            root = testroot;
+            extraConfig = ''
+              modsecurity on;
+              modsecurity_rules_file ${modsecurity_conf};
+            '';
+          };
       };
-    testScript = ''
-      machine.wait_for_unit("nginx")
+    };
+  testScript = ''
+    machine.wait_for_unit("nginx")
 
-      response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")
-      assert "Hello World!" in response
+    response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")
+    assert "Hello World!" in response
 
-      machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")
-      machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")
-    '';
-  }
-)
+    machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")
+    machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")
+  '';
+}
diff --git a/nixos/tests/nginx-moreheaders.nix b/nixos/tests/nginx-moreheaders.nix
index 34bbb211dc9d..446f0ed179e2 100644
--- a/nixos/tests/nginx-moreheaders.nix
+++ b/nixos/tests/nginx-moreheaders.nix
@@ -1,4 +1,5 @@
-import ./make-test-python.nix {
+{ ... }:
+{
   name = "nginx-more-headers";
 
   nodes = {
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 8b1f921ec520..476824e3a9ec 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -4,134 +4,150 @@
 #   2. whether the ETag header is properly generated whenever we're serving
 #      files in Nix store paths
 #   3. nginx doesn't restart on configuration changes (only reloads)
-import ./make-test-python.nix ({ pkgs, ... }: {
+{ pkgs, ... }:
+{
   name = "nginx";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ mbbx6spp danbst ];
+    maintainers = [
+      mbbx6spp
+      danbst
+    ];
   };
 
   nodes = {
-    webserver = { pkgs, lib, ... }: {
-      services.nginx.enable = true;
-      services.nginx.commonHttpConfig = ''
-        log_format ceeformat '@cee: {"status":"$status",'
-          '"request_time":$request_time,'
-          '"upstream_response_time":$upstream_response_time,'
-          '"pipe":"$pipe","bytes_sent":$bytes_sent,'
-          '"connection":"$connection",'
-          '"remote_addr":"$remote_addr",'
-          '"host":"$host",'
-          '"timestamp":"$time_iso8601",'
-          '"request":"$request",'
-          '"http_referer":"$http_referer",'
-          '"upstream_addr":"$upstream_addr"}';
-      '';
-      services.nginx.virtualHosts."0.my.test" = {
-        extraConfig = ''
-          access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
-          location /favicon.ico { allow all; access_log off; log_not_found off; }
+    webserver =
+      { pkgs, lib, ... }:
+      {
+        services.nginx.enable = true;
+        services.nginx.commonHttpConfig = ''
+          log_format ceeformat '@cee: {"status":"$status",'
+            '"request_time":$request_time,'
+            '"upstream_response_time":$upstream_response_time,'
+            '"pipe":"$pipe","bytes_sent":$bytes_sent,'
+            '"connection":"$connection",'
+            '"remote_addr":"$remote_addr",'
+            '"host":"$host",'
+            '"timestamp":"$time_iso8601",'
+            '"request":"$request",'
+            '"http_referer":"$http_referer",'
+            '"upstream_addr":"$upstream_addr"}';
         '';
-      };
+        services.nginx.virtualHosts."0.my.test" = {
+          extraConfig = ''
+            access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
+            location /favicon.ico { allow all; access_log off; log_not_found off; }
+          '';
+        };
 
-      services.nginx.virtualHosts.localhost = {
-        root = pkgs.runCommand "testdir" {} ''
-          mkdir "$out"
-          echo hello world > "$out/index.html"
-        '';
-      };
-
-      services.nginx.enableReload = true;
-
-      specialisation.etagSystem.configuration = {
         services.nginx.virtualHosts.localhost = {
-          root = lib.mkForce (pkgs.runCommand "testdir2" {} ''
+          root = pkgs.runCommand "testdir" { } ''
             mkdir "$out"
-            echo content changed > "$out/index.html"
-          '');
+            echo hello world > "$out/index.html"
+          '';
+        };
+
+        services.nginx.enableReload = true;
+
+        specialisation.etagSystem.configuration = {
+          services.nginx.virtualHosts.localhost = {
+            root = lib.mkForce (
+              pkgs.runCommand "testdir2" { } ''
+                mkdir "$out"
+                echo content changed > "$out/index.html"
+              ''
+            );
+          };
+        };
+
+        specialisation.justReloadSystem.configuration = {
+          services.nginx.virtualHosts."1.my.test".listen = [
+            {
+              addr = "127.0.0.1";
+              port = 8080;
+            }
+          ];
+        };
+
+        specialisation.reloadRestartSystem.configuration = {
+          services.nginx.package = pkgs.nginxMainline;
+        };
+
+        specialisation.reloadWithErrorsSystem.configuration = {
+          services.nginx.package = pkgs.nginxMainline;
+          services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";
         };
       };
-
-      specialisation.justReloadSystem.configuration = {
-        services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }];
-      };
-
-      specialisation.reloadRestartSystem.configuration = {
-        services.nginx.package = pkgs.nginxMainline;
-      };
-
-      specialisation.reloadWithErrorsSystem.configuration = {
-        services.nginx.package = pkgs.nginxMainline;
-        services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";
-      };
-    };
   };
 
-  testScript = { nodes, ... }: let
-    etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";
-    justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";
-    reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";
-    reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";
-  in ''
-    url = "http://localhost/index.html"
+  testScript =
+    { nodes, ... }:
+    let
+      etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";
+      justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";
+      reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";
+      reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";
+    in
+    ''
+      url = "http://localhost/index.html"
 
 
-    def check_etag():
-        etag = webserver.succeed(
-            f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'
-        ).rstrip()
-        http_code = webserver.succeed(
-            f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"
-        )
-        assert http_code.split("\n")[-1] == "304"
+      def check_etag():
+          etag = webserver.succeed(
+              f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'
+          ).rstrip()
+          http_code = webserver.succeed(
+              f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"
+          )
+          assert http_code.split("\n")[-1] == "304"
 
-        return etag
+          return etag
 
 
-    def wait_for_nginx_on_port(port):
-        webserver.wait_for_unit("nginx")
-        webserver.wait_for_open_port(port)
+      def wait_for_nginx_on_port(port):
+          webserver.wait_for_unit("nginx")
+          webserver.wait_for_open_port(port)
 
 
-    # nginx can be ready before multi-user.target, in which case switching to
-    # a different configuration might not realize it needs to restart nginx.
-    webserver.wait_for_unit("multi-user.target")
+      # nginx can be ready before multi-user.target, in which case switching to
+      # a different configuration might not realize it needs to restart nginx.
+      webserver.wait_for_unit("multi-user.target")
 
-    wait_for_nginx_on_port(80)
+      wait_for_nginx_on_port(80)
 
-    with subtest("check ETag if serving Nix store paths"):
-        old_etag = check_etag()
-        webserver.succeed(
-            "${etagSystem}/bin/switch-to-configuration test >&2"
-        )
-        wait_for_nginx_on_port(80)
-        new_etag = check_etag()
-        assert old_etag != new_etag
+      with subtest("check ETag if serving Nix store paths"):
+          old_etag = check_etag()
+          webserver.succeed(
+              "${etagSystem}/bin/switch-to-configuration test >&2"
+          )
+          wait_for_nginx_on_port(80)
+          new_etag = check_etag()
+          assert old_etag != new_etag
 
-    with subtest("config is reloaded on nixos-rebuild switch"):
-        webserver.succeed(
-            "${justReloadSystem}/bin/switch-to-configuration test >&2"
-        )
-        wait_for_nginx_on_port(8080)
-        webserver.fail("journalctl -u nginx | grep -q -i stopped")
-        webserver.succeed("journalctl -u nginx | grep -q -i reloaded")
+      with subtest("config is reloaded on nixos-rebuild switch"):
+          webserver.succeed(
+              "${justReloadSystem}/bin/switch-to-configuration test >&2"
+          )
+          wait_for_nginx_on_port(8080)
+          webserver.fail("journalctl -u nginx | grep -q -i stopped")
+          webserver.succeed("journalctl -u nginx | grep -q -i reloaded")
 
-    with subtest("restart when nginx package changes"):
-        webserver.succeed(
-            "${reloadRestartSystem}/bin/switch-to-configuration test >&2"
-        )
-        wait_for_nginx_on_port(80)
-        webserver.succeed("journalctl -u nginx | grep -q -i stopped")
+      with subtest("restart when nginx package changes"):
+          webserver.succeed(
+              "${reloadRestartSystem}/bin/switch-to-configuration test >&2"
+          )
+          wait_for_nginx_on_port(80)
+          webserver.succeed("journalctl -u nginx | grep -q -i stopped")
 
-    with subtest("nixos-rebuild --switch should fail when there are configuration errors"):
-        webserver.fail(
-            "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
-        )
-        webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")
-        webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")
-        # just to make sure operation is idempotent. During development I had a situation
-        # when first time it shows error, but stops showing it on subsequent rebuilds
-        webserver.fail(
-            "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
-        )
-  '';
-})
+      with subtest("nixos-rebuild --switch should fail when there are configuration errors"):
+          webserver.fail(
+              "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
+          )
+          webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")
+          webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")
+          # just to make sure operation is idempotent. During development I had a situation
+          # when first time it shows error, but stops showing it on subsequent rebuilds
+          webserver.fail(
+              "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"
+          )
+    '';
+}
diff --git a/nixos/tests/web-apps/monica.nix b/nixos/tests/web-apps/monica.nix
index bb770828d5f7..9b1995d393d3 100644
--- a/nixos/tests/web-apps/monica.nix
+++ b/nixos/tests/web-apps/monica.nix
@@ -1,37 +1,35 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
-  let
-    cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } ''
-      openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500
-      mkdir -p $out
-      cp key.pem cert.pem $out
-    '';
-  in
-  {
-    name = "monica";
+{ pkgs, ... }:
+let
+  cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } ''
+    openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500
+    mkdir -p $out
+    cp key.pem cert.pem $out
+  '';
+in
+{
+  name = "monica";
 
-    nodes = {
-      machine =
-        { pkgs, ... }:
-        {
-          services.monica = {
-            enable = true;
-            hostname = "localhost";
-            appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}";
-            nginx = {
-              forceSSL = true;
-              sslCertificate = "${cert}/cert.pem";
-              sslCertificateKey = "${cert}/key.pem";
-            };
+  nodes = {
+    machine =
+      { pkgs, ... }:
+      {
+        services.monica = {
+          enable = true;
+          hostname = "localhost";
+          appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}";
+          nginx = {
+            forceSSL = true;
+            sslCertificate = "${cert}/cert.pem";
+            sslCertificateKey = "${cert}/key.pem";
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("monica-setup.service")
-      machine.wait_for_open_port(443)
-      machine.succeed("curl -k --fail https://localhost", timeout=10)
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("monica-setup.service")
+    machine.wait_for_open_port(443)
+    machine.succeed("curl -k --fail https://localhost", timeout=10)
+  '';
+}
diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix
index fcf0224639da..ae7503ad0ffa 100644
--- a/nixos/tests/web-servers/unit-php.nix
+++ b/nixos/tests/web-servers/unit-php.nix
@@ -1,62 +1,60 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
-  let
-    testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";
+{ pkgs, ... }:
+let
+  testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";
 
-  in
-  {
-    name = "unit-php-test";
-    meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
+in
+{
+  name = "unit-php-test";
+  meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-    nodes.machine =
-      {
-        config,
-        lib,
-        pkgs,
-        ...
-      }:
-      {
-        services.unit = {
-          enable = true;
-          config = pkgs.lib.strings.toJSON {
-            listeners."*:9081".application = "php_81";
-            applications.php_81 = {
-              type = "php 8.1";
-              processes = 1;
-              user = "testuser";
-              group = "testgroup";
-              root = "${testdir}/www";
-              index = "info.php";
-              options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";
-            };
-          };
-        };
-        users = {
-          users.testuser = {
-            isSystemUser = true;
-            uid = 1080;
+  nodes.machine =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    {
+      services.unit = {
+        enable = true;
+        config = pkgs.lib.strings.toJSON {
+          listeners."*:9081".application = "php_81";
+          applications.php_81 = {
+            type = "php 8.1";
+            processes = 1;
+            user = "testuser";
             group = "testgroup";
-          };
-          groups.testgroup = {
-            gid = 1080;
+            root = "${testdir}/www";
+            index = "info.php";
+            options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";
           };
         };
       };
-    testScript = ''
-      machine.start()
+      users = {
+        users.testuser = {
+          isSystemUser = true;
+          uid = 1080;
+          group = "testgroup";
+        };
+        groups.testgroup = {
+          gid = 1080;
+        };
+      };
+    };
+  testScript = ''
+    machine.start()
 
-      machine.wait_for_unit("unit.service")
-      machine.wait_for_open_port(9081)
+    machine.wait_for_unit("unit.service")
+    machine.wait_for_open_port(9081)
 
-      # Check so we get an evaluated PHP back
-      response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/")
-      assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected"
+    # Check so we get an evaluated PHP back
+    response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/")
+    assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected"
 
-      # Check so we have database and some other extensions loaded
-      for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
-          assert ext in response, f"Missing {ext} extension"
+    # Check so we have database and some other extensions loaded
+    for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
+        assert ext in response, f"Missing {ext} extension"
 
-      machine.shutdown()
-    '';
-  }
-)
+    machine.shutdown()
+  '';
+}
diff --git a/nixos/tests/wiki-js.nix b/nixos/tests/wiki-js.nix
index 9d5819ceff59..947f3a9afe9d 100644
--- a/nixos/tests/wiki-js.nix
+++ b/nixos/tests/wiki-js.nix
@@ -1,171 +1,169 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "wiki-js";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ ma27 ];
+{ pkgs, ... }:
+{
+  name = "wiki-js";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ ma27 ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      virtualisation.memorySize = 2047;
+      services.wiki-js = {
+        enable = true;
+        settings.db.host = "/run/postgresql";
+        settings.db.user = "wiki-js";
+        settings.db.db = "wiki-js";
+        settings.logLevel = "debug";
+      };
+      services.postgresql = {
+        enable = true;
+        ensureDatabases = [ "wiki-js" ];
+        ensureUsers = [
+          {
+            name = "wiki-js";
+            ensureDBOwnership = true;
+          }
+        ];
+      };
+      systemd.services.wiki-js = {
+        requires = [ "postgresql.service" ];
+        after = [ "postgresql.service" ];
+      };
+      environment.systemPackages = with pkgs; [ jq ];
     };
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        virtualisation.memorySize = 2047;
-        services.wiki-js = {
-          enable = true;
-          settings.db.host = "/run/postgresql";
-          settings.db.user = "wiki-js";
-          settings.db.db = "wiki-js";
-          settings.logLevel = "debug";
-        };
-        services.postgresql = {
-          enable = true;
-          ensureDatabases = [ "wiki-js" ];
-          ensureUsers = [
-            {
-              name = "wiki-js";
-              ensureDBOwnership = true;
-            }
-          ];
-        };
-        systemd.services.wiki-js = {
-          requires = [ "postgresql.service" ];
-          after = [ "postgresql.service" ];
-        };
-        environment.systemPackages = with pkgs; [ jq ];
-      };
-
-    testScript =
-      let
-        payloads.finalize = pkgs.writeText "finalize.json" (
-          builtins.toJSON {
-            adminEmail = "webmaster@example.com";
-            adminPassword = "notapassword";
-            adminPasswordConfirm = "notapassword";
-            siteUrl = "http://localhost:3000";
-            telemetry = false;
+  testScript =
+    let
+      payloads.finalize = pkgs.writeText "finalize.json" (
+        builtins.toJSON {
+          adminEmail = "webmaster@example.com";
+          adminPassword = "notapassword";
+          adminPasswordConfirm = "notapassword";
+          siteUrl = "http://localhost:3000";
+          telemetry = false;
+        }
+      );
+      payloads.login = pkgs.writeText "login.json" (
+        builtins.toJSON [
+          {
+            operationName = null;
+            extensions = { };
+            query = ''
+              mutation ($username: String!, $password: String!, $strategy: String!) {
+                authentication {
+                  login(username: $username, password: $password, strategy: $strategy) {
+                    responseResult {
+                      succeeded
+                      errorCode
+                      slug
+                      message
+                      __typename
+                    }
+                    jwt
+                    mustChangePwd
+                    mustProvideTFA
+                    mustSetupTFA
+                    continuationToken
+                    redirect
+                    tfaQRImage
+                    __typename
+                  }
+                  __typename
+                }
+              }
+            '';
+            variables = {
+              password = "notapassword";
+              strategy = "local";
+              username = "webmaster@example.com";
+            };
           }
-        );
-        payloads.login = pkgs.writeText "login.json" (
-          builtins.toJSON [
-            {
-              operationName = null;
-              extensions = { };
-              query = ''
-                mutation ($username: String!, $password: String!, $strategy: String!) {
-                  authentication {
-                    login(username: $username, password: $password, strategy: $strategy) {
-                      responseResult {
-                        succeeded
-                        errorCode
-                        slug
-                        message
-                        __typename
-                      }
-                      jwt
-                      mustChangePwd
-                      mustProvideTFA
-                      mustSetupTFA
-                      continuationToken
-                      redirect
-                      tfaQRImage
+        ]
+      );
+      payloads.content = pkgs.writeText "content.json" (
+        builtins.toJSON [
+          {
+            extensions = { };
+            operationName = null;
+            query = ''
+              mutation ($content: String!, $description: String!, $editor: String!, $isPrivate: Boolean!, $isPublished: Boolean!, $locale: String!, $path: String!, $publishEndDate: Date, $publishStartDate: Date, $scriptCss: String, $scriptJs: String, $tags: [String]!, $title: String!) {
+                pages {
+                  create(content: $content, description: $description, editor: $editor, isPrivate: $isPrivate, isPublished: $isPublished, locale: $locale, path: $path, publishEndDate: $publishEndDate, publishStartDate: $publishStartDate, scriptCss: $scriptCss, scriptJs: $scriptJs, tags: $tags, title: $title) {
+                    responseResult {
+                      succeeded
+                      errorCode
+                      slug
+                      message
+                      __typename
+                    }
+                    page {
+                      id
+                      updatedAt
                       __typename
                     }
                     __typename
                   }
+                  __typename
                 }
-              '';
-              variables = {
-                password = "notapassword";
-                strategy = "local";
-                username = "webmaster@example.com";
-              };
-            }
-          ]
-        );
-        payloads.content = pkgs.writeText "content.json" (
-          builtins.toJSON [
-            {
-              extensions = { };
-              operationName = null;
-              query = ''
-                mutation ($content: String!, $description: String!, $editor: String!, $isPrivate: Boolean!, $isPublished: Boolean!, $locale: String!, $path: String!, $publishEndDate: Date, $publishStartDate: Date, $scriptCss: String, $scriptJs: String, $tags: [String]!, $title: String!) {
-                  pages {
-                    create(content: $content, description: $description, editor: $editor, isPrivate: $isPrivate, isPublished: $isPublished, locale: $locale, path: $path, publishEndDate: $publishEndDate, publishStartDate: $publishStartDate, scriptCss: $scriptCss, scriptJs: $scriptJs, tags: $tags, title: $title) {
-                      responseResult {
-                        succeeded
-                        errorCode
-                        slug
-                        message
-                        __typename
-                      }
-                      page {
-                        id
-                        updatedAt
-                        __typename
-                      }
-                      __typename
-                    }
-                    __typename
-                  }
-                }
-              '';
-              variables = {
-                content = "# Header\n\nHello world!";
-                description = "";
-                editor = "markdown";
-                isPrivate = false;
-                isPublished = true;
-                locale = "en";
-                path = "home";
-                publishEndDate = "";
-                publishStartDate = "";
-                scriptCss = "";
-                scriptJs = "";
-                tags = [ ];
-                title = "Hello world";
-              };
-            }
-          ]
-        );
-      in
-      ''
-        machine.start()
-        machine.wait_for_unit("multi-user.target")
-        machine.wait_for_open_port(3000)
+              }
+            '';
+            variables = {
+              content = "# Header\n\nHello world!";
+              description = "";
+              editor = "markdown";
+              isPrivate = false;
+              isPublished = true;
+              locale = "en";
+              path = "home";
+              publishEndDate = "";
+              publishStartDate = "";
+              scriptCss = "";
+              scriptJs = "";
+              tags = [ ];
+              title = "Hello world";
+            };
+          }
+        ]
+      );
+    in
+    ''
+      machine.start()
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_open_port(3000)
 
-        machine.succeed("curl -sSf localhost:3000")
+      machine.succeed("curl -sSf localhost:3000")
 
-        with subtest("Setup"):
-            result = machine.succeed(
-                "curl -sSf localhost:3000/finalize -X POST -d "
-                + "@${payloads.finalize} -H 'Content-Type: application/json' "
-                + "| jq .ok | xargs echo"
-            )
-            assert result.strip() == "true", f"Expected true, got {result}"
+      with subtest("Setup"):
+          result = machine.succeed(
+              "curl -sSf localhost:3000/finalize -X POST -d "
+              + "@${payloads.finalize} -H 'Content-Type: application/json' "
+              + "| jq .ok | xargs echo"
+          )
+          assert result.strip() == "true", f"Expected true, got {result}"
 
-            # During the setup the service gets restarted, so we use this
-            # to check if the setup is done.
-            machine.wait_until_fails("curl -sSf localhost:3000")
-            machine.wait_until_succeeds("curl -sSf localhost:3000")
+          # During the setup the service gets restarted, so we use this
+          # to check if the setup is done.
+          machine.wait_until_fails("curl -sSf localhost:3000")
+          machine.wait_until_succeeds("curl -sSf localhost:3000")
 
-        with subtest("Base functionality"):
-            auth = machine.succeed(
-                "curl -sSf localhost:3000/graphql -X POST "
-                + "-d @${payloads.login} -H 'Content-Type: application/json' "
-                + "| jq '.[0].data.authentication.login.jwt' | xargs echo"
-            ).strip()
+      with subtest("Base functionality"):
+          auth = machine.succeed(
+              "curl -sSf localhost:3000/graphql -X POST "
+              + "-d @${payloads.login} -H 'Content-Type: application/json' "
+              + "| jq '.[0].data.authentication.login.jwt' | xargs echo"
+          ).strip()
 
-            assert auth
+          assert auth
 
-            create = machine.succeed(
-                "curl -sSf localhost:3000/graphql -X POST "
-                + "-d @${payloads.content} -H 'Content-Type: application/json' "
-                + f"-H 'Authorization: Bearer {auth}' "
-                + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"
-            )
-            assert create.strip() == "true", f"Expected true, got {create}"
+          create = machine.succeed(
+              "curl -sSf localhost:3000/graphql -X POST "
+              + "-d @${payloads.content} -H 'Content-Type: application/json' "
+              + f"-H 'Authorization: Bearer {auth}' "
+              + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"
+          )
+          assert create.strip() == "true", f"Expected true, got {create}"
 
-        machine.shutdown()
-      '';
-  }
-)
+      machine.shutdown()
+    '';
+}
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index 4961a6027565..c7988c111ac4 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -1,123 +1,121 @@
-import ./make-test-python.nix (
-  { lib, pkgs, ... }:
+{ lib, config, ... }:
 
-  rec {
-    name = "wordpress";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        flokli
-        grahamc # under duress!
-        mmilata
+rec {
+  name = "wordpress";
+  meta = with lib.maintainers; {
+    maintainers = [
+      flokli
+      grahamc # under duress!
+      mmilata
+    ];
+  };
+
+  nodes =
+    lib.foldl
+      (
+        a: version:
+        let
+          package = config.node.pkgs."wordpress_${version}";
+        in
+        a
+        // {
+          "wp${version}_httpd" = _: {
+            services.httpd.adminAddr = "webmaster@site.local";
+            services.httpd.logPerVirtualHost = true;
+
+            services.wordpress.webserver = "httpd";
+            services.wordpress.sites = {
+              "site1.local" = {
+                database.tablePrefix = "site1_";
+                inherit package;
+              };
+              "site2.local" = {
+                database.tablePrefix = "site2_";
+                inherit package;
+              };
+            };
+
+            networking.firewall.allowedTCPPorts = [ 80 ];
+            networking.hosts."127.0.0.1" = [
+              "site1.local"
+              "site2.local"
+            ];
+          };
+
+          "wp${version}_nginx" = _: {
+            services.wordpress.webserver = "nginx";
+            services.wordpress.sites = {
+              "site1.local" = {
+                database.tablePrefix = "site1_";
+                inherit package;
+              };
+              "site2.local" = {
+                database.tablePrefix = "site2_";
+                inherit package;
+              };
+            };
+
+            networking.firewall.allowedTCPPorts = [ 80 ];
+            networking.hosts."127.0.0.1" = [
+              "site1.local"
+              "site2.local"
+            ];
+          };
+
+          "wp${version}_caddy" = _: {
+            services.wordpress.webserver = "caddy";
+            services.wordpress.sites = {
+              "site1.local" = {
+                database.tablePrefix = "site1_";
+                inherit package;
+              };
+              "site2.local" = {
+                database.tablePrefix = "site2_";
+                inherit package;
+              };
+            };
+
+            networking.firewall.allowedTCPPorts = [ 80 ];
+            networking.hosts."127.0.0.1" = [
+              "site1.local"
+              "site2.local"
+            ];
+          };
+        }
+      )
+      { }
+      [
+        "6_7"
       ];
-    };
 
-    nodes =
-      lib.foldl
-        (
-          a: version:
-          let
-            package = pkgs."wordpress_${version}";
-          in
-          a
-          // {
-            "wp${version}_httpd" = _: {
-              services.httpd.adminAddr = "webmaster@site.local";
-              services.httpd.logPerVirtualHost = true;
+  testScript = ''
+    import re
 
-              services.wordpress.webserver = "httpd";
-              services.wordpress.sites = {
-                "site1.local" = {
-                  database.tablePrefix = "site1_";
-                  inherit package;
-                };
-                "site2.local" = {
-                  database.tablePrefix = "site2_";
-                  inherit package;
-                };
-              };
+    start_all()
 
-              networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.hosts."127.0.0.1" = [
-                "site1.local"
-                "site2.local"
-              ];
-            };
+    ${lib.concatStrings (
+      lib.mapAttrsToList (name: value: ''
+        ${name}.wait_for_unit("${(value null).services.wordpress.webserver}")
+      '') nodes
+    )}
 
-            "wp${version}_nginx" = _: {
-              services.wordpress.webserver = "nginx";
-              services.wordpress.sites = {
-                "site1.local" = {
-                  database.tablePrefix = "site1_";
-                  inherit package;
-                };
-                "site2.local" = {
-                  database.tablePrefix = "site2_";
-                  inherit package;
-                };
-              };
+    site_names = ["site1.local", "site2.local"]
 
-              networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.hosts."127.0.0.1" = [
-                "site1.local"
-                "site2.local"
-              ];
-            };
+    for machine in (${lib.concatStringsSep ", " (builtins.attrNames nodes)}):
+        for site_name in site_names:
+            machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")
 
-            "wp${version}_caddy" = _: {
-              services.wordpress.webserver = "caddy";
-              services.wordpress.sites = {
-                "site1.local" = {
-                  database.tablePrefix = "site1_";
-                  inherit package;
-                };
-                "site2.local" = {
-                  database.tablePrefix = "site2_";
-                  inherit package;
-                };
-              };
+            with subtest("website returns welcome screen"):
+                assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")
 
-              networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.hosts."127.0.0.1" = [
-                "site1.local"
-                "site2.local"
-              ];
-            };
-          }
-        )
-        { }
-        [
-          "6_7"
-        ];
+            with subtest("wordpress-init went through"):
+                info = machine.get_unit_info(f"wordpress-init-{site_name}")
+                assert info["Result"] == "success"
 
-    testScript = ''
-      import re
-
-      start_all()
-
-      ${lib.concatStrings (
-        lib.mapAttrsToList (name: value: ''
-          ${name}.wait_for_unit("${(value null).services.wordpress.webserver}")
-        '') nodes
-      )}
-
-      site_names = ["site1.local", "site2.local"]
-
-      for machine in (${lib.concatStringsSep ", " (builtins.attrNames nodes)}):
-          for site_name in site_names:
-              machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")
-
-              with subtest("website returns welcome screen"):
-                  assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")
-
-              with subtest("wordpress-init went through"):
-                  info = machine.get_unit_info(f"wordpress-init-{site_name}")
-                  assert info["Result"] == "success"
-
-              with subtest("secret keys are set"):
-                  pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
-                  assert pattern.search(
-                      machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
-                  )
-    '';
-  }
-)
+            with subtest("secret keys are set"):
+                pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
+                assert pattern.search(
+                    machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
+                )
+  '';
+}
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index a42f7884ad4e..57848bcb2b69 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "schismtracker";
-  version = "20250208";
+  version = "20250313";
 
   src = fetchFromGitHub {
     owner = "schismtracker";
     repo = "schismtracker";
     tag = version;
-    hash = "sha256-nL2zvlu/xPW4CmwqWP2V9KOPdUJ/vCBtlG7rKDiwtgg=";
+    hash = "sha256-AiQ5+HTosVOR+Z5+uT6COMLvkGS3zvXtkCkg16MhVf4=";
   };
 
   # If we let it try to get the version from git, it will fail and fall back
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5e37857ce43a..60c501232089 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -70,12 +70,12 @@ final: prev:
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "df550ff3f9f2d028160946d674db08dad432fdd3";
-      sha256 = "1ak9js6xphrwlp6rpkn0p91l5j70r9b81kfvw02mkwkm9r66drgl";
+      rev = "cd82b6b9c4cfb254218f5782cc3339e05cbb9989";
+      sha256 = "1v9cvhb2gh2b35fmb8bmamjq3bwghrhx59qbx0i6kdwki12sp5l5";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -200,12 +200,12 @@ final: prev:
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-03-24";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "570b2f62b1c3d2ace893d203f970c6da3e619c71";
-      sha256 = "0n2ak7pl7xplp9b20yfba2c3mc0cgnx3w2y3hq37i4km84vsbpja";
+      rev = "16484c86c92a7e4b46d3a12da97979d7fba50886";
+      sha256 = "0k4wjylvwyhckx74fi7xkvnq4wz7qvs2wx9ia5j3brg06njaphck";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -369,12 +369,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "d307d291f38678d064cb987112926df6d9134de3";
-      sha256 = "03blmpkrzgfsv4gpdlmhnan4f4jnxmzmj5gkl3hgqcabfbhdmazp";
+      rev = "e659e0c6ca06727ed898aaaeea3850f528898684";
+      sha256 = "0kz3ay9zbpcwc1pkh251qyxb1zkl8v06nb7ifisq2lxllyp4k6ws";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -722,12 +722,12 @@ final: prev:
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2025-03-18";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "7fcc0548b03e1c7d7d269af76ea3e27b9a59f8bd";
-      sha256 = "00is4hbxxk9wsd3z33gs5f2n1ll84l3myxs4vljx4n5ah6g9rc5m";
+      rev = "add538213fe0d326f541fd58fd113b9f64a83378";
+      sha256 = "11m1dc972azfijqq8xljkzi4rfy57lkm3fax1a4z14y681pkb33m";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -878,12 +878,12 @@ final: prev:
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      rev = "5d6b00072ef226507d68ef88857aa522b126f7a8";
-      sha256 = "1i36lvcwl0sznf4cpk0w10szbym5mgcxnn1hynymkz5q86rk6a1d";
+      rev = "1cb27c53d1fbe0852f1f368b706631ef4e007630";
+      sha256 = "1y8a4dy36l5z0lifbn7bsl1phzpra8rkdqfrb3z09nfl7l1dw3ql";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
     meta.hydraPlatforms = [ ];
@@ -891,12 +891,12 @@ final: prev:
 
   astrolsp = buildVimPlugin {
     pname = "astrolsp";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrolsp";
-      rev = "0ab285f47b9f667402f08eb471e3e98f9a50b5ee";
-      sha256 = "14ajg0kxf0af1s9rasvdd6pldr47zcbm68q08rfkx4h70jzqdgz0";
+      rev = "bb0051597474971b93e1cde2fd960dda978c2378";
+      sha256 = "04v1vg0zyp3bjyikxm4qw6agylw4hjv2jg77vspnijvikb2qk6zq";
     };
     meta.homepage = "https://github.com/AstroNvim/astrolsp/";
     meta.hydraPlatforms = [ ];
@@ -1555,12 +1555,12 @@ final: prev:
 
   blink-copilot = buildVimPlugin {
     pname = "blink-copilot";
-    version = "2025-03-15";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "fang2hou";
       repo = "blink-copilot";
-      rev = "100691cd842ff0bd957683424ad0e829f71ce262";
-      sha256 = "07bmzhx053yp2ygv07d1csbdcwqzkifcd8as54fwxcmymmr7j4wf";
+      rev = "991b2ebf1c27fa2a6e073b5bc21bdfdec517c0a4";
+      sha256 = "11d2v43fiqq8x7kxwnw8qdsay1fb96ql78dydhgl7x3s371s8jh0";
     };
     meta.homepage = "https://github.com/fang2hou/blink-copilot/";
     meta.hydraPlatforms = [ ];
@@ -1594,12 +1594,12 @@ final: prev:
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-03-22";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "af61f99945e15b195fbce017230cedb0497ded4d";
-      sha256 = "01n8vyp600smxwyj123f36xbbqgj7v7gvhqp7i0a5494y8vfg212";
+      rev = "d4af981745ea67b2c29bcd25f9843dbeedc580ed";
+      sha256 = "1xjhpp9118bgpp2x3pxv0llngkm69fzxhdqp92civ19s5pxb5h5y";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2244,12 +2244,12 @@ final: prev:
 
   cmp-dictionary = buildVimPlugin {
     pname = "cmp-dictionary";
-    version = "2024-07-24";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "uga-rosa";
       repo = "cmp-dictionary";
-      rev = "c5ffc6afb7f3a68da981ed9c56f3d9d8f3d907b7";
-      sha256 = "1shxx5h0y7rjh6bam1cckrrrqjhb2mwr85pja39p9s4zpvj0r0am";
+      rev = "fecc3ef2435c2be35818f8fcac4a6c5655f3a8f0";
+      sha256 = "1qv9dj9kskcw5kw4ly2awbkqpz6hbvkjzg6kzidinvhglnrqaqd6";
     };
     meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
     meta.hydraPlatforms = [ ];
@@ -2387,12 +2387,12 @@ final: prev:
 
   cmp-nixpkgs-maintainers = buildVimPlugin {
     pname = "cmp-nixpkgs-maintainers";
-    version = "2024-12-03";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "GaetanLepage";
       repo = "cmp-nixpkgs-maintainers";
-      rev = "4179ab637b7134671f3d0119377e8d5738d113dc";
-      sha256 = "0dmqq8wzvb4v7z6zwqv960h6xjl70pj59cfx0xdwmrxl28n5vw8m";
+      rev = "5dc3b3b3b6115bdb5d56089e17add4d41783a4a8";
+      sha256 = "1kv88syl9aq66jp5gdmsj1vnab414pmzxmmgbgclsplc08hxxbn5";
     };
     meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
     meta.hydraPlatforms = [ ];
@@ -2816,12 +2816,12 @@ final: prev:
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-03-21";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "da20bea23b6226e5859a06137b841c6853599f22";
-      sha256 = "0gnr6lgpsqxjxy60sx640lpc59mvbvk6f19xwnl8cych0ik6dfrv";
+      rev = "4f1199b195b4baabc1cede645c138c14336be604";
+      sha256 = "0fyzlr1mm08lfr5lmnnhgd6yh178gb80cv188khhggywrva6944f";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2868,12 +2868,12 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "f4eed65f7890023104f7c1979be31baadbfb901f";
-      sha256 = "0snzi9qhjlsr23x7ynh6mw42yzwwb1b787ii5h3a2sh92p3s5gjy";
+      rev = "51fe5a782dbbd5cad8189420cb8d38fd7c245684";
+      sha256 = "09vjvbf5rxmj2fax0ddcinbvx6mhjdy58fw9d1nf8ll7x8dj5j2s";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2946,12 +2946,12 @@ final: prev:
 
   colorful-menu-nvim = buildVimPlugin {
     pname = "colorful-menu.nvim";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "xzbdmw";
       repo = "colorful-menu.nvim";
-      rev = "91621b22c334812e5bbf0c8f82fc03869279acfe";
-      sha256 = "0i1y1kd1bknj9p6n1yhx8wfrxapg7gaii66v2sgdf8jkggcqjzwf";
+      rev = "271e3a4b564664421e991053aab9d047a1725738";
+      sha256 = "1013z3bfqw9vcng4p4scvx32lnvxgylbrrmc97v6klcvmjw8cis0";
     };
     meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3220,12 +3220,12 @@ final: prev:
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-03-27";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "0e3585bb9d482336aeb43811e9d7cd09e33edada";
-      sha256 = "0gc5yvyv20v5iy51kvmc3ws6qswc3v3q3zaw840ag0p2c0q887ij";
+      rev = "f7e800b83ccbe512f45725aac6639ba036086474";
+      sha256 = "09nb5vx3qndhw63qibns1gihx5xnhk3aifdf8vhglxa8125knxg7";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3324,12 +3324,12 @@ final: prev:
 
   cornelis = buildVimPlugin {
     pname = "cornelis";
-    version = "2025-02-20";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "agda";
       repo = "cornelis";
-      rev = "dca4bda97d6718e76af3f203d688fe6b4a2e9927";
-      sha256 = "11i03s21c2rsqwzlchsv1f7ci00zzz8gfy52ly4m9kjd8da0apwr";
+      rev = "11731389558ed5ad0d3e9d60148f40c4c1022211";
+      sha256 = "0i3x47112nnlrb35grz7z370ksjbz3824i4ag2qky6xj00mpgcwq";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
     meta.hydraPlatforms = [ ];
@@ -3389,12 +3389,12 @@ final: prev:
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "ed94128fc113d992dc9b78100cb87e41cf4143c0";
-      sha256 = "0b2f2n9cnmw7m5a2wgbn1j0mphqfk3mk4k852qj2bj6izal2ddkh";
+      rev = "8420ee6a9fe0bfc9a37920fd572b0ae5a2348967";
+      sha256 = "19k5iayhji76q031mzm1vw0n2irh2417mn0gdhf4cmadkrj4ygmg";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3506,12 +3506,12 @@ final: prev:
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2025-03-18";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "339a7b1293568405847b3627247da82a6030a852";
-      sha256 = "1rm1fay8r36kh32qmbsmhp1vjs9xynyqi43zn9aak6wzzpvcabmp";
+      rev = "f36d7991b6373ebda9cfca20030aa1fca7328ea8";
+      sha256 = "051a53i6dcxb5lff4schna36rd2di7rpnlhw31ki2kdk37rw8cqy";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3519,12 +3519,12 @@ final: prev:
 
   darkearth-nvim = buildVimPlugin {
     pname = "darkearth-nvim";
-    version = "2024-11-27";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "ptdewey";
       repo = "darkearth-nvim";
-      rev = "a8382f396ebd9dfafcf0524dbaecd18e4168e6ae";
-      sha256 = "02q2hincblghm8abisinisnw7499dhm07bhxwxin5lhm3vjmrxm2";
+      rev = "e5e14fa028512809a4efd2979e07b4225a7c242c";
+      sha256 = "1h8jnx7929nyybq5sb0z6galg60xcgj0rr73n14qgbf35v8q3zpj";
     };
     meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
     meta.hydraPlatforms = [ ];
@@ -4132,12 +4132,12 @@ final: prev:
 
   diagram-nvim = buildVimPlugin {
     pname = "diagram.nvim";
-    version = "2025-01-17";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "3rd";
       repo = "diagram.nvim";
-      rev = "554d4f407d68662e5f5e41882241302077682225";
-      sha256 = "0n4ygwk93wcr8n3dhax77gnf5136bcsyk2wi9f97grfylbhy3r9p";
+      rev = "84fe677aa940605ef248f36c0ea23561690c95eb";
+      sha256 = "1izimzfvydhhwh71yj9sj309h8nvkxvh8pawmnjdw1fw6avjlfl3";
     };
     meta.homepage = "https://github.com/3rd/diagram.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4145,12 +4145,12 @@ final: prev:
 
   dial-nvim = buildVimPlugin {
     pname = "dial.nvim";
-    version = "2025-03-19";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "monaqa";
       repo = "dial.nvim";
-      rev = "1fc4475c66b794aad3dde39414f73b2e2b26230e";
-      sha256 = "0f8y11l7pxp07vdjll1vsmzi1phj05q1dwlxbsx3z25sf4hixq9h";
+      rev = "2c7e2750372918f072a20f3cf754d845e143d7c9";
+      sha256 = "1j7a2pf3f3n3kpdpsys3n3bzj8pp1nig1n1s1c4xpx8xyc0wkgf3";
     };
     meta.homepage = "https://github.com/monaqa/dial.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4262,12 +4262,12 @@ final: prev:
 
   dracula-vim = buildVimPlugin {
     pname = "dracula-vim";
-    version = "2024-07-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "65f4225e0526516a67d56c8ac09925a209138e53";
-      sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8";
+      rev = "d4b0823100c702af127cba8dd5595a8f599041ec";
+      sha256 = "1nzybqmsgjaxad057x3m6fcfi8q5nf4glp05ilhk5abq768mv31s";
     };
     meta.homepage = "https://github.com/dracula/vim/";
     meta.hydraPlatforms = [ ];
@@ -4288,12 +4288,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2025-03-23";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "873ba43f83398fd0e28880cf98fd89e6ce667c51";
-      sha256 = "0rfh82xyimysali998v91gir0694lp9h03hh9kqvxgn906dgvccd";
+      rev = "0bb3f1262fa8bfd8a1c05db29804d1116df32276";
+      sha256 = "091m0yjhnl7jw03a90i2fdfy1ni6lyc15xmavpsai70ik03wrcax";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4314,12 +4314,12 @@ final: prev:
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-03-25";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "6d77deea4905f5fdac5cb1c6e35fb02054b406ae";
-      sha256 = "077wwrqqslspyf21h6ml8wzcwcwgazvg5gpa4dsk938sy6k9nmyy";
+      rev = "86de4c79c65c4ce17a1a95fd05065290397e7c15";
+      sha256 = "058xy187nmv9x3d492p49m7wi7rpzffh76cwb1c805ar95x8p9j2";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4824,12 +4824,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2025-03-16";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "8edcdabfe982c77482ebde2ba3f46f2adc677e64";
-      sha256 = "0v8xlylc7h926wrni78m4zzlxgjnm6ff1ckx730yjg9b2rajg7kr";
+      rev = "2d91a86a43a1ae1303e48aac55542f57b5731990";
+      sha256 = "1ijwhwmf6f2rrixdpbr0aigjjy7jwl20bi4v5y7rz8cg0lhsmy5x";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5449,12 +5449,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2025-03-27";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "5da116bc99a03e14be3b824e319f4e49c676af78";
-      sha256 = "196l6vy9573fkwld3cl927706a6gfgmc71kn1kx3pmk8l6p8hcya";
+      rev = "9411a99390014231753bbb7a2afe6886fda99257";
+      sha256 = "1qx7ijy05zn0svnpz4jdxr5z0rl03w36m1rp7gfplprwalbmn7xv";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5527,12 +5527,12 @@ final: prev:
 
   gruvbox-material-nvim = buildVimPlugin {
     pname = "gruvbox-material.nvim";
-    version = "2025-03-06";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "f4z3r";
       repo = "gruvbox-material.nvim";
-      rev = "5b2bf094b86568a09ca911204b77727ef60db95c";
-      sha256 = "1b17b1489hm5jvlgl6fm9ksfbw560sj7gjqd7cbvcircw6kddpa6";
+      rev = "e69dbfe66a228191d257e2b19fe11cbd3002a6a2";
+      sha256 = "1chz1gjswmpwsqwlfnyccqvm4cr243z8irnjygnmhmzn335gffia";
     };
     meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5984,12 +5984,12 @@ final: prev:
 
   hydra-nvim = buildVimPlugin {
     pname = "hydra.nvim";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "hydra.nvim";
-      rev = "394744ac7a5e3449044e368006f49e823c2d6908";
-      sha256 = "0j8cz01v30s4z1w9phwyky68gikv2w1j2iwnj4xfbm1hkl3ksj0j";
+      rev = "f4ad21b530f4bd4c561e45bec4b53c07c8082dc3";
+      sha256 = "0nk4ry73dha815x1ldmyfs8y6xvqz5nbdd6l0c7hkx8y9c6sg9cf";
     };
     meta.homepage = "https://github.com/nvimtools/hydra.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6559,12 +6559,12 @@ final: prev:
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-03-25";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "f9daf1df015aac94350b3f20c26ce43a9e0009be";
-      sha256 = "02564h0ly1m93341d3ba81bwviigafjmayyqscfjc31ra6pjvnrz";
+      rev = "791b8850e8faf0588955cf531a0817195bcab737";
+      sha256 = "13mpk1j0wwkddjp08ig8sbs3y2skpa03xi6yk4j7dcq9nw87ksrm";
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6689,12 +6689,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-03-25";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "594d051d03eef7ab5e4f91b680e3c87e53936259";
-      sha256 = "1d9vjk4zldq155pcr1s9if9pagw0mpq5sb5nb9pspg9g2j3wjmmd";
+      rev = "290150e429866d7500ff38c91ed1c3b33e6a20d9";
+      sha256 = "1glh3kn2xs7nm4891qglj5795js87lfv4fq03pzqmwrlwiyg7j1w";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6804,6 +6804,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  lf-nvim = buildVimPlugin {
+    pname = "lf.nvim";
+    version = "2023-10-03";
+    src = fetchFromGitHub {
+      owner = "lmburns";
+      repo = "lf.nvim";
+      rev = "69ab1efcffee6928bf68ac9bd0c016464d9b2c8b";
+      sha256 = "0hwd90ahqm3hh78qhz7id064bkx8xrinfn133d74ws30gf0y9kfa";
+    };
+    meta.homepage = "https://github.com/lmburns/lf.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   lf-vim = buildVimPlugin {
     pname = "lf.vim";
     version = "2024-03-18";
@@ -7157,12 +7170,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPlugin {
     pname = "lsp-zero.nvim";
-    version = "2024-11-07";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "ab2a3413646fedd77aa0eab4214a6473e62f6a64";
-      sha256 = "1c8m516fgcc704pgs4dz4vm90as3h3n4m796qdms3wcb2w3hpd8q";
+      rev = "cd9155f8a4ff33c5c27a2596dd26423b2d57cd7d";
+      sha256 = "07xjlpalgl1nnp91646qlf27m6f84pwi20kkf567imxqngg311ic";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7183,12 +7196,12 @@ final: prev:
 
   lsp_signature-nvim = buildVimPlugin {
     pname = "lsp_signature.nvim";
-    version = "2025-03-13";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "8b681c86b0bd7f932cd91987983d91497e43d83f";
-      sha256 = "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j";
+      rev = "b58cca003d1d3311213d6db0352f58d8e57bfff0";
+      sha256 = "1jqpjb7xgdm5ikay8hdjz04bdkirhns6zpa68cblsyslpkvk4hk0";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7417,12 +7430,12 @@ final: prev:
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-03-24";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "556cac8bb8eeb461013ebe0d015e2c48d3527c36";
-      sha256 = "029n2zx4ya7iv4qa53q5zg62jx8jzv6mnd3qrlfn3db2akfdlmd3";
+      rev = "b3c0f3caf78518d33a0b5ad8af944a3c70aa0389";
+      sha256 = "065s20b1i6jsvmdk58bhda9rwrrg9vxlfvgp1q8c857wyrignirg";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7665,12 +7678,12 @@ final: prev:
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2025-03-21";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.animate";
-      rev = "89c921eba5b65834e4e230e5c19e87b8f2c6a969";
-      sha256 = "0yir17bci1772h2d1sp495r1gjzg3h0dnpp8mdpp6jyn5iw4m6lx";
+      rev = "33235a02c7dbaf2a5abdb9c584f9bdb6a6fef247";
+      sha256 = "1v4xlphp9h1vc48dxwf9hmm2mfr1z1s708knsbyx6gkd282zmzkg";
     };
     meta.homepage = "https://github.com/echasnovski/mini.animate/";
     meta.hydraPlatforms = [ ];
@@ -7678,12 +7691,12 @@ final: prev:
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "2025-02-28";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.base16";
-      rev = "44240f11871c15aba8fc49959ebd27c0b4768a40";
-      sha256 = "0z4vvsm2hc1cab5qqd28x6jzyzh23cdijrrs1hkkkj0nj3si3zkn";
+      rev = "492b34f496fd1a53126feb1e47ebf55ce9d61e25";
+      sha256 = "0srxnxkpi03282zdcbrq13b2m259pchnfvp94awn286zwsc9x23l";
     };
     meta.homepage = "https://github.com/echasnovski/mini.base16/";
     meta.hydraPlatforms = [ ];
@@ -7691,12 +7704,12 @@ final: prev:
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "2025-03-24";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.basics";
-      rev = "c411cee62c9981556ee2df8fb2e76a3cdef124e6";
-      sha256 = "1alqr41iivkldfvpr78zdlwa63kdg6d7r3yndn8d40pd0k67yr5p";
+      rev = "246fc266f3bc3f6ae88c51e011609540b582b196";
+      sha256 = "18vadl8zbrwdss5lahdypz0hb9nx9pn26b3xw0wdaw6x7bqgkpv1";
     };
     meta.homepage = "https://github.com/echasnovski/mini.basics/";
     meta.hydraPlatforms = [ ];
@@ -7717,12 +7730,12 @@ final: prev:
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "2025-01-31";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.bufremove";
-      rev = "bba1d8b413d37081756f59200b8cf756181e5b9a";
-      sha256 = "0lbh2azsa9fmb8qp8gzhv36riiafybmjgg0prppchik8lsbhjzy4";
+      rev = "c635c40d06a45450d34695d70c3fb3efe432728f";
+      sha256 = "0d5zmn1rldcl37i6v6m2b2ql3nvkdfqjzf3zhdkqfd7pxvvwp12j";
     };
     meta.homepage = "https://github.com/echasnovski/mini.bufremove/";
     meta.hydraPlatforms = [ ];
@@ -7730,12 +7743,12 @@ final: prev:
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-03-22";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.clue";
-      rev = "8b1947d001419503636398168b8d8413ebd7c14b";
-      sha256 = "1rc9plmqw5nnmd0gdp49r5g10w49j4dvh4lvj2jl87pfxgfmyk6p";
+      rev = "9bfd8ce71ae31460837fcec82a03946008929777";
+      sha256 = "1rx2952li3zby1v24asrp9avy6l9f7f6v954a6xf1rl8ijz2aa5j";
     };
     meta.homepage = "https://github.com/echasnovski/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -7743,12 +7756,12 @@ final: prev:
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "2025-03-02";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.colors";
-      rev = "d49e0764821d40adbf3f9e92091dfba0b0590378";
-      sha256 = "1kn5012q6x1hfpyjqhssydln3v6b25gvvjw1zhw93m8x9km2j524";
+      rev = "0b13a3f8c7279d31833203b1c15d456047321f28";
+      sha256 = "00037f03cmx01y6hd7cdk4bibbzfqmygf851alhnvd2fs7flvxcw";
     };
     meta.homepage = "https://github.com/echasnovski/mini.colors/";
     meta.hydraPlatforms = [ ];
@@ -7769,12 +7782,12 @@ final: prev:
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-03-22";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.completion";
-      rev = "5603b1ca012777ce8933bda46d62a819c11e5756";
-      sha256 = "13dx7ygkh5dmbnh0470alklgdj98kbaclmj5wv489sjwm43vj9fx";
+      rev = "9e6aa17fef2e86d3f33666a7843b942791cc1c1f";
+      sha256 = "05z0ghbwh7h2ij8k72sidrpypnzkf57kf058kwpc0wd1jm9ymznm";
     };
     meta.homepage = "https://github.com/echasnovski/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -7795,12 +7808,12 @@ final: prev:
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "2025-02-28";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.deps";
-      rev = "8391f6d9abbbeb597168c141ca7ec93b4f0b9fcc";
-      sha256 = "1hj79f0ip3p8vc2bs1bl3xfis5rgqarikxynyr5hcmw5slqvlg80";
+      rev = "f1ab455876019233c8d23126e6ff91ecc24a02bb";
+      sha256 = "022jy13p30nq6k0bl9c8jqj4l49nh2j0ghzgq9dmxj01rff8664c";
     };
     meta.homepage = "https://github.com/echasnovski/mini.deps/";
     meta.hydraPlatforms = [ ];
@@ -7808,12 +7821,12 @@ final: prev:
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2025-01-31";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.diff";
-      rev = "bc3a7be30fd45ed4961ea90de1d9d04637cdeae6";
-      sha256 = "0mjl819rd7hbsk3my9ypsl7q7kvxaiyms6a8z63d63nljsbs8ycf";
+      rev = "fcde3f00a32437ffebad23d357564d7c4df9f18e";
+      sha256 = "18flq6rvazahgxj2agv3rf8hw27j6rxw87glcs4qq52gcmcd12n2";
     };
     meta.homepage = "https://github.com/echasnovski/mini.diff/";
     meta.hydraPlatforms = [ ];
@@ -7834,12 +7847,12 @@ final: prev:
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2025-02-14";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.extra";
-      rev = "7725a82b4d9c0acdc370385b9c04bb0791017230";
-      sha256 = "0vndliykk98dn9qy8r3ip73y8zflyr40qml7jg522lq5ql546my6";
+      rev = "54420de7ee36cf011c6351a1d6290b2555120c7b";
+      sha256 = "16kyn5jh6pnpiiahf16r2yk3bck9yz8vy5fbvwlfa847rbl39ybd";
     };
     meta.homepage = "https://github.com/echasnovski/mini.extra/";
     meta.hydraPlatforms = [ ];
@@ -7847,12 +7860,12 @@ final: prev:
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-03-25";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.files";
-      rev = "b6c9cb5f5ebbd9014097cd1296baf74c92b656aa";
-      sha256 = "0pfybraga5mblmlgshnxc8nmqmpxfk8h4zk25dfinypn8jjihcf7";
+      rev = "3007632477bb9df28b4e32329c63aea1ab2c2b0a";
+      sha256 = "1bb0sv766gjnwnqpn7qhcsm6m6c8zj96ippsh1sjlqd3ma09hzwm";
     };
     meta.homepage = "https://github.com/echasnovski/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -7873,12 +7886,12 @@ final: prev:
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "2025-01-31";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini-git";
-      rev = "05f9ec07534ce8e2bf797c05c0a8bd826d9d24a2";
-      sha256 = "0irvwbxhi9y4wf04khgv1l8z4a2hff3r7f2j3r0p76slqjgd7x19";
+      rev = "96034bd94220115e49dbf8c38ef4da5508ba29c2";
+      sha256 = "0f15bsqrjbifjp0g0fscncyhzsvjd3i4fh0vyagpl08g4as1fqx3";
     };
     meta.homepage = "https://github.com/echasnovski/mini-git/";
     meta.hydraPlatforms = [ ];
@@ -7899,12 +7912,12 @@ final: prev:
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-02-28";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.hues";
-      rev = "7a88e67dfb953820718106d8fc83d0f97c4d9173";
-      sha256 = "1kgjkx9bqycmm077i4jk0fnyl47fkmmd2vv0qf6lqsnnliivqxqw";
+      rev = "b65cb42ad651ee3543985e333c504bf820bc5a85";
+      sha256 = "1yhkvszlw6pp1pxkz0w76fwmmysb2bl2kka0f0ws4jhfcdj6qv1c";
     };
     meta.homepage = "https://github.com/echasnovski/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -7912,12 +7925,12 @@ final: prev:
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "2025-01-31";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.icons";
-      rev = "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36";
-      sha256 = "0y5b4bswykf8mf429y29lahmjzjsri0qspwyimnb1d73028qn8ck";
+      rev = "86a633f0dffcfd80110bac86681dbf4b5c37ba5c";
+      sha256 = "1810mvav1k24kxx3kj364v09k26d1s1p2y6dnc2l8mwzw7q70byr";
     };
     meta.homepage = "https://github.com/echasnovski/mini.icons/";
     meta.hydraPlatforms = [ ];
@@ -7964,12 +7977,12 @@ final: prev:
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "2025-03-21";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.map";
-      rev = "a6b491bd30e3b661b704c65445b00be5b69600f7";
-      sha256 = "0q2sl92za253qf95dyhlcycqsndb7aybngmsf3rbj9n50qb1z1gg";
+      rev = "2fe08148f883d613c825c1c0c6ea8a19901061f0";
+      sha256 = "1mqf5bkyp8r05h7ba4drfxx97js2fzmdbjz0xb88xhnpmrikfjnv";
     };
     meta.homepage = "https://github.com/echasnovski/mini.map/";
     meta.hydraPlatforms = [ ];
@@ -8003,12 +8016,12 @@ final: prev:
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "2025-03-22";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.notify";
-      rev = "e189f90b114bef9c6fe0418e939207880e5bbaff";
-      sha256 = "0payrhx8m3yisjfzp9bbrlbm1ayqvawglj1zlqjr41h89979jlh9";
+      rev = "be6661ee23f2325841fb087efb8e492b29eccc9a";
+      sha256 = "16n36gvk3gz46cs30gh8zd4mcwszniynl2k87rzbfhhcwsj71svx";
     };
     meta.homepage = "https://github.com/echasnovski/mini.notify/";
     meta.hydraPlatforms = [ ];
@@ -8016,12 +8029,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-03-25";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "3ad46cdb7a51281e0024416023b56cf5c7909ae7";
-      sha256 = "1gm8s9j26qnxvizpr0rq5sv5nccwbds2srrlkh7cz0ihg8wrpji4";
+      rev = "4630b9cb783b280fa0fd94e8245d8fb06023f3ba";
+      sha256 = "1n0sjygi371b4a43syxs2pljf5gkach1119bswgq3h6cc32wfsll";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8055,12 +8068,12 @@ final: prev:
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2025-03-22";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.pick";
-      rev = "ef479fcfb94b8f5fdbec46d697c18ca113547f3d";
-      sha256 = "1a402rf573jwjl9gqfvpx3x21ix9p5jf4kbncar0my0s5b5j2f6n";
+      rev = "4dfc0a21f16d34e9b2429b96d62788ed8a65e6cd";
+      sha256 = "0ybfn2mn038mn2bdaf5hyiycimfi785silpcnayh4nj544zhzjc9";
     };
     meta.homepage = "https://github.com/echasnovski/mini.pick/";
     meta.hydraPlatforms = [ ];
@@ -8107,12 +8120,12 @@ final: prev:
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "2025-02-28";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.starter";
-      rev = "736c5177bd90cc852c05d903f662f0fc395a4b4b";
-      sha256 = "0w2awkcrabbsybvv2hlzjlqgcr53480pg5p3fhaaparrhd90c7na";
+      rev = "cf770619b85968bc0f45cace82f5c80b69ca0e96";
+      sha256 = "11l7vxhd6sra55aj2xmm79nfhrkisv9r6fssknmcdxrmh47dr3kd";
     };
     meta.homepage = "https://github.com/echasnovski/mini.starter/";
     meta.hydraPlatforms = [ ];
@@ -8198,12 +8211,12 @@ final: prev:
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-03-25";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "3053504dc3695ce84cc260ac84c4948960d3ed42";
-      sha256 = "056dynpkx8kd8x4ch3qy89xzzdbasn0kbfl4v7wcy9jhffkiz6qm";
+      rev = "9168232920cc0d00f53f0f5b8f5df04212635912";
+      sha256 = "1iigrq7did4mby0h4r1j29fx6p7sgrk19srgka8iyjn7cvnib8cx";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8653,12 +8666,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-03-23";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "a2f0245a509f1fc70c7af2c3e156305c55fd52cd";
-      sha256 = "0sfr8fsb1d0pnhkq2bxqz3dinhy130sc51fywkkij6awaq486d2b";
+      rev = "69f798bf9493b84df660ac3c6b2fc03e23956d25";
+      sha256 = "0yybrcljbfq6xygaqzspjz3bhxa6fb7w0qypky66cvhbpzrl6blz";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8679,12 +8692,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-03-27";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "d4848c791496eab6989951d46586fabf7a22942c";
-      sha256 = "1fipgrpf2di88zqksa5171bzqwsrmkhrw2b5sw8za4l5m6i8pc9v";
+      rev = "08fb60026a583ac4a798113dcf67a25019e41314";
+      sha256 = "09k3lv21l4xjswn5znn2wkdbvvs5135fx0hm1w0smyhk6q92v5f2";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8757,12 +8770,12 @@ final: prev:
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-03-14";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "333968f8222fda475d3e4545a9b15fe9912ca26a";
-      sha256 = "16qjyv0qcwngi9185p5bzb4xjvb2c7xpv6qnmn2hi7kald6d4wp0";
+      rev = "6d1bd94f7fca92a50a892f494920696b5defa8c8";
+      sha256 = "0jhlhw88605gjmgs1yz3gcbsgv3yzydz7m1dzy10bvs44d9sx87y";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9449,12 +9462,12 @@ final: prev:
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2025-03-18";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "275532b004ddda91be7626fae227aaf33302d6f0";
-      sha256 = "1i7idcgw0amrrxnfr7jkh5hcdl0j4dj1zv94jvlrdkaz27hprmqi";
+      rev = "7bc1e8411ba60308cdd4222086582f5f7c057857";
+      sha256 = "1dabl6s567aky6xwzj7kvkyiacdygwilg5iaww7s6i8q48cbv6hc";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -9943,12 +9956,12 @@ final: prev:
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-03-17";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "6a5bba0ddea5d419a783e170c20988046376090d";
-      sha256 = "0i10mybxpz0vjkyspv8jkxawph9c823ryf0khb4g8zwpixwhrpmx";
+      rev = "7aade9e99bef5f0735cf966e715b3ce45515d786";
+      sha256 = "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10047,12 +10060,12 @@ final: prev:
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-03-18";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "8fff34699823c354815891d7081972ef5166a31e";
-      sha256 = "1a2w88g65j04dygf6bkhp6ylj34vhry9h283s1z258ib7741gpip";
+      rev = "afffe27e5eab5b3a540b5303e18fa1d6676909b1";
+      sha256 = "0nja1y29nfi6ivnihvy67wwp62mim3dq2lc89vl2w6qr6717g54c";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10151,12 +10164,12 @@ final: prev:
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2025-03-25";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "a91692c49fefe13dffaf13d316589f9d76f2b1d2";
-      sha256 = "1nisii2mgfasrblq0ypl28z92zlrnhqri9dshhl1igmsf26dr55d";
+      rev = "466bdbbf64f14e03ea407c8ecec7a98b620e9d62";
+      sha256 = "0pfa7f1hjhxb002l1cmv7rwpi6bzpy3k27icn8bv6yjf0qmavfib";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -10190,12 +10203,12 @@ final: prev:
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "2025-03-25";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "7eeaa05eab26fb840c4fe7bca91710bf37cb13ed";
-      sha256 = "0fhiv158ww1kdziknswr3x5gvvnyjsm2qjg1gkkk5cflldfz9cmy";
+      rev = "832589c1cc118bed0fc46b8b6a0c4a10489d9c2b";
+      sha256 = "0bmbi1w22ji5q079lx049pzfyjvhvksll9xcbc05w19z105kvsky";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
     meta.hydraPlatforms = [ ];
@@ -10216,12 +10229,12 @@ final: prev:
 
   nvim-hlslens = buildVimPlugin {
     pname = "nvim-hlslens";
-    version = "2024-12-31";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-hlslens";
-      rev = "e22f8448b571b56d6140427e27e02406bcf4e059";
-      sha256 = "1qh19h5gb8yy4wnwcclwic66hqbdyf8hfpn773zsjylbw6mfzcbn";
+      rev = "00b9c7359eaaa4804a9be943ea46bc64e6d2e065";
+      sha256 = "0hkilzijh6xhscd03pr1khvcza7qy606fj9lw0cranbgkd05nlr4";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
     meta.hydraPlatforms = [ ];
@@ -10450,12 +10463,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "401e50fae626c4707af12114b5ddb7bb9f4236a4";
-      sha256 = "1d8zvgzn91l9cwanbhwnzchhml00wi53qsy228pagisxnhkr7w7v";
+      rev = "85e0dd26b710e834a105d679200d01e326a3d2b0";
+      sha256 = "1vkk4niflipxac8p8l9plaqmy41lvzk0gvb8i48f2d6qamcc6bix";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -10749,12 +10762,12 @@ final: prev:
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2025-03-25";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "bad61d14ba5e282e6b7b40cf618d879729494036";
-      sha256 = "1k17cy81qnxv3jkkxdfwvsvjr3b482hjxrfcs8n8dgns3j3fhndw";
+      rev = "3fa6c10af1a4daaeaa3dc3a6a9a76dde48879133";
+      sha256 = "0is8szn0z1gkb8ik4c0kzkv20fr1qf5c0n3mssfn27n2mix63wp6";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -10775,12 +10788,12 @@ final: prev:
 
   nvim-scrollview = buildVimPlugin {
     pname = "nvim-scrollview";
-    version = "2025-03-16";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "5cdf84c85b7d9664ca5b7fd6ebe5dd2c973ba876";
-      sha256 = "07npxvnxhmivymns0mhzfq3i78ik5dkz8gv3d0cgpakhyj22d6sj";
+      rev = "2e49cb7a9a8e999a26f044029c279052a02f10af";
+      sha256 = "185i9xsbyaaqjmhnfzlcgz71sjrl8m5c7rj9dsr50f0b0n1fsk2a";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
     meta.hydraPlatforms = [ ];
@@ -10931,12 +10944,12 @@ final: prev:
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2025-03-26";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "85168f15808d89b0222313652b9d2777eda3cb08";
-      sha256 = "1mn92s3v0rp5szy9cclnwlvvj61cmib98nwsz5xybw0a3wfmil45";
+      rev = "aece1062335a9e856636f5da12d8a06c7615ce8a";
+      sha256 = "0kh0jjjcvjdzxcg3xk2fav6g2kdws6by3snbzhs9a0fcfdbdrvnw";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.hydraPlatforms = [ ];
@@ -11113,12 +11126,12 @@ final: prev:
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-03-26";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "cf1a86cf831ac5b45653f47e3c541aaf8f5553fe";
-      sha256 = "0qr6pxlrbi83g3w2xg74mp9vvk8i1dvb6pwv8ncsn44rks8m6jsj";
+      rev = "5d9c77cc79a53c168679d36ac66ce2ae44c3e91a";
+      sha256 = "045cvck2zqrib8z9dwc4qz6nk2rvly3fpi68kprk1qxwshpnnl7h";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -11295,12 +11308,12 @@ final: prev:
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-03-26";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "1f3c5626427eec7584b42568ee051e21c747eb23";
-      sha256 = "000p5bdagj9wpdccz0p6n7mf2zdy7g3xk8fivjh6gwqmm6y3vq8c";
+      rev = "97660ea338c3c94e9e367258a322afc1e154cbbd";
+      sha256 = "1lhsb52y2skqzvw1l05c27pryqfdkggl6nj0924731r2hlcj8v83";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11529,12 +11542,12 @@ final: prev:
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "c72e597f03ad53479424f52c9df71ddebe34c3d8";
-      sha256 = "1ks44vm0cz52kqhfm8qlvmmda57hj8hr31nhikmx08h8f55g204x";
+      rev = "622816aac66933352e20e4d5d01993cd270d6fb0";
+      sha256 = "15ciqkx3hbbccy30dkga17jhra4mslvas0qnqiqrv5qlc09shyrp";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11555,12 +11568,12 @@ final: prev:
 
   overseer-nvim = buildVimPlugin {
     pname = "overseer.nvim";
-    version = "2025-03-05";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "overseer.nvim";
-      rev = "d95931e9e8cc4429819c8bbae395da00a6800d1e";
-      sha256 = "0zvhc29qnczyjijkq12b7xjs254r9wr2m54si846xq5ihhjj44pj";
+      rev = "72c68aab0358c92f451168b704c411c4a3e3410e";
+      sha256 = "0zsiys8nib9l7f8nx3zi4cfpcjpfb9wkvvysyzqf42yq2ngyms5h";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@@ -11660,12 +11673,12 @@ final: prev:
 
   papercolor-theme-slim = buildVimPlugin {
     pname = "papercolor-theme-slim";
-    version = "2025-03-24";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "pappasam";
       repo = "papercolor-theme-slim";
-      rev = "ed3e7dd544d04aff6116cb5eaa94b444162acbeb";
-      sha256 = "1q93nxn0x1wd393fw6djmibl0y60ci2aplx6f9m8y7j7lif24874";
+      rev = "4359f1126268674b9a924bea5b6c0e7d1359df78";
+      sha256 = "1x2k3pmkx689820chr5zla9dyf83anv0i4xqjwcv3iy80djh1wg9";
     };
     meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/";
     meta.hydraPlatforms = [ ];
@@ -12025,12 +12038,12 @@ final: prev:
 
   pum-vim = buildVimPlugin {
     pname = "pum.vim";
-    version = "2025-02-24";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "2c76e582e7f180da6ee3ba2be1787bec3ffead3d";
-      sha256 = "1iqi9zi557gi1s5zc24bhnjc2avp3ymvb0jyp2jds62a33fl5dxq";
+      rev = "81189d12df5e02465766e4b182df9fe2fcfac00b";
+      sha256 = "16a1n7vm2zajz0jksq8qscxbw9ab82c8n9maca236ihirjq4q8mq";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
     meta.hydraPlatforms = [ ];
@@ -12364,12 +12377,12 @@ final: prev:
 
   remote-sshfs-nvim = buildVimPlugin {
     pname = "remote-sshfs.nvim";
-    version = "2024-08-29";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "nosduco";
       repo = "remote-sshfs.nvim";
-      rev = "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d";
-      sha256 = "1pl08cpgx27mhmbjxlqld4n2728hxs0hvwyjjy982k315hhhhldw";
+      rev = "e047b6340653538efa57a8164cdcb1f729325689";
+      sha256 = "0nyrz45z2gpvcyc14lr5f8n7mh3xc43xh1ra1cy9mqrrvpkwsknc";
     };
     meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12390,12 +12403,12 @@ final: prev:
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-03-27";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "35119c1614ec41f9b02ddd28795673a56b468269";
-      sha256 = "02kfbp2mgp3y717cdb9bl3bb3bb9lval1x202v1z66cywsia9bp4";
+      rev = "a1fc4e559252baa128c471adadf0be045abd542d";
+      sha256 = "0n9zis5jf7khjdmc622g40is5yjsqkxph64mldpd3q8ka64yaib1";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12521,12 +12534,12 @@ final: prev:
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-03-24";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "8c80d1fe4070264f58a366d8ed431544f5f3455a";
-      sha256 = "1m5cagnlgwrfnm6nziny5xaak52wzmf7d9zrdvix7a8pw9jfpan2";
+      rev = "02aa30c67a538c00ef197708daf2edba11d50a2b";
+      sha256 = "0h6nkivsspkcxgs08ig5yc6yikafh825q2m5sk1y7zfnhm55zdis";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12638,12 +12651,12 @@ final: prev:
 
   satellite-nvim = buildVimPlugin {
     pname = "satellite.nvim";
-    version = "2025-03-07";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "satellite.nvim";
-      rev = "253bf5215a7329e0e24f7b0ec27c06eae13a6b79";
-      sha256 = "1kr5d4dx5mlw9ia801na4q05zw29f8ccbh3z1c16kg310d439gs0";
+      rev = "3379561c794a93c546c5c45f9d60e78a01a31d31";
+      sha256 = "1nmnkcflqmm1x9z1yql43h0ghliw32nwhr2p7f3r6by9xccfmdic";
     };
     meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12873,12 +12886,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-03-21";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "096d23df87d5c430e6e96f3e99d67e360fb2097f";
-      sha256 = "12bqnvx1infy4z1ibspcljkdsmrwwlkn6dwhi3scsz1441n425sj";
+      rev = "987b1a29087d38072f86177ccf18bbdcef8660d8";
+      sha256 = "0yfah9l4xvas97cywjzg6nqvj2wzbrp0dw1cc4wcdpfri6wyhflj";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13800,12 +13813,12 @@ final: prev:
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "2025-03-21";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "55ca623ae9e366fabccd5bbe7e612ca0879e98c8";
-      sha256 = "049apxl689zrs8swqzbljw273i70kfli6076j81c19axczgs62z2";
+      rev = "aa28501258a66b7182a3071064c2d214ca840fbd";
+      sha256 = "196kk5lw144jncrnkb5mlfwxx9v0pns31j881xxm8svxqnqg6f92";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14309,12 +14322,12 @@ final: prev:
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-03-11";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "5d168a2826fb90691f674e81bd5c1dfa6d931c61";
-      sha256 = "02c24gw6g2n377khn0glzmhz987rkmkvq2pi19xf1y7qcd2gyr2r";
+      rev = "0a3be9835c6044e8bbc1bdf001e3333519a2bad9";
+      sha256 = "05cxy8c8mpjxy115yy71z54mbrjvzy8c0s468pl63ggxp176a3pv";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14492,12 +14505,12 @@ final: prev:
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-03-26";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "22d0a5f2a2c8030f5544a44a5c5fdcfd9d54c01d";
-      sha256 = "1c381rxhgc0xidpk4rcfk77xwbbd2gas490n5gyp51sq07ir0z1g";
+      rev = "43d3250007d2c5a2ed693c1edebf66d66af33407";
+      sha256 = "1ppzk7a5f9qi6r5mxy1xvbkzn3zr3rxbbqmq37l3cqg52h3jy683";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14675,12 +14688,12 @@ final: prev:
 
   typescript-tools-nvim = buildVimPlugin {
     pname = "typescript-tools.nvim";
-    version = "2024-12-04";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "pmizio";
       repo = "typescript-tools.nvim";
-      rev = "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a";
-      sha256 = "1wxs4rfaqqpdjl5grapl8k8h1xks1mpxvi2vpslaqaq5jv6qszf7";
+      rev = "3bc72c8597f6137f977032f5c76fcde51e0ef19a";
+      sha256 = "1wvlmz7bbsspjxjnn3nqiididnrpz6zldaia3p73qqmzfyvbnw6f";
     };
     meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14792,12 +14805,12 @@ final: prev:
 
   unimpaired-nvim = buildVimPlugin {
     pname = "unimpaired.nvim";
-    version = "2025-01-23";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "tummetott";
       repo = "unimpaired.nvim";
-      rev = "a282ab8ce0d0d4b5b1200ea484993aecf65dd94c";
-      sha256 = "08nbc8svk83c5mjgj6ljsa7dm91i0q3anrfgjjx6x6s7khvxzccd";
+      rev = "75eb0cdee816f4642fe92ffd267a1fc1b02a0117";
+      sha256 = "07ri7vi4fzqdxn35646kswij61dpg63pq8f2d46jyifxzv1kbis7";
     };
     meta.homepage = "https://github.com/tummetott/unimpaired.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14805,12 +14818,12 @@ final: prev:
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-03-24";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "891dcccc1b761a4bd27c3786977203baddcdcc8f";
-      sha256 = "0qlnvdbvnhx6s8bv2bvzs124z4rvs0p2q4znsyxxm2lqr8p2n0j5";
+      rev = "51d6d80ead4325a5d491a795a413b82d4af6d35a";
+      sha256 = "1b7d7mrrfikgfj9f9fm82rpxkh66bsa0az3h4i3350i9xqzmi87x";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16599,12 +16612,12 @@ final: prev:
 
   vim-fern = buildVimPlugin {
     pname = "vim-fern";
-    version = "2025-02-18";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-fern";
-      rev = "60d9a56380123198fe318c250d29a4a44bb952e9";
-      sha256 = "0x1fi8xk2b83jzq2lgj7fj5zd3vzdwwal13jdd4n4vacp7bd03s0";
+      rev = "67a98a1f32706139fa26c6fc1f77a210ade469b3";
+      sha256 = "1s1x412w8vjv9wj0p50nqlzqisz9ss6cmmija4gpmdxfmikjnxn9";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-fern/";
     meta.hydraPlatforms = [ ];
@@ -16664,12 +16677,12 @@ final: prev:
 
   vim-flagship = buildVimPlugin {
     pname = "vim-flagship";
-    version = "2025-01-04";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-flagship";
-      rev = "8e3f69e33ae8cc5c50ac1be26e5049771013ca7d";
-      sha256 = "0jkshn76xh0a0y6d14c5j47q66ycqndlchrb18zr58ig5i6ryx32";
+      rev = "de8da9c5e5fbb061e8ff55c65c510dcc5982c035";
+      sha256 = "05gxh2yg8im20x9zsgr89qawhngd1w6gcn0sv69cwn9i2l7z8dhb";
     };
     meta.homepage = "https://github.com/tpope/vim-flagship/";
     meta.hydraPlatforms = [ ];
@@ -17406,12 +17419,12 @@ final: prev:
 
   vim-isort = buildVimPlugin {
     pname = "vim-isort";
-    version = "2023-07-12";
+    version = "2025-03-12";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
-      rev = "757c2c830ba0365167460c26f304f3472dfa2ce2";
-      sha256 = "01la7hmf9z9iqv1n4lmsihsny6wsjzqa5c7prws88jkmryrvjxdb";
+      rev = "41c7921dc755c5d10afe2e72f97b90ba43905a93";
+      sha256 = "0i5kgd08ydqhfl8hxyxwpxgsg92pajn64azz5kp69fi75bbrg7sx";
     };
     meta.homepage = "https://github.com/fisadev/vim-isort/";
     meta.hydraPlatforms = [ ];
@@ -18759,12 +18772,12 @@ final: prev:
 
   vim-plug = buildVimPlugin {
     pname = "vim-plug";
-    version = "2025-03-12";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "cdea0244a538a3178bba45e743e691e5bee61b4d";
-      sha256 = "0jidxnamh6pb94hdfmrb5r0h1v4hdbz0mmq9jvhbrh1srjrsy4gv";
+      rev = "baa66bcf349a6f6c125b0b2b63c112662b0669e1";
+      sha256 = "1jf2kgxgvr6d182xk4hvcrsb4ccav8892nzg7izz1hxs5pg7lwcl";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
     meta.hydraPlatforms = [ ];
@@ -19578,12 +19591,12 @@ final: prev:
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-03-20";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "3a21e6ce512ee88bf892294bc6d05fdf1a860cb4";
-      sha256 = "1xzkw0vlnpgfl59czgmylxkcvsn84ligaz6ggkypg58vgnyvbz0a";
+      rev = "fdf42b98bd7bc03dfa018d20aa3436d7f726a0b3";
+      sha256 = "1zn5lrgm1bd00ivjyj3d470p0z2kxq3knhbw3327qa53i282n274";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20255,12 +20268,12 @@ final: prev:
 
   vim-vsnip = buildVimPlugin {
     pname = "vim-vsnip";
-    version = "2024-01-11";
+    version = "2025-03-28";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip";
-      rev = "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9";
-      sha256 = "06j0fph91x3gdhbf9bb0yv95j34gf827p97vak0l4jb0ib7vmyc2";
+      rev = "b7445b3c43acb08c0b74350d046e0088ece88033";
+      sha256 = "1gccx6fglhqd5znf2rz7n16wwxx49wgfy6rjlrni5kr1adp047wa";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
     meta.hydraPlatforms = [ ];
@@ -20672,12 +20685,12 @@ final: prev:
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-03-23";
+    version = "2025-03-27";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "bcb14eb6e3739f0c1902115a710292bc37c62d2e";
-      sha256 = "03drrff3r1ch9wll7zdb8sc6jyysd677c65kn4iy841bpqmzg8qx";
+      rev = "528c0671d4d579e1ce126e8958b388a67586d282";
+      sha256 = "0h91bbmdk6b3ds2nfrq8847b0xg622wx6qkyy9k6kx43yhbhg1ni";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -21102,12 +21115,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-03-24";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "9694c227f62dc197b9909cb59b78526775068a22";
-      sha256 = "19zz0i1xp1xlhz8b4ms0bqg5h75rd904hwlj5dlsh2whwd6w9w79";
+      rev = "b5596b981df9cdb219ece29eea60cd52f149c319";
+      sha256 = "1hjwwz925cnr26w2z7lmsq5p0zwzwvg3bhr2pibxkah34pdfyj50";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21258,12 +21271,12 @@ final: prev:
 
   zk-nvim = buildVimPlugin {
     pname = "zk-nvim";
-    version = "2025-03-11";
+    version = "2025-03-29";
     src = fetchFromGitHub {
       owner = "zk-org";
       repo = "zk-nvim";
-      rev = "01769fb74653588a6185a24ab99419c223bd2a8b";
-      sha256 = "052ifipky41fczarzmf99izqd96mwjx5qqg12lznb55rryhgjw6v";
+      rev = "8fdd7032633045ece559273370fc0ec75ee8ffce";
+      sha256 = "067yvj7q4ylb362ilj1blj7rfnyxgn990aiv9032sx0jbl0jqvb2";
     };
     meta.homepage = "https://github.com/zk-org/zk-nvim/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index e949917f6522..d1c06ff4b387 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -1,4 +1,4 @@
-# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
 
 { buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }:
 
@@ -27,12 +27,12 @@
   };
   angular = buildGrammar {
     language = "angular";
-    version = "0.0.0+rev=be53f25";
+    version = "0.0.0+rev=8435251";
     src = fetchFromGitHub {
       owner = "dlvandenberg";
       repo = "tree-sitter-angular";
-      rev = "be53f2597dded40c90b5f53ed9f4521422f6b6b3";
-      hash = "sha256-gs28MvuPz9hYUSeyObj1QE7n5CDa1+T1+CsDdE8xZLM=";
+      rev = "843525141575e397541e119698f0532755e959f6";
+      hash = "sha256-SPBtbwEMGPrEUCbxSlQl44+hK4Yphngp8QsLkmMsDBk=";
     };
     meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
   };
@@ -1187,12 +1187,12 @@
   };
   hcl = buildGrammar {
     language = "hcl";
-    version = "0.0.0+rev=9e3ec98";
+    version = "0.0.0+rev=de10d49";
     src = fetchFromGitHub {
       owner = "MichaHoffmann";
       repo = "tree-sitter-hcl";
-      rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b";
-      hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM=";
+      rev = "de10d494dbd6b71cdf07a678fecbf404dbfe4398";
+      hash = "sha256-oRNNxE5AnI0TyJl92pk0E9xGj5xom/+0kpPMUE/O/TY=";
     };
     meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
   };
@@ -1597,12 +1597,12 @@
   };
   koto = buildGrammar {
     language = "koto";
-    version = "0.0.0+rev=6735114";
+    version = "0.0.0+rev=46770ab";
     src = fetchFromGitHub {
       owner = "koto-lang";
       repo = "tree-sitter-koto";
-      rev = "673511402dfef07b25cfa43991693b8442695fc7";
-      hash = "sha256-PKaG5VKMP+O0QC5Wp2hxA6Q/YEbYzfw2a2L7s37yKuY=";
+      rev = "46770abba021e2ddd2c51d9fa3087fd1ab6b2aea";
+      hash = "sha256-BMBwkWVvW4qBX6DqM29Ne17K116yUiH2njdKkzeXmTY=";
     };
     meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
   };
@@ -1831,12 +1831,12 @@
   };
   meson = buildGrammar {
     language = "meson";
-    version = "0.0.0+rev=9c74e8e";
+    version = "0.0.0+rev=a56af66";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "tree-sitter-meson";
-      rev = "9c74e8e8917b83d90e38ac040949079437ec0043";
-      hash = "sha256-uxJfDIsqTROc5YSZkVwr2zZEcpqt3IEdGVkzwp59gnI=";
+      rev = "a56af662e8540412fed5e40cc20435b2b9a20502";
+      hash = "sha256-RT/CXsbo+TZeG+6m9kwSoS5RImchTe5P/7tRlgTnPJo=";
     };
     meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
   };
@@ -2021,12 +2021,12 @@
   };
   ocamllex = buildGrammar {
     language = "ocamllex";
-    version = "0.0.0+rev=5da5bb7";
+    version = "0.0.0+rev=c5cf996";
     src = fetchFromGitHub {
       owner = "atom-ocaml";
       repo = "tree-sitter-ocamllex";
-      rev = "5da5bb7508ac9fd3317561670ef18c126a0fe2aa";
-      hash = "sha256-qfmIfcZ3zktYzuNNYP7Z6u6c7XoKsKD86MRMxe/qkpY=";
+      rev = "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f";
+      hash = "sha256-eDJRTLYKHcL7yAgFL8vZQh9zp5fBxcZRsWChp8y3Am0=";
     };
     generate = true;
     meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@@ -2077,12 +2077,12 @@
   };
   perl = buildGrammar {
     language = "perl";
-    version = "0.0.0+rev=bb53f20";
+    version = "0.0.0+rev=ecd90bd";
     src = fetchFromGitHub {
       owner = "tree-sitter-perl";
       repo = "tree-sitter-perl";
-      rev = "bb53f204aa3e7507960014642965c9f9a9e84b1d";
-      hash = "sha256-Kshs1auxxhEjU/XF3LmTzJ2CCMkZL/tVirEHsM0Jelk=";
+      rev = "ecd90bd8b381bcc7219fed4fe351903630e761c6";
+      hash = "sha256-iIa0FJ4kCgfOM/jKwSpaGyOlNwUtczhqoO5gKW7PAHI=";
     };
     meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
   };
@@ -2621,12 +2621,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=42a1542";
+    version = "0.0.0+rev=160e355";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "42a1542248ff611ba2091fe76c6dbf42551ebef8";
-      hash = "sha256-FRX8uaSB408fOWaQSLjOqurVaWQYysoSQCI3vI4d63E=";
+      rev = "160e35520577d91576b08fb677aaee840c591dc2";
+      hash = "sha256-lcrS0FHFGnjT54ePM3BsHMdg5mbc65bsW4T0XpqC3XQ=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -2878,12 +2878,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=fc7c594";
+    version = "0.0.0+rev=28dcf0e";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "fc7c594f52528e4a4a08671137850143d55a5bf2";
-      hash = "sha256-SEaefbbQFd+Viks55eijUT3YHaEZJMvmZcXm3V6R05I=";
+      rev = "28dcf0edf98d491d47bacb65dc49b6fb979b444c";
+      hash = "sha256-tKeYqRjysv/RVKdegWSMkcJv3y9xrP8lNEqLEoHw2DI=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2979,12 +2979,12 @@
   };
   tact = buildGrammar {
     language = "tact";
-    version = "0.0.0+rev=a19be2d";
+    version = "0.0.0+rev=47af202";
     src = fetchFromGitHub {
       owner = "tact-lang";
       repo = "tree-sitter-tact";
-      rev = "a19be2d4c1956e12facfc717e28f13a6ad0860e0";
-      hash = "sha256-TBleyQmrHbKQJKftg2VcLstYIteuPbKuCct4ImmMtcU=";
+      rev = "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f";
+      hash = "sha256-Zrnkvm1WjAlxuk2dEojIx0ldWqdv6gxMl/f9w6TsqBE=";
     };
     meta.homepage = "https://github.com/tact-lang/tree-sitter-tact";
   };
@@ -3035,12 +3035,12 @@
   };
   terraform = buildGrammar {
     language = "terraform";
-    version = "0.0.0+rev=9e3ec98";
+    version = "0.0.0+rev=de10d49";
     src = fetchFromGitHub {
       owner = "MichaHoffmann";
       repo = "tree-sitter-hcl";
-      rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b";
-      hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM=";
+      rev = "de10d494dbd6b71cdf07a678fecbf404dbfe4398";
+      hash = "sha256-oRNNxE5AnI0TyJl92pk0E9xGj5xom/+0kpPMUE/O/TY=";
     };
     location = "dialects/terraform";
     meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
@@ -3327,12 +3327,12 @@
   };
   vhs = buildGrammar {
     language = "vhs";
-    version = "0.0.0+rev=3f20232";
+    version = "0.0.0+rev=0c6fae9";
     src = fetchFromGitHub {
       owner = "charmbracelet";
       repo = "tree-sitter-vhs";
-      rev = "3f202326c06f1c4d47aa82b9013a6b71aea70611";
-      hash = "sha256-JpldlE+buaakzmItiGWBs8OCgA9A8x8meI37BQNyN5U=";
+      rev = "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db";
+      hash = "sha256-o7Q/3wwiCjxO6hBfj1Wxoz2y6+wxLH+oCLiapox7+Hk=";
     };
     meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 44c0c0229e22..e7446892a7d5 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1560,6 +1560,10 @@ in
     ];
   };
 
+  lf-nvim = super.lf-nvim.overrideAttrs {
+    dependencies = [ self.toggleterm-nvim ];
+  };
+
   lf-vim = super.lf-vim.overrideAttrs {
     dependencies = [ self.vim-floaterm ];
   };
@@ -2287,6 +2291,7 @@ in
   nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
     # Test module
     nvimSkipModules = [
+      "nvim-highlight-colors.utils_spec"
       "nvim-highlight-colors.buffer_utils_spec"
       "nvim-highlight-colors.color.converters_spec"
       "nvim-highlight-colors.color.patterns_spec"
@@ -3614,6 +3619,9 @@ in
   };
 
   vim-isort = super.vim-isort.overrideAttrs {
+    # Code updated to find relative path at runtime
+    # https://github.com/fisadev/vim-isort/pull/41
+    dontCheckForBrokenSymlinks = true;
     postPatch = ''
       substituteInPlace ftplugin/python_vimisort.vim \
         --replace-fail 'import vim' 'import vim; import sys; sys.path.append("${python3.pkgs.isort}/${python3.sitePackages}")'
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 9de4fa3eb844..c8dd0ca5c63b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -521,6 +521,7 @@ https://github.com/mrjones2014/legendary.nvim/,HEAD,
 https://github.com/camspiers/lens.vim/,,
 https://github.com/thirtythreeforty/lessspace.vim/,,
 https://github.com/cohama/lexima.vim/,,
+https://github.com/lmburns/lf.nvim/,HEAD,
 https://github.com/ptzz/lf.vim/,,
 https://github.com/LucHermitte/lh-brackets/,,
 https://github.com/LucHermitte/lh-vim-lib/,,
diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix
index eb9647e8c662..6ef67b39621f 100644
--- a/pkgs/applications/graphics/seamly2d/default.nix
+++ b/pkgs/applications/graphics/seamly2d/default.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "seamly2d";
-  version = "2025.3.3.205";
+  version = "2025.3.17.207";
 
   src = fetchFromGitHub {
     owner = "FashionFreedom";
     repo = "Seamly2D";
     tag = "v${version}";
-    hash = "sha256-gn2qkozRlv16UdOG7k6qoF/HOT3pgJzmjAmvYm5dn+o=";
+    hash = "sha256-5Bi+SycUZFOxmP0bWbqSnKRZ+UW6b48Cn4YUVfHi4Js=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8e04700b83fd..fd990baa6faf 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -26,7 +26,7 @@ still shows most of the available features is in `./gwenview`.
 */
 
 {
-  lib, libsForQt5, fetchurl,
+  lib, config, libsForQt5, fetchurl,
 }:
 
 let
@@ -96,7 +96,6 @@ let
       incidenceeditor = callPackage ./incidenceeditor.nix {};
       itinerary = callPackage ./itinerary.nix {};
       juk = callPackage ./juk.nix {};
-      k3b = callPackage ./k3b.nix {};
       kaccounts-integration = callPackage ./kaccounts-integration.nix {};
       kaccounts-providers = callPackage ./kaccounts-providers.nix {};
       kaddressbook = callPackage ./kaddressbook.nix {};
@@ -264,6 +263,8 @@ let
       qmlkonsole = callPackage ./qmlkonsole.nix {};
       telly-skout = callPackage ./telly-skout.nix {};
       tokodon = callPackage ./tokodon.nix {};
+    } // lib.optionalAttrs config.allowAliases {
+      k3b = throw "libsForQt5.k3b has been dropped in favor of kdePackages.k3b";
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
deleted file mode 100644
index 643c5e80b10f..000000000000
--- a/pkgs/applications/kde/k3b.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ mkDerivation, lib
-, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info
-, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
-, flac, lame, libmad, libmpcdec, libvorbis
-, libsamplerate, libsndfile, taglib
-, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
-}:
-
-mkDerivation {
-  pname = "k3b";
-  meta = with lib; {
-    homepage = "https://apps.kde.org/k3b/";
-    description = "Disk burning application";
-    mainProgram = "k3b";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ sander ];
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-  buildInputs = [
-    # kde
-    libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
-    # formats
-    flac lame libmad libmpcdec libvorbis
-    # sound utilities
-    libsamplerate libsndfile taglib
-    # cd/dvd
-    cdparanoia libdvdcss libdvdread
-    # others
-    ffmpeg libmusicbrainz3 shared-mime-info
-  ];
-  propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
-  postFixup =
-    let
-      binPath = lib.makeBinPath [
-        cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
-        vcdimager flac
-      ];
-      libraryPath = lib.makeLibraryPath [
-        cdparanoia
-      ];
-    in ''
-      wrapProgram "$out/bin/k3b"     \
-        --prefix PATH : "${binPath}" \
-        --prefix LD_LIBRARY_PATH : ${libraryPath}
-    '';
-}
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index d5af0443de12..bc358bc4d036 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "firehol";
-  version = "3.1.7";
+  version = "3.1.8";
 
   src = fetchFromGitHub {
     owner = "firehol";
     repo = "firehol";
     rev = "v${version}";
-    sha256 = "sha256-gq7l7QoUsK+j5DUn84kD9hlUTC4hz3ds3gNJc1tRygs=";
+    sha256 = "sha256-6O3AoQs7Qzcin8VXQgJfCVsNOI74H6fE1DgqdY+e4bA=";
   };
 
   patches = [
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index b8457092dda3..7174db91e6e9 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,26 +1,81 @@
-{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
-, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
-, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib
-, libpulseaudio, libopus, libogg, jansson, libsodium
+{
+  lib,
+  stdenv,
+  fetchurl,
 
-, postgresqlSupport ? true, libpq }:
+  # build-time deps
+  libtool,
+  makeWrapper,
+  meson,
+  ninja,
+  pkg-config,
 
-stdenv.mkDerivation rec {
+  # runtime deps
+  adns,
+  curl,
+  gettext,
+  gmp,
+  gnutls,
+  jansson,
+  libextractor,
+  libgcrypt,
+  libgnurl,
+  libidn,
+  libmicrohttpd,
+  libogg,
+  libopus,
+  libpulseaudio,
+  libsodium,
+  libunistring,
+  libxml2,
+  ncurses,
+  sqlite,
+  zlib,
+
+  postgresqlSupport ? true,
+  libpq,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.23.1";
+  version = "0.24.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
-    hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI=";
+    url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
+    hash = "sha256-BoUvn0gz5ssGvu3fhyerlMQ4U69yOnY4etdxYS4WPFc=";
   };
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkg-config libtool makeWrapper ];
+  nativeBuildInputs = [
+    libtool
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+  ];
+
   buildInputs = [
-    adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
-    libmicrohttpd libunistring libxml2 ncurses gettext libsodium
-    sqlite zlib libpulseaudio libopus libogg jansson
+    adns
+    curl
+    gettext
+    gmp
+    gnutls
+    jansson
+    libextractor
+    libgcrypt
+    libgnurl
+    libidn
+    libmicrohttpd
+    libogg
+    libopus
+    libpulseaudio
+    libsodium
+    libunistring
+    libxml2
+    ncurses
+    sqlite
+    zlib
   ] ++ lib.optional postgresqlSupport libpq;
 
   preConfigure = ''
@@ -44,7 +99,7 @@ stdenv.mkDerivation rec {
     make -k check
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
 
     longDescription = ''
@@ -63,9 +118,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "https://gnunet.org/";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ pstn ];
-    platforms = platforms.unix;
-    changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ pstn ];
+    platforms = lib.platforms.unix;
+    changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${finalAttrs.version}";
   };
-}
+})
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 2f1e31f48d91..69cb8c180954 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -13,13 +13,13 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet-gtk";
-  version = "0.23.1";
+  version = "0.24.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
-    hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI=";
+    url = "mirror://gnu/gnunet/gnunet-gtk-${finalAttrs.version}.tar.gz";
+    hash = "sha256-rsQzMvOoQEuushd0jBGQt9j6zXj2G1SMax8d4QoDV6s=";
   };
 
   nativeBuildInputs = [
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     description = "GNUnet GTK User Interface";
     homepage = "https://git.gnunet.org/gnunet-gtk.git";
   };
-}
+})
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index 2d662a407dc8..c88b85be9e3e 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -8,48 +8,56 @@
   useMpi ? false,
   mpi,
   fetchFromGitLab,
+  cmake,
+  pkg-config,
+  readline,
+  ninja,
+  elpa,
 }:
 
-stdenv.mkDerivation rec {
-  version = "4.1.5";
+stdenv.mkDerivation (finalAttrs: {
   pname = "siesta";
+  version = "5.2.2";
 
   src = fetchFromGitLab {
     owner = "siesta-project";
     repo = "siesta";
-    rev = "v${version}";
-    sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg";
+    tag = finalAttrs.version;
+    hash = "sha256-pud8RlJAT+0TwyPRsbf5D/8FfLjZvPYPf84Xb7UH6os=";
+    fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace Src/siesta_init.F --replace '/bin/rm' 'rm'
-  '';
-
   passthru = {
     inherit mpi;
   };
 
-  nativeBuildInputs = [ gfortran ];
+  nativeBuildInputs = [
+    ninja
+    gfortran
+    cmake
+    pkg-config
+  ];
 
   buildInputs =
     [
       blas
       lapack
+      readline
+      elpa
     ]
     ++ lib.optionals useMpi [
       mpi
       scalapack
     ];
 
-  enableParallelBuilding = false; # Started making trouble with gcc-11
+  NIX_LDFLAGS = "-lm";
 
-  # Must do manually because siesta does not do the regular
-  # ./configure; make; make install
-  configurePhase = ''
-    cd Obj
-    sh ../Src/obj_setup.sh
-    cp gfortran.make arch.make
-  '';
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
+
+  enableParallelBuilding = false; # Started making trouble with gcc-11
 
   preBuild =
     ''
@@ -76,12 +84,7 @@ stdenv.mkDerivation rec {
         ''
     );
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -a siesta $out/bin
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "First-principles materials simulation code using DFT";
     mainProgram = "siesta";
     longDescription = ''
@@ -98,8 +101,8 @@ stdenv.mkDerivation rec {
       and all-electron methods.
     '';
     homepage = "https://siesta-project.org/siesta/";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.costrouc ];
+    maintainers = [ lib.maintainers.costrouc ];
   };
-}
+})
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
deleted file mode 100644
index 899a7ca3f137..000000000000
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  qtbase,
-  qtx11extras,
-  ncurses5,
-  xorg,
-  zlib,
-  python27Packages,
-}:
-stdenv.mkDerivation {
-  pname = "fdr";
-  version = "4.2.7";
-  src = fetchurl {
-    url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz";
-    sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh";
-  };
-
-  libPath = lib.makeLibraryPath [
-    stdenv.cc.cc
-    python27Packages.python
-    qtbase
-    qtx11extras
-    ncurses5
-    xorg.libX11
-    xorg.libXft
-    zlib
-  ];
-
-  dontConfigure = true;
-  installPhase = ''
-    mkdir -p "$out"
-
-    # shipped Qt is buggy
-    rm lib/libQt*
-    rm -r lib/qt_plugins
-
-    cp -r * "$out"
-    ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
-    ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
-    ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
-
-    for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
-    do
-      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$libPath:$out/lib" \
-        "$out/bin/$b"
-    done
-
-    for l in corei7/librefines.so \
-      libcspm_process_compiler.so \
-      libcsp_operators.so \
-      _fdr.so \
-      libfdr.so \
-      libfdr_java.so \
-      libprocess_compiler.so \
-      librefines_gui.so \
-      librefines_licensing.so  \
-      libboost_date_time.so.1.60.0 \
-      libboost_filesystem.so.1.60.0 \
-      libboost_iostreams.so.1.60.0 \
-      libboost_program_options.so.1.60.0 \
-      libboost_serialization.so.1.60.0 \
-      libboost_system.so.1.60.0
-    do
-      patchelf --set-rpath "$libPath:$out/lib" \
-        "$out/lib/$l"
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://cocotec.io/fdr/";
-    description = "CSP refinement checker";
-    license = licenses.unfreeRedistributable;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickhu ];
-  };
-}
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index cb539aacb37f..d827b14f5869 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bino";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchgit {
     url = "https://git.marlam.de/git/bino.git";
     rev = "bino-${finalAttrs.version}";
-    hash = "sha256-h7sS+5he8dKl9ipdM1Vs1WC6U+Pi/QMVSdTbT9E59lU=";
+    hash = "sha256-vGPbSYTfRy414xVcLIvOnN4Te36HWVz7DQegNhYb3u4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
index 7aa5e936ef35..87ba04219d6d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-tuna";
-  version = "1.9.9";
+  version = "1.9.10";
 
   nativeBuildInputs = [
     cmake
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "univrsal";
     repo = "tuna";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qwOAidnCGZSwTahgbyf1K0KgoDvYpqDAQXM3l1lfZXg=";
+    hash = "sha256-Y4ny8XJIk4KtmRTWdO6tHevT4Ivr1TqkNMNhua499sY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index e6461b85863b..814b4b5e971b 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -15,12 +15,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-softhddevice";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
-    sha256 = "sha256-RaPzflLz712+UU4dD7p3waMD6dg5SHfT9SfmON4jVk4=";
+    sha256 = "sha256-G5pOSlO1FU7kvHwH1yw8UBEeDwQ5aIxubdyFcWQ2Z/8=";
     rev = "v${version}";
   };
 
diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix
index 0d23000df9fb..bbf42b287435 100644
--- a/pkgs/by-name/ag/agorakit/package.nix
+++ b/pkgs/by-name/ag/agorakit/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  php,
+  php82,
   dataDir ? "/var/lib/agorakit",
 }:
 
-php.buildComposerProject2 (finalAttrs: {
+php82.buildComposerProject2 (finalAttrs: {
   pname = "agorakit";
   version = "1.9.3";
 
diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index ab1254a0bb64..1d324fa7e43d 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-2025-03-02";
+  version = "0-unstable-2025-03-23";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "f172389273a0ab35f703a6ab267c737d28ab7ec5";
-    hash = "sha256-YmtH5KtPeTDR8imQkTriJx5sD9cS5Tqp6Yjri/I+q3Y=";
+    rev = "9de336a436cb5ea1e47a319947acb1ea44cede6e";
+    hash = "sha256-gI5dmI5ysoCmUBTL6CgUw+F/K8D4RbXlXNTpIJMbotk=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables
diff --git a/pkgs/by-name/al/alsa-scarlett-gui/package.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
index 8d87ad212fa8..ca24560d3ab9 100644
--- a/pkgs/by-name/al/alsa-scarlett-gui/package.nix
+++ b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "alsa-scarlett-gui";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "geoffreybennett";
     repo = "alsa-scarlett-gui";
     rev = version;
-    hash = "sha256-Kc8KKFLMf4NZK8Bdnuttt8VOrYUpo0M9m3iJ+8z0hZE=";
+    hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg=";
   };
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
index 61f952a98dcc..a1dcffe21cd8 100644
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ b/pkgs/by-name/an/android-udev-rules/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "android-udev-rules";
-  version = "20241109";
+  version = "20250314";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    hash = "sha256-WHAm9hDpXsn+Isrc5nNgw7G5DKBJb7X0ILx6lG5Y7YQ=";
+    hash = "sha256-QADyZ3FHVuxX/PfsRt2ijwJRCksQb1Hz5lSgYJlyb1Q=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 4e568fcca434..b5282ed05206 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.14.2";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K4VXTO8F3GTOA9jOrI0OF6CYTRaDUlUT9/HujYmnHpM=";
+    hash = "sha256-n70H2FBvp7hxvRqU1+bvef9UrOzkSpg9QtFoqGyXiaM=";
   };
 
-  vendorHash = "sha256-t+E3sILEwXGkTaBtKLO2kFEntivY9fVK8o86arvMaOU=";
+  vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k=";
 
   subPackages = [
     "cmd/anubis"
@@ -43,7 +43,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/TecharoHQ/anubis/";
     changelog = "https://github.com/TecharoHQ/anubis/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ knightpp ];
+    maintainers = with lib.maintainers; [
+      knightpp
+      soopyc
+    ];
     mainProgram = "anubis";
   };
 })
diff --git a/pkgs/by-name/ap/apx/package.nix b/pkgs/by-name/ap/apx/package.nix
index 5b9d3be524db..34091bef284a 100644
--- a/pkgs/by-name/ap/apx/package.nix
+++ b/pkgs/by-name/ap/apx/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "apx";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "Vanilla-OS";
     repo = "apx";
     tag = "v${version}";
-    hash = "sha256-60z6wbbXQp7MA5l7LP/mToZftX+nbcs2Mewg5jCFwFk=";
+    hash = "sha256-0Rfj7hrH26R9GHOPPVdCaeb1bfAw9KnPpJYXyiei90U=";
   };
 
-  vendorHash = "sha256-YHnPLjZWUYoARHF4V1Pm1LYdCJGubPCve0wQ5FpeXUg=";
+  vendorHash = "sha256-RoZ6sXbvIHfQcup9Ba/PpzS0eytKdX4WjDUlgB3UjfE=";
 
   # podman needed for apx to not error when building shell completions
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix
index b291aa28eb1f..18b6761e30b3 100644
--- a/pkgs/by-name/ar/arduino-language-server/package.nix
+++ b/pkgs/by-name/ar/arduino-language-server/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "arduino-language-server";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "arduino-language-server";
     tag = version;
-    hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I=";
+    hash = "sha256-twTbJ5SFbL4AIX+ffB0LdOYXUxh4SzmZguJSRdEo1lQ=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0=";
+  vendorHash = "sha256-wXArVPzYmuiivx+8M86rrvfKsvCMtkN3WgXQByr5fC4=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/au/ausweiskopie/package.nix b/pkgs/by-name/au/ausweiskopie/package.nix
new file mode 100644
index 000000000000..2a33cdd80b6f
--- /dev/null
+++ b/pkgs/by-name/au/ausweiskopie/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  python3Packages,
+  makeDesktopItem,
+  copyDesktopItems,
+  desktopToDarwinBundle,
+  enableModern ? true,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "ausweiskopie";
+  version = "0.1.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Varbin";
+    repo = pname;
+    tag = "v${version}";
+    hash = "sha256-axy/cI5n2uvMKZ2Fkb0seFMRBKv6rpU01kgKSiQ10jE=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Meine Ausweiskopie";
+      exec = "ausweiskopie";
+      icon = "ausweiskopie";
+      desktopName = "Meine Ausweiskopie";
+      comment = "Create redacted copies of German identity cards";
+      categories = [
+        "Office"
+        "Viewer"
+      ];
+    })
+  ];
+
+  dependencies =
+    with python3Packages;
+    (
+      [
+        pillow
+        tkinter
+        importlib-resources
+      ]
+      ++ lib.optionals enableModern optional-dependencies.modern
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        dbus-next
+        pygobject3
+      ]
+    );
+
+  optional-dependencies.modern = [ python3Packages.ttkbootstrap ];
+
+  postInstall = ''
+    install -Dm644 ./src/ausweiskopie/resources/icon_colored.png $out/share/icons/hicolor/256x256/apps/ausweiskopie.png
+  '';
+
+  meta = {
+    description = "Create privacy friendly and legal copies of your Ausweisdokument";
+    homepage = "https://github.com/Varbin/ausweiskopie";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ e1mo ];
+    platforms = lib.platforms.unix;
+    mainProgram = "ausweiskopie";
+  };
+}
diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 7565be53919a..35d50ba68d77 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.134.0";
+  version = "1.135.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     tag = "v${version}";
-    hash = "sha256-CuXJHKHFE1HOs3fQPofWPJI1/+mtkXBGEmO7bIQD5lA=";
+    hash = "sha256-ccYpEznuU6d7gDyrDiuUmvdCJutXI7SAH2PH9Vdq8Fs=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index f9191d4ac0e4..2f49abc4bab3 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -16,9 +16,9 @@
 {
   application-insights = mkAzExtension rec {
     pname = "application-insights";
-    version = "1.2.2";
+    version = "1.2.3";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl";
-    hash = "sha256-ijmPj8jG+s+855jly3m5wEz5myS8pxU/Scf7lRP2VvI=";
+    hash = "sha256-yUHCMtBDZmNuE1TP4AcIUhAT+IpbHnR0DYBH7EbZBZk=";
     description = "Support for managing Application Insights components and querying metrics, events, and logs from such components";
     propagatedBuildInputs = with python3Packages; [ isodate ];
     meta.maintainers = with lib.maintainers; [ andreasvoss ];
@@ -140,9 +140,9 @@
 
   vm-repair = mkAzExtension rec {
     pname = "vm-repair";
-    version = "2.0.3";
+    version = "2.1.1";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
-    hash = "sha256-ynbq8XyoC6LR7N/x6Ztl74Gu4otTN+QiWLmvy7OfGA0=";
+    hash = "sha256-3Pgwppp4IssNYhJ+USQNwMEp91XdZDwNlnNWzVWrHFM=";
     description = "Support for repairing Azure Virtual Machines";
     propagatedBuildInputs = with python3Packages; [ opencensus ];
     meta.maintainers = with lib.maintainers; [ ];
diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
index 63fb1d0b610a..ee9dcb13c301 100644
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule rec {
   pname = "bicep";
-  version = "0.34.1";
+  version = "0.34.44";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "bicep";
     rev = "v${version}";
-    hash = "sha256-8ob4UISiqyhgBeQxRb6iLporsIVCq5c/7Yb2wvUW1ZQ=";
+    hash = "sha256-vyPRLPTvQkwN7unlIHs6DvpjXnXyW1PDtH9hhIOgN1A=";
   };
 
   patches = [
diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix
index 3d642154c028..ed67064892d4 100644
--- a/pkgs/by-name/br/brillo/package.nix
+++ b/pkgs/by-name/br/brillo/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "brillo";
-  version = "1.4.12";
+  version = "1.4.13";
 
   src = fetchFromGitLab {
     owner = "cameronnemo";
     repo = "brillo";
     rev = "v${version}";
-    hash = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo=";
+    hash = "sha256-+BUyM3FFnsk87NFaD9FBwdLqf6wsNhX+FDB7nqhgAmM=";
   };
 
   patches = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/cameronnemo/brillo";
     mainProgram = "brillo";
     license = [
-      licenses.gpl3
+      licenses.gpl3Only
       licenses.bsd0
     ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 2590dbd75854..e70249029444 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -17,13 +17,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "1.40.0";
+  version = "1.40.1";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-8Uo3eGF555yoBQxpq1cF9JLK9jkYVMHG+6eFFX1NO3U=";
+    hash = "sha256-1QJjdvH3cjZJKDWnua7EeqVEXaMEqYcv44jqG/O0+a4=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 1e85aa006d5e..c9d50be042e8 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.44.2";
+  version = "0.47.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Rdwn3izKSy5733KJw3OyGsBJ55xdxg9+MuI8ZNdei3s=";
+    hash = "sha256-g0kaJ3HPFeS5PvWQfUTanxCgm9sduW9nBx/N61kt3ZI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-11Y9BTtprv7EmBx7hsV8UnGDWmogj9azHOCAc/JdY7o=";
+  cargoHash = "sha256-jQx4VCarfbdTXOE/GAAzxeXf7xVwEaXDPhw6ywBR3wA=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix
index 9da29d3b9c45..9f4f625ae237 100644
--- a/pkgs/by-name/cc/ccid/package.nix
+++ b/pkgs/by-name/cc/ccid/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ccid";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz";
-    hash = "sha256-LsqPsH6P58DTna6sp7l81zxA7Ztyc4okrT3L38kY4eo=";
+    hash = "sha256-QZWEEJUBV+Yi+dkcnnjHtwjbdOIvcRkMWB0k0gVk1Ek=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ch/checkpolicy/package.nix b/pkgs/by-name/ch/checkpolicy/package.nix
index c399142bc16f..326c37f8fb82 100644
--- a/pkgs/by-name/ch/checkpolicy/package.nix
+++ b/pkgs/by-name/ch/checkpolicy/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation rec {
   pname = "checkpolicy";
-  version = "3.8";
+  version = "3.8.1";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${se_url}/${version}/checkpolicy-${version}.tar.gz";
-    sha256 = "sha256-ZforqKJR1tQvAwZGcU5eLegHrhbgIx3isDuUCq2636U=";
+    sha256 = "sha256-e0d8UW4mk9i2xRE4YyMXfx19tRwuBOttDejKKzYSDl0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 4d5d22703cf4..84069c8123d7 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-03-17";
+  version = "0.4.0-unstable-2025-03-27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "7d0a609a24efa7861a9cedd0abe057a250857d97";
-    hash = "sha256-BL5+z3CFInCEXgwyx4sHaHbUXLWwe/JWevD1ZDxQStQ=";
+    rev = "906aa9704dfd131fabbcb3ae2dbba33b7cc2a5da";
+    hash = "sha256-oRo26GB28wQ5gx+EgN/xyvOyA4IaObG0np05bFlJsF8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index 474cee254696..ca8ba21bae81 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -14,25 +14,25 @@
 }:
 let
   pname = "clash-verge-rev";
-  version = "2.1.2";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-rev";
     tag = "v${version}";
-    hash = "sha256-rsl3hBywToemthNrG80Mv+JagA4g4S7HukOaRpMKJi8=";
+    hash = "sha256-CiVwFSCbCxFm8naogpL73gUp8HNHwcIiygSVon4WNZk=";
   };
 
   src-service = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-service";
-    rev = "bfd7d597b13d49cf49b64676c2719f1ed9599d22"; # no meaningful tags in this repo. The only way is updating manully every time.
-    hash = "sha256-LdM0VIVsDPGnHEGwbRFh4/ACTdpVyDnu6dYLLvVbwpc=";
+    rev = "ffcccc6095e052534980230f9e0ca97db2675062"; # no meaningful tags in this repo. The only way is updating manully every time.
+    hash = "sha256-AbUflPcuSuUigRQB0i52mfVu5sIep1vMZGVMZyznwXY=";
   };
 
-  service-cargo-hash = "sha256-mJEk4OAEcuTk5NCzPcWwSlvysqR/9s8p9OGiXWBZvdg=";
-  npm-hash = "sha256-1OT9Iv9AF4svaOnWNQfOUdo8EUkG0+PU+y8nprc6YjU=";
-  vendor-hash = "sha256-myvFXaS+QdBRHPpcLEmhg1wgheWb4uXv+QXQf5HA51M=";
+  service-cargo-hash = "sha256-lMOQznPlkHIMSm5nOLuGP9qJXt3CXnd+q8nCu+Xbbt8=";
+  npm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw=";
+  vendor-hash = "sha256-nU3bIxD5zggTScNGH3HmnnXUGkLMwnQbIBVI1DmIpFs=";
 
   service = callPackage ./service.nix {
     inherit
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 973c650e0b5a..bf0cae5f8eaf 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -4,6 +4,7 @@
   src,
   libayatana-appindicator,
   vendor-hash,
+  fetchpatch,
   glib,
   webui,
   pkg-config,
@@ -29,7 +30,20 @@ rustPlatform.buildRustPackage {
     OPENSSL_NO_VENDOR = 1;
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-service-mode-mihomo-check.patch";
+      url = "https://github.com/clash-verge-rev/clash-verge-rev/commit/16d4f9fe7ee95b7312a10bf216c818c3e144dea7.patch";
+      hash = "sha256-FQHm1jjo0W1IokMDJGWVMVV9DWItG1prX+TIysL12DA=";
+    })
+  ];
+
+  prePatch = ''
+    cd ..
+  '';
+
   postPatch = ''
+    cd src-tauri
     substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
       --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
 
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 2cbd32b184fd..8511e41249a3 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cocogitto";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
     rev = version;
-    hash = "sha256-VorWk7E+I1hU8Hc+WF47+V483E/xPjf7Glqp7iA1t5g=";
+    hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-h6XX25uN9wBCdOYc1Bl6VWi3htopcXb7VhjNIDkmEJY=";
+  cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
   # and might be failing to create the test repository it works in.
diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index e56f83547a57..d61ac2cf6ace 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.20.6";
+  version = "2.20.7";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-f3CigPHi3z2Sd4CwsITPDPMqKEZimbjuIPByd4+oeK8=";
+    hash = "sha256-PYTKW+zfmOuJr5BClB3JQKeuZH986uct0m4WyDTxxnQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index c2a29e19fa45..28a35d6577a3 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "coroot";
-  version = "1.8.11";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot";
     rev = "v${version}";
-    hash = "sha256-DUagBuGHght6kt63V+o1Rr51KN/yUK7qCfBgbqnAiAU=";
+    hash = "sha256-qhKpB1Gp2GPtWCjlkEjVAx9oB2y8FYfZIMMlnpJLduI=";
   };
 
   vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864=";
diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index a6d296ead85d..d62f7930f3b5 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cozette";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchzip {
     url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${
       builtins.replaceStrings [ "." ] [ "-" ] version
     }.zip";
-    hash = "sha256-FOgRz9amVmJSBYPa0HEwzXWsdcc53td9g3tY3sQbs9c=";
+    hash = "sha256-L/C1fohaLSVbrxAr4v3R83x1/Yt8fI3Lo+c84cZvEHY=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix
new file mode 100644
index 000000000000..1673ddaef1a2
--- /dev/null
+++ b/pkgs/by-name/cr/cromite/package.nix
@@ -0,0 +1,266 @@
+{
+  fetchurl,
+  lib,
+  makeBinaryWrapper,
+  patchelf,
+  stdenv,
+  copyDesktopItems,
+  makeDesktopItem,
+
+  # Linked dynamic libraries.
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  gtk4,
+  libdrm,
+  libglvnd,
+  libkrb5,
+  libX11,
+  libxcb,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libxkbcommon,
+  libXrandr,
+  libXrender,
+  libXScrnSaver,
+  libxshmfence,
+  libXtst,
+  libgbm,
+  nspr,
+  nss,
+  pango,
+  pipewire,
+  vulkan-loader,
+  wayland, # ozone/wayland
+
+  # Command line programs
+  coreutils,
+
+  # command line arguments which are always set e.g "--disable-gpu"
+  commandLineArgs ? "",
+
+  # Will crash without.
+  systemd,
+
+  # Loaded at runtime.
+  libexif,
+  pciutils,
+
+  # Additional dependencies according to other distros.
+  ## Ubuntu
+  curl,
+  liberation_ttf,
+  util-linux,
+  wget,
+  xdg-utils,
+  ## Arch Linux.
+  flac,
+  harfbuzz,
+  icu,
+  libopus,
+  libpng,
+  snappy,
+  speechd-minimal,
+  ## Gentoo
+  bzip2,
+  libcap,
+
+  # Necessary for USB audio devices.
+  libpulseaudio,
+  pulseSupport ? true,
+
+  adwaita-icon-theme,
+  gsettings-desktop-schemas,
+
+  # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
+  libva,
+  libvaSupport ? true,
+
+  # For Vulkan support (--enable-features=Vulkan)
+  addDriverRunpath,
+
+  # For QT support
+  qt6,
+}:
+
+let
+  opusWithCustomModes = libopus.override { withCustomModes = true; };
+
+  deps =
+    [
+      alsa-lib
+      at-spi2-atk
+      at-spi2-core
+      atk
+      bzip2
+      cairo
+      coreutils
+      cups
+      curl
+      dbus
+      expat
+      flac
+      fontconfig
+      freetype
+      gcc-unwrapped.lib
+      gdk-pixbuf
+      glib
+      harfbuzz
+      icu
+      libcap
+      libdrm
+      liberation_ttf
+      libexif
+      libglvnd
+      libkrb5
+      libpng
+      libX11
+      libxcb
+      libXcomposite
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libxkbcommon
+      libXrandr
+      libXrender
+      libXScrnSaver
+      libxshmfence
+      libXtst
+      libgbm
+      nspr
+      nss
+      opusWithCustomModes
+      pango
+      pciutils
+      pipewire
+      snappy
+      speechd-minimal
+      systemd
+      util-linux
+      vulkan-loader
+      wayland
+      wget
+    ]
+    ++ lib.optionals pulseSupport [ libpulseaudio ]
+    ++ lib.optionals libvaSupport [ libva ]
+    ++ [
+      gtk3
+      gtk4
+      qt6.qtbase
+      qt6.qtwayland
+    ];
+  commit = "ee9852e97e8e1d0ec5edf1c1b35fd1f8b57f2929";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cromite";
+  version = "134.0.6998.108";
+
+  src = fetchurl {
+    url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz";
+    hash = "sha256-P1dLdpFYQlnJYT2o02PietgL2VW0cTGqYLtbkBJyPl0=";
+  };
+
+  # With strictDeps on, some shebangs were not being patched correctly
+  # ie, $out/share/cromite/chrome
+  strictDeps = false;
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    patchelf
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    # needed for XDG_ICON_DIRS
+    adwaita-icon-theme
+    glib
+    gtk3
+    gtk4
+    # needed for GSETTINGS_SCHEMAS_PATH
+    gsettings-desktop-schemas
+  ];
+
+  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
+
+  binpath = lib.makeBinPath deps;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "cromite";
+      exec = "cromite %U";
+      icon = "cromite";
+      genericName = "Cromite";
+      desktopName = "Cromite";
+      categories = [
+        "Application"
+        "Network"
+        "WebBrowser"
+      ];
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 product_logo_48.png $out/share/pixmaps/cromite.png
+    cp -v -a . $out/share/cromite
+    # replace bundled vulkan-loader
+    rm -v $out/share/cromite/libvulkan.so.1
+    ln -v -s -t "$out/share/cromite" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+    # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
+    mkdir $out/bin
+    makeWrapper $out/share/cromite/chrome $out/bin/cromite \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtbase}/lib/qt-6/plugins" \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtwayland}/lib/qt-6/plugins" \
+      --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
+      --prefix LD_LIBRARY_PATH : "$rpath" \
+      --prefix PATH            : "$binpath" \
+      --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
+      --set CHROME_WRAPPER  "cromite" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
+    patchelf --set-rpath $rpath $out/share/cromite/lib*GL*
+
+    for elf in $out/share/cromite/{chrome,chrome_sandbox,chrome_crashpad_handler}; do
+      patchelf --set-rpath $rpath $elf
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+    done
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/uazo/cromite/releases";
+    description = "Bromite fork with ad blocking and privacy enhancements";
+    homepage = "https://github.com/uazo/cromite";
+    license = with lib.licenses; [
+      bsd3
+      gpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ emaryn ];
+    mainProgram = "cromite";
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index e4d5cd6c7abe..dcf9f7c0dc4d 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "crowdsec";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-Jt5qFY41TnkvDw2BPd+vfyskhLpnJnsiUmUJcADQ0so=";
+    hash = "sha256-yregZUHdwfg/MJ9ndeHzpo4md9Qq+BAF0gHGC80+Mp0=";
   };
 
-  vendorHash = "sha256-I9h63iePhEMCy8IQNTomhgduGOyC3aoxz/0L4JQhhF8=";
+  vendorHash = "sha256-XTKOApMagrcHlgdGascIJzRZxjd+IBVhEyF+FiszOkQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/dd/ddrescue/package.nix b/pkgs/by-name/dd/ddrescue/package.nix
index 0b44929e46b1..f00dd7d0ef69 100644
--- a/pkgs/by-name/dd/ddrescue/package.nix
+++ b/pkgs/by-name/dd/ddrescue/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ddrescue";
-  version = "1.29";
+  version = "1.29.1";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz";
-    sha256 = "sha256-AaQUMnhTs5+6L9Ds4w977i6djI6OsxQxhSSt9aYAOaM=";
+    sha256 = "sha256-3dfUXfAmgHg1ouxqucNl3y7xno3hpQ/+aIbNOR4E3XU=";
   };
 
   nativeBuildInputs = [ lzip ];
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index 5526463d4420..5171e9c52261 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "decker";
-  version = "1.53";
+  version = "1.54";
 
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
     rev = "v${version}";
-    hash = "sha256-TsEGErzekSmAEJLKao74FxdfMq3yTuFrru6HncEvQ38=";
+    hash = "sha256-6rKfIMEWMig1LAaLk1eSUHnc2104FuN5wTVpf1SgCtg=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/de/denemo/package.nix b/pkgs/by-name/de/denemo/package.nix
index 88c2a4dbf856..837791645e1e 100644
--- a/pkgs/by-name/de/denemo/package.nix
+++ b/pkgs/by-name/de/denemo/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchgit,
   pkg-config,
   libjack2,
   gettext,
@@ -29,26 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "denemo";
-  version = "2.6.0";
+  version = "2.6.43";
 
-  src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
-    sha256 = "sha256-S+WXDGmEf5fx+HYnXJdE5QNOfJg7EqEEX7IMI2SUtV0=";
+  src = fetchgit {
+    url = "https://git.savannah.gnu.org/git/denemo.git";
+    rev = "b04ead1d3efeee036357cf36898b838a96ec5332";
+    hash = "sha256-XMFbPk70JqUHWBPEK8rjr70iMs49RNyaaCUGnYlLf2E=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "allow-guile-3.patch";
-      url = "https://git.savannah.gnu.org/cgit/denemo.git/patch/?id=9de1c65e56a021925af532bb55336b0ce86d3084";
-      postFetch = ''
-        substituteInPlace $out \
-          --replace "2.6.8" "2.6.0" \
-          --replace "2.6.9" "2.6.0"
-      '';
-      hash = "sha256-Jj33k/KgvZgKG43MuLgjb4A2KNkm/z9ytzGKcXMAOI4=";
-    })
-  ];
-
   buildInputs = [
     libjack2
     guile
@@ -68,6 +55,9 @@ stdenv.mkDerivation rec {
     portmidi
   ];
 
+  # error by default in GCC 14
+  NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix PATH : "${lilypond}/bin"
@@ -89,8 +79,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.olynch ];
-    # sffile.c:38:10: error: implicit declaration of function 'isprint' [-Wimplicit-function-declaration]
-    # sffile.c:54:10: error: type defaults to 'int' in declaration of 'initialized' [-Wimplicit-int]
-    broken = true;
   };
 }
diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index f801990766fa..eb8558b9dba7 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doublecmd";
-  version = "1.1.22";
+  version = "1.1.23";
 
   src = fetchFromGitHub {
     owner = "doublecmd";
     repo = "doublecmd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PyAmGYWA7QZcD7SN2utHacwqm8PQy8VxuVxAXlR7tj4=";
+    hash = "sha256-nvLVJAB751dY28jG1WjguuEVkCUb4Iy7V8cJjw3y8GI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dv/dvd-slideshow/package.nix b/pkgs/by-name/dv/dvd-slideshow/package.nix
index 619fda454393..fe2380d9c938 100644
--- a/pkgs/by-name/dv/dvd-slideshow/package.nix
+++ b/pkgs/by-name/dv/dvd-slideshow/package.nix
@@ -10,7 +10,6 @@
   lame,
   mjpegtools,
   sox,
-  transcode,
   vorbis-tools,
   runtimeShell,
 }:
@@ -24,7 +23,6 @@ let
     lame
     mjpegtools
     sox
-    transcode
     vorbis-tools
   ];
 
diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 7e818893c91a..dd718663ba80 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -22,13 +22,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.9.5";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-aubGM7kJMtfCRBeFgISuyXS9CkDwBC9hB3d6VA9mG2E=";
+    hash = "sha256-z2cl3yUNUQhLT9bPWApABUIRNdbYqG/7QDwRTvCWvjY=";
     fetchSubmodules = true;
   };
 
@@ -113,7 +113,7 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M=";
+  vendorHash = "sha256-3ry4eLe6W9YFFH7TdQm87CPvj8X/63XNC48A6EXqoDs=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index 147c5435d67e..c3d809614cd6 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.91.0";
+  version = "1.91.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = pname;
-    hash = "sha256-JRrDxJzbV1a3Ppo4fw9bREjJMRcV2Yj1gxflkE5WJfU=";
+    hash = "sha256-BIfyuZ7bf1P/8JfavIJNi06k8zEcCL1jwxAEnknpqq4=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ei/eigenmath/package.nix b/pkgs/by-name/ei/eigenmath/package.nix
index 34cc8b58836b..7ab596da4e6b 100644
--- a/pkgs/by-name/ei/eigenmath/package.nix
+++ b/pkgs/by-name/ei/eigenmath/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eigenmath";
-  version = "337-unstable-2025-03-16";
+  version = "338-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "georgeweigt";
     repo = pname;
-    rev = "622740aa22d11d08016d0ac962aa920f5e38f223";
-    hash = "sha256-sFiCYvp+SC8CnkMfoUXpAPFySd5nxiqLRVGiWsZ4FcY=";
+    rev = "2e4f6f099e7a9984e3d34430f63bc0606f364dd9";
+    hash = "sha256-Bp7+0ykgUqELF3KE678pkGneZCDcIfqlZo2g12Nb+Qc=";
   };
 
   checkPhase =
diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix
index 0f9e01609770..ceb56e9b4d12 100644
--- a/pkgs/by-name/el/elasticsearch-curator/package.nix
+++ b/pkgs/by-name/el/elasticsearch-curator/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "elasticsearch-curator";
-  version = "8.0.18";
+  version = "8.0.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "curator";
     tag = "v${version}";
-    hash = "sha256-J0RHCWr0l1Vm/rcmcH3w0E0U+S9AvM0XMO89rnG38mY=";
+    hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI=";
   };
 
   pythonRelaxDeps = [ "es-client" ];
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 9872a0f77d2a..7155cda71398 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.172";
+  version = "0.0.173";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-/FxjXCML7hBNYOVf1PLG+VwCdaNGYwwirRJSQxIvLcg=";
+    hash = "sha256-Yyn0yWcOWb379rzaA+KW0KiLVg0nbIwJJQ8NhQAsuN8=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 8e12caf52d25..0fb68f056348 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-03-27";
+  version = "2025-03-29";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-az5BZEWiDknvf0p1/5cbr9sDOVv2SDsXhdzlqtBYaO0=";
+    hash = "sha256-JSaOwl2JggWLAywxNTIpGB2KCp3qhepIeRjK5KWPX2I=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix
index 275285041b3b..329fa3b7aa90 100644
--- a/pkgs/by-name/ex/exportarr/package.nix
+++ b/pkgs/by-name/ex/exportarr/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "exportarr";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "onedr0p";
     repo = "exportarr";
     rev = "v${version}";
-    hash = "sha256-A6G1b9hTGp35ZHsDaMAZdH0LkkEyXCWoV6e5Bo3UqI4=";
+    hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo=";
   };
 
-  vendorHash = "sha256-8MrS/BMSjyWbBM8jVQYDsvLLaolgbP22Vp2PRX33Kfw=";
+  vendorHash = "sha256-F5WOSsjeOzMaj4Yze11OnqpgL1l87wpgl3OQEGya//M=";
 
   subPackages = [ "cmd/exportarr" ];
 
diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix
index 5880cdd7dbd2..8e85b598c5f1 100644
--- a/pkgs/by-name/fi/filesender/package.nix
+++ b/pkgs/by-name/fi/filesender/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "filesender";
-  version = "2.53";
+  version = "2.54";
 
   src = fetchFromGitHub {
     owner = "filesender";
     repo = "filesender";
     tag = "filesender-${finalAttrs.version}";
-    hash = "sha256-a9hA1aHuuSbFHggeKlh374/rEVszDdRToKLSiuVb66Q=";
+    hash = "sha256-FmTjnOlst3KfKTHKw2KqkLNhK0IhfYVAbVv7tMSg6e8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index a5c3c0be3681..f45d67eac22d 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fire";
-  version = "1.0.1-unstable-2024-10-22";
+  version = "1.0.1-unstable-2025-03-12";
 
   src = fetchFromGitHub {
     owner = "jerryuhoo";
     repo = "Fire";
-    rev = "4c3275caa0dbd9e65c6c3d574cc5ac1c828e529a";
+    rev = "b7ded116ce7ab78a57bb9b6b61796cb2cf3a6e8b";
     fetchSubmodules = true;
-    hash = "sha256-DyYP/uDawa+m2FtNvEvu36iRl6zfMyGNMMad5f/rX4k=";
+    hash = "sha256-d8w+b4OpU2/kQdcAimR4ihDEgVTM1V7J0hj7saDrQpY=";
   };
 
   postPatch =
diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix
index affa56aaedea..dcb75fc62b89 100644
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flashmq";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/nSNWmSR16V1+nXOMIx+TtxtNS9Xk3BJSY4ps+6TwG8=";
+    hash = "sha256-ccTarrInS9Af9fT43dgRTuHVuHbWlYzDAEh31myHUvY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix
index 90f8c6f67afc..44c9e9ebd42b 100644
--- a/pkgs/by-name/fl/fluidd/package.nix
+++ b/pkgs/by-name/fl/fluidd/package.nix
@@ -8,13 +8,13 @@
 
 buildNpmPackage rec {
   pname = "fluidd";
-  version = "1.32.4";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "fluidd-core";
     repo = "fluidd";
     tag = "v${version}";
-    hash = "sha256-5siU1BunQ1tcF8pg0trKkynJXmLdCS1rFo7J0WX8V30=";
+    hash = "sha256-z1qb3n+BlvQhw6fKvfZ6s/uSdWbXAJ8xqvQRdLPnD+M=";
   };
 
   patches = [
@@ -23,7 +23,7 @@ buildNpmPackage rec {
     })
   ];
 
-  npmDepsHash = "sha256-+MfqmMZ2fiijr4X2S2TQfo25mVGpnZtZYOxCfPH4gFY=";
+  npmDepsHash = "sha256-RpnZLJzxMmwo/XsXOWshw8xCpXG6GuhsaTb4rnXt/D0=";
 
   installPhase = ''
     mkdir -p $out/share/fluidd
diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
index 6f8e64b3faf0..9897087b6870 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "flutter_rust_bridge_codegen";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "fzyzcjy";
     repo = "flutter_rust_bridge";
     rev = "v${version}";
-    hash = "sha256-amjfreJq/GC/Xou39i2IIIGI1ukpiWRx3bddxVQB6dk=";
+    hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zRiyLFDRqhi6TUt/UfWvgJ2hqWdUz8jxUCvN5RDp1Bk=";
+  cargoHash = "sha256-efMA8VJaQlqClAmjJ3zIYLUfnuj62vEIBKsz0l3CWxA=";
   cargoBuildFlags = "--package flutter_rust_bridge_codegen";
   cargoTestFlags = "--package flutter_rust_bridge_codegen";
 
diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index b4002ae64ce1..88973a0fa160 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.23.2";
+  version = "0.23.3";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-P0ENx8PDWbqfiBEsWv11R3Q/FE+rAFhhk49VyQgXIz4=";
+    hash = "sha256-EpcYNUtGbEFvetroo1zAyfKxW70vD1Lk0aJKWcaV39I=";
   };
 
   # Darwin requires writable Electron dist
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-U6H4TMKR+khs5fQtMtIBnHpAzJvHcvMeSD1XUqaov/M=";
+    hash = "sha256-xiJGzvmfrvvB6/rdwALOxhWSWAZ31cbySYygtG8+QpQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index 465b6c3b5620..8b7376d06b9f 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -82,23 +82,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "frr";
-  version = "10.2.1";
+  version = "10.3";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = "frr";
     rev = "frr-${finalAttrs.version}";
-    hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs=";
+    hash = "sha256-o/BG12FVypIaInXDeOj2Ymdgv1mxof9Sl0ZQA8o3YLs=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-44070.patch";
-      url = "https://github.com/FRRouting/frr/commit/fea4ed5043b4a523921f970a39a565d2c1ca381f.patch";
-      hash = "sha256-X9FjQeOvo92+mL1z3u5W0LBhhePDAyhFAqh8sAtNNm8=";
-    })
-  ];
-
   # Without the std explicitly set, we may run into abseil-cpp
   # compilation errors.
   CXXFLAGS = "-std=gnu++23";
diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 1f976936aa8c..cded6b78595c 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "gallery-dl";
-  version = "1.29.2";
+  version = "1.29.3";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-vr+qvztNtFMnDzi0GGX10eZCj5EqXj03OnIXudvrumU=";
+    hash = "sha256-LzMiJxMl6IWtUloWxBAMLvkhnTQpHkz/gjWl5gW2sZ0=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix
index e5ee491ab68f..8aac346b5eae 100644
--- a/pkgs/by-name/gc/gcfflasher/package.nix
+++ b/pkgs/by-name/gc/gcfflasher/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   libgpiod,
   cmake,
@@ -9,15 +10,22 @@
 
 stdenv.mkDerivation rec {
   pname = "gcfflasher";
-  version = "4.6.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "dresden-elektronik";
     repo = "gcfflasher";
     tag = "v${version}";
-    hash = "sha256-z7FsxTAsAmjz76NxbqZuecN1ywAZYHhgcPfOe6y5QNQ=";
+    hash = "sha256-W1sL3RyauEYAC/Fj0JhNnk0k5DT6Q8qIEuZNke3xNAE=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/dresden-elektronik/gcfflasher/commit/c1019d7ef2ab55a598ddd938db1b08169b05fc37.patch";
+      hash = "sha256-Frd3Xerkv3QolGCOrTE4AqBPqPHTKjjhk+DzhHABTqo=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index ebe11c9382f0..3b1bb6f0a6a4 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.17.1";
+  version = "0.19.0";
 in
 rustPlatform.buildRustPackage {
   pname = "gir";
@@ -15,11 +15,11 @@ rustPlatform.buildRustPackage {
     owner = "gtk-rs";
     repo = "gir";
     rev = version;
-    sha256 = "sha256-WpTyT62bykq/uwzBFQXeJ1HxR1a2vKmtid8YAzk7J+Q=";
+    sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-bytICp0+1/suM+kf4VX9z/mpnsdXi3I3dPUlK3A9+V4=";
+  cargoHash = "sha256-ObEXOaEdwJpaLJDkcSmAK86P7E6y0eUQQHFpX4hsuog=";
 
   postPatch = ''
     rm build.rs
diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix
index 228bc39b6bf5..d39850168a15 100644
--- a/pkgs/by-name/gi/git-gamble/package.nix
+++ b/pkgs/by-name/gi/git-gamble/package.nix
@@ -9,13 +9,13 @@
 }:
 
 let
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitLab {
     owner = "pinage404";
     repo = "git-gamble";
     rev = "version/${version}";
-    hash = "sha256-hMP5mBKXcO+Ws04G3OxdYuB5JoaSjlYtlkerRQ6+bXw=";
+    hash = "sha256-oWbV3KhDcb/LlDkaGqkrYU/b2LEijUTX0RaHi0yS5cw=";
   };
 in
 rustPlatform.buildRustPackage {
@@ -23,12 +23,16 @@ rustPlatform.buildRustPackage {
   inherit version src;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-t58vf/xhJi5HV9lBWvXzKMZ8I2stjTAmCOrdLWPerGI=";
+  cargoHash = "sha256-v8sQuFmHHWuLUhRND1CzI5VkybgHRETVyNNabw1Uhyg=";
 
   nativeCheckInputs = [ gitMinimal ];
   preCheck = ''
     patchShebangs tests/editor/fake_editor.sh
   '';
+  checkFlags = [
+    # this test can be flaky ; help is needed to stabilize it in upstream
+    "--skip=git_time_keeper::white_box::lock_file::create_as_many_as_lock_files_when_starting_several_times"
+  ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index a2101ac62fa4..5420ca4ae351 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -35,18 +35,18 @@ let
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.23.5";
+  version = "1.23.6";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-SWLkrZTZXXy7x3kszagR0hjrmLhtYvGRf05YU5Mtbl4=";
+    hash = "sha256-psVny0qmx2wPiNK1qIXQiW0gdRsZs16MEfIgBXTWgFI=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Iiw302HDGf6ECw2cGqwZCwAqQ21eQVaEab/cuhD1dJ4=";
+  vendorHash = "sha256-h9RnHv4weGfHwpmuEhQbsYDd5fKc439m0gF/BgDVIdA=";
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/go/goimports-reviser/package.nix b/pkgs/by-name/go/goimports-reviser/package.nix
index 35b8a56be98c..af2d48f40862 100644
--- a/pkgs/by-name/go/goimports-reviser/package.nix
+++ b/pkgs/by-name/go/goimports-reviser/package.nix
@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goimports-reviser";
-  version = "3.8.2";
+  version = "3.9.1";
 
   src = fetchFromGitHub {
     owner = "incu6us";
     repo = "goimports-reviser";
     rev = "v${version}";
-    hash = "sha256-73EU2LaOq5AfMssYJShhQLbZjrK4qbERn9SRomMMsHA=";
+    hash = "sha256-MMF5gzUbL8j9NTGKT1Xz177Z0SqdeKObBa6TEguK5aI=";
   };
-  vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA=";
+  vendorHash = "sha256-BAV7vMWRgBZaL2Pya4QiVcY54VIiHT++Dz4ZZ92FGgM=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index c681e7f0f5d3..951d7b453687 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "greenmask";
-  version = "0.2.8";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     tag = "v${version}";
-    hash = "sha256-Upgf/VmWHtvldIx3n6e3NTHDzs7XoZUBVcEVC+ix9cQ=";
+    hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8=";
   };
 
   vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA=";
diff --git a/pkgs/by-name/ha/hashrat/package.nix b/pkgs/by-name/ha/hashrat/package.nix
index 3c215d1e2474..9f4fd90d8c62 100644
--- a/pkgs/by-name/ha/hashrat/package.nix
+++ b/pkgs/by-name/ha/hashrat/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hashrat";
-  version = "1.23";
+  version = "1.25";
 
   src = fetchFromGitHub {
     owner = "ColumPaget";
     repo = "Hashrat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dDtn01eoODgRtsbEdtuXhib3fZLosP8ajJBGaG8Skss=";
+    hash = "sha256-nGaOVvy8caySohCGyGdnxXsv2DuqFPRi4JJLlZy+q8o=";
   };
 
   configureFlags = [ "--enable-xattr" ];
diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index a83955ab23de..75b67969093a 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "htgettoken";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "fermitools";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-cp/Y4l59MscQIrHjVdMUQEqgFZTPTEfVdRoH/pOG5uQ=";
+    hash = "sha256-O0OHnYaoTkqUqD4s+wEAzN3Paq9qsjBZdZ0QUXdFefE=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix
index dbff6d5397d3..fe418f68d6ee 100644
--- a/pkgs/by-name/hw/hwatch/package.nix
+++ b/pkgs/by-name/hw/hwatch/package.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hwatch";
-  version = "0.3.18";
+  version = "0.3.19";
 
   src = fetchFromGitHub {
     owner = "blacknon";
     repo = "hwatch";
     tag = version;
-    sha256 = "sha256-E1IxeraZTHY+FDnOhyjygFyqOIwVEvnKuPuuNZvvL7o=";
+    sha256 = "sha256-lMsBzMDMgpHxcQFtfZ4K7r2WRUaVR8Ry/kPvwfzPObI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-gM9KLf2kEY48M8nQrSdBoqdU9ssQj4sH/hma3/+3JTw=";
+  cargoHash = "sha256-UnaZZEmX5XoTVFLEFj5JkJXJkjoUBwzJokfffJTPP4M=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 5401ab10bd67..426a1a79e0e4 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "infrastructure-agent";
-  version = "1.62.0";
+  version = "1.63.0";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = version;
-    hash = "sha256-qwbYDPj47Tya1De+4hawgkz+StZ5seR+UNPc2vhl+pk=";
+    hash = "sha256-odB40XRZyFuHX82RzxIvW3SAwglOyYRiApWUfRhOEmk=";
   };
 
   vendorHash = "sha256-Oxhraf5xsnowNWZznB6JE+nCnGc3D5dOi/EWIvyv81M=";
diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index cded6b5712ee..2ee012e1883a 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.0.1";
+  version = "33.1.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 676afdf8cb33..455e931e1ea8 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1abwdisa8v4af2jw7abfrjkhh5wg293da3v96p7irpgha3hg50hc";
-  IosevkaAile = "0mzqkx9if9hcb7dk4nil55r1ybh908v3ncbl1ckmbvxrsh5s1b9l";
-  IosevkaCurly = "0yv6nr96dbq0pvs80mq6m3laagl70jqbk9szbvnwzwj1a5c6vnvq";
-  IosevkaCurlySlab = "0l1gls5kxiq1nxv68jnlww5ygi6qgi1h0dhnsd6xv2f0f85wvzc1";
-  IosevkaEtoile = "1hzg1jvjcql925bwwv99g3kjm31gq9jbkq4fap6m5x504aihcxni";
-  IosevkaSlab = "1wvp2r6972akxl20k5fjnkkj2kiv33k4g09gkgd97j40zsbk808j";
-  IosevkaSS01 = "00xw9cnzx4b054mmlphx949z3av47wykmkwjgaihnqv0j7yypwxg";
-  IosevkaSS02 = "0rrfy32r7ikkxr6b9b2zcb8a2441411fkgjj1k519ixr8zf6f3ja";
-  IosevkaSS03 = "02dnfjyjapgch45gydyyl7m9lcz85vx8csqkvxkxll93hmipippm";
-  IosevkaSS04 = "0rgk652607kh4i9xasjg8m1ll6qj6l7v2fw7bwb5xwi68s38b0kf";
-  IosevkaSS05 = "15sk5l8dchp5w9b2yw6w1kq90673pq147sid253wampjdrc7z222";
-  IosevkaSS06 = "1j9znczpz3hvxrzbm4zqh8vbv81sbar58ayh3dmv1bwgb5mq658m";
-  IosevkaSS07 = "1g6jrdwd5hf61wapix179ry22yzjc3g88vpqy6j5s2knq3l4ni6c";
-  IosevkaSS08 = "0drnqwnmkpazjhrp8v1ly2fix1x4paa11cy7yr6kc354bxb6krc1";
-  IosevkaSS09 = "0wvrwwg5md4jdxsxc9rc2r62sraixq4xdznb901iblzxylk5cfpp";
-  IosevkaSS10 = "0zg84i6kf88ahg6m6q9z9lpgh2bmphviciqcrky8bdcc7bda96zw";
-  IosevkaSS11 = "1b7bw2y5p48y0qks6dc8dxiva7xjz7mkzwnxw19jrwas5is4q8wr";
-  IosevkaSS12 = "1c8r8cz6s9wl3wcra42qajk6nnvzijwrvbhxah2b9q8qf5z1ycj5";
-  IosevkaSS13 = "1fa9q895rdgif3xrdx5hsgzynx0zwah33rvycnfvwgwcayi5jfj0";
-  IosevkaSS14 = "05cbb8qav3vyx79gri2naxlwg0b13phr8b3gg3iddklb4zck88ac";
-  IosevkaSS15 = "1k6wyk0w7gmc7z0p596lgfi8p9xi4m99nan2fhgzclkmvpyz07hx";
-  IosevkaSS16 = "117yh5n9kgqlyisfizr422z6ig7yxj0zkqlarjvbpdby5v541mv5";
-  IosevkaSS17 = "1smlyrynirjwcqw2ddx6zkkbdcvcjr8qqmmn9r011j794j9dhl75";
-  IosevkaSS18 = "1zdify73ziq7jcg26hj70z25ywmc1jp64zdnwjs2dwq5fhvl6lc9";
-  SGr-Iosevka = "11h20s9dl6hwz0vz8fk5m4cqzpw1dn97ys7imhp3clzj9nij6c9f";
-  SGr-IosevkaCurly = "06pr490jq0z84y7kj2hbfc3jl14xsawpjsxcyd33bb9ab9p1yzfc";
-  SGr-IosevkaCurlySlab = "02l3ppclgcw72hr90pw3skp7dr13qyx88qkf8w4ki4qyn0mbdjhv";
-  SGr-IosevkaFixed = "1arkc7yygskfywv9hwnz4jks6fsrw5fky6xznnbh840v524a9pmb";
-  SGr-IosevkaFixedCurly = "07mww0732w1in5v2g1m7r78q3yk7ivwlc2ckv4bqr76xf48vrwzb";
-  SGr-IosevkaFixedCurlySlab = "0y0mnxjh868nnlmn8m37078fjkjhv4242jqzvbxidknxz1giwcvc";
-  SGr-IosevkaFixedSlab = "1xfh54ybb3h95spdjf1ns5ps32hglhnrc4lfibn5dpvz1xdis94x";
-  SGr-IosevkaFixedSS01 = "1g9ymiixhs8axqbk44ggsiip0jcd48xy9i0fxlpqcwnclm31by1z";
-  SGr-IosevkaFixedSS02 = "0abvhswiflpd6lc7yx7dlr08z1d250asc1z6pc7f60f3vj6hlry5";
-  SGr-IosevkaFixedSS03 = "0wi7kacxrmjc96zpwxg3nnkdhfnwxn0ykaqwryi2h9x0va2dlxf6";
-  SGr-IosevkaFixedSS04 = "0pziw1jlzbd2d2f6aqxc4amzcwaps197w3f3kg0s0kk8gpbcksc8";
-  SGr-IosevkaFixedSS05 = "1nc2ps34hk1913snl77rx4sp7h8zcip2m4yr0b7ym6710n7mdj47";
-  SGr-IosevkaFixedSS06 = "1054z104prssjx8x4a5mbr384vkxc7xya9xpal7ffj50mhl9wivi";
-  SGr-IosevkaFixedSS07 = "1jpd5v445fbf02ngbgs4cxxid1cqya1gjspamiidfbz9ixyx0rib";
-  SGr-IosevkaFixedSS08 = "12d22n0lmbvyjj76igvmypr148rd62sfkxkf29xl4yjqawml1yia";
-  SGr-IosevkaFixedSS09 = "1x89d80gnf1g7fm593dn50w8lrgbplasmsc1g9y9628wn3x85zdw";
-  SGr-IosevkaFixedSS10 = "1cx5pk4rxpay140vjfsx1v32k5gp4dfkmh3kj4sl2yqarxbjy886";
-  SGr-IosevkaFixedSS11 = "00fynnbh7v3nn574a3a04bx41pghzbdqm6522pwdhwkqp35ds8fp";
-  SGr-IosevkaFixedSS12 = "18zrpy61axkyyigklkv652azfjl1v2nhs1qgakq20b1bwg28xbrp";
-  SGr-IosevkaFixedSS13 = "0c0y34v9bwfnprpv1pgml2ah5ichpwwk70c44qm3p53m6mjx44sw";
-  SGr-IosevkaFixedSS14 = "1q5wjj98my02kkdsqnqyndqc1crmv0ksiiv10pq0d12cl9748drn";
-  SGr-IosevkaFixedSS15 = "1qx644g8abpydb3bamlnxxilwv55j62xya88vq03pjzy94z9jpsc";
-  SGr-IosevkaFixedSS16 = "1pi7w0b5y7bbkjj7rhpi4isd7db37n2vzq1f1qd0mv9f7z9zic6i";
-  SGr-IosevkaFixedSS17 = "1afynn5j5k3lljlhl1pgglvcjfc14r0x64rk5nmh17j37fqypxs8";
-  SGr-IosevkaFixedSS18 = "0khaa4k4pyfp2p6vz9nnx4jp6ff0b260x17l6q7f2ahpf7lhnvvw";
-  SGr-IosevkaSlab = "03hzzl21p4m4yw4ad61q16ail2c53r8w6hazvyz0401pvnw75v7c";
-  SGr-IosevkaSS01 = "0y5ga8d8r7nqkjk6hk5hwki23920cf07v5dkx98x69f5y03l8y9a";
-  SGr-IosevkaSS02 = "1b4biawj8mz7klwp5dww7kw4l3kjd8wyzl9rdgvk74k4r60af404";
-  SGr-IosevkaSS03 = "0v592zg675a2ajf0v6vf3hmx1as7rb7s12lw9xzly0c15lry4zv4";
-  SGr-IosevkaSS04 = "19xg28zwnrbdwlngy5ac69jxf4g3di7di55irc8mg2mirfj2g8nj";
-  SGr-IosevkaSS05 = "0p49pidz9xr1xswxixib175gxdlphg6y3fvi5izg11xybr71yy2y";
-  SGr-IosevkaSS06 = "1x46df043i8z97m5s8j35nisyc5wj6ihqb4kyrxc2jqz0128bkjg";
-  SGr-IosevkaSS07 = "0pn6cdsig8nwza6z0dh19nrg83smxrlsjgqc8gsw41nxfbf121pv";
-  SGr-IosevkaSS08 = "091n2gmzrfqiav48gly7cz62q39nm2aym7yyyj627w4kswd9xfsh";
-  SGr-IosevkaSS09 = "1jsd3fw80fgq6jwcpf6cqpvd9s59lapgjy088rsb6pmww17gkd15";
-  SGr-IosevkaSS10 = "027f7f003gc05rls5zycywzknrbviaw3zm78fqzrd4ka8wm39fpp";
-  SGr-IosevkaSS11 = "076xiy33w5gf1gyhqc7ywzfasp7ibywmmff248r6jiishvk8c50p";
-  SGr-IosevkaSS12 = "0chgzb85f3l5c46fg301wm8353sga139i4qb0pb9gk7p2y5fzrhc";
-  SGr-IosevkaSS13 = "0ackkxyib1n4qmzp8bc88lqgymsv389x3fnas8d0idjp5zzivlgi";
-  SGr-IosevkaSS14 = "05gh1r39g01lvxgkdbv9awk009svlp94i490q8wj74c084y39mab";
-  SGr-IosevkaSS15 = "19w7zbgwzw58gqbqgkz57g5hbaaikailmwjjf51i0j4zbg9ycqx7";
-  SGr-IosevkaSS16 = "09qb2c9bqxwhqycl829pgx690dqqhmvjgkz1qhdpr2hfp9wscyx2";
-  SGr-IosevkaSS17 = "0ghfsfpq5j5rx86ggv4slsxfaz3x7j3hkh19671j799mhizwjf2v";
-  SGr-IosevkaSS18 = "0ahf8l7fg354ppi2ym59xbnxrm58k9lkclxa0idig2h7xqjcrfnc";
-  SGr-IosevkaTerm = "0ilqld2x7af90345i62j3m0agsnsbrldxqlvmavhm6wwv0r7m274";
-  SGr-IosevkaTermCurly = "0hy553x9s7w8i2zx3bi5ib8c7ia7zfb76236dy65s5i6jayvnpmr";
-  SGr-IosevkaTermCurlySlab = "1vqdagirfhab2ac534jpxw1hsk9svajpkfaak5q7rhiff6s919zb";
-  SGr-IosevkaTermSlab = "0m1lmfb7g11fpixar24njg575cza3zf8pq8qpnfchj1dz8yhfi7n";
-  SGr-IosevkaTermSS01 = "1wrixpzqi1midaybgwg7dr5fg5ijpby1i4b4dllwv3hh1h68dl1k";
-  SGr-IosevkaTermSS02 = "0bw5mx89mizdzgwhaslgyiaq5ivz2vadrdrhpvc5p2bbrq6vjk8f";
-  SGr-IosevkaTermSS03 = "1za8s20saxn6iyrsdngyqzfl4i2w3v7pg1drr5g02hx0z74pm3k8";
-  SGr-IosevkaTermSS04 = "0yx6mn584fmnilaksiwnkfs8gg96n6bd8igalsl7912kv5hgrl57";
-  SGr-IosevkaTermSS05 = "0yl41all8xl2h1jq6nfax2j9x5ncg5qzid8r77knz30a1x7k5kis";
-  SGr-IosevkaTermSS06 = "147ji66rhbii7jcs1hjzyiy0sk47iin5nwys9vpfc3cb8qbyxinp";
-  SGr-IosevkaTermSS07 = "1nvs5j5cqa3nn97akisr4li5iavxplj5ix102ay9pahh7699prxj";
-  SGr-IosevkaTermSS08 = "09yw7p07gmi6dykxwll5zgacsxgyd9nqsglkilpy726bqq1y9bm0";
-  SGr-IosevkaTermSS09 = "1373ana5i04y42phm8djvldqhxp23c560k58dplfmrijkxg9v9ah";
-  SGr-IosevkaTermSS10 = "01wppyqf41fk3v8wsb20m4xa10mmhjh1fqwvygkxg6bdhrls9h65";
-  SGr-IosevkaTermSS11 = "05shlbgcknwslm1h78qgcx0snr0gmb92hyc84h10jzrh2rhwpmdr";
-  SGr-IosevkaTermSS12 = "19q8mywksarwff4h9izcbl91swxskqcj1x6yagbyfd2v7wbmzhiw";
-  SGr-IosevkaTermSS13 = "07ix812bw4q6img8lnds5rq5z08sc39jkmpinwxgn6j1yz8fhsk6";
-  SGr-IosevkaTermSS14 = "17cwfqlx9962biypc7sqihx58645xgvs4bb1jkfvjz0rj8f699jq";
-  SGr-IosevkaTermSS15 = "16c0bpal9i2pjbgn4rwqbcwwzins5qp1llqjspi1967sn9v3y0nk";
-  SGr-IosevkaTermSS16 = "08r0jr98z8z3wh3p4pdd9249kggixina4v2cxyb886rqc5vj2263";
-  SGr-IosevkaTermSS17 = "1115qx8gafyxnmvf1m107sg048yy0k14787qv9l20y3h09kvi2qd";
-  SGr-IosevkaTermSS18 = "1pf151qwr9yh166fssv161ajkid75m2nl3p9y7b2189qvmds8a9m";
+  Iosevka = "0fqm3dall5yajqinxpqqnqbngr2qj1g9ch6a24b56y1xjd62cran";
+  IosevkaAile = "1qv1ipnky1jwkrgwb2zzlcsjyfpswy1h7jjdhybkqqxr0kln6669";
+  IosevkaCurly = "0zy9dhwglbbsgwa0s7nhz6lm72v88iv4pqnpdfjq5yn5ngsr9wnx";
+  IosevkaCurlySlab = "16vrc3lk5islp0v53cc1jcipxqqq0mgrpx3vx8qqc0jy34vraa2r";
+  IosevkaEtoile = "0x4bc20iwdm3ympm32zvskqlmjb23j4k9f1bvmmc78v1s9l07n9h";
+  IosevkaSlab = "06njqwhd80ikv7armlyryslkrlwa44nn47m46xw2k6zdws6rilm0";
+  IosevkaSS01 = "1ksrvlv1mysy1ld4yxiq1hh7jhhg61p3yhyb8m7cpwpi340vlf7a";
+  IosevkaSS02 = "0b0l4wbjqvxyp20wfnky3filvwpv59xxav4sa8ad92rgz5q24lxc";
+  IosevkaSS03 = "1prjhxirv2rdaxcwpn8r5c96pjk1rpwf9kz92yidh7szcfn92b9x";
+  IosevkaSS04 = "108agp6nq0rddd7hb4r5nf0c3122nibzspin19yhicaxangba1rb";
+  IosevkaSS05 = "09phnpjxx3xadyar4cng7bl7i96l4z65z8z7xixkgjhrbfb3gmn4";
+  IosevkaSS06 = "137qdcs31qny3fqi4k96pcrhi95r8piv6bmdfv3lcv94v80zz6f0";
+  IosevkaSS07 = "1n34hai1knj66q1ab9n9s839qizprmrzda8ww7hnc7l1dz5yv12d";
+  IosevkaSS08 = "1rzllgh5s3brh6bipszhcs2hr4bmzq325h72s7agj2dq451a3i8a";
+  IosevkaSS09 = "0pkbxraad7m3bcp6db48wwm0k8xb303cqcd4cnczgrnl8qkd2pd7";
+  IosevkaSS10 = "15107qv3rmvwc5mrlp1h1sh6f0m40daspxri27y9bgl2imz074sr";
+  IosevkaSS11 = "0f5ym3324y8jwinkraqsl79342gj8078yrmv5k6a9wzwzb23y82j";
+  IosevkaSS12 = "0yqmm4yl4dcldl49w0i4bm26l2y540531drpbp63q3m84gkxkr56";
+  IosevkaSS13 = "1k1h6zpq95dadybv84q16jwk3gy8151l8z4302rsh2c474w6p8cg";
+  IosevkaSS14 = "06xx3cs3qvb0i3zw0v1rbk573dmpfg2izqjs65bdzn1v8h13glqv";
+  IosevkaSS15 = "13bbpnc9hkndy8rfkfxvyr98pqh822xn6npp6h5gipslczgci0kr";
+  IosevkaSS16 = "1cgfmb38l6hdllijdg1ybxhk2acx8rxa0lxx4z9rpak00bw3zy4m";
+  IosevkaSS17 = "0a3ir1wa93darilalvkyl2gp3rgk3v86qvbvq428pg3z0fkxg4lp";
+  IosevkaSS18 = "0kc144dc9nsq5anp61pfyad5h4qwgkm7xnca10g62cn1a1l2lkks";
+  SGr-Iosevka = "04jwfl8idgqv1y401y6b6pc4hdarkp126n43kdcb8x083qfnfw20";
+  SGr-IosevkaCurly = "085yphzyb044v091sn726iz5kwmk8vsy19v4m936kk9b7s5jcavz";
+  SGr-IosevkaCurlySlab = "1axqcc57sm3bxqsssbanxsfl2x4s417jf6v0gjlkv3dgknmq18zh";
+  SGr-IosevkaFixed = "131ibj57v2sabb8pw8dhk86q0kbh5q22allkdcibgcrj8av9g3ym";
+  SGr-IosevkaFixedCurly = "12fy0i2hd91p9z7n9jqbqyac2s15xz17m7qsmqnh5ijbv0h15xs3";
+  SGr-IosevkaFixedCurlySlab = "0lrcpjiam1hvwhfgpafv6pny4a443x10f64lhs7ig5ga7msn34ww";
+  SGr-IosevkaFixedSlab = "19y749m77i5xw4ny6x6zqbdg2pjpwm8ns51y1k6x6fxmzw1f45iv";
+  SGr-IosevkaFixedSS01 = "1332dsn8n11mwiqv5qhkiqzh0cp1bz8jc576mq735xcsdjb9rmbv";
+  SGr-IosevkaFixedSS02 = "06pg5kpklgapidnmh97r9zr7lk043493pi1154p3rxn71q5q0gja";
+  SGr-IosevkaFixedSS03 = "13bjcbhdcabcdq8xy7rc75vszmdhq1n8ykqyg32g04mcza6qh711";
+  SGr-IosevkaFixedSS04 = "123fqgpy1srsbryp3svamqfgxdk0kh98rdlbmhfaw3fzdrfcpbm1";
+  SGr-IosevkaFixedSS05 = "0zc7v7c4q50hlyrwkw58rm20igbyvkq07fhb369bijr42rlvhhc3";
+  SGr-IosevkaFixedSS06 = "1l0zwmq1l2k5iz88zwv4wksl3h2kvfr0vjdhyf8sc42la99v7xsk";
+  SGr-IosevkaFixedSS07 = "1g7vs4j1b1h0xqs8lzasgjszz1pf80frgj819qnrqwf7as0lhlrn";
+  SGr-IosevkaFixedSS08 = "0dxc5c2hy0vf0jn7njm1xpcblvmnkz2yalqksqf4i2fip1ysd5yc";
+  SGr-IosevkaFixedSS09 = "07s43jhxwh6qha4k5wpxv7sqqhbd475sqwrv14fzw08m12mpdpkc";
+  SGr-IosevkaFixedSS10 = "077dwvnm78fx0fj4bh0clzmvcgk6kci2a9avwqp4zqzz12z81dmj";
+  SGr-IosevkaFixedSS11 = "043wc8075359llr5jy6jzrh9dvdzzgc0iqplvvncmhj69q06cn81";
+  SGr-IosevkaFixedSS12 = "1dbf3lqygz7wckq84gfy92wjpiqy7jwhbbfb9mcbvnnkz9vn33nc";
+  SGr-IosevkaFixedSS13 = "04my4x9k4hcrzl9iab44dd1xpab2i486vxgr3ap4g8yppgc1844d";
+  SGr-IosevkaFixedSS14 = "0r11nq120hccmbg0yzam1zigpcwxymghgqrn5qqilh4mky91sdj6";
+  SGr-IosevkaFixedSS15 = "0kqwrr89gbmpjrpmmsnvi0gzrbfqa7akk6j9821k795a0swym1wa";
+  SGr-IosevkaFixedSS16 = "1bvjxxzm2klay9mxbzrgv8waxgr5nlikp6s05p7ac9gif0q6344c";
+  SGr-IosevkaFixedSS17 = "053pl9y8sm6z5hdawxf60f9zvffzys86a1znf2d0hn3si3shdyy9";
+  SGr-IosevkaFixedSS18 = "0cckxs4p61jsrynvvj7q75dg7fhac4qc94k595nln7g4a8lyxvl1";
+  SGr-IosevkaSlab = "1znjdjmfkpn4z6kykxyg87ahkwqm95l06gbsnc45i0fzwkikapwx";
+  SGr-IosevkaSS01 = "00pzyv2r1gy9pwbg35pg7x4g4jsl7l1xqyn1ywsbcpcdagsda783";
+  SGr-IosevkaSS02 = "05lxrl27maksbxrrfrarlhiacax2ghl7h7vbq2y2aa7mml46j9nn";
+  SGr-IosevkaSS03 = "0yycbwfjqamqvliihdkxpahvr8b3grfrzpbzxsjs54vfi03q8wxs";
+  SGr-IosevkaSS04 = "0a5g7i28l0i3lm31ggwfr8ix0w5z96qxhk7az2nifgfspcygsmvm";
+  SGr-IosevkaSS05 = "1c4y7pplh8h3y0g41arhg7ilnpfr9jvrx4ffv2gfs96z8nd3v1j7";
+  SGr-IosevkaSS06 = "011gwa2nyjijh6w5yxah4ss9i5lgp0fs639mg1d5khyrazzhd8lv";
+  SGr-IosevkaSS07 = "1n11pqlhl3db6n5ia5rkr8b69fplj3xmaqpv237mmpa7msxdj03v";
+  SGr-IosevkaSS08 = "1nxgpl3ncr5ky2llizgnz941zw2i5vmd9ccqrdzknlr90rdi5z12";
+  SGr-IosevkaSS09 = "0x3jz7vg8w86pzyc82axb70xg2j4nfzmy7hnhbrlci35yxvxrwlg";
+  SGr-IosevkaSS10 = "0zq76fqqys2p23panj0jm5575lnrrskxgbgrki1v8ssp0zy8qind";
+  SGr-IosevkaSS11 = "0sd6mlpf2hplkv3njqxxyj9d1ja5ap5cvz87fnqm3k82bvy9j3mv";
+  SGr-IosevkaSS12 = "1aa40j9vagp4q5b3pf4iab16m3frn05w3xm9hmlh5qvkz90kbgzq";
+  SGr-IosevkaSS13 = "0hav346gz42027dkasdfskmmgrcjv874i27ns26n1cpvnk997lyl";
+  SGr-IosevkaSS14 = "1xxhif1yyjb2x52nbka7mw130b47l0hxm4cgimnhb7fs9ha2a51j";
+  SGr-IosevkaSS15 = "0i182a442092c5azyybbrnpvsfg46iajmzj1lp12cpm73sannfb8";
+  SGr-IosevkaSS16 = "01gz4nxi18r0yrr42lr2nrf2lca8a3rliz5k1b594qsnswpqv0fk";
+  SGr-IosevkaSS17 = "1c2krm1xabwqk7g4p0m9xhgmpx9bcn9npbx146cig3zb94djrav7";
+  SGr-IosevkaSS18 = "1v03vchjkzji74iav2l55lmmig232a1rjfz22mwvvw6vvsqp75m6";
+  SGr-IosevkaTerm = "12jbm58migwvbiqxn8ykcnq6lb285h323cbk5baxk0qn8nhsybnr";
+  SGr-IosevkaTermCurly = "0kk0wmkcw17z6j4l142r0q4zf4jsh3rnvsn0n97famw3mrdnjcn9";
+  SGr-IosevkaTermCurlySlab = "0hxr3wp9sr7vr5w9sjyyfbhshlj755d2lyjbnjs0ac5r1vcgfqyf";
+  SGr-IosevkaTermSlab = "1pcqlvb8zbqz2idmf4dhhwq6srby7a6w3254dcw9qj7432rhfhfx";
+  SGr-IosevkaTermSS01 = "1h3kivh7l4abfcx6x1kcmws2lcsjid4159jmsrp2dbgg4sa92nwy";
+  SGr-IosevkaTermSS02 = "08blza1chjks8641wxi2251rxv264j0sxdcacllss4y0a13qv2xn";
+  SGr-IosevkaTermSS03 = "0i5l61qd92ykifwa8a0cll2317gwd611kccqc9bk6grlxpyyajjl";
+  SGr-IosevkaTermSS04 = "0grvfxlxsq75v04jrbx5xhb6lhv564lb23zdlncwp5f7kiwnjwh1";
+  SGr-IosevkaTermSS05 = "0c6pbpi92ga67ypr6xkzzhm47ph54nz0v5hjvnnys8hdazrp7q7l";
+  SGr-IosevkaTermSS06 = "1s9a5yylzka728wkl89fk712g7kmhqv1fhy04c5dg69r85189w8s";
+  SGr-IosevkaTermSS07 = "1prvb7ppgl3n5jzihag1l1yrwgz0rxgf86zqb62nvyrvvvslkly8";
+  SGr-IosevkaTermSS08 = "1dn7rdipfyvcqq4gv07r7zkmg0h1337c2s17ajzv0k0f79a6k9mr";
+  SGr-IosevkaTermSS09 = "1fqjn07mz0xgrhj8lbq6l2nxzykbx2kcrq1hhmd60y79241dsms6";
+  SGr-IosevkaTermSS10 = "1d499grr3khq45fnflwdj7h8qkxgyri7fs77kwivsaqn2p7hd9ff";
+  SGr-IosevkaTermSS11 = "0fhj3xnxvc4b3vri13jg9zqghql6z29d9h7xi6hl75cf8gl0rzlc";
+  SGr-IosevkaTermSS12 = "1xvfk9wvd91wzaa6d9zj6yxzkmgmjd13v2kjrwv9m1f5ykdzpvpa";
+  SGr-IosevkaTermSS13 = "0zd0i0mzqh36d6w72lrrl3i7zvsy9p3yj9z5hb9kcsnlg9cnnlyv";
+  SGr-IosevkaTermSS14 = "01qg7yvn29lqnd5fmnhyrl84lh3vhm1yxinx39nclj3vfp26r6qz";
+  SGr-IosevkaTermSS15 = "0hxvrawp94a2vx23gyf7pnzd3dzrh7ijgg4q6pcj2kfadfxjwqks";
+  SGr-IosevkaTermSS16 = "1ghkg9d8371ls8iipzqn83kp9j9aah76c90zy8wkvpjh6ypp6sgq";
+  SGr-IosevkaTermSS17 = "0pr6n3b3h8jp7h5hy468ia3dwsnqawcm7v2m8waszgywgvpl5rcy";
+  SGr-IosevkaTermSS18 = "0f08vznvd2hdn3bdjx3qzy5hkrjqm69dpyj4rr4lqxwwx1dyy120";
 }
diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index b13a4f11df31..683af773a1ed 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-02-28";
+  version = "1.21.1-unstable-2025-03-27";
 
   nativeBuildInputs = [
     mtools
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "be3a78eaf804a2c437aa055d5c1e2f4a1310a0c1";
-    hash = "sha256-W1nLhFc3OttPbDyf8e7OM+kHQajamvNJ550YdTwlOHA=";
+    rev = "09fbebc084bddcb5bc7277f1644154ab35e6a334";
+    hash = "sha256-7F7SYSvSiY23xZbiJdzjiSDMnfeB4gWNodlHVgm9MyE=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.
diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index cf1c8fd83574..c32d7b5f101b 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.124.0";
+  version = "0.125.0";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-mFAp7lfXAS4Y6GERRpmOvE3cjonOi52BS9G8Z5ixvpw=";
+    sha256 = "sha256-twVqW8fzthhvU6T1r78bGv0yN4UI/px0YI9C4alACxs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix
index 6c236c046277..9afec3edf96f 100644
--- a/pkgs/by-name/jb/jbrowse/package.nix
+++ b/pkgs/by-name/jb/jbrowse/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "jbrowse";
-  version = "3.0.5";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
-    sha256 = "sha256-WpAaI07gfUmW1a2OlEtFAJMDdmvUCTEQIvGQQ1o/URc=";
+    sha256 = "sha256-NgqihP3l5a2nrw4LeykypLPDnUmD6MEHSM+hPndhqFI=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/jr/jrsonnet/Cargo.lock b/pkgs/by-name/jr/jrsonnet/Cargo.lock
deleted file mode 100644
index 941503289d9a..000000000000
--- a/pkgs/by-name/jr/jrsonnet/Cargo.lock
+++ /dev/null
@@ -1,551 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "annotate-snippets"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c96c3d1062ea7101741480185a6a1275eab01cbe8b20e378d1311bc056d2e08"
-dependencies = [
- "unicode-width",
- "yansi-term",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "cc"
-version = "1.0.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
-
-[[package]]
-name = "clap"
-version = "3.0.0-beta.2"
-source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "indexmap",
- "lazy_static",
- "os_str_bytes",
- "strsim",
- "termcolor",
- "textwrap",
- "vec_map",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.0.0-beta.2"
-source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_generate"
-version = "3.0.0-beta.2"
-source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-
-[[package]]
-name = "heck"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
-
-[[package]]
-name = "jrsonnet"
-version = "0.4.2"
-dependencies = [
- "clap",
- "clap_generate",
- "jrsonnet-cli",
- "jrsonnet-evaluator",
- "jrsonnet-parser",
- "mimallocator",
- "thiserror",
-]
-
-[[package]]
-name = "jrsonnet-cli"
-version = "0.4.2"
-dependencies = [
- "clap",
- "jrsonnet-evaluator",
- "jrsonnet-gc",
- "jrsonnet-parser",
-]
-
-[[package]]
-name = "jrsonnet-evaluator"
-version = "0.4.2"
-dependencies = [
- "annotate-snippets",
- "anyhow",
- "base64",
- "bincode",
- "jrsonnet-gc",
- "jrsonnet-interner",
- "jrsonnet-parser",
- "jrsonnet-stdlib",
- "jrsonnet-types",
- "md5",
- "pathdiff",
- "rustc-hash",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "jrsonnet-gc"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68da8bc2f00117b1373bb8877af03b1d391e4c4800e6585d7279e5b99c919dde"
-dependencies = [
- "jrsonnet-gc-derive",
-]
-
-[[package]]
-name = "jrsonnet-gc-derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcba9c387b64b054f06cc4d724905296e21edeeb7506847f3299117a2d92d12"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "jrsonnet-interner"
-version = "0.4.2"
-dependencies = [
- "jrsonnet-gc",
- "rustc-hash",
- "serde",
-]
-
-[[package]]
-name = "jrsonnet-parser"
-version = "0.4.2"
-dependencies = [
- "jrsonnet-gc",
- "jrsonnet-interner",
- "jrsonnet-stdlib",
- "peg",
- "serde",
- "unescape",
-]
-
-[[package]]
-name = "jrsonnet-stdlib"
-version = "0.4.2"
-
-[[package]]
-name = "jrsonnet-types"
-version = "0.4.2"
-dependencies = [
- "jrsonnet-gc",
- "peg",
-]
-
-[[package]]
-name = "jsonnet"
-version = "0.4.2"
-dependencies = [
- "jrsonnet-evaluator",
- "jrsonnet-gc",
- "jrsonnet-parser",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "mimalloc-sys"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa3cefb626f6ae3d0b2f71c5378c89d2b1d4d7bc246b0ca9a7ee61a4daad291"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "mimallocator"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d44fe4ebf6b538fcf39d9975c2b90bb3232d1ba8e8bffeacd004f27b20c577a"
-dependencies = [
- "mimalloc-sys",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34"
-
-[[package]]
-name = "peg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
-dependencies = [
- "peg-macros",
- "peg-runtime",
-]
-
-[[package]]
-name = "peg-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
-dependencies = [
- "peg-runtime",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "peg-runtime"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "serde"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "1.0.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unescape"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index a2db13c9b42f..4c646a9bac5f 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -17,12 +17,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "clap-3.0.0-beta.2" = "sha256-BaLzm2JZEicktfsCIXQipHtEKlEv2lBktfvHP58rjeM=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-DA31NatwQyf3RPpaI38DdAujpRyZfJvoHgr2CZSjH3s=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/kc/kclvm/Cargo.lock b/pkgs/by-name/kc/kclvm/Cargo.lock
deleted file mode 100644
index 122b5f8cea00..000000000000
--- a/pkgs/by-name/kc/kclvm/Cargo.lock
+++ /dev/null
@@ -1,5128 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "always-assert"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "annotate-snippets"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
-dependencies = [
- "unicode-width",
- "yansi-term",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-dependencies = [
- "backtrace",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "bitmaps"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "blake3"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if 1.0.0",
- "constant_time_eq",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "cc"
-version = "1.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
-dependencies = [
- "clap_builder",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.11.1",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "compiler_base_error"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e6a143200e9657a565b093fde64a590af93884d1f820829db6461de1ff0086"
-dependencies = [
- "anyhow",
- "compiler_base_macros",
- "compiler_base_span",
- "fluent",
- "pretty_assertions",
- "rustc_errors",
- "rustc_span",
- "termcolor",
- "unic-langid",
- "walkdir",
-]
-
-[[package]]
-name = "compiler_base_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21900034f34b69f860a5ff66e0577b8e66d310090b04bf0334afea9a041e0cee"
-
-[[package]]
-name = "compiler_base_session"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67411f0b5421d9c9f045ec08c4d01fe3861197d11215d1e2e448be663aff9ad9"
-dependencies = [
- "anyhow",
- "compiler_base_error",
- "compiler_base_span",
-]
-
-[[package]]
-name = "compiler_base_span"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42aae2adfa4b418441ede52835f3c96e9ca63d595f0ac861d94935757e9cb2e"
-dependencies = [
- "rustc_span",
-]
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "const_fn"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array 0.14.7",
- "typenum",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.11.1",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if 1.0.0",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer 0.10.4",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "dissimilar"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
-
-[[package]]
-name = "dns-lookup"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "socket2",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "ena"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
-]
-
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
-[[package]]
-name = "enquote"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "erased-serde"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
-dependencies = [
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "expect-test"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
-dependencies = [
- "dissimilar",
- "once_cell",
-]
-
-[[package]]
-name = "fancy-regex"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf"
-dependencies = [
- "bit-set",
- "regex",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "filetime"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fluent"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a"
-dependencies = [
- "fluent-bundle",
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-bundle"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493"
-dependencies = [
- "fluent-langneg",
- "fluent-syntax",
- "intl-memoizer",
- "intl_pluralrules",
- "rustc-hash",
- "self_cell 0.10.3",
- "smallvec",
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-langneg"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
-dependencies = [
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-syntax"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fslock"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fst"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generational-arena"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if 1.0.0",
- "crunchy",
-]
-
-[[package]]
-name = "handlebars"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.7",
-]
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "hostname"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "windows",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-auth"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki-roots",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "im-rc"
-version = "15.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe"
-dependencies = [
- "bitmaps",
- "rand_core",
- "rand_xoshiro",
- "sized-chunks",
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "rustc-rayon 0.5.0",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "inkwell"
-version = "0.2.0"
-source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33"
-dependencies = [
- "either",
- "inkwell_internals",
- "libc",
- "llvm-sys",
- "once_cell",
- "parking_lot 0.12.3",
-]
-
-[[package]]
-name = "inkwell_internals"
-version = "0.8.0"
-source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "insta"
-version = "1.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
-dependencies = [
- "console",
- "lazy_static",
- "linked-hash-map",
- "similar",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "intl-memoizer"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda"
-dependencies = [
- "type-map",
- "unic-langid",
-]
-
-[[package]]
-name = "intl_pluralrules"
-version = "7.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
-dependencies = [
- "unic-langid",
-]
-
-[[package]]
-name = "inventory"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jod-thread"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json-spanned-value"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb343fa4e3b1b22b344937deedac88da995abf139c2232cbeaa436c38380a210"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
-dependencies = [
- "futures",
- "futures-executor",
- "futures-util",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "jsonrpc-stdio-server"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6878586767497326eb3d011bd6dbb583e9f008b11528f82fd47798ec46bb6c26"
-dependencies = [
- "futures",
- "jsonrpc-core",
- "log",
- "tokio",
- "tokio-util 0.6.10",
-]
-
-[[package]]
-name = "jwt"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f"
-dependencies = [
- "base64 0.13.1",
- "crypto-common",
- "digest 0.10.7",
- "hmac",
- "serde",
- "serde_json",
- "sha2 0.10.8",
-]
-
-[[package]]
-name = "kcl-language-server"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "chrono",
- "clap",
- "compiler_base_session",
- "crossbeam-channel",
- "dashmap",
- "env_logger",
- "im-rc",
- "indexmap 1.9.3",
- "insta",
- "kclvm-ast",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-sema",
- "kclvm-span",
- "kclvm-tools",
- "kclvm-utils",
- "kclvm-version",
- "log",
- "lsp-server",
- "lsp-types",
- "maplit",
- "parking_lot 0.12.3",
- "proc_macro_crate",
- "ra_ap_vfs",
- "ra_ap_vfs-notify",
- "ropey",
- "rustc-hash",
- "rustc_lexer",
- "salsa",
- "serde",
- "serde_json",
- "threadpool",
- "tokio",
- "tokio-test",
-]
-
-[[package]]
-name = "kclvm"
-version = "0.10.0"
-dependencies = [
- "kclvm-api",
- "kclvm-ast",
- "kclvm-cmd",
- "kclvm-compiler",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-evaluator",
- "kclvm-loader",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-runner",
- "kclvm-runtime",
- "kclvm-sema",
- "kclvm-tools",
- "kclvm-version",
-]
-
-[[package]]
-name = "kclvm-api"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "criterion",
- "futures",
- "indexmap 1.9.3",
- "jsonrpc-stdio-server",
- "kcl-language-server",
- "kclvm-ast",
- "kclvm-ast-pretty",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-loader",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-runner",
- "kclvm-runtime",
- "kclvm-sema",
- "kclvm-tools",
- "kclvm-utils",
- "kclvm-version",
- "maplit",
- "once_cell",
- "prost",
- "prost-build",
- "prost-types",
- "prost-wkt",
- "prost-wkt-build",
- "prost-wkt-types",
- "protoc-bin-vendored",
- "serde",
- "serde_json",
- "serde_yaml",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "kclvm-ast"
-version = "0.10.0"
-dependencies = [
- "compiler_base_span",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-span",
- "kclvm-utils",
- "serde",
- "serde_json",
- "thread_local",
- "uuid",
-]
-
-[[package]]
-name = "kclvm-ast-pretty"
-version = "0.10.0"
-dependencies = [
- "compiler_base_macros",
- "compiler_base_session",
- "fancy-regex",
- "indexmap 1.9.3",
- "kclvm-ast",
- "kclvm-error",
- "kclvm-parser",
- "pretty_assertions",
-]
-
-[[package]]
-name = "kclvm-cmd"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "clap",
- "compiler_base_session",
- "kclvm-api",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-runner",
- "kclvm-runtime",
- "kclvm-tools",
- "kclvm-version",
-]
-
-[[package]]
-name = "kclvm-compiler"
-version = "0.10.0"
-dependencies = [
- "ahash",
- "bit-set",
- "bitflags 1.3.2",
- "fancy-regex",
- "indexmap 1.9.3",
- "inkwell",
- "kclvm-ast",
- "kclvm-error",
- "kclvm-runtime",
- "kclvm-sema",
- "once_cell",
- "phf",
- "time 0.2.27",
- "unicode_names2",
-]
-
-[[package]]
-name = "kclvm-config"
-version = "0.10.0"
-dependencies = [
- "ahash",
- "anyhow",
- "chrono",
- "dirs",
- "glob",
- "indexmap 1.9.3",
- "kclvm-ast",
- "kclvm-utils",
- "kclvm-version",
- "md-5 0.8.0",
- "pathdiff",
- "regex",
- "ron",
- "serde",
- "serde_json",
- "serde_yaml",
- "toml",
-]
-
-[[package]]
-name = "kclvm-driver"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "flate2",
- "indexmap 2.2.6",
- "kclvm-ast",
- "kclvm-config",
- "kclvm-parser",
- "kclvm-runtime",
- "kclvm-utils",
- "notify 6.1.1",
- "oci-distribution",
- "once_cell",
- "parking_lot 0.12.3",
- "serde",
- "serde_json",
- "tar",
- "tokio",
- "walkdir",
-]
-
-[[package]]
-name = "kclvm-error"
-version = "0.10.0"
-dependencies = [
- "annotate-snippets",
- "anyhow",
- "compiler_base_error",
- "compiler_base_macros",
- "compiler_base_session",
- "compiler_base_span",
- "indexmap 1.9.3",
- "kclvm-runtime",
- "kclvm-span",
- "kclvm-utils",
- "serde",
- "serde_json",
- "termize",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "kclvm-evaluator"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "generational-arena",
- "indexmap 1.9.3",
- "insta",
- "kclvm-ast",
- "kclvm-error",
- "kclvm-loader",
- "kclvm-parser",
- "kclvm-runtime",
- "kclvm-sema",
- "scopeguard",
-]
-
-[[package]]
-name = "kclvm-lexer"
-version = "0.10.0"
-dependencies = [
- "expect-test",
- "kclvm-error",
- "rustc_lexer",
- "unic-emoji-char",
-]
-
-[[package]]
-name = "kclvm-loader"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "indexmap 1.9.3",
- "insta",
- "kclvm-ast",
- "kclvm-ast-pretty",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-sema",
- "maplit",
-]
-
-[[package]]
-name = "kclvm-macros"
-version = "0.10.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "synstructure",
-]
-
-[[package]]
-name = "kclvm-parser"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "bstr",
- "compiler_base_error",
- "compiler_base_macros",
- "compiler_base_session",
- "compiler_base_span",
- "either",
- "enquote",
- "expect-test",
- "glob",
- "indexmap 1.9.3",
- "insta",
- "kclvm-ast",
- "kclvm-config",
- "kclvm-error",
- "kclvm-lexer",
- "kclvm-sema",
- "kclvm-span",
- "kclvm-utils",
- "num-bigint",
- "parking_lot 0.12.3",
- "petgraph",
- "regex",
- "rustc_lexer",
- "serde",
- "serde_json",
- "tracing",
- "unicode_names2",
-]
-
-[[package]]
-name = "kclvm-query"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "compiler_base_macros",
- "compiler_base_session",
- "fancy-regex",
- "indexmap 1.9.3",
- "insta",
- "kclvm-ast",
- "kclvm-ast-pretty",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-sema",
- "maplit",
- "pretty_assertions",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "kclvm-runner"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "cc",
- "chrono",
- "compiler_base_macros",
- "compiler_base_session",
- "criterion",
- "glob",
- "indexmap 1.9.3",
- "kclvm-ast",
- "kclvm-compiler",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-evaluator",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-runtime",
- "kclvm-sema",
- "kclvm-utils",
- "kclvm-version",
- "libc",
- "libloading",
- "once_cell",
- "serde",
- "serde_json",
- "tempfile",
- "threadpool",
- "uuid",
- "walkdir",
-]
-
-[[package]]
-name = "kclvm-runtime"
-version = "0.10.0"
-dependencies = [
- "ahash",
- "anyhow",
- "base64 0.13.1",
- "blake3",
- "bstr",
- "chrono",
- "dns-lookup",
- "encoding",
- "fancy-regex",
- "generational-arena",
- "glob",
- "handlebars",
- "hostname",
- "indexmap 1.9.3",
- "itertools",
- "kclvm_runtime_internal_macros",
- "lazy_static",
- "libc",
- "md5",
- "num-integer",
- "phf",
- "regex",
- "serde",
- "serde_json",
- "serde_yaml",
- "sha1",
- "sha2 0.9.9",
- "unic-ucd-bidi",
- "unic-ucd-category",
- "unicode-casing",
- "uuid",
- "walkdir",
-]
-
-[[package]]
-name = "kclvm-sema"
-version = "0.10.0"
-dependencies = [
- "ahash",
- "anyhow",
- "bit-set",
- "bitflags 1.3.2",
- "compiler_base_error",
- "compiler_base_macros",
- "compiler_base_session",
- "compiler_base_span",
- "criterion",
- "fancy-regex",
- "generational-arena",
- "indexmap 1.9.3",
- "kclvm-ast",
- "kclvm-ast-pretty",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-runtime",
- "kclvm-span",
- "kclvm-utils",
- "lazy_static",
- "once_cell",
- "parking_lot 0.12.3",
- "petgraph",
- "phf",
- "regex",
- "serde",
- "serde_json",
- "suggestions",
- "unicode_names2",
-]
-
-[[package]]
-name = "kclvm-span"
-version = "0.10.0"
-dependencies = [
- "compiler_base_span",
- "kclvm-macros",
- "parking_lot 0.11.2",
- "scoped-tls",
-]
-
-[[package]]
-name = "kclvm-tools"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "compiler_base_session",
- "compiler_base_span",
- "criterion",
- "fancy-regex",
- "indexmap 1.9.3",
- "insta",
- "json-spanned-value",
- "kclvm-ast",
- "kclvm-ast-pretty",
- "kclvm-config",
- "kclvm-driver",
- "kclvm-error",
- "kclvm-parser",
- "kclvm-query",
- "kclvm-runner",
- "kclvm-runtime",
- "kclvm-sema",
- "kclvm-utils",
- "located_yaml",
- "once_cell",
- "pretty_assertions",
- "regex",
- "rustc_lexer",
- "serde_json",
- "serde_yaml",
- "walkdir",
-]
-
-[[package]]
-name = "kclvm-utils"
-version = "0.10.0"
-dependencies = [
- "anyhow",
- "fslock",
- "regex",
-]
-
-[[package]]
-name = "kclvm-version"
-version = "0.10.0"
-dependencies = [
- "vergen-gitcl",
-]
-
-[[package]]
-name = "kclvm_runtime_internal_macros"
-version = "0.5.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "llvm-sys"
-version = "120.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624f2692f436769c7eb85a13eeca3f6fb9705a4b2bd0473ac9577c90f19e21ef"
-dependencies = [
- "cc",
- "lazy_static",
- "libc",
- "regex",
- "semver 0.11.0",
-]
-
-[[package]]
-name = "located_yaml"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bc68ee6f87a1be7fdba1dcfd854528371aa84a8390279b5d7a99d5da82add76"
-dependencies = [
- "linked-hash-map",
- "serde",
- "yaml-rust",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "lsp-server"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
-dependencies = [
- "crossbeam-channel",
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lsp-types"
-version = "0.93.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51"
-dependencies = [
- "bitflags 1.3.2",
- "serde",
- "serde_json",
- "serde_repr",
- "url",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "md-5"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if 1.0.0",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "miow"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "notify"
-version = "5.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
-dependencies = [
- "bitflags 1.3.2",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "mio 0.8.11",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "notify"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.6.0",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "log",
- "mio 0.8.11",
- "walkdir",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "oci-distribution"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95a2c51531af0cb93761f66094044ca6ea879320bccd35ab747ff3fcab3f422"
-dependencies = [
- "bytes",
- "chrono",
- "futures-util",
- "http",
- "http-auth",
- "jwt",
- "lazy_static",
- "olpc-cjson",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "sha2 0.10.8",
- "thiserror",
- "tokio",
- "tracing",
- "unicase",
-]
-
-[[package]]
-name = "olpc-cjson"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d637c9c15b639ccff597da8f4fa968300651ad2f1e968aefc3b4927a6fb2027a"
-dependencies = [
- "serde",
- "serde_json",
- "unicode-normalization",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "oorandom"
-version = "11.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.5.3",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pest"
-version = "2.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
-dependencies = [
- "once_cell",
- "pest",
- "sha2 0.10.8",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap 2.2.6",
-]
-
-[[package]]
-name = "phf"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37"
-dependencies = [
- "phf_macros",
- "phf_shared",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "plotters"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proc_macro_crate"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "prost"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
-dependencies = [
- "bytes",
- "heck 0.4.1",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 1.0.109",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "prost-wkt"
-version = "0.4.1"
-dependencies = [
- "chrono",
- "inventory",
- "prost",
- "serde",
- "serde_derive",
- "serde_json",
- "typetag",
-]
-
-[[package]]
-name = "prost-wkt-build"
-version = "0.4.1"
-dependencies = [
- "heck 0.4.1",
- "prost",
- "prost-build",
- "prost-types",
- "quote",
-]
-
-[[package]]
-name = "prost-wkt-types"
-version = "0.4.1"
-dependencies = [
- "chrono",
- "prost",
- "prost-build",
- "prost-types",
- "prost-wkt",
- "prost-wkt-build",
- "protoc-bin-vendored",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "protoc-bin-vendored"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-dependencies = [
- "protoc-bin-vendored-linux-aarch_64",
- "protoc-bin-vendored-linux-ppcle_64",
- "protoc-bin-vendored-linux-x86_32",
- "protoc-bin-vendored-linux-x86_64",
- "protoc-bin-vendored-macos-aarch_64",
- "protoc-bin-vendored-macos-x86_64",
- "protoc-bin-vendored-win32",
-]
-
-[[package]]
-name = "protoc-bin-vendored-linux-aarch_64"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-linux-ppcle_64"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-linux-x86_32"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-linux-x86_64"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-macos-aarch_64"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-macos-x86_64"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "protoc-bin-vendored-win32"
-version = "3.2.0"
-source = "git+https://github.com/kcl-lang/rust-protoc-bin-vendored#53c1f87ffc3027642ea6b822025b1dc699a3135b"
-
-[[package]]
-name = "quinn"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
-dependencies = [
- "bytes",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
-dependencies = [
- "libc",
- "once_cell",
- "socket2",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "ra_ap_paths"
-version = "0.0.149"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d780b450680460bd7ea3e2483dcf15a3ac0ce0ec028696caa342c577d65e5506"
-
-[[package]]
-name = "ra_ap_stdx"
-version = "0.0.149"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d776542bf771f4fdf40c21ced864bf213924d8a60d580c970715818471ebd74c"
-dependencies = [
- "always-assert",
- "libc",
- "miow",
- "winapi",
-]
-
-[[package]]
-name = "ra_ap_vfs"
-version = "0.0.149"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cd60adecd0947e1dd41a3077713381aa0cdcba6dc8777300d7d5b83b9fbe84"
-dependencies = [
- "fst",
- "indexmap 1.9.3",
- "ra_ap_paths",
- "ra_ap_stdx",
- "rustc-hash",
-]
-
-[[package]]
-name = "ra_ap_vfs-notify"
-version = "0.0.149"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a680f2dbd796844ebeaa2a4d01ae209f412ddc2981f6512ab8bc9b471156e6cd"
-dependencies = [
- "crossbeam-channel",
- "jod-thread",
- "notify 5.2.0",
- "ra_ap_paths",
- "ra_ap_vfs",
- "tracing",
- "walkdir",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_xoshiro"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.7",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pemfile",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tokio-util 0.7.11",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if 1.0.0",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ron"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
-dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "serde",
-]
-
-[[package]]
-name = "ropey"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
-dependencies = [
- "smallvec",
- "str_indices",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-rayon"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246"
-dependencies = [
- "crossbeam-deque",
- "either",
- "rustc-rayon-core 0.3.2",
-]
-
-[[package]]
-name = "rustc-rayon"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81aadc8837ca6ecebe0fe1353f15df83b3b3cc2cf7a8afd571bc22aa121710"
-dependencies = [
- "either",
- "rustc-rayon-core 0.5.0",
-]
-
-[[package]]
-name = "rustc-rayon-core"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "rustc-rayon-core"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67668daaf00e359c126f6dcb40d652d89b458a008c8afa727a42a2d20fca0b7f"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "rustc_data_structures"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38bae9c6afa27015bcaa2869e03bb111ecf0d0e0edc2da559a91d4057174c9a"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "cfg-if 0.1.10",
- "ena",
- "indexmap 1.9.3",
- "jobserver",
- "libc",
- "memmap2",
- "parking_lot 0.12.3",
- "rustc-hash",
- "rustc-rayon 0.3.2",
- "rustc-rayon-core 0.3.2",
- "stable_deref_trait",
- "tempfile",
- "tracing",
- "winapi",
-]
-
-[[package]]
-name = "rustc_errors"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00299b1841816d2c41129e6d4f86b0b446ee387e8203871c2551e1c405b1243c"
-dependencies = [
- "termcolor",
- "winapi",
-]
-
-[[package]]
-name = "rustc_lexer"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "rustc_span"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043e9cc06c53de1f6a125e41e4b915d23a130241610a114ad4fe4f654617eae4"
-dependencies = [
- "cfg-if 0.1.10",
- "md-5 0.10.6",
- "rustc_data_structures",
- "scoped-tls",
- "sha-1",
- "sha2 0.10.8",
- "tracing",
- "unicode-width",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.23",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
-dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "salsa"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403"
-dependencies = [
- "crossbeam-utils",
- "indexmap 1.9.3",
- "lock_api",
- "log",
- "oorandom",
- "parking_lot 0.11.2",
- "rustc-hash",
- "salsa-macros",
- "smallvec",
-]
-
-[[package]]
-name = "salsa-macros"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "self_cell"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
-dependencies = [
- "self_cell 1.0.4",
-]
-
-[[package]]
-name = "self_cell"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.115"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-dependencies = [
- "anyhow",
- "indexmap 2.2.6",
- "indoc",
- "itoa",
- "ryu",
- "serde",
- "serde_derive",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
-[[package]]
-name = "sha1_smol"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.1",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "similar"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "sized-chunks"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
-dependencies = [
- "bitmaps",
- "typenum",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
-[[package]]
-name = "str_indices"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "suggestions"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5441c382482e49aaac2c3ea9cbcd24290531246e879ee94af5dfc4b144f11e80"
-dependencies = [
- "strsim 0.10.0",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unicode-xid",
-]
-
-[[package]]
-name = "tar"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "termize"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
-]
-
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "time"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros 0.1.1",
- "version_check",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros 0.2.18",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio 1.0.1",
- "parking_lot 0.12.3",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-test"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
-dependencies = [
- "async-stream",
- "bytes",
- "futures-core",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "type-map"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
-dependencies = [
- "rustc-hash",
-]
-
-[[package]]
-name = "typeid"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "typetag"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7ec175048b96728c30152928c52161bfcc8ea2bd3fb7ed4ccb7dec060b2834"
-dependencies = [
- "erased-serde",
- "inventory",
- "once_cell",
- "serde",
- "typetag-impl",
-]
-
-[[package]]
-name = "typetag-impl"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b5474fd169a5b02b6782b56bbbbff27e85947d4488e5501123687db3148647"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unic-char-property"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
-dependencies = [
- "unic-char-range",
-]
-
-[[package]]
-name = "unic-char-range"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
-
-[[package]]
-name = "unic-common"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
-
-[[package]]
-name = "unic-emoji-char"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d"
-dependencies = [
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-langid"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44"
-dependencies = [
- "unic-langid-impl",
- "unic-langid-macros",
-]
-
-[[package]]
-name = "unic-langid-impl"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5"
-dependencies = [
- "tinystr",
-]
-
-[[package]]
-name = "unic-langid-macros"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e"
-dependencies = [
- "proc-macro-hack",
- "tinystr",
- "unic-langid-impl",
- "unic-langid-macros-impl",
-]
-
-[[package]]
-name = "unic-langid-macros-impl"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b"
-dependencies = [
- "proc-macro-hack",
- "quote",
- "syn 2.0.72",
- "unic-langid-impl",
-]
-
-[[package]]
-name = "unic-ucd-bidi"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c"
-dependencies = [
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-ucd-category"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0"
-dependencies = [
- "matches",
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-ucd-version"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
-dependencies = [
- "unic-common",
-]
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-casing"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623f59e6af2a98bdafeb93fa277ac8e1e40440973001ca15cf4ae1541cd16d56"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "unicode_names2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87d6678d7916394abad0d4b19df4d3802e1fd84abd7d701f39b75ee71b9e8cf1"
-
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "vergen"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustc_version 0.4.0",
- "rustversion",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-gitcl"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bbdc9746577cb4767f218d320ee0b623d415e8130332f8f562b910b61cc2c4e"
-dependencies = [
- "anyhow",
- "derive_builder",
- "rustversion",
- "time 0.3.36",
- "vergen",
- "vergen-lib",
-]
-
-[[package]]
-name = "vergen-lib"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720"
-dependencies = [
- "anyhow",
- "derive_builder",
- "getset",
- "rustversion",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.72",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index 00ed9e182150..aaa3a3cca342 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -20,13 +20,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   sourceRoot = "${src.name}/kclvm";
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM=";
-      "protoc-bin-vendored-3.2.0" = "sha256-cYLAjjuYWat+8RS3vtNVS/NAJYw2NGeMADzGBL1L2Ww=";
-    };
-  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-xQgCiNt0lUvB5XmVB45l0GuIiVp5Jm6dZY7396Rsnqw=";
 
   buildInputs =
     [ rustc ]
diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index cb004a622baf..a191e193905d 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keymapper";
-  version = "4.11.0";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
     rev = finalAttrs.version;
-    hash = "sha256-2tkTsGKsjojS15Ds57KITsXwxQdpD4NJmuXsnfBJJJk=";
+    hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY=";
   };
 
   # all the following must be in nativeBuildInputs
diff --git a/pkgs/by-name/ki/kile-wl/Cargo.lock b/pkgs/by-name/ki/kile-wl/Cargo.lock
deleted file mode 100644
index 0ce38b840817..000000000000
--- a/pkgs/by-name/ki/kile-wl/Cargo.lock
+++ /dev/null
@@ -1,295 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "kile"
-version = "0.1.0"
-dependencies = [
- "kilexpr",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "kilexpr"
-version = "0.1.0"
-source = "git+https://gitlab.com/snakedye/kilexpr#d7b58f2c9fd771b175d410c0b7f870f647a4fbbb"
-
-[[package]]
-name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "libloading"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
-dependencies = [
- "cfg-if",
- "windows-sys",
-]
-
-[[package]]
-name = "log"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
- "memoffset",
- "static_assertions",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "wayland-backend"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8"
-dependencies = [
- "cc",
- "downcast-rs",
- "io-lifetimes",
- "nix",
- "scoped-tls",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.30.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8"
-dependencies = [
- "bitflags",
- "nix",
- "wayland-backend",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e"
-dependencies = [
- "proc-macro2",
- "quick-xml",
- "quote",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
-dependencies = [
- "dlib",
- "log",
- "pkg-config",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
diff --git a/pkgs/by-name/ki/kile-wl/package.nix b/pkgs/by-name/ki/kile-wl/package.nix
index a321e00486b8..5c34097bd912 100644
--- a/pkgs/by-name/ki/kile-wl/package.nix
+++ b/pkgs/by-name/ki/kile-wl/package.nix
@@ -16,12 +16,8 @@ rustPlatform.buildRustPackage {
     tagPrefix = "v";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "kilexpr-0.1.0" = "sha256-Bw6vYtzhheAJ8NLQtr3gLjZ9/5ajuABURRYDnVF9W1Y=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-HcwdUwhiSkULCevsHTnRyazNfHDvLZv44SFXKxrHxYY=";
 
   meta = with lib; {
     description = "Tiling layout generator for river";
diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix
index 0e0e8f874dd3..448f01e1cd55 100644
--- a/pkgs/by-name/ki/kitsas/package.nix
+++ b/pkgs/by-name/ki/kitsas/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kitsas";
-  version = "5.8";
+  version = "5.9";
 
   src = fetchFromGitHub {
     owner = "artoh";
     repo = "kitupiikki";
     rev = "v${version}";
-    hash = "sha256-w4RttQUzCPqqMwNf0P9lThu4JaLD3yEHm3yPLU1P4KA=";
+    hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 7bf1e2029daf..720aebbe17ca 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-0NVgG80WQYwnYA4F7DK4xqOv/snige6BQrKr/TD/uys=";
+    sha256 = "sha256-FYw519VT40PU3fVEb7DBoST2bqhPXcEqquHkGeULQ3k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/kord/Cargo.lock b/pkgs/by-name/ko/kord/Cargo.lock
deleted file mode 100644
index 1d2a4d61c140..000000000000
--- a/pkgs/by-name/ko/kord/Cargo.lock
+++ /dev/null
@@ -1,3574 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher",
- "cpufeatures",
- "opaque-debug",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alsa"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
-dependencies = [
- "alsa-sys",
- "bitflags",
- "libc",
- "nix",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
-
-[[package]]
-name = "arc-swap"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "async-trait"
-version = "0.1.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.2"
-source = "git+https://github.com/bincode-org/bincode.git#6791311a98b059a540da2ef70fdafb41a7f54760"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-
-[[package]]
-name = "burn"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f762ffa48b53a7d69c3bc7e6e1792d30e1d73de10da0beb025029a6d2f6578f"
-dependencies = [
- "burn-core",
- "burn-train",
-]
-
-[[package]]
-name = "burn-autodiff"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25759a31cfa871e13b4f17e0319248a5b124b7f5bc4962d98add09f8920cbff9"
-dependencies = [
- "burn-common",
- "burn-tensor",
- "burn-tensor-testgen",
- "derive-new",
- "spin 0.9.6",
-]
-
-[[package]]
-name = "burn-common"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830988a0a0c407a272561f28001ab0794efe4ee75c00f3fc2c6f5f2711474a95"
-dependencies = [
- "const-random",
- "rand",
- "spin 0.9.6",
- "uuid",
-]
-
-[[package]]
-name = "burn-core"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2ab774b18a51fcf1f7d0ac6c8b6288bff6406ebae9094e2e524f8aa904164b1"
-dependencies = [
- "burn-autodiff",
- "burn-common",
- "burn-dataset",
- "burn-derive",
- "burn-tensor",
- "derive-new",
- "flate2",
- "hashbrown 0.13.2",
- "libm",
- "log",
- "rand",
- "serde",
- "serde_json",
- "spin 0.9.6",
-]
-
-[[package]]
-name = "burn-dataset"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7234387b1641027a33c8ceaef413724080844f479b1adc44ed7c7990ee52d763"
-dependencies = [
- "dirs",
- "rand",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "burn-derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a79a50ec2c580c4734ca55a60142d15025e5244fb5cf3d19c70c23ce258d6599"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "burn-ndarray"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9bdd1946c0206f140bcb6ec598c572a518b7a8ed6406ed7131f3245d3f3c93b"
-dependencies = [
- "burn-autodiff",
- "burn-common",
- "burn-tensor",
- "derive-new",
- "libm",
- "matrixmultiply",
- "ndarray",
- "num-traits",
- "rand",
- "rayon",
- "spin 0.9.6",
-]
-
-[[package]]
-name = "burn-tch"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc55e3db566a818c4c111d0b28d7e09e9673d9790efa731392d44d1e8f24158d"
-dependencies = [
- "burn-tensor",
- "half",
- "libc",
- "rand",
- "tch",
-]
-
-[[package]]
-name = "burn-tensor"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714397a86811e1aaf534f420c3af1fd908026fd8be99870b28b7e78037ddaf7e"
-dependencies = [
- "burn-tensor-testgen",
- "derive-new",
- "half",
- "hashbrown 0.13.2",
- "libm",
- "num-traits",
- "rand",
- "rand_distr",
- "serde",
-]
-
-[[package]]
-name = "burn-tensor-testgen"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349751c86a0f936db064f5a5d567174a880927bd41846899501d96ece319ba25"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "burn-train"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b72ff7a3b4af6ea75db2bcb1b184a7a21e6df1d3e7d1dc0ba1dd39b21612778"
-dependencies = [
- "burn-core",
- "derive-new",
- "indicatif",
- "log",
- "log4rs",
- "nvml-wrapper",
- "rgb",
- "serde",
- "terminal_size",
- "textplots",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom 7.1.3",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time 0.1.45",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "4.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "console"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "const-cstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
-
-[[package]]
-name = "const-random"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
-dependencies = [
- "getrandom",
- "once_cell",
- "proc-macro-hack",
- "tiny-keccak",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys 0.8.3",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
-dependencies = [
- "bitflags",
- "core-foundation",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-text"
-version = "19.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
-dependencies = [
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "coreaudio-rs"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
-dependencies = [
- "bitflags",
- "core-foundation-sys 0.6.2",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb"
-dependencies = [
- "bindgen",
-]
-
-[[package]]
-name = "cpal"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34fa7b20adf588f73f094cd9b1d944977c686e37a2759ea217ab174f017e10a"
-dependencies = [
- "alsa",
- "core-foundation-sys 0.8.3",
- "coreaudio-rs",
- "dasp_sample",
- "jni 0.19.0",
- "js-sys",
- "libc",
- "mach",
- "ndk",
- "ndk-context",
- "oboe",
- "once_cell",
- "parking_lot",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
-dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "darling"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.9.3",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive-new"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "destructure_traitobject"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dlib"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "drawille"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e461c3f1e69d99372620640b3fd5f0309eeda2e26e4af69f6760c0e1df845"
-dependencies = [
- "colored",
- "fnv",
-]
-
-[[package]]
-name = "dwrote"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
-dependencies = [
- "lazy_static",
- "libc",
- "winapi",
- "wio",
-]
-
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "float-ord"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "font-kit"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5"
-dependencies = [
- "bitflags",
- "byteorder",
- "core-foundation",
- "core-graphics",
- "core-text",
- "dirs-next",
- "dwrote",
- "float-ord",
- "freetype",
- "lazy_static",
- "libc",
- "log",
- "pathfinder_geometry",
- "pathfinder_simd",
- "walkdir",
- "winapi",
- "yeslogic-fontconfig-sys",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "freetype"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
-dependencies = [
- "freetype-sys",
- "libc",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
-
-[[package]]
-name = "futures-task"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gif"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "half"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
-dependencies = [
- "crunchy",
- "num-traits",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
- "serde",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys 0.8.3",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.24.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder",
- "num-rational",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
-dependencies = [
- "console",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
-dependencies = [
- "libc",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
-dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-
-[[package]]
-name = "js-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kord"
-version = "0.6.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "bincode",
- "burn",
- "burn-autodiff",
- "burn-ndarray",
- "burn-tch",
- "byteorder",
- "clap 4.1.8",
- "console_error_panic_hook",
- "cpal",
- "futures",
- "futures-timer",
- "gloo-timers",
- "js-sys",
- "once_cell",
- "parse_duration0",
- "paste",
- "pest",
- "pest_derive",
- "plotters",
- "pretty_assertions",
- "rand",
- "rayon",
- "rodio",
- "rustfft",
- "serde",
- "symphonia",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wee_alloc",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
- "serde",
-]
-
-[[package]]
-name = "log-mdc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7"
-
-[[package]]
-name = "log4rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd"
-dependencies = [
- "anyhow",
- "arc-swap",
- "chrono",
- "derivative",
- "fnv",
- "humantime",
- "libc",
- "log",
- "log-mdc",
- "parking_lot",
- "serde",
- "serde-value",
- "serde_json",
- "serde_yaml",
- "thiserror",
- "thread-id",
- "typemap-ors",
- "winapi",
-]
-
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
-dependencies = [
- "num_cpus",
- "once_cell",
- "rawpointer",
- "thread-tree",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
-[[package]]
-name = "meval"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
-dependencies = [
- "fnv",
- "nom 1.2.4",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "ndarray"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
-dependencies = [
- "matrixmultiply",
- "num-complex",
- "num-integer",
- "num-traits",
- "rawpointer",
- "rayon",
-]
-
-[[package]]
-name = "ndk"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys",
- "num_enum",
- "raw-window-handle",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "libc",
-]
-
-[[package]]
-name = "nom"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "nvml-wrapper"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288bd66a5a56d8c97b178412b328419b3fdec261c0cbc4628ddc49cc16db8fc6"
-dependencies = [
- "bitflags",
- "libloading",
- "nvml-wrapper-sys",
- "static_assertions",
- "thiserror",
- "wrapcenum-derive",
-]
-
-[[package]]
-name = "nvml-wrapper-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d606d4edf766969f16828ec047ca9aa96652a17bd353dc0613bfaca49b61d6"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "oboe"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
-dependencies = [
- "jni 0.20.0",
- "ndk",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "ordered-float"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
-[[package]]
-name = "output_vt100"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "parse_duration0"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "341129a5f9fb040851e7c025e201184070b85627989d63707c93b65952001882"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
-
-[[package]]
-name = "pathfinder_geometry"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3"
-dependencies = [
- "log",
- "pathfinder_simd",
-]
-
-[[package]]
-name = "pathfinder_simd"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff"
-dependencies = [
- "rustc_version",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "plotters"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
-dependencies = [
- "chrono",
- "font-kit",
- "image",
- "lazy_static",
- "num-traits",
- "pathfinder_geometry",
- "plotters-backend",
- "plotters-bitmap",
- "plotters-svg",
- "ttf-parser",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
-
-[[package]]
-name = "plotters-bitmap"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4a1f21490a6cf4a84c272ad20bd7844ed99a3178187a4c5ab7f2051295beef"
-dependencies = [
- "gif",
- "image",
- "plotters-backend",
-]
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "png"
-version = "0.17.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
-dependencies = [
- "bitflags",
- "crc32fast",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
-dependencies = [
- "ctor",
- "diff",
- "output_vt100",
- "yansi",
-]
-
-[[package]]
-name = "primal-check"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
-dependencies = [
- "num-integer",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-dependencies = [
- "num-traits",
- "rand",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559"
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "rgb"
-version = "0.8.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "rodio"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
-dependencies = [
- "cpal",
- "symphonia",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustfft"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "primal-check",
- "strength_reduce",
- "transpose",
- "version_check",
-]
-
-[[package]]
-name = "rustix"
-version = "0.36.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
-dependencies = [
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
-dependencies = [
- "indexmap",
- "ryu",
- "serde",
- "yaml-rust",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "shlex"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-
-[[package]]
-name = "slab"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strength_reduce"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap 2.34.0",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "symphonia"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-bundle-mp3",
- "symphonia-codec-aac",
- "symphonia-codec-adpcm",
- "symphonia-codec-alac",
- "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
- "symphonia-core",
- "symphonia-format-isomp4",
- "symphonia-format-mkv",
- "symphonia-format-ogg",
- "symphonia-format-wav",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-flac"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc2deed3204967871ba60f913378f95820cb47a2fe9b2eef5a9eedb417dfdc8"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73"
-dependencies = [
- "bitflags",
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-codec-aac"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdd4a10695ca0528572360ec020586320357350eb62791693667e7de8c871a"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-adpcm"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5cfb8d4405e26eb9593157dc45b05e102b8d774b38ed2a95946d6bb9e26e3e"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-alac"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49e1b209318bcefa7ff452bd85f1f593210943a7d9786b7d4250e8991a7449c"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-pcm"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb9a9f0b9991cccf3217b74644af412d5d082a4815e5e2943f26e0ecabdf3c9"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-vorbis"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-core"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869"
-dependencies = [
- "arrayvec",
- "bitflags",
- "bytemuck",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "symphonia-format-isomp4"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1818f6f54b4eaba5ec004a8dbcca637c57e617eb1ff4c9addbd3fc065eba437"
-dependencies = [
- "encoding_rs",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-mkv"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd22f2def8c8f078495ad66111648bfc7d5222ee33774f2077cb665588f3119"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-ogg"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474df6e86b871dcb56913130bada1440245f483057c4a2d8a2981455494c4439"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-wav"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06679bd5646b3037300f88891dfc8a6e1cc4e1133206cc17a98e5d7c22f88296"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-metadata"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e"
-dependencies = [
- "encoding_rs",
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-utils-xiph"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b"
-dependencies = [
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tch"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3394fea57e43ef3708196025beb3445dc13998b162f972233f11b9fdf091401"
-dependencies = [
- "half",
- "lazy_static",
- "libc",
- "ndarray",
- "rand",
- "thiserror",
- "torch-sys",
- "zip",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
-dependencies = [
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "textplots"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c771910e9d7e37d50f6d39f5ce4c4351fd797dcaed9a348e911877401af1b799"
-dependencies = [
- "drawille",
- "meval",
- "rgb",
- "structopt",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread-id"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f"
-dependencies = [
- "libc",
- "redox_syscall",
- "winapi",
-]
-
-[[package]]
-name = "thread-tree"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbd370cb847953a25954d9f63e14824a36113f8c72eecf6eccef5dc4b45d630"
-dependencies = [
- "crossbeam-channel",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
-dependencies = [
- "serde",
- "time-core",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-
-[[package]]
-name = "toml_edit"
-version = "0.19.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "torch-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff928d3e632acda675e388d8e0efe526136350620800cc770e3727c9abc6ea1"
-dependencies = [
- "anyhow",
- "cc",
- "libc",
- "ureq",
- "zip",
-]
-
-[[package]]
-name = "transpose"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23"
-dependencies = [
- "num-integer",
- "strength_reduce",
-]
-
-[[package]]
-name = "ttf-parser"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
-
-[[package]]
-name = "typemap-ors"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867"
-dependencies = [
- "unsafe-any-ors",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unsafe-any-ors"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad"
-dependencies = [
- "destructure_traitobject",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "ureq"
-version = "2.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d"
-dependencies = [
- "base64",
- "flate2",
- "log",
- "once_cell",
- "rustls",
- "url",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "uuid"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-
-[[package]]
-name = "web-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.44.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "winnow"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "wrapcenum-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "yeslogic-fontconfig-sys"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386"
-dependencies = [
- "const-cstr",
- "dlib",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "zip"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time 0.3.20",
- "zstd",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.7+zstd.1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index 319ac891815a..d1b830abf4aa 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "bincode-2.0.0-rc.2" = "sha256-0BfKKGOi5EVIoF0HvIk0QS2fHUMG3tpsMLe2SkXeZlo=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-DpZsi2eIhuetHnLLYGAvv871mbPfAIUevqBLaV8ljGA=";
 
   patches = [
     # Fixes build issues due to refactored Rust compiler feature annotations.
diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index d8068053e2f6..eb184bcb2cb1 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.1.9";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-u9Fj2YkHVbFHpxrrxdYrRBvbGsLvxQQlsPHf4++L0g0=";
+    sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";
   };
 
-  vendorHash = "sha256-HYUI0x4fCA8nhIHPguGCJ+F36fxb7m97bgyigwiXWd8=";
+  vendorHash = "sha256-d4zXjMr34DUXHNBe8jGhlQ/gdsaR2hGWxZEfUKXvKCQ=";
 
   ldflags = [
     "-X main.gitTag=v${version}"
diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 207823785854..16d3029eccd8 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubetui";
-  version = "1.6.2";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "sarub0b0";
     repo = "kubetui";
     tag = "v${version}";
-    hash = "sha256-sEl/hkGn9X0NArCMA1Nr+KM5mR8ZXAl4hBiU8zGaS0U=";
+    hash = "sha256-p7NPHOmeDzZ8OlVnpOOoTksWbWcnKlzsXu/mYmMU4l4=";
   };
 
   checkFlags = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     ]
   );
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1wc2mXX2NQdFaygukeaSDn6qHUaBcTRvCo0uSX289s0=";
+  cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw=";
 
   meta = {
     homepage = "https://github.com/sarub0b0/kubetui";
diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix
index 46799736257a..1d2d8b017a80 100644
--- a/pkgs/by-name/ku/kubo/package.nix
+++ b/pkgs/by-name/ku/kubo/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.33.2"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.34.0"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
   passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version
@@ -16,7 +16,7 @@ buildGoModule rec {
   # Kubo makes changes to its source tarball that don't match the git source.
   src = fetchurl {
     url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-    hash = "sha256-PSXX1mLteeLpaq74PnWeDy+E6E3uVWr1c5+FTMBKc5g=";
+    hash = "sha256-+nyL8fR8OLcUU4XdA+H4I3BFj1U/mOrb0Qio2sM21jQ=";
   };
 
   # tarball contains multiple files/directories
diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix
index fb1668911319..ac05b283bc02 100644
--- a/pkgs/by-name/lc/lcov/package.nix
+++ b/pkgs/by-name/lc/lcov/package.nix
@@ -30,16 +30,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-Qz5Q1JRJeB0aCaYmCR8jeG7TQPkvJHtJTkBhXGM05ak=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    perl
+  ];
 
   buildInputs = [
     perl
     python3
   ];
 
+  strictDeps = true;
+
   preBuild = ''
-    patchShebangs bin/
-    makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl))
+    patchShebangs --build bin/{fix.pl,get_version.sh} tests/*/*
+    patchShebangs --host bin/{gen*,lcov,perl2lcov}
+    makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=${lib.getExe perl})
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
index 7d0d006dbb4c..7cd609484408 100644
--- a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
+++ b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
@@ -66,5 +66,8 @@ stdenv.mkDerivation {
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ valodim ];
+    # Does not compile against libfprint-tod, hasn't seen any maintenance
+    # since 2020.
+    broken = true;
   };
 }
diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix
index 30f2b91864d7..6abda09a6eb3 100644
--- a/pkgs/by-name/li/libfprint-tod/package.nix
+++ b/pkgs/by-name/li/libfprint-tod/package.nix
@@ -13,7 +13,7 @@ libfprint.overrideAttrs (
     ...
   }:
   let
-    version = "1.90.7+git20210222+tod1";
+    version = "1.94.9+tod1";
   in
   {
     pname = "libfprint-tod";
@@ -24,18 +24,22 @@ libfprint.overrideAttrs (
       owner = "3v1n0";
       repo = "libfprint";
       rev = "v${version}";
-      sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j";
+      hash = "sha256-xkywuFbt8EFJOlIsSN2hhZfMUhywdgJ/uT17uiO3YV4=";
     };
 
     mesonFlags = [
       # Include virtual drivers for fprintd tests
       "-Ddrivers=all"
       "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
+      "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
     ];
 
     postPatch = ''
       ${postPatch}
-      patchShebangs ./tests/*.py ./tests/*.sh
+      patchShebangs \
+        ./libfprint/tod/tests/*.sh \
+        ./tests/*.py \
+        ./tests/*.sh \
     '';
 
     meta = with lib; {
diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix
index 49f2ded72eb6..58d3c56d25c6 100644
--- a/pkgs/by-name/li/libmediainfo/package.nix
+++ b/pkgs/by-name/li/libmediainfo/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmediainfo";
-  version = "24.12";
+  version = "25.03";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    hash = "sha256-H0mGIH913rKQkV5r8LM+PkVXdDBd0mb/6Jl8AarWWyc=";
+    hash = "sha256-NfH9q4EjnKNVxt41ioT73gR3/tjrNQ5d/valmBRcUgc=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix
index 1284f0e0cf24..c268cd552028 100644
--- a/pkgs/by-name/li/libppd/package.nix
+++ b/pkgs/by-name/li/libppd/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libppd";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "OpenPrinting";
     repo = "libppd";
     rev = version;
-    hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY=";
+    hash = "sha256-8ofCv+tKgBk9GoGD4lmBPB/S4ABZ6cWGOk/KqDsEzNk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix
index fa48a7ed88dc..ffcf5dc0ba79 100644
--- a/pkgs/by-name/li/libxlsxwriter/package.nix
+++ b/pkgs/by-name/li/libxlsxwriter/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libxlsxwriter";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "jmcnamara";
     repo = "libxlsxwriter";
     tag = "v${version}";
-    hash = "sha256-PlKUDJEYQ2LThdq8F3ylFTgusZ9wTaL9pdAznAXpwI0=";
+    hash = "sha256-Bi89TtihLtiXUh1PsJW1TiiT7ygQUM8yKeiYMi1PRCM=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix
index 6e3a56ebfd35..fad8352a9d78 100644
--- a/pkgs/by-name/ll/lls/package.nix
+++ b/pkgs/by-name/ll/lls/package.nix
@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lls";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "jcaesar";
     repo = "lls";
-    rev = "v${version}";
-    hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M=";
+    tag = "v${version}";
+    hash = "sha256-7biyctXeTTZi8PQqKKYn7Qkuw1CxJ9lT6Wo1+rpnjVs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Hc6roJJ5xbqdCAsZIf0V2Z8KPm+t7AQ5Q9It1ynWqhw=";
+  cargoHash = "sha256-v4AW6kL546LNdBh9GEJfC5lKJBvVhfF52MS4bOkUbdU=";
 
   meta = with lib; {
     description = "Tool to list listening sockets";
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index e20e7930de13..5fba70890b06 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luau";
-  version = "0.664";
+  version = "0.666";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     rev = version;
-    hash = "sha256-VmeUO7zkBG0NojzpnfR+eVzoRhNpJh+7HwEunL/Ylqw=";
+    hash = "sha256-++4PwlCxNq31T0UQUHcvrUnY/ADdnQCtekGiGTPRmv0=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix
index 8d0d50a64691..645398c90d0c 100644
--- a/pkgs/by-name/ma/mandown/package.nix
+++ b/pkgs/by-name/ma/mandown/package.nix
@@ -2,28 +2,30 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
-
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mandown";
   version = "1.1.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-a+1tm9YlBuroTtgCL0nTjASaPiJHif89pRH0CWw7RjM=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZyjoAvsqUyHgfEsG3+CvJatmBt0AJ2ga6HRJ8Y7her0=";
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Markdown to groff (man page) converter";
     homepage = "https://gitlab.com/kornelski/mandown";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.awwpotato ];
     mainProgram = "mandown";
   };
-}
+})
diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix
index cb4f5a8b0100..4564d933b5c3 100644
--- a/pkgs/by-name/me/mediainfo-gui/package.nix
+++ b/pkgs/by-name/me/mediainfo-gui/package.nix
@@ -9,20 +9,16 @@
   desktop-file-utils,
   libSM,
   imagemagick,
-  darwin,
   wrapGAppsHook3,
 }:
 
-let
-  inherit (darwin.apple_sdk.frameworks) Cocoa;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediainfo-gui";
-  version = "24.06";
+  version = "25.03";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${finalAttrs.version}/mediainfo_${finalAttrs.version}.tar.xz";
-    hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA=";
+    hash = "sha256-wpO7MPIx3FMQuYDv2E/n0za4MQto6DJlzxZtf3/Dhsk=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     desktop-file-utils
     libSM
     imagemagick
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
+  ];
 
   sourceRoot = "MediaInfo/Project/GNU/GUI";
 
diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix
index 212a1530ccd2..078ef1131300 100644
--- a/pkgs/by-name/me/mediainfo/package.nix
+++ b/pkgs/by-name/me/mediainfo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mediainfo";
-  version = "24.12";
+  version = "25.03";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    hash = "sha256-NpmuZQznGJOpMs4uqio1+NpH5vch+T1pWwvrCq1OmZc=";
+    hash = "sha256-wpO7MPIx3FMQuYDv2E/n0za4MQto6DJlzxZtf3/Dhsk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/me/meme-suite/package.nix b/pkgs/by-name/me/meme-suite/package.nix
index 90047ee65d5a..5f185c3f923c 100644
--- a/pkgs/by-name/me/meme-suite/package.nix
+++ b/pkgs/by-name/me/meme-suite/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "meme-suite";
-  version = "5.1.1";
+  version = "5.5.4";
 
   src = fetchurl {
     url = "https://meme-suite.org/meme-software/${version}/meme-${version}.tar.gz";
-    sha256 = "38d73d256d431ad4eb7da2c817ce56ff2b4e26c39387ff0d6ada088938b38eb5";
+    sha256 = "sha256-zaYBHCuFW/JWPE56LCVeEembW25ec3Nv8AiUJQdYAVM=";
   };
 
   buildInputs = [ zlib ];
diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index 74716cb8c213..9a91ffca6e05 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "metacubexd";
-  version = "1.176.2";
+  version = "1.186.1";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "metacubexd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pvVtTN3hMwQJEV1a83Hb7KDnzEPSoxDCxIgAIvFrm88=";
+    hash = "sha256-AcqtDdEdtkxwm99CQzLGtDE9PSdRHJIO2gAUextqtSs=";
   };
 
   nativeBuildInputs = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-xDcqGvM8J6miDwiwNQODnPVq63flitva6/nPLYa9cgY=";
+    hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index e64a77a7c1f2..1742f171ecba 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.22.2";
+  version = "2.22.4";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pwAILZTSYk+AUi/XwC3bvK3KxZJkmCSprG9sbIhtdCc=";
+    hash = "sha256-sN3gGxUOWNFBB+iz6i+a0SP8my+IdbMXAVd/bWzzKms=";
   };
 
   vendorHash = "sha256-PxmtYVMkZcJvaM9CYSy5OSUkpyhL1VLwkXoY7uIe7Q8=";
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 7e78f1dc6442..8ce5d1aa22f8 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.134.2",
+  "version": "3.136.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_linux_x86_64",
-      "hash": "sha256-RrHB4/FLcIK1C0U0d6Vs2UxNTKCmcZT1ubBhqL1+rCQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_x86_64",
+      "hash": "sha256-MV6S23Ly0g2FPAhp2+RIMSC8D+s6NakVbMqLSwEr/2o="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_linux_aarch64",
-      "hash": "sha256-pohyE3VHFvkJ1YR1VkDrkrbqS4V10feFPNFfSpGZ2Ro="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_aarch64",
+      "hash": "sha256-zwistetfQCucaQ3yE1XHNChDhVCnSUq2ttl4XMnAQJU="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_mac_universal",
-      "hash": "sha256-BFCQ/QrzMGhB0y422by9L7/nmLv4mDzxMkhtQGSQBwg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",
+      "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.134.2/mirrord_mac_universal",
-      "hash": "sha256-BFCQ/QrzMGhB0y422by9L7/nmLv4mDzxMkhtQGSQBwg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",
+      "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="
     }
   }
 }
diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index 0b9cf686cae5..13bce0bcd6b7 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "3.19.0";
+  version = "3.21.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-3Qa9L8RnEeKJw/+GSVaGXPkCNZ8aWG/JkV6e2DF6ZEk=";
+    hash = "sha256-xBcz9XNpEDtIZW7yfbfWYPklw3whYoNF+gx3vkHQXGI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-PFq6gKMDbRGZaLjqLp8eNLn4mQ1we6RJXunzItdj+SQ=";
+  cargoHash = "sha256-LO7xJBWxEGKLxocVs6EDWzGYLX/YtH4d9gSaVy+XxbM=";
 
   # require running database
   doCheck = false;
diff --git a/pkgs/by-name/mn/mni_autoreg/package.nix b/pkgs/by-name/mn/mni_autoreg/package.nix
index 9d89a6eeff0c..e7698513891e 100644
--- a/pkgs/by-name/mn/mni_autoreg/package.nix
+++ b/pkgs/by-name/mn/mni_autoreg/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "mni_autoreg";
-  version = "unstable-2022-05-20";
+  version = "0.99.70-unstable-2024-10-04";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "mni_autoreg";
-    rev = "be7bd25bf7776974e0f2c1d90b6e7f8ccc0c8874";
-    sha256 = "sGMZbCrdV6yAOgGiqvBFOUr6pGlTCqwy8yNrPxMoKco=";
+    rev = "85265398d90dc1bfef886e2cf876a1a2caae86b4";
+    hash = "sha256-tKCDrIHlkArF5Xv6NlSkvmNMIMDsxEf5O3ATzm6DabQ=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,15 @@ stdenv.mkDerivation {
     MNI-Perllib
   ];
 
-  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=implicit-function-declaration"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
+  cmakeFlags = [
+    "-DLIBMINC_DIR=${libminc}/lib/cmake"
+    (lib.cmakeFeature "PERL_EXECUTABLE" (lib.getExe perlPackages.perl))
+  ];
   # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
 
   postFixup = ''
@@ -40,11 +48,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/BIC-MNI/mni_autoreg";
     description = "Tools for automated registration using the MINC image format";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.free;
   };
 }
diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix
index 1940e8a8f268..214e7c729178 100644
--- a/pkgs/by-name/mo/mount-zip/package.nix
+++ b/pkgs/by-name/mo/mount-zip/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fuse,
+  fuse3,
   boost,
   icu,
   libzip,
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mount-zip";
-  version = "1.6";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mount-zip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-akiZwuwrsj+62TmZEJamlvQ1rSyFA4hrH0TcZ8T97z4=";
+    hash = "sha256-HxHXQfyX3jdTJ5s/QwC9tkjU+JbPDEm7FUGss7tB0EM=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    fuse
+    fuse3
     icu
     libzip
   ];
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 3554ce93254e..d7bd6f1e1cb1 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-qtBE0kNNhCQ4o3NY/ylhA/AKCoIpCMXlWReONV1klm0=";
+    hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA=";
   };
 
-  vendorHash = "sha256-U4mHGkbl5nygQfakIRmyS5z85bulO7+MjKhbQmv9ZB8=";
+  vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ=";
 
   subPackages = ".";
 
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 24f0b3a55f3a..e43016e3ddb7 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird";
-  version = "0.39.1";
+  version = "0.39.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tm7MIgLfPbt3MFetYebYW+aeOgg55+lBXU1rXRIDfms=";
+    hash = "sha256-K1qnQfkptMFviWWqzDA+yju/L/aMNTyO3qDHzMJnXzU=";
   };
 
-  vendorHash = "sha256-VpU1WCudjo6M2DOhz3F4k/VOedIE/RqlU9mHgBcLcXw=";
+  vendorHash = "sha256-yNFyW1D2gFkt2VDTyiaDXPw0zrT4KBQTe72x0Jh0jOs=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 
diff --git a/pkgs/by-name/ne/networkmanager_dmenu/package.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
index 97acb7b35c1a..7e39c745d1c9 100644
--- a/pkgs/by-name/ne/networkmanager_dmenu/package.nix
+++ b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager_dmenu";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
     rev = "v${version}";
-    sha256 = "sha256-aw6TwRtlb9x/JOuJqPZTZB2+srlnteEOmYiOPS1tAbM=";
+    sha256 = "sha256-Iy8Bi6aXtNXFfuQmRhLo50cs7pMx1l+OIv019Dqj6ow=";
   };
 
   nativeBuildInputs = [ gobject-introspection ];
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index ff80c7d8deab..2da3eb5e7b6a 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.41.3";
+  version = "2.42.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5pM3usXT3ukKkhKtDR5nIllaCCEUj7GVIl5HWq9DwII=";
+    hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";
   };
 
-  vendorHash = "sha256-GnAo+B4UEZIf5K3d1XSU8WpHmdMqzO1nR0reSJ2D1Yk=";
+  vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index 8b6d262dfe39..a003f5eb65e5 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
     rev = "v${version}";
-    hash = "sha256-pCCyGFAeeRV9OV6bp5KIUb8/ZD7mktBR0pV+bB14AZc=";
+    hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/Q92s2I/JG745Nd2ZewKx4P/SMdyhXIMsR4oa7TImm8=";
+  cargoHash = "sha256-h6DoUCj7wjN/qiy0rsC2fCHhQ8hcmSwFu7zaRw9tCUs=";
 
   # skip test due FHS dependency
   doCheck = false;
diff --git a/pkgs/by-name/nm/nmrpflash/package.nix b/pkgs/by-name/nm/nmrpflash/package.nix
index 323bcd43fe58..1dd0aea6359a 100644
--- a/pkgs/by-name/nm/nmrpflash/package.nix
+++ b/pkgs/by-name/nm/nmrpflash/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nmrpflash";
-  version = "0.9.24";
+  version = "0.9.25";
 
   src = fetchFromGitHub {
     owner = "jclehner";
     repo = "nmrpflash";
     rev = "v${version}";
-    hash = "sha256-WneKImWEQQHBFEw/ABE7wA8ZFIvh2t5nJkfviq1fH4M=";
+    hash = "sha256-5oj+sIrVNAbLmmKHiBSDSVdJFrobK41UfWBmU0WRG3c=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix
index 51145d2ebbc7..c5bcc28b3e97 100644
--- a/pkgs/by-name/np/npm-check-updates/package.nix
+++ b/pkgs/by-name/np/npm-check-updates/package.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "npm-check-updates";
-  version = "17.1.15";
+  version = "17.1.16";
 
   src = fetchFromGitHub {
     owner = "raineorshine";
     repo = "npm-check-updates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NewFg7eKhBMgMrjLQ1/n+CytcOZEaMMr/PNgA57Irw8=";
+    hash = "sha256-yNo1W+Twzs3jG9bZzgjDLTxvZYCXY/FhoGtjlh6ZMZo=";
   };
 
-  npmDepsHash = "sha256-qF3p+P+CJvpDhx0ddPnz6A7N9yC9+6uXWQCWFo9k30c=";
+  npmDepsHash = "sha256-8jxuKxL7PEGYqK6kwSPnfmoQH4RLmL8sGi989RDBBSI=";
 
   postPatch = ''
     sed -i '/"prepare"/d' package.json
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index fa847d3916aa..63cd50a39d0c 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.1.5";
+  version = "10.1.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-8WfFNXxbDWV+AFybsLkcpNKUnJ8a1FpANv1cvmNIJqA=";
+    hash = "sha256-4li7585M7Pp1/mzD91+tgZgsnoo/Hfy55O+7bEyxUtA=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index 42c03a9ccf99..74677277285c 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-FseLPykYJrfjCyuS0+yLNcEhzFAaguJjMSdGHIacexo=";
+    hash = "sha256-ZSmyhNbZotNiqoXl4E+Pjap5zewPlwcTlPihcm4v6Qs=";
   };
 
   vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw=";
diff --git a/pkgs/by-name/nw/nwg-displays/package.nix b/pkgs/by-name/nw/nwg-displays/package.nix
index a79a98919b75..dae8595613ef 100644
--- a/pkgs/by-name/nw/nwg-displays/package.nix
+++ b/pkgs/by-name/nw/nwg-displays/package.nix
@@ -15,13 +15,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-displays";
-  version = "0.3.22";
+  version = "0.3.25";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-displays";
     tag = "v${version}";
-    hash = "sha256-lTFei4NR8eu5/5V9MEc/k6qQYRRZkQ5m6B7Bx9xIS6c=";
+    hash = "sha256-Om5kz3mtrQPd5aHZwf/9BBDnPfSzMhyRp05MqX+7XzQ=";
   };
 
   nativeBuildInputs = [
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     description = "Output management utility for Sway and Hyprland";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ qf0xb ];
     mainProgram = "nwg-displays";
   };
 }
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index 09984af405cd..f8be91ed1719 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -13,16 +13,16 @@
 
 let
   pname = "nwg-drawer";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-drawer";
     rev = "v${version}";
-    hash = "sha256-LFxugvLRUyx6uNc8dzn7tB4cZp87hcI7Fi2/9hVBJx0=";
+    hash = "sha256-uctM2fi3lfSrvKSinkjAXD3bLyJOVC0DTyDoAKXgB54=";
   };
 
-  vendorHash = "sha256-3QSq4zdsQu2bvKH0oA4Sapd247jYy+GV69roy9x8WK0=";
+  vendorHash = "sha256-VW9K56pdzA6CAqyJ859WOCEtHTASW8lnQGuW1zBUJYw=";
 in
 buildGoModule {
   inherit
diff --git a/pkgs/by-name/ny/nyaa/package.nix b/pkgs/by-name/ny/nyaa/package.nix
new file mode 100644
index 000000000000..df6340fb8505
--- /dev/null
+++ b/pkgs/by-name/ny/nyaa/package.nix
@@ -0,0 +1,37 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nyaa";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "Beastwick18";
+    repo = "nyaa";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WxOGtNMqQoEgztLaitwpE4MusGaLuKMmqi9L4prfOBY=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-oCe0Yn0DuwF7rG+MGBGQ0Fsgt3c4Wju7uFkp3+IiP0I=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/Beastwick18/nyaa/releases/tag/v${finalAttrs.version}";
+    description = "Tui tool for browsing and downloading torrents";
+    homepage = "https://github.com/Beastwick18/nyaa";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "nyaa";
+    maintainers = with lib.maintainers; [ redyf ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index b68944dd20dc..2d5ca17c04ee 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onedrive";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KJ+6Yo5tod36yMihBamdzCGzVOTItN9OgUd05pAyTxc=";
+    hash = "sha256-SoTkphmxWVAeSfqO7Vqm8bdPAP1hK57zFNR6N5elEOM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index 73987c5267ac..69efb208b6bf 100644
--- a/pkgs/by-name/op/opengrok/package.nix
+++ b/pkgs/by-name/op/opengrok/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
-  version = "1.13.26";
+  version = "1.13.27";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-MPKPbKi7u7SFBBkIxZDrE4TV8RRjGWpRBp6vmeeagwM=";
+    hash = "sha256-Qr30+paSn3I3+tWpzALTIXP8kxireL96rKopDDj/qnM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix
index be65fe8c6887..f5e20af9d1a3 100644
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@@ -3,19 +3,21 @@
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
+  versionCheckHook,
 }:
-buildGoModule rec {
+
+buildGoModule (finalAttrs: {
   pname = "opnborg";
-  version = "0.1.66";
+  version = "0.1.68";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "opnborg";
-    rev = "v${version}";
-    hash = "sha256-7WYDkAHhCrVghNd+77XfwF1WwYJ8azt0Twn4d/rDjU8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fES3YlJu8Zy1CLNEkzWW0KAhy3dZj1JXAT8y9tRjyEA=";
   };
 
-  vendorHash = "sha256-i9MDtaR5uTrIhpliCyK/WMZqT69TyPVLQI9AGHCWavU=";
+  vendorHash = "sha256-u1LZvLAKYd1TQlZkYxgztOm1g94N4orMe6Y1Ab1to5Y=";
 
   ldflags = [
     "-s"
@@ -24,12 +26,18 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/opnborg";
+  versionCheckProgramArg = "--version";
+
   meta = {
-    changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${version}";
+    changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${finalAttrs.version}";
     homepage = "https://paepcke.de/opnborg";
     description = "Sefhosted OPNSense Appliance Backup & Configuration Management Portal";
     license = lib.licenses.bsd3;
     mainProgram = "opnborg";
     maintainers = with lib.maintainers; [ paepcke ];
   };
-}
+})
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 223064576721..ac79481e65e6 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -145,27 +145,32 @@ stdenv.mkDerivation (finalAttrs: {
 
   NLOPT = nlopt;
 
-  NIX_CFLAGS_COMPILE = toString [
-    "-Wno-ignored-attributes"
-    "-I${opencv.out}/include/opencv4"
-    "-Wno-error=template-id-cdtor"
-    "-Wno-error=incompatible-pointer-types"
-    "-Wno-template-id-cdtor"
-    "-Wno-uninitialized"
-    "-Wno-unused-result"
-    "-Wno-deprecated-declarations"
-    "-Wno-use-after-free"
-    "-Wno-format-overflow"
-    "-Wno-stringop-overflow"
-    "-DBOOST_ALLOW_DEPRECATED_HEADERS"
-    "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"
-    "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"
-    "-DBOOST_MATH_DISABLE_FLOAT128"
-    "-DBOOST_MATH_NO_QUAD_SUPPORT"
-    "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
-    "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
-    "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
-  ];
+  NIX_CFLAGS_COMPILE = toString (
+    [
+      "-Wno-ignored-attributes"
+      "-I${opencv.out}/include/opencv4"
+      "-Wno-error=incompatible-pointer-types"
+      "-Wno-template-id-cdtor"
+      "-Wno-uninitialized"
+      "-Wno-unused-result"
+      "-Wno-deprecated-declarations"
+      "-Wno-use-after-free"
+      "-Wno-format-overflow"
+      "-Wno-stringop-overflow"
+      "-DBOOST_ALLOW_DEPRECATED_HEADERS"
+      "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"
+      "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"
+      "-DBOOST_MATH_DISABLE_FLOAT128"
+      "-DBOOST_MATH_NO_QUAD_SUPPORT"
+      "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
+      "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
+      "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
+    ]
+    # Making it compatible with GCC 14+, see https://github.com/SoftFever/OrcaSlicer/pull/7710
+    ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14") [
+      "-Wno-error=template-id-cdtor"
+    ]
+  );
 
   NIX_LDFLAGS = toString [
     (lib.optionalString withSystemd "-ludev")
diff --git a/pkgs/by-name/os/osquery/update.py b/pkgs/by-name/os/osquery/update.py
index d593154e78a8..3bb24c68a528 100644
--- a/pkgs/by-name/os/osquery/update.py
+++ b/pkgs/by-name/os/osquery/update.py
@@ -9,7 +9,7 @@ OWNER = 'osquery'
 REPO = 'osquery'
 OPENSSL_VERSION_PAT = re.compile(r'^set\(OPENSSL_VERSION "(.*)"\)')
 OPENSSL_SHA256_PAT = re.compile(r'^set\(OPENSSL_ARCHIVE_SHA256 "(.*)"\)')
-INFO_PATH = 'pkgs/tools/system/osquery/info.json'
+INFO_PATH = 'pkgs/by-name/os/osquery/info.json'
 
 
 def download_str(url):
diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index 3e5e88634dd5..717b0871ea86 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "1.9.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-Db5AgFvyrUOlW+1rcw8jPUzTBwQcFelLk5Rqk9HsbCo=";
+    hash = "sha256-iYbCCGZDTUbyW1XvQIpLZEtuzwUhTBAf3EfAwRX9qYU=";
   };
 
-  vendorHash = "sha256-4e+aEOo/hu2lC0c1sT8XJXdjrlcsqmPjpgvvdakHnmc=";
+  vendorHash = "sha256-saD4RehZrKSC5V3A5r5prlq+080BFbhEp1Jo1rCbSHI=";
 
   subPackages = [
     "cmd/osv-scanner"
diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index 58be43c9be43..ef10b1d3a9b7 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "partclone";
-  version = "0.3.33";
+  version = "0.3.34";
 
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
     rev = version;
-    sha256 = "sha256-dWpl/6d5TSZnJ0IGTtl87NchJWmsCOKa/vmQA3OEK7A=";
+    sha256 = "sha256-VxHxg5O/ox97rgRvY+KJJx35DVruack2Nu7JKwysruc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix
index 651ec40b198f..f7a75990f285 100644
--- a/pkgs/by-name/pa/passt/package.nix
+++ b/pkgs/by-name/pa/passt/package.nix
@@ -5,15 +5,16 @@
 , getconf
 , gitUpdater
 , testers
+, unixtools
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "passt";
-  version = "2024_12_11.09478d5";
+  version = "2025_03_20.32f6212";
 
   src = fetchurl {
     url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-IE0BMM24lrl5NHeQGkAZZVwmAsvkhDN64pARdEiOM6s=";
+    hash = "sha256-TRtFwBUUOnRwcLtB3vwU5nG/ufi9D36waXW5Yuboowk=";
   };
 
   postPatch = ''
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
+      command = "${unixtools.script}/bin/script -c 'passt --version'";
     };
 
     updateScript = gitUpdater {
diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index d7cea40f6c5d..626c2e13cda8 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   # also update rev of headers in python3Packages.pypdfium2
-  version = "7047";
+  version = "7087";
   src =
     let
       inherit (stdenv.hostPlatform) system;
@@ -18,10 +18,10 @@ let
         aarch64-darwin = "mac-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-cBhGagmFHH3SNW+w4yzm5GUnQqApRjp6iWzilDIgtiU=";
-        aarch64-linux = "sha256-b0XRtz9tdUpBqRqRGJNGv6fTvAiRnNbNQAqIKNjByg0=";
-        x86_64-darwin = "sha256-shvCpikbRgvHW8Z6ALwPZ5zYy46DcDmYum86xrSRozM=";
-        aarch64-darwin = "sha256-dglnL8OpkAXPdANeOFJU9HY/1RtinFeSdA4FO/PJiP4=";
+        x86_64-linux = "sha256-zn7QlTvChQa2mQCe5K+zEGVUtuD+l/jEtlKticrrSKg=";
+        aarch64-linux = "sha256-080X72NNfKaanHeVtmxE/4uNV6Ue4f/1Mri/p3nOT8c=";
+        x86_64-darwin = "sha256-XMStU0MN9ieCrLQnQL4/jKrNWxgQl9OtZHg9EmemPhU=";
+        aarch64-darwin = "sha256-Q8R/p1hX6+JeVTFc6w7MC9GPNGqxlu6m+iawRIMndic=";
       };
     in
     fetchzip {
diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix
index 898171820c7d..b3ea28f0b780 100644
--- a/pkgs/by-name/ph/photoprism/backend.nix
+++ b/pkgs/by-name/ph/photoprism/backend.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"
   '';
 
-  vendorHash = "sha256-6xE1j/Vh9ltE6TpBkvjK4rzLyXv8OJzy84vf9Iqw3yU=";
+  vendorHash = "sha256-eHdnTpcVBSvGR9ZiK6A32jfjik8VClDTkv92bD8EIgA=";
 
   subPackages = [ "cmd/photoprism" ];
 
diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix
index c297335d103a..5cb90ae8ef68 100644
--- a/pkgs/by-name/ph/photoprism/frontend.nix
+++ b/pkgs/by-name/ph/photoprism/frontend.nix
@@ -13,7 +13,7 @@ buildNpmPackage {
     cd frontend
   '';
 
-  npmDepsHash = "sha256-y2Mj0sJP2urTDrsVPReVFi7G9fLjuKz76vDPLvkaMFA=";
+  npmDepsHash = "sha256-3cytU/QaPSsGu/984AEh3YsdV4H5cjf/br3NSc5Zd1M=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix
index 14c8b832876b..158aa87830e7 100644
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -17,14 +17,14 @@
 }:
 
 let
-  version = "240711-2197af848";
+  version = "250321-57590c48b";
   pname = "photoprism";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8=";
+    hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8=";
   };
 
   libtensorflow = callPackage ./libtensorflow.nix { };
diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix
index d494f85809a5..e5d47c202bae 100644
--- a/pkgs/by-name/po/policycoreutils/package.nix
+++ b/pkgs/by-name/po/policycoreutils/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "policycoreutils";
-  version = "3.8";
+  version = "3.8.1";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${se_url}/${version}/policycoreutils-${version}.tar.gz";
-    hash = "sha256-LEMLhmKq+zp1clHp2NYuyqvBwkvisqasbofT+giwTiI=";
+    hash = "sha256-7vIxlrUB0UHLlfX8Uu8acon0WbZeRBXqD+mu7cXYDvI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
index 9385801b1f87..26d3ce9e1c88 100644
--- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
+++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "projectm-sdl-cpp";
-  version = "0-unstable-2025-02-28";
+  version = "0-unstable-2025-03-17";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "frontend-sdl-cpp";
-    rev = "9d93ead331553738568fb789d5e95bfb2388e953";
-    hash = "sha256-ubylUiVVs7GqirWgawY3ruL/yyZIy8QNJ3wEdTc+4Pc=";
+    rev = "080e48b303fe9d7eebaba6d266ddef0543bba0d3";
+    hash = "sha256-5thnZhw22U2IVn6VNDEIw1fEaTnTwJv8pkgAdWdrHu8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index f12d00b45a8a..f5216be48eeb 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -7,11 +7,11 @@
 renode.overrideAttrs (
   finalAttrs: _: {
     pname = "renode-unstable";
-    version = "1.15.3+20250227git5f21d12f9";
+    version = "1.15.3+20250314git5b219d820";
 
     src = fetchurl {
       url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-      hash = "sha256-yg13mFYNXZGb4exfra1kggVzlhU6J4UUtJC5NLfVL9E=";
+      hash = "sha256-v23MC22DVYV+czmpktKKP8lU0JKjgoOfNkTDhm0q/4o=";
     };
 
     passthru.updateScript =
diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index 9e120736c8ea..bb971a848e3a 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "rke";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-GMo/r1HLbAy1W4IHsP2sAS058ysNFGeQq6Aob9jmJac=";
+    hash = "sha256-5KL9XAd0CnJ7yTfU1KpYqHBu9DxTTqo2fMPAr9IqqZY=";
   };
 
-  vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM=";
+  vendorHash = "sha256-5+BjXPh52RNoaU/ABpvgbAO+mKcW4Hg2SRxRhV9etIo=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index aaf9d3e35e76..d68c97cf1e95 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-03-14";
+  version = "0-unstable-2025-03-28";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "07dbb0c7d3bc3038ad9eb4cf3304c7da1af440d3";
-    hash = "sha256-9Sla1i24wzKpm0Zoap+OXzfXYotJvjYVGm3JGcpTvJc=";
+    rev = "fbb71fb47b39095365ebba057342a4b0330ac477";
+    hash = "sha256-h1AuaR1MTgRhk4K+dbq2GAtVch8kehFDRFHknQzK3fg=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index 351bf11867ca..110cc6df04c5 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -101,7 +101,7 @@ buildDotnetModule rec {
     "--set SDL_VIDEODRIVER x11"
   ];
 
-  preInstall = ''
+  preInstall = lib.optionalString stdenv.isLinux ''
     # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
     mkdir -p $out/lib/sndio-6
     ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 157b6f3583b8..cc4af8a03439 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.50";
+  version = "0.51";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${version}";
-    hash = "sha256-srLziLdTjKd8NC5YBbAR1iD1EcJAL3HUp6O7Z2drdsI=";
+    hash = "sha256-U9aIZ+D5BhAPWuyQgAvwO6Bu8na2KnYLVPoDHi18jj4=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix
new file mode 100644
index 000000000000..bd55fcb22c17
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-gcg/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  pkgs,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  scipopt-scip,
+  cliquer,
+  gsl,
+  gmp,
+  bliss,
+  nauty,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "scipopt-gcg";
+  version = "371";
+
+  # To correlate scipVersion and version, check: https://scipopt.org/#news
+  scipVersion = "9.2.1";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "gcg";
+    tag = "v${version}";
+    hash = "sha256-+rD8tGE49Irg9xZTD3Ay87ISSeRI4kbBpCj5ppyENbo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    scipopt-scip
+    cliquer
+    gsl
+    gmp
+    bliss
+    nauty
+  ];
+
+  # Fixing the error
+  #   > CMake Error at CMakeLists.txt:236 (find_package):
+  #   >   By not providing "FindNAUTY.cmake" in CMAKE_MODULE_PATH this project has
+  #   >   asked CMake to find a package configuration file provided by "NAUTY", but
+  #   >   CMake did not find one.
+  # with this weird workaround of setting SCIPOptSuite_SOURCE_DIR to include the scipopt-scip source
+  # files via symlinks, so the specific nauty files are found:
+  preConfigure = ''
+    mkdir -pv $out/scip
+    ln -sv ${scipopt-scip.src}/src/ $out/scip/src
+    cmakeFlagsArray+=(
+      "-DSCIPOptSuite_SOURCE_DIR=$out"
+    )
+  '';
+  doCheck = true;
+  meta = {
+    maintainers = with lib.maintainers; [ fettgoenner ];
+    changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
+    description = "Branch-and-Price & Column Generation for Everyone";
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://gcg.zib.de";
+    mainProgram = "gcg";
+  };
+}
diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix
new file mode 100644
index 000000000000..9f0581f4f575
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-papilo/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  boost,
+  blas,
+  gmp,
+  tbb_2021_11,
+  gfortran,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "scipopt-papilo";
+  version = "2.4.1";
+
+  # To correlate scipVersion and version, check: https://scipopt.org/#news
+  scipVersion = "9.2.1";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "papilo";
+    tag = "v${version}";
+    hash = "sha256-oQ9iq5UkFK0ghUx6uxdJIOo5niQjniHegSZptqi2fgE=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    blas
+    gmp
+    gfortran
+    boost
+    tbb_2021_11
+  ];
+
+  cmakeFlags = [
+    # Disable automatic download of TBB.
+    (lib.cmakeBool "TBB_DOWNLOAD" false)
+
+    # Explicitly disable SoPlex as a built-in back-end solver to avoid this error:
+    #   > include/boost/multiprecision/mpfr.hpp:22: fatal error: mpfr.h: No such file or directory
+    #   > compilation terminated.
+    (lib.cmakeBool "SOPLEX" false)
+
+    # (lib.cmakeBool "GMP" true)
+    # (lib.cmakeBool "QUADMATH" true)
+    # (lib.cmakeBool "TBB" true)
+  ];
+  doCheck = true;
+  meta = {
+    maintainers = with lib.maintainers; [ fettgoenner ];
+    changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
+    description = "Parallel Presolve for Integer and Linear Optimization";
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://github.com/scipopt/papilo";
+    mainProgram = "papilo";
+  };
+}
diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix
new file mode 100644
index 000000000000..c4939120ae08
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-scip/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchFromGitHub,
+  cmake,
+  zlib,
+  readline,
+  gmp,
+  scipopt-soplex,
+  scipopt-papilo,
+  scipopt-zimpl,
+  ipopt,
+  tbb_2021_11,
+  boost,
+  gfortran,
+  criterion,
+  mpfr,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "scipopt-scip";
+  version = "9.2.1";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "scip";
+    tag = "v${lib.replaceStrings [ "." ] [ "" ] version}";
+    hash = "sha256-xYxbMZYYqFNInlct8Ju0SrksfJlwV9Q+AHjxq7xhfAs=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    scipopt-soplex
+    scipopt-papilo
+    scipopt-zimpl
+    ipopt
+    gmp
+    readline
+    zlib
+    tbb_2021_11
+    boost
+    gfortran
+    criterion
+    mpfr # if not included, throws fatal error: mpfr.h not found
+  ];
+
+  cmakeFlags = [ ];
+
+  doCheck = true;
+
+  meta = {
+    maintainers = with lib.maintainers; [ fettgoenner ];
+    changelog = "https://scipopt.org/doc-${version}/html/RN${lib.versions.major version}.php";
+    description = "Solving Constraint Integer Programs";
+    license = lib.licenses.asl20;
+    homepage = "https://github.com/scipopt/scip";
+    mainProgram = "scip";
+  };
+}
diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix
new file mode 100644
index 000000000000..ab79ae825c21
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-soplex/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  gmp,
+  mpfr,
+  zlib,
+  boost,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "scipopt-soplex";
+  version = "713";
+
+  # To correlate scipVersion and version, check: https://scipopt.org/#news
+  scipVersion = "9.2.1";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "soplex";
+    rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
+    hash = "sha256-qI7VGPAm3ALzeiD/OgvlZ1w2GzHRYdBajTW5XdIN9pU=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    boost
+    gmp
+    mpfr
+    zlib
+  ];
+
+  strictDeps = true;
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://soplex.zib.de/";
+    description = "Sequential object-oriented simPlex";
+    license = with lib.licenses; [ asl20 ];
+    mainProgram = "soplex";
+    maintainers = with lib.maintainers; [ david-r-cox ];
+    changelog = "https://scipopt.org/doc-${finalAttrs.scipVersion}/html/RN${lib.versions.major finalAttrs.scipVersion}.php";
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix
new file mode 100644
index 000000000000..5905ce388596
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-ug/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  cmake,
+  scipopt-scip,
+  zlib,
+  mpi,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "scipopt-ug";
+  version = "1.0.0-beta6";
+
+  # To correlate scipVersion and version, check: https://scipopt.org/#news
+  scipVersion = "9.2.1";
+
+  # Take the SCIPOptSuite source since no other source exists publicly.
+  src = fetchzip {
+    url = "https://github.com/scipopt/scip/releases/download/v${
+      lib.replaceStrings [ "." ] [ "" ] scipVersion
+    }/scipoptsuite-${scipVersion}.tgz";
+    sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE=";
+  };
+
+  sourceRoot = "${src.name}/ug";
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    scipopt-scip
+    mpi
+    zlib
+  ];
+
+  meta = {
+    maintainers = with lib.maintainers; [ fettgoenner ];
+    changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
+    description = "Ubiquity Generator framework to parallelize branch-and-bound based solvers";
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://ug.zib.de";
+  };
+}
diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix
new file mode 100644
index 000000000000..d0e768b3e7ac
--- /dev/null
+++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  bison,
+  flex,
+  gmp,
+  zlib,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "scipopt-zimpl";
+  version = "362";
+
+  # To correlate scipVersion and version, check: https://scipopt.org/#news
+  scipVersion = "9.2.1";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "zimpl";
+    tag = "v${version}";
+    sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o=";
+  };
+
+  postPatch = ''
+    chmod +x check/check.sh
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    bison
+    flex
+  ];
+
+  buildInputs = [
+    gmp
+    zlib
+  ];
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    pushd ../check
+    ./check.sh ../build/bin/zimpl
+    popd
+    runHook postCheck
+  '';
+  meta = {
+    maintainers = with lib.maintainers; [ fettgoenner ];
+    changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
+    description = "Zuse Institut Mathematical Programming Language";
+    longDescription = ''
+      ZIMPL is a little language to translate the mathematical model of a
+      problem into a linear or (mixed-)integer mathematical program
+      expressed in .lp or .mps file format which can be read by a LP or MIP
+      solver.
+
+      If you use Zimpl for research and publish results, the best way
+      to refer to Zimpl is to cite my Ph.d. thesis:
+
+      @PHDTHESIS{Koch2004,
+         author      = "Thorsten Koch",
+         title       = "Rapid Mathematical Programming",
+         year        = "2004",
+         school      = "Technische {Universit\"at} Berlin",
+         url         = "http://www.zib.de/Publications/abstracts/ZR-04-58/",
+         note        = "ZIB-Report 04-58",
+      }
+    '';
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://zimpl.zib.de";
+    mainProgram = "zimpl";
+  };
+}
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 4370d32e565c..bc68f58f9745 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${version}";
-    hash = "sha256-r9RZZqf6IVwMkCKHHH7hBP0t1HIr8zuhoaL4fD3UXso=";
+    hash = "sha256-OmP2FLvBupeJeGhMMBgcTpMSgQZ5JWzXBVeFZt7EU4Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mpVh6bRZVec9SXOuc9/BY0SSkzUPE7ykmHXSdzaMwrc=";
+  cargoHash = "sha256-8Ry3rpGTNcvMIA3Q10Cb3uJHOBQin9AhlLNRekaKw/0=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 0f4666648a55..62faa989d3dd 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -62,13 +62,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-03-18";
+  version = "0-unstable-2025-03-29";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "8d39d7706aee50971e848a5e31fc6bfd7ef552c1";
-    hash = "sha256-PdkES7tvECVoJWa78t/K4ab+brqCLHY47c+TnDNQ3Ps=";
+    rev = "5d1c64dba9cf3e65f770370eb17f00ad4114edce";
+    hash = "sha256-0DuS2WfgWgnxh5qDc/XNL28XxXKnYPQW7F2m4OlANck=";
     # 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
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mxbRqJ+ex9k1h6wOgjPHWfG8RA0vVRBAqsHtwSRI12Y=";
+  cargoHash = "sha256-m6lsXHf7SIgbIt8RyhUkJpd1/nJQMSNRS9uTJ6th9ng=";
 
   # 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/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix
index ba565b5c20b3..44735da75e42 100644
--- a/pkgs/by-name/sn/snakefmt/package.nix
+++ b/pkgs/by-name/sn/snakefmt/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "snakefmt";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
-  disabled = python3.pythonOlder "3.8.1";
+  disabled = python3.pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QoalkDtm2n5SdjxegYTaTtyVETt1j0RIUogE+1T5t1o=";
+    hash = "sha256-r8O5LhA8/agP/35381f2zB2rdCJy7nY0K6NC8w5yHzA=";
   };
 
   build-system = [ python3.pkgs.poetry-core ];
@@ -27,6 +27,8 @@ python3.pkgs.buildPythonApplication rec {
     toml
   ];
 
+  pythonRelaxDeps = [ "black" ];
+
   pythonImportsCheck = [ "snakefmt" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 5e07b18b1030..d4563bebf85f 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "spire";
-  version = "1.11.2";
+  version = "1.12.0";
 
   outputs = [
     "out"
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "spiffe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-aLAJbNnFd7fcxLJ/htoFacU5NjPnnrlC6/LiT/sVHwk=";
+    sha256 = "sha256-hNa1e6h4IhD2SfhZZ5xkwQ7e7X5x3Gk4v33nw2t+cvk=";
   };
 
-  vendorHash = "sha256-QE0+3TzJQ9Ue6V1QjNJzkrleXPZrd17lY+KqcPf/Hwg=";
+  vendorHash = "sha256-6qtR9SF6QQKqsVpKpp6YBkB9wOLFwm8C3PF0DlN0Ud0=";
 
   subPackages = [
     "cmd/spire-agent"
diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index 26ea41b0c0b4..120c0cca258b 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -37,13 +37,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "sqlpage";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "SQLpage";
     tag = "v${version}";
-    hash = "sha256-Yme+Nh6x5cJzDm3o4s+QVrOmv6afnmoD7ZjhTkWDAgo=";
+    hash = "sha256-cqMXdAXc46DbbONz1A6uf2Oo2Cu4sig6ntuLqYlihR4=";
   };
 
   postPatch = ''
@@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec {
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-/LTDlZseS4V2nqBKyi3HaxjNyqKHVYYNFmEJOTp0pqs=";
+  cargoHash = "sha256-NUbCSYUTXN8glw94Lr/+Jj54PukRXFlzTxq0d7znjwA=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix
index b25351bfb37f..6179b456225c 100644
--- a/pkgs/by-name/ss/ssocr/package.nix
+++ b/pkgs/by-name/ss/ssocr/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ssocr";
-  version = "2.24.1";
+  version = "2.25.0";
 
   src = fetchFromGitHub {
     owner = "auerswal";
     repo = "ssocr";
     rev = "v${version}";
-    sha256 = "sha256-5v97v9sBoHDCH2onpmBI7otK9UuhqJbM1TMapKp4XsM=";
+    sha256 = "sha256-yQPjs4kGvp6C7kFcWQ3EzoFhwEAhm2nC7yXu9RbU4os=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 69a8b759f915..cd678c8f98a9 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.26.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-7XI5YkfLY/Jo1lVEQ2waN7/g8xN8LUTXIva8OzRdRSo=";
+    hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE=";
   };
 
-  vendorHash = "sha256-ZVDe28D2vw/p5i6MoBZ1KS9pjncOzul3/bLB4cGoY80=";
+  vendorHash = "sha256-NiaY0HKDerYqehZkYToAHazaJe0eMUuue+8h6QdQDHM=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index 71eb5df05e8b..7b3289bfb5ed 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -20,13 +20,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0.6.0-unstable-2025-03-17";
+  version = "0.6.0-unstable-2025-03-28";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "8482d947369230b3af45e8775b78dad2379f7a1a";
-    hash = "sha256-/2j8olMZngr5tKmM0JfxM8oi+CYn05LY5406syq7jak=";
+    rev = "2f0fba8b16a3fbab083cedcf09974514b3a29d25";
+    hash = "sha256-i/bmZFoC3fRocO1KeCPGB9K/0yEAcKlLh56N+r1V7CI=";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/su/sunxi-tools/package.nix b/pkgs/by-name/su/sunxi-tools/package.nix
index 075b94148822..c6ec1b65cd04 100644
--- a/pkgs/by-name/su/sunxi-tools/package.nix
+++ b/pkgs/by-name/su/sunxi-tools/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "sunxi-tools";
-  version = "0-unstable-2024-10-13";
+  version = "0-unstable-2025-03-07";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "29d48c3c39d74200fb35b5750f99d06a4886bf2e";
-    sha256 = "sha256-IUgAM/wVHGbidJ2bfLcTIdXg7wxEjxCg1IA8FtDFpR4=";
+    rev = "4390ca668f3b2e62f885edb6952b189c4489d83d";
+    sha256 = "sha256-TwMV+hsbfARrns1ZimYTXNdGS8E9gIal6NqXBzsQjAc=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix
index 2a364fbb7bcb..67c4cebfbe82 100644
--- a/pkgs/by-name/su/superfile/package.nix
+++ b/pkgs/by-name/su/superfile/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "1.2.0.0";
+  version = "1.2.1";
   tag = "v${version}";
 in
 buildGoModule {
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "yorukot";
     repo = "superfile";
     inherit tag;
-    hash = "sha256-ByCKpNUWwVzO6A8Ad9V0P0lsquYgVqDS3eCta5iOfXI=";
+    hash = "sha256-yClDrDpt6QUWeAtWkG0tkmFqnaviRixz6Kez0q4cRuk=";
   };
 
-  vendorHash = "sha256-5mjy6Mu/p7UJCxn2XRbgtfGmrS+9bEt4+EVheYZcDpY=";
+  vendorHash = "sha256-STiuaNcmoviHBXGcSPPs39sICsks3Z8I3ANdnlUqA/k=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix
index 630da8c0aeca..e03df3fd06f8 100644
--- a/pkgs/by-name/su/suricata/package.nix
+++ b/pkgs/by-name/su/suricata/package.nix
@@ -40,11 +40,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "suricata";
-  version = "7.0.8";
+  version = "7.0.9";
 
   src = fetchurl {
     url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
-    hash = "sha256-SSkoxiLhcL2cRdNTC8KxAzxVgtwYCFxDb86vtigp084=";
+    hash = "sha256-5XspNDx7ahhXyZG9crCzRKuimOThGVM7F56BfampnT0=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix
index 69ba10d6c06d..c59e90506bd2 100644
--- a/pkgs/by-name/ta/taler-challenger/package.nix
+++ b/pkgs/by-name/ta/taler-challenger/package.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-challenger";
-  version = "0.14.1";
+  version = "0.14.3-unstable-2025-02-17";
 
   src = fetchgit {
     url = "https://git.taler.net/challenger.git";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-W7oImw5ptrLVIK8KPtmb7PJKSpmh8KsazxV6reUoRO8=";
+    rev = "e49e33a13df92c6a1d6f119775baa31778163531";
+    hash = "sha256-AOtCx/r6JzwOSF3b3lDeY0/S+dGGNrJELerFoQ/K4tA=";
   };
 
   # https://git.taler.net/challenger.git/tree/bootstrap
diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index 208a7dfbc686..d9be94b66252 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-exchange";
-  version = "0.14.1";
+  version = "0.14.6-unstable-2025-03-02";
 
   src = fetchgit {
     url = "https://git.taler.net/exchange.git";
-    rev = "v${finalAttrs.version}";
+    rev = "13e058a902a3dbee9d7fe327030b88c2d126675b";
     fetchSubmodules = true;
-    hash = "sha256-DD6fX54K1q4f2d/IqC+urVpMkypDRaL3lrBoQieGviI=";
+    hash = "sha256-fqlYpFggQkB/IqD6V01ec+G4EtoNaA/FXigM+jqIMe0=";
   };
 
   patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ];
diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index 2cf1f7de6cf5..c144c8a607b6 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-merchant";
-  version = "0.14.1";
+  version = "0.14.6-unstable-2025-03-02";
 
   src = fetchgit {
     url = "https://git.taler.net/merchant.git";
-    rev = "v${finalAttrs.version}";
+    rev = "c84ed905e2d4af60162a7def5c0fc430394930e6";
     fetchSubmodules = true;
-    hash = "sha256-ac7ajHBLW6BJrL0iaa+b7XNZHMEEmbAo17URIdPSXd8=";
+    hash = "sha256-LXmrY8foiYOxCik23d3f4t9+tldbm7bVGG8eQOLsm+A=";
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix
index 34f9021c759b..7eb982f9b120 100644
--- a/pkgs/by-name/ta/taler-sync/package.nix
+++ b/pkgs/by-name/ta/taler-sync/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-sync";
-  version = "0.14.1";
+  version = "0.14.2-unstable-2025-03-02";
 
   src = fetchgit {
     url = "https://git.taler.net/sync.git";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-v+BBn9GZ+4Zc8iUebGmLtxAQN+7+cTdG8jNOpi+jN2c=";
+    rev = "10d0e97f191a8bd7de07049559a2eccb29a78507";
+    hash = "sha256-aihxgknPCE8tbRfncbMO/zHGg395LHVuXWyln2ryiCw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index 9f046d3b811b..a76f4ef4d16a 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.27.1";
+  version = "1.27.2";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    hash = "sha256-hQs2rSTbNqknQ/N0mZ8BxeKQn2Pm9Yt/5eKGB2Kc+ME=";
+    hash = "sha256-3x94Cccy5CHAKb2eHdMThAC+ONQjuYZ4UyQ8YwrWvgU=";
   };
 
-  vendorHash = "sha256-kasKs692fHojyCLsSdho5LWej11Asu8JJb61rbg1k2k=";
+  vendorHash = "sha256-g3XASZFZPS2Zs7gvGQpy9GO5kpA9gSL4Ur3LQhKIL6Y=";
 
   excludedPackages = [ "./build" ];
 
diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix
index b59f3310ad10..fb8fb7c8e86e 100644
--- a/pkgs/by-name/te/tetragon/package.nix
+++ b/pkgs/by-name/te/tetragon/package.nix
@@ -7,19 +7,26 @@
   llvm_16,
   clang_16,
   bash,
+  writableTmpDirAsHomeHook,
+  gitMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tetragon";
-  version = "1.2.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "tetragon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q=";
+    hash = "sha256-HOVQdKUIBLq9/2hTokZKvLZOgRQu5/lAwYy1yQa1bus=";
   };
 
+  nativeBuildInputs = [
+    writableTmpDirAsHomeHook
+    gitMinimal
+  ];
+
   buildInputs = [
     clang_16
     go
@@ -27,48 +34,51 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-fno-stack-protector -Qunused-arguments";
+  env = {
+    LOCAL_CLANG = 1;
+    LOCAL_CLANG_FORMAT = 1;
+    NIX_CFLAGS_COMPILE = "-fno-stack-protector -Qunused-arguments";
+  };
 
   buildPhase = ''
     runHook preBuild
-    export HOME=$TMP
-    export LOCAL_CLANG=1
-    export LOCAL_CLANG_FORMAT=1
+
     make tetragon
     make tetragon-operator
     make tetra
     make tetragon-bpf
+
     runHook postBuild
   '';
 
   # For BPF compilation
-  hardeningDisable = [
-    "zerocallusedregs"
-  ];
+  hardeningDisable = [ "zerocallusedregs" ];
 
   postPatch = ''
-    substituteInPlace bpf/Makefile --replace '/bin/bash' '${lib.getExe bash}'
-    substituteInPlace pkg/defaults/defaults.go --replace '/var/lib/tetragon/' $out/lib/tetragon/bpf/
+    substituteInPlace bpf/Makefile.defs --replace-fail '/bin/bash' '${lib.getExe bash}'
+    substituteInPlace pkg/defaults/defaults.go --replace-fail '/var/lib/tetragon/' $out/lib/tetragon/bpf/
   '';
 
   installPhase = ''
     runHook preInstall
+
     mkdir -p $out/lib/tetragon $out/lib/tetragon/tetragon.tp.d/
     sed -i "s+/usr/local/+$out/+g" install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/bpf-lib
     cp -n -r install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/ $out/lib/tetragon/
     cp -n -r ./bpf/objs $out/lib/tetragon/bpf
     install -m755 -D ./tetra $out/bin/tetra
     install -m755 -D ./tetragon $out/bin/tetragon
+
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Real-time, eBPF-based Security Observability and Runtime Enforcement tool";
     homepage = "https://github.com/cilium/tetragon";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "tetragon";
-    maintainers = with maintainers; [ gangaram ];
-    platforms = platforms.linux;
-    sourceProvenance = with sourceTypes; [ fromSource ];
+    maintainers = with lib.maintainers; [ gangaram ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
   };
 })
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 5135dda20a5e..001b277ffc2a 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   SDL2,
   SDL2_image,
   rtaudio,
@@ -13,6 +12,7 @@
   cmake,
   pkg-config,
   zenity,
+  withEditor ? true,
 }:
 let
   # package depends on SDL2main static library
@@ -22,23 +22,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "theforceengine";
-  version = "1.15.000";
+  version = "1.22.200";
 
   src = fetchFromGitHub {
     owner = "luciusDXL";
     repo = "TheForceEngine";
     rev = "v${version}";
-    hash = "sha256-pcPR2KCGbyL1JABF30yJrlcLPGU2h0//Ghf7e7zYO0s=";
+    hash = "sha256-Mvp9VrPk36wNTUwNQT83JPOEO72Xhqmhkn3/KfZhQX4=";
   };
 
-  patches = [
-    # https://github.com/luciusDXL/TheForceEngine/pull/493 -- fixes finding data files outside program directory
-    (fetchpatch {
-      url = "https://github.com/luciusDXL/TheForceEngine/commit/476a5277666bfdffb33ed10bdd1177bfe8ec3a70.diff";
-      hash = "sha256-ZcfKIXQMcWMmnM4xfQRd/Ozl09vkQr3jUxZ5e4Mw5CU=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -57,8 +49,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_EDITOR" true)
-    (lib.cmakeBool "ENABLE_FORCE_SCRIPT" true)
+    (lib.cmakeBool "ENABLE_EDITOR" withEditor)
   ];
 
   prePatch = ''
@@ -78,6 +69,6 @@ stdenv.mkDerivation rec {
     homepage = "https://theforceengine.github.io";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ devusb ];
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/to/tooling-language-server/package.nix b/pkgs/by-name/to/tooling-language-server/package.nix
index 3a90b7ea2433..1feca73499a3 100644
--- a/pkgs/by-name/to/tooling-language-server/package.nix
+++ b/pkgs/by-name/to/tooling-language-server/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tooling-language-server";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "filiptibell";
     repo = "tooling-language-server";
     tag = "v${version}";
-    hash = "sha256-4jwL2XD4bK3QnsQ/nOLySjp6e5nGB8jUOf6reYzNrAc=";
+    hash = "sha256-0FF9p3Z8C3C/fcTvu66ozCs/G3UAJ/Kf2v+4IZU4eCA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-L7LfnF9C6JNjY9pGJb0uuj38H9KI3vkkvtx7QCB1GO0=";
+  cargoHash = "sha256-DxQMAnlE8oWtigU1gUEdTdBIvEtbL8xhaPLx6kt8T2c=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];
diff --git a/pkgs/by-name/tr/transcode/package.nix b/pkgs/by-name/tr/transcode/package.nix
deleted file mode 100644
index d64d4f760b33..000000000000
--- a/pkgs/by-name/tr/transcode/package.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  flac,
-  lame,
-  zlib,
-  libjpeg,
-  libvorbis,
-  libtheora,
-  libxml2,
-  lzo,
-  libdvdread,
-  pkg-config,
-  x264,
-  libmpeg2,
-  xvidcore,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "transcode";
-  version = "1.1.7";
-  src = fetchurl {
-    url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    flac
-    lame
-    zlib
-    libjpeg
-    libvorbis
-    libtheora
-    libxml2
-    lzo
-    libdvdread
-    x264
-    libmpeg2
-    xvidcore
-  ];
-  configureFlags = [
-    "--disable-ffmpeg"
-    "--disable-libavcodec"
-    "--disable-libavformat"
-    "--enable-lzo"
-    "--enable-ogg"
-    "--enable-vorbis"
-    "--enable-theora"
-    "--enable-libxml2"
-    "--enable-x264"
-    "--enable-libmpeg2"
-    "--enable-xvid"
-  ];
-
-  enableParallelBuilding = true;
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of
-  #     `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  meta = with lib; {
-    description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats";
-    homepage = "http://www.transcoding.org/";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix
index e08be9dd7609..12737b3e670d 100644
--- a/pkgs/by-name/tr/treesheets/package.nix
+++ b/pkgs/by-name/tr/treesheets/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2025-03-03";
+  version = "0-unstable-2025-03-15";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "a09352dabf6c491eed411bca5e613ba58142debc";
-    hash = "sha256-3lO8bsdluj24EMikvSQ7qOciHmIlKVxR3GWAG/SfUFM=";
+    rev = "6240644205b963e3e1b1fd4d21762e209ef38c05";
+    hash = "sha256-sgzgqb1lirVVE1TKNarMgnn5altsSyNL/CQd+IBatPI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index 0c1861d9f1a8..00edf3cf211d 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -11,19 +11,19 @@
 
 buildGo124Module rec {
   pname = "trivy";
-  version = "0.60.0";
+  version = "0.61.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
     tag = "v${version}";
-    hash = "sha256-9JArivz+4GWfU2R7e4pFI/cWJgNFhMj/cQ09a4ESoy8=";
+    hash = "sha256-SC/EYozsPdqummWBCrQi852rHk6TAMnzxyn0FzwjJ6w=";
   };
 
   # Hash mismatch on across Linux and Darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-EF2oq3iYVhdeXjAYYLqtcF0OwDh6vgDay1y8z5w/S4k=";
+  vendorHash = "sha256-cQPfZnLDNqMfunBr0xa45H/Trh9+EvdDdiYrjZsOyF0=";
 
   subPackages = [ "cmd/trivy" ];
 
diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index 2a41da495b6a..aab0192fe498 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   pname = "ts_query_ls";
-  version = "1.9.0";
+  version = "1.10.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage {
     owner = "ribru17";
     repo = "ts_query_ls";
     rev = "v${version}";
-    hash = "sha256-pjV5WRHcBZUFGr06YKlkZST0E47SNt5bxOM7my3TiF8=";
+    hash = "sha256-3dUmHux+kXuIGao8vX0ZzVZO6fnPegQ4yqzmt2mMmOg=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Tyw8IqaqHmxN//MNtrSuS0xLwh+xDjemquKouLIlsHQ=";
+  cargoHash = "sha256-14RSZC4yo76g1E2fcN22iQ9ElniNV4RZey0H2kLxoGE=";
 
   meta = {
     description = "LSP implementation for Tree-sitter's query files";
diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix
index 988e95a039ad..73746434696f 100644
--- a/pkgs/by-name/ts/tsid/package.nix
+++ b/pkgs/by-name/ts/tsid/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsid";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "tsid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-id6OCOX01o41Z5kqzwvjYa5uoQZtzhRaFBuOBhbLcTA=";
+    hash = "sha256-SS6JhU4fuZtTzv/EY31ixwwLOzmO/dN3H5HEMh/URTA=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index fc04ad442124..2e5179dea11e 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "271.250227.0";
+  version = "274.250312.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-03RNIGY9gTuvHurVX1UiZEZwnBoxrL4GfsEMdoN/irM=";
+    hash = "sha256-30+ZKqbIEUvmWhQ3ZrDZkZMBUc7lKkv02Vbraq9vPrU=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index 8259e84806ce..586ce877c159 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -598,72 +598,72 @@
   "io/netty#netty-bom/4.1.104.Final": {
    "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw="
   },
-  "io/netty#netty-buffer/4.1.114.Final": {
-   "jar": "sha256-Q26iVyXZLB9ZCoV9Rtwcj1xU1/J3WYTbJlXl47wNl8k=",
-   "pom": "sha256-s/B89Cce5aSkWeqKDZ9PFpEak1U1eDHQVxDvZPi4xc4="
+  "io/netty#netty-buffer/4.1.119.Final": {
+   "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=",
+   "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k="
   },
-  "io/netty#netty-codec-haproxy/4.1.114.Final": {
-   "jar": "sha256-qWIW00fHIZ9psvT4dDzgruasdQs2kXOXReu8wQ60lSg=",
-   "pom": "sha256-o5m+RgepdUnSSa128vz24JKvY9NE4ycu/UTfIXV8z+A="
+  "io/netty#netty-codec-haproxy/4.1.119.Final": {
+   "jar": "sha256-37y7TkXFgwaVU57Z6L3+EHQKorLM0Df3xsJXny5wq/4=",
+   "pom": "sha256-igsZt4CSwJwqUaAhzhIyeBTtF/L77u1WjeprreJlelo="
   },
-  "io/netty#netty-codec-http/4.1.114.Final": {
-   "jar": "sha256-VhUM6QD22TH843p/sF19dUeNbQuLVWoheBly65w+198=",
-   "pom": "sha256-6P6eu4YvHdXDpr6H6FGjs7KKfuxK+NcKy+ywwegW864="
+  "io/netty#netty-codec-http/4.1.119.Final": {
+   "jar": "sha256-/0jbY+ROJz5neDLlLMKhziZw2nlvIq8SmovUw3hqLTQ=",
+   "pom": "sha256-vOiQ0Qr5A4IpExJ+naVAK73GZuDCUEOKeMkcwS4nKNA="
   },
-  "io/netty#netty-codec/4.1.114.Final": {
-   "jar": "sha256-cdFFSRRWtTIS444keHu77Qx32FD3NS4k5TXSam7qkTs=",
-   "pom": "sha256-9VFgq+xGNjTDZFmRTMYMtZSJ3Lcj6H6acaw3vfNwa4Q="
+  "io/netty#netty-codec/4.1.119.Final": {
+   "jar": "sha256-xJeTSgV0RLEmqG4G8rUJGI5IymxaXhTBgqAvHoyNX9s=",
+   "pom": "sha256-ZJYD0FaxmxgvbbDAyUVlNHgLtLpXV8/lRAYsIiTBb44="
   },
-  "io/netty#netty-common/4.1.114.Final": {
-   "jar": "sha256-1rBTs7J8xWggfyVJAty2+V3SOMG51V73GdLE+OtHYiM=",
-   "pom": "sha256-PC59GBM6xtjk9ELMX6X+BJL1y/h4vw9xV8bUENpxn10="
+  "io/netty#netty-common/4.1.119.Final": {
+   "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=",
+   "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM="
   },
-  "io/netty#netty-handler/4.1.114.Final": {
-   "jar": "sha256-V74l7GyPpwUv6QEZNz2LyXnNN/oAcKE1wOafX44N2tA=",
-   "pom": "sha256-aU/m+43+kUiiMm539WFB/Ou8zCy4sp8oV3Z5YWTsapM="
+  "io/netty#netty-handler/4.1.119.Final": {
+   "jar": "sha256-m0m+mONrt5ogJf+1FZrsh9onIM+lRfVt45w7wQhYexs=",
+   "pom": "sha256-thDmZTNdjjhqUojfU4o1bv+tZCNR4ZoVgzXqDSoASUs="
   },
-  "io/netty#netty-parent/4.1.114.Final": {
-   "pom": "sha256-ocilU65+Q78O2YbSLwN53PDC+3/Dlx3GBX7VydBMWmg="
+  "io/netty#netty-parent/4.1.119.Final": {
+   "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM="
   },
-  "io/netty#netty-resolver/4.1.114.Final": {
-   "jar": "sha256-GWYefx297pf+maIn++0GltKcPN8/jy2YOaeQaVwr8Kw=",
-   "pom": "sha256-hoQ5BUAfZgXVdfSFi1jB6tzx48C8zUF3h8sK0GIcwSA="
+  "io/netty#netty-resolver/4.1.119.Final": {
+   "jar": "sha256-O2yfn282B0chPRVJcd7B/IhSgg3BqY0FX/CdCWdviDY=",
+   "pom": "sha256-NmDAaSSYZKymorltz1va46qqJv8G7zHGgy8fRbPcfXc="
   },
-  "io/netty#netty-transport-classes-epoll/4.1.114.Final": {
-   "jar": "sha256-qQtCd99Wi+BWLggnEGCiiHDFe6WpH+eSBX8R6Yb+d34=",
-   "pom": "sha256-Zsd1AZ1ns6QKaIAmW5DciLAWYMU9t64vZc/qXnSZRxU="
+  "io/netty#netty-transport-classes-epoll/4.1.119.Final": {
+   "jar": "sha256-OO28600PPByHvI25+BLTFzQsnI6VpKBS+3lqL3itCY4=",
+   "pom": "sha256-b+EBjyF42dyvIbm0LVNPHT/2eLUS7Km+wORqr9KEGdU="
   },
-  "io/netty#netty-transport-classes-kqueue/4.1.114.Final": {
-   "jar": "sha256-igf+1ZhVAt1ok29wsN1WOdLmnCV8IwBhCTbODm2phH0=",
-   "pom": "sha256-kMv2b+fCoYWq8twosBNvjvi6jrUb4cMZvL1/c3KvCfU="
+  "io/netty#netty-transport-classes-kqueue/4.1.119.Final": {
+   "jar": "sha256-r4T3GgvN6eTKLY8ct79qbU0kmSOnms4UqG/qgYqPkPc=",
+   "pom": "sha256-UD3mbIm3UTYOnfZkk8ME617x8T3IdwhZZrHV4mqnMHw="
   },
-  "io/netty#netty-transport-native-epoll/4.1.114.Final": {
-   "jar": "sha256-2JkbiwluoPBNh/463pSAS79rzh5gGfiGt/cVBHQbqW8=",
-   "pom": "sha256-ktTe6GXcAC/vZOGeYCtvZhZmfaIlaIafsRNXFaA0S/g="
+  "io/netty#netty-transport-native-epoll/4.1.119.Final": {
+   "jar": "sha256-lgYKW1oKODfqQmHpfPpCi9HXZFqIMsGFievNhokLXRg=",
+   "pom": "sha256-irxRuVvO8pFNK/HU9PpWny7DWG3qRT5wjJw0HtVe4ek="
   },
-  "io/netty#netty-transport-native-epoll/4.1.114.Final/linux-aarch_64": {
-   "jar": "sha256-+6GSmRoRefTwTILWmkOwYTYhbqxZdPijCIGIcFj6Zq0="
+  "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-aarch_64": {
+   "jar": "sha256-IlrvlWIYlmLgPJK9Xls+uFGlSZ2H75ArJky5JJiLGH0="
   },
-  "io/netty#netty-transport-native-epoll/4.1.114.Final/linux-x86_64": {
-   "jar": "sha256-eYcT5BNd6bq35L0DqHsG6XLojUz0oflRu7Kj6jnMyjg="
+  "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-x86_64": {
+   "jar": "sha256-ElV5I6UGnnNqkwXHOoezA7qeibMto+yV3qaoVvP9Y5c="
   },
-  "io/netty#netty-transport-native-kqueue/4.1.114.Final": {
-   "jar": "sha256-ZDsb2bP3TupUEfQodb3GT7grOpQT1mzqKuRmIAc/V4A=",
-   "pom": "sha256-DKdmrzuwjfpEdHx8rGe0CNW2zB/tBR/rwbQj7cB3r7c="
+  "io/netty#netty-transport-native-kqueue/4.1.119.Final": {
+   "jar": "sha256-F0Q4piU+ddPbVQ69CGJxq5bBHU5+jaPWpyr5xrSjhac=",
+   "pom": "sha256-sRoWwXL4F9pvCSo64FJjKP7oNU7GH9kdmQsEqsaPlA4="
   },
-  "io/netty#netty-transport-native-kqueue/4.1.114.Final/osx-aarch_64": {
-   "jar": "sha256-aLbd/ls3tAJMJUNGChZcA0qRzDIVMk1OR6EwjqPrQEY="
+  "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-aarch_64": {
+   "jar": "sha256-UtgGg6dkTO9ClKcZ0oXNaJeagkMZCB4kDRScsuZcx1E="
   },
-  "io/netty#netty-transport-native-kqueue/4.1.114.Final/osx-x86_64": {
-   "jar": "sha256-Wjj8Tr8ZkHfEkl+lJTzm73ibqlQhCgNQkZAvBgckWhk="
+  "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-x86_64": {
+   "jar": "sha256-vDl3sM1Wo99hxhF6jfQd/Trv7oYuPFHKDUo4wzP/SqA="
   },
-  "io/netty#netty-transport-native-unix-common/4.1.114.Final": {
-   "jar": "sha256-/WTAfJ4Gj4DcJx9idyeCRjKKFxvmaavf4LyLIibZgN4=",
-   "pom": "sha256-gytDwoTiwM8PV9YpKPpylntqpuXch2bGybLQH933lR0="
+  "io/netty#netty-transport-native-unix-common/4.1.119.Final": {
+   "jar": "sha256-iuVhj2kybm0Xt3sBQPnSdxGNvSOQbKB2OLwBNlcoxlA=",
+   "pom": "sha256-SqiNTykFV76vUGtoXKVeZH7LM0d2IYCID+Qiypddgko="
   },
-  "io/netty#netty-transport/4.1.114.Final": {
-   "jar": "sha256-KoYJ/mqLTJ1ZZca5AXd7S9CyZgBkfuKqfU2T9NXHgN4=",
-   "pom": "sha256-lFGxCRev0ijFiSVB2UrMPWgUyNc1icQFDHeakh+rnII="
+  "io/netty#netty-transport/4.1.119.Final": {
+   "jar": "sha256-wJIeoOecO5Ntqr4Iom6SZkKkrSSVHWEV+0M2LCHf6xA=",
+   "pom": "sha256-emUG02VfdKWneuAMaq/ZB70qt+0gAMNesqiObuTdA70="
   },
   "it/unimi/dsi#fastutil/8.5.15": {
    "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 5cf39a780a19..15b0c13e0593 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-02-28";
+  version = "3.4.0-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "b8fe3577c9582972a92134642e35eb7fac671376";
-    hash = "sha256-V+h2+M567niYmDWxT6hInbsVivL3pLp2pZO8D91kXkg=";
+    rev = "d2cd79185b56bab1adbd45acb1caf0ea7f24d84e";
+    hash = "sha256-WnXDBofr2zkkNvuFYG/6AijgzuDR/8CISafmGDXazgc=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix
new file mode 100644
index 000000000000..fb50c72099ef
--- /dev/null
+++ b/pkgs/by-name/vi/video-compare/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  SDL2,
+  SDL2_ttf,
+  ffmpeg,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "video-compare";
+  version = "20250223";
+
+  src = fetchFromGitHub {
+    owner = "pixop";
+    repo = "video-compare";
+    tag = version;
+    hash = "sha256-h74TWXPcbIjfejGfHnjKZqKzpV0DIkC5llSD1jmiDDY=";
+  };
+
+  postPatch = ''
+    # Fix build on Darwin by using $CXX set by setup-hook
+    substituteInPlace makefile \
+      --replace-fail 'CXX = g++' ""
+  '';
+
+  buildInputs = [
+    SDL2
+    SDL2_ttf
+    ffmpeg
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dt $out/bin video-compare
+
+    runHook postInstall
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "https://github.com/pixop/video-compare";
+    description = "Split screen video comparison tool";
+    maintainers = with lib.maintainers; [ orivej ];
+    license = lib.licenses.gpl2Only;
+    mainProgram = "video-compare";
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/by-name/wa/watchyourlan/package.nix b/pkgs/by-name/wa/watchyourlan/package.nix
index f7ab4f9022c6..5cf2e91c4d53 100644
--- a/pkgs/by-name/wa/watchyourlan/package.nix
+++ b/pkgs/by-name/wa/watchyourlan/package.nix
@@ -5,18 +5,19 @@
   lib,
   arp-scan,
 }:
+
 buildGoModule rec {
   pname = "watchyourlan";
-  version = "2.0.4";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "aceberg";
     repo = "WatchYourLAN";
-    rev = version;
-    hash = "sha256-nJYDGCkT8vCkxySLONG3OkWVkaBqXqSFgd7N1TTMAf4=";
+    tag = version;
+    hash = "sha256-xiwDcqEfuNuqNQO2wtJ2XK0mPf91C1bapEqKKmKxw4c=";
   };
 
-  vendorHash = "sha256-urSFoFkYllV+bsKIRV/azkbL30mbGeciYR7jy/fOE/w=";
+  vendorHash = "sha256-NUv90wq3nFHDtfk3BitwJ3ZfciPESUIDzS5S/6zafEQ=";
 
   ldflags = [
     "-s"
@@ -33,6 +34,7 @@ buildGoModule rec {
   meta = {
     description = "Lightweight network IP scanner with web GUI";
     homepage = "https://github.com/aceberg/WatchYourLAN";
+    changelog = "https://github.com/aceberg/WatchYourLAN/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     mainProgram = "WatchYourLAN";
     maintainers = [ lib.maintainers.iv-nn ];
diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index 2d4b4aa1ac98..c58471bed6d1 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-ERyJQNfVdr7uocJtmiyFIax8RS/5mvWOP0GfIxTs7bs=";
+    hash = "sha256-2cIUWrDOfKiTubS8l904dd5lJsNY9+MGtV2KBTa6fFM=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index 54b39716769a..ef0e55faacb4 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-tyztq4oXN9tPVSqQme8IG3dcba7ytblVW98jU6Nao5M=";
+    hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";
   };
 
-  vendorHash = "sha256-WfqYmqEjgZwQgFKW97oIEaBXTKqOOFKviuYTRyqVQP0=";
+  vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU=";
 
   subPackages = [ "cmd/weaviate-server" ];
 
diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix
index 41e6089a8422..401aff4d5867 100644
--- a/pkgs/by-name/we/web-ext/package.nix
+++ b/pkgs/by-name/we/web-ext/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "web-ext";
-  version = "8.4.0";
+  version = "8.5.0";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "web-ext";
     rev = version;
-    hash = "sha256-zPOXl/7v/yP1ggqSKruGli/FC8Vf7i4J3LZey4WC/Lc=";
+    hash = "sha256-RT/K/fYMys1RAvnusAMuHtfZ7gndYf3FPuHBYCklBpw=";
   };
 
-  npmDepsHash = "sha256-tU/NTeMjUyw1ftXLTP3HpLQqfzTNVwgY3oKvuIZXPxw=";
+  npmDepsHash = "sha256-O8DmeT0wRNpuPU1K6kH97D9+mxOxCchAUrvOVPq4VPc=";
 
   npmBuildFlags = [ "--production" ];
 
diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix
index f15bae2ca5ea..6e4cbf3b58d6 100644
--- a/pkgs/by-name/wo/workout-tracker/package.nix
+++ b/pkgs/by-name/wo/workout-tracker/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "workout-tracker";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "jovandeginste";
     repo = "workout-tracker";
     tag = "v${version}";
-    hash = "sha256-J2Pu8SR1kS9rpbq6uvZncU+oGvB4Ijfrajw2EtakluA=";
+    hash = "sha256-6t+p/P8gAHTOMiWJ1lDcpHRPptO+lk0jl/llKy8fNrg=";
   };
 
   assets = buildNpmPackage {
diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index ed1d02c116af..f2587510a527 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xan";
-  version = "0.46.2";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = version;
-    hash = "sha256-scLpmKlMIqBScvtMcrNnU0UPEJ8ufOefksk/kVQzZhE=";
+    hash = "sha256-TBrPe4kmxLiyFfP6s4lAV3PjzXihqdBZ+emisd2Yjbs=";
   };
 
-  cargoHash = "sha256-aTDT3kMSEjOzbjEez5i13D8HsnP1ZYBt6GkorR1EZiM=";
+  cargoHash = "sha256-XKiYF619IEQEU7P5mRjnCEJSxr2G3t3cV4MpvBlWcNw=";
   useFetchCargoVendor = true;
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index bbab28e66c8e..1d787c2df31b 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -30,11 +30,16 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch =
-    let
-      configFile =
-        if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf;
-    in
-    lib.optionalString (conf != null) "cp ${configFile} config.h";
+    ''
+      sed -i "8i #include <time.h>" xprompt.c
+    ''
+    + (
+      let
+        configFile =
+          if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf;
+      in
+      lib.optionalString (conf != null) "cp ${configFile} config.h"
+    );
 
   makeFlags = [
     "CC:=$(CC)"
diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index cbde39f5b156..7d37601b0102 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "yamlscript";
-  version = "0.1.94";
+  version = "0.1.95";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
-    hash = "sha256-WDA6ppD4qO24kKn1M12CVWykK+Uxs9fYNhC1RRLV/vI=";
+    hash = "sha256-8GmKMRMQ5YaCK0jJkLVlWHTngr5DJSN/Vm+0nMYBkr8=";
   };
 
   executable = "ys";
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index f50dd0237162..8ce975e4c9cc 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-02-21";
+  version = "3.7.2-2-unstable-2025-03-25";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "3d43fdf3b1c9f93f384f126901f069ebb5efdd32";
-    hash = "sha256-qex38HoQ40S61fdjdKm5qgbSwOKvmu3gnsqrw+B2MSQ=";
+    rev = "47287adecfbd6b068cf7ad5fb67c9548a7062156";
+    hash = "sha256-RRlCfv34hSBWpeXxvXsPtfziE0L0FhZfMIfBi8i2XWg=";
   };
 
   vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";
diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index f40a1341d687..c0152506c7ad 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-server";
-  version = "1.40.3";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-server";
     rev = version;
-    hash = "sha256-fk9UBtdbU9ZVoqCXXeeGpaiGhU9/pcR87NP1S86axSM=";
+    hash = "sha256-vY/afOza0ewOqlhbp6uMf/mw9nvQLN0lEFmHekxpJVA=";
   };
 
-  npmDepsHash = "sha256-iSrgrgepUZzlBvwMe6lmFUW4i6DVx1Bq4I4UBph/oNA=";
+  npmDepsHash = "sha256-HgXFFA1aa25vRpw4ujj6aeIX75soDYv3TaM5bQOfEv4=";
 
   # For some reason the zwave-js dependency is in devDependencies
   npmFlags = [ "--include=dev" ];
diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
index 7f2a58625385..5811e867d9d4 100644
--- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-polkit-agent";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-polkit-agent";
     tag = finalAttrs.version;
-    hash = "sha256-U4NNPBuLhe+m5WvfOYq5ZFE70OYJ/mn69wyK+ALebRE=";
+    hash = "sha256-3x2gwKhRDXE6tuwM7pXIwsWg/8pQrKLJ1zds8Ljtk+I=";
   };
 
   strictDeps = true;
diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix
index 98dc771ded7a..3851fdd452d9 100644
--- a/pkgs/desktops/xfce/applications/mousepad/default.nix
+++ b/pkgs/desktops/xfce/applications/mousepad/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-6ddPma6B4hNgtILavJFz/wtSzLViABkluZ5BTXpbcEE=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     glib # glib-compile-schemas
     meson
diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix
index 811150041a25..fe64709b1631 100644
--- a/pkgs/desktops/xfce/applications/orage/default.nix
+++ b/pkgs/desktops/xfce/applications/orage/default.nix
@@ -13,9 +13,9 @@
 mkXfceDerivation {
   category = "apps";
   pname = "orage";
-  version = "4.20.0";
+  version = "4.20.1";
 
-  sha256 = "sha256-VaabhMRgH/q9HiFXBPQ90HbMLW21BXTvZtxd8bhYYnw=";
+  sha256 = "sha256-WdvqsgHfhJ2sk4vQ75m1zmWjefJBJdDKH8E0GA4fCNg=";
 
   buildInputs = [
     glib
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 44ef452b5025..2de8179ce99e 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -1,28 +1,52 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
-  gtk3,
+  fetchFromGitLab,
   glib,
-  gnome,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
+  cairo,
+  exo,
+  gtk3,
   libexif,
+  libxfce4ui,
+  libxfce4util,
+  xfconf,
+  gnome,
   libheif,
   libjxl,
   librsvg,
-  libxfce4ui,
-  libxfce4util,
   webp-pixbuf-loader,
-  xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "ristretto";
-  version = "0.13.3";
-  odd-unstable = false;
+  version = "0.13.4";
 
-  sha256 = "sha256-cJMHRN4Wl6Fm0yoVqe0h30ZUlE1+Hw1uEDBHfHXBbC0=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "ristretto";
+    tag = "ristretto-${finalAttrs.version}";
+    hash = "sha256-X0liZddeEOxlo0tyn3Irvo0+MTnMFuvKY2m4h+/EI2E=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    glib # glib-compile-schemas
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs = [
+    cairo
+    exo
     glib
     gtk3
     libexif
@@ -46,9 +70,14 @@ mkXfceDerivation {
     }"
   '';
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "ristretto-"; };
+
+  meta = {
     description = "Fast and lightweight picture-viewer for the Xfce desktop environment";
+    homepage = "https://gitlab.xfce.org/apps/ristretto";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "ristretto";
-    maintainers = with maintainers; [ ] ++ teams.xfce.members;
+    maintainers = lib.teams.xfce.members;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
index 0d6277a0d8e0..f6acb93dd3a3 100644
--- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
@@ -1,50 +1,75 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
-  glib,
-  gtk3,
-  gtk-layer-shell,
-  libX11,
-  libxfce4ui,
-  vte,
-  xfconf,
-  pcre2,
-  libxslt,
+  fetchFromGitLab,
   docbook_xml_dtd_45,
   docbook_xsl,
+  glib,
+  libxslt, # xsltproc
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
+  gtk3,
+  gtk-layer-shell,
+  libutempter,
+  libX11,
+  libxfce4ui,
+  pcre2,
+  vte,
+  xfconf,
   nixosTests,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-terminal";
-  version = "1.1.4";
-  odd-unstable = false;
+  version = "1.1.5";
 
-  sha256 = "sha256-WrmffY8kC9tBorvtEb8q6DmHKX5d7HnvbxtBbpy4LJs=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfce4-terminal";
+    tag = "xfce4-terminal-${finalAttrs.version}";
+    hash = "sha256-qNXrxUjmuY6+k95/zcOu1/CUfhb1u0Ca91aFD3c4uoc=";
+  };
+
+  strictDeps = true;
 
   nativeBuildInputs = [
-    libxslt
     docbook_xml_dtd_45
     docbook_xsl
+    glib # glib-mkenums
+    libxslt # xsltproc
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     glib
     gtk3
     gtk-layer-shell
+    libutempter
     libX11
     libxfce4ui
+    pcre2
     vte
     xfconf
-    pcre2
   ];
 
-  passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal;
-
-  meta = with lib; {
-    description = "Modern terminal emulator";
-    maintainers = with maintainers; [ ] ++ teams.xfce.members;
-    mainProgram = "xfce4-terminal";
+  passthru = {
+    tests.test = nixosTests.terminal-emulators.xfce4-terminal;
+    updateScript = gitUpdater { rev-prefix = "xfce4-terminal-"; };
   };
-}
+
+  meta = {
+    description = "Modern terminal emulator";
+    homepage = "https://gitlab.xfce.org/apps/xfce4-terminal";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "xfce4-terminal";
+    maintainers = lib.teams.xfce.members;
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 04eae0082f60..77891bd51268 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.27.1";
+  version = "0.27.2";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-YSu9uN0n8x1833iqvskk/47JnoXJ2Y8RCRmA12YYgDc=";
+    hash = "sha256-y1QT+wRFc+++OVFJwEheqcDIwaKHlyjbhEjhLJ2rYaI=";
   };
 in
 mixRelease {
diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix
index f23ba8e11e71..e095e45b97db 100644
--- a/pkgs/development/compilers/elm/packages/node/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix
@@ -13,7 +13,6 @@ let
     inherit (pkgs)
       stdenv
       lib
-      python2
       runCommand
       writeTextFile
       writeShellScript
diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix
index bd158cf04892..7fa30796e44c 100644
--- a/pkgs/development/interpreters/erlang/25.nix
+++ b/pkgs/development/interpreters/erlang/25.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "25.3.2.18";
-  sha256 = "sha256-PmDEJ0o6s27K0+g9zUXkmwbqibXNWQkF412DFYizrd8=";
+  version = "25.3.2.19";
+  sha256 = "sha256-fd2YxFx/Skst+jRXAm4nLVxEIriu34lPRuBWvj+qaIk=";
 }
diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index b6322d8ac8f3..5bb6407f8d70 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "26.2.5.9";
-  sha256 = "sha256-FRNVmaeBUCFLmfhE9JVb1DgC/MIoryDV7lvh+YayRNA=";
+  version = "26.2.5.10";
+  sha256 = "sha256-dnkt2tg2jQ4pHvkrUvDPmw7Bxsd5ECd/3lLvuScyFoc=";
 }
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index b7f09b7ebb7b..789c698216c1 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wpebackend-fdo";
-  version = "1.14.3";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz";
-    sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw=";
+    sha256 = "sha256-vt3zISMtW9CBBsF528YA+M6I6zYgtKWaYykGO3j2RjU=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 9a4bb7465219..5ac9522155f1 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -134,5 +134,15 @@ stdenv.mkDerivation rec {
       ];
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
+
+    # 29-03-2025: On darwin, the libc++ standard library is used to compile C++ programs.
+    # 29-03-2025: Since the base template for `std::char_traits` was removed in LLVM 19,
+    # 29-03-2025: usages of `boost::u32regex` will no longer compile.
+    # 29-03-2025: Linux builds do not fail as they use libstdc++, which has not removed
+    # 29-03-2025: such `std::char_trait` declarations.
+    #
+    # 29-03-2025: See https://github.com/mapnik/mapnik/issues/4499 for more information
+    # 29-03-2025: and a Minimal Reproducible Example.
+    badPlatforms = platforms.darwin;
   };
 }
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 2be0ac567821..1385e1a38e81 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -6,6 +6,7 @@
   jdk,
   gnumake,
   gawk,
+  meta,
 }:
 
 {
@@ -64,6 +65,8 @@ stdenv.mkDerivation (
       mkdir -p $out/nix-support
       echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
     '';
+
+    inherit meta;
   }
   // extraArgs
 )
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 53a80dd14967..9a38383f4ad1 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,27 +1,56 @@
-{deployAndroidPackage, lib, stdenv, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}:
+{
+  deployAndroidPackage,
+  lib,
+  stdenv,
+  package,
+  os,
+  arch,
+  autoPatchelfHook,
+  makeWrapper,
+  pkgs,
+  pkgsi686Linux,
+  postInstall,
+  meta,
+}:
 
 deployAndroidPackage {
-  inherit package;
-  nativeBuildInputs = [ makeWrapper ]
-    ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs.libcxx ]
-    ++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc zlib ncurses5 ]);
-  patchInstructions = ''
-    ${lib.optionalString (os == "linux") ''
-      addAutoPatchelfSearchPath $packageBaseDir/lib
-      if [[ -d $packageBaseDir/lib64 ]]; then
-        addAutoPatchelfSearchPath $packageBaseDir/lib64
-        autoPatchelf --no-recurse $packageBaseDir/lib64
-      fi
-      autoPatchelf --no-recurse $packageBaseDir
-    ''}
+  inherit package os arch;
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
+  buildInputs =
+    lib.optionals (os == "linux") [
+      pkgs.glibc
+      pkgs.zlib
+      pkgs.ncurses5
+      pkgs.libcxx
+    ]
+    ++ lib.optionals (os == "linux" && stdenv.isx86_64) (
+      with pkgsi686Linux;
+      [
+        glibc
+        zlib
+        ncurses5
+      ]
+    );
+  patchInstructions =
+    ''
+      ${lib.optionalString (os == "linux") ''
+        addAutoPatchelfSearchPath $packageBaseDir/lib
+        if [[ -d $packageBaseDir/lib64 ]]; then
+          addAutoPatchelfSearchPath $packageBaseDir/lib64
+          autoPatchelf --no-recurse $packageBaseDir/lib64
+        fi
+        autoPatchelf --no-recurse $packageBaseDir
+      ''}
 
-    ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
-      wrapProgram $PWD/mainDexClasses \
-        --prefix PATH : ${pkgs.jdk8}/bin
-    ''}
+      ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
+        wrapProgram $PWD/mainDexClasses \
+          --prefix PATH : ${pkgs.jdk8}/bin
+      ''}
 
-    cd $out/libexec/android-sdk
-  '' + postInstall;
+      cd $out/libexec/android-sdk
+    ''
+    + postInstall;
   noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
+
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix
index 02c5ab24aab2..d5f54ac4d102 100644
--- a/pkgs/development/mobile/androidenv/cmake.nix
+++ b/pkgs/development/mobile/androidenv/cmake.nix
@@ -1,10 +1,28 @@
-{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}:
+{
+  deployAndroidPackage,
+  lib,
+  package,
+  os,
+  arch,
+  autoPatchelfHook,
+  pkgs,
+  stdenv,
+  meta,
+}:
 
 deployAndroidPackage {
-  inherit package;
+  inherit package os arch;
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
+  buildInputs = lib.optionals (os == "linux") [
+    pkgs.stdenv.cc.libc
+    pkgs.stdenv.cc.cc
+    pkgs.ncurses5
+  ];
   patchInstructions = lib.optionalString (os == "linux") ''
     autoPatchelf $packageBaseDir/bin
   '';
+
+  meta = meta // {
+    license = lib.licenses.bsd3;
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix
index d3935d547b04..adb1dcba94bd 100644
--- a/pkgs/development/mobile/androidenv/cmdline-tools.nix
+++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix
@@ -5,14 +5,16 @@
   autoPatchelfHook,
   makeWrapper,
   os,
+  arch,
   pkgs,
   stdenv,
   postInstall,
+  meta,
 }:
 
 deployAndroidPackage {
   name = "androidsdk";
-  inherit package os;
+  inherit package os arch;
   nativeBuildInputs = [
     makeWrapper
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
@@ -46,5 +48,5 @@ deployAndroidPackage {
     ${postInstall}
   '';
 
-  meta.license = lib.licenses.unfree;
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 5dad457d6b89..e7552862c2b7 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -1,286 +1,291 @@
-{ callPackage, stdenv, lib, fetchurl, ruby, writeText
-, licenseAccepted ? false
+{
+  callPackage,
+  stdenv,
+  stdenvNoCC,
+  lib,
+  fetchurl,
+  ruby,
+  writeText,
+  licenseAccepted ? false,
+  meta,
 }:
 
-{ cmdLineToolsVersion ? "13.0"
-, toolsVersion ? "26.1.1"
-, platformToolsVersion ? "35.0.2"
-, buildToolsVersions ? [ "35.0.0" ]
-, includeEmulator ? false
-, emulatorVersion ? "35.5.2"
-, platformVersions ? []
-, includeSources ? false
-, includeSystemImages ? false
-, systemImageTypes ? [ "google_apis" "google_apis_playstore" ]
-, abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ]
-, cmakeVersions ? [ ]
-, includeNDK ? false
-, ndkVersion ? "27.0.12077973"
-, ndkVersions ? [ndkVersion]
-, useGoogleAPIs ? false
-, useGoogleTVAddOns ? false
-, includeExtras ? []
-, repoJson ? ./repo.json
-, repoXmls ? null
-, extraLicenses ? []
+let
+  # Coerces a string to an int.
+  coerceInt = val: if lib.isInt val then val else lib.toIntBase10 val;
+in
+{
+  repoJson ? ./repo.json,
+  repoXmls ? null,
+  repo ? (
+    # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store.
+    if repoXmls != null then
+      let
+        # Uses mkrepo.rb to create a repo spec.
+        mkRepoJson =
+          {
+            packages ? [ ],
+            images ? [ ],
+            addons ? [ ],
+          }:
+          let
+            mkRepoRuby = (
+              ruby.withPackages (
+                pkgs: with pkgs; [
+                  slop
+                  nokogiri
+                ]
+              )
+            );
+            mkRepoRubyArguments = lib.lists.flatten [
+              (map (package: [
+                "--packages"
+                "${package}"
+              ]) packages)
+              (map (image: [
+                "--images"
+                "${image}"
+              ]) images)
+              (map (addon: [
+                "--addons"
+                "${addon}"
+              ]) addons)
+            ];
+          in
+          stdenvNoCC.mkDerivation {
+            name = "androidenv-repo-json";
+            buildInputs = [ mkRepoRuby ];
+            preferLocalBuild = true;
+            unpackPhase = "true";
+            buildPhase = ''
+              ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json
+            '';
+            installPhase = ''
+              mv repo.json $out
+            '';
+          };
+        repoXmlSpec = {
+          packages = repoXmls.packages or [ ];
+          images = repoXmls.images or [ ];
+          addons = repoXmls.addons or [ ];
+        };
+      in
+      lib.importJSON "${mkRepoJson repoXmlSpec}"
+    else
+      lib.importJSON repoJson
+  ),
+  cmdLineToolsVersion ? repo.latest.cmdline-tools,
+  toolsVersion ? repo.latest.tools,
+  platformToolsVersion ? repo.latest.platform-tools,
+  buildToolsVersions ? [ repo.latest.build-tools ],
+  includeEmulator ? false,
+  emulatorVersion ? repo.latest.emulator,
+  minPlatformVersion ? null,
+  maxPlatformVersion ? coerceInt repo.latest.platforms,
+  numLatestPlatformVersions ? 1,
+  platformVersions ?
+    if minPlatformVersion != null && maxPlatformVersion != null then
+      let
+        minPlatformVersionInt = coerceInt minPlatformVersion;
+        maxPlatformVersionInt = coerceInt maxPlatformVersion;
+      in
+      lib.range (lib.min minPlatformVersionInt maxPlatformVersionInt) (
+        lib.max minPlatformVersionInt maxPlatformVersionInt
+      )
+    else
+      let
+        minPlatformVersionInt = if minPlatformVersion == null then 1 else coerceInt minPlatformVersion;
+        latestPlatformVersionInt = lib.max minPlatformVersionInt (coerceInt repo.latest.platforms);
+        firstPlatformVersionInt = lib.max minPlatformVersionInt (
+          latestPlatformVersionInt - (lib.max 1 numLatestPlatformVersions) + 1
+        );
+      in
+      lib.range firstPlatformVersionInt latestPlatformVersionInt,
+  includeSources ? false,
+  includeSystemImages ? false,
+  systemImageTypes ? [
+    "google_apis"
+    "google_apis_playstore"
+  ],
+  abiVersions ? [
+    "x86"
+    "x86_64"
+    "armeabi-v7a"
+    "arm64-v8a"
+  ],
+  # cmake has precompiles on x86_64 and Darwin platforms. Default to true there for compatibility.
+  includeCmake ? stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin,
+  cmakeVersions ? [ repo.latest.cmake ],
+  includeNDK ? false,
+  ndkVersion ? repo.latest.ndk,
+  ndkVersions ? [ ndkVersion ],
+  useGoogleAPIs ? false,
+  useGoogleTVAddOns ? false,
+  includeExtras ? [ ],
+  extraLicenses ? [ ],
 }:
 
 let
   # Determine the Android os identifier from Nix's system identifier
-  os = {
+  os =
+    {
       x86_64-linux = "linux";
       x86_64-darwin = "macosx";
       aarch64-linux = "linux";
       aarch64-darwin = "macosx";
-  }.${stdenv.hostPlatform.system} or "all";
+    }
+    .${stdenv.hostPlatform.system} or "all";
 
   # Determine the Android arch identifier from Nix's system identifier
-  arch = {
+  arch =
+    {
       x86_64-linux = "x64";
       x86_64-darwin = "x64";
       aarch64-linux = "aarch64";
       aarch64-darwin = "aarch64";
-  }.${stdenv.hostPlatform.system} or "all";
-
-  # Uses mkrepo.rb to create a repo spec.
-  mkRepoJson = { packages ? [], images ? [], addons ? [] }: let
-    mkRepoRuby = (ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ]));
-    mkRepoRubyArguments = lib.lists.flatten [
-      (builtins.map (package: ["--packages" "${package}"]) packages)
-      (builtins.map (image: ["--images" "${image}"]) images)
-      (builtins.map (addon: ["--addons" "${addon}"]) addons)
-    ];
-  in
-  stdenv.mkDerivation {
-    name = "androidenv-repo-json";
-    buildInputs = [ mkRepoRuby ];
-    preferLocalBuild = true;
-    unpackPhase = "true";
-    buildPhase = ''
-      ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json
-    '';
-    installPhase = ''
-      mv repo.json $out
-    '';
-  };
-
-  # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store.
-  repo = if repoXmls != null then
-           let
-             repoXmlSpec = {
-               packages = repoXmls.packages or [];
-               images = repoXmls.images or [];
-               addons = repoXmls.addons or [];
-             };
-           in
-           lib.importJSON "${mkRepoJson repoXmlSpec}"
-         else
-           lib.importJSON repoJson;
+    }
+    .${stdenv.hostPlatform.system} or "all";
 
   # Converts all 'archives' keys in a repo spec to fetchurl calls.
-  fetchArchives = attrSet:
-    lib.attrsets.mapAttrsRecursive
-      (path: value:
-        if (builtins.elemAt path ((builtins.length path) - 1)) == "archives" then
-          let
-            validArchives = builtins.filter (archive:
-              let
-                isTargetOs = if builtins.hasAttr "os" archive then
-                  archive.os == os || archive.os == "all" else true;
-                isTargetArc = if builtins.hasAttr "arch" archive then
-                  archive.arch == arch || archive.arch == "all" else true;
-              in
-                isTargetOs && isTargetArc
-            ) value;
-          in
-          lib.warnIf (builtins.length validArchives == 0)
-            "No valid archives for ${lib.concatMapStringsSep "." (x: ''"${x}"'') path} for os=${os}, arch=${arch}"
-            (lib.optionals (builtins.length validArchives > 0)
-              (lib.last (map (archive:
-                (fetchurl { inherit (archive) url sha1; })
-              ) validArchives)))
-        else value
-      )
-      attrSet;
+  fetchArchives =
+    attrSet:
+    lib.attrsets.mapAttrsRecursive (
+      path: value:
+      if (builtins.elemAt path (builtins.length path - 1)) == "archives" then
+        let
+          validArchives = builtins.filter (
+            archive:
+            let
+              isTargetOs =
+                if builtins.hasAttr "os" archive then archive.os == os || archive.os == "all" else true;
+              isTargetArch =
+                if builtins.hasAttr "arch" archive then archive.arch == arch || archive.arch == "all" else true;
+            in
+            isTargetOs && isTargetArch
+          ) value;
+          packageInfo = lib.attrByPath (lib.sublist 0 (builtins.length path - 1) path) null attrSet;
+        in
+        lib.optionals (builtins.length validArchives > 0) (
+          lib.last (
+            map (
+              archive:
+              (fetchurl {
+                inherit (archive) url sha1;
+                preferLocalBuild = true;
+                passthru = {
+                  info = packageInfo;
+                };
+              })
+            ) validArchives
+          )
+        )
+      else
+        value
+    ) attrSet;
 
-  # Converts the repo attrset into fetch calls
-  packages = fetchArchives repo.packages;
-  system-images-packages = fetchArchives repo.images;
-  addons = {
+  # Converts the repo attrset into fetch calls.
+  allArchives = {
+    packages = fetchArchives repo.packages;
+    system-images = fetchArchives repo.images;
     addons = fetchArchives repo.addons;
     extras = fetchArchives repo.extras;
   };
 
+  # Lift the archives to the package level for easy search,
+  # and add recurseIntoAttrs to all of them.
+  allPackages =
+    let
+      liftedArchives = lib.attrsets.mapAttrsRecursiveCond (value: !(builtins.hasAttr "archives" value)) (
+        path: value:
+        if (value.archives or null) != null && (value.archives or [ ]) != [ ] then
+          lib.dontRecurseIntoAttrs value.archives
+        else
+          null
+      ) allArchives;
+
+      # Creates a version key from a name.
+      # Converts things like 'extras;google;auto' to 'extras-google-auto'
+      toVersionKey =
+        name:
+        lib.optionalString (lib.match "^[0-9].*" name != null) "v"
+        + lib.concatStringsSep "_" (lib.splitVersion (lib.replaceStrings [ ";" ] [ "-" ] name));
+
+      recurse = lib.mapAttrs' (
+        name: value:
+        if builtins.isAttrs value && (value.recurseForDerivations or true) then
+          lib.nameValuePair (toVersionKey name) (lib.recurseIntoAttrs (recurse value))
+        else
+          lib.nameValuePair (toVersionKey name) value
+      );
+    in
+    lib.recurseIntoAttrs (recurse liftedArchives);
+
   # Converts a license name to a list of license texts.
   mkLicenses = licenseName: repo.licenses.${licenseName};
 
   # Converts a list of license names to a flattened list of license texts.
   # Just used for displaying licenses.
-  mkLicenseTexts = licenseNames:
-    lib.lists.flatten
-      (builtins.map
-        (licenseName:
-          builtins.map
-            (licenseText: "--- ${licenseName} ---\n${licenseText}")
-            (mkLicenses licenseName))
-      licenseNames);
+  mkLicenseTexts =
+    licenseNames:
+    lib.lists.flatten (
+      builtins.map (
+        licenseName:
+        builtins.map (licenseText: "--- ${licenseName} ---\n${licenseText}") (mkLicenses licenseName)
+      ) licenseNames
+    );
 
   # Converts a license name to a list of license hashes.
-  mkLicenseHashes = licenseName:
-    builtins.map
-      (licenseText: builtins.hashString "sha1" licenseText)
-      (mkLicenses licenseName);
+  mkLicenseHashes =
+    licenseName:
+    builtins.map (licenseText: builtins.hashString "sha1" licenseText) (mkLicenses licenseName);
 
   # The list of all license names we're accepting. Put android-sdk-license there
   # by default.
-  licenseNames = lib.lists.unique ([
-    "android-sdk-license"
-  ] ++ extraLicenses);
-in
-rec {
-  deployAndroidPackages = callPackage ./deploy-androidpackages.nix {
-    inherit stdenv lib mkLicenses;
-  };
-
-  deployAndroidPackage = ({package, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:
-    let
-      extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ];
-    in
-    deployAndroidPackages ({
-      inherit buildInputs;
-      packages = [ package ];
-      patchesInstructions = { "${package.name}" = patchInstructions; };
-    } // extraParams
-  ));
+  licenseNames = lib.lists.unique (
+    [
+      "android-sdk-license"
+    ]
+    ++ extraLicenses
+  );
 
   # put a much nicer error message that includes the available options.
-  check-version = packages: package: version:
+  check-version =
+    packages: package: version:
     if lib.hasAttrByPath [ package version ] packages then
       packages.${package}.${version}
     else
       throw ''
         The version ${version} is missing in package ${package}.
-        The only available versions are ${builtins.concatStringsSep ", " (builtins.attrNames packages.${package})}.
+        The only available versions are ${
+          builtins.concatStringsSep ", " (builtins.attrNames packages.${package})
+        }.
       '';
 
-  platform-tools = callPackage ./platform-tools.nix {
-    inherit deployAndroidPackage os;
-    package = check-version packages "platform-tools" platformToolsVersion;
-  };
-
-  tools = callPackage ./tools.nix {
-    inherit deployAndroidPackage os;
-    package = check-version packages "tools" toolsVersion;
-
-    postInstall = ''
-      ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
-      ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
-    '';
-  };
-
-  build-tools = map (version:
-    callPackage ./build-tools.nix {
-      inherit deployAndroidPackage os;
-      package = check-version packages "build-tools" version;
-
-      postInstall = ''
-        ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}
-      '';
-    }
-  ) buildToolsVersions;
-
-  emulator = lib.optionals includeEmulator (callPackage ./emulator.nix {
-    inherit deployAndroidPackage os;
-    package = check-version packages "emulator" emulatorVersion;
-
-    postInstall = ''
-      ${linkSystemImages { images = system-images; check = includeSystemImages; }}
-    '';
-  });
-
-  platforms = map (version:
-    deployAndroidPackage {
-      package = check-version packages "platforms" version;
-    }
-  ) platformVersions;
-
-  sources = map (version:
-    deployAndroidPackage {
-      package = check-version packages "sources" version;
-    }
-  ) platformVersions;
-
-  system-images = lib.flatten (map (apiVersion:
-    map (type:
-      # Deploy all system images with the same  systemImageType in one derivation to avoid the `null` problem below
-      # with avdmanager when trying to create an avd!
-      #
-      # ```
-      # $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'
-      # Error: Package path is not valid. Valid system image paths are:
-      # null
-      # ```
+  # Returns true if we should link the specified plugins.
+  shouldLink =
+    check: packages:
+    assert builtins.isList packages;
+    if check == true then
+      true
+    else if check == false then
+      false
+    else if check == "if-supported" then
       let
-        availablePackages = map (abiVersion:
-          system-images-packages.${apiVersion}.${type}.${abiVersion}
-        ) (builtins.filter (abiVersion:
-          lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages
-        ) abiVersions);
-
-        instructions = builtins.listToAttrs (map (package: {
-            name = package.name;
-            value = lib.optionalString (lib.hasPrefix "google_apis" type) ''
-              # Patch 'google_apis' system images so they're recognized by the sdk.
-              # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
-              # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
-              sed -i '/^Addon.Vendor/d' source.properties
-            '';
-          }) availablePackages
-        );
+        hasSrc =
+          package: package.src != null && (builtins.isList package.src -> builtins.length package.src > 0);
       in
-      lib.optionals (availablePackages != [])
-        (deployAndroidPackages {
-          packages = availablePackages;
-          patchesInstructions = instructions;
-        })
-    ) systemImageTypes
-  ) platformVersions);
-
-  cmake = map (version:
-    callPackage ./cmake.nix {
-      inherit deployAndroidPackage os;
-      package = check-version packages "cmake" version;
-    }
-  ) cmakeVersions;
-
-  # Creates a NDK bundle.
-  makeNdkBundle = ndkVersion:
-    callPackage ./ndk-bundle {
-      inherit deployAndroidPackage os platform-tools;
-      package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion};
-    };
-
-  # All NDK bundles.
-  ndk-bundles = lib.optionals includeNDK (map makeNdkBundle ndkVersions);
-
-  # The "default" NDK bundle.
-  ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null;
-
-  google-apis = map (version:
-    deployAndroidPackage {
-      package = (check-version addons "addons" version).google_apis;
-    }
-  ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
-
-  google-tv-addons = map (version:
-    deployAndroidPackage {
-      package = (check-version addons "addons" version).google_tv_addon;
-    }
-  ) platformVersions;
+      packages != [ ] && lib.all hasSrc packages
+    else
+      throw "Invalid argument ${toString check}; use true, false, or if-supported";
 
   # Function that automatically links all plugins for which multiple versions can coexist
-  linkPlugins = {name, plugins}:
-    lib.optionalString (plugins != []) ''
+  linkPlugins =
+    {
+      name,
+      plugins,
+      check ? true,
+    }:
+    lib.optionalString (shouldLink check plugins) ''
       mkdir -p ${name}
       ${lib.concatMapStrings (plugin: ''
         ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
@@ -288,8 +293,14 @@ rec {
     '';
 
   # Function that automatically links all NDK plugins.
-  linkNdkPlugins = {name, plugins, rootName ? name}:
-    lib.optionalString (plugins != []) ''
+  linkNdkPlugins =
+    {
+      name,
+      plugins,
+      rootName ? name,
+      check ? true,
+    }:
+    lib.optionalString (shouldLink check plugins) ''
       mkdir -p ${rootName}
       ${lib.concatMapStrings (plugin: ''
         ln -s ${plugin}/libexec/android-sdk/${name} ${rootName}/${plugin.version}
@@ -297,114 +308,432 @@ rec {
     '';
 
   # Function that automatically links the default NDK plugin.
-  linkNdkPlugin = {name, plugin, check}:
-    lib.optionalString check ''
+  linkNdkPlugin =
+    {
+      name,
+      plugin,
+      check,
+    }:
+    lib.optionalString (shouldLink check [ plugin ]) ''
       ln -s ${plugin}/libexec/android-sdk/${name} ${name}
     '';
 
   # Function that automatically links a plugin for which only one version exists
-  linkPlugin = {name, plugin, check ? true}:
-    lib.optionalString check ''
+  linkPlugin =
+    {
+      name,
+      plugin,
+      check ? true,
+    }:
+    lib.optionalString (shouldLink check [ plugin ]) ''
       ln -s ${plugin}/libexec/android-sdk/${name} ${name}
     '';
 
-  linkSystemImages = { images, check }: lib.optionalString check ''
-    mkdir -p system-images
-    ${lib.concatMapStrings (system-image: ''
-      apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))
-      type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))
-      mkdir -p system-images/$apiVersion
-      ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type
-    '') images}
-  '';
+  linkSystemImages =
+    { images, check }:
+    lib.optionalString (shouldLink check images) ''
+      mkdir -p system-images
+      ${lib.concatMapStrings (system-image: ''
+        apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))
+        type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))
+        mkdir -p system-images/$apiVersion
+        ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type
+      '') images}
+    '';
 
   # Links all plugins related to a requested platform
-  linkPlatformPlugins = {name, plugins, check}:
-    lib.optionalString check ''
+  linkPlatformPlugins =
+    {
+      name,
+      plugins,
+      check,
+    }:
+    lib.optionalString (shouldLink check plugins) ''
       mkdir -p ${name}
       ${lib.concatMapStrings (plugin: ''
         ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
       '') plugins}
     ''; # */
 
-  cmdline-tools-package = check-version packages "cmdline-tools" cmdLineToolsVersion;
+in
+lib.recurseIntoAttrs rec {
+  deployAndroidPackages = callPackage ./deploy-androidpackages.nix {
+    inherit
+      stdenv
+      lib
+      mkLicenses
+      meta
+      os
+      arch
+      ;
+  };
+
+  deployAndroidPackage = (
+    {
+      package,
+      buildInputs ? [ ],
+      patchInstructions ? "",
+      meta ? { },
+      ...
+    }@args:
+    let
+      extraParams = removeAttrs args [
+        "package"
+        "os"
+        "arch"
+        "buildInputs"
+        "patchInstructions"
+      ];
+    in
+    deployAndroidPackages (
+      {
+        inherit buildInputs;
+        packages = [ package ];
+        patchesInstructions = {
+          "${package.name}" = patchInstructions;
+        };
+      }
+      // extraParams
+    )
+  );
+
+  all = allPackages;
+
+  platform-tools = callPackage ./platform-tools.nix {
+    inherit
+      deployAndroidPackage
+      os
+      arch
+      meta
+      ;
+    package = check-version allArchives.packages "platform-tools" platformToolsVersion;
+  };
+
+  tools = callPackage ./tools.nix {
+    inherit
+      deployAndroidPackage
+      os
+      arch
+      meta
+      ;
+    package = check-version allArchives.packages "tools" toolsVersion;
+
+    postInstall = ''
+      ${linkPlugin {
+        name = "platform-tools";
+        plugin = platform-tools;
+      }}
+      ${linkPlugin {
+        name = "emulator";
+        plugin = emulator;
+        check = includeEmulator;
+      }}
+    '';
+  };
+
+  build-tools = map (
+    version:
+    callPackage ./build-tools.nix {
+      inherit
+        deployAndroidPackage
+        os
+        arch
+        meta
+        ;
+      package = check-version allArchives.packages "build-tools" version;
+
+      postInstall = ''
+        ${linkPlugin {
+          name = "tools";
+          plugin = tools;
+          check = toolsVersion != null;
+        }}
+      '';
+    }
+  ) buildToolsVersions;
+
+  emulator = callPackage ./emulator.nix {
+    inherit
+      deployAndroidPackage
+      os
+      arch
+      meta
+      ;
+    package = check-version allArchives.packages "emulator" emulatorVersion;
+
+    postInstall = ''
+      ${linkSystemImages {
+        images = system-images;
+        check = includeSystemImages;
+      }}
+    '';
+  };
+
+  inherit platformVersions;
+
+  platforms = map (
+    version:
+    deployAndroidPackage {
+      package = check-version allArchives.packages "platforms" (toString version);
+    }
+  ) platformVersions;
+
+  sources = map (
+    version:
+    deployAndroidPackage {
+      package = check-version allArchives.packages "sources" (toString version);
+    }
+  ) platformVersions;
+
+  system-images = lib.flatten (
+    map (
+      apiVersion:
+      map (
+        type:
+        # Deploy all system images with the same  systemImageType in one derivation to avoid the `null` problem below
+        # with avdmanager when trying to create an avd!
+        #
+        # ```
+        # $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'
+        # Error: Package path is not valid. Valid system image paths are:
+        # null
+        # ```
+        let
+          availablePackages =
+            map (abiVersion: allArchives.system-images.${toString apiVersion}.${type}.${abiVersion})
+              (
+                builtins.filter (
+                  abiVersion: lib.hasAttrByPath [ (toString apiVersion) type abiVersion ] allArchives.system-images
+                ) abiVersions
+              );
+
+          instructions = builtins.listToAttrs (
+            map (package: {
+              name = package.name;
+              value = lib.optionalString (lib.hasPrefix "google_apis" type) ''
+                # Patch 'google_apis' system images so they're recognized by the sdk.
+                # Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
+                # of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
+                sed -i '/^Addon.Vendor/d' source.properties
+              '';
+            }) availablePackages
+          );
+        in
+        lib.optionals (availablePackages != [ ]) (deployAndroidPackages {
+          packages = availablePackages;
+          patchesInstructions = instructions;
+        })
+      ) systemImageTypes
+    ) platformVersions
+  );
+
+  cmake = map (
+    version:
+    callPackage ./cmake.nix {
+      inherit
+        deployAndroidPackage
+        os
+        arch
+        meta
+        ;
+      package = check-version allArchives.packages "cmake" version;
+    }
+  ) cmakeVersions;
+
+  # All NDK bundles.
+  ndk-bundles =
+    let
+      # Creates a NDK bundle.
+      makeNdkBundle =
+        package:
+        callPackage ./ndk-bundle {
+          inherit
+            deployAndroidPackage
+            os
+            arch
+            platform-tools
+            meta
+            package
+            ;
+        };
+    in
+    lib.flatten (
+      map (
+        version:
+        let
+          package = makeNdkBundle (
+            allArchives.packages.ndk-bundle.${ndkVersion} or allArchives.packages.ndk.${ndkVersion}
+          );
+        in
+        lib.optional (shouldLink includeNDK [ package ]) package
+      ) ndkVersions
+    );
+
+  # The "default" NDK bundle.
+  ndk-bundle = if ndk-bundles == [ ] then null else lib.head ndk-bundles;
+
+  # Makes a Google API bundle.
+  google-apis =
+    map
+      (
+        version:
+        deployAndroidPackage {
+          package = (check-version allArchives "addons" (toString version)).google_apis;
+        }
+      )
+      (
+        builtins.filter (platformVersion: lib.versionOlder (toString platformVersion) "26") platformVersions
+      ); # API level 26 and higher include Google APIs by default
+
+  google-tv-addons = map (
+    version:
+    deployAndroidPackage {
+      package = (check-version allArchives "addons" (toString version)).google_tv_addon;
+    }
+  ) platformVersions;
+
+  cmdline-tools-package = check-version allArchives.packages "cmdline-tools" cmdLineToolsVersion;
 
   # This derivation deploys the tools package and symlinks all the desired
   # plugins that we want to use. If the license isn't accepted, prints all the licenses
   # requested and throws.
-  androidsdk = if !licenseAccepted then throw ''
-    ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)}
+  androidsdk =
+    if !licenseAccepted then
+      throw ''
+        ${builtins.concatStringsSep "\n\n" (mkLicenseTexts licenseNames)}
 
-    You must accept the following licenses:
-    ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}
+        You must accept the following licenses:
+        ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}
 
-    a)
-      by setting nixpkgs config option 'android_sdk.accept_license = true;'.
-    b)
-      by an environment variable for a single invocation of the nix tools.
-        $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1
-  '' else callPackage ./cmdline-tools.nix {
-    inherit deployAndroidPackage os;
+        a)
+          by setting nixpkgs config option 'android_sdk.accept_license = true;'.
+        b)
+          by an environment variable for a single invocation of the nix tools.
+            $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1
+      ''
+    else
+      callPackage ./cmdline-tools.nix {
+        inherit
+          deployAndroidPackage
+          os
+          arch
+          meta
+          ;
 
-    package = cmdline-tools-package;
+        package = cmdline-tools-package;
 
-    postInstall = ''
-      # Symlink all requested plugins
-      ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
-      ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}
-      ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
-      ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
-      ${linkPlugins { name = "platforms"; plugins = platforms; }}
-      ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
-      ${linkPlugins { name = "cmake"; plugins = cmake; }}
-      ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }}
-      ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
-      ${linkSystemImages { images = system-images; check = includeSystemImages; }}
-      ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }}
-      ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }}
+        postInstall = ''
+          # Symlink all requested plugins
+          ${linkPlugin {
+            name = "platform-tools";
+            plugin = platform-tools;
+          }}
+          ${linkPlugin {
+            name = "tools";
+            plugin = tools;
+            check = toolsVersion != null;
+          }}
+          ${linkPlugins {
+            name = "build-tools";
+            plugins = build-tools;
+          }}
+          ${linkPlugin {
+            name = "emulator";
+            plugin = emulator;
+            check = includeEmulator;
+          }}
+          ${linkPlugins {
+            name = "platforms";
+            plugins = platforms;
+          }}
+          ${linkPlatformPlugins {
+            name = "sources";
+            plugins = sources;
+            check = includeSources;
+          }}
+          ${linkPlugins {
+            name = "cmake";
+            plugins = cmake;
+            check = includeCmake;
+          }}
+          ${linkNdkPlugins {
+            name = "ndk-bundle";
+            rootName = "ndk";
+            plugins = ndk-bundles;
+            check = includeNDK;
+          }}
+          ${linkNdkPlugin {
+            name = "ndk-bundle";
+            plugin = ndk-bundle;
+            check = includeNDK;
+          }}
+          ${linkSystemImages {
+            images = system-images;
+            check = includeSystemImages;
+          }}
+          ${linkPlatformPlugins {
+            name = "add-ons";
+            plugins = google-apis;
+            check = useGoogleAPIs;
+          }}
+          ${linkPlatformPlugins {
+            name = "add-ons";
+            plugins = google-tv-addons;
+            check = useGoogleTVAddOns;
+          }}
 
-      # Link extras
-      ${lib.concatMapStrings (identifier:
-        let
-          package = addons.extras.${identifier};
-          path = package.path;
-          extras = callPackage ./extras.nix {
-            inherit deployAndroidPackage package os;
-          };
-        in
-        ''
-          targetDir=$(dirname ${path})
-          mkdir -p $targetDir
-          ln -s ${extras}/libexec/android-sdk/${path} $targetDir
-        '') includeExtras}
+          # Link extras
+          ${lib.concatMapStrings (
+            identifier:
+            let
+              package = allArchives.extras.${identifier};
+              path = package.path;
+              extras = callPackage ./extras.nix {
+                inherit
+                  deployAndroidPackage
+                  package
+                  os
+                  arch
+                  meta
+                  ;
+              };
+            in
+            ''
+              targetDir=$(dirname ${path})
+              mkdir -p $targetDir
+              ln -s ${extras}/libexec/android-sdk/${path} $targetDir
+            ''
+          ) includeExtras}
 
-      # Expose common executables in bin/
-      mkdir -p $out/bin
+          # Expose common executables in bin/
+          mkdir -p $out/bin
 
-      for i in ${platform-tools}/bin/*; do
-          ln -s $i $out/bin
-      done
+          for i in ${platform-tools}/bin/*; do
+              ln -s $i $out/bin
+          done
 
-      ${lib.optionalString includeEmulator ''
-        for i in ${emulator}/bin/*; do
-            ln -s $i $out/bin
-        done
-      ''}
+          ${lib.optionalString (shouldLink includeEmulator [ emulator ]) ''
+            for i in ${emulator}/bin/*; do
+                ln -s $i $out/bin
+            done
+          ''}
 
-      find $ANDROID_SDK_ROOT/${cmdline-tools-package.path}/bin -type f -executable | while read i; do
-          ln -s $i $out/bin
-      done
+          find $ANDROID_SDK_ROOT/${cmdline-tools-package.path}/bin -type f -executable | while read i; do
+              ln -s $i $out/bin
+          done
 
-      # Write licenses
-      mkdir -p licenses
-      ${lib.concatMapStrings (licenseName:
-        let
-          licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName);
-          licenseHashFile = writeText "androidenv-${licenseName}" licenseHashes;
-        in
-        ''
-          ln -s ${licenseHashFile} licenses/${licenseName}
-        '') licenseNames}
-    '';
-  };
+          # Write licenses
+          mkdir -p licenses
+          ${lib.concatMapStrings (
+            licenseName:
+            let
+              licenseHashes = builtins.concatStringsSep "\n" (mkLicenseHashes licenseName);
+              licenseHashFile = writeText "androidenv-${licenseName}" licenseHashes;
+            in
+            ''
+              ln -s ${licenseHashFile} licenses/${licenseName}
+            ''
+          ) licenseNames}
+        '';
+      };
 }
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d461afa1c322..38084115c1c4 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,51 +1,42 @@
 {
-  config,
+  lib,
   pkgs ? import <nixpkgs> { },
-  licenseAccepted ?
-    config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),
+  licenseAccepted ? pkgs.callPackage ./license.nix { },
 }:
 
-rec {
+lib.recurseIntoAttrs rec {
   composeAndroidPackages = pkgs.callPackage ./compose-android-packages.nix {
-    inherit licenseAccepted;
+    inherit licenseAccepted meta;
   };
 
   buildApp = pkgs.callPackage ./build-app.nix {
-    inherit composeAndroidPackages;
+    inherit composeAndroidPackages meta;
   };
 
   emulateApp = pkgs.callPackage ./emulate-app.nix {
-    inherit composeAndroidPackages;
+    inherit composeAndroidPackages meta;
   };
 
   androidPkgs = composeAndroidPackages {
-    platformVersions = [
-      "28"
-      "29"
-      "30"
-      "31"
-      "32"
-      "33"
-      "34"
-      "35"
-    ];
-    includeEmulator =
-      with pkgs.stdenv.hostPlatform;
-      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";
-    includeSystemImages =
-      with pkgs.stdenv.hostPlatform;
-      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";
-    includeNDK =
-      with pkgs.stdenv.hostPlatform;
-      system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin";
+    # Support roughly the last 5 years of Android packages and system images by default in nixpkgs.
+    numLatestPlatformVersions = 5;
+    includeEmulator = "if-supported";
+    includeSystemImages = "if-supported";
+    includeNDK = "if-supported";
   };
 
-  test-suite = pkgs.callPackage ./test-suite.nix { };
+  test-suite = pkgs.callPackage ./test-suite.nix {
+    inherit meta;
+  };
 
-  meta = with pkgs.lib; {
-    description = "Android SDK & sdkmanager";
-    homepage = "https://developer.android.com/tools/sdkmanager";
-    maintainers = with maintainers; [
+  inherit (test-suite) passthru;
+
+  meta = {
+    homepage = "https://developer.android.com/tools";
+    description = "Android SDK tools, packaged in Nixpkgs";
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       numinit
       hadilq
     ];
diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
index 1cfa3f7e9fc7..1a4e8b9fb780 100644
--- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
+++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix
@@ -1,30 +1,59 @@
-{stdenv, lib, unzip, mkLicenses}:
-{packages, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args:
+{
+  stdenv,
+  lib,
+  unzip,
+  mkLicenses,
+  os,
+  arch,
+  meta,
+}:
+{
+  packages,
+  nativeBuildInputs ? [ ],
+  buildInputs ? [ ],
+  patchesInstructions ? { },
+  ...
+}@args:
 
 let
-  extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ];
+  extraParams = removeAttrs args [
+    "packages"
+    "os"
+    "buildInputs"
+    "nativeBuildInputs"
+    "patchesInstructions"
+  ];
   sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages;
 
-  mkXmlAttrs = attrs:
-    lib.concatStrings (lib.mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs);
-  mkXmlValues = attrs:
-    lib.concatStrings (lib.mapAttrsToList (name: value:
-      let
-        tag = builtins.head (builtins.match "([^:]+).*" name);
-      in
+  mkXmlAttrs =
+    attrs: lib.concatStrings (lib.mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs);
+  mkXmlValues =
+    attrs:
+    lib.concatStrings (
+      lib.mapAttrsToList (
+        name: value:
+        let
+          tag = builtins.head (builtins.match "([^:]+).*" name);
+        in
         if builtins.typeOf value == "string" then "<${tag}>${value}</${tag}>" else mkXmlDoc name value
-    ) attrs);
-  mkXmlDoc = name: doc:
-      let
-        tag = builtins.head (builtins.match "([^:]+).*" name);
-        hasXmlAttrs = builtins.hasAttr "element-attributes" doc;
-        xmlValues = removeAttrs doc [ "element-attributes" ];
-        hasXmlValues = builtins.length (builtins.attrNames xmlValues) > 0;
-      in
-        if hasXmlAttrs && hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues }</${tag}>"
-        else if hasXmlAttrs && !hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}/>"
-        else if !hasXmlAttrs && hasXmlValues then "<${tag}>${mkXmlValues xmlValues}</${tag}>"
-        else "<${tag}/>";
+      ) attrs
+    );
+  mkXmlDoc =
+    name: doc:
+    let
+      tag = builtins.head (builtins.match "([^:]+).*" name);
+      hasXmlAttrs = builtins.hasAttr "element-attributes" doc;
+      xmlValues = removeAttrs doc [ "element-attributes" ];
+      hasXmlValues = builtins.length (builtins.attrNames xmlValues) > 0;
+    in
+    if hasXmlAttrs && hasXmlValues then
+      "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues}</${tag}>"
+    else if hasXmlAttrs && !hasXmlValues then
+      "<${tag}${mkXmlAttrs doc.element-attributes}/>"
+    else if !hasXmlAttrs && hasXmlValues then
+      "<${tag}>${mkXmlValues xmlValues}</${tag}>"
+    else
+      "<${tag}/>";
   mkXmlPackage = package: ''
     <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <ns2:repository
@@ -44,71 +73,88 @@ let
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <license id="${package.license}" type="text">${lib.concatStringsSep "---" (mkLicenses package.license)}</license>
       <localPackage path="${builtins.replaceStrings [ "/" ] [ ";" ] package.path}" obsolete="${
-          if (lib.hasAttrByPath [ "obsolete" ] package)
-          then package.obsolete else "false"
-        }">
+        if (lib.hasAttrByPath [ "obsolete" ] package) then package.obsolete else "false"
+      }">
         ${mkXmlDoc "type-details" package.type-details}
         ${mkXmlDoc "revision" package.revision-details}
-        ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package)
-          (mkXmlDoc "dependencies" package.dependencies)
-        }
+        ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package) (
+          mkXmlDoc "dependencies" package.dependencies
+        )}
         <display-name>${package.displayName}</display-name>
         <uses-license ref="${package.license}"/>
       </localPackage>
     </ns2:repository>
   '';
 in
-stdenv.mkDerivation ({
-  inherit buildInputs;
-  pname = "android-sdk-${lib.concatMapStringsSep "-" (package: package.name) sortedPackages}";
-  version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages;
-  src = map (package: package.archives) packages;
-  nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
-  preferLocalBuild = true;
+stdenv.mkDerivation (
+  {
+    inherit buildInputs;
+    pname = "android-sdk-${lib.concatMapStringsSep "-" (package: package.name) sortedPackages}";
+    version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages;
+    src = lib.flatten (map (package: package.archives) packages);
+    inherit os arch;
+    nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
+    preferLocalBuild = true;
 
-  unpackPhase = ''
-    buildDir=$PWD
-    i=0
-    for srcArchive in $src; do
-      extractedZip="extractedzip-$i"
-      i=$((i+1))
-      cd "$buildDir"
-      mkdir "$extractedZip"
-      cd "$extractedZip"
-      unpackFile "$srcArchive"
-    done
-  '';
+    unpackPhase = ''
+      runHook preUnpack
+      if [ -z "$src" ]; then
+        echo "$pname did not have any sources available for os=$os, arch=$arch." >&2
+        echo "Are packages available for this architecture?" >&2
+        exit 1
+      fi
+      buildDir=$PWD
+      i=0
+      for srcArchive in $src; do
+        extractedZip="extractedzip-$i"
+        i=$((i+1))
+        cd "$buildDir"
+        mkdir "$extractedZip"
+        cd "$extractedZip"
+        unpackFile "$srcArchive"
+      done
+      runHook postUnpack
+    '';
 
-  installPhase = lib.concatStrings (lib.imap0 (i: package: ''
-    cd $buildDir/extractedzip-${toString i}
+    installPhase =
+      ''
+        runHook preInstall
+      ''
+      + lib.concatStrings (
+        lib.imap0 (i: package: ''
+          cd $buildDir/extractedzip-${toString i}
 
-    # Most Android Zip packages have a root folder, but some don't. We unpack
-    # the zip file in a folder and we try to discover whether it has a single root
-    # folder. If this is the case, we adjust the current working folder.
-    if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]; then
-        cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
-    fi
-    extractedZip="$PWD"
+          # Most Android Zip packages have a root folder, but some don't. We unpack
+          # the zip file in a folder and we try to discover whether it has a single root
+          # folder. If this is the case, we adjust the current working folder.
+          if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]; then
+              cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
+          fi
+          extractedZip="$PWD"
 
-    packageBaseDir=$out/libexec/android-sdk/${package.path}
-    mkdir -p $packageBaseDir
-    cd $packageBaseDir
-    cp -a $extractedZip/* .
-    ${patchesInstructions.${package.name}}
+          packageBaseDir=$out/libexec/android-sdk/${package.path}
+          mkdir -p $packageBaseDir
+          cd $packageBaseDir
+          cp -a $extractedZip/* .
+          ${patchesInstructions.${package.name}}
 
-    if [ ! -f $packageBaseDir/package.xml ]; then
-      cat << EOF > $packageBaseDir/package.xml
-    ${mkXmlPackage package}
-    EOF
-    fi
-  '') packages);
+          if [ ! -f $packageBaseDir/package.xml ]; then
+            cat << EOF > $packageBaseDir/package.xml
+          ${mkXmlPackage package}
+          EOF
+          fi
+        '') packages
+      )
+      + ''
+        runHook postInstall
+      '';
 
-  # Some executables that have been patched with patchelf may not work any longer after they have been stripped.
-  dontStrip = true;
-  dontPatchELF = true;
-  dontAutoPatchelf = true;
+    # Some executables that have been patched with patchelf may not work any longer after they have been stripped.
+    dontStrip = true;
+    dontPatchELF = true;
+    dontAutoPatchelf = true;
 
-  meta = {
-    description = lib.concatMapStringsSep "\n" (package: package.displayName) packages;
-  } // meta;
-} // extraParams)
+    inherit meta;
+  }
+  // extraParams
+)
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index e215d4981af7..2e9b83854a8a 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -3,6 +3,7 @@
   stdenv,
   lib,
   runtimeShell,
+  meta,
 }:
 {
   name,
@@ -195,5 +196,7 @@ stdenv.mkDerivation {
     chmod +x $out/bin/run-test-emulator
   '';
 
-  meta.mainProgram = "run-test-emulator";
+  meta = meta // {
+    mainProgram = "run-test-emulator";
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 765bf40df364..e2f724ada13c 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -1,27 +1,46 @@
-{ deployAndroidPackage, lib, stdenv, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }:
+{
+  deployAndroidPackage,
+  lib,
+  stdenv,
+  package,
+  os,
+  arch,
+  autoPatchelfHook,
+  makeWrapper,
+  pkgs,
+  pkgsi686Linux,
+  postInstall,
+  meta,
+}:
 
 deployAndroidPackage {
-  inherit package;
-  nativeBuildInputs = [ makeWrapper ]
-    ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") (with pkgs; [
-      glibc
-      libcxx
-      libGL
-      libpulseaudio
-      libtiff
-      libuuid
-      zlib
-      libbsd
-      ncurses5
-      libdrm
-      stdenv.cc.cc
-      expat
-      freetype
-      nss
-      nspr
-      alsa-lib
-    ]) ++ (with pkgs.xorg; [
+  inherit package os arch;
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
+  buildInputs =
+    lib.optionals (os == "linux") (
+      with pkgs;
+      [
+        glibc
+        libcxx
+        libGL
+        libpulseaudio
+        libtiff
+        libuuid
+        zlib
+        libbsd
+        ncurses5
+        libdrm
+        stdenv.cc.cc
+        expat
+        freetype
+        nss
+        nspr
+        alsa-lib
+        llvmPackages_15.libllvm.lib
+        waylandpp.lib
+      ]
+    )
+    ++ (with pkgs.xorg; [
       libX11
       libXext
       libXdamage
@@ -35,7 +54,9 @@ deployAndroidPackage {
       libICE
       libSM
       libxkbfile
-    ]) ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
+      libxshmfence
+    ])
+    ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
   patchInstructions = lib.optionalString (os == "linux") ''
     addAutoPatchelfSearchPath $packageBaseDir/lib
     addAutoPatchelfSearchPath $packageBaseDir/lib64
@@ -48,14 +69,20 @@ deployAndroidPackage {
       patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
     done
 
+    for file in $out/libexec/android-sdk/emulator/lib64/vulkan/libvulkan_lvp.so; do
+      patchelf --replace-needed libLLVM-15.so.1 libLLVM-15.so "$file" || true
+    done
+
     autoPatchelf $out
 
     # Wrap emulator so that it can load required libraries at runtime
     wrapProgram $out/libexec/android-sdk/emulator/emulator \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-        pkgs.dbus
-        pkgs.systemd
-      ]} \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          pkgs.dbus
+          pkgs.systemd
+        ]
+      } \
       --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
       --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
 
@@ -69,4 +96,6 @@ deployAndroidPackage {
     ${postInstall}
   '';
   dontMoveLib64 = true;
+
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
index 9cd207611c25..eb5a48681931 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
@@ -19,22 +19,12 @@
     config.allowUnfree = true;
   },
 
-  config ? pkgs.config,
   # You probably need to set it to true to express consent.
-  licenseAccepted ?
-    config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),
+  licenseAccepted ? pkgs.callPackage ../license.nix { },
 }:
 
 # Copy this file to your Android project.
 let
-  # Declaration of versions for everything. This is useful since these
-  # versions may be used in multiple places in this Nix expression.
-  android = {
-    platforms = [ "35" ];
-    systemImageTypes = [ "google_apis" ];
-    abis = [ "x86_64" ];
-  };
-
   # If you copy this example out of nixpkgs, something like this will work:
   /*
     androidEnvNixpkgs = fetchTarball {
@@ -44,23 +34,21 @@ let
     };
 
     androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
-      inherit config pkgs;
+      inherit pkgs;
       licenseAccepted = true;
     };
   */
 
   # Otherwise, just use the in-tree androidenv:
   androidEnv = pkgs.callPackage ./.. {
-    inherit config pkgs licenseAccepted;
+    inherit pkgs licenseAccepted;
   };
 
-  sdkArgs = {
-    platformVersions = android.platforms;
-    abiVersions = android.abis;
-    systemImageTypes = android.systemImageTypes;
+  emulatorSupported = pkgs.stdenv.hostPlatform.isx86_64 || pkgs.stdenv.hostPlatform.isDarwin;
 
+  sdkArgs = {
     includeSystemImages = true;
-    includeEmulator = true;
+    includeEmulator = "if-supported";
 
     # Accepting more licenses declaratively:
     extraLicenses = [
@@ -89,6 +77,7 @@ let
   };
   androidSdk = androidComposition.androidsdk;
   platformTools = androidComposition.platform-tools;
+  latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions;
   jdk = pkgs.jdk;
 in
 pkgs.mkShell rec {
@@ -133,10 +122,11 @@ pkgs.mkShell rec {
           echo "installed_packages_section: ''${installed_packages_section}"
 
           packages=(
-            "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "emulator" "platform-tools" "platforms;android-35" \
-            "system-images;android-35;google_apis;x86_64"
+            "build-tools" "cmdline-tools" \
+            "platform-tools" "platforms;android-${toString latestSdk}" \
+            "system-images;android-${toString latestSdk};google_apis;x86_64"
           )
+          ${pkgs.lib.optionalString emulatorSupported ''packages+=("emulator")''}
 
           for package in "''${packages[@]}"; do
             if [[ ! $installed_packages_section =~ "$package" ]]; then
@@ -160,24 +150,17 @@ pkgs.mkShell rec {
           output="$(sdkmanager --list)"
           installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
 
-          excluded_packages=(
-            "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
-            "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
-            "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \
-            "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \
-            "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \
-            "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
-            "system-images;android-28" \
-            "system-images;android-29" \
-            "system-images;android-30" \
-            "system-images;android-31" \
-            "system-images;android-32" \
-            "system-images;android-33" \
-            "ndk"
-          )
+          excluded_packages=(ndk)
+          for x in $(seq 1 ${toString latestSdk}); do
+            excluded_packages+=(
+              "platforms;android-$x"
+              "sources;android-$x"
+              "system-images;android-$x"
+            )
+          done
 
           for package in "''${excluded_packages[@]}"; do
-            if [[ $installed_packages_section =~ "$package" ]]; then
+            if [[ $installed_packages_section =~ ^"$package"$ ]]; then
               echo "$package package was installed, while it was excluded!"
               exit 1
             fi
@@ -195,21 +178,25 @@ pkgs.mkShell rec {
             jdk
           ];
         }
-        ''
-          export ANDROID_USER_HOME=$PWD/.android
-          mkdir -p $ANDROID_USER_HOME
+        (
+          pkgs.lib.optionalString emulatorSupported ''
+            export ANDROID_USER_HOME=$PWD/.android
+            mkdir -p $ANDROID_USER_HOME
 
-          avdmanager delete avd -n testAVD || true
-          echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64'
-          result=$(avdmanager list avd)
+            avdmanager delete avd -n testAVD || true
+            echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-${toString latestSdk};google_apis;x86_64'
+            result=$(avdmanager list avd)
 
-          if [[ ! $result =~ "Name: testAVD" ]]; then
-            echo "avdmanager couldn't create the avd! The output is :''${result}"
-            exit 1
-          fi
+            if [[ ! $result =~ "Name: testAVD" ]]; then
+              echo "avdmanager couldn't create the avd! The output is :''${result}"
+              exit 1
+            fi
 
-          avdmanager delete avd -n testAVD || true
-          touch "$out"
-        '';
+            avdmanager delete avd -n testAVD || true
+          ''
+          + ''
+            touch $out
+          ''
+        );
   };
 }
diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
index 16fd105e4b59..3af80459b347 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
@@ -5,12 +5,12 @@
   # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html
   /*
     nixpkgsSource ? (builtins.fetchTarball {
-    name = "nixpkgs-20.09";
-    url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
-    sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
+      name = "nixpkgs-20.09";
+      url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
+      sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
     }),
     pkgs ? import nixpkgsSource {
-    config.allowUnfree = true;
+      config.allowUnfree = true;
     },
   */
 
@@ -18,49 +18,32 @@
   pkgs ? import ../../../../.. {
     config.allowUnfree = true;
   },
-  config ? pkgs.config,
-  # You probably need to set it to true to express consent.
-  licenseAccepted ?
-    config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),
+
+  licenseAccepted ? pkgs.callPackage ../license.nix { },
 }:
 
 # Copy this file to your Android project.
 let
-  # Declaration of versions for everything. This is useful since these
-  # versions may be used in multiple places in this Nix expression.
-  android = {
-    versions = {
-      cmdLineToolsVersion = "13.0";
-      platformTools = "35.0.2";
-      buildTools = "35.0.0";
-    };
-    platforms = [ "35" ];
-  };
-
   # If you copy this example out of nixpkgs, something like this will work:
   /*
     androidEnvNixpkgs = fetchTarball {
-    name = "androidenv";
-    url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
-    sha256 = "<fill me in with nix-prefetch-url --unpack>";
+      name = "androidenv";
+      url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
+      sha256 = "<fill me in with nix-prefetch-url --unpack>";
     };
 
     androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
-    inherit config pkgs;
-    licenseAccepted = true;
+      inherit pkgs;
+      licenseAccepted = true;
     };
   */
 
   # Otherwise, just use the in-tree androidenv:
   androidEnv = pkgs.callPackage ./.. {
-    inherit config pkgs licenseAccepted;
+    inherit pkgs licenseAccepted;
   };
 
   sdkArgs = {
-    cmdLineToolsVersion = android.versions.cmdLineToolsVersion;
-    platformToolsVersion = android.versions.platformTools;
-    buildToolsVersions = [ android.versions.buildTools ];
-    platformVersions = android.platforms;
     includeNDK = false;
     includeSystemImages = false;
     includeEmulator = false;
@@ -85,6 +68,7 @@ let
   androidComposition = androidEnv.composeAndroidPackages sdkArgs;
   androidSdk = androidComposition.androidsdk;
   platformTools = androidComposition.platform-tools;
+  latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions;
   jdk = pkgs.jdk;
 in
 pkgs.mkShell {
@@ -126,8 +110,8 @@ pkgs.mkShell {
           echo "installed_packages_section: ''${installed_packages_section}"
 
           packages=(
-            "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "platform-tools" "platforms;android-35"
+            "build-tools" "cmdline-tools" \
+            "platform-tools" "platforms;android-${toString latestSdk}"
           )
 
           for package in "''${packages[@]}"; do
diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix
index 05e078a03f9e..7a45dcfbbcbc 100644
--- a/pkgs/development/mobile/androidenv/examples/shell.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -1,14 +1,15 @@
 {
   # If you copy this example out of nixpkgs, use these lines instead of the next.
   # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html
-  /*nixpkgsSource ? (builtins.fetchTarball {
-    name = "nixpkgs-20.09";
-    url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
-    sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
-  }),
-  pkgs ? import nixpkgsSource {
-    config.allowUnfree = true;
-  },
+  /*
+    nixpkgsSource ? (builtins.fetchTarball {
+      name = "nixpkgs-20.09";
+      url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
+      sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
+    }),
+    pkgs ? import nixpkgsSource {
+      config.allowUnfree = true;
+    },
   */
 
   # If you want to use the in-tree version of nixpkgs:
@@ -16,88 +17,70 @@
     config.allowUnfree = true;
   },
 
-  config ? pkgs.config,
   # You probably need to set it to true to express consent.
-  licenseAccepted ?
-    config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),
+  licenseAccepted ? pkgs.callPackage ../license.nix { },
 }:
 
 # Copy this file to your Android project.
 let
-  # Declaration of versions for everything. This is useful since these
-  # versions may be used in multiple places in this Nix expression.
-  android = {
-    versions = {
-      cmdLineToolsVersion = "13.0";
-      platformTools = "35.0.2";
-      buildTools = "35.0.0";
-      ndk = [
-        "27.0.12077973"
-      ];
-      cmake = "3.6.4111459";
-      emulator = "35.1.4";
+  # If you copy this example out of nixpkgs, something like this will work:
+  /*
+    androidEnvNixpkgs = fetchTarball {
+      name = "androidenv";
+      url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
+      sha256 = "<fill me in with nix-prefetch-url --unpack>";
     };
 
-    platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ];
-    abis = [ "x86_64" ];
-    extras = [
-      "extras;google;gcm"
-      "extras;google;auto"
-    ];
-  };
-
-  # If you copy this example out of nixpkgs, something like this will work:
-  /*androidEnvNixpkgs = fetchTarball {
-    name = "androidenv";
-    url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
-    sha256 = "<fill me in with nix-prefetch-url --unpack>";
-  };
-
-  androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
-    inherit config pkgs;
-    licenseAccepted = true;
-  };*/
+    androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
+      inherit pkgs;
+      licenseAccepted = true;
+    };
+  */
 
   # Otherwise, just use the in-tree androidenv:
   androidEnv = pkgs.callPackage ./.. {
-    inherit config pkgs licenseAccepted;
+    inherit pkgs licenseAccepted;
   };
 
+  # The head unit only works on these platforms
+  includeAuto = pkgs.stdenv.hostPlatform.isx86_64 || pkgs.stdenv.hostPlatform.isDarwin;
+
   androidComposition = androidEnv.composeAndroidPackages {
-    cmdLineToolsVersion = android.versions.cmdLineToolsVersion;
-    platformToolsVersion = android.versions.platformTools;
-    buildToolsVersions = [android.versions.buildTools];
-    platformVersions = android.platforms;
-    abiVersions = android.abis;
-
     includeSources = true;
-    includeSystemImages = true;
-    includeEmulator = true;
-    emulatorVersion = android.versions.emulator;
-
-    includeNDK = true;
-    ndkVersions = android.versions.ndk;
-    cmakeVersions = [android.versions.cmake];
-
+    includeSystemImages = false;
+    includeEmulator = "if-supported";
+    includeNDK = "if-supported";
     useGoogleAPIs = true;
-    includeExtras = android.extras;
+
+    # Make sure everything from the last decade works since we are not using system images.
+    numLatestPlatformVersions = 10;
 
     # If you want to use a custom repo JSON:
     # repoJson = ../repo.json;
 
     # If you want to use custom repo XMLs:
-    /*repoXmls = {
-      packages = [ ../xml/repository2-1.xml ];
-      images = [
-        ../xml/android-sys-img2-1.xml
-        ../xml/android-tv-sys-img2-1.xml
-        ../xml/android-wear-sys-img2-1.xml
-        ../xml/android-wear-cn-sys-img2-1.xml
-        ../xml/google_apis-sys-img2-1.xml
-        ../xml/google_apis_playstore-sys-img2-1.xml
+    /*
+      repoXmls = {
+        packages = [ ../xml/repository2-1.xml ];
+        images = [
+          ../xml/android-sys-img2-1.xml
+          ../xml/android-tv-sys-img2-1.xml
+          ../xml/android-wear-sys-img2-1.xml
+          ../xml/android-wear-cn-sys-img2-1.xml
+          ../xml/google_apis-sys-img2-1.xml
+          ../xml/google_apis_playstore-sys-img2-1.xml
+        ];
+        addons = [ ../xml/addon2-1.xml ];
+      };
+    */
+
+    includeExtras =
+      [
+        "extras;google;gcm"
+      ]
+      ++ pkgs.lib.optionals includeAuto [
+        "extras;google;auto"
       ];
-      addons = [ ../xml/addon2-1.xml ];
-    };*/
 
     # Accepting more licenses declaratively:
     extraLicenses = [
@@ -118,11 +101,17 @@ let
 
   androidSdk = androidComposition.androidsdk;
   platformTools = androidComposition.platform-tools;
+  firstSdk = pkgs.lib.foldl' pkgs.lib.min 100 androidComposition.platformVersions;
+  latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions;
   jdk = pkgs.jdk;
 in
 pkgs.mkShell rec {
   name = "androidenv-demo";
-  packages = [ androidSdk platformTools jdk ];
+  packages = [
+    androidSdk
+    platformTools
+    jdk
+  ];
 
   LANG = "C.UTF-8";
   LC_ALL = "C.UTF-8";
@@ -132,12 +121,12 @@ pkgs.mkShell rec {
   ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
   ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
 
-  # Ensures that we don't have to use a FHS env by using the nix store's aapt2.
-  GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${android.versions.buildTools}/aapt2";
-
   shellHook = ''
+    # Ensures that we don't have to use a FHS env by using the nix store's aapt2.
+    export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=$(echo "$ANDROID_SDK_ROOT/build-tools/"*"/aapt2")"
+
     # Add cmake to the path.
-    cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}"*/)"
+    cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/"*/)"
     export PATH="$cmake_root/bin:$PATH"
 
     # Write out local.properties for Android Studio.
@@ -151,53 +140,57 @@ pkgs.mkShell rec {
 
   passthru.tests = {
 
-    shell-sdkmanager-licenses-test = pkgs.runCommand "shell-sdkmanager-licenses-test" {
-      nativeBuildInputs = [ androidSdk jdk ];
-    } ''
-      if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then
-        echo "At least one of SDK package licenses are not accepted."
-        exit 1
-      fi
-      touch $out
-    '';
+    shell-sdkmanager-licenses-test =
+      pkgs.runCommand "shell-sdkmanager-licenses-test"
+        {
+          nativeBuildInputs = [
+            androidSdk
+            jdk
+          ];
+        }
+        ''
+          if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then
+            echo "At least one of SDK package licenses are not accepted."
+            exit 1
+          fi
+          touch $out
+        '';
 
-    shell-sdkmanager-packages-test = pkgs.runCommand "shell-sdkmanager-packages-test" {
-      nativeBuildInputs = [ androidSdk jdk ];
-    } ''
-      output="$(sdkmanager --list)"
-      installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
+    shell-sdkmanager-packages-test =
+      pkgs.runCommand "shell-sdkmanager-packages-test"
+        {
+          nativeBuildInputs = [
+            androidSdk
+            jdk
+          ];
+        }
+        ''
+          output="$(sdkmanager --list)"
+          installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
 
-      # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?!
-      packages=(
-        "build-tools;35.0.0" "platform-tools" \
-        "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
-        "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
-        "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-35" \
-        "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \
-        "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \
-        "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
-        "sources;android-35" \
-        "system-images;android-28;google_apis_playstore;x86_64" \
-        "system-images;android-29;google_apis_playstore;x86_64" \
-        "system-images;android-30;google_apis_playstore;x86_64" \
-        "system-images;android-31;google_apis_playstore;x86_64" \
-        "system-images;android-32;google_apis_playstore;x86_64" \
-        "system-images;android-33;google_apis_playstore;x86_64" \
-        "system-images;android-34;google_apis;x86_64" \
-        "system-images;android-35;google_apis;x86_64" \
-        "extras;google;gcm"
-        "extras;google;auto"
-      )
+          packages=(
+            "build-tools" "platform-tools" \
+            "extras;google;gcm"
+          )
 
-      for package in "''${packages[@]}"; do
-        if [[ ! $installed_packages_section =~ "$package" ]]; then
-          echo "$package package was not installed."
-          exit 1
-        fi
-      done
+          for x in $(seq ${toString firstSdk} ${toString latestSdk}); do
+            if [ $x -ne 34 ]; then
+              # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?!
+              packages+=("platforms;android-$x")
+            fi
+            packages+=("sources;android-$x")
+          done
 
-      touch "$out"
-    '';
+          ${pkgs.lib.optionalString includeAuto ''packages+=("extras;google;auto")''}
+
+          for package in "''${packages[@]}"; do
+            if [[ ! $installed_packages_section =~ "$package" ]]; then
+              echo "$package package was not installed."
+              exit 1
+            fi
+          done
+
+          touch "$out"
+        '';
   };
 }
-
diff --git a/pkgs/development/mobile/androidenv/extras.nix b/pkgs/development/mobile/androidenv/extras.nix
index 7e6123635f59..fd98f1f2af84 100644
--- a/pkgs/development/mobile/androidenv/extras.nix
+++ b/pkgs/development/mobile/androidenv/extras.nix
@@ -3,13 +3,15 @@
   lib,
   package,
   os,
+  arch,
   autoPatchelfHook,
   makeWrapper,
   pkgs,
+  meta,
 }:
 
 deployAndroidPackage {
-  inherit package os;
+  inherit package os arch;
   nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
   buildInputs = lib.optionals (os == "linux") (
     with pkgs;
@@ -36,4 +38,6 @@ deployAndroidPackage {
         }
     fi
   '';
+
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/fetchrepo.sh b/pkgs/development/mobile/androidenv/fetchrepo.sh
index 10c106ff96c5..61f8aa66fe7c 100755
--- a/pkgs/development/mobile/androidenv/fetchrepo.sh
+++ b/pkgs/development/mobile/androidenv/fetchrepo.sh
@@ -8,7 +8,7 @@ die() {
 
 fetch() {
     local url="https://dl.google.com/android/repository/$1"
-    echo "$url -> $2"
+    echo "$url -> $2" >&2
     curl -s "$url" -o "$2" || die "Failed to fetch $url"
 }
 
diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh
deleted file mode 100755
index 2c9a0a9f591b..000000000000
--- a/pkgs/development/mobile/androidenv/generate.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./fetchrepo.sh && ./mkrepo.sh
diff --git a/pkgs/development/mobile/androidenv/license.nix b/pkgs/development/mobile/androidenv/license.nix
new file mode 100644
index 000000000000..7b89babdaf52
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/license.nix
@@ -0,0 +1,9 @@
+{
+  config,
+}:
+
+# Accept the license in the test suite.
+config.android_sdk.accept_license or (
+  builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"
+  || builtins.getEnv "UPDATE_NIX_ATTR_PATH" == "androidenv.test-suite"
+)
diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb
index eef50b463a38..66fee5c47322 100644
--- a/pkgs/development/mobile/androidenv/mkrepo.rb
+++ b/pkgs/development/mobile/androidenv/mkrepo.rb
@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'json'
+require 'rubygems'
 require 'nokogiri'
 require 'slop'
+require 'shellwords'
+require 'erb'
 
 # Returns a repo URL for a given package name.
 def repo_url value
@@ -467,6 +470,18 @@ opts[:addons].each do |filename|
   merge result['extras'], extras
 end
 
+result['latest'] = {}
+result['packages'].each do |name, versions|
+  max_version = Gem::Version.new('0')
+  versions.each do |version, package|
+    if package['license'] == 'android-sdk-license' && Gem::Version.correct?(package['revision'])
+      package_version = Gem::Version.new(package['revision'])
+      max_version = package_version if package_version > max_version
+    end
+  end
+  result['latest'][name] = max_version.to_s
+end
+
 # As we keep the old packages in the repo JSON file, we should have
 # a strategy to remove them at some point!
 # So with this variable we claim it's okay to remove them from the
@@ -474,17 +489,21 @@ end
 two_years_ago = today - 2 * 365
 
 input = {}
+prev_latest = {}
 begin
-  input_json = (STDIN.tty?) ? "{}" : $stdin.read
+  input_json = (STDIN.tty?) ? "{}" : STDIN.read
   if input_json != nil && !input_json.empty?
-    input =  expire_records(JSON.parse(input_json), two_years_ago)
+    input = expire_records(JSON.parse(input_json), two_years_ago)
+
+    # Just create a new set of latest packages.
+    prev_latest = input['latest'] || {}
+    input['latest'] = {}
   end
 rescue JSON::ParserError => e
-  $stderr.write(e.message)
+  STDERR.write(e.message)
   return
 end
 
-
 fixup_result = fixup(result)
 
 # Regular installation of Android SDK would keep the previously installed packages even if they are not
@@ -492,4 +511,70 @@ fixup_result = fixup(result)
 # therefore the old packages will work as long as the links are working on the Google servers.
 output = merge input, fixup_result
 
-puts JSON.pretty_generate(sort_recursively(output))
+# See if there are any changes in the latest versions.
+cur_latest = output['latest'] || {}
+
+old_versions = []
+new_versions = []
+changes = []
+changed = false
+
+cur_latest.each do |k, v|
+  prev = prev_latest[k]
+  if prev && prev != v
+    old_versions << "#{k}:#{prev}"
+    new_versions << "#{k}:#{v}"
+    changes << "#{k}: #{prev} -> #{v}"
+    changed = true
+  end
+end
+
+# Write the repository. Append a \n to keep nixpkgs Github Actions happy.
+File.write 'repo.json', (JSON.pretty_generate(sort_recursively(output)) + "\n")
+
+# Output metadata for the nixpkgs update script.
+changed_paths = []
+if changed
+  if ENV['UPDATE_NIX_ATTR_PATH']
+    # Instantiate it.
+    test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`
+    test_status = $?.exitstatus
+    tests_ran = true
+  else
+    tests_ran = false
+  end
+
+  template = ERB.new(<<-EOF, trim_mode: '<>-')
+androidenv: <%= changes.join('; ') %>
+
+Performed the following automatic androidenv updates:
+
+<% changes.each do |change| %>
+- <%= change -%>
+<% end %>
+
+<% if tests_ran %>
+Tests exited with status: <%= test_status -%>
+
+<% if !test_result.empty? %>
+Last 100 lines of output:
+```
+<%= test_result.lines.last(100).join -%>
+```
+<% end %>
+<% end %>
+EOF
+
+  changed_paths << {
+    attrPath: 'androidenv.androidPkgs.androidsdk',
+    oldVersion: old_versions.join('; '),
+    newVersion: new_versions.join('; '),
+    files: [
+      File.realpath('repo.json')
+    ],
+    commitMessage: template.result(binding)
+  }
+end
+
+# nix-update info is on stderr
+STDOUT.puts JSON.pretty_generate(changed_paths)
diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh
index 81dfdbdb210c..174b765e9c34 100755
--- a/pkgs/development/mobile/androidenv/mkrepo.sh
+++ b/pkgs/development/mobile/androidenv/mkrepo.sh
@@ -6,7 +6,7 @@ set -e
 pushd "$(dirname "$0")" &>/dev/null || exit 1
 
 echo "Writing repo.json" >&2
-cat ./repo.json | ruby mkrepo.rb \
+ruby mkrepo.rb \
     --packages ./xml/repository2-3.xml \
     --images ./xml/android-sys-img2-3.xml \
     --images ./xml/android-tv-sys-img2-3.xml \
@@ -15,7 +15,5 @@ cat ./repo.json | ruby mkrepo.rb \
     --images ./xml/android-automotive-sys-img2-3.xml \
     --images ./xml/google_apis-sys-img2-3.xml \
     --images ./xml/google_apis_playstore-sys-img2-3.xml \
-    --addons ./xml/addon2-3.xml \
-         | sponge repo.json
-
+    --addons ./xml/addon2-3.xml <./repo.json
 popd &>/dev/null
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index b57d0c84d7bc..ba1d9ea3e81b 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -1,18 +1,47 @@
-{ stdenv, lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook
-, deployAndroidPackage, package, os, platform-tools
+{
+  stdenv,
+  lib,
+  pkgs,
+  pkgsHostHost,
+  makeWrapper,
+  autoPatchelfHook,
+  deployAndroidPackage,
+  package,
+  os,
+  arch,
+  platform-tools,
+  meta,
 }:
 
 let
-  runtime_paths = lib.makeBinPath (with pkgsHostHost; [
-    coreutils file findutils gawk gnugrep gnused jdk python3 which
-  ]) + ":${platform-tools}/platform-tools";
+  runtime_paths =
+    lib.makeBinPath (
+      with pkgsHostHost;
+      [
+        coreutils
+        file
+        findutils
+        gawk
+        gnugrep
+        gnused
+        jdk
+        python3
+        which
+      ]
+    )
+    + ":${platform-tools}/platform-tools";
 in
 deployAndroidPackage rec {
-  inherit package;
-  nativeBuildInputs = [ makeWrapper ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  inherit package os arch;
+  nativeBuildInputs = [
+    makeWrapper
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
   autoPatchelfIgnoreMissingDeps = [ "*" ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ];
+  buildInputs = lib.optionals (os == "linux") [
+    pkgs.zlib
+    pkgs.libcxx
+    (lib.getLib stdenv.cc.cc)
+  ];
 
   patchElfBnaries = ''
     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
@@ -70,8 +99,10 @@ deployAndroidPackage rec {
     done
   '';
 
-  patchInstructions = patchOsAgnostic
-    + lib.optionalString stdenv.hostPlatform.isLinux patchElfBnaries;
+  patchInstructions =
+    patchOsAgnostic + lib.optionalString stdenv.hostPlatform.isLinux patchElfBnaries;
 
   noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
+
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix
index e52013f9c323..6d89de28244c 100644
--- a/pkgs/development/mobile/androidenv/patcher.nix
+++ b/pkgs/development/mobile/androidenv/patcher.nix
@@ -3,12 +3,13 @@
   lib,
   package,
   os,
+  arch,
   autoPatchelfHook,
   stdenv,
 }:
 
 deployAndroidPackage {
-  inherit package os;
+  inherit package os arch;
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
   patchInstructions = lib.optionalString (os == "linux") ''
     autoPatchelf $packageBaseDir/bin
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 478259e812c9..f1fab2e5eb2e 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,20 +1,37 @@
-{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
+{
+  deployAndroidPackage,
+  lib,
+  package,
+  os,
+  arch,
+  autoPatchelfHook,
+  pkgs,
+  meta,
+}:
 
 deployAndroidPackage {
-  inherit package;
+  inherit package os arch;
   nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ];
-  buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ];
+  buildInputs = lib.optionals (os == "linux") [
+    pkgs.glibc
+    (lib.getLib pkgs.stdenv.cc.cc)
+    pkgs.zlib
+    pkgs.ncurses5
+  ];
 
-  patchInstructions = lib.optionalString (os == "linux") ''
-    addAutoPatchelfSearchPath $packageBaseDir/lib64
-    autoPatchelf --no-recurse $packageBaseDir/lib64
-    autoPatchelf --no-recurse $packageBaseDir
-  '' + ''
-    mkdir -p $out/bin
-    cd $out/bin
-    find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
-    do
-        ln -s $i
-    done
-  '';
+  patchInstructions =
+    lib.optionalString (os == "linux") ''
+      addAutoPatchelfSearchPath $packageBaseDir/lib64
+      autoPatchelf --no-recurse $packageBaseDir/lib64
+      autoPatchelf --no-recurse $packageBaseDir
+    ''
+    + ''
+      mkdir -p $out/bin
+      cd $out/bin
+      find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i
+      do
+          ln -s $i
+      done
+    '';
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 77295eeaa17a..26dc4252f547 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -91,7 +91,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -156,7 +156,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -233,7 +233,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -280,7 +280,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -357,7 +357,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -404,7 +404,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -483,7 +483,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -576,7 +576,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -669,7 +669,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -762,7 +762,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -855,7 +855,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -948,7 +948,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1041,7 +1041,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1134,7 +1134,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -1227,7 +1227,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1320,7 +1320,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1413,7 +1413,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1478,7 +1478,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1543,7 +1543,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1608,7 +1608,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1673,7 +1673,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1738,7 +1738,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1803,7 +1803,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1869,7 +1869,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1900,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1931,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1960,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +2010,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2036,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2072,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2101,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2130,7 +2130,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2168,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2197,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2226,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2256,7 +2256,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2285,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2314,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20131,
+      "last-available-day": 20174,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2984,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3030,7 +3030,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3078,7 +3078,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3130,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3179,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3229,7 +3229,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3275,7 +3275,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3323,7 +3323,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3375,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3431,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3470,7 +3470,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3516,7 +3516,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3564,7 +3564,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3616,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3672,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3711,7 +3711,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3757,7 +3757,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3811,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3863,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3919,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3965,7 +3965,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -4013,7 +4013,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4121,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4167,7 +4167,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4215,7 +4215,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4267,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4316,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4353,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4392,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4438,7 +4438,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4484,7 +4484,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4530,7 +4530,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4571,7 +4571,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4623,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4675,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4727,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4776,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4815,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4861,7 +4861,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4907,7 +4907,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4953,7 +4953,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4994,7 +4994,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +5046,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5098,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5199,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5243,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5282,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5328,7 +5328,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5374,7 +5374,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5420,7 +5420,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5461,7 +5461,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5513,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5565,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5617,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5673,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5712,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5758,7 +5758,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5804,7 +5804,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5850,7 +5850,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5898,7 +5898,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5950,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +6002,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +6056,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6112,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6158,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6202,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6241,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6287,7 +6287,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6333,7 +6333,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6374,7 +6374,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6426,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6478,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6530,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6584,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6655,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6701,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6752,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6796,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6840,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6891,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +7025,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7094,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7201,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7245,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7289,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7340,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7476,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7537,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7582,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7628,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7679,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7716,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7753,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7871,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7938,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7997,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +8064,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8131,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8192,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8252,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8291,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8417,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8450,8 +8450,8 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "5ef4888ce47a24a9e96e45418f9fd26f1c8e0f13",
-              "size": 1170272392,
+              "sha1": "f96b1ee677f1bd2ddcff0b93485e9c65db2e6160",
+              "size": 1170273162,
               "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r13.zip"
             }
           ],
@@ -8468,7 +8468,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8507,9 +8507,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "8dc45a7406b922116f2121f6826868c2e7087389",
-              "size": 1133056400,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r12.zip"
+              "sha1": "7eb6ddbea82b94978f7c708fe09a05d8b977f9e9",
+              "size": 1136013362,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r13.zip"
             }
           ],
           "dependencies": {
@@ -8525,13 +8525,13 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
           "revision": "29-google_apis-x86",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "13"
           },
           "type-details": {
             "abi:3": "x86",
@@ -8564,9 +8564,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "8392b93dc05c380bb0e6b2375ba318c14b263b37",
-              "size": 1313280930,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r12.zip"
+              "sha1": "50c2953ab13f312ed797a961577ee74a911d087d",
+              "size": 1314706136,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r13.zip"
             }
           ],
           "dependencies": {
@@ -8582,13 +8582,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
           "revision": "29-google_apis-x86_64",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "13"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -8622,17 +8622,10 @@
           "archives": [
             {
               "arch": "all",
-              "os": "macosx",
-              "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
-              "size": 1242979582,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip"
-            },
-            {
-              "arch": "all",
-              "os": "linux",
-              "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
-              "size": 1242979582,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip"
+              "os": "all",
+              "sha1": "4827a12df810087c899f522abe227f250a101548",
+              "size": 1167440660,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09.zip"
             }
           ],
           "dependencies": {
@@ -8648,7 +8641,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8686,10 +8679,10 @@
           "archives": [
             {
               "arch": "all",
-              "os": "windows",
-              "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970",
-              "size": 1153916727,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-windows.zip"
+              "os": "all",
+              "sha1": "f5cf2ac122f1a0d8a4a9361f786f79f48c54ccc3",
+              "size": 1161024570,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r09.zip"
             },
             {
               "arch": "all",
@@ -8712,9 +8705,9 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "28",
-                "micro:2": "9",
-                "minor:1": "1"
+                "major:0": "30",
+                "micro:2": "2",
+                "minor:1": "8"
               }
             },
             "dependency:1": {
@@ -8729,13 +8722,13 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
           "revision": "29-google_apis_playstore-x86",
           "revision-details": {
-            "major:0": "8"
+            "major:0": "9"
           },
           "type-details": {
             "abi:3": "x86",
@@ -8767,10 +8760,10 @@
           "archives": [
             {
               "arch": "all",
-              "os": "windows",
-              "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a",
-              "size": 1322004798,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-windows.zip"
+              "os": "all",
+              "sha1": "96569c901288b5c29f3699c481ac491eadf368d1",
+              "size": 1328071660,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r09.zip"
             },
             {
               "arch": "all",
@@ -8793,9 +8786,9 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "28",
-                "micro:2": "9",
-                "minor:1": "1"
+                "major:0": "30",
+                "micro:2": "2",
+                "minor:1": "8"
               }
             },
             "dependency:1": {
@@ -8810,13 +8803,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
           "revision": "29-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "8"
+            "major:0": "9"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -8871,7 +8864,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8931,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8977,7 +8970,7 @@
             }
           },
           "displayName": "Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear/arm64-v8a",
@@ -9021,7 +9014,7 @@
             }
           },
           "displayName": "Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear/x86",
@@ -9060,7 +9053,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9109,7 +9102,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9160,7 +9153,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9227,7 +9220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9294,7 +9287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9360,7 +9353,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9441,7 +9434,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9522,7 +9515,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9593,7 +9586,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9652,7 +9645,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9703,7 +9696,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9752,7 +9745,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9813,7 +9806,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9880,7 +9873,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9956,7 +9949,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10023,7 +10016,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10084,7 +10077,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10137,7 +10130,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10192,7 +10185,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10241,7 +10234,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10302,7 +10295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10369,7 +10362,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10445,7 +10438,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10526,7 +10519,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10587,7 +10580,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10640,7 +10633,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10705,7 +10698,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10764,7 +10757,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10810,7 +10803,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10854,7 +10847,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10905,7 +10898,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10954,7 +10947,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11015,7 +11008,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11082,7 +11075,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11151,7 +11144,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11218,7 +11211,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11293,7 +11286,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11342,7 +11335,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11405,7 +11398,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11465,7 +11458,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11505,7 +11498,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11542,7 +11535,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11593,7 +11586,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11642,7 +11635,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11703,7 +11696,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11771,7 +11764,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11841,7 +11834,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11910,7 +11903,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11973,7 +11966,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -12026,7 +12019,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -12095,7 +12088,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12144,7 +12137,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12185,7 +12178,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12217,7 +12210,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12263,7 +12256,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12308,7 +12301,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12355,7 +12348,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12413,7 +12406,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12473,7 +12466,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12531,7 +12524,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12591,7 +12584,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12653,7 +12646,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12695,6 +12688,74 @@
       }
     },
     "35x": {
+      "android-wear": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "85f302e4038789563b3075c744645d06762a523c",
+              "size": 1235397800,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-35-ext15_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-license",
+          "name": "system-image-35x-android-wear-arm64-v8a",
+          "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
+          "revision": "35x-android-wear-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "35x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "15",
+            "tag:3": {
+              "display:1": "Wear OS 5.1",
+              "id:0": "android-wear"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "70b5cc9e0a070bb485113fba38df782aa3e21782",
+              "size": 1230585003,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-35-ext15_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-license",
+          "name": "system-image-35x-android-wear-x86_64",
+          "path": "system-images/android-35-ext15/android-wear/x86_64",
+          "revision": "35x-android-wear-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "35x",
+            "base-extension:2": "false",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "15",
+            "tag:3": {
+              "display:1": "Wear OS 5.1",
+              "id:0": "android-wear"
+            }
+          }
+        }
+      },
       "google_apis_playstore": {
         "arm64-v8a": {
           "archives": [
@@ -12719,7 +12780,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a",
@@ -12768,7 +12829,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext14/google_apis_playstore/x86_64",
@@ -12796,16 +12857,16 @@
         }
       }
     },
-    "Baklava": {
+    "36": {
       "google_apis": {
         "arm64-v8a": {
           "archives": [
             {
               "arch": "all",
               "os": "all",
-              "sha1": "9252bbb0cced0cfb7373a3236a7295ebf0f2945c",
-              "size": 1807500394,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-Baklava_r03.zip"
+              "sha1": "82c8c75e78c73e80a663472f278e61ae3219ff7e",
+              "size": 1814357571,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36_r05.zip"
             }
           ],
           "dependencies": {
@@ -12821,13 +12882,323 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-36-google_apis-arm64-v8a",
+          "path": "system-images/android-36/google_apis/arm64-v8a",
+          "revision": "36-google_apis-arm64-v8a",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:5": "arm64-v8a",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "069c5654cb549e7ff7c817e7023d0c680a623f8c",
+              "size": 1706610245,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-license",
+          "name": "system-image-36-google_apis-x86_64",
+          "path": "system-images/android-36/google_apis/x86_64",
+          "revision": "36-google_apis-x86_64",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:5": "x86_64",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "1605ca6608e2e83f250c4375e15489ade9169c52",
+              "size": 1835226829,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-36-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
+          "revision": "36-google_apis_playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:5": "arm64-v8a",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "b24c50ec8e211cc116f448b67f49ed482c55bd55",
+              "size": 1741001393,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-license",
+          "name": "system-image-36-google_apis_playstore-x86_64",
+          "path": "system-images/android-36/google_apis_playstore/x86_64",
+          "revision": "36-google_apis_playstore-x86_64",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:5": "x86_64",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:4": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "page_size_16kb": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "da544188ab47a89f4b3cf6614523cf3cb3440129",
+              "size": 1887754420,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-36-page_size_16kb-arm64-v8a",
+          "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
+          "revision": "36-page_size_16kb-arm64-v8a",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:6": "arm64-v8a",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "tag:4": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "d1f4ccf971300511e5f8d606c6d5fabf97647b36",
+              "size": 1738939657,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
+          "last-available-day": 20174,
+          "license": "android-sdk-license",
+          "name": "system-image-36-page_size_16kb-x86_64",
+          "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
+          "revision": "36-page_size_16kb-x86_64",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:6": "x86_64",
+            "api-level:0": "36",
+            "base-extension:2": "true",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "extension-level:1": "17",
+            "tag:3": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "tag:4": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      }
+    },
+    "Baklava": {
+      "google_apis": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "arch": "all",
+              "os": "all",
+              "sha1": "012427119cb7382eaea36bde92172cccd1eb2b7c",
+              "size": 1813124028,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-Baklava_r04.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis/arm64-v8a",
           "revision": "Baklava-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -12853,9 +13224,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "1548664b809576557fb4823e0f03e7c550fec443",
-              "size": 1814866164,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-Baklava_r03.zip"
+              "sha1": "a5158e787b4357422a8ebe971e2a310930adcb70",
+              "size": 1822731345,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-Baklava_r04.zip"
             }
           ],
           "dependencies": {
@@ -12871,13 +13242,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-Baklava/google_apis/x86_64",
           "revision": "Baklava-google_apis-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -12905,9 +13276,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "029e0b3732aba5a4cb97621b84f5edea9b71775b",
-              "size": 1825799645,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Baklava_r03.zip"
+              "sha1": "a04a36068b98b2fee3dea444425c4e38e6431876",
+              "size": 1832396476,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Baklava_r04.zip"
             }
           ],
           "dependencies": {
@@ -12923,13 +13294,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a",
           "revision": "Baklava-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -12955,9 +13326,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "4fd21b8fa1b92c8f9a9f7838ffab55a1c344aa0a",
-              "size": 1848004792,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Baklava_r03.zip"
+              "sha1": "1b274676d5920772015689ce480763caf6c72cd7",
+              "size": 1856730222,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Baklava_r04.zip"
             }
           ],
           "dependencies": {
@@ -12973,13 +13344,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore/x86_64",
           "revision": "Baklava-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -13007,9 +13378,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "9ed66f7ad190fedf5b20989a3914501234fbeff2",
-              "size": 1623140308,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-Baklava_r03.zip"
+              "sha1": "fc3cf2d62ae0705ee0411d59e15fcb9d5e062f61",
+              "size": 1890722992,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-Baklava_r04.zip"
             }
           ],
           "dependencies": {
@@ -13025,13 +13396,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "Baklava-page_size_16kb-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "arm64-v8a",
@@ -13061,9 +13432,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "8242bdada27c1db6209d8b2fa68bd86d7b3ee3b9",
-              "size": 1588410201,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-Baklava_r03.zip"
+              "sha1": "10a84e0c1cbc56d6cd1cf6de17890603a88de395",
+              "size": 1862515759,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-Baklava_r04.zip"
             }
           ],
           "dependencies": {
@@ -13079,13 +13450,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
-          "last-available-day": 20131,
+          "last-available-day": 20174,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64",
           "revision": "Baklava-page_size_16kb-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "x86_64",
@@ -13899,6 +14270,19 @@
       }
     }
   },
+  "latest": {
+    "build-tools": "36.0.0",
+    "cmake": "3.31.6",
+    "cmdline-tools": "19.0",
+    "emulator": "35.5.8",
+    "ndk": "28.0.13004108",
+    "ndk-bundle": "22.1.7171670",
+    "platform-tools": "35.0.2",
+    "platforms": "36",
+    "skiaparser": "7",
+    "sources": "36",
+    "tools": "26.1.1"
+  },
   "licenses": {
     "android-googletv-license": [
       "Terms and Conditions\n\nThis is the Google TV Add-on for the Android Software Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the \"Google TV Add-on\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.\n\n1.2 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.\n\n2.2 You can accept this License Agreement by:\n\n(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or\n\n(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.\n\n2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.\n\n3. Google TV Add-on License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.\n\n3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.\n\n4. Use of the Google TV Add-on by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications for the Google TV Platform\n\n7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google TV APIs\n\n8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services\n\n8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:\n\n(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;\n\n(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or\n\n(c) not create any commercial audience measurement tool or service using the Google TV API Content\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if:\n\n(A) you have breached any provision of this License Agreement; or\n\n(B) Google is required to do so by law; or\n\n(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or\n\n(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nAugust 15, 2011"
@@ -13962,7 +14346,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14011,7 +14395,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14060,7 +14444,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14109,7 +14493,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14158,7 +14542,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14207,7 +14591,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14256,7 +14640,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14305,7 +14689,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14354,7 +14738,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -14402,7 +14786,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -14450,7 +14834,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14499,7 +14883,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14548,7 +14932,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14597,7 +14981,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14646,7 +15030,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14695,7 +15079,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -14743,7 +15127,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14792,7 +15176,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -14840,7 +15224,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -14889,7 +15273,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -14937,7 +15321,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -14985,7 +15369,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -15033,7 +15417,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -15081,7 +15465,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -15129,7 +15513,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -15177,7 +15561,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -15225,7 +15609,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -15273,7 +15657,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -15321,7 +15705,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -15369,7 +15753,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -15417,7 +15801,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -15465,7 +15849,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -15513,7 +15897,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -15561,7 +15945,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -15609,7 +15993,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -15657,7 +16041,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -15705,7 +16089,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -15753,7 +16137,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -15801,7 +16185,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -15849,7 +16233,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15899,7 +16283,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15949,7 +16333,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -15997,7 +16381,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -16045,7 +16429,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -16093,7 +16477,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -16141,7 +16525,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16191,7 +16575,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16241,7 +16625,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16291,7 +16675,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -16339,7 +16723,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -16387,7 +16771,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -16435,7 +16819,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -16483,7 +16867,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -16531,7 +16915,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -16579,7 +16963,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -16620,7 +17004,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -16661,7 +17045,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -16702,7 +17086,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -16744,7 +17128,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -16785,7 +17169,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -16826,7 +17210,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -16867,7 +17251,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -16908,7 +17292,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -16949,7 +17333,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -16991,7 +17375,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -17033,7 +17417,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -17114,7 +17498,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -17155,7 +17539,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -17197,7 +17581,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -17239,7 +17623,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -17281,7 +17665,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -17323,7 +17707,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -17339,6 +17723,47 @@
           }
         }
       },
+      "36.0.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "b0b6376977657e8ad9b969bacf4093601da2c6fb",
+            "size": 63737259,
+            "url": "https://dl.google.com/android/repository/build-tools_r36_linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "f16ccffd34de8790dede813a6c7d8e2c11a27b50",
+            "size": 58699878,
+            "url": "https://dl.google.com/android/repository/build-tools_r36_windows.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "199ae0047ee61e842f8ee0c6d3918e44fb9a1f83",
+            "size": 79121749,
+            "url": "https://dl.google.com/android/repository/build-tools_r36_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 36",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/36.0.0",
+        "revision": "36.0.0",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "36.0.0-rc1": {
         "archives": [
           {
@@ -17364,7 +17789,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -17406,7 +17831,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -17448,7 +17873,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -17464,6 +17889,48 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.0.0-rc5": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "68e91b122664fead061c7963643de494a0dbb73e",
+            "size": 61709567,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc5_linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "9d1f6fbf7ff15be61a9b122a055221b5e0a0edf7",
+            "size": 58459079,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc5_windows.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "76aab21b11691d27c7012cd2288cb31f6e02e3b9",
+            "size": 78724827,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc5_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 36-rc5",
+        "last-available-day": 20174,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/36.0.0-rc5",
+        "revision": "36.0.0-rc5",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmake": {
@@ -17499,7 +17966,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -17540,7 +18007,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -17581,7 +18048,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -17622,7 +18089,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -17663,7 +18130,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -17704,7 +18171,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -17745,7 +18212,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -17786,7 +18253,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -17827,7 +18294,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -17868,7 +18335,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -17884,6 +18351,47 @@
           }
         }
       },
+      "3.31.6": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "a54551dabd5daf8cc99f7f51769fd00ca759be0a",
+            "size": 30771638,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.6-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "78c3bf819d7bf6144783aeef06c5f9cbd3f8f5a9",
+            "size": 42861179,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.6-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "1efbef168291afc5d6ae449b1a016f8bf034b0fc",
+            "size": 20491843,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.6-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.31.6",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.31.6",
+        "revision": "3.31.6",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "6",
+          "minor:1": "31"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "3.6.4111459": {
         "archives": [
           {
@@ -17916,7 +18424,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -17959,7 +18467,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -17999,7 +18507,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -18077,7 +18585,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -18193,7 +18701,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -18271,7 +18779,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -18311,7 +18819,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -18352,7 +18860,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -18393,7 +18901,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -18433,7 +18941,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -18474,7 +18982,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -18489,6 +18997,46 @@
           }
         }
       },
+      "19.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "5fdcc763663eefb86a5b8879697aa6088b041e70",
+            "size": 164760899,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "c3e06a1959762e89167d1cbaa988605f6f7c1d24",
+            "size": 143250852,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-13114758_latest.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "54a582f3bf73e04253602f2d1c80bd5868aac115",
+            "size": 143040480,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-13114758_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/19.0",
+        "revision": "19.0",
+        "revision-details": {
+          "major:0": "19",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "19.0-rc01": {
         "archives": [
           {
@@ -18514,7 +19062,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -18555,7 +19103,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -18596,7 +19144,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -18636,7 +19184,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -18676,7 +19224,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -18716,7 +19264,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -18756,7 +19304,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -18796,7 +19344,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -18836,7 +19384,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -18876,7 +19424,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -19809,6 +20357,54 @@
           }
         }
       },
+      "35.3.12": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "c859ea9c0aa625cc4cf43ad13ba665891155c101",
+            "size": 297030576,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12990079.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "67d4cc43dfb3983ae210ab51371a3c698fe9b226",
+            "size": 392170242,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12990079.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "074fd2fb62febe34ba75c4eed75668aff7c7cc03",
+            "size": 311190387,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-12990079.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "9319f59bf621430a0f8ec25f124343fadcc4912f",
+            "size": 419761989,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12990079.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20139,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.3.12",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "12",
+          "minor:1": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "35.4.8": {
         "archives": [
           {
@@ -19841,7 +20437,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20131,
+        "last-available-day": 20139,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -19857,6 +20453,54 @@
           }
         }
       },
+      "35.4.9": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "dc8d58c3948dcfa946417afaa60ad397c7329765",
+            "size": 298118508,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13025442.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "230baf96ebcb0d27779e5bd55ffeab7cfa98294c",
+            "size": 393818294,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13025442.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "08ff527ae85394e8d9957d5ea17fffdc14abf035",
+            "size": 311961707,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13025442.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "819cf13914861226713ca61beb9cbc01165d5044",
+            "size": 421982739,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13025442.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.4.9",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "9",
+          "minor:1": "4"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "35.5.2": {
         "archives": [
           {
@@ -19904,6 +20548,150 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.5.3": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "cea757d3e73c0cf40bb6f74b2aa40831d9c3a87b",
+            "size": 303896991,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13023280.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "5f2004b9cf55db7473803069e77c5facce07a585",
+            "size": 401205692,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13023280.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "4c997b00e0814603fbab1a19821ecda469e0cbec",
+            "size": 319180896,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13023280.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "7b1bdb613b34af21fd5888c811999ba173e553a9",
+            "size": 429277282,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13023280.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20139,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.5.3",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "3",
+          "minor:1": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "35.5.8": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "30a3e80f55f09d64ffc72e7ecd4dc962e2385fad",
+            "size": 301171981,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13181580.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "ab51e1aaa71e1c95ac96b0087af0442ac80a62d6",
+            "size": 394047089,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13181580.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "cee00a0495b1cdde264e71c364f411b6f84ca3bc",
+            "size": 312156337,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13181580.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "11fb3933985bb97b49861ef42299c8a3800bc9d7",
+            "size": 423381031,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13181580.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.5.8",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "8",
+          "minor:1": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "35.6.2": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "d895e040a36a339490b44187bb57d09aa0e9e514",
+            "size": 323950884,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-13248170.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "5c46bfdbb66bad0926ea01028e7224b7c10ee1f7",
+            "size": 401371702,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13248170.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "8ef0aeaa7b1224bf66021c077885741eab64a42f",
+            "size": 319286666,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13248170.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "d9bbf3b50551e8a68df56b137c7cdb14428c8b5b",
+            "size": 429402312,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-13248170.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20174,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.6.2",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "2",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -20029,7 +20817,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -20091,7 +20879,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -20153,7 +20941,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -20215,7 +21003,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20278,7 +21066,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -20340,7 +21128,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20404,7 +21192,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -20468,7 +21256,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -20530,7 +21318,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -20578,7 +21366,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -20627,7 +21415,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -20675,7 +21463,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -20731,7 +21519,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -20787,7 +21575,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -20842,7 +21630,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -20898,7 +21686,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -20953,7 +21741,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -21008,7 +21796,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -21063,7 +21851,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -21119,7 +21907,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -21174,7 +21962,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -21229,7 +22017,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -21285,7 +22073,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -21341,7 +22129,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -21397,7 +22185,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -21446,7 +22234,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -21495,7 +22283,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -21544,7 +22332,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -21592,7 +22380,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -21640,7 +22428,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -21688,7 +22476,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -21737,7 +22525,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -21786,7 +22574,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -21835,7 +22623,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -21883,7 +22671,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -21932,7 +22720,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -21981,7 +22769,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -22030,7 +22818,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -22079,7 +22867,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -22127,7 +22915,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -22175,7 +22963,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -22223,7 +23011,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -22265,7 +23053,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -22307,7 +23095,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -22348,7 +23136,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -22389,7 +23177,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -22430,7 +23218,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -22471,7 +23259,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -22513,7 +23301,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -22555,7 +23343,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -22596,7 +23384,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -22637,7 +23425,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -22678,7 +23466,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -22720,7 +23508,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -22762,7 +23550,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -22804,7 +23592,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -22819,6 +23607,48 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "29.0.13113456-rc1": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "ec2d8801e42009edf66be853c1bab9ba216378f9",
+            "size": 773995428,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta1-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "485c42ff6a04ef0ec9612420b3226de443f46e7a",
+            "size": 1027792565,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta1-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "90347ffa01dd1833b9ff116865958976fd66c264",
+            "size": 821548547,
+            "url": "https://dl.google.com/android/repository/android-ndk-r29-beta1-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 29.0.13113456",
+        "last-available-day": 20174,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/29.0.13113456",
+        "revision": "29.0.13113456-rc1",
+        "revision-details": {
+          "major:0": "29",
+          "micro:2": "13113456",
+          "minor:1": "0",
+          "preview:3": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "ndk-bundle": {
@@ -22868,7 +23698,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -22930,7 +23760,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -22992,7 +23822,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23054,7 +23884,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23117,7 +23947,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23179,7 +24009,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23243,7 +24073,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -23307,7 +24137,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23369,7 +24199,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23417,7 +24247,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23466,7 +24296,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23514,7 +24344,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23570,7 +24400,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23626,7 +24456,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23681,7 +24511,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23737,7 +24567,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23792,7 +24622,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23847,7 +24677,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23902,7 +24732,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -23958,7 +24788,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24013,7 +24843,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24068,7 +24898,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24124,7 +24954,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24180,7 +25010,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24236,7 +25066,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24496,7 +25326,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -24525,7 +25355,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -24564,7 +25394,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -24603,7 +25433,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -24642,7 +25472,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -24681,7 +25511,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -24720,7 +25550,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -24759,7 +25589,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -24798,7 +25628,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -24837,7 +25667,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -24876,7 +25706,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -24929,7 +25759,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -24969,7 +25799,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -25008,7 +25838,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -25047,7 +25877,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -25086,7 +25916,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -25125,7 +25955,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -25164,7 +25994,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -25203,7 +26033,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -25242,7 +26072,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -25281,7 +26111,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -25320,7 +26150,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -25373,7 +26203,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25413,7 +26243,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -25452,7 +26282,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -25491,7 +26321,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -25530,7 +26360,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -25570,7 +26400,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -25605,7 +26435,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25651,7 +26481,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -25684,7 +26514,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -25722,7 +26552,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext14",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext14",
@@ -25744,6 +26574,39 @@
           }
         }
       },
+      "36": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "feed7041652a3744582bb233506013969dbadb46",
+            "size": 65749783,
+            "url": "https://dl.google.com/android/repository/platform-36_r01.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 36",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-36",
+        "revision": "36",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "36",
+          "base-extension:2": "true",
+          "element-attributes": {
+            "xsi:type": "ns11:platformDetailsType"
+          },
+          "extension-level:1": "17",
+          "layoutlib:3": {
+            "element-attributes": {
+              "api": "15"
+            }
+          }
+        }
+      },
       "4": {
         "archives": [
           {
@@ -25769,7 +26632,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25823,7 +26686,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25877,7 +26740,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -25917,7 +26780,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -25956,7 +26819,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -25995,7 +26858,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -26028,19 +26891,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "69909269fe199e2d3817c10ecc13cd338da55d3b",
-            "size": 65460575,
-            "url": "https://dl.google.com/android/repository/platform-Baklava_r04.zip"
+            "sha1": "9dcd49009a005b0bdce2384cad0d9ca0fe74f1ce",
+            "size": 65604289,
+            "url": "https://dl.google.com/android/repository/platform-Baklava_r05.zip"
           }
         ],
         "displayName": "Android SDK Platform Baklava",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava",
         "revision": "Baklava",
         "revision-details": {
-          "major:0": "4"
+          "major:0": "5"
         },
         "type-details": {
           "api-level:0": "35",
@@ -26099,7 +26962,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26253,7 +27116,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -26374,7 +27237,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -26387,6 +27250,52 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "7": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "bb1f92866924dc64e035516d36866f6d851c5f6d",
+            "size": 9075303,
+            "url": "https://dl.google.com/android/repository/skiaparser-13188227-linux-x64.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "a4a0037269a48d8eca8cdb8bc289e7b35b829b45",
+            "size": 2939258,
+            "url": "https://dl.google.com/android/repository/skiaparser-13188227-darwin-x64.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "44c55cb986abfb8d5dc2293db3a625b8d81dc1f6",
+            "size": 2601969,
+            "url": "https://dl.google.com/android/repository/skiaparser-13188227-darwin-aarch64.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "9c47bdff5f0bb8947426d766d28b35a6f3bba988",
+            "size": 2956517,
+            "url": "https://dl.google.com/android/repository/skiaparser-13188227-win-x64.zip"
+          }
+        ],
+        "displayName": "Layout Inspector image server for API 31-36",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "skiaparser",
+        "path": "skiaparser/3",
+        "revision": "7",
+        "revision-details": {
+          "major:0": "7"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "sources": {
@@ -26401,7 +27310,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -26431,7 +27340,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -26460,7 +27369,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -26489,7 +27398,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -26518,7 +27427,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -26547,7 +27456,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -26576,7 +27485,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -26605,7 +27514,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -26634,7 +27543,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -26663,7 +27572,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -26692,7 +27601,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -26721,7 +27630,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -26750,7 +27659,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -26779,7 +27688,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -26808,7 +27717,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -26837,7 +27746,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -26866,7 +27775,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -26895,7 +27804,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -26924,7 +27833,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -26953,7 +27862,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -26983,7 +27892,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -27013,7 +27922,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -27031,6 +27940,34 @@
           },
           "extension-level:2": "13"
         }
+      },
+      "36": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "all",
+            "sha1": "57b6cbc3acff91f6b1bc56f4083c9446052a9851",
+            "size": 51345538,
+            "url": "https://dl.google.com/android/repository/source-36_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 36",
+        "last-available-day": 20174,
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-36",
+        "revision": "36",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "36",
+          "base-extension:2": "true",
+          "element-attributes": {
+            "xsi:type": "ns11:sourceDetailsType"
+          },
+          "extension-level:1": "17"
+        }
       }
     },
     "tools": {
@@ -27082,7 +28019,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20131,
+        "last-available-day": 20174,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",
diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index 20386f06b324..ba745109462b 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -2,6 +2,7 @@
   callPackage,
   lib,
   stdenv,
+  meta,
 }:
 let
   examples-shell = callPackage ./examples/shell.nix { licenseAccepted = true; };
@@ -25,5 +26,14 @@ stdenv.mkDerivation {
 
   passthru.tests = all-tests;
 
-  meta.timeout = 60;
+  # This is the toplevel package, so inherit the update script
+  passthru.updateScript = {
+    command = [ ./update.sh ];
+    attrPath = "androidenv.test-suite";
+    supportedFeatures = [ "commit" ];
+  };
+
+  meta = meta // {
+    timeout = 60;
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix
index 6cd41305bebb..0ed6bc86b544 100644
--- a/pkgs/development/mobile/androidenv/tools.nix
+++ b/pkgs/development/mobile/androidenv/tools.nix
@@ -1,17 +1,48 @@
-{deployAndroidPackage, lib, stdenv, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}:
+{
+  deployAndroidPackage,
+  lib,
+  stdenv,
+  package,
+  os,
+  arch,
+  autoPatchelfHook,
+  makeWrapper,
+  pkgs,
+  pkgsi686Linux,
+  postInstall,
+  meta,
+}:
 
 deployAndroidPackage {
   name = "androidsdk-tools";
-  inherit package;
-  nativeBuildInputs = [ makeWrapper ]
-    ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
+  inherit package os arch;
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
   buildInputs = lib.optional (os == "linux") (
-      (with pkgs; [ glibc freetype fontconfig fontconfig.lib
-        stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357
-      ])
-      ++ (with pkgs.xorg; [ libX11 libXrender libXext ])
-      ++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])
-    );
+    (with pkgs; [
+      glibc
+      freetype
+      fontconfig
+      fontconfig.lib
+      stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357
+    ])
+    ++ (with pkgs.xorg; [
+      libX11
+      libXrender
+      libXext
+    ])
+    ++ lib.optionals (os == "linux" && stdenv.isx86_64) (
+      with pkgsi686Linux;
+      [
+        glibc
+        xorg.libX11
+        xorg.libXrender
+        xorg.libXext
+        fontconfig.lib
+        freetype
+        zlib
+      ]
+    )
+  );
 
   patchInstructions = ''
     ${lib.optionalString (os == "linux") ''
@@ -31,7 +62,15 @@ deployAndroidPackage {
     # Wrap monitor script
     wrapProgram $PWD/monitor \
       --prefix PATH : ${pkgs.jdk8}/bin \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ xorg.libX11 xorg.libXtst ])}
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath (
+          with pkgs;
+          [
+            xorg.libX11
+            xorg.libXtst
+          ]
+        )
+      }
 
     # Patch all script shebangs
     patchShebangs .
@@ -40,5 +79,5 @@ deployAndroidPackage {
     ${postInstall}
   '';
 
-  meta.license = lib.licenses.unfree;
+  inherit meta;
 }
diff --git a/pkgs/development/mobile/androidenv/update.sh b/pkgs/development/mobile/androidenv/update.sh
new file mode 100755
index 000000000000..f79676069f9c
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+pushd "$(dirname "$0")" &>/dev/null || exit 1
+./fetchrepo.sh && ./mkrepo.sh
+popd &>/dev/null
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index 659c43a1feec..6d49245bff5d 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -13,7 +13,6 @@ let
     inherit (pkgs)
       stdenv
       lib
-      python2
       runCommand
       writeTextFile
       writeShellScript
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 4123ca029664..b1ba5526816d 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,9 +1,9 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
+{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
 
 let
-  python = if nodejs ? python then nodejs.python else python2;
+  inherit (nodejs) python;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index 109627e26ce2..2e7cec7569dc 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -19,16 +19,16 @@
 
 buildPythonPackage rec {
   pname = "aiocoap";
-  version = "0.4.12";
+  version = "0.4.14";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "chrysn";
     repo = "aiocoap";
     tag = version;
-    hash = "sha256-yy9TsNTdk7kfLilXsjDCVAe1C3O70P09It71zU26PKo=";
+    hash = "sha256-v0OzRWHlGaBKqqcIyAlVafd/siXVwaTAZqw+Sstju3s=";
   };
 
   build-system = [ setuptools ];
@@ -59,29 +59,14 @@ buildPythonPackage rec {
     "tests/test_oscore_plugtest.py"
   ];
 
-  disabledTests =
-    [
-      # Communication is not properly mocked
-      "test_uri_parser"
-      # Doctest
-      "test_001"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # https://github.com/chrysn/aiocoap/issues/339
-      "TestServerTCP::test_big_resource"
-      "TestServerTCP::test_empty_accept"
-      "TestServerTCP::test_error_resources"
-      "TestServerTCP::test_fast_resource"
-      "TestServerTCP::test_js_accept"
-      "TestServerTCP::test_manualbig_resource"
-      "TestServerTCP::test_nonexisting_resource"
-      "TestServerTCP::test_replacing_resource"
-      "TestServerTCP::test_root_resource"
-      "TestServerTCP::test_slow_resource"
-      "TestServerTCP::test_slowbig_resource"
-      "TestServerTCP::test_spurious_resource"
-      "TestServerTCP::test_unacceptable_accept"
-    ];
+  disabledTests = [
+    # Communication is not properly mocked
+    "test_uri_parser"
+    # Doctest
+    "test_001"
+    # CLI test
+    "test_help"
+  ];
 
   pythonImportsCheck = [ "aiocoap" ];
 
@@ -89,7 +74,7 @@ buildPythonPackage rec {
     description = "Python CoAP library";
     homepage = "https://aiocoap.readthedocs.io/";
     changelog = "https://github.com/chrysn/aiocoap/blob/${version}/NEWS";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix
index 7309f774b14f..5d3527104be8 100644
--- a/pkgs/development/python-modules/aiopulse/default.nix
+++ b/pkgs/development/python-modules/aiopulse/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiopulse";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-juubQHAAQYN9mSssfF3prYByy+wxscZFxwgspJU8zYA=";
+    hash = "sha256-DM/zDFoTYgaW+o2YYv4bDAja5iwabIBfFJ7Yep4Fywc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix
index 55085347745c..c010fd7dce1d 100644
--- a/pkgs/development/python-modules/auditwheel/default.nix
+++ b/pkgs/development/python-modules/auditwheel/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "auditwheel";
-  version = "6.2.0";
+  version = "6.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-T8n3eM2B2sVoIOjN7phC3ES49DX4eDYG2r1JZNRjizA=";
+    hash = "sha256-BccKI0+hTBQKptkHYTXZVQli2VhJkRuNXQQZo63QnwA=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index aa05085d1968..9935c3e0cc99 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -6,24 +6,30 @@
   azure-common,
   azure-mgmt-core,
   isodate,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerregistry";
-  version = "10.3.0";
-  format = "setuptools";
+  version = "12.0.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-riFlGFXfsZxC2R1rOpZcbGEeI/i8S/cTiDXmUtL5GOM=";
+    pname = "azure_mgmt_containerregistry";
+    inherit version;
+    hash = "sha256-8Z+PqniB3q8rUBXA6wUKkuI4DNnRje4zzbXyfUSgbAM=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-mgmt-core
     isodate
+    typing-extensions
   ];
 
   # no tests included
@@ -36,7 +42,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Microsoft Azure Container Registry Client Library for Python";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-mgmt-containerregistry";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md";
     license = licenses.mit;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index a49d213a117f..80636d58b042 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.20";
+  version = "1.37.23";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-fkGik7zbvqmbIdanOAgi58ijGZL21n2ImJrrums1zcI=";
+    hash = "sha256-AR8G2tzV7zxifsmAi5r6Thg3sPAJ2CuCCfEqhP+7OGc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index e86b479d4cbf..cd45dc4a24d2 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.37.20";
+  version = "1.37.23";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-KVuSGMCocfk5JuAMG71pVvArOsmwWKRb27AL9ssEVAI=";
+    hash = "sha256-N5H0Y86UFIEcluKatmAryAapjLRrHVXaE/+UXeGQ5bY=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index fe11ef7dd8e5..e46e38f083cd 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.86.0";
+  version = "1.90.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-umwAG7+ykCWLqgyQzWdrYUuslyWWP1/uKlsSci50qR4=";
+    hash = "sha256-5u33FbSB86jR9KIAhR24J0wSz9kRCaOJ0ituEzULHH8=";
   };
 
   build-system = [
@@ -79,15 +79,12 @@ buildPythonPackage rec {
     wheel
   ];
 
-  pythonImportsCheck = [
-    "coiled"
-  ];
+  pythonImportsCheck = [ "coiled" ];
 
   nativeCheckInputs = [
     versionCheckHook
   ];
-
-  versionCheckProgramArg = [ "--version" ];
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Python client for coiled.io dask clusters";
diff --git a/pkgs/development/python-modules/compressed-rtf/default.nix b/pkgs/development/python-modules/compressed-rtf/default.nix
index 46ad11bfc1fc..acfdd2dae763 100644
--- a/pkgs/development/python-modules/compressed-rtf/default.nix
+++ b/pkgs/development/python-modules/compressed-rtf/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage {
   pname = "compressed-rtf";
-  version = "1.0.6-unstable-2023-10-15";
+  version = "1.0.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index 636fde33039f..c3601041d17c 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "craft-parts";
-  version = "2.6.2";
+  version = "2.7.0";
 
   pyproject = true;
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-parts";
     tag = version;
-    hash = "sha256-3NFbAxgY183RmZ+ats6M5WM07VO2amj7EdqMCLcKNvI=";
+    hash = "sha256-Diu8cHy3tRWsyI7mPsAcYREK9nUG7tzasmZYAARzpXU=";
   };
 
   patches = [ ./bash-path.patch ];
diff --git a/pkgs/development/python-modules/dlms-cosem/default.nix b/pkgs/development/python-modules/dlms-cosem/default.nix
index cfe444813ade..ed9435cc8735 100644
--- a/pkgs/development/python-modules/dlms-cosem/default.nix
+++ b/pkgs/development/python-modules/dlms-cosem/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "dlms-cosem";
-  version = "24.1.0";
+  version = "25.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,12 +25,12 @@ buildPythonPackage rec {
     owner = "pwitab";
     repo = "dlms-cosem";
     tag = version;
-    hash = "sha256-NeTaU8i18Zb39Y2JnYzr87Ozt7Rj074xusL4xaNe0q0=";
+    hash = "sha256-ZsF+GUVG9bZNZE5daROQJIZZgqpjAkB/bFyre2oGu+E=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     asn1crypto
     attrs
     cryptography
@@ -47,8 +47,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to parse DLMS/COSEM";
     homepage = "https://github.com/pwitab/dlms-cosem";
-    changelog = "https://github.com/pwitab/dlms-cosem/blob/${version}/HISTORY.md";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/pwitab/dlms-cosem/blob/${src.tag}/HISTORY.md";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix
deleted file mode 100644
index 9d9b9cc9ad02..000000000000
--- a/pkgs/development/python-modules/evernote/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  isPy27,
-  oauth2,
-}:
-
-buildPythonPackage rec {
-  pname = "evernote";
-  version = "1.25.3";
-  format = "setuptools";
-  disabled = !isPy27; # some dependencies do not work with py3
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "796847e0b7517e729041c5187fa1665c3f6fc0491cb4d71fb95a62c4f22e64eb";
-  };
-
-  propagatedBuildInputs = [ oauth2 ];
-
-  meta = with lib; {
-    description = "Evernote SDK for Python";
-    homepage = "https://dev.evernote.com";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hbunke ];
-  };
-}
diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix
index 8cd18b628502..e43a86f28702 100644
--- a/pkgs/development/python-modules/evtx/default.nix
+++ b/pkgs/development/python-modules/evtx/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "evtx";
-  version = "0.8.5";
+  version = "0.8.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,13 +20,13 @@ buildPythonPackage rec {
     owner = "omerbenamram";
     repo = "pyevtx-rs";
     tag = version;
-    hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8=";
+    hash = "sha256-rxE3Srm+5L9r6uNIeOPBnpQAbS89WCel/U7xgLc2ZDU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-Zdj0trB0wIVC9xg64wVOIrstdG7LGMOhWcRFXQJGNls=";
+    hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/extractcode/7z.nix b/pkgs/development/python-modules/extractcode/7z.nix
index bc1ae9e07ab9..a9ea8e5f94a2 100644
--- a/pkgs/development/python-modules/extractcode/7z.nix
+++ b/pkgs/development/python-modules/extractcode/7z.nix
@@ -11,10 +11,10 @@ buildPythonPackage rec {
   version = "21.5.31";
 
   src = fetchFromGitHub {
-    owner = "nexB";
+    owner = "aboutcode-org";
     repo = "scancode-plugins";
-    rev = "v${version}";
-    sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w";
+    tag = "v${version}";
+    hash = "sha256-nGgFjp1N1IM/Sm4xLJw5WiZncc369/LqNcwFJBS1EQs=";
   };
 
   sourceRoot = "${src.name}/builtins/extractcode_7z-linux";
@@ -36,14 +36,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "extractcode_7z" ];
 
-  meta = with lib; {
+  meta = {
     description = "ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
-    homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_7z-linux";
-    license = with licenses; [
+    homepage = "https://github.com/aboutcode-org/scancode-plugins/tree/main/builtins/extractcode_7z-linux";
+    license = with lib.licenses; [
       asl20
       lgpl21
     ];
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/extractcode/libarchive.nix b/pkgs/development/python-modules/extractcode/libarchive.nix
index 2168fc0f3b7a..bf4aed064879 100644
--- a/pkgs/development/python-modules/extractcode/libarchive.nix
+++ b/pkgs/development/python-modules/extractcode/libarchive.nix
@@ -18,10 +18,10 @@ buildPythonPackage rec {
   version = "21.5.31";
 
   src = fetchFromGitHub {
-    owner = "nexB";
+    owner = "aboutcode-org";
     repo = "scancode-plugins";
-    rev = "v${version}";
-    sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w";
+    tag = "v${version}";
+    hash = "sha256-nGgFjp1N1IM/Sm4xLJw5WiZncc369/LqNcwFJBS1EQs=";
   };
 
   sourceRoot = "${src.name}/builtins/extractcode_libarchive-linux";
@@ -49,14 +49,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "extractcode_libarchive" ];
 
-  meta = with lib; {
+  meta = {
     description = "ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
-    homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_libarchive-linux";
-    license = with licenses; [
+    homepage = "https://github.com/aboutcode-org/scancode-plugins/tree/main/builtins/extractcode_libarchive-linux";
+    license = with lib.licenses; [
       asl20
       bsd2
     ];
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix
deleted file mode 100644
index 1aeeabd92f29..000000000000
--- a/pkgs/development/python-modules/geeknote/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  isPy27,
-  thrift,
-  beautifulsoup4,
-  markdown2,
-  sqlalchemy,
-  html2text,
-  evernote,
-}:
-
-buildPythonPackage {
-  version = "2015-05-11";
-  format = "setuptools";
-  pname = "geeknote";
-  disabled = !isPy27;
-
-  src = fetchFromGitHub {
-    owner = "VitaliyRodnenko";
-    repo = "geeknote";
-    rev = "8489a87d044e164edb321ba9acca8d4631de3dca";
-    sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf";
-  };
-
-  /*
-    build with tests fails with "Can not create application dirictory :
-    /homeless-shelter/.geeknotebuilder".
-  */
-  doCheck = false;
-
-  propagatedBuildInputs = [
-    thrift
-    beautifulsoup4
-    markdown2
-    sqlalchemy
-    html2text
-    evernote
-  ];
-
-  meta = with lib; {
-    description = "Work with Evernote from command line";
-    homepage = "http://www.geeknote.me";
-    license = licenses.gpl1Only;
-    maintainers = with maintainers; [ hbunke ];
-  };
-}
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 5f7d42c2d116..9e068f6edc42 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.31.0";
+  version = "2.31.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_speech";
     inherit version;
-    hash = "sha256-15mMJqlF9Ykzxg4tOAPtBZPrQWusnUOBwDBZ0QJy7wM=";
+    hash = "sha256-/fDTUMBke1ZpRUAr2K7vK3r9pnq7UgbrTbTtQfkjtA8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index 078c2ee8c55d..b9208fdd8ed3 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "h3";
-  version = "4.2.1";
+  version = "4.2.2";
   pyproject = true;
 
   # pypi version does not include tests
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "uber";
     repo = "h3-py";
     tag = "v${version}";
-    hash = "sha256-YFGKF/WV0nlmtR7MacOBoor6PQwPPFqdK1C1eIciXwI=";
+    hash = "sha256-HvJT5SuE7UHhGMlaQG3YSHfGkgsdDAVVGsGRsAeNHGQ=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix
index c591c3887e28..93619ea1a540 100644
--- a/pkgs/development/python-modules/iaqualink/default.nix
+++ b/pkgs/development/python-modules/iaqualink/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "iaqualink";
-  version = "0.5.0";
+  version = "0.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "flz";
     repo = "iaqualink-py";
-    rev = "v${version}";
-    hash = "sha256-ewPP2Xq+ecZGc5kokvLEsRokGqTWlymrzkwk480tapk=";
+    tag = "v${version}";
+    hash = "sha256-2DqZJlsbDWo9fxIDg5P0CvZs8AuAh8XrhNiwIvuRm80=";
   };
 
   build-system = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for Jandy iAqualink";
     homepage = "https://github.com/flz/iaqualink-py";
-    changelog = "https://github.com/flz/iaqualink-py/releases/tag/v${version}";
+    changelog = "https://github.com/flz/iaqualink-py/releases/tag/v${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 9cfc926aca8d..8ef451cf0f69 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.13.5";
+  version = "1.13.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${version}";
-    hash = "sha256-fMFTGzw7j4VylmKaG8K9FNFnKsyQ9R6g2c//DcUztfc=";
+    hash = "sha256-80qgV35B863B16L+kdQ+6p6laZo2v5dChyczO5VXvNY=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix
index 82abd2041a05..82c343070f31 100644
--- a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix
+++ b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix
@@ -24,11 +24,14 @@ buildPythonPackage rec {
 
   dependencies = [
     cryptography
-    gssapi
     pyasn1
     pycryptodomex
   ];
 
+  optional-dependencies = {
+    kerberos = [ gssapi ];
+  };
+
   pythonImportsCheck = [ "ldap3" ];
 
   # Tests require network access
diff --git a/pkgs/development/python-modules/litemapy/default.nix b/pkgs/development/python-modules/litemapy/default.nix
index 38a234321e07..02e321182f05 100644
--- a/pkgs/development/python-modules/litemapy/default.nix
+++ b/pkgs/development/python-modules/litemapy/default.nix
@@ -2,22 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  # build-system
+  setuptools,
+  # dependencies
   nbtlib,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "litemapy";
-  version = "0.7.2b0";
-  format = "setuptools";
+  version = "0.10.0b0";
+  pyproject = true;
+  build-system = [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "SmylerMC";
     repo = "litemapy";
     rev = "v${version}";
-    hash = "sha256-VfEo/JLeU17bEkvc8oZYfq19RsHl6QvKv0sGZYQjYhE=";
+    hash = "sha256-mGRnrFfrg0VD9pXs0WOuiP6QnYyu0Jbv/bqCWtkOie0=";
   };
 
-  propagatedBuildInputs = [ nbtlib ];
+  propagatedBuildInputs = [
+    nbtlib
+    typing-extensions
+  ];
 
   pythonImportsCheck = [ "litemapy" ];
 
diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
deleted file mode 100644
index 24c4ef2b0bcd..000000000000
--- a/pkgs/development/python-modules/modestmaps/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pillow,
-  isPy27,
-}:
-
-buildPythonPackage rec {
-  pname = "modestmaps";
-  version = "1.4.7";
-  disabled = !isPy27;
-
-  src = fetchPypi {
-    pname = "ModestMaps";
-    inherit version;
-    sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457";
-  };
-
-  propagatedBuildInputs = [ pillow ];
-
-  meta = with lib; {
-    description = "Library for building interactive maps";
-    homepage = "http://modestmaps.com";
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index 439b8403190c..600f52fcd14f 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.25.0";
+  version = "1.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-CRs9Pqgv8sVhjlMPmC8UR03b4jP1Pm39Yndn2LF51jU=";
+    hash = "sha256-zCnv+1/rQzo1+Kya8y8M9hljrygT9ZhHstpm14FL9mE=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a163227a563f..b6410ced2b5b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -78,16 +78,16 @@ rec {
       "sha256-QDagskTiBtIbR8dIh5E3bdAxaezblNXWNEGGmNUcrWY=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.37.0"
-      "sha256-VS0iDnBlRPV6KBDC198tkxECMC13W1jjujsmig174BE=";
+    buildMypyBoto3Package "apigateway" "1.37.23"
+      "sha256-Ey2/SstD830TRvw6BQll2H9x8qPcvOZgm++mVv8AmlU=";
 
   mypy-boto3-apigatewaymanagementapi =
     buildMypyBoto3Package "apigatewaymanagementapi" "1.37.0"
       "sha256-Y6BQWnf8h7ec2Rt4bhuyAl1KAIe53rnhTupcNeROQ8I=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.37.0"
-      "sha256-vF9qDs4R1LCPpYjdRqSEmTB64rOTKToJjmKwHlwOkyc=";
+    buildMypyBoto3Package "apigatewayv2" "1.37.23"
+      "sha256-T4x9ayNwSPKNFIxL3OgoE1lBqv+j25LhvcymikqJmpM=";
 
   mypy-boto3-appconfig =
     buildMypyBoto3Package "appconfig" "1.37.0"
@@ -138,8 +138,8 @@ rec {
       "sha256-4eY2gziQLvX2t39e201UitkV/Cs0E2RSP4yAG6/OdbI=";
 
   mypy-boto3-arc-zonal-shift =
-    buildMypyBoto3Package "arc-zonal-shift" "1.37.0"
-      "sha256-3s+fYgf1gAy1o5V0uNrUcznLplweWm+2mTgMl4cmMWQ=";
+    buildMypyBoto3Package "arc-zonal-shift" "1.37.21"
+      "sha256-m88NXN/OxX65E92CnQoIZ9+Uq/D1idXzq3NvYQqEilM=";
 
   mypy-boto3-athena =
     buildMypyBoto3Package "athena" "1.37.0"
@@ -166,8 +166,8 @@ rec {
       "sha256-SFybjQDlMxvgIFQbv/D6wDexm+s4u26I6Lj2T94vwak=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.37.2"
-      "sha256-cEJJucCt54tLZBZKseJWFzW+baIoySP2igPcgfj7Ri0=";
+    buildMypyBoto3Package "batch" "1.37.22"
+      "sha256-D2LSlIcSgCzO55DHMI9/q7zUMmujL6N0v94qiEgPykY=";
 
   mypy-boto3-billingconductor =
     buildMypyBoto3Package "billingconductor" "1.37.0"
@@ -226,8 +226,8 @@ rec {
       "sha256-lIkRuhQHTqlXRkyf9hIIZ0oh3vgdr5GzLApLt9lXvaw=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.37.0"
-      "sha256-v8dLqGFGcUBuEfKEYJZ0FnUz7aIg3WNcL7gky2Ajuu0=";
+    buildMypyBoto3Package "cloudformation" "1.37.22"
+      "sha256-v2vtJ9GtgtEVaWStq+sNYntVWrhw1okwWhYMuT4O8lU=";
 
   mypy-boto3-cloudfront =
     buildMypyBoto3Package "cloudfront" "1.37.9"
@@ -266,8 +266,8 @@ rec {
       "sha256-nVAeLXy2hjJZDjNTjFccKClY7DS0oLv9Q9QLlngkX6M=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.37.12"
-      "sha256-nOZz1Yfl4UsuYBCbwS09QuWgW0ilQHTpzLqOR3HgO2g=";
+    buildMypyBoto3Package "codebuild" "1.37.23"
+      "sha256-dnwZL9dcrOJRb82phmusI7DMEKlM0mZ66kMwY34vBls=";
 
   mypy-boto3-codecatalyst =
     buildMypyBoto3Package "codecatalyst" "1.37.0"
@@ -402,8 +402,8 @@ rec {
       "sha256-TqYdke3fLJRHZBmHbFkQYxPJ+Vm6aQyI0XNEsR12FvM=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.37.0"
-      "sha256-sp2viLLUNRurZbDPlscmuqwo4Mgi5PA0cl68wtff4A8=";
+    buildMypyBoto3Package "directconnect" "1.37.21"
+      "sha256-G1oWu51jsk80Y2CHCg+Wj/LrU+BN1Z0urmuHjWi+kp4=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.37.0"
@@ -462,16 +462,16 @@ rec {
       "sha256-7Sz4g1+0B99ZybhrzJOS0K71thybaDPUYmF4+SN1sGc=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.37.11"
-      "sha256-lUFZE7dC5C2RZQjt515X7gn/4U2Md8GYrrCDX1E6Edk=";
+    buildMypyBoto3Package "ecs" "1.37.23"
+      "sha256-laN5lEqfTiYJmhjt0FxwrH6rS1YHjHTCCaTYNfmuV6s=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.37.0"
       "sha256-uKccWDS0zhFrs6CQ9ve6by4rYL43T6iFZ3rjNy7SiyI=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.37.20"
-      "sha256-jFap7gKOZHeBtIKRz7BfEbm2EidERQhU7qohKjnYb9Y=";
+    buildMypyBoto3Package "eks" "1.37.22"
+      "sha256-T/dhVpy1eW2kcjNe1jMMSrwyHFwttVNShhId1q2u8VE=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"
@@ -562,8 +562,8 @@ rec {
       "sha256-wPym6XJ09JuqPS5ee+5iU4jXrtCiSutNE7BiZvP9w2A=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.37.0"
-      "sha256-p32uq+oF5IVsI2eoBjmjmZO5actsyghuB5R81fuCEYA=";
+    buildMypyBoto3Package "gamelift" "1.37.22"
+      "sha256-5wycchIRl8vzVHyYzW5WoNckIIYjyUZHEv7vMmtarU4=";
 
   mypy-boto3-glacier =
     buildMypyBoto3Package "glacier" "1.37.0"
@@ -606,8 +606,8 @@ rec {
       "sha256-cLuH24dACvIWq9+UDtLaeIXe8V7o8lz5oltGD94tTrU=";
 
   mypy-boto3-iam =
-    buildMypyBoto3Package "iam" "1.37.0"
-      "sha256-FlGDGUvHmvhPlrjXh7141YIOJh2P4q8baWINYQTfxOU=";
+    buildMypyBoto3Package "iam" "1.37.22"
+      "sha256-f3FqgcCMJeapoZA+nyZGndRDJ88qLX9km5R9ymLXnsY=";
 
   mypy-boto3-identitystore =
     buildMypyBoto3Package "identitystore" "1.37.0"
@@ -862,8 +862,8 @@ rec {
       "sha256-TfeKy6dyjQJVyhmCjttwBxBQNi3iZdJQQwpY/HRvnf0=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.37.15"
-      "sha256-bs9Zvpv3AyT/zhucLMqtdhmocG4+hbHkPjyGsvviFJ8=";
+    buildMypyBoto3Package "mediaconvert" "1.37.21"
+      "sha256-Ltzv3h+NATTcKsyd1PfnUdjIhT3V0OS3woGsStyI/qA=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.37.11"
@@ -890,8 +890,8 @@ rec {
       "sha256-g/KoroOmWZgWPfC0HMgLGQrGpr9QWEirTL3S9t7iMjs=";
 
   mypy-boto3-mediatailor =
-    buildMypyBoto3Package "mediatailor" "1.37.0"
-      "sha256-IJJUCcWCds3xb01lV0ghy0Itweeg3vKEUW8Pmp/Er/I=";
+    buildMypyBoto3Package "mediatailor" "1.37.21"
+      "sha256-SssQmTozr5f/uwsbwmMZpkXKG4SWG43IkEmehVG53Lw=";
 
   mypy-boto3-medical-imaging =
     buildMypyBoto3Package "medical-imaging" "1.37.0"
@@ -902,8 +902,8 @@ rec {
       "sha256-88OSler+2SJ2zDYtLmM5NeOPafKIf5zaLV8MMLRb5es=";
 
   mypy-boto3-meteringmarketplace =
-    buildMypyBoto3Package "meteringmarketplace" "1.37.20"
-      "sha256-Bpcsx33TRawi+ZzseMkkYxVbkTo+PYahe8kj7TwcwIs=";
+    buildMypyBoto3Package "meteringmarketplace" "1.37.23"
+      "sha256-rVSofDYP53P0MuI8aS8yJAdMfWvmp6u7dCYU15Li6tQ=";
 
   mypy-boto3-mgh =
     buildMypyBoto3Package "mgh" "1.37.0"
@@ -954,8 +954,8 @@ rec {
       "sha256-Lth+Py9qwXU+mnbV21d9H7QoONrwWU1UmMCJWorypxs=";
 
   mypy-boto3-networkmanager =
-    buildMypyBoto3Package "networkmanager" "1.37.0"
-      "sha256-XQd/4cp7d5DB9g0QU8i5qvUpycPx4P3CxwTx5pijSLQ=";
+    buildMypyBoto3Package "networkmanager" "1.37.23"
+      "sha256-wJjK+WP4nS3CItgfxYXbo51y8SsZLRfe9nO5GanFiPg=";
 
   mypy-boto3-nimble =
     buildMypyBoto3Package "nimble" "1.35.0"
@@ -1002,8 +1002,8 @@ rec {
       "sha256-5t43MNckv0+Gxdmp+4dkxMTtl9ToTk0Wfq9W0jr4Qko=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.37.0"
-      "sha256-2JlRaJI+easfcwj7TqYJ1B/9mGlApbQ0sh9DYK2gE28=";
+    buildMypyBoto3Package "payment-cryptography" "1.37.23"
+      "sha256-Uy3TNwYrc0j+a08H0POVX1GTPFdc/8KpVeCnm4rb9Zk=";
 
   mypy-boto3-payment-cryptography-data =
     buildMypyBoto3Package "payment-cryptography-data" "1.37.0"
@@ -1050,8 +1050,8 @@ rec {
       "sha256-/Wr+oP8wfgSoeynyZDJ0fTS0T2oeBXR8DctO25S7qPU=";
 
   mypy-boto3-polly =
-    buildMypyBoto3Package "polly" "1.37.0"
-      "sha256-xPW1Ogeucuynd6rOGji/ihdWWrEzTXQdqcjiJeFX2bs=";
+    buildMypyBoto3Package "polly" "1.37.21"
+      "sha256-G9EVOO0mU8f/tAd/mg0/04lMkvs4+6JLHF3E+ylnyEo=";
 
   mypy-boto3-pricing =
     buildMypyBoto3Package "pricing" "1.37.4"
@@ -1074,8 +1074,8 @@ rec {
       "sha256-WqMrD+uGG7YQIQagu8L5pUOYMNHeneEQCYzkWrIZ+nA=";
 
   mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.37.0"
-      "sha256-+brjIm6GDK95Ft7bcCRKiEB34ERKqoLKwF18XlNp+fA=";
+    buildMypyBoto3Package "quicksight" "1.37.23"
+      "sha256-evmnL/VUlIk3b5tvPLL/QEGS5hJ4XoBUP85B5BNPOd8=";
 
   mypy-boto3-ram =
     buildMypyBoto3Package "ram" "1.37.0"
@@ -1086,8 +1086,8 @@ rec {
       "sha256-csr3DYjsomhq4T+97ZEQdjt0RfsXbo8kBFGrB6cUUmM=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.37.6"
-      "sha256-IoXZZE9YwtHROZYy3A/nmSfhkpCpt6GE+AyF2KTmXlg=";
+    buildMypyBoto3Package "rds" "1.37.21"
+      "sha256-j6eNB3ImSJ/vKNGzRJZGiCQl0ln5NSP3sIr9m3Yd/fg=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.37.0"
@@ -1174,8 +1174,8 @@ rec {
       "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.37.20"
-      "sha256-fncIq3N1qd+d0cvnecyn9LKd6ehjqwE8/EVnPhk/t5E=";
+    buildMypyBoto3Package "sagemaker" "1.37.23"
+      "sha256-w3zuzIXvQvxRv9unOJjBv2lnXXRA2tycfo3KCz4l9p4=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"
@@ -1318,8 +1318,8 @@ rec {
       "sha256-y4IyBLiayIZObpAK/to12GaqhDqiKnJDta+038BdNSg=";
 
   mypy-boto3-sso-oidc =
-    buildMypyBoto3Package "sso-oidc" "1.37.0"
-      "sha256-w7E28nqg4N8dz7MpAyRwMOJb+Q1bFb4JkmVQ6Cw629U=";
+    buildMypyBoto3Package "sso-oidc" "1.37.22"
+      "sha256-ahiaClNbudP2banQ8+HK8BYkQARVo5dW9W9W7/LmkpY=";
 
   mypy-boto3-stepfunctions =
     buildMypyBoto3Package "stepfunctions" "1.37.0"
@@ -1398,8 +1398,8 @@ rec {
       "sha256-nBigZ8YNNcy6TrQQ+dThN62xZ5IOq92EHbC3/tZbbuE=";
 
   mypy-boto3-wafv2 =
-    buildMypyBoto3Package "wafv2" "1.37.14"
-      "sha256-wfndS06dDJCEqVLceB+WMTIh1laTi9eVfTzx23K47nk=";
+    buildMypyBoto3Package "wafv2" "1.37.21"
+      "sha256-EiksZIqxgX/H/YF7Yo0B2YIQzgIYqcFhol81jDL9gKk=";
 
   mypy-boto3-wellarchitected =
     buildMypyBoto3Package "wellarchitected" "1.37.0"
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index a41b34aa4b5b..80d0a894a9c8 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -41,13 +41,13 @@
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.9.2";
+  version = "1.10.0";
   disabled = pythonOlder "3.7";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pQO9QbZY8ITRBCUv1yjvdfGhmYAm/quYsWOZiWVOA0M=";
+    hash = "sha256-GeXWzvpwmXGY94vGZe9NPTy1MyW1uYpy5Rrvra9rPg4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index f7698d0cb53b..5619fc76cbc9 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "ntc-templates";
-  version = "7.7.0";
+  version = "7.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "networktocode";
     repo = "ntc-templates";
     tag = "v${version}";
-    hash = "sha256-B5gKCvouqxzH5BoMpV9I6aLuUYbfdjABqjtzkXWs0Uw=";
+    hash = "sha256-v9+d9nZiYneG3vULtQZsa/gD6FCyBrrbGxUJsv1sMYA=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix
new file mode 100644
index 000000000000..6bbcf2bc53c5
--- /dev/null
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation-sqlalchemy/default.nix
@@ -0,0 +1,52 @@
+{
+  buildPythonPackage,
+  pythonOlder,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  opentelemetry-api,
+  opentelemetry-instrumentation,
+  opentelemetry-semantic-conventions,
+  packaging,
+  sqlalchemy,
+  wrapt,
+
+  # tests
+  opentelemetry-test-utils,
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  inherit (opentelemetry-instrumentation) version src;
+  pname = "opentelemetry-instrumentation-sqlalchemy";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-sqlalchemy";
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    opentelemetry-api
+    opentelemetry-instrumentation
+    opentelemetry-semantic-conventions
+    packaging
+    sqlalchemy
+    wrapt
+  ];
+
+  nativeCheckInputs = [
+    opentelemetry-test-utils
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "opentelemetry.instrumentation.sqlalchemy" ];
+
+  meta = opentelemetry-instrumentation.meta // {
+    homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-sqlalchemy";
+    description = "SQLAlchemy instrumentation for OpenTelemetry";
+  };
+}
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 6f67e8b335d5..21d14e710718 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.28.2";
+  version = "1.28.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     tag = "v${version}";
-    hash = "sha256-zbEpTK1kH2bweQqWHPNtWekwZTdNqqLYnx0VDKyFiUA=";
+    hash = "sha256-uf1uCXuCgp9Ly7sYdcGiwyjI7QbEqLvQEtJt2DE/06k=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 52344a8c8e87..189720c5907b 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "25.3.2";
+  version = "25.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-gxmNOrvV007nSwP2TNDCnB0CPspeWMt9ohnT4u8EzPw=";
+    hash = "sha256-jupd56zLx7tdsiklX0y8WNH0UkPeFtD/TLtzuoRefuI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix
index 69aa219c68ae..1ae18ae1e5cd 100644
--- a/pkgs/development/python-modules/powerapi/default.nix
+++ b/pkgs/development/python-modules/powerapi/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "powerapi";
-  version = "2.9.1";
+  version = "2.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "powerapi-ng";
     repo = "powerapi";
     tag = "v${version}";
-    hash = "sha256-iFWCrO9frMK68kefmKQrXra1g5efDCj2ZOlVwxDNvXw=";
+    hash = "sha256-rn1qe0RwYuUR23CgzOOeiwe1wuFihnhQ9a6ALgSP/cQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index 57029dae7e3b..7c75393cbd45 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -9,7 +9,6 @@
   boringssl,
   libiconv,
   SystemConfiguration,
-  patchelf,
   gcc-unwrapped,
   python,
   fetchpatch,
@@ -87,7 +86,7 @@ buildPythonPackage rec {
 
   # TODO: Can we improve this?
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    ${lib.getExe patchelf} --add-rpath ${lib.getLib gcc-unwrapped.lib} --add-needed libstdc++.so.6 $out/${python.sitePackages}/primp/primp.abi3.so
+    patchelf --add-rpath ${lib.getLib gcc-unwrapped.lib} --add-needed libstdc++.so.6 $out/${python.sitePackages}/primp/primp.abi3.so
   '';
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -109,7 +108,7 @@ buildPythonPackage rec {
 
   meta = {
     changelog = "https://github.com/deedy5/primp/releases/tag/${version}";
-    description = "PRIMP (Python Requests IMPersonate). The fastest python HTTP client that can impersonate web browsers.";
+    description = "Python Requests IMPersonate, the fastest Python HTTP client that can impersonate web browsers";
     homepage = "https://github.com/deedy5/primp";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index c863b5010542..677b89f0fe07 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250319";
+  version = "1.0.2.20250329";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OBBkjnDzMGKiwLb1Mnkcw/0IwaeJyoSSQh3YVuF1aRo=";
+    hash = "sha256-HinLmgjEHCmoW3tNTQF8vKWSh7IExxaGbdcztQsPuSk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix
deleted file mode 100644
index c6fa67c0912e..000000000000
--- a/pkgs/development/python-modules/pychart/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  isPy27,
-}:
-
-buildPythonPackage rec {
-  pname = "pychart";
-  version = "1.39";
-  format = "setuptools";
-
-  disabled = !isPy27;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
-  };
-
-  meta = with lib; {
-    description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
-    homepage = "https://pypi.python.org/pypi/PyChart";
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix
index cedae6dd3efb..d47cc165ebd7 100644
--- a/pkgs/development/python-modules/pygnmi/default.nix
+++ b/pkgs/development/python-modules/pygnmi/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pygnmi";
-  version = "0.8.14";
+  version = "0.8.15";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "akarneliuk";
     repo = "pygnmi";
     tag = "v${version}";
-    sha256 = "sha256-ncp/OwELy/QOvGhLUZW2qTQZsckWI4CGrlEAZ20RtQI=";
+    sha256 = "sha256-2QPUyPGTtXlO6A05mmb/jofRidXfKq0xvH7lv1f9OQk=";
   };
 
   propagatedBuildInputs = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     description = "Pure Python gNMI client to manage network functions and collect telemetry";
     mainProgram = "pygnmicli";
     homepage = "https://github.com/akarneliuk/pygnmi";
-    changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}";
+    changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 6e9f0cf7299c..70ebe0dff7ad 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.16.4";
+  version = "1.16.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${version}";
-    hash = "sha256-J3AjTMLgKDUeCzRLRkUk3bvqBCHqBl+p3EyLmlojYhU=";
+    hash = "sha256-uqpR3rGXIsdrVD2vjbSXHjFbFmyLSw/3MFcvX3HhQT8=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix
index 7ed7461a03d1..933302eb81e3 100644
--- a/pkgs/development/python-modules/pypdfium2/default.nix
+++ b/pkgs/development/python-modules/pypdfium2/default.nix
@@ -17,8 +17,8 @@ let
   headers = fetchgit {
     url = "https://pdfium.googlesource.com/pdfium";
     # The latest revision on the chromium/${pdfiumVersion} branch
-    rev = "9afffebfa895ea6cdcc05516908c50bd7fe72797";
-    hash = "sha256-n7Xio1hEZqZX2FFKWqjVXEcOWPpkcVfBKXGPxDUL4cs=";
+    rev = "9232d7c94a0007377a8034222f47683fe391d474";
+    hash = "sha256-dI3jTyVYc0EmMLHTiVjGSf3C2noS9Ru5WijEJFtiSFk=";
     sparseCheckout = [
       "public"
     ];
diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix
deleted file mode 100644
index 2dfd18079c72..000000000000
--- a/pkgs/development/python-modules/python-wifi/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  isPy27,
-}:
-
-buildPythonPackage rec {
-  pname = "python-wifi";
-  version = "0.6.1";
-  format = "setuptools";
-  disabled = !isPy27;
-
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.bz2";
-    sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv";
-  };
-
-  meta = with lib; {
-    description = "Read & write wireless card capabilities using the Linux Wireless Extensions";
-    homepage = "http://pythonwifi.tuxfamily.org/";
-    # From the README: "pythonwifi is licensed under LGPLv2+, however, the
-    # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+."
-    license = with licenses; [
-      lgpl2Plus
-      gpl2Plus
-    ];
-  };
-}
diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix
index b3f28bfa5af7..bf136eec51c1 100644
--- a/pkgs/development/python-modules/pywerview/default.nix
+++ b/pkgs/development/python-modules/pywerview/default.nix
@@ -3,7 +3,6 @@
   beautifulsoup4,
   buildPythonPackage,
   fetchFromGitHub,
-  gssapi,
   impacket,
   ldap3-bleeding-edge,
   lxml,
@@ -15,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pywerview";
-  version = "0.7.2";
+  version = "0.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,14 +23,13 @@ buildPythonPackage rec {
     owner = "the-useless-one";
     repo = "pywerview";
     tag = "v${version}";
-    hash = "sha256-1JDohgEowOlbLsqzX5aAmMSfS6LffXwz1t3361IYq60=";
+    hash = "sha256-ZIv0IW7oruMBwinXvH/n1YEtbBFyLb8h/Qlh4JxvV4k=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     beautifulsoup4
-    gssapi
     impacket
     ldap3-bleeding-edge
     lxml
@@ -39,6 +37,10 @@ buildPythonPackage rec {
     pyasn1
   ];
 
+  optional-dependencies = {
+    kerberos = [ ldap3-bleeding-edge ] ++ ldap3-bleeding-edge.optional-dependencies.kerberos;
+  };
+
   # Module has no tests
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 76841e31d2e3..213d33de2314 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pywizlight";
-  version = "0.6.0";
+  version = "0.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sbidy";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4z1PmVoRs7mql/PhSG9Ek6NRkGXIXAYxaV8nNDoJjeY=";
+    hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc=";
   };
 
   propagatedBuildInputs = [ click ];
diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index e7381b9dd7e0..5a622073b990 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "setupmeta";
-  version = "3.7.2";
+  version = "3.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "codrsquad";
     repo = "setupmeta";
     tag = "v${version}";
-    hash = "sha256-qtnewUmTApPYq7/X82GsduW0VcioW4huRAyDMHUD74Q=";
+    hash = "sha256-2SKiIkwfmXVOQBKBNUmw4SjiVpyLjIMpSHNA9IQxqwY=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index 4a15f13f0ab3..42cf1421611d 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "streamlit";
-  version = "1.42.2";
+  version = "1.43.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YgJtvctIJ5CTP2WLCW191Y+nDaicHwb7w2WLkdzU2rI=";
+    hash = "sha256-86+ir2N9ABVMakxWDS/eJW19yMwfMqU88gVwwJZ4Qbw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix
index 05a541623d7c..e4a8d0d7d84b 100644
--- a/pkgs/development/python-modules/superqt/default.nix
+++ b/pkgs/development/python-modules/superqt/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "superqt";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "pyapp-kit";
     repo = "superqt";
     tag = "v${version}";
-    hash = "sha256-rKm4MUheQOJyaBggiZQ3U9J2kzOXrUcWpJnfPr4HzyU=";
+    hash = "sha256-G+z1q1hSvF7Of197bycACRqxPc+fjxU93PDxMcMWCME=";
   };
 
   build-system = [
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Missing widgets and components for Qt-python (napari/superqt)";
     homepage = "https://github.com/napari/superqt";
-    changelog = "https://github.com/pyapp-kit/superqt/releases/tag/v${version}";
+    changelog = "https://github.com/pyapp-kit/superqt/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SomeoneSerge ];
   };
diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
deleted file mode 100644
index 23fe0e26ea7c..000000000000
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  modestmaps,
-  pillow,
-  pycairo,
-  python-mapnik,
-  simplejson,
-  werkzeug,
-  isPy27,
-}:
-
-buildPythonPackage rec {
-  pname = "tilestache";
-  version = "1.51.14";
-  format = "setuptools";
-  disabled = !isPy27;
-
-  src = fetchPypi {
-    pname = "TileStache";
-    inherit version;
-    sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk";
-  };
-
-  propagatedBuildInputs = [
-    modestmaps
-    pillow
-    pycairo
-    python-mapnik
-    simplejson
-    werkzeug
-  ];
-
-  meta = with lib; {
-    description = "Tile server for rendered geographic data";
-    homepage = "http://tilestache.org";
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index f994251f63d3..c1f45a688f4b 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -58,14 +58,14 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.50.1";
+  version = "4.50.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${version}";
-    hash = "sha256-PIJB4iW493I3932Yq3tyGom82cMY1uduc53bs1xCPgU=";
+    hash = "sha256-Qou5q7FZJJXO87lgMC5Qttfi5KJWCwuzG5icCEfgs0M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix
new file mode 100644
index 000000000000..c1307c09d94c
--- /dev/null
+++ b/pkgs/development/python-modules/ttkbootstrap/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pillow,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ttkbootstrap";
+  version = "1.10.1";
+
+  src = fetchFromGitHub {
+    owner = "israel-dryer";
+    repo = pname;
+    tag = "v${version}";
+    hash = "sha256-aUqr30Tgz3ZLjLbNIt9yi6bqhXj+31heZoOLOZHYUiU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pillow
+  ];
+
+  # As far as I can tell, all tests require a display and are not normal-ish pytests
+  # but appear to just be python scripts that run demos of components?
+  doCheck = false;
+
+  meta = {
+    description = "Supercharged theme extension for tkinter inspired by Bootstrap";
+    homepage = "https://github.com/israel-dryer/ttkbootstrap";
+    maintainers = with lib.maintainers; [ e1mo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index cb1440b51602..31898840acef 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "vt-py";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "vt-py";
     tag = version;
-    hash = "sha256-r6pEtq/GQzVY+gRzY2KZfSQEyp4ZoFRLBd8tlXp/aM8=";
+    hash = "sha256-5go6O5V8mY1Ph3peF6ISJ63/cnhNtDIlgeLztp2zpkY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/web/nodejs/openssl-3.4-v18.patch b/pkgs/development/web/nodejs/openssl-3.4-v18.patch
deleted file mode 100644
index a674a27e64c4..000000000000
--- a/pkgs/development/web/nodejs/openssl-3.4-v18.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
-index 2b49161df8..8071c6dd18 100644
---- a/test/parallel/test-tls-psk-circuit.js
-+++ b/test/parallel/test-tls-psk-circuit.js
-@@ -66,7 +66,8 @@ const expectedHandshakeErr = common.hasOpenSSL32 ?
-   'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE';
- test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr);
- // Recognized user but incorrect secret should fail handshake
--const expectedIllegalParameterErr = common.hasOpenSSL32 ?
--  'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
-+const expectedIllegalParameterErr = common.hasOpenSSL(3, 4) ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' :
-+  common.hasOpenSSL(3, 2) ?
-+    'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER';
- test({ psk: USERS.UserA, identity: 'UserB' }, {}, expectedIllegalParameterErr);
- test({ psk: USERS.UserB, identity: 'UserB' });
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 972ba8c5962d..d038bc0ea375 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -21,8 +21,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.20.7";
-  sha256 = "9a89659fad80c1b6da33d29f43f5865483ccb1952ddad434ee22f8193607277f";
+  version = "18.20.8";
+  sha256 = "36a7bf1a76d62ce4badd881ee5974a323c70e1d8d19165732684e145632460d9";
   patches = [
     ./configure-emulator-node18.patch
     ./configure-armv6-vfpv2.patch
@@ -77,10 +77,5 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
       hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
     })
-
-    # Fix tests on OpenSSL 3.4
-    # Manual backport of https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92
-    # FIXME: remove after a minor point release
-    ./openssl-3.4-v18.patch
   ] ++ gypPatches;
 }
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index b4bd9d9d41d2..1d201f032168 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit (pkgs) stdenv lib runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index d73a2578522a..a3115da5be01 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0bw3xip9qg4zr42vx28iai954g5a1wprrrkr81zn7x7vv3ayjvya"
     },
     "6.1": {
-        "version": "6.1.131",
-        "hash": "sha256:05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4"
+        "version": "6.1.132",
+        "hash": "sha256:1l5vrc8an6h0fcnfmqb6pmal686imxbllcvlkqah19fg7wnv3dyx"
     },
     "5.15": {
         "version": "5.15.179",
@@ -20,16 +20,16 @@
         "hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk"
     },
     "6.6": {
-        "version": "6.6.84",
-        "hash": "sha256:19vvq558vs2ivj4l6kmyha30a94fh42wmijsghsdnq8salhhglkz"
+        "version": "6.6.85",
+        "hash": "sha256:0abmgc5rg7hx18ykwsl6xl72gzaf3wbn5bkvh4kcsa1lrbscrfjy"
     },
     "6.12": {
-        "version": "6.12.20",
-        "hash": "sha256:1ivakcj0gi191687zagl1qfsip0567p1pk3yy1s2xf0agfq8j3i3"
+        "version": "6.12.21",
+        "hash": "sha256:1iyn8qif6xfz04z698ib2dvmam54pyxzsign8sbdj9505sdf66lx"
     },
     "6.13": {
-        "version": "6.13.8",
-        "hash": "sha256:1fqsfnam0ca2lyqgi9vh7x6xa24yjk6ym6z85bn6nrrxsxczm6i5"
+        "version": "6.13.9",
+        "hash": "sha256:1ci78x5dfjm3nlv4m2j02wl7ax82l47xwnr4k6j9n4dn53qa7rsk"
     },
     "6.14": {
         "version": "6.14",
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 105eb5ac43e1..eae78b62785d 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libsemanage";
-  version = "3.8";
+  version = "3.8.1";
   inherit (libsepol) se_url;
 
   src = fetchurl {
     url = "${se_url}/${version}/libsemanage-${version}.tar.gz";
-    sha256 = "sha256-qslZiKVyzIl6GsG+d9NgvhFx/AstfGYZWnRWAbryW+8=";
+    sha256 = "sha256-ezkSeyGcxwv9k1pK9rDyuoPUs1yRbyU8fpQsI6tJDwc=";
   };
 
   outputs = [
diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix
index 0b65c8e45d5d..88b9a7b5d5db 100644
--- a/pkgs/servers/http/couchdb/3.nix
+++ b/pkgs/servers/http/couchdb/3.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "couchdb";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
-    hash = "sha256-0n/yoTNWAAKWqYq4hMrz0XWSfPIXJ5Y/+Q+rOnR1RM8=";
+    hash = "sha256-A1dRG2/tcOPmT051ql18wgAMsPJk7zAXArGBZCf3LyA=";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index a5c2bb76037c..2f8e7ba21470 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,5 +1,6 @@
 { lib
 , config
+, nixosTests
 , fetchFromGitHub
 , fetchFromGitLab
 , fetchhg
@@ -509,8 +510,8 @@ let self = {
     src = fetchFromGitHub {
       owner = "nginx";
       repo = "njs";
-      rev = "0.8.7";
-      hash = "sha256-VEXzP+cN5hnDeniccwY7GIi4x460rnWO/o7ja3DyRCc=";
+      rev = "0.8.9";
+      hash = "sha256-TalS9EJP+vB1o3BKaTvXXnudjKhNOcob3kDAyeKej3c=";
     };
 
     # njs module sources have to be writable during nginx build, so we copy them
@@ -520,17 +521,19 @@ let self = {
       mkdir -p "$(dirname "$NJS_SOURCE_DIR")"
       cp --recursive "${src}" "$NJS_SOURCE_DIR"
       chmod -R u+rwX,go+rX "$NJS_SOURCE_DIR"
-      export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"}"
+      export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"} --with-ld-opt='-lz'"
       unset NJS_SOURCE_DIR
     '';
 
-    inputs = [ which ];
+    inputs = [ which zlib ];
+
+    passthru.tests = nixosTests.nginx-njs;
 
     meta = with lib; {
       description = "Subset of the JavaScript language that allows extending nginx functionality";
       homepage = "https://nginx.org/en/docs/njs/";
       license = with licenses; [ bsd2 ];
-      maintainers = [ ];
+      maintainers = with maintainers; [ jvanbruegge ];
     };
   };
 
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 8a948d00c94c..d36faa6e523e 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   makeWrapper,
-  php,
+  php83,
   nixosTests,
 }:
 
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
     cp -ra application bin etc library modules public $out
     cp -ra doc $out/share
 
-    wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}"
+    wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php83 ]}"
   '';
 
   passthru.tests = { inherit (nixosTests) icingaweb2; };
diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
index 58f8d21f5824..60dea11316c7 100644
--- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pihole-exporter";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "eko";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Sum27hjs0Jvi1UWGeQcR8z9zmZ/I40uBFpKeHgHfFrA=";
+    sha256 = "sha256-7gomafTMK8rk+QFw3Vm8KUgNFqiUDILeTwNFa7vdgAw=";
   };
 
-  vendorHash = "sha256-7f/upTF3/w40wWGdcw0h3kOPlo8ZeyRna6FapnF2X0s=";
+  vendorHash = "sha256-GB/wVB97aV+CV9Xtv0EofQQR+qOmtwrBFBogU+2S+Po=";
 
   meta = with lib; {
     description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker";
diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix
index 02b6fb71734b..ae6e5618167d 100644
--- a/pkgs/servers/monitoring/zabbix/agent.nix
+++ b/pkgs/servers/monitoring/zabbix/agent.nix
@@ -48,6 +48,7 @@ import ./versions.nix (
       license =
         if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [
+        bstanderline
         mmahut
         psyanticy
       ];
diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix
index 0d9fda84b234..b1bf7cd6f22f 100644
--- a/pkgs/servers/monitoring/zabbix/agent2.nix
+++ b/pkgs/servers/monitoring/zabbix/agent2.nix
@@ -83,7 +83,10 @@ import ./versions.nix (
       homepage = "https://www.zabbix.com/";
       license =
         if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ aanderse ];
+      maintainers = with lib.maintainers; [
+        aanderse
+        bstanderline
+      ];
       platforms = lib.platforms.unix;
     };
   }
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 7b60782669d5..93e6244808d8 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -126,7 +126,10 @@ import ./versions.nix (
       homepage = "https://www.zabbix.com/";
       license =
         if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ mmahut ];
+      maintainers = with lib.maintainers; [
+        bstanderline
+        mmahut
+      ];
       platforms = lib.platforms.linux;
     };
   }
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index c68e1bb44a0e..39065ed6756c 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -126,6 +126,7 @@ import ./versions.nix (
       license =
         if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [
+        bstanderline
         mmahut
         psyanticy
       ];
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 36c8ff67ad31..46b1bc0323f4 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
 generic: {
   v70 = generic {
-    version = "7.0.10";
-    hash = "sha256-7tY+06QNva7EgTnBVu1SbbYLUIXbSlzJWpG08ISyGUg=";
+    version = "7.0.11";
+    hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";
     vendorHash = null;
   };
   v64 = generic {
diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix
index a77cfe3b7dd6..7cbefe782637 100644
--- a/pkgs/servers/monitoring/zabbix/web.nix
+++ b/pkgs/servers/monitoring/zabbix/web.nix
@@ -33,7 +33,10 @@ import ./versions.nix (
       homepage = "https://www.zabbix.com/";
       license =
         if (lib.versions.major version >= "7") then lib.licenses.agpl3Only else lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ mmahut ];
+      maintainers = with lib.maintainers; [
+        bstanderline
+        mmahut
+      ];
       platforms = lib.platforms.linux;
     };
   }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 808b04d6687e..158d0cc142e4 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -2,13 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   meson,
   ninja,
   pkg-config,
   glib,
   systemd,
-  boost,
   fmt,
   buildPackages,
   # Darwin inputs
@@ -202,30 +200,18 @@ let
     in
     stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.23.17";
+      version = "0.24.2";
 
       src = fetchFromGitHub {
         owner = "MusicPlayerDaemon";
         repo = "MPD";
         rev = "v${version}";
-        sha256 = "sha256-1+eVLvwMp6mR38y39wV73rhPA998ip7clyyKcJ008z0=";
+        sha256 = "sha256-6wEFgiMsEoWvmfH609d+UZY7jzqDoNmXalpHBipqTN0=";
       };
 
-      patches = [
-        # Revert of https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43
-        # We use a yajl fork that fixed this issue in the pkg-config manifest
-        (fetchpatch2 {
-          name = "revert-yajl-include-fix.patch";
-          url = "https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43.diff";
-          hash = "sha256-p/sYvWpr0GTw8gjt+W9FQysadOK/QOUp81ykTI50UYg=";
-          revert = true;
-        })
-      ];
-
       buildInputs =
         [
           glib
-          boost
           fmt
           # According to the configurePhase of meson, gtest is considered a
           # runtime dependency. Quoting:
@@ -248,13 +234,25 @@ let
       depsBuildBuild = [ buildPackages.stdenv.cc ];
 
       postPatch =
-        lib.optionalString
-          (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0")
-          ''
-            substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
-              --replace kAudioObjectPropertyElement{Main,Master} \
-              --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
-          '';
+        ''
+          # Basically a revert of https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43
+          # We use a yajl fork that fixed this issue in the pkg-config manifest
+          substituteInPlace \
+            src/lib/yajl/Callbacks.hxx \
+            src/lib/yajl/Handle.hxx \
+            --replace-fail "<yajl_parse.h>" "<yajl/yajl_parse.h>"
+          substituteInPlace \
+            src/lib/yajl/Gen.hxx \
+            --replace-fail "<yajl_gen.h>" "<yajl/yajl_gen.h>"
+        ''
+        +
+          lib.optionalString
+            (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0")
+            ''
+              substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
+                --replace kAudioObjectPropertyElement{Main,Master} \
+                --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
+            '';
 
       # Otherwise, the meson log says:
       #
diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix
index 12460bea17a1..e7922d509acb 100644
--- a/pkgs/servers/mx-puppet-discord/node-composition.nix
+++ b/pkgs/servers/mx-puppet-discord/node-composition.nix
@@ -13,7 +13,6 @@ let
     inherit (pkgs)
       stdenv
       lib
-      python2
       runCommand
       writeTextFile
       writeShellScript
diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix
index d822ddc7f315..47a71b9206ad 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/pkgs/servers/sql/mssql/jdbc/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
-  version = "12.8.1";
+  version = "12.10.0";
 
   src = fetchurl {
     url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
-    sha256 = "sha256-RPIXsdZ9IkQgAu4tHEq46GNYYGp4e5XutTAfI1SCoqs=";
+    sha256 = "sha256-riYa0wDnfocbyqCSrMhm9efMvp3JtoQTNk3EOCy02AQ=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 4c0a7afb0986..976147d8ab33 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -101,7 +101,7 @@ in
   };
   # EOL 2025-09-15
   varnish76 = common {
-    version = "7.6.1";
-    hash = "sha256-Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo=";
+    version = "7.6.2";
+    hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
   };
 }
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix
index 1042cdba2cb6..0d1f60098bb6 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix
@@ -13,7 +13,6 @@ let
     inherit (pkgs)
       stdenv
       lib
-      python2
       runCommand
       writeTextFile
       writeShellScript
diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix
index 07321936cc77..d74d17f335e5 100644
--- a/pkgs/tools/misc/opentelemetry-collector/builder.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix
@@ -7,17 +7,17 @@ buildGoModule rec {
   pname = "ocb";
   # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
   # whenever that version changes.
-  version = "0.121.0";
+  version = "0.122.1";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "cmd/builder/v${version}";
-    hash = "sha256-rsKkq70vAes99h9HbAiWJhlIC8rbeNHYdlBNO34fO34=";
+    hash = "sha256-nkle8jY8y/+/4H7pFvVTqX+iFxjvVKsYqm6Rx6nvdPQ=";
   };
 
   sourceRoot = "${src.name}/cmd/builder";
-  vendorHash = "sha256-vyCp/XR92RNNkoPh5tTDsdWcI2DDiLKy8Kj09ZmFCY4=";
+  vendorHash = "sha256-1wgS9AIoFHlSUoELEQVvx+bCnTApEvwKRhTKGrcUGM8=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index 0509becadd54..e028e085d02d 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.169.0";
+  version = "2.170.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-SPX4cdzz72Vd0d4fukxgZYQvESiXBzTKGEkDI5+tj04=";
+    hash = "sha256-dm6JBBHFX61acQ4tnkklZqAM4hiOqtvea0oy7/bSovQ=";
   };
 
-  vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";
+  vendorHash = "sha256-D5wVbgxs5Hq+vmHNi/6t7rZVKez1DqAiTZCP5uJKRtA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix
index 05d8f84ddebb..1814e4887f8c 100644
--- a/pkgs/tools/security/onlykey/onlykey.nix
+++ b/pkgs/tools/security/onlykey/onlykey.nix
@@ -13,7 +13,6 @@ let
     inherit (pkgs)
       stdenv
       lib
-      python2
       runCommand
       writeTextFile
       writeShellScript
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 04dd656e1f08..76aec1462571 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -50,11 +50,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.8.14";
+  version = "0.4.8.16";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "sha256-UEfh3tEtmqxOuFj3Y0pidxTdWM6ZBT1RdpGkswSmbRA=";
+    sha256 = "sha256-ZUDdN3oSD7jn0nUwqjt/9yoPpbT2cP4dZMmHwc/TkMs=";
   };
 
   outputs = [
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 38c5a3ac1d11..b82459d22d84 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.88.18";
+  version = "3.88.20";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-0STZXG7abx5viXhU2Zks1uiabNtL1ckoSH7foSn6WNw=";
+    hash = "sha256-JLBHg1hCTOOBRTJbjXJitILD/HSmH1WDuzm0t3/OJaA=";
   };
 
-  vendorHash = "sha256-mxmPvuOznYN3sjuCzuircQNtot9ntApS9ygKywLIVv4=";
+  vendorHash = "sha256-vJl2gIS14NA9nV9j+81xKv3NnsDce4V7XoeipOZV+wI=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 98b0a17bea2c..7a43235e1309 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -471,6 +471,7 @@ mapAliases {
   fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17
   fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
   fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
+  fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19
   inherit (luaPackages) fennel; # Added 2022-09-24
   ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
@@ -1577,6 +1578,7 @@ mapAliases {
   libtransmission = lib.warnOnInstantiate (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10
   tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
   tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
+  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
   transfig = fig2dev; # Added 2022-02-15
   transifex-client = transifex-cli; # Added 2023-12-29
   trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38c96c5f687..8e6deed22a68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10030,7 +10030,7 @@ with pkgs;
     });
 
   libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget;
+    inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget;
   })) // { __recurseIntoDerivationForReleaseJobs = true; };
 
   # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
@@ -12910,8 +12910,6 @@ with pkgs;
   evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
   evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
 
-  fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
-
   fetchmail = callPackage ../applications/misc/fetchmail { };
   fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 316da20d8088..f9ea9b9d9d02 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -210,6 +210,7 @@ mapAliases ({
   et_xmlfile = et-xmlfile; # added 2023-10-16
   etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
   ev3dev2 = python-ev3dev2; # added 2023-06-19
+  evernote = throw "evernote is intended for use with Python 2.X";
   eyeD3 = eyed3; # added 2024-01-03
   Fabric = fabric; # addedd 2023-02-19
   face_recognition = face-recognition; # added 2022-10-15
@@ -264,6 +265,7 @@ mapAliases ({
   gbulb = throw "gbulb has been removed as it is unmaintained and no longer compatible with PyGObject 3.50."; # added 2024-10-14
   gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22
   gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15
+  geeknote = throw "geeknote depends on the Python2-only library evernote"; # Added 2025-03-22
   GeoIP = geoip; # added 2023-02-19
   gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
@@ -390,6 +392,7 @@ mapAliases ({
   mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06
   mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10
   mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
+  modestmaps = throw "modestmaps is unmaintained and was never enabled for anything except Python27"; # Added 2025-03-23
   mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21
   mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30
   mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
@@ -491,6 +494,7 @@ mapAliases ({
   pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
   pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
   pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
+  pychart = throw "pychart does not support Python3"; # added 2025-03-23
   pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
   pydns = py3dns; # added 2024-10-25
   pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
@@ -594,6 +598,7 @@ mapAliases ({
   python-Levenshtein = levenshtein;
   python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
   python-subunit = subunit; # added 2021-09-10
+  python-wifi = throw "python-wifi does not support Python3";
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
   pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11
@@ -711,6 +716,7 @@ mapAliases ({
   tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
   tensorflow-tensorboard = tensorboard; # added 2022-03-06
   tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
+  tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23
   Theano = theano; # added 2023-02-19
   TheanoWithCuda = theanoWithCuda; # added 2023-02-19
   TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 181acab6fa03..7aaf06856b21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4530,8 +4530,6 @@ self: super: with self; {
 
   events = callPackage ../development/python-modules/events { };
 
-  evernote = callPackage ../development/python-modules/evernote { };
-
   evohome-async = callPackage ../development/python-modules/evohome-async { };
 
   evolutionhttp = callPackage ../development/python-modules/evolutionhttp { };
@@ -5345,8 +5343,6 @@ self: super: with self; {
     }
   );
 
-  geeknote = callPackage ../development/python-modules/geeknote { };
-
   gehomesdk = callPackage ../development/python-modules/gehomesdk { };
 
   gekitchen = callPackage ../development/python-modules/gekitchen { };
@@ -8895,8 +8891,6 @@ self: super: with self; {
 
   moderngl-window = callPackage ../development/python-modules/moderngl-window { };
 
-  modestmaps = callPackage ../development/python-modules/modestmaps { };
-
   mohawk = callPackage ../development/python-modules/mohawk { };
 
   molbar = callPackage ../development/python-modules/molbar { };
@@ -10311,6 +10305,10 @@ self: super: with self; {
     callPackage ../development/python-modules/opentelemetry-instrumentation-requests
       { };
 
+  opentelemetry-instrumentation-sqlalchemy =
+    callPackage ../development/python-modules/opentelemetry-instrumentation-sqlalchemy
+      { };
+
   opentelemetry-instrumentation-wsgi =
     callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi
       { };
@@ -11839,8 +11837,6 @@ self: super: with self; {
 
   pychannels = callPackage ../development/python-modules/pychannels { };
 
-  pychart = callPackage ../development/python-modules/pychart { };
-
   pychm = callPackage ../development/python-modules/pychm { };
 
   pychromecast = callPackage ../development/python-modules/pychromecast { };
@@ -14112,8 +14108,6 @@ self: super: with self; {
 
   python-whois = callPackage ../development/python-modules/python-whois { };
 
-  python-wifi = callPackage ../development/python-modules/python-wifi { };
-
   python-wink = callPackage ../development/python-modules/python-wink { };
 
   python-xapp = callPackage ../development/python-modules/python-xapp {
@@ -17109,8 +17103,6 @@ self: super: with self; {
 
   tiler = callPackage ../development/python-modules/tiler { };
 
-  tilestache = callPackage ../development/python-modules/tilestache { };
-
   tilt-ble = callPackage ../development/python-modules/tilt-ble { };
 
   time-machine = callPackage ../development/python-modules/time-machine { };
@@ -17476,6 +17468,8 @@ self: super: with self; {
 
   ttfautohint-py = callPackage ../development/python-modules/ttfautohint-py { };
 
+  ttkbootstrap = callPackage ../development/python-modules/ttkbootstrap { };
+
   ttls = callPackage ../development/python-modules/ttls { };
 
   ttn-client = callPackage ../development/python-modules/ttn-client { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index a307fb5b072d..8d0f06d0f091 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -7,6 +7,7 @@
 
 
 { lib
+, config
 , __splicedPackages
 , makeScopeWithSplicing'
 , generateSplicesForMkScope
@@ -47,7 +48,7 @@ makeScopeWithSplicing' {
   kdeGear = let
     mkGear = import ../applications/kde;
     attrs = {
-      inherit libsForQt5;
+      inherit config libsForQt5;
       inherit (pkgs) lib fetchurl;
     };
   in (lib.makeOverridable mkGear attrs);