diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index a616742fbb3b..241acb439ea6 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -758,6 +758,7 @@ An attribute set of derivations which perform the tests during their build.
   - Output attribute `config` is the resulting evaluated services attrset (e.g., the value of the `system.services` option in NixOS).
     This attribute must be available even if `checkDrv` would fail.
   - Output attribute `checkDrv` is a representative derivation whose existence and buildability prove the eval is sound (e.g., `system.build.toplevel` in NixOS, but could perhaps be more specific in the case of another process manager integration).
+  - The generic tester only reads `config` and `checkDrv`. An integration may return additional attributes for its own integration-specific eval checks. Such extra attributes are optional.
 
 `mkTest` (function)
 
@@ -772,6 +773,14 @@ An attribute set of derivations which perform the tests during their build.
 : Path to a directory writable by service processes and readable by `testExe`.
   The integration must ensure this directory is available when the services and `testExe` run.
 
+`callReload` (function)
+
+: `path -> string`.
+  Given a service's name `path` (the list of service names from the top-level service down to the target sub-service, e.g. `[ "reload" "inner" ]`), returns a shell command that reloads that service.
+  The command is embedded in `testExe` and executed with sufficient privilege to reload the service (e.g. as root in the test VM).
+  There is no manager-agnostic reload command, so every integration must provide this; the integration joins the `path` per its own unit-naming convention (the suite does not assume one).
+  On NixOS the `path` dash-joins into the systemd unit name with a `.service` suffix, so the command is `systemctl reload ${lib.concatStringsSep "-" path}.service` (a top-level service is a single-element path `[ "svc" ]` -> `svc.service`; a nested sub-service `[ "parent" "child" ]` -> `parent-child.service`).
+
 :::{.example #ex-modularServiceCompliance-nixos}
 
 # NixOS invocation of the compliance suite
@@ -802,6 +811,7 @@ recurseIntoAttrs (
         config = machine.config.system.services;
         checkDrv = machine.config.system.build.toplevel;
       };
+    callReload = path: "systemctl reload ${lib.concatStringsSep "-" path}.service";
     mkTest =
       {
         name,
diff --git a/doc/hooks/pnpm.section.md b/doc/hooks/pnpm.section.md
index 58c966a4dbdf..e8871c6c2398 100644
--- a/doc/hooks/pnpm.section.md
+++ b/doc/hooks/pnpm.section.md
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherversion = 4;
+    fetcherVersion = 4;
     hash = lib.fakeHash;
   };
 
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherversion = 4;
+    fetcherVersion = 4;
     hash = lib.fakeHash;
   };
 
diff --git a/lib/services/service.nix b/lib/services/service.nix
index 449c35426039..5911202547fe 100644
--- a/lib/services/service.nix
+++ b/lib/services/service.nix
@@ -7,10 +7,11 @@
 {
   lib,
   config,
+  options,
   ...
 }:
 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkEnableOption mkOption types;
   pathOrStr = types.coercedTo types.path (x: "${x}") types.str;
 in
 {
@@ -40,7 +41,7 @@ in
       visible = "shallow";
     };
     process = {
-      argv = lib.mkOption {
+      argv = mkOption {
         type = types.listOf pathOrStr;
         example = lib.literalExpression ''[ (lib.getExe config.package) "--nobackground" ]'';
         description = ''
@@ -72,15 +73,12 @@ in
     };
 
     notificationProtocol = mkOption {
-      type = types.listOf (
-        types.enum [
-          "systemd"
-          "s6"
-        ]
-      );
-
-      default = [ ];
-      apply = v: lib.unique v;
+      type = types.submodule {
+        options = {
+          systemd = mkEnableOption "Whether the service supports systemd-notify.";
+          s6 = mkEnableOption "Whether the service supports s6-notify.";
+        };
+      };
       description = ''
         Notification protocol that this service supports with the underlying service manager.
       '';
@@ -90,13 +88,20 @@ in
   config = {
     assertions = [
       {
-        assertion = config.process.reloadSignal != null && config.process.reloadCommand != null;
+        # `reloadSignal` derives `reloadCommand` at `mkDefault` priority below, so a
+        # conflict only exists when the user *also* set `reloadCommand` explicitly.
+        # An explicit (non-`mkDefault`) definition has `defaultOverridePriority`.
+        assertion =
+          !(
+            config.process.reloadSignal != null
+            && options.process.reloadCommand.highestPrio <= lib.modules.defaultOverridePriority
+          );
         message = "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand.";
       }
     ];
 
-    process.reloadCommand = (lib.mkIf config.process.reloadSignal != null) (
-      lib.mkForce "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID"
+    process.reloadCommand = lib.mkIf (config.process.reloadSignal != null) (
+      lib.mkDefault "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID"
     );
   };
 }
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aa1d153b5c2a..351397e01784 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4691,6 +4691,12 @@
     githubId = 53847249;
     name = "Casey Avila";
   };
+  caspersonn = {
+    email = "lucakasper8@gmail.com";
+    github = "Caspersonn";
+    githubId = 96787412;
+    name = "Luca Kasper";
+  };
   cassandracomar = {
     name = "Cassandra Comar";
     github = "cassandracomar";
@@ -25000,6 +25006,12 @@
     githubId = 47582;
     name = "Samir Talwar";
   };
+  samiser = {
+    email = "nixos@me.samiser.xyz";
+    github = "samiser";
+    githubId = 32001364;
+    name = "Sam";
+  };
   samlich = {
     email = "nixos@samli.ch";
     github = "samlich";
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index f7ca6c2717bc..bfe8b651b350 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -24,6 +24,8 @@ let
     GRANIAN_HOST = cfg.address;
     GRANIAN_PORT = toString cfg.port;
     GRANIAN_WORKERS_KILL_TIMEOUT = "60";
+    # django-allauth uses python requests, which doesn't use the systems CA bundle by default: https://requests.readthedocs.io/en/latest/user/advanced/#ca-certificates
+    REQUESTS_CA_BUNDLE = config.security.pki.caBundle;
   }
   // lib.optionalAttrs (config.time.timeZone != null) {
     PAPERLESS_TIME_ZONE = config.time.timeZone;
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
deleted file mode 100644
index 977042a074bd..000000000000
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  dmcfg = config.services.xserver.displayManager;
-  ldmcfg = dmcfg.lightdm;
-  cfg = ldmcfg.greeters.enso;
-
-  theme = cfg.theme.package;
-  icons = cfg.iconTheme.package;
-  cursors = cfg.cursorTheme.package;
-
-  ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" ''
-    [greeter]
-    default-wallpaper=${ldmcfg.background}
-    gtk-theme=${cfg.theme.name}
-    icon-theme=${cfg.iconTheme.name}
-    cursor-theme=${cfg.cursorTheme.name}
-    blur=${toString cfg.blur}
-    brightness=${toString cfg.brightness}
-    ${cfg.extraConfig}
-  '';
-in
-{
-  options = {
-    services.xserver.displayManager.lightdm.greeters.enso = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable enso-os-greeter as the lightdm greeter
-        '';
-      };
-
-      theme = {
-        package = mkPackageOption pkgs "gnome-themes-extra" { };
-        name = mkOption {
-          type = types.str;
-          default = "Adwaita";
-          description = ''
-            Name of the theme to use for the lightdm-enso-os-greeter
-          '';
-        };
-      };
-
-      iconTheme = {
-        package = mkPackageOption pkgs "papirus-icon-theme" { };
-        name = mkOption {
-          type = types.str;
-          default = "ePapirus";
-          description = ''
-            Name of the icon theme to use for the lightdm-enso-os-greeter
-          '';
-        };
-      };
-
-      cursorTheme = {
-        package = mkPackageOption pkgs "capitaine-cursors" { };
-        name = mkOption {
-          type = types.str;
-          default = "capitane-cursors";
-          description = ''
-            Name of the cursor theme to use for the lightdm-enso-os-greeter
-          '';
-        };
-      };
-
-      blur = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether or not to enable blur
-        '';
-      };
-
-      brightness = mkOption {
-        type = types.int;
-        default = 7;
-        description = ''
-          Brightness
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Extra configuration that should be put in the greeter.conf
-          configuration file
-        '';
-      };
-    };
-  };
-
-  config = mkIf (ldmcfg.enable && cfg.enable) {
-    environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
-
-    environment.systemPackages = [
-      cursors
-      icons
-      theme
-    ];
-
-    services.xserver.displayManager.lightdm = {
-      greeter = mkDefault {
-        package = pkgs.lightdm-enso-os-greeter.xgreeters;
-        name = "pantheon-greeter";
-      };
-
-      greeters = {
-        gtk = {
-          enable = mkDefault false;
-        };
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3561d4877451..d0d2d8de4411 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -83,7 +83,6 @@ in
   imports = [
     ./lightdm-greeters/gtk.nix
     ./lightdm-greeters/mini.nix
-    ./lightdm-greeters/enso-os.nix
     ./lightdm-greeters/pantheon.nix
     ./lightdm-greeters/lomiri.nix
     ./lightdm-greeters/tiny.nix
@@ -107,6 +106,9 @@ in
         "user"
       ]
     )
+    (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "lightdm" "greeters" "enso" ]
+      "services.xserver.displayManager.lightdm.greeters.enso has been removed following removal of the corresponding package."
+    )
   ];
 
   options = {
diff --git a/nixos/modules/system/service/systemd/service.nix b/nixos/modules/system/service/systemd/service.nix
index 63e80aa19e0c..e7fa338ff97b 100644
--- a/nixos/modules/system/service/systemd/service.nix
+++ b/nixos/modules/system/service/systemd/service.nix
@@ -126,33 +126,29 @@ in
         `%i` (instance), `%t` (runtime directory), and environment variables using
         `''${VAR}` syntax in your command line.
 
-        By default, it is either set to null or this is set to the escaped version of {option}`process.reloadCommand`
-        when specified to prevent systemd substitution. Set this option explicitly to enable
-        systemd's substitution features.
+        By default, it is set to {option}`process.reloadCommand` when specified, or an
+        empty string otherwise. Because {option}`process.reloadCommand` is already a
+        command line (not an argument list), it is used verbatim so that references
+        like `$MAINPID` are preserved.
 
         To extend {option}`process.reloadCommand` with systemd specifiers, you can append
-        to the escaped arguments:
+        to the command line:
 
         ```nix
         systemd.mainExecReload =
-          config.systemd.lib.escapeSystemdExecArgs config.process.reload + " --systemd-unit %n";
+          config.process.reloadCommand + " --systemd-unit %n";
         ```
 
         This pattern allows you to pass the unit name (or other systemd specifiers)
-        as additional arguments while keeping the base command from {option}`process.argv`
-        properly escaped.
+        as additional arguments.
 
         See {manpage}`systemd.service(5)` (section "COMMAND LINES") for details on
         variable substitution and {manpage}`systemd.unit(5)` (section "SPECIFIERS")
         for available specifiers like `%n`, `%i`, `%t`.
       '';
       type = types.nullOr types.str;
-      default =
-        if config.process.reloadCommand then
-          config.systemd.lib.escapeSystemdExecArgs config.process.reloadCommand
-        else
-          "";
-      defaultText = lib.literalExpression "config.systemd.lib.escapeSystemdExecArgs config.process.reloadCommand";
+      default = if config.process.reloadCommand != null then config.process.reloadCommand else "";
+      defaultText = lib.literalExpression "config.process.reloadCommand";
     };
 
     systemd.services = mkOption {
@@ -213,9 +209,7 @@ in
       wantedBy = lib.mkDefault [ "multi-user.target" ];
       serviceConfig = {
         ExecReload = config.systemd.mainExecReload;
-        Type = lib.mkDefault (
-          if (config.serviceManager.notificationProtocol == "systemd") then "notify" else "simple"
-        );
+        Type = lib.mkDefault (if config.notificationProtocol.systemd then "notify" else "simple");
         Restart = lib.mkDefault "always";
         RestartSec = lib.mkDefault "5";
         ExecStart = [
diff --git a/nixos/tests/system-services-compliance.nix b/nixos/tests/system-services-compliance.nix
index 0a40d18fc4fe..add3593fd3a8 100644
--- a/nixos/tests/system-services-compliance.nix
+++ b/nixos/tests/system-services-compliance.nix
@@ -7,6 +7,23 @@
 
 let
   sharedDir = "/tmp/modular-service-compliance";
+
+  inherit (pkgs) lib coreutils;
+
+  evalSystemServices =
+    services:
+    evalSystem (
+      { ... }:
+      {
+        system.services = services;
+        system.stateVersion = "25.05";
+        fileSystems."/" = {
+          device = "/test/dummy";
+          fsType = "auto";
+        };
+        boot.loader.grub.enable = false;
+      }
+    );
 in
 let
   suite = pkgs.testers.modularServiceCompliance {
@@ -15,23 +32,13 @@ let
     evalConfig =
       { services }:
       let
-        machine = evalSystem (
-          { ... }:
-          {
-            system.services = services;
-            system.stateVersion = "25.05";
-            fileSystems."/" = {
-              device = "/test/dummy";
-              fsType = "auto";
-            };
-            boot.loader.grub.enable = false;
-          }
-        );
+        machine = evalSystemServices services;
       in
       {
         config = machine.config.system.services;
         checkDrv = machine.config.system.build.toplevel;
       };
+    callReload = path: "systemctl reload ${lib.concatStringsSep "-" path}.service";
     mkTest =
       {
         name,
@@ -49,6 +56,80 @@ let
         meta.maintainers = with pkgs.lib.maintainers; [ roberth ];
       };
   };
+
+  # systemd-specific eval assertions. serviceConfig.Type/ExecReload only exist on
+  # the resolved host units, so a fresh eval is used per case.
+  systemdEvalTests =
+    let
+      defaultUnits =
+        (evalSystemServices {
+          service.process.argv = [ "${coreutils}/bin/true" ];
+        }).config.systemd.services;
+
+      notifyUnits =
+        (evalSystemServices {
+          service = {
+            process.argv = [ "${coreutils}/bin/true" ];
+            notificationProtocol.systemd = true;
+          };
+        }).config.systemd.services;
+
+      reloadUnits =
+        (evalSystemServices {
+          service = {
+            process.argv = [ "${coreutils}/bin/true" ];
+            process.reloadSignal = "HUP";
+          };
+        }).config.systemd.services;
+    in
+    {
+      testDefaultType = {
+        expr = defaultUnits.service.serviceConfig.Type;
+        expected = "simple";
+      };
+
+      testNotifyType = {
+        expr = notifyUnits.service.serviceConfig.Type;
+        expected = "notify";
+      };
+
+      testReloadExecReload = {
+        expr = reloadUnits.service.serviceConfig.ExecReload;
+        expected = "${coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+
+  systemdEval = pkgs.stdenvNoCC.mkDerivation (finalAttrs: {
+    __structuredAttrs = true;
+    name = "system-services-compliance-systemd-eval-report";
+    passthru = {
+      tests = systemdEvalTests;
+      failures = lib.runTests finalAttrs.finalPackage.tests;
+    };
+    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.finalPackage.tests;
+    buildCommand = ''
+      touch $out
+      for testName in "''${!testResults[@]}"; do
+        if [[ -n "''${testResults[$testName]}" ]]; then
+          echo "PASS  $testName"
+        else
+          echo "FAIL  $testName"
+        fi
+      done
+    ''
+    + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) ''
+      {
+        echo ""
+        echo "systemd-specific eval-level compliance failures:"
+        for testName in "''${!testResults[@]}"; do
+          if [[ -z "''${testResults[$testName]}" ]]; then
+            echo "- $testName"
+          fi
+        done
+      } >&2
+      exit 1
+    '';
+  });
 in
 
 # Please the callTest pattern.
@@ -64,4 +145,4 @@ pkgs.lib.mapAttrs (
       test = v;
       driver = v;
     }
-) suite
+) (suite // { systemd-eval = systemdEval; })
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 0c3ed6a9a561..d6bbea45d0fd 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -13,18 +13,18 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.10.0";
+  version = "0.10.1";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff";
     tag = "v${version}";
-    hash = "sha256-nrstsxOxHTeSKkqpvyxdzyypfHU6wZBQpvNnCfjh9s4=";
+    hash = "sha256-GGoy8ghA87vwHEc0fi97uiBrpRTAGk/QgqzKu8BBRXo=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-Nlf2Bxwe5KvZF0unpeK/mMFmv4NM+IKPpFOopXoNRxU=";
+    cargoHash = "sha256-sOE3Zrs/ZtOIusH0+OvR1Ew5sfQfse6eWSLPwDPVSU4=";
 
     cargoBuildFlags = [
       "-p"
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index e7e90c4dafa2..7d9174b46e19 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-nDKqXhU97h0iBPPFASaCSzEdi6H48IW1rn4iB9cD36Y=";
+          hash = "sha256-Y6MXjJBmhMzuQMwhkPLHK/vtciTdjsGvkEblH3ofju0=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-gIN2FE6ROma6v3vJX/Wi+OqFrq5/YV7kJXNMwGRw0Z8=";
+          hash = "sha256-8VvDtb+8SoLTRC7pXwH40amRurxTQgCmhdi0u7e5AfU=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-rb50iFTniwhY/iqsKBN4jfV4j+RxjLF126opVkReyGA=";
+          hash = "sha256-bqjEgsjY+zyG1g/KtkRNxAlazIpc+HwGWvsMQNnPI2M=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.217";
+      version = "2.1.218";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index d944eaa6e6f0..9aec3368aae5 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2026.6.1780853884";
-          hash = "sha256-4nxH5qW3u3/9Vqf+QFs7l5BDusE5wcxxHiJFcPq/2EE=";
+          version = "2026.7.1784455023";
+          hash = "sha256-mUiQ+35R1HXC+23qYKRJwV61poEsyhY2NkDizU+QMx8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index ae815cfd02b7..e395e0ed8cf1 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -837,7 +837,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "150.0.7871.128",
+    "version": "150.0.7871.181",
     "deps": {
       "depot_tools": {
         "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
@@ -849,16 +849,16 @@
         "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
       },
       "ungoogled-patches": {
-        "rev": "150.0.7871.128-1",
-        "hash": "sha256-GxSsGTC68IEMPt85RLBCVDT0dTl7ZVVPc8o4vxc50H8="
+        "rev": "150.0.7871.181-1",
+        "hash": "sha256-ifqEnOcvi49cFOYan8ShiwteXYnFrLPclrIBZiE1rGY="
       },
       "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "81891e5ca708047763816c778216799ef14c66cb",
-        "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
+        "rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9",
+        "hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -928,8 +928,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
-        "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
+        "rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c",
+        "hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -973,8 +973,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
-        "hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
+        "rev": "d089fc91e7e4881362463faf8efe9ae435e34660",
+        "hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q="
       },
       "src/third_party/dawn/third_party/glfw3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1493,8 +1493,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
-        "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
+        "rev": "587c5b0f5a7b0260826a0c19094c2d952195066e",
+        "hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1663,8 +1663,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
-        "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
+        "rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638",
+        "hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs="
       },
       "src/agents/shared": {
         "url": "https://chromium.googlesource.com/chromium/agents.git",
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index aedee50cefef..39c8278a232e 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -19,7 +19,7 @@
   ocamlPackages_4_10,
   ocamlPackages_4_12,
   ocamlPackages_4_14,
-  ocamlPackages_5_4,
+  ocamlPackages_5_5,
   rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq
   ncurses,
   buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14
@@ -76,6 +76,7 @@ let
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
     "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
     "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s=";
+    "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw=";
   };
   releaseRev = v: "V${v}";
   fetched =
@@ -140,12 +141,15 @@ let
           case = lib.versions.range "8.7" "8.10";
           out = ocamlPackages_4_09;
         }
-      ] ocamlPackages_5_4;
+      ] ocamlPackages_5_5;
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml
     ocamlPackages.findlib
   ]
   ++ lib.optional (coqAtLeast "8.14") dune;
+  ocamlBuildInputs = [
+    ocamlPackages.findlib
+  ];
   ocamlPropagatedBuildInputs =
     [ ]
     ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5
@@ -225,6 +229,7 @@ let
     buildInputs = [
       ncurses
     ]
+    ++ ocamlBuildInputs
     ++ lib.optionals buildIde (
       if coqAtLeast "8.10" then
         [
@@ -328,11 +333,18 @@ let
       platforms = lib.platforms.unix;
       mainProgram = if buildIde then "coqide" else "coqtop";
     };
+
+    # Things required by the CI
+    strictDeps = true;
+    __structuredAttrs = true;
   };
 in
 if coqAtLeast "8.21" then
   self.overrideAttrs (o: {
     # coq-core is now a shim for rocq
+    nativeBuildInputs = o.nativeBuildInputs ++ [
+      rocqPackages.rocq-core
+    ];
     propagatedBuildInputs = o.propagatedBuildInputs ++ [
       rocqPackages.rocq-core
     ];
diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index a6501daaaa3f..68a2c3895e98 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -14,7 +14,7 @@
   dune,
   customOCamlPackages ? null,
   ocamlPackages_4_14,
-  ocamlPackages_5_4,
+  ocamlPackages_5_5,
   ncurses,
   csdp ? null,
   version,
@@ -29,6 +29,7 @@ let
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
     "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
     "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s=";
+    "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw=";
   };
   releaseRev = v: "V${v}";
   fetched =
@@ -66,12 +67,15 @@ let
       in
       lib.switch rocq-version [
         (case (range "9.0" "9.1") ocamlPackages_4_14)
-      ] ocamlPackages_5_4;
+      ] ocamlPackages_5_5;
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml
     ocamlPackages.findlib
     dune
   ];
+  ocamlBuildInputs = [
+    ocamlPackages.findlib
+  ];
   ocamlPropagatedBuildInputs = [ ocamlPackages.zarith ];
   self = stdenv.mkDerivation {
     pname = "rocq";
@@ -130,7 +134,7 @@ let
     };
 
     nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs;
-    buildInputs = [ ncurses ];
+    buildInputs = [ ncurses ] ++ ocamlBuildInputs;
 
     propagatedBuildInputs = ocamlPropagatedBuildInputs;
 
@@ -196,6 +200,10 @@ let
       platforms = lib.platforms.unix;
       mainProgram = "rocq";
     };
+
+    # Things required by the CI
+    strictDeps = true;
+    __structuredAttrs = true;
   };
 in
 self
diff --git a/pkgs/build-support/testers/modular-service-compliance.nix b/pkgs/build-support/testers/modular-service-compliance.nix
index ece674583eff..2349e9e96a8f 100644
--- a/pkgs/build-support/testers/modular-service-compliance.nix
+++ b/pkgs/build-support/testers/modular-service-compliance.nix
@@ -15,6 +15,7 @@
   evalConfig,
   mkTest,
   sharedDir,
+  callReload,
   namePrefix ? "modular-service-compliance",
 }:
 
@@ -45,6 +46,11 @@ let
           ];
           warnings = [ "compliance child warning" ];
         };
+        # A sub-service exercising reload derivation from a reload signal.
+        services.reloadee = {
+          process.argv = [ "${coreutils}/bin/true" ];
+          process.reloadSignal = "HUP";
+        };
       };
     };
   };
@@ -65,7 +71,7 @@ let
       };
 
       testAssertions = {
-        expr = builtins.elem {
+        expr = lib.elem {
           assertion = true;
           message = "compliance test assertion";
         } c.assertions;
@@ -73,12 +79,12 @@ let
       };
 
       testWarnings = {
-        expr = builtins.elem "compliance test warning" c.warnings;
+        expr = lib.elem "compliance test warning" c.warnings;
         expected = true;
       };
 
       testSubServiceAssertions = {
-        expr = builtins.elem {
+        expr = lib.elem {
           assertion = true;
           message = "compliance child assertion";
         } c.services.child.assertions;
@@ -86,14 +92,58 @@ let
       };
 
       testSubServiceWarnings = {
-        expr = builtins.elem "compliance child warning" c.services.child.warnings;
+        expr = lib.elem "compliance child warning" c.services.child.warnings;
+        expected = true;
+      };
+
+      # The reload-conflict assertion must not fire (its `assertion` must hold) for a
+      # service that sets only reloadSignal (guards the inverted-assertion fix, and the
+      # priority-aware conflict detection: reloadSignal derives reloadCommand internally,
+      # which must not be mistaken for a user-set conflict).
+      testNoReloadConflict = {
+        expr = lib.any (
+          a:
+          a.message
+          == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand."
+          && !a.assertion
+        ) c.services.reloadee.assertions;
+        expected = false;
+      };
+
+      # Setting process.reloadSignal derives process.reloadCommand
+      # (guards the misplaced-paren mkIf fix).
+      testReloadSignalDerivesCommand = {
+        expr = c.services.reloadee.process.reloadCommand;
+        expected = "${coreutils}/bin/kill -HUP $MAINPID";
+      };
+
+      # notificationProtocol submodule bools default to false.
+      testNotificationProtocolSystemdDefault = {
+        expr = c.notificationProtocol.systemd;
+        expected = false;
+      };
+
+      testNotificationProtocolS6Default = {
+        expr = c.notificationProtocol.s6;
+        expected = false;
+      };
+
+      # Setting both reloadSignal and reloadCommand explicitly is a genuine conflict,
+      # so the assertion must fire. Separate eval: checkDrv would fail on this.
+      testReloadConflictFires = {
+        expr = lib.any (
+          a:
+          a.message
+          == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand."
+          && !a.assertion
+        ) conflictEval.config.conflict.assertions;
         expected = true;
       };
 
       # Separate eval for a failing assertion — checkDrv would fail here,
       # so we only access config.
       testFailingAssertionValue = {
-        expr = builtins.elem {
+        expr = lib.elem {
           assertion = false;
           message = "compliance failing assertion";
         } failingEval.config.failing.assertions;
@@ -101,6 +151,16 @@ let
       };
     };
 
+  conflictEval = evalConfig {
+    services = {
+      conflict = {
+        process.argv = [ "${coreutils}/bin/true" ];
+        process.reloadSignal = "HUP";
+        process.reloadCommand = "${coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+
   failingEval = evalConfig {
     services = {
       failing = {
@@ -129,6 +189,24 @@ let
     exec "${coreutils}/bin/sleep" infinity
   '';
 
+  /**
+    A reloadable service script. Like `svc`, it namespaces a comms subdirectory
+    by its first argument and records the remaining arguments. It traps SIGHUP
+    and appends a marker line to `$dir/reloads` on each reload, then stays alive
+    as the trapping shell itself (no `exec`, so the trap and MAINPID are kept).
+  */
+  reloadableSvc = writeShellScript "${namePrefix}-reloadable-svc" ''
+    id="$1"; shift
+    dir="${sharedDir}/$id"
+    mkdir -p "$dir"
+    : > "$dir/reloads"
+    reload() { printf 'reloaded\n' >> "$dir/reloads"; }
+    trap reload HUP
+    echo "$$" > "$dir/pid"
+    printf '%s\n' "$@" > "$dir/args"
+    while true; do "${coreutils}/bin/sleep" 1; done
+  '';
+
   mkArgv =
     id: extraArgs:
     [
@@ -171,6 +249,27 @@ let
       inherit text;
     });
 
+  # The reload runtime test's service tree. The reloadable unit is the *sub*-service,
+  # so its name path `[ "reload" "inner" ]` handed to `callReload` exercises the
+  # integration's nested unit naming (NixOS dash-joins to `reload-inner.service`).
+  reloadServices = {
+    reload = {
+      # Parent must run something; a bare keep-alive is enough.
+      process.argv = [
+        reloadableSvc
+        "reload-parent"
+      ];
+      services.inner.process = {
+        argv = [
+          reloadableSvc
+          "reload-inner"
+        ];
+        # The script traps SIGHUP; reloadSignal derives the manager's reload command.
+        reloadSignal = "HUP";
+      };
+    };
+  };
+
 in
 {
   # Eval-level tests: config structure, evaluated in the integration's
@@ -186,9 +285,9 @@ in
     representative = evalResult.checkDrv;
     passthru = {
       tests = evalTestDefs;
-      failures = lib.runTests finalAttrs.passthru.tests;
+      failures = lib.runTests finalAttrs.finalPackage.tests;
     };
-    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.passthru.tests;
+    testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.finalPackage.tests;
     buildCommand = ''
       touch $out
       for testName in "''${!testResults[@]}"; do
@@ -247,5 +346,26 @@ in
     '';
   };
 
+  # Runtime reload: start a reloadable service, ask the integration to reload it,
+  # and assert the service observed the reload (recorded a SIGHUP marker).
+  reload = mkTest {
+    name = "${namePrefix}-reload";
+    services = reloadServices;
+    testExe = mkTestScript "reload" ''
+      ${waitAndCheck "reload-inner" [ ]}
+      ${callReload [
+        "reload"
+        "inner"
+      ]}
+      timeout=30; elapsed=0
+      while ! grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" && [ "$elapsed" -lt "$timeout" ]; do
+        sleep 1; elapsed=$((elapsed + 1))
+      done
+      grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" \
+        || { echo "reload: no reload recorded after ''${timeout}s"; cat "${sharedDir}/reload-inner/reloads"; exit 1; }
+      echo "reload: reload observed"
+    '';
+  };
+
   # See also the manual compliance items in doc/build-helpers/testers.chapter.md.
 }
diff --git a/pkgs/by-name/ap/apfel-llm/package.nix b/pkgs/by-name/ap/apfel-llm/package.nix
index 2f8c4f6cd107..16c1143b869f 100644
--- a/pkgs/by-name/ap/apfel-llm/package.nix
+++ b/pkgs/by-name/ap/apfel-llm/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apfel-llm";
-  version = "1.8.3";
+  version = "1.8.4";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
   src = fetchurl {
     url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz";
-    hash = "sha256-1AA86f5+Poo5YCrtxT1rAPGBctQbNa5hdAZmI008/yU=";
+    hash = "sha256-farvPPo3VU2qUat+72qaiMpcd9LwFO7kqzGGKKtPwGE=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix
index dae963ad3d85..335492c06806 100644
--- a/pkgs/by-name/ar/artalk/package.nix
+++ b/pkgs/by-name/ar/artalk/package.nix
@@ -3,7 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   installShellFiles,
@@ -31,14 +31,14 @@ let
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm_10
     ];
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
-      pnpm = pnpm_9;
-      fetcherVersion = 3;
-      hash = "sha256-HypDGYb0MRCIDBHY8pVgwFoZQWC8us44cunORZRk3RM=";
+      pnpm = pnpm_10;
+      fetcherVersion = 4;
+      hash = "sha256-RSz/bx8/BAqLZH3/yQ6/H/nnwGvcCg8EzIEJ4/xkQgQ=";
     };
 
     buildPhase = ''
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 82df8b94ffe1..a8293ea24ca9 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "atuin";
-  version = "18.17.0";
+  version = "18.17.1";
 
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "atuin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cciogPSlbfiC9U3Dv+IGyuRI9PU9X4LdlequCFiG/a0=";
+    hash = "sha256-9wfeAqtE6HLNvQHdGlLX6Kv1kakmojgY14RVW/WpOSs=";
   };
 
-  cargoHash = "sha256-QX1JupLZafRdMUZjl58iFjiPgLSTYZazRVyU88n5QP8=";
+  cargoHash = "sha256-l2TX8thT+MnWhrTyD4ryapJkDg43mb2IurGDnyk2b74=";
 
   # atuin's default features include 'check-updates', which do not make sense
   # for distribution builds. List all other default features.
diff --git a/pkgs/by-name/bl/blazesym-c/package.nix b/pkgs/by-name/bl/blazesym-c/package.nix
index c9f0035b5495..9fdddf6c7090 100644
--- a/pkgs/by-name/bl/blazesym-c/package.nix
+++ b/pkgs/by-name/bl/blazesym-c/package.nix
@@ -9,24 +9,27 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blazesym-c";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "blazesym";
     tag = "capi-v${finalAttrs.version}";
-    hash = "sha256-IdeY9FCGziYN9glnvQJu2oa5ogdXb6D9QcY2MRnq7vA=";
+    hash = "sha256-gaDNRVcoI6Nc1zWEwS49FhKPep4uI5560t3AaIRCYfw=";
   };
 
-  cargoHash = "sha256-fsvdhahTKxjrrH9z6m1k3cTkXfMUZXZNZlYRi3tgTlA=";
+  cargoHash = "sha256-ZLGtskOe38fBP8o8zIezzsNwY4Xwr7UnVrbx1KysEis=";
 
   cargoBuildFlags = [
     "--package"
     "blazesym-c"
   ];
 
-  nativeCheckInputs = [
+  nativeBuildInputs = [
     pkg-config
+  ];
+
+  buildInputs = [
     elfutils
     zlib
   ];
diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index d1e0ff92eee9..97525b2def80 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -136,7 +136,7 @@ buildFHSEnv {
       with pkgs;
       [
         gtk2-x11
-        openssl_1_1
+        # openssl_1_1
       ]
     );
 
@@ -166,5 +166,8 @@ buildFHSEnv {
     ];
     platforms = lib.platforms.linux;
     mainProgram = "bolt-launcher";
-  };
+  }
+  // (lib.optionalAttrs enableRS3 {
+    problems.broken.message = "OpenSSL 1.1 has been end of life since 2023 and will be removed soon.";
+  });
 }
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 17e075e0206f..2ef60eda0800 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,20 +3,20 @@
 
 let
   pname = "brave";
-  version = "1.92.141";
+  version = "1.92.143";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-FVzXaVpyfX+GIVofy3NfpE8rOH+9LjQpdEoEWQV0DqI=";
+      hash = "sha256-IHBJm9uow2d/X4Z9e117aGdP1Y+3R1ApWu40sPtdbr8=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-A87vCTtcyuNMPLaLYDjgyIm85zwAXNc3Z4ImtC9Kjek=";
+      hash = "sha256-jaxNneurduBiw3jho5Fp7gXnBfSpLB5hlE06i/JK+ic=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-b4BmNt+c0CSrtS2n+30gdWrSsFOQSZnFAy2vWbGJz6g=";
+      hash = "sha256-EvfZgO8FAijof1Ml6gqSOyRndL8KYFdT0MNmVmuxAnU=";
     };
   };
 
diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index fd809eab061b..9ebd8a0799b1 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -18,13 +18,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "buildah";
-  version = "1.44.0";
+  version = "1.44.1";
 
   src = fetchFromGitHub {
     owner = "podman-container-tools";
     repo = "buildah";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Rv5la54ikmP4qVT19tg0sv0kM+xpQO6w9XU1PpGFk4=";
+    hash = "sha256-EGoH+PvePNw7I28Vq1kH9W0x4lYuUTSa1Rd+fEE8fkc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 1c4dc8cbbc02..cfbc7a4b2abf 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-expand";
-  version = "1.0.123";
+  version = "1.0.124";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
     tag = finalAttrs.version;
-    hash = "sha256-vd63DpKLZpE+fIdfy4gp9PDSSLICPXZdrjk7hMB9L0A=";
+    hash = "sha256-deGIcij3Tczsqc0HTBGUbncdUXKP+FGj5R+2fevQULA=";
   };
 
-  cargoHash = "sha256-mLpihgQ5PNRE72xWRHgcA8KxujR7Pi4bGnwahOQJ4qo=";
+  cargoHash = "sha256-MYaKNoz8h5bt0/Z+8PwLKZDvIWUUCfsvB5vibMaDmf4=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index e018d00fc245..8b4658f822a8 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.217",
-  "commit": "9963b018d22c3e6659c99e135e687870301b5c67",
-  "buildDate": "2026-07-21T18:45:36Z",
+  "version": "2.1.218",
+  "commit": "bce61b433bc397ce68686368abd12f545b0a013a",
+  "buildDate": "2026-07-22T18:42:19Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "5840c777fd47115e9ca276e165563c6e121e7c7e2b4d86598e0025f8cc37de56",
-      "size": 250456784
+      "checksum": "71abaff59312c9a9b6a1d818365048b42e4e95cc521a823660eded3e0880d9b7",
+      "size": 255069680
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "8387a6fd44edfd40d7e74c5fdc3270a15f5e6b1b58c7c6fee560e70d3d1943da",
-      "size": 259908496
+      "checksum": "9862b74a083e8a4ed572f99cbd4895185e0dd5a0a601affb0fb8e43d8d1f40e6",
+      "size": 264548368
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "40c53507ac669c1d438366c19760c22f52748a06e50e0fc0e353d2cb73425597",
-      "size": 265337760
+      "checksum": "295fd30481bd03b38450fdec2a6e25bb6472c2074f04b0c4a566cd5988f230bf",
+      "size": 269990816
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "2630fc5dc6db61bc03f86b95daf47766e5ed5b61873f7bb7cfea764c5ac5a9ba",
-      "size": 268573680
+      "checksum": "e12071751a9336b8af1012c103358ff04ac18f9aaff4a738cff7ba5cdfaf63f2",
+      "size": 273177584
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "e219a631e194e71bccbea2f81f5678c75f745aa6e7a74e8a407610c906d1299b",
-      "size": 258585960
+      "checksum": "efcaae48f8f537a0e9a47b4317a5f8c184706c99ddd8ca0a9a21391e2a766ef8",
+      "size": 263239016
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "7c44188927edbf7b918b41bc7a284292359b1ad556b7802db0148adb4b395732",
-      "size": 263197264
+      "checksum": "62986293277153f5db97404cf7e3e96de136f02c28f79ccd5c7bc99766224db4",
+      "size": 267801168
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "6e4a3a4679f381178a90cf741de9ce924a3274304b09277695ac3a679628ca17",
-      "size": 259460768
+      "checksum": "81fcf59bb7abb558aedc6f2361f4723b3d757d28e799962d88b18b4520df66ca",
+      "size": 263931552
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "f0128e1a50b8d7dec5bb4dbdff0ef622f617e798df61ebb009ed3f03d2afe613",
-      "size": 253836448
+      "checksum": "a7959fd87feb9557d56f4e5752f7ed1ddf405f3bea91b2571bf93af636efd193",
+      "size": 258307232
     }
   },
   "sdkCompat": {
@@ -67,7 +67,8 @@
       "0.3.207",
       "0.3.208",
       "0.3.209",
-      "0.3.215"
+      "0.3.215",
+      "0.3.217"
     ],
     "harnessSchema": 1
   }
diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index fbd4c958f9e2..02ea666b856e 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,16 +16,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.57.1";
+  version = "1.61.0";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wRXF2bnl3xFJtuESJX2UVSsPwl4xo6E+k7nIdtzCULo=";
+    hash = "sha256-BbyaZw+OvC6rb60Z2whhHj2iKow/ZJJ8VzuwPX7bHIE=";
   };
 
-  vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";
+  vendorHash = "sha256-KYjP6qEINdSlcDSEMKxMwDfXzuQPAQSe4oZh+o4PrFs=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index a77ef572e61e..14b7473e245b 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,18 +1,18 @@
 {
-  "version": "3.12.17",
+  "version": "3.12.30",
   "vscodeVersion": "1.128.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/0fb762053c34788bb7760d5673f8a6d4c8589d52/linux/x64/Cursor-3.12.17-x86_64.AppImage",
-      "hash": "sha256-Fu00p0vaLNOl9wbGgtseLwhseXxmIQMyyhlNF7VZ+qM="
+      "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/linux/x64/Cursor-3.12.30-x86_64.AppImage",
+      "hash": "sha256-7gyF8YtWLjFOjAxhqip2fVxTbaBj/4FtLsjw2JpTOD8="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/0fb762053c34788bb7760d5673f8a6d4c8589d52/linux/arm64/Cursor-3.12.17-aarch64.AppImage",
-      "hash": "sha256-/r6lFrSq7aSefGvOWqLw/YmyUy3VocaWRyOUHoHuSeM="
+      "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/linux/arm64/Cursor-3.12.30-aarch64.AppImage",
+      "hash": "sha256-UKPf2q4py0pN5FlgdwGbTEKA52T7iJpM63z2kemz9h8="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/0fb762053c34788bb7760d5673f8a6d4c8589d52/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-WaUBglq+Jqa1Cn0sx62ccbBSKhYiBz1u1PjdHxcfQKE="
+      "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-uxAWl5wJISEbGSv7yHys29NZDquLe7z6wMNb61HC/7g="
     }
   }
 }
diff --git a/pkgs/by-name/co/conduktor/package.nix b/pkgs/by-name/co/conduktor/package.nix
deleted file mode 100644
index ee86a659cacd..000000000000
--- a/pkgs/by-name/co/conduktor/package.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchzip,
-  jdk11,
-  openjfx17,
-  gtk3,
-  glib,
-  pango,
-  cairo,
-  gdk-pixbuf,
-  libxtst,
-  makeBinaryWrapper,
-  makeDesktopItem,
-  copyDesktopItems,
-}:
-
-let
-  openjfx_jdk = openjfx17.override { withWebKit = true; };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "conduktor";
-  version = "2.24.9";
-
-  src = fetchzip {
-    url = "https://github.com/conduktor/builds/releases/download/v${finalAttrs.version}/Conduktor-linux-${finalAttrs.version}.zip";
-    hash = "sha256-c9QjlKPZpeJi5YTq4gm+sg7my4EP0LI95AfGguF4ork=";
-  };
-
-  nativeBuildInputs = [
-    makeBinaryWrapper
-    copyDesktopItems
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      type = "Application";
-      name = "conduktor";
-      desktopName = "Conduktor";
-      genericName = finalAttrs.meta.description;
-      exec = "conduktor";
-      icon = fetchurl {
-        url = "https://github.com/conduktor/builds/raw/v${finalAttrs.version}/.github/resources/Conduktor.png";
-        hash = "sha256-mk4c9ecookRb7gR56cedIWfPfQy2uGF+ZbX6NI90KI0=";
-      };
-      comment = "A beautiful and fully-featured desktop client for Apache Kafka";
-    })
-  ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r . $out
-    wrapProgram $out/bin/conduktor \
-      --set JAVA_HOME ${jdk11.home} \
-      --set LD_LIBRARY_PATH ${
-        lib.makeLibraryPath [
-          openjfx_jdk
-          gtk3
-          gtk3
-          glib
-          pango
-          cairo
-          gdk-pixbuf
-          libxtst
-        ]
-      } \
-       --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Apache Kafka Desktop Client";
-    longDescription = ''
-      Conduktor is a GUI over the Kafka ecosystem, to make the development
-      and management of Apache Kafka clusters as easy as possible.
-    '';
-    homepage = "https://www.conduktor.io/";
-    changelog = "https://www.conduktor.io/changelog/#${finalAttrs.version}";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ trobert ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index a69e2ac226df..89f552e48e54 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,12 +21,12 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2026-07-06";
+  version = "0-unstable-2026-07-15";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "1378aabfc63333547e87b788a8204511da243166";
-    hash = "sha256-7cfiXOPlNHLIVHBW+y7WnYgdcxErtJeLBxPey/3uA1w=";
+    rev = "ffbf0df34699f9670db015962bac83d0d417d7e7";
+    hash = "sha256-4z1TXMGOvOMUAED1gluugHPF4mBigjDioxnFneQOIS8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix
index a98087d61091..7b0fadbbdbc3 100644
--- a/pkgs/by-name/ct/ctx7/package.nix
+++ b/pkgs/by-name/ct/ctx7/package.nix
@@ -16,7 +16,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ctx7";
-  version = "0.5.4";
+  version = "0.5.5";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "upstash";
     repo = "context7";
     tag = "${finalAttrs.pname}@${finalAttrs.version}";
-    hash = "sha256-yyz4UraRm1JR/C7J2ib0nBU6zsNpKCWIWduTu7OlebM=";
+    hash = "sha256-Ea281W/CT/TfFNFMKV7xQzXnMo/25mCAB/Gs9ofyUU4=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-S+TCwe4FJHjSLTUL/cPh+eRtWx/z7REUyfMNT0BgK7k=";
+    hash = "sha256-F1A0y4uZczVqzce0FfugCaU5Y2qqMZQXy7T6oqlgkbA=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/cu/cutter/package.nix b/pkgs/by-name/cu/cutter/package.nix
index 3da5d1f86b02..4872bb232346 100644
--- a/pkgs/by-name/cu/cutter/package.nix
+++ b/pkgs/by-name/cu/cutter/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   stdenv,
   # for passthru.plugins
   pkgs,
@@ -19,24 +18,16 @@
 let
   cutter = stdenv.mkDerivation rec {
     pname = "cutter";
-    version = "2.4.1";
+    version = "2.5.0";
 
     src = fetchFromGitHub {
       owner = "rizinorg";
       repo = "cutter";
       rev = "v${version}";
-      hash = "sha256-fNOznaFzWJ4Dve9U1+E4xPaznnyxae2jHNaBCdJzDyQ=";
+      hash = "sha256-dnVbtAp7TorPQx4qdK43L2pXMcnWvOYjhRC3MJBrAmM=";
       fetchSubmodules = true;
     };
 
-    patches = [
-      (fetchpatch2 {
-        name = "fix-shiboken6-type-index-case.patch";
-        url = "https://github.com/rizinorg/cutter/commit/07fea9c772dc573588dc2e5771f0740ee1883738.patch?full_index=1";
-        hash = "sha256-/C/s+Ui5F7MCxbzbChQ5Tv/oUHUQxXmk9xOnNI80xwQ=";
-      })
-    ];
-
     nativeBuildInputs = [
       cmake
       pkg-config
diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index d9a0d8cf3769..99bf8dd2db2e 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "earlybird";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P8kA9MJA+2jtVOYLBu0oG9xTUTGCtiX4R+4ecmXDAAw=";
+    hash = "sha256-Wjvg0+IQHIB5wFwY+4grTOagk5fHMf6YlIB83Jv/ZwE=";
   };
 
   vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o=";
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index c11097e00aab..1a3478d04f87 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   nix-update-script,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   makeWrapper,
@@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-2nKpmGxC+KVg0oF0BsswS9L84QxzpRF7NvKyqyQ7WJM=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-scJhcZDyqUVdKv/EQvB5+EJN/SvMw220+QOcTUxTFJQ=";
   };
 
   nativeBuildInputs = [
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
     makeWrapper
   ];
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper ${lib.getExe nodejs} $out/bin/etherpad-lite \
       --inherit-argv0 \
       --add-flags "--require tsx/cjs $out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node/server.ts" \
-      --suffix PATH : "${lib.makeBinPath [ pnpm_9 ]}" \
+      --suffix PATH : "${lib.makeBinPath [ pnpm_10 ]}" \
       --set NODE_PATH "$out/lib/node_modules:$out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node_modules" \
       --set-default NODE_ENV production
     find $out/lib -xtype l -delete
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index 0a9330e7b43a..0da92f263656 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "exim";
-  version = "4.99.4";
+  version = "4.99.5";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/exim-${finalAttrs.version}.tar.xz";
-    hash = "sha256-h/84gVcA37HuTrfo26eRbfenVZBTVNLQ+qGuF5DE/Z0=";
+    hash = "sha256-wtL4Ctx8cdQk/YKkZlXqotfZtMoud4g+upB2lHt+5ic=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index ca41bc3ee420..171bfe18f7b2 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -24,13 +24,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "faas-cli";
-  version = "0.18.10";
+  version = "0.18.11";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = finalAttrs.version;
-    sha256 = "sha256-MctMhuaXJpm25VKqlhaAPG2QzSDQ//Ei8B1lRCKdz68=";
+    sha256 = "sha256-4bfp9nM6cAglx9mNzjQZ4uo6nJNWI9Q9g9zIdkev9FM=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix
index 0e44d761a1e2..1322c7da4c64 100644
--- a/pkgs/by-name/fi/firezone-server/package.nix
+++ b/pkgs/by-name/fi/firezone-server/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   beam27Packages,
   gitMinimal,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -34,10 +34,10 @@ beam27Packages.mixRelease rec {
 
   pnpmDeps = fetchPnpmDeps {
     inherit pname version;
-    pnpm = pnpm_9;
+    pnpm = pnpm_10;
     src = "${src}/apps/web/assets";
-    fetcherVersion = 3;
-    hash = "sha256-tB0y3T/dZBe8BHz7AV913zQ4oQu7VLyqHCnzBycNg18=";
+    fetcherVersion = 4;
+    hash = "sha256-Uq6dAYYWT8G6upYcNEzVc8Gb2HUj8SaWRD0/w0quaRE=";
   };
   pnpmRoot = "apps/web/assets";
 
@@ -63,7 +63,7 @@ beam27Packages.mixRelease rec {
 
   nativeBuildInputs = [
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
     nodejs
   ];
 
diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index c297c4e01e00..307dd9b21398 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -30,13 +30,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "frankenphp";
-  version = "1.12.4";
+  version = "1.12.5";
 
   src = fetchFromGitHub {
     owner = "php";
     repo = "frankenphp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DzncOAhdDyc5qOipMI8OPss0WciAQIam6GmaUoe8mR8=";
+    hash = "sha256-1f+3w9x6P1euUZr4hC4jOkgEJEbS/MJ11u+chGShCno=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/caddy";
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
   # frankenphp requires C code that would be removed with `go mod tidy`
   # https://github.com/golang/go/issues/26366
   proxyVendor = true;
-  vendorHash = "sha256-XY5a8pd5vJ/ouZMASzVqPoeXVfPbnEVDJFKkVNQF+2M=";
+  vendorHash = "sha256-d6ZTi1Ihu011eKVdHMiW9oSdPB4SYpDHMFxH65XLGac=";
 
   buildInputs = [
     phpUnwrapped
diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index efe62d5ca082..ed4e7f35e84e 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.25.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-oXa+3BXLVDTaLUzt0imgTtZ4/NywibFzul/y0wymnWk=";
+    hash = "sha256-CQiwAoOJoAZpcDIwqcOfUAvJHLWTdj8fIInlR3qyjg8=";
   };
 
   __structuredAttrs = true;
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-xHlxmeMtMd9/ImheeMH1K22MC0zmIzzgAHXzK+tLnQc=";
+    hash = "sha256-NWCgUjBuSeEl65mmAeJzOyIxCi2ha0Nr5qjOQq+CtMQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix
index 08f5cb920367..2a3f171e161e 100644
--- a/pkgs/by-name/gi/gitea-actions-runner/package.nix
+++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitea-actions-runner";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "runner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jkK61OZgbMDHD5yxrpyP1BWCVzDiR79dVaC5ItS99BU=";
+    hash = "sha256-aiba7Tdyyy8aDzJq62zOWNkEZE+twIxReW7clbIoVTI=";
   };
 
-  vendorHash = "sha256-5K0vL0CDYgL/Ud7i4um3mz887Er4qmuhCd9dt5zyUHA=";
+  vendorHash = "sha256-Zpq/G/SZ959SRUIMGo2votFv4DzB46OmPmZwFoae3gU=";
 
   # Tests require network access (artifactcache tests try to determine outbound IP)
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 6f7021ae3974..01f8f222233e 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGo125Module rec {
   pname = "gitlab-container-registry";
-  version = "4.39.0";
+  version = "4.40.2";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo125Module rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-7dGKV2Pc3OPdM4OZqYjp3B9/s6DHtPvrqcWnWb3wHYw=";
+    hash = "sha256-k94uEM2VoOtdFRXWm6CDmeRt8LMXSNegRGes3ZKPg0I=";
   };
 
-  vendorHash = "sha256-s08LsgYZTRJm0sWkbEUsmTYGkfb/5PJl9o9ozY1KOms=";
+  vendorHash = "sha256-MD98JYwTo/t5/E7clIlUfjmv8t7nDPpVElbuYDRjMMc=";
 
   excludedPackages = [
     "devvm/*"
diff --git a/pkgs/by-name/go/godotpcktool/package.nix b/pkgs/by-name/go/godotpcktool/package.nix
index 8ca38733ce0f..8a3418012e48 100644
--- a/pkgs/by-name/go/godotpcktool/package.nix
+++ b/pkgs/by-name/go/godotpcktool/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "godotpcktool";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "hhyyrylainen";
     repo = "GodotPckTool";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H0v432PyKscazR9PN5d+MmYZ8ND497m3RHmWpw16UY4=";
+    hash = "sha256-v8etiUKVxSgVSB3ARqdLgbp3SEC12xBf0HXDl1RJRug=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/he/headlamp-frontend/package.nix b/pkgs/by-name/he/headlamp-frontend/package.nix
index 68b611156846..10866da81cbb 100644
--- a/pkgs/by-name/he/headlamp-frontend/package.nix
+++ b/pkgs/by-name/he/headlamp-frontend/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage {
 
   sourceRoot = "${headlamp-server.src.name}/frontend";
 
-  npmDepsHash = "sha256-73xc/GK1Cvz67D6ftYVRe5GARNgG5qD86CGK6uhoyWA=";
+  npmDepsHash = "sha256-v8aMlOk2JD2DzcUMWTK+2QP44n1Nl0LQPcIry7W51vg=";
 
   postPatch = ''
     chmod -R u+w ../app
diff --git a/pkgs/by-name/he/headlamp-server/package.nix b/pkgs/by-name/he/headlamp-server/package.nix
index ce86de1ab9a9..5abca97e1995 100644
--- a/pkgs/by-name/he/headlamp-server/package.nix
+++ b/pkgs/by-name/he/headlamp-server/package.nix
@@ -2,11 +2,13 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update,
+  writeShellScript,
 }:
 
 buildGoModule rec {
   pname = "headlamp-server";
-  version = "0.42.0";
+  version = "0.43.0";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -15,12 +17,12 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = "headlamp";
     tag = "v${version}";
-    hash = "sha256-SBPSh6dsKvMw1C80THri0mNPoTMgcrjONk455S/g9v0=";
+    hash = "sha256-6TGKBKR0WR4Xv7lGCgMFVG/nc19oMOP5cJcgT0bw6Ag=";
   };
 
   modRoot = "backend";
 
-  vendorHash = "sha256-dBU053QtUEMWjzkOEHzELH3j7PJOKuoBZCVZFmZ5z7E=";
+  vendorHash = "sha256-U0H1Dj38ajRGFqcWszveWckxenaKa4nrPg81GyIpS0U=";
 
   # Don't embed frontend - Electron serves it directly. This also prevents
   # the server from auto-opening a browser window.
@@ -38,6 +40,14 @@ buildGoModule rec {
     mv $out/bin/cmd $out/bin/headlamp-server
   '';
 
+  # headlamp-frontend and headlamp inherit src (and version) from here, update their hashes aswell
+  passthru.updateScript = writeShellScript "headlamp-update" ''
+    set -euo pipefail
+    ${lib.getExe nix-update} headlamp-server
+    ${lib.getExe nix-update} --version=skip --no-src headlamp-frontend
+    ${lib.getExe nix-update} --version=skip --no-src headlamp
+  '';
+
   meta = {
     description = "An easy-to-use and extensible Kubernetes web UI";
     homepage = "https://headlamp.dev";
diff --git a/pkgs/by-name/he/headlamp/package.nix b/pkgs/by-name/he/headlamp/package.nix
index 4991f3e61205..6a5fef440f67 100644
--- a/pkgs/by-name/he/headlamp/package.nix
+++ b/pkgs/by-name/he/headlamp/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage {
 
   sourceRoot = "${headlamp-server.src.name}/app";
 
-  npmDepsHash = "sha256-k7rABbEmYY24k/obKm1GZUnM0Udjtyv2bhrVEvc0ebc=";
+  npmDepsHash = "sha256-gZr+ni3dmrjqHDwoFxgGM0/Kf3R1Qy2SZetLtGtDY+0=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix
index 854ac3a19e22..0a9b504bdcce 100644
--- a/pkgs/by-name/he/herdr/package.nix
+++ b/pkgs/by-name/he/herdr/package.nix
@@ -12,7 +12,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "herdr";
-  version = "0.7.4";
+  version = "0.7.5";
 
   __structuredAttrs = true;
 
@@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ogulcancelik";
     repo = "herdr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dBOQYLFitJ+E3XNz44Ag3CIrBxFj16CmVPp7qil0ssg=";
+    hash = "sha256-3BA8eredGku+vsL2Af7sUf43QiArR5XTHNrI+X11vFM=";
   };
 
-  cargoHash = "sha256-XHzZy2tKLbMQy4POmXowUcGf77ZPunG/oQ3P2wOoVls=";
+  cargoHash = "sha256-lWnc0Ka0hp7bbm+dkKKj22Dbk+Cwrld86romXs3lzBs=";
 
   zigDeps = zig_0_15.fetchDeps {
     inherit (finalAttrs) pname version;
     src = "${finalAttrs.src}/vendor/libghostty-vt";
     fetchAll = true;
-    hash = "sha256-pgGu8+NwvFcj6SrN4VaTHLeHdA7QY731ctyrHZwgFAc=";
+    hash = "sha256-PnM+hZIlLyQwK8vJgd/Bhjt1lNIz06T8FahwliRmMrY=";
   };
 
   nativeBuildInputs = [
@@ -77,7 +77,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://herdr.dev";
     changelog = "https://github.com/ogulcancelik/herdr/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ kevinpita ];
+    maintainers = with lib.maintainers; [
+      kevinpita
+      faukah
+    ];
     mainProgram = "herdr";
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/hy/hyprmag/package.nix b/pkgs/by-name/hy/hyprmag/package.nix
new file mode 100644
index 000000000000..e3a459496f62
--- /dev/null
+++ b/pkgs/by-name/hy/hyprmag/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  cmake,
+  pkg-config,
+  wayland-scanner,
+  cairo,
+  libGL,
+  libjpeg,
+  libxkbcommon,
+  pango,
+  wayland,
+  wayland-protocols,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "hyprmag";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "SIMULATAN";
+    repo = "hyprmag";
+    tag = finalAttrs.version;
+    hash = "sha256-IHYxQeCcPH2XoRyTgFEi+HVlWGVAnaTdS0Jf96H9PNU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    cairo
+    libGL
+    libjpeg
+    libxkbcommon
+    pango
+    wayland
+    wayland-protocols
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "wlroots-compatible Wayland screen magnifier, based on hyprpicker";
+    homepage = "https://github.com/SIMULATAN/hyprmag";
+    changelog = "https://github.com/SIMULATAN/hyprmag/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ samiser ];
+    mainProgram = "hyprmag";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/hy/hyprmagnifier/package.nix b/pkgs/by-name/hy/hyprmagnifier/package.nix
deleted file mode 100644
index 48042f069a6c..000000000000
--- a/pkgs/by-name/hy/hyprmagnifier/package.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  wayland,
-  wayland-protocols,
-  wayland-scanner,
-  hyprwayland-scanner,
-  libxkbcommon,
-  pango,
-  libjpeg,
-  hyprutils,
-  nix-update-script,
-}:
-
-stdenv.mkDerivation {
-  pname = "hyprmagnifier";
-  version = "0.0.1-unstable-2025-05-16";
-
-  src = fetchFromGitHub {
-    owner = "st0rmbtw";
-    repo = "hyprmagnifier";
-    rev = "ce05ed35a1a7f9df976be7ee604d291ddad9c91c";
-    hash = "sha256-vsQnL3R7lPKsUlDQKXirWMj/3qI377g7PkKlN+eVDTI=";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    hyprwayland-scanner
-  ];
-
-  buildInputs = [
-    wayland
-    wayland-protocols
-    wayland-scanner
-    hyprwayland-scanner
-    libxkbcommon
-    pango
-    libjpeg
-    hyprutils
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "wlroots-compatible Wayland magnifier that does not suck";
-    homepage = "https://github.com/st0rmbtw/hyprmagnifier";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      matthewcroughan
-    ];
-    mainProgram = "hyprmagnifier";
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/by-name/i3/i3-rounded/package.nix b/pkgs/by-name/i3/i3-rounded/package.nix
index 01b0e3e4d5aa..92b1046fa1f3 100644
--- a/pkgs/by-name/i3/i3-rounded/package.nix
+++ b/pkgs/by-name/i3/i3-rounded/package.nix
@@ -2,21 +2,24 @@
   fetchFromGitHub,
   lib,
   i3,
-  pcre,
+  pcre2,
 }:
 
+let
+  version = "4.21.1";
+in
 i3.overrideAttrs (oldAttrs: {
   pname = "i3-rounded";
-  version = "4.21.1";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "LinoBigatti";
     repo = "i3-rounded";
-    rev = "524c9f7b50f8c540b2ae3480b242c30d8775f98e";
-    hash = "sha256-lceeP+WZtBLNSDqcNn18MROLtBwj+nXufDs55IMO9Xg=";
+    rev = "v${version}";
+    hash = "sha256-KMpejS89Hg6Mrm94HTNA9mV/6Leu1yo2W1CsD6vGDRo=";
   };
 
-  buildInputs = oldAttrs.buildInputs ++ [ pcre ];
+  buildInputs = oldAttrs.buildInputs ++ [ pcre2 ];
 
   # Some tests are failing.
   doCheck = false;
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 1aaa10968a14..b5b50d51b8e9 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -21,7 +21,6 @@
   libxml2,
   libglut,
   libsamplerate,
-  pcre,
   libevent,
   libedit,
   yajl,
@@ -81,7 +80,6 @@ stdenv.mkDerivation {
     libxml2
     libglut
     libsamplerate
-    pcre
     libevent
     libedit
     yajl
diff --git a/pkgs/by-name/ji/jiratui/package.nix b/pkgs/by-name/ji/jiratui/package.nix
index a9652114ab64..407fb5c1bafa 100644
--- a/pkgs/by-name/ji/jiratui/package.nix
+++ b/pkgs/by-name/ji/jiratui/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "jiratui";
-  version = "1.3.0";
+  version = "1.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "whyisdifficult";
     repo = "jiratui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b5bSMPnqHqpeFDl501gSun7G38OlhV/IMNMYXQT+j/4=";
+    hash = "sha256-yXVc3evYK3lbiLwn09M++lZfbb5F9bXSR5ge6Pfgs6w=";
   };
 
   postPatch = ''
@@ -32,19 +32,28 @@ python3Packages.buildPythonApplication (finalAttrs: {
       click
       gitpython
       httpx
-      pyaml
+      marklas
+      puremagic
       pydantic-settings
       python-dateutil
       python-json-logger
-      python-magic
+      pyyaml
       textual
+      textual-autocomplete
       textual-image
+      urllib3
       xdg-base-dirs
     ]
     ++ textual.optional-dependencies.syntax;
 
   pythonRelaxDeps = [
     "click"
+    "marklas"
+    # upstream wants puremagic >= 2.2.0 but only uses puremagic.magic_string,
+    # which is compatible with 1.x; drop once puremagic >= 2.2.0 lands
+    "puremagic"
+    "pydantic-settings"
+    "python-json-logger"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 3b36c50c5afb..4ed203ba3761 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kcl";
-  version = "0.12.4";
+  version = "0.12.7";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jtAfFwgtIP2sJRH4RcGTgVn/S5yvA15q3u2xeWus/8s=";
+    hash = "sha256-HPydO/gBJkMsqR3Eb3ymKprm5x7tr9//IKT052hiDNA=";
   };
 
-  vendorHash = "sha256-aKXfVDu3uTEeSzs4nVWQMUj+HaVkzk+iTr+lti+Yb6E=";
+  vendorHash = "sha256-46qLRdB0epfZPuvNVYaLIAiTkI9kbAS6OM9OYC8cmmE=";
 
   subPackages = [ "cmd/kcl" ];
 
diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix
index 677d51238628..bc74c936a3ab 100644
--- a/pkgs/by-name/ke/kermit-terminal/package.nix
+++ b/pkgs/by-name/ke/kermit-terminal/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   gtk3,
-  pcre,
   pkg-config,
   vte,
   nixosTests,
@@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk3
-    pcre
     vte
   ];
 
diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix
index 80075abbc1eb..cfb248f4bc35 100644
--- a/pkgs/by-name/kp/kphotoalbum/package.nix
+++ b/pkgs/by-name/kp/kphotoalbum/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   fetchurl,
   lib,
+  cmake,
   exiv2,
   ffmpeg,
   libvlc,
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    cmake
     kdePackages.extra-cmake-modules
     kdePackages.wrapQtAppsHook
   ];
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 70a5fde765ef..6f36fad0241c 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeltachat";
-  version = "2.55.0";
+  version = "2.56.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Iy0VeWfD0GXdQiGZbn95p9SJ4MUSYBwsYLnI5NvgUl4=";
+    hash = "sha256-qdkCv3MooW2tieg6ivJHjh7uTVzWcwDM3aV5u2rIqOw=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-BfvLWldH4gbnB/ehywB40Ho1IZB/Kv5szmtMTVRsvqk=";
+    hash = "sha256-tETJAlwRmKgC1BRFtqQe2PNqpsGKaYeAfKA4kFog5+8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libgaminggear/package.nix b/pkgs/by-name/li/libgaminggear/package.nix
index 30ad21ee8d29..ad8945f0f0f5 100644
--- a/pkgs/by-name/li/libgaminggear/package.nix
+++ b/pkgs/by-name/li/libgaminggear/package.nix
@@ -9,7 +9,6 @@
   gtk2,
   libcanberra,
   libnotify,
-  pcre,
   sqlite,
   libxdmcp,
   libpthread-stubs,
@@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     gtk2
     libcanberra
     libnotify
-    pcre
     sqlite
     libxdmcp
     libpthread-stubs
diff --git a/pkgs/by-name/li/libghostty-vt/deps.nix b/pkgs/by-name/li/libghostty-vt/deps.nix
index d4bbdf97a44c..1229b3fe8d8c 100644
--- a/pkgs/by-name/li/libghostty-vt/deps.nix
+++ b/pkgs/by-name/li/libghostty-vt/deps.nix
@@ -192,11 +192,11 @@ linkFarm name [
     };
   }
   {
-    name = "N-V-__8AAL6FAwBDPampKgDjoxlJYDIn2jv0VaINS4W6CXJN";
+    name = "N-V-__8AALZGBAAS5NLVH-c8eC-6VtCdcH-9nUvVfUSkWS__";
     path = fetchZigArtifact {
       name = "iterm2_themes";
-      url = "https://deps.files.ghostty.org/ghostty-themes-release-20260323-152405-a2c7b60.tgz";
-      hash = "sha256-fWgXdUXh2/dNZqERzEu9hz4xyy4nl+GUjLMpUMrsRnA=";
+      url = "https://deps.files.ghostty.org/ghostty-themes-release-20260713-155359-c3968b3.tgz";
+      hash = "sha256-FLMES+9no8uDUjlzvRbTqg+wCW3dHg7Lo5FtFNbWfyA=";
       unpack = false;
     };
   }
diff --git a/pkgs/by-name/li/libghostty-vt/package.nix b/pkgs/by-name/li/libghostty-vt/package.nix
index b6e629a50634..5132cad9839f 100644
--- a/pkgs/by-name/li/libghostty-vt/package.nix
+++ b/pkgs/by-name/li/libghostty-vt/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libghostty-vt";
-  version = "0.1.0-unstable-2026-05-03";
+  version = "0.1.0-unstable-2026-07-20";
 
   src = fetchFromGitHub {
     owner = "ghostty-org";
     repo = "ghostty";
-    rev = "1547dd667ab6d1f4ebcdc7282adc54c95752ee67";
-    hash = "sha256-dZFc+8az7BUIs8+v45XqNnY5G6oXEwVfVVHZQuATSGQ=";
+    rev = "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9";
+    hash = "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8=";
   };
 
   # Zig's build runner computes relative paths from `cwd` to the build directory.
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 65ad27bb78c0..e32438d996c3 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      ramkromberg
       OPNA2608
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/li/libssc/package.nix b/pkgs/by-name/li/libssc/package.nix
index a0bed1bc8a3b..ea84759291a4 100644
--- a/pkgs/by-name/li/libssc/package.nix
+++ b/pkgs/by-name/li/libssc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libssc";
-  version = "0.2.2";
+  version = "0.4.4";
 
   src = fetchFromCodeberg {
     owner = "DylanVanAssche";
     repo = "libssc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vc3phLAURKXAVD/o4uiGkBtJ3wsbLEfkwygMltEhqug=";
+    hash = "sha256-C9A0NtkGztSJQIkv4diGAPhZMUiIUszRNYif2yZL8nI=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
deleted file mode 100644
index 8ddee3abf8d9..000000000000
--- a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt
-index 57aebb0..11c4ca7 100644
---- a/greeter/CMakeLists.txt
-+++ b/greeter/CMakeLists.txt
-@@ -1,6 +1,6 @@
- project (greeter)
--cmake_minimum_required (VERSION 2.8)
--cmake_policy (VERSION 2.8)
-+cmake_minimum_required (VERSION 3.10)
-+cmake_policy (VERSION 3.10)
- 
- enable_testing ()
- 
-@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- set (CONF_DIR "/etc/lightdm")
- set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
- set (PKGDATADIR "${DATADIR}/enso/greeter")
--set (CMAKE_INSTALL_PREFIX /usr)
- set (VERSION "1.0.6")
- 
- 
-@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
- add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
- target_link_libraries(pantheon-greeter m)
- 
--install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
-+install (TARGETS pantheon-greeter RUNTIME DESTINATION bin)
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR})
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm)
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR})
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR})
diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
deleted file mode 100644
index 91bbedc0e5dd..000000000000
--- a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  linkFarm,
-  lightdm-enso-os-greeter,
-  dbus,
-  pcre,
-  libepoxy,
-  libxdmcp,
-  libx11,
-  libpthread-stubs,
-  at-spi2-core,
-  libxklavier,
-  libxkbcommon,
-  gtk3,
-  vala,
-  cmake,
-  libgee,
-  lightdm,
-  gdk-pixbuf,
-  clutter-gtk,
-  wrapGAppsHook3,
-  librsvg,
-}:
-
-stdenv.mkDerivation {
-  pname = "lightdm-enso-os-greeter";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "nick92";
-    repo = "Enso-OS";
-    rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";
-    sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY=";
-  };
-
-  patches = [
-    ./fix-paths.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    vala
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    dbus
-    gtk3
-    pcre
-    libepoxy
-    libgee
-    libx11
-    lightdm
-    libxdmcp
-    gdk-pixbuf
-    clutter-gtk
-    libxklavier
-    at-spi2-core
-    libxkbcommon
-    libpthread-stubs
-    librsvg
-  ];
-
-  preConfigure = ''
-    cd greeter
-  '';
-
-  passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [
-    {
-      path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop";
-      name = "pantheon-greeter.desktop";
-    }
-  ];
-
-  postFixup = ''
-    substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \
-      --replace "pantheon-greeter" "$out/bin/pantheon-greeter"
-  '';
-
-  meta = {
-    description = ''
-      A fork of pantheon greeter that positions elements in a central and
-      vertigal manner and adds a blur effect to the background
-    '';
-    mainProgram = "pantheon-greeter";
-    homepage = "https://github.com/nick92/Enso-OS";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [
-      eadwu
-    ];
-  };
-}
diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix
index ed62aebb3996..6525511d748f 100644
--- a/pkgs/by-name/li/listmonk/package.nix
+++ b/pkgs/by-name/li/listmonk/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     owner = "knadh";
     repo = "listmonk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eora/+zJf60trmANEqAhYAQXfEMifyw5gLPKcqBW46w=";
+    hash = "sha256-yLOs1vhTV/0zzq/2Rk5rJ3/1z+kE5xaYODM5NO06F6U=";
   };
 
   vendorHash = "sha256-t4l8872bniTmNIW4ias1gImURJgrR6htXkncqfrJ+AU=";
diff --git a/pkgs/by-name/ma/mailspring/bump-yauzl.patch b/pkgs/by-name/ma/mailspring/bump-yauzl.patch
deleted file mode 100644
index 1a3fc9ab0489..000000000000
--- a/pkgs/by-name/ma/mailspring/bump-yauzl.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff --git a/app/package-lock.json b/app/package-lock.json
-index 9b5b874..bc446b7 100644
---- a/app/package-lock.json
-+++ b/app/package-lock.json
-@@ -570,16 +570,6 @@
-         "ieee754": "^1.1.13"
-       }
-     },
--    "node_modules/buffer-crc32": {
--      "version": "0.2.13",
--      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
--      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
--      "license": "MIT",
--      "peer": true,
--      "engines": {
--        "node": "*"
--      }
--    },
-     "node_modules/buffer-from": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-@@ -1581,16 +1571,6 @@
-       "license": "MIT",
-       "peer": true
-     },
--    "node_modules/fd-slicer": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
--      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
--      "license": "MIT",
--      "peer": true,
--      "dependencies": {
--        "pend": "~1.2.0"
--      }
--    },
-     "node_modules/file-uri-to-path": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-@@ -4575,14 +4555,16 @@
-       }
-     },
-     "node_modules/yauzl": {
--      "version": "2.10.0",
--      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
--      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-+      "version": "3.4.0",
-+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
-+      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
-       "license": "MIT",
-       "peer": true,
-       "dependencies": {
--        "buffer-crc32": "~0.2.3",
--        "fd-slicer": "~1.1.0"
-+        "pend": "~1.2.0"
-+      },
-+      "engines": {
-+        "node": ">=12"
-       }
-     }
-   }
-diff --git a/app/package.json b/app/package.json
-index 115cf61..436527d 100644
---- a/app/package.json
-+++ b/app/package.json
-@@ -77,7 +77,9 @@
-     "@types/react": "^17.0.0",
-     "@types/react-dom": "^17.0.0"
-   },
--  "overrides": {},
-+  "overrides": {
-+    "yauzl": "^3.3.1"
-+  },
-   "optionalDependencies": {
-     "windows-focus-assist": "^1.4.0"
-   }
-diff --git a/package-lock.json b/package-lock.json
-index fdc0d9d..31a4b5f 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -1893,14 +1893,6 @@
-       "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-       "license": "MIT"
-     },
--    "node_modules/buffer-crc32": {
--      "version": "0.2.13",
--      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
--      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
--      "engines": {
--        "node": "*"
--      }
--    },
-     "node_modules/buffer-fill": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-@@ -3446,14 +3438,6 @@
-         "reusify": "^1.0.4"
-       }
-     },
--    "node_modules/fd-slicer": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
--      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
--      "dependencies": {
--        "pend": "~1.2.0"
--      }
--    },
-     "node_modules/file-entry-cache": {
-       "version": "6.0.1",
-       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-@@ -5582,7 +5566,8 @@
-     "node_modules/pend": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
--      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-+      "license": "MIT"
-     },
-     "node_modules/picomatch": {
-       "version": "2.3.2",
-@@ -7403,12 +7388,15 @@
-       }
-     },
-     "node_modules/yauzl": {
--      "version": "2.10.0",
--      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
--      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-+      "version": "3.4.0",
-+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
-+      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
-+      "license": "MIT",
-       "dependencies": {
--        "buffer-crc32": "~0.2.3",
--        "fd-slicer": "~1.1.0"
-+        "pend": "~1.2.0"
-+      },
-+      "engines": {
-+        "node": ">=12"
-       }
-     },
-     "node_modules/yocto-queue": {
-@@ -8663,11 +8651,6 @@
-       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-       "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-     },
--    "buffer-crc32": {
--      "version": "0.2.13",
--      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
--      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
--    },
-     "buffer-fill": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-@@ -9692,7 +9675,7 @@
-         "@types/yauzl": "^2.9.1",
-         "debug": "^4.1.1",
-         "get-stream": "^5.1.0",
--        "yauzl": "^2.10.0"
-+        "yauzl": "^3.3.1"
-       },
-       "dependencies": {
-         "get-stream": {
-@@ -9745,14 +9728,6 @@
-         "reusify": "^1.0.4"
-       }
-     },
--    "fd-slicer": {
--      "version": "1.1.0",
--      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
--      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
--      "requires": {
--        "pend": "~1.2.0"
--      }
--    },
-     "file-entry-cache": {
-       "version": "6.0.1",
-       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-@@ -11158,7 +11133,7 @@
-     "pend": {
-       "version": "1.2.0",
-       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
--      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-     },
-     "picomatch": {
-       "version": "2.3.2",
-@@ -12389,12 +12364,11 @@
-       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-     },
-     "yauzl": {
--      "version": "2.10.0",
--      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
--      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-+      "version": "3.4.0",
-+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
-+      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
-       "requires": {
--        "buffer-crc32": "~0.2.3",
--        "fd-slicer": "~1.1.0"
-+        "pend": "~1.2.0"
-       }
-     },
-     "yocto-queue": {
-diff --git a/package.json b/package.json
-index 58a4e93..f065078 100644
---- a/package.json
-+++ b/package.json
-@@ -82,5 +82,8 @@
-     "test:e2e": "npx playwright test --config playwright/playwright.config.ts",
-     "tsc-watch": "tsc -w -p ./app --noEmit",
-     "build": "node app/build/build.js"
-+  },
-+  "overrides": {
-+    "yauzl": "^3.3.1"
-   }
--}
-\ No newline at end of file
-+}
diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix
index bf4e3ad2f1bd..68483b457314 100644
--- a/pkgs/by-name/ma/mailspring/package.nix
+++ b/pkgs/by-name/ma/mailspring/package.nix
@@ -5,6 +5,7 @@
   callPackage,
   fetchFromGitHub,
 
+  actool,
   makeBinaryWrapper,
   pkg-config,
   wrapGAppsHook3,
@@ -17,19 +18,17 @@
   commandLineArgs ? "",
 }:
 let
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "Foundry376";
     repo = "Mailspring";
     tag = version;
-    hash = "sha256-32d0WIWqCsZlvuT+RDa3EYxkwTxWzQyLIfASiDfZnL8=";
+    hash = "sha256-GbY3lov3MT8c8LehEifzOH28VAYpBWDbwXrqEfFfwJg=";
     fetchSubmodules = true;
   };
 
   patches = [
-    # zip extraction fails on newer nodejs versions without this fix
-    ./bump-yauzl.patch
     ./remove-rpm-deb-and-macos-package-generation.patch
   ];
 
@@ -41,7 +40,7 @@ let
     pname = "mailspring-app";
     inherit version src patches;
     postPatch = "cd app"; # we don't use sourceRoot so that we don't have to make the patch relative to it
-    npmDepsHash = "sha256-/caWmbN4Sl3DVPLXSaXrCHEyRsk/p3FwDqSZ7lfNgUk=";
+    npmDepsHash = "sha256-JkjtC4WT3cBsVlmrfO5WAxU1Xe3vXbxuNBDs2Q7fEck=";
     dontNpmBuild = true;
     env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
@@ -67,13 +66,16 @@ buildNpmPackage (finalAttrs: {
   pname = "mailspring";
   inherit version src patches;
 
-  npmDepsHash = "sha256-nHKFuTdk3qbAiSHksSo++mc8TMasspuym7MYxjuTTHI=";
+  npmDepsHash = "sha256-0cg/DT0MUbfzTq5hejH7auSk77M9Md7FWzidov8iyA4=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
     pkg-config
     wrapGAppsHook3
     zip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    actool
   ];
 
   npmFlags = [ "--ignore-scripts" ];
@@ -133,7 +135,7 @@ buildNpmPackage (finalAttrs: {
       cp -r app/dist/*/resources $out/share/mailspring
 
       install -Dm444 app/dist/Mailspring.desktop $out/share/applications/Mailspring.desktop
-      install -Dm444 app/dist/mailspring.appdata.xml $out/share/metainfo/mailspring.appdata.xml
+      install -Dm444 app/dist/mailspring.metainfo.xml $out/share/metainfo/mailspring.metainfo.xml
 
       for size in 16 32 64 128 256 512; do
         install -Dm444 app/build/resources/linux/icons/$size.png \
diff --git a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch
index 6df9c6519084..feac5cdc8821 100644
--- a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch
+++ b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch
@@ -1,6 +1,6 @@
-From 420f1f58734dbc7305f46b4d8089b461b79321b0 Mon Sep 17 00:00:00 2001
+From e1210102ab3f7bff24d9dfa38ad87b3fe04d0f5e Mon Sep 17 00:00:00 2001
 From: wrench-exile-legacy <user@wrench-exile-legacy.site>
-Date: Mon, 6 Jul 2026 22:40:30 +0100
+Date: Wed, 22 Jul 2026 10:38:53 +0100
 Subject: [PATCH] remove rpm, deb and macos package generation
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] remove rpm, deb and macos package generation
  1 file changed, 17 deletions(-)
 
 diff --git a/app/build/build.js b/app/build/build.js
-index 6d90aa5b2..ffec9cf8b 100644
+index 2e90d5624..d07244d75 100644
 --- a/app/build/build.js
 +++ b/app/build/build.js
-@@ -373,12 +373,6 @@ async function createMacZip() {
+@@ -365,12 +365,6 @@ async function createMacZip() {
    }
    const arch = process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch;
    const cwd = path.join(outputDir, `Mailspring-darwin-${arch}`);
@@ -24,8 +24,8 @@ index 6d90aa5b2..ffec9cf8b 100644
  }
  
  function writeFromTemplate(filePath, data) {
-@@ -422,11 +416,6 @@ async function createDebInstaller() {
-   writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), data);
+@@ -415,11 +409,6 @@ async function createDebInstaller() {
+   writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), data);
  
    const icon = path.join(appDir, 'build', 'resources', 'linux', 'icons', '512.png');
 -  await spawn({
@@ -36,10 +36,10 @@ index 6d90aa5b2..ffec9cf8b 100644
  }
  
  async function createRpmInstaller() {
-@@ -452,12 +441,6 @@ async function createRpmInstaller() {
+@@ -446,12 +435,6 @@ async function createRpmInstaller() {
    writeFromTemplate(path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in'), templateData);
    writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), templateData);
-   writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), templateData);
+   writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), templateData);
 -
 -  await spawn({
 -    cmd: path.join(appDir, 'script', 'mkrpm'),
diff --git a/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix b/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix
index 06360a9a03f4..6214bb0bee33 100644
--- a/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix
+++ b/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   pnpmConfigHook,
   nix-update-script,
   n8n,
@@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
   ];
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-hMjWFjDhc61HGkQOG/q2EU8pPShUhtHSTe+6wUAa5M4=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-jAHeQHUPUzC4NiKl/h7i8UwStyzw2tCKs42ZkeGZVSw=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ne/netproc/package.nix b/pkgs/by-name/ne/netproc/package.nix
index 598d9992458c..8a87123b641d 100644
--- a/pkgs/by-name/ne/netproc/package.nix
+++ b/pkgs/by-name/ne/netproc/package.nix
@@ -3,23 +3,26 @@
   stdenv,
   fetchFromGitHub,
   ncurses,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netproc";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "berghetti";
     repo = "netproc";
     rev = finalAttrs.version;
-    hash = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk=";
+    hash = "sha256-EqCyh0WNz7B2B1SFgFQT2MFk8+OVPsy5n3EFt64HJ+E=";
   };
 
   buildInputs = [ ncurses ];
 
   installFlags = [ "prefix=$(out)" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tool to monitor network traffic based on processes";
     homepage = "https://github.com/berghetti/netproc";
diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index a22fa73bc2dc..26e3f21880b0 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -32,11 +32,11 @@
 }:
 let
   pname = "nextcloud-talk-desktop";
-  version = "2.1.1"; # Ensure both hashes (Linux and Darwin) are updated!
+  version = "2.2.1"; # Ensure both hashes (Linux and Darwin) are updated!
 
   hashes = {
-    linux = "sha256-s6+p21KLoDvcQz0EgV7WYIwYc9JolZpqkxZ8iIol8Yg=";
-    darwin = "sha256-rp6+bYb3Y8yEXYUY+cuDo7Lw6cq/EUnPjLIqscKeULc=";
+    linux = "sha256-AhNHPejdnGmL55/mHGKkDaGWl2fm7uufX4JaB5VSBos=";
+    darwin = "sha256-TkLAydkedLbi6vqd3kvQNkVnXGSHfF6xTBF3PCOgJ6I=";
   };
 
   # Only x86_64-linux is supported with Darwin support being universal
@@ -62,7 +62,7 @@ let
   meta = {
     description = "Nextcloud Talk Desktop Client";
     homepage = "https://github.com/nextcloud/talk-desktop";
-    changelog = "https://github.com/nextcloud/talk-desktop/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/nextcloud/talk-desktop/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ kashw2 ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index c789215e7f9a..1b9afcebbb79 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nix-unit";
-  version = "2.35.0";
+  version = "2.35.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-unit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eXyZw2ddCKT5xMY8SDnV6lkr61zvSc7CNJeJSAjKqN4=";
+    hash = "sha256-jZ6YOb5L7FShPUcq63qDKT3W83mVzAaM2y1V4CLcdq8=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/nu/nu-lint/package.nix b/pkgs/by-name/nu/nu-lint/package.nix
index 84f69553f2b5..40f8eae44a61 100644
--- a/pkgs/by-name/nu/nu-lint/package.nix
+++ b/pkgs/by-name/nu/nu-lint/package.nix
@@ -8,13 +8,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu-lint";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromCodeberg {
     owner = "wvhulle";
     repo = "nu-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5YR1Cn9/psNswLVYtDZGmvoP9AwBANa0sPHN4eqcRhQ=";
+    hash = "sha256-QkOJFjqZtAo4GqZ/khbx0MZQDB0Hh8S3H9r4ln5AxqM=";
   };
 
   cargoHash = "sha256-FA9C7Li4wtXvI8+jDTmdFjqsop6cvGNPByRpOfvQPzw=";
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 7191e168b064..7db9d9ff645b 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.18.3";
+  version = "1.18.4";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wdkzms59oHw3M/Em2RH7BPhZME8AtLmtNFSnsUxO1V4=";
+    hash = "sha256-tGMO5JktINO8kXAHFQftn+JCrzwvpmNipTa8V0aIfNI=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-1NUtprMH8GnSUqQ+mHQSC+JLU7lwzHe6XXYHe129WmE=";
+    outputHash = "sha256-jMZSDlqNObSmWJZ0Xn0IwfYC2+mBbRYorfgD5Y2sHWs=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index b37d21e98c6a..4a9092189fac 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -8,7 +8,7 @@
   moreutils,
   nodejs,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
 
@@ -35,9 +35,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-KJZuucXB7BEMnqPmgytveG/IBEzq4mgMo9ZJHPe/gVs=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-DkVV5Dz5UV/xMuteSXWgSko3e8t8u1Saq1X1UxaaZFA=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs
     pkg-config
     pnpmConfigHook
-    pnpm_9
+    pnpm_10
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix
index f31b71498456..b9eda55de672 100644
--- a/pkgs/by-name/pa/parca/package.nix
+++ b/pkgs/by-name/pa/parca/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   lib,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   stdenv,
@@ -26,16 +26,16 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname src version;
-      pnpm = pnpm_9;
-      fetcherVersion = 3;
-      hash = "sha256-zHdMwJyeafzbIlp+Fhh1khcUVrLsoUg6ViSGm/ByGAA=";
+      pnpm = pnpm_10;
+      fetcherVersion = 4;
+      hash = "sha256-cd9sA01DTXsrKm4enFeS3zmn3w4A5N7QXhtZ0wcpNss=";
     };
 
     nativeBuildInputs = [
       faketty
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm_10
     ];
 
     # faketty is required to work around a bug in nx.
diff --git a/pkgs/by-name/pa/parca/update.sh b/pkgs/by-name/pa/parca/update.sh
index a20292a935e0..f2f03322e119 100755
--- a/pkgs/by-name/pa/parca/update.sh
+++ b/pkgs/by-name/pa/parca/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_9
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq git pnpm_10
 # shellcheck shell=bash
 set -euo pipefail
 nixpkgs="$(pwd)"
diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 326846061102..c23cc9ab473a 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -21,7 +21,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "peertube";
-  version = "8.2.2";
+  version = "8.2.3";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-huyuaCWJ3w1KHCcQFjH2ZcofPjqwjLpLt+dg6auD/dQ=";
+    hash = "sha256-w+mSFr+uobq1TtqfewRmakGMYlEjwLs0k39mWHMbq+Q=";
   };
 
   outputs = [
@@ -170,6 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.agpl3Plus;
     homepage = "https://joinpeertube.org/";
+    changelog = "https://github.com/Chocobozzz/PeerTube/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 1433c9a3dc9d..1d43ec78e00f 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  fetchurl,
   nix-update-script,
   versionCheckHook,
   writableTmpDirAsHomeHook,
@@ -12,16 +13,34 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.80.10";
+  version = "0.81.1";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vs/ndHYzFyfN4CjPV2zMYblLXe9IuM13UrPJI1VsZEQ=";
+    hash = "sha256-xo3uoR7HceOCL3wqoMcacOe8WXP1o7ReAXne5t6Hgao=";
   };
 
-  npmDepsHash = "sha256-XGvDNH+eilsgc0Z7ITqbitB/9RVc+WuDfCcr1pibNqk=";
+  npmDepsHash = "sha256-lzKQZbnITzgV9koucsMno6f61ubBLYUcwQEXtak1r1s=";
+
+  # The provider model catalog (packages/ai/src/providers/data/) is generated by
+  # a network fetch (models.dev plus provider APIs) and is gitignored upstream,
+  # so it is absent from the source tarball. Restore it from the matching
+  # published @earendil-works/pi-ai npm package, which ships the hydrated catalog
+  # under dist/providers/data/. Bump this hash alongside version.
+  modelData = fetchurl {
+    url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${finalAttrs.version}.tgz";
+    hash = "sha256-x53MD5DU370ZdNoz36P+OWZjGVpoM5sfVcEU2/ckDy8=";
+  };
+
+  preConfigure = ''
+    mkdir -p packages/ai/src/providers/data
+    tar --extract --gzip --file=${finalAttrs.modelData} \
+      --directory=packages/ai/src/providers/data \
+      --strip-components=4 \
+      package/dist/providers/data
+  '';
 
   npmWorkspace = "packages/coding-agent";
 
@@ -34,8 +53,8 @@ buildNpmPackage (finalAttrs: {
 
   # Build workspace dependencies in order, then the coding-agent.
   # We invoke tsgo directly for workspace deps to skip pi-ai's
-  # generate-models script which requires network access
-  # (models.generated.ts is committed to the repo).
+  # generate-models script, which requires network access; the model
+  # catalog it would produce is supplied via modelData above.
   buildPhase = ''
     runHook preBuild
 
@@ -96,13 +115,18 @@ buildNpmPackage (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/pi";
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--custom-dep"
+      "modelData"
+    ];
+  };
 
   meta = {
     description = "Coding agent CLI with read, bash, edit, write tools and session management";
     homepage = "https://pi.dev/";
     downloadPage = "https://www.npmjs.com/package/@earendil-works/pi-coding-agent";
-    changelog = "https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md";
+    changelog = "https://github.com/earendil-works/pi/blob/v${finalAttrs.version}/packages/coding-agent/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       munksgaard
diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index 7d48c6754153..07bbf6f3450b 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Command-line interface for managing your Proton Pass vaults, items, and secrets";
     homepage = "https://github.com/protonpass/pass-cli";
-    license = lib.licenses.unfree;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "pass-cli";
     maintainers = with lib.maintainers; [ delafthi ];
     platforms = lib.attrNames finalAttrs.passthru.sources;
diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index c19772fe4d8c..02f8e1764841 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -7,7 +7,6 @@
   glib,
   libbsd,
   check,
-  pcre,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libbsd
     check
-    pcre
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index dd34c1d76d44..5ba463a9a06d 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -13,7 +13,7 @@
   lame,
   libxml2_13,
   libjack2,
-  ffmpeg_4-headless,
+  ffmpeg-headless,
   vlc,
   xdg-utils,
   xdotool,
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
               curl
               lame
               libxml2_13
-              ffmpeg_4-headless
+              ffmpeg-headless
               vlc
               xdotool
               stdenv.cc.cc
diff --git a/pkgs/by-name/re/render-cli/package.nix b/pkgs/by-name/re/render-cli/package.nix
index 12e9be9954e5..2f5393ca6050 100644
--- a/pkgs/by-name/re/render-cli/package.nix
+++ b/pkgs/by-name/re/render-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "render-cli";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "render-oss";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-f5Knj3yirUHjQ9+4wxJYRwrsSpvb1lvQbnxaRlHUC6s=";
+    hash = "sha256-xFzpyF4uUopjAYmCKe3lUKFo9xGXuJDpQi7+1fHsM68=";
   };
 
-  vendorHash = "sha256-ywUuD8ZtfPAtVcHOrEIuXBncqWENTb++Spc4cp2LUOM=";
+  vendorHash = "sha256-cQ7JZYJe/ZcrOXwCz3X9ySmLS78uJeGpf29Ope/OyF0=";
 
   # Tests require network access
   doCheck = false;
diff --git a/pkgs/by-name/ri/rizin/jsdec.nix b/pkgs/by-name/ri/rizin/jsdec.nix
index 728d0b2a36a5..26ad136d2d2b 100644
--- a/pkgs/by-name/ri/rizin/jsdec.nix
+++ b/pkgs/by-name/ri/rizin/jsdec.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "0.8.0";
+  version = "0.9.0";
 
   libquickjs = fetchFromGitHub {
     owner = "quickjs-ng";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rizinorg";
     repo = "jsdec";
     rev = "v${version}";
-    hash = "sha256-Xc8FMKSGdjrp288u49R6YC0xiynwHeoZe2P/UqnfsFU=";
+    hash = "sha256-9FNsFPQf3GyREXsagWDHctfne28lct6dPH8vKvF8kpY=";
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/ri/rizin/package.nix b/pkgs/by-name/ri/rizin/package.nix
index d53e1b5870ac..2bc342bac56b 100644
--- a/pkgs/by-name/ri/rizin/package.nix
+++ b/pkgs/by-name/ri/rizin/package.nix
@@ -30,11 +30,11 @@
 let
   rizin = stdenv.mkDerivation rec {
     pname = "rizin";
-    version = "0.8.2";
+    version = "0.9.1";
 
     src = fetchurl {
       url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
-      hash = "sha256-FjDKUrroby/zfrIgaZ/IL5UbWxgIDt+j9Q3TalJsLZU=";
+      hash = "sha256-esHNfaynr92nQuFUeLH3R/wfgT5Jb+5xg50eEJ5UPco=";
     };
 
     mesonFlags = [
diff --git a/pkgs/by-name/ri/rizin/rz-ghidra.nix b/pkgs/by-name/ri/rizin/rz-ghidra.nix
index b37b81838643..f6386247fbc9 100644
--- a/pkgs/by-name/ri/rizin/rz-ghidra.nix
+++ b/pkgs/by-name/ri/rizin/rz-ghidra.nix
@@ -11,17 +11,18 @@
   enableCutterPlugin ? true,
   cutter,
   qt6,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rz-ghidra";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "rizinorg";
     repo = "rz-ghidra";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uI0EnuHAuyrXYKDijh5Tg/WcQ/5yyZnW3d5MMHZxnqA=";
+    hash = "sha256-R9wPmt2WoK4wlTXb0JUX+0Fk8JQgGagb8vZQmjxLXn8=";
     fetchSubmodules = true;
   };
 
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     pugixml
     rizin
+    zlib
   ]
   ++ lib.optionals enableCutterPlugin [
     cutter
diff --git a/pkgs/by-name/sa/sayonara/package.nix b/pkgs/by-name/sa/sayonara/package.nix
index 4a34c298a366..9fbc38ebfab4 100644
--- a/pkgs/by-name/sa/sayonara/package.nix
+++ b/pkgs/by-name/sa/sayonara/package.nix
@@ -7,7 +7,6 @@
   lib,
   libpulseaudio,
   ninja,
-  pcre,
   pkg-config,
   taglib,
   zlib,
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libpulseaudio
-    pcre
     libsForQt5.qtbase
     taglib
     zlib
diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix
index 3c81a170ee1d..09085d9dcf17 100644
--- a/pkgs/by-name/sc/scalafmt/package.nix
+++ b/pkgs/by-name/sc/scalafmt/package.nix
@@ -9,7 +9,7 @@
 
 let
   baseName = "scalafmt";
-  version = "3.11.1";
+  version = "3.11.4";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -19,7 +19,7 @@ let
       cp $(< deps) $out/share/java/
     '';
     outputHashMode = "recursive";
-    outputHash = "sha256-EgkXDCbgn7OmH1e/us6lyNiei/qZMzFn/1Qh4LiraBo=";
+    outputHash = "sha256-CWgdxQH2DZ9Il2elQOLgC2+TzP6cIqmcCHUZcQuCSEg=";
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/se/seamonkey/package.nix b/pkgs/by-name/se/seamonkey/package.nix
index 114a96b9cce2..32a47be98fac 100644
--- a/pkgs/by-name/se/seamonkey/package.nix
+++ b/pkgs/by-name/se/seamonkey/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   gtk3,
-  gtk2,
   gdk-pixbuf,
   dbus-glib,
   libx11,
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk2
     gtk3
     gdk-pixbuf
     dbus-glib
diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index 46e798244fab..2e9b6f5429b3 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "secretspec";
-  version = "0.14.0";
+  version = "0.16.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-PlI2+cQbP/CfilYX2fJnQv8yw4euxvqYT0XqlYsU0QI=";
+    hash = "sha256-YiKud3dfw6QmZbKVCY9FD5vrxJs9bE6++BvEeaDUiEs=";
   };
 
-  cargoHash = "sha256-UfeVqZaH04Ucu+FgXX2bqgqiHJNpN3OIN0lKhWFn1j0=";
+  cargoHash = "sha256-tXZ1KUjZWgddh8wD3oyeZWDe5XqdknyEQ0eu4LXPrf0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix
index af184dbe5260..26d3d9b544d4 100644
--- a/pkgs/by-name/sh/shelfmark/package.nix
+++ b/pkgs/by-name/sh/shelfmark/package.nix
@@ -37,13 +37,13 @@ let
     apprise
   ];
 
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "calibrain";
     repo = "shelfmark";
     tag = "v${version}";
-    hash = "sha256-uRuSFWjEnJp3cMx4IeM9akpj+l/36/jgIRavoan9iAU=";
+    hash = "sha256-Pf+CdZZdIJVcJaUD43hZL6qRsY9oFmroTdN0it5BxfM=";
   };
 
   frontend = buildNpmPackage (finalAttrs: {
@@ -52,7 +52,7 @@ let
 
     sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
-    npmDepsHash = "sha256-oqEUiHOHx78+plHUnsOtdv0S3ZhaHr0CAb7kA0VbG/k=";
+    npmDepsHash = "sha256-e2iF6YNV11/l4BmnNrB6OGj8PGv+mrQk3wynm/NAUvU=";
 
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix
index eb0e7c9c5606..d29d157a59c2 100644
--- a/pkgs/by-name/sk/skimpdf/package.nix
+++ b/pkgs/by-name/sk/skimpdf/package.nix
@@ -3,6 +3,7 @@
   lib,
   undmg,
   fetchurl,
+  makeWrapper,
 }:
 stdenv.mkDerivation rec {
   pname = "Skim";
@@ -14,14 +15,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-0IfdLeH6RPxf4OZWnNltN7tvvZWbWDQaMCmazd4UUi4=";
   };
 
-  nativeBuildInputs = [ undmg ];
+  nativeBuildInputs = [
+    undmg
+    makeWrapper
+  ];
 
   sourceRoot = ".";
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/Applications
+    mkdir -p $out/Applications $out/bin
     cp -R Skim.app $out/Applications
+    for app in displayline skimnotes skimpdf; do
+      makeWrapper $out/Applications/Skim.app/Contents/SharedSupport/$app $out/bin/$app
+    done
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/sq/sqlite-jdbc/package.nix b/pkgs/by-name/sq/sqlite-jdbc/package.nix
index 1204a882da5f..4a1ff93e7808 100644
--- a/pkgs/by-name/sq/sqlite-jdbc/package.nix
+++ b/pkgs/by-name/sq/sqlite-jdbc/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Library for accessing and creating SQLite database files in Java";
     license = lib.licenses.asl20;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jraygauthier ];
   };
 }
diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix
index b78025195b8d..0749b80460e4 100644
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@@ -1,48 +1,44 @@
 {
   fetchFromGitHub,
   lib,
-  nodejs,
-  pnpm_9,
+  nodejs-slim,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
+  pnpmBuildHook,
   stdenvNoCC,
   nix-update-script,
+  runCommand,
+  stylelint-lsp,
 }:
+let
+  pnpm = pnpm_11;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stylelint-lsp";
-  version = "2.0.1";
+  version = "2.0.1-unstable-2026-07-19";
 
   src = fetchFromGitHub {
     owner = "bmatcuk";
     repo = "stylelint-lsp";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-LUX/H7yY8Dl44vgpf7vOgtMdY7h//m5BAfrK5RRH9DM=";
+    rev = "0362a26ffaf1879b9ec02e2a52a11792a2d4f8d4";
+    hash = "sha256-qRc67tvgncERh6FDJdydN6aL/a5bVSsQQir3KPp1cFk=";
   };
 
-  buildInputs = [
-    nodejs
-  ];
-
   nativeBuildInputs = [
+    nodejs-slim
     pnpmConfigHook
-    pnpm_9
+    pnpmBuildHook
+    pnpm
   ];
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-qzUvA00ujnIibQAONOPlp5BsXcwQb/gQvOPp83hMT5A=";
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-EuCvuErydwe2LGG62VHcZtN/51Gv1uhhBN3/sEiqzME=";
   };
 
-  buildPhase = ''
-    runHook preBuild
-
-    pnpm build
-
-    runHook postBuild
-  '';
-
   preInstall = ''
     # remove unnecessary files
     CI=true pnpm --ignore-scripts prune --prod
@@ -57,13 +53,34 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,lib/stylelint-lsp}
     mv {dist,node_modules} $out/lib/stylelint-lsp
+
     chmod a+x $out/lib/stylelint-lsp/dist/index.js
+    patchShebangs $out/lib/stylelint-lsp/dist/index.js
     ln -s $out/lib/stylelint-lsp/dist/index.js $out/bin/stylelint-lsp
 
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
+    };
+
+    tests.smoke = runCommand "stylelint-lsp-smoke-test" { } ''
+      INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}'
+      CONTENT_LENGTH=''${#INIT_REQUEST}
+
+      RESPONSE=$(
+        {
+          printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST"
+          sleep 1
+        } | timeout 3  ${lib.getExe stylelint-lsp} --stdio 2>&1 | head -c 1000
+      ) || true
+
+      echo "$RESPONSE" | grep -q '"capabilities"'
+      touch $out
+    '';
+  };
 
   meta = {
     description = "Stylelint Language Server";
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index 4d7917d4f9f3..326543d4872d 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -6,7 +6,6 @@
 
   cmake,
   openssl,
-  pcre,
   util-linux,
   libselinux,
   libsepol,
@@ -69,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libsForQt5.qttools # Used for translations even when not building the GUI
     openssl
-    pcre
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     util-linux
diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index 2bf53fb1cc01..c7e43f0dc201 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -14,7 +14,6 @@
   libuuid,
   libzip,
   orc,
-  pcre,
   zstd,
   glib,
   gobject-introspection,
@@ -78,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     libuuid
     libzip
     orc
-    pcre
     zstd
     glib
     gst_all_1.gstreamer
diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix
index 345b14b03c74..5cddcd00a35e 100644
--- a/pkgs/by-name/tr/trurl/package.nix
+++ b/pkgs/by-name/tr/trurl/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       url = "https://github.com/curl/trurl/commit/f22a2c45956f35702e437fb83ac05376f1956ec5.patch";
       hash = "sha256-7CkUs5tMk77WKc7SlgE2NslHtU5cViKSGhHj3IBlpWo=";
     })
-    # https://github.com/curl/trurl/pull/441
+    # https://github.com/curl/trurl/pull/441 + fix for more tests
     ./tests-uppercase-hex.patch
   ];
 
@@ -64,7 +64,10 @@ stdenv.mkDerivation rec {
     homepage = "https://curl.se/trurl";
     changelog = "https://github.com/curl/trurl/releases/tag/trurl-${version}";
     license = lib.licenses.curl;
-    maintainers = with lib.maintainers; [ christoph-heiss ];
+    maintainers = with lib.maintainers; [
+      christoph-heiss
+      diogotcorreia
+    ];
     platforms = lib.platforms.all;
     mainProgram = "trurl";
   };
diff --git a/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch b/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch
index 8308b8e2c15f..5e8e61fa6f51 100644
--- a/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch
+++ b/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch
@@ -1,6 +1,36 @@
+diff --git a/tests.json b/tests.json
+index 891271c..c8606b0 100644
 --- a/tests.json
 +++ b/tests.json
-@@ -749,6 +749,7 @@
+@@ -473,12 +473,27 @@
+                 "https://example.com/#%2e%61%13%Fa"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "https://example.com/#.a%13%fa\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "--url",
++                "https://example.com/#%2e%61%13%Fa"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "https://example.com/#.a%13%FA\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
+@@ -749,12 +764,29 @@
                  "query=user=me"
              ]
          },
@@ -8,10 +38,15 @@
          "expected": {
              "stdout": "https://curl.se/hello?user%3dme\n",
              "stderr": "",
-@@ -761,6 +762,22 @@
-                 "--url",
-                 "https://curl.se/hello",
-                 "--set",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "--url",
++                "https://curl.se/hello",
++                "--set",
 +                "query=user=me"
 +            ]
 +        },
@@ -22,16 +57,10 @@
 +            "returncode": 0
 +        }
 +    },
-+    {
-+        "input": {
-+            "arguments": [
-+                "--url",
-+                "https://curl.se/hello",
-+                "--set",
-                 "fragment= hello"
-             ]
-         },
-@@ -2132,6 +2149,7 @@
+     {
+         "input": {
+             "arguments": [
+@@ -2132,12 +2164,33 @@
                  "query:=a&b&a%26b"
              ]
          },
@@ -39,10 +68,12 @@
          "expected": {
              "stdout": "http://localhost/ABC%5c%5c?a&b&a%26b\n",
              "returncode": 0,
-@@ -2141,6 +2159,26 @@
-     {
-         "input": {
-             "arguments": [
+             "stderr": ""
+         }
+     },
++    {
++        "input": {
++            "arguments": [
 +                "-s",
 +                "scheme:=http",
 +                "-s",
@@ -60,13 +91,37 @@
 +            "stderr": ""
 +        }
 +    },
+     {
+         "input": {
+             "arguments": [
+@@ -2811,12 +2864,26 @@
+                 "https://example.com/one/t%61o/%2F%42/"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "https://example.com/one/tao/%2fB/\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
 +    {
 +        "input": {
 +            "arguments": [
-                 "-g",
-                 "{query:b}\\t{query-all:a}\\n{:query:b}\\t{:query-all:a}",
-                 "https://example.org/foo?a=1&b=%23&a=%26#hello"
-@@ -2825,11 +2863,27 @@
++                "https://example.com/one/t%61o/%2F%42/"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "https://example.com/one/tao/%2FB/\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
+@@ -2825,12 +2892,28 @@
                  "path=%61"
              ]
          },
@@ -76,7 +131,7 @@
              "stderr": "",
              "returncode": 0
          }
-+    },
+     },
 +    {
 +        "input": {
 +            "arguments": [
@@ -91,6 +146,115 @@
 +            "stderr": "",
 +            "returncode": 0
 +        }
-     },
++    },
      {
          "input": {
+             "arguments": [
+@@ -2991,36 +3074,78 @@
+                 "http://example.com/?a=%5D"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "http://example.com/?a=%5d\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "http://example.com/?a=%5D"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "http://example.com/?a=%5D\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
+                 "http://example.com/?a=%5D&b=%5D"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "http://example.com/?a=%5d&b=%5d\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "http://example.com/?a=%5D&b=%5D"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "http://example.com/?a=%5D&b=%5D\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
+                 "sftp://us%65r:pwd;giraffe@odd"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "sftp://user:pwd%3bgiraffe@odd/\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "sftp://us%65r:pwd;giraffe@odd"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "sftp://user:pwd%3Bgiraffe@odd/\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
+@@ -3055,12 +3180,28 @@
+                 "[:password]"
+             ]
+         },
++        "excludes": ["uppercase-hex"],
+         "expected": {
+             "stdout": "pwd%3bgiraffe\n",
+             "stderr": "",
+             "returncode": 0
+         }
+     },
++    {
++        "input": {
++            "arguments": [
++                "sftp://us%65r:pwd;giraffe@odd",
++                "--get",
++                "[:password]"
++            ]
++        },
++        "required": ["uppercase-hex"],
++        "expected": {
++            "stdout": "pwd%3Bgiraffe\n",
++            "stderr": "",
++            "returncode": 0
++        }
++    },
+     {
+         "input": {
+             "arguments": [
diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json
index e9b0e0351f57..7d76f8484395 100644
--- a/pkgs/by-name/up/upsun/versions.json
+++ b/pkgs/by-name/up/upsun/versions.json
@@ -1,19 +1,19 @@
 {
-  "version": "5.10.7",
+  "version": "5.10.8",
   "darwin-amd64": {
-    "hash": "sha256-EczhSmIDcG7K8L+BtOOHRT1cmvsB86IvkSWa3A5bwjk=",
-    "url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_darwin_all.tar.gz"
+    "hash": "sha256-8M7L9GAwaSpFg6VHI4T5CI2oBE2Z8It3Pt2Wr76Z+is=",
+    "url": "https://github.com/upsun/cli/releases/download/v5.10.8/upsun_5.10.8_darwin_all.tar.gz"
   },
   "darwin-arm64": {
-    "hash": "sha256-EczhSmIDcG7K8L+BtOOHRT1cmvsB86IvkSWa3A5bwjk=",
-    "url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_darwin_all.tar.gz"
+    "hash": "sha256-8M7L9GAwaSpFg6VHI4T5CI2oBE2Z8It3Pt2Wr76Z+is=",
+    "url": "https://github.com/upsun/cli/releases/download/v5.10.8/upsun_5.10.8_darwin_all.tar.gz"
   },
   "linux-amd64": {
-    "hash": "sha256-SF9GkeQlh9jdONO24zQ7LC6419txRXyl+x4q0Gfvntk=",
-    "url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_linux_amd64.tar.gz"
+    "hash": "sha256-ymKZVLavGiGarDvdzYvxCVTHqPm2YPR5bJqQTQddiPw=",
+    "url": "https://github.com/upsun/cli/releases/download/v5.10.8/upsun_5.10.8_linux_amd64.tar.gz"
   },
   "linux-arm64": {
-    "hash": "sha256-F8YfXhTd0fU75InxLgZ02hrLrx3ELDhkRpRvYNrRGu4=",
-    "url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_linux_arm64.tar.gz"
+    "hash": "sha256-Fe4oSes/i3LdRP5bzI/d3gA2QtsfCO0dVswVoNMQXCs=",
+    "url": "https://github.com/upsun/cli/releases/download/v5.10.8/upsun_5.10.8_linux_arm64.tar.gz"
   }
 }
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 3bc7d80bb2e4..dd9914874764 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -10,6 +10,7 @@
   which,
   ps,
   getconf,
+  python3Packages,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
   # dependency ordering is broken at the moment when building with openssl
@@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     tests = {
       redis = nixosTests.redis;
       unitTests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
+      valkey-python = python3Packages.valkey;
     };
     serverBin = "valkey-server";
   };
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index eb6850ff14d8..433faf3e8b6e 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wit-bindgen";
-  version = "0.59.0";
+  version = "0.60.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-m5P8OmaB2vPkZPU8IhIFSHmyjIhdTGb23xwoU/d7j38=";
+    hash = "sha256-/48oa9Jby6Bp7aVHgU1DLSXeH52RG0wB7nvqbMf7uOg=";
   };
 
-  cargoHash = "sha256-nIgOnM+Z+KaL9TpjhxvNKZjfzQ+12tWzAynaig24Vzg=";
+  cargoHash = "sha256-Cp8tNqk7sc3dqcAmaF3byCCzZc1i4Qk8d7eJ8v2SbIY=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.
diff --git a/pkgs/by-name/wo/wordlists/package.nix b/pkgs/by-name/wo/wordlists/package.nix
index 39a02fe14f0a..b4fa7702c572 100644
--- a/pkgs/by-name/wo/wordlists/package.nix
+++ b/pkgs/by-name/wo/wordlists/package.nix
@@ -38,7 +38,8 @@ let
 
 in
 symlinkJoin {
-  name = "wordlists";
+  pname = "wordlists";
+  version = lib.trivial.release;
 
   paths = [
     wordlistsCollection
diff --git a/pkgs/by-name/x1/x11spice/package.nix b/pkgs/by-name/x1/x11spice/package.nix
index df02a65b80a7..dcc34f162c23 100644
--- a/pkgs/by-name/x1/x11spice/package.nix
+++ b/pkgs/by-name/x1/x11spice/package.nix
@@ -7,7 +7,7 @@
   libxcb-util,
   util-macros,
   libxcb,
-  gtk2,
+  gtk3,
   spice,
   spice-protocol,
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     libxcb
     libxcb-util
     util-macros
-    gtk2
+    gtk3
     spice
     spice-protocol
   ];
diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json
index 8df2e60b7d7a..c4ce6e6ea612 100644
--- a/pkgs/by-name/ya/yafc-ce/deps.json
+++ b/pkgs/by-name/ya/yafc-ce/deps.json
@@ -36,38 +36,43 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.3.0-2.25625.1",
-    "hash": "sha256-W2CaLe+fpnD2/2VL6jPW/Ct17qOt4lGZKK2X8HU7MLI="
+    "version": "5.3.0",
+    "hash": "sha256-eUjU7MDekcbDQxUButcWK7siHx6HmrgdDMLnpGYRVLM="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "5.3.0",
-    "hash": "sha256-O5RVbqAWXL2FcCNtn+dPAVJ/5aiaxc8nQWojJSsx61w="
+    "version": "5.6.0",
+    "hash": "sha256-Q+34cKCUHLMUdigLSuCunqcpAzagynq7O6LJ09EPu6g="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "5.3.0",
-    "hash": "sha256-A3jxlZEyfgEn9unhoQqbOsA0wd/mA8aak6dRlu5mHIU="
+    "version": "5.6.0",
+    "hash": "sha256-nrzGZk9oLuCEvhDT+IS+XBVOuHVrwL8RGj0rZFP4SRo="
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "18.5.1",
-    "hash": "sha256-OnahMnRBbdlGSz+igNB0GaMS7PAppefPL1fWN1+cs0w="
+    "version": "18.7.0",
+    "hash": "sha256-QonDzKnOwcYkkVP0T3PT9/QySgUILc/L/bcp6+l+tA8="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "18.5.1",
-    "hash": "sha256-X69wQBKd5GvXfO7BaPWFcyrwfi/kZFVdH/axorIra5Y="
+    "version": "18.7.0",
+    "hash": "sha256-m2cPE5Y7lQz1nmyjlaf4bf9LpABQa24wiga7HPN4LgQ="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "18.5.1",
-    "hash": "sha256-CUuOoANj4lXhQAE1/265X6S+afmNxhpsICEIDqNzSXk="
+    "version": "18.7.0",
+    "hash": "sha256-OJYJt3EhJ60HobDzET31dESe29BtqDd35Xjt8/2BQCQ="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "18.5.1",
-    "hash": "sha256-jtb74D0mqq7hu/nlCtV7IU2dXhviLrmGPER0ttdH2Dg="
+    "version": "18.7.0",
+    "hash": "sha256-i5XpKR5rgazQ5ZLPGE/F71h0Sp6Ko/ff1NzLo+lsE5M="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
   },
   {
     "pname": "Newtonsoft.Json",
@@ -109,20 +114,10 @@
     "version": "0.49.1",
     "hash": "sha256-o2IpO605TKJ2mJLKnxWBHtCFnFJPnRj6zMQJBCGgNGw="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "9.0.0",
-    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
-  },
   {
     "pname": "System.IO.Hashing",
-    "version": "10.0.8",
-    "hash": "sha256-nsDMvCvAeKCyp566iEyp3JOWfQnTPgDU3dIFMg0iUL0="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "9.0.0",
-    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+    "version": "10.0.9",
+    "hash": "sha256-DjQNrB0BGxnzZ2zE72C2E94xRFmcJLsM3sbLbiQOHPs="
   },
   {
     "pname": "xunit",
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 693a70b2c767..a511087edf2c 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -15,17 +15,17 @@
   nix-update-script,
 }:
 let
-  dotnet = dotnetCorePackages.dotnet_8;
+  dotnet = dotnetCorePackages.dotnet_10;
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.19.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "Yafc-CE";
     repo = "yafc-ce";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O4ldYVfOgq+0lZ7xWtBATzx/xlmz3tydC+YX/fvVgY4=";
+    hash = "sha256-J0oDrmSt/VnFT82Uql38alHQDAOgzm1lapQPCObicdA=";
   };
 
   projectFile = [
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 31f2ef03909e..e6ffaf0b2f76 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -8,7 +8,6 @@
   libpthread-stubs,
   lxqt-build-tools,
   openbox,
-  pcre,
   pkg-config,
   qtbase,
   qttools,
@@ -41,7 +40,6 @@ stdenv.mkDerivation rec {
     libxdmcp
     libpthread-stubs
     openbox
-    pcre
     qtbase
     qtwayland
   ];
diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json
index fc8351b58c97..894732a60e1f 100644
--- a/pkgs/development/compilers/openjdk/8/source.json
+++ b/pkgs/development/compilers/openjdk/8/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-c86eD79qxAHswjSi+GTPPkyRAz8PRA2w+eBLRMazUik=",
+  "hash": "sha256-7sbEwNSd0SNdsfWREU6EIk+/9UMlZfWYEv+UQ6iJ3VI=",
   "owner": "openjdk",
   "repo": "jdk8u",
-  "rev": "refs/tags/jdk8u502-b01"
+  "rev": "refs/tags/jdk8u502-b07"
 }
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 79e65ec6c042..a3b185f54d13 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -8,9 +8,6 @@
   version ? null,
 }:
 
-let
-  recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev";
-in
 (mkCoqDerivation {
   pname = "QuickChick";
   owner = "QuickChick";
@@ -35,10 +32,6 @@ in
         (case "8.11" lib.pred.true "1.3.2")
         (case "8.10" lib.pred.true "1.2.1")
         (case "8.9" lib.pred.true "1.1.0")
-        (case "8.8" lib.pred.true "20190311")
-        (case "8.7" (lib.versions.isLe "1.8") "1.0.0")
-        (case "8.6" lib.pred.true "20171102")
-        (case "8.5" lib.pred.true "20170512")
       ]
       null;
   release."2.1.1".hash = "sha256-tcZFpf8joEdVCgy1oKWdaM/9q3EMsF/jT+zz+kIsix8=";
@@ -53,26 +46,17 @@ in
   release."1.3.2".hash = "sha256:0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
   release."1.2.1".hash = "sha256:17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
   release."1.1.0".hash = "sha256:1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
-  release."1.0.0".hash = "sha256:1gqy9a4yavd0sa7kgysf9gf2lq4p8dmn4h89y8081f2j8zli0w5y";
-  release."20190311".rev = "22af9e9a223d0038f05638654422e637e863b355";
-  release."20190311".hash = "sha256:00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
-  release."20171102".rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
-  release."20171102".hash = "sha256:0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
-  release."20170512".rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
-  release."20170512".hash = "sha256:033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
   releaseRev = v: "v${v}";
 
-  preConfigure = lib.optionalString recent "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
+  preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
 
   useDuneifVersion = v: lib.versions.isGe "2.1" v || v == "dev";
   opam-name = "coq-quickchick";
 
   mlPlugin = true;
-  nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
+  nativeBuildInputs = [ coq.ocamlPackages.ocamlbuild ];
   propagatedBuildInputs = [
     mathcomp-boot
-  ]
-  ++ lib.optionals recent [
     ExtLib
     simple-io
   ];
diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix
index 65ee981171ae..4d27ac065a44 100644
--- a/pkgs/development/coq-modules/aac-tactics/default.nix
+++ b/pkgs/development/coq-modules/aac-tactics/default.nix
@@ -33,72 +33,27 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion =
-
+    let
+      case = case: out: { inherit case out; };
+    in
+    with lib.versions;
     lib.switch coq.coq-version [
-      {
-        case = lib.versions.isGe "9.0";
-        out = "9.0.0";
-      }
-      {
-        case = "8.20";
-        out = "8.20.0";
-      }
-      {
-        case = "8.19";
-        out = "8.19.1";
-      }
-      {
-        case = "8.18";
-        out = "8.18.0";
-      }
-      {
-        case = "8.17";
-        out = "8.17.0";
-      }
-      {
-        case = "8.16";
-        out = "8.16.0";
-      }
-      {
-        case = "8.15";
-        out = "8.15.1";
-      }
-      {
-        case = "8.14";
-        out = "8.14.1";
-      }
-      {
-        case = "8.13";
-        out = "8.13.2";
-      }
-      {
-        case = "8.12";
-        out = "8.12.0";
-      }
-      {
-        case = "8.11";
-        out = "8.11.0";
-      }
-      {
-        case = "8.10";
-        out = "8.10.0";
-      }
-      {
-        case = "8.9";
-        out = "8.9.0";
-      }
-      {
-        case = "8.8";
-        out = "8.8.0";
-      }
-      {
-        case = "8.6";
-        out = "8.6.1";
-      }
-      {
-        case = "8.5";
-        out = "8.5.0";
-      }
+      (case (range "9.0" "9.2") "9.0.0")
+      (case "8.20" "8.20.0")
+      (case "8.19" "8.19.1")
+      (case "8.18" "8.18.0")
+      (case "8.17" "8.17.0")
+      (case "8.16" "8.16.0")
+      (case "8.15" "8.15.0")
+      (case "8.14" "8.14.1")
+      (case "8.13" "8.13.2")
+      (case "8.12" "8.12.0")
+      (case "8.11" "8.11.0")
+      (case "8.10" "8.10.0")
+      (case "8.9" "8.9.0")
+      (case "8.8" "8.8.0")
+      (case "8.6" "8.6.1")
+      (case "8.5" "8.5.0")
     ] null;
 
   mlPlugin = true;
diff --git a/pkgs/development/coq-modules/unicoq/default.nix b/pkgs/development/coq-modules/unicoq/default.nix
index 135f6515d397..8f8af5583689 100644
--- a/pkgs/development/coq-modules/unicoq/default.nix
+++ b/pkgs/development/coq-modules/unicoq/default.nix
@@ -10,20 +10,14 @@ mkCoqDerivation {
   owner = "unicoq";
   inherit version;
   defaultVersion =
+    let
+      case = case: out: { inherit case out; };
+    in
     with lib.versions;
     lib.switch coq.version [
-      {
-        case = isGe "9.1";
-        out = "1.6-9.1";
-      }
-      {
-        case = range "8.20" "9.0";
-        out = "1.6-8.20";
-      }
-      {
-        case = range "8.19" "8.19";
-        out = "1.6-8.19";
-      }
+      (case (range "9.1" "9.1") "1.6-9.1")
+      (case (range "8.20" "9.0") "1.6-8.20")
+      (case (range "8.19" "8.19") "1.6-8.19")
     ] null;
   release."1.6-9.1".rev = "0cf37ef7e638bfaad6e804e17bd80e7bb0e1b717";
   release."1.6-9.1".hash = "sha256-1EKDkj33pg3AsEpckZYqWppPUZV2OkxM2xLq2zvZGMQ=";
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
index beddf97c4dde..0639b30213dd 100644
--- a/pkgs/development/interpreters/guile/3.0.nix
+++ b/pkgs/development/interpreters/guile/3.0.nix
@@ -18,6 +18,7 @@
   pkgsBuildBuild,
   readline,
   writeScript,
+  pkgsStatic,
 }:
 
 let
@@ -88,12 +89,6 @@ builder rec {
   patches = [
     ./eai_system.patch
   ]
-  # Fix cross-compilation, can be removed at next release (as well as the autoreconfHook)
-  # Include this only conditionally so we don't have to run the autoreconfHook for the native build.
-  ++ lib.optional (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) (fetchpatch {
-    url = "https://cgit.git.savannah.gnu.org/cgit/guile.git/patch/?id=c117f8edc471d3362043d88959d73c6a37e7e1e9";
-    hash = "sha256-GFwJiwuU8lT1fNueMOcvHh8yvA4HYHcmPml2fY/HSjw=";
-  })
   ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
   ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
     url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
@@ -162,6 +157,8 @@ builder rec {
   setupHook = ./setup-hook-3.0.sh;
 
   passthru = rec {
+    tests.static = pkgsStatic.guile;
+
     effectiveVersion = lib.versions.majorMinor version;
     siteCcacheDir = "lib/guile/${effectiveVersion}/site-ccache";
     siteDir = "share/guile/site/${effectiveVersion}";
@@ -190,6 +187,7 @@ builder rec {
       system calls, networking support, multiple threads, dynamic linking, a
       foreign function call interface, and powerful string processing.
     '';
+    broken = stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isDarwin;
     license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 3f56fa6db65e..302189efe7e6 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": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -90,7 +90,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -154,7 +154,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -230,7 +230,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -276,7 +276,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -352,7 +352,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -398,7 +398,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -476,7 +476,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -568,7 +568,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -660,7 +660,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -752,7 +752,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -844,7 +844,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -936,7 +936,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1028,7 +1028,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1212,7 +1212,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1304,7 +1304,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1396,7 +1396,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1460,7 +1460,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1524,7 +1524,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1588,7 +1588,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1652,7 +1652,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1716,7 +1716,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1780,7 +1780,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1845,7 +1845,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1876,7 +1876,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1907,7 +1907,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1936,7 +1936,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1986,7 +1986,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2012,7 +2012,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2048,7 +2048,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2077,7 +2077,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2106,7 +2106,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2144,7 +2144,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2173,7 +2173,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2202,7 +2202,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2231,7 +2231,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2260,7 +2260,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2289,7 +2289,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20647,
+      "last-available-day": 20656,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2329,7 +2329,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -2373,7 +2373,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -2419,7 +2419,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -2471,7 +2471,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -2520,7 +2520,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -2568,7 +2568,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -2612,7 +2612,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -2658,7 +2658,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -2710,7 +2710,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -2766,7 +2766,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -2803,7 +2803,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -2847,7 +2847,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -2893,7 +2893,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -2945,7 +2945,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3001,7 +3001,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3038,7 +3038,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3082,7 +3082,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3136,7 +3136,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3188,7 +3188,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3244,7 +3244,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3288,7 +3288,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3334,7 +3334,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -3386,7 +3386,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -3442,7 +3442,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -3486,7 +3486,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -3532,7 +3532,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -3584,7 +3584,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -3633,7 +3633,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -3670,7 +3670,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -3709,7 +3709,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -3753,7 +3753,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -3797,7 +3797,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -3841,7 +3841,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -3880,7 +3880,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -3932,7 +3932,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -3984,7 +3984,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4036,7 +4036,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4085,7 +4085,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4124,7 +4124,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4168,7 +4168,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4212,7 +4212,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4256,7 +4256,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4295,7 +4295,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -4347,7 +4347,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -4399,7 +4399,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -4451,7 +4451,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -4500,7 +4500,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -4544,7 +4544,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -4583,7 +4583,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -4627,7 +4627,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -4671,7 +4671,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -4715,7 +4715,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -4754,7 +4754,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -4806,7 +4806,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -4858,7 +4858,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -4910,7 +4910,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -4966,7 +4966,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5005,7 +5005,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5049,7 +5049,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5093,7 +5093,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5137,7 +5137,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5183,7 +5183,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5235,7 +5235,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -5287,7 +5287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -5341,7 +5341,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -5397,7 +5397,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -5443,7 +5443,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -5487,7 +5487,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -5526,7 +5526,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -5570,7 +5570,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -5614,7 +5614,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -5653,7 +5653,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -5705,7 +5705,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -5757,7 +5757,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -5809,7 +5809,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -5863,7 +5863,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -5934,7 +5934,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -5980,7 +5980,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6031,7 +6031,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6075,7 +6075,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6119,7 +6119,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6170,7 +6170,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6237,7 +6237,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -6304,7 +6304,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -6373,7 +6373,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -6429,7 +6429,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -6480,7 +6480,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -6524,7 +6524,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -6568,7 +6568,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -6619,7 +6619,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -6686,7 +6686,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -6755,7 +6755,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -6816,7 +6816,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -6861,7 +6861,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -6907,7 +6907,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -6995,7 +6995,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7032,7 +7032,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7083,7 +7083,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7217,7 +7217,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7276,7 +7276,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -7343,7 +7343,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -7410,7 +7410,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -7471,7 +7471,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -7531,7 +7531,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -7570,7 +7570,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -7633,7 +7633,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -7696,7 +7696,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -7747,7 +7747,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -7861,7 +7861,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -7920,7 +7920,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -8001,7 +8001,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8082,7 +8082,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8143,7 +8143,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8203,7 +8203,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8249,7 +8249,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -8293,7 +8293,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -8332,7 +8332,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -8381,7 +8381,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -8432,7 +8432,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -8499,7 +8499,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -8566,7 +8566,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -8632,7 +8632,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -8713,7 +8713,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -8794,7 +8794,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -8865,7 +8865,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -8975,7 +8975,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9024,7 +9024,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9085,7 +9085,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9152,7 +9152,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9228,7 +9228,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -9295,7 +9295,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -9356,7 +9356,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -9409,7 +9409,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -9464,7 +9464,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -9513,7 +9513,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -9574,7 +9574,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -9641,7 +9641,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -9717,7 +9717,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -9798,7 +9798,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -9859,7 +9859,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -9912,7 +9912,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -9977,7 +9977,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10036,7 +10036,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10082,7 +10082,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10126,7 +10126,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10177,7 +10177,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10226,7 +10226,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -10287,7 +10287,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -10354,7 +10354,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -10423,7 +10423,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -10490,7 +10490,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -10565,7 +10565,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -10614,7 +10614,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -10677,7 +10677,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -10737,7 +10737,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -10777,7 +10777,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -10814,7 +10814,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -10865,7 +10865,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -10914,7 +10914,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -10975,7 +10975,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11043,7 +11043,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11113,7 +11113,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -11182,7 +11182,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11245,7 +11245,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -11298,7 +11298,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -11367,7 +11367,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -11416,7 +11416,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -11457,7 +11457,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -11489,7 +11489,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -11535,7 +11535,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -11580,7 +11580,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -11627,7 +11627,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -11685,7 +11685,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -11745,7 +11745,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -11803,7 +11803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -11863,7 +11863,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -11925,7 +11925,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -11991,7 +11991,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-arm64-v8a",
           "path": "system-images/android-35-ext15/android-automotive/arm64-v8a",
@@ -12044,7 +12044,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-x86_64",
           "path": "system-images/android-35-ext15/android-automotive/x86_64",
@@ -12087,7 +12087,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12120,7 +12120,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12167,7 +12167,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12216,7 +12216,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12267,7 +12267,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12316,7 +12316,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12369,7 +12369,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -12414,7 +12414,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -12459,7 +12459,7 @@
             }
           },
           "displayName": "Android TV Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86_64",
           "path": "system-images/android-36/android-tv/x86_64",
@@ -12494,7 +12494,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -12527,7 +12527,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -12574,7 +12574,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-default-arm64-v8a",
           "path": "system-images/android-36/default/arm64-v8a",
@@ -12619,7 +12619,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-default-x86_64",
           "path": "system-images/android-36/default/x86_64",
@@ -12666,7 +12666,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -12715,7 +12715,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -12766,7 +12766,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -12815,7 +12815,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -12866,7 +12866,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "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",
@@ -12919,7 +12919,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -12964,7 +12964,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-arm64-v8a",
           "path": "system-images/android-36.1/android-wear-signed/arm64-v8a",
@@ -12997,7 +12997,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-x86_64",
           "path": "system-images/android-36.1/android-wear-signed/x86_64",
@@ -13044,7 +13044,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a",
@@ -13102,7 +13102,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis_ps16k/x86_64",
@@ -13162,7 +13162,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13220,7 +13220,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13390,7 +13390,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -13439,7 +13439,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -13490,7 +13490,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -13539,7 +13539,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -13580,7 +13580,7 @@
             }
           ],
           "displayName": "Wear OS 7.0 - Preview ARM 64 v8a System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-37.0-android-wear-arm64-v8a",
           "path": "system-images/android-37.0/android-wear-signed/arm64-v8a",
@@ -13613,7 +13613,7 @@
             }
           ],
           "displayName": "Wear OS 7.0 - Preview Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-preview-license",
           "name": "system-image-37.0-android-wear-x86_64",
           "path": "system-images/android-37.0/android-wear-signed/x86_64",
@@ -13660,7 +13660,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a",
@@ -13722,7 +13722,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis-x86_64",
           "path": "system-images/android-37.0/google_apis_ps16k/x86_64",
@@ -13786,7 +13786,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a",
@@ -13848,7 +13848,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis_playstore-x86_64",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64",
@@ -13896,9 +13896,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "a30cd0035f1f195455e2f863c8a6c35f0f589834",
-              "size": 2092733202,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.1_r06.zip"
+              "sha1": "d4785e29b1930b657ee1cde117cb237ef5710925",
+              "size": 2097078633,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.1_r07.zip"
             }
           ],
           "dependencies": {
@@ -13914,13 +13914,13 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.1-google_apis-arm64-v8a",
           "path": "system-images/android-37.1/google_apis_ps16k/arm64-v8a",
           "revision": "37.1-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -13949,9 +13949,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "724c0f206e8c4d8a2b45080e438ece5009d2debe",
-              "size": 2172594682,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.1_r06.zip"
+              "sha1": "88e208a83a5f0b18958275b7c1a047e931395f3f",
+              "size": 2176688306,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.1_r07.zip"
             }
           ],
           "dependencies": {
@@ -13967,13 +13967,13 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-37.1-google_apis-x86_64",
           "path": "system-images/android-37.1/google_apis_ps16k/x86_64",
           "revision": "37.1-google_apis-x86_64",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -14004,9 +14004,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "f2d225e0b569dfd8c993ca9eac794ca6655820b9",
-              "size": 2120238345,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.1_r06.zip"
+              "sha1": "53d2a5e3b6427d4b3c732cb8b03afe308a12a434",
+              "size": 2124630403,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.1_r07.zip"
             }
           ],
           "dependencies": {
@@ -14022,13 +14022,13 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.1/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "37.1-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
@@ -14057,9 +14057,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "15fcda0d15335414cabefbefa7d875a12e62861d",
-              "size": 2190215543,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.1_r06.zip"
+              "sha1": "19b91b705b5d4908b7dc84ea9d1411d86cb7a699",
+              "size": 2194317666,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.1_r07.zip"
             }
           ],
           "dependencies": {
@@ -14075,13 +14075,13 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-37.1-google_apis_playstore-x86_64",
           "path": "system-images/android-37.1/google_apis_playstore_ps16k/x86_64",
           "revision": "37.1-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "6"
+            "major:0": "7"
           },
           "type-details": {
             "abi:6": "x86_64",
@@ -14448,7 +14448,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a",
@@ -14511,7 +14511,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis_ps16k/x86_64",
@@ -14576,7 +14576,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14639,7 +14639,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -14798,9 +14798,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "d40b3a56fab1d15b280000a04be4dde8050e5fd3",
-              "size": 2094864739,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r05.zip"
+              "sha1": "5bc2a62ef9885fefaff8c98b9fa739a97b45f577",
+              "size": 2324480545,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.2-beta1_r01.zip"
             }
           ],
           "dependencies": {
@@ -14816,24 +14816,24 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis-arm64-v8a",
-          "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a",
+          "path": "system-images/android-37.2-beta1/google_apis_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "1"
           },
           "type-details": {
             "abi:7": "arm64-v8a",
             "abi:8": "arm64-v8a",
-            "api-level:0": "37.0",
+            "api-level:0": "37.1",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14861,9 +14861,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "d879c8113d89d202f1cbc2796c2372fa737ab565",
-              "size": 2169610681,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r05.zip"
+              "sha1": "12ad6acabf3ab7a51f618776b94713665f5a3e18",
+              "size": 2404586110,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.2-beta1_r01.zip"
             }
           ],
           "dependencies": {
@@ -14879,24 +14879,24 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis-x86_64",
-          "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64",
+          "path": "system-images/android-37.2-beta1/google_apis_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis-x86_64",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "1"
           },
           "type-details": {
             "abi:7": "x86_64",
             "abi:8": "x86_64",
-            "api-level:0": "37.0",
+            "api-level:0": "37.1",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14926,9 +14926,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "a7609b48a497a992e87bdeb94a945cf92993f1bb",
-              "size": 2206834051,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r05.zip"
+              "sha1": "a9bb45a77b7254f3aba40fac1a332e6e569d5f37",
+              "size": 2355653329,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.2-beta1_r01.zip"
             }
           ],
           "dependencies": {
@@ -14944,24 +14944,24 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a",
+          "path": "system-images/android-37.2-beta1/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "1"
           },
           "type-details": {
             "abi:7": "arm64-v8a",
             "abi:8": "arm64-v8a",
-            "api-level:0": "37.0",
+            "api-level:0": "37.1",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -14989,9 +14989,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "cdf42021f5938c76ce368cee7674d8dc34bd7fce",
-              "size": 2296198717,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r05.zip"
+              "sha1": "52fd1982de4a4cef933fe1a90467daeb58ba876a",
+              "size": 2424909110,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.2-beta1_r01.zip"
             }
           ],
           "dependencies": {
@@ -15007,24 +15007,24 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20647,
+          "last-available-day": 20656,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-x86_64",
-          "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64",
+          "path": "system-images/android-37.2-beta1/google_apis_playstore_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "5"
+            "major:0": "1"
           },
           "type-details": {
             "abi:7": "x86_64",
             "abi:8": "x86_64",
-            "api-level:0": "37.0",
+            "api-level:0": "37.1",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "22",
+            "extension-level:2": "23",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -15624,8 +15624,8 @@
     "build": "0.1.1",
     "build-tools": "37.0.0",
     "cmake": "4.1.2",
-    "cmdline-tools": "21.0",
-    "emulator": "36.6.11",
+    "cmdline-tools": "22.0",
+    "emulator": "37.1.10",
     "ndk": "29.0.14206865",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "37.0.0",
@@ -15633,7 +15633,7 @@
     "skiaparser": "8",
     "sources": "37.1",
     "tools": "26.1.1",
-    "fingerprint": "bf983fbce7b915ee"
+    "fingerprint": "96adc7d16ae7f971"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15701,7 +15701,7 @@
           }
         ],
         "displayName": "Lightbuild",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build",
         "path": "build/lightbuild/0.0.10-alpha01",
@@ -15756,7 +15756,7 @@
           }
         ],
         "displayName": "Android Project Templates",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build",
         "path": "build/templates",
@@ -15806,7 +15806,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15855,7 +15855,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15904,7 +15904,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15953,7 +15953,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16002,7 +16002,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16051,7 +16051,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16100,7 +16100,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16149,7 +16149,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16198,7 +16198,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -16246,7 +16246,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -16294,7 +16294,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16343,7 +16343,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16392,7 +16392,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16441,7 +16441,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16490,7 +16490,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16539,7 +16539,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16587,7 +16587,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16636,7 +16636,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16684,7 +16684,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16733,7 +16733,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16781,7 +16781,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16829,7 +16829,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -16877,7 +16877,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -16925,7 +16925,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -16973,7 +16973,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -17021,7 +17021,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -17069,7 +17069,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -17117,7 +17117,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -17165,7 +17165,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -17213,7 +17213,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -17261,7 +17261,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -17309,7 +17309,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -17357,7 +17357,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -17405,7 +17405,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -17453,7 +17453,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -17501,7 +17501,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -17549,7 +17549,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17597,7 +17597,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17645,7 +17645,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17693,7 +17693,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17743,7 +17743,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17793,7 +17793,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17841,7 +17841,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -17889,7 +17889,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -17937,7 +17937,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -17985,7 +17985,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18035,7 +18035,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18085,7 +18085,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18135,7 +18135,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -18183,7 +18183,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -18231,7 +18231,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -18279,7 +18279,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -18327,7 +18327,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -18375,7 +18375,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -18423,7 +18423,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -18464,7 +18464,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -18505,7 +18505,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -18546,7 +18546,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18588,7 +18588,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18629,7 +18629,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18670,7 +18670,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18711,7 +18711,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18752,7 +18752,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18793,7 +18793,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18835,7 +18835,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -18877,7 +18877,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -18919,7 +18919,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -18960,7 +18960,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -19002,7 +19002,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -19044,7 +19044,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -19086,7 +19086,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -19128,7 +19128,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -19169,7 +19169,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -19210,7 +19210,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -19252,7 +19252,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -19294,7 +19294,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -19336,7 +19336,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -19378,7 +19378,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -19419,7 +19419,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -19461,7 +19461,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0",
@@ -19502,7 +19502,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc1",
@@ -19544,7 +19544,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc2",
@@ -19595,7 +19595,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -19636,7 +19636,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -19677,7 +19677,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19718,7 +19718,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19759,7 +19759,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19800,7 +19800,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19841,7 +19841,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -19882,7 +19882,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -19923,7 +19923,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -19964,7 +19964,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -20005,7 +20005,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -20053,7 +20053,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -20094,7 +20094,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -20135,7 +20135,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -20176,7 +20176,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -20217,7 +20217,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -20258,7 +20258,7 @@
           }
         ],
         "displayName": "CMake 4.1.2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.2",
@@ -20301,7 +20301,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -20341,7 +20341,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -20381,7 +20381,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -20421,7 +20421,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -20461,7 +20461,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -20501,7 +20501,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -20542,7 +20542,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -20583,7 +20583,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -20623,7 +20623,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -20664,7 +20664,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20704,7 +20704,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20744,7 +20744,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20785,7 +20785,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20826,7 +20826,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -20866,7 +20866,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/20.0",
@@ -20906,7 +20906,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/21.0",
@@ -20921,6 +20921,53 @@
           }
         }
       },
+      "22.0": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "040d3996a65543d22ec4bf73e4c37aa37a8d4af4",
+            "size": 181833628,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-15859902_latest.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "1a79e61677b99cb0ce622792713cbea7ff2dc5de",
+            "size": 156281494,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac_x86_64-15859902_latest.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "c4e0dbc53f1a4ce04fc2b11d4e2c4675001a95af",
+            "size": 156083281,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac_arm64-15859902_latest.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "b9862337a13e2809a5159dc3a08d058091bd59f6",
+            "size": 155655386,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-15859902_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "last-available-day": 20656,
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/22.0",
+        "revision": "22.0",
+        "revision-details": {
+          "major:0": "22",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "3.0": {
         "archives": [
           {
@@ -20946,7 +20993,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -20986,7 +21033,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -21026,7 +21073,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -21066,7 +21113,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -21106,7 +21153,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -21146,7 +21193,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -21186,7 +21233,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -22549,7 +22596,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -22805,6 +22852,54 @@
           }
         }
       },
+      "37.1.10": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "489e57e560e310f9dfadf098951a713bf5651cd2",
+            "size": 334377561,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15888535.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "ae3192d0a814168fca6317f02e45417602d8a9f5",
+            "size": 465774014,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15888535.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "31fd5016927f1f513d1f7630b79a9f288c367d1a",
+            "size": 394553854,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15888535.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "982681268eb1703ee285fb174c7f5b7d4d7d70c8",
+            "size": 441928380,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15888535.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20656,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "37.1.10",
+        "revision-details": {
+          "major:0": "37",
+          "micro:2": "10",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "37.1.2": {
         "archives": [
           {
@@ -22948,6 +23043,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "37.2.1": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "1c39ceb4bca042b973344d252a051189d367ab83",
+            "size": 346539649,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15875889.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "92a0e64420eb712b5ccaef526894478455dee4aa",
+            "size": 477610243,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15875889.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "b959066bf27e9262d74ee81d33fd1a9f6bc9c72c",
+            "size": 405538040,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15875889.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "467df0f9c597df052991d8e22c422749bb354a43",
+            "size": 453554579,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15875889.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20656,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "37.2.1",
+        "revision-details": {
+          "major:0": "37",
+          "micro:2": "1",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -23073,7 +23216,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -23135,7 +23278,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -23197,7 +23340,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -23259,7 +23402,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23322,7 +23465,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -23384,7 +23527,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23448,7 +23591,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23512,7 +23655,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -23574,7 +23717,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -23622,7 +23765,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -23671,7 +23814,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -23719,7 +23862,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -23775,7 +23918,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -23831,7 +23974,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -23886,7 +24029,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -23942,7 +24085,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -23997,7 +24140,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -24052,7 +24195,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -24107,7 +24250,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -24163,7 +24306,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -24218,7 +24361,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -24273,7 +24416,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -24329,7 +24472,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -24385,7 +24528,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -24441,7 +24584,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -24490,7 +24633,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -24539,7 +24682,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -24588,7 +24731,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -24636,7 +24779,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -24684,7 +24827,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -24732,7 +24875,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -24781,7 +24924,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -24830,7 +24973,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -24879,7 +25022,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -24927,7 +25070,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -24976,7 +25119,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -25025,7 +25168,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -25074,7 +25217,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -25123,7 +25266,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -25171,7 +25314,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -25219,7 +25362,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -25267,7 +25410,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -25309,7 +25452,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -25351,7 +25494,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -25392,7 +25535,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -25433,7 +25576,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -25474,7 +25617,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -25515,7 +25658,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -25557,7 +25700,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -25599,7 +25742,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -25640,7 +25783,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -25681,7 +25824,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -25722,7 +25865,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -25763,7 +25906,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -25805,7 +25948,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -25847,7 +25990,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -25889,7 +26032,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -25930,7 +26073,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -25971,7 +26114,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -26012,7 +26155,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -26054,7 +26197,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -26096,7 +26239,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -26138,7 +26281,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -26180,7 +26323,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -26221,7 +26364,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.14904198",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.14904198",
@@ -26263,7 +26406,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.15729638",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.15729638",
@@ -26328,7 +26471,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26390,7 +26533,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26452,7 +26595,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26514,7 +26657,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26577,7 +26720,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26639,7 +26782,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26703,7 +26846,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26767,7 +26910,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26829,7 +26972,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26877,7 +27020,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26926,7 +27069,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26974,7 +27117,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27030,7 +27173,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27086,7 +27229,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27141,7 +27284,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27197,7 +27340,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27252,7 +27395,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27307,7 +27450,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27362,7 +27505,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27418,7 +27561,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27473,7 +27616,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27528,7 +27671,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27584,7 +27727,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27640,7 +27783,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27696,7 +27839,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27905,7 +28048,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27946,7 +28089,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-preview-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27975,7 +28118,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -28013,7 +28156,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -28051,7 +28194,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -28089,7 +28232,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -28127,7 +28270,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -28165,7 +28308,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -28203,7 +28346,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -28241,7 +28384,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -28279,7 +28422,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -28317,7 +28460,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -28369,7 +28512,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28408,7 +28551,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -28446,7 +28589,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -28484,7 +28627,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -28522,7 +28665,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -28560,7 +28703,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -28598,7 +28741,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -28636,7 +28779,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -28674,7 +28817,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -28712,7 +28855,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -28750,7 +28893,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -28802,7 +28945,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28841,7 +28984,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -28879,7 +29022,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -28917,7 +29060,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -28955,7 +29098,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -28994,7 +29137,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -29028,7 +29171,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29073,7 +29216,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -29106,7 +29249,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -29144,7 +29287,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -29177,7 +29320,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -29210,7 +29353,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -29243,7 +29386,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -29276,7 +29419,7 @@
           }
         ],
         "displayName": "Android SDK Platform 37.0",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.0",
@@ -29310,7 +29453,7 @@
           }
         ],
         "displayName": "Android SDK Platform 37.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.1",
@@ -29358,7 +29501,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29411,7 +29554,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29464,7 +29607,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29503,7 +29646,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -29541,7 +29684,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -29579,7 +29722,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -29651,7 +29794,7 @@
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
@@ -29679,23 +29822,23 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "e2b204742c79147f694281af9e30fa8d8b7e96eb",
-            "size": 67558105,
-            "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r05.zip"
+            "sha1": "ea5c02c184a299263943047fb6b83fa21654ce60",
+            "size": 67734125,
+            "url": "https://dl.google.com/android/repository/platform-37.2-beta1_r01.zip"
           }
         ],
-        "displayName": "Android SDK Platform CinnamonBun-ext23",
-        "last-available-day": 20647,
+        "displayName": "Android SDK Platform 37.2-beta1",
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
-        "path": "platforms/android-CinnamonBun-ext23",
+        "path": "platforms/android-37.2-beta1",
         "revision": "CinnamonBun",
         "revision-details": {
-          "major:0": "3"
+          "major:0": "1"
         },
         "type-details": {
-          "api-level:0": "37.0x",
-          "base-extension:3": "false",
+          "api-level:0": "37.1",
+          "base-extension:3": "true",
           "codename:1": "CinnamonBun",
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
@@ -29750,7 +29893,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29868,7 +30011,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -29989,7 +30132,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -30081,7 +30224,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -30108,7 +30251,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -30137,7 +30280,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -30165,7 +30308,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -30193,7 +30336,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -30221,7 +30364,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -30249,7 +30392,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -30277,7 +30420,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -30305,7 +30448,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -30333,7 +30476,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -30361,7 +30504,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -30389,7 +30532,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -30417,7 +30560,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -30445,7 +30588,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -30473,7 +30616,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -30501,7 +30644,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -30529,7 +30672,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -30557,7 +30700,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -30585,7 +30728,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -30613,7 +30756,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -30641,7 +30784,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -30670,7 +30813,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -30699,7 +30842,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -30728,7 +30871,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -30756,7 +30899,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -30784,7 +30927,7 @@
           }
         ],
         "displayName": "Sources for Android 37.0",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-37.0",
@@ -30813,7 +30956,7 @@
           }
         ],
         "displayName": "Sources for Android 37.1",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-37.1",
@@ -30881,7 +31024,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20647,
+        "last-available-day": 20656,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",
diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index 33f08b7e66d4..65b4956b32a1 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "cloudflare";
-  version = "5.5.0";
+  version = "5.6.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pXFvBqv/FyHQLsuc6DuhXYeVwhbQHCEtTlWzvKb6hiE=";
+    hash = "sha256-uMgVhq7NDOSPDaqoWczlVPe5dbAdMStg0aka0OpLZ/8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix
index e6f842343335..421f385da4a4 100644
--- a/pkgs/development/python-modules/git-sweep/default.nix
+++ b/pkgs/development/python-modules/git-sweep/default.nix
@@ -3,19 +3,22 @@
   buildPythonPackage,
   fetchPypi,
   gitpython,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "git-sweep";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-zSnxw3JHsFru9fOZSJZX+XOu144uJ0DaIKYlAtoHV7M=";
   };
 
-  propagatedBuildInputs = [ gitpython ];
+  build-system = [ setuptools ];
+
+  dependencies = [ gitpython ];
 
   # Module has no tests
   doCheck = false;
@@ -29,4 +32,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pSub ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/ha-iotawattpy/default.nix b/pkgs/development/python-modules/ha-iotawattpy/default.nix
index dca667749f94..4fe401a0db48 100644
--- a/pkgs/development/python-modules/ha-iotawattpy/default.nix
+++ b/pkgs/development/python-modules/ha-iotawattpy/default.nix
@@ -4,15 +4,16 @@
   fetchPypi,
   httpx,
   setuptools,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ha-iotawattpy";
   version = "0.1.2";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-eMsBEbmENjbJME9Gzo4O9LbGo1i0MP0IuwLUAYqxbI8=";
   };
 
@@ -20,9 +21,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ httpx ];
 
-  # Project doesn't tag releases or ship the tests with PyPI
-  # https://github.com/gtdiehl/iotawattpy/issues/14
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "iotawattpy" ];
 
@@ -32,4 +31,4 @@ buildPythonPackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix
index 2faf262f6ed2..16fa665cb55f 100644
--- a/pkgs/development/python-modules/helpdev/default.nix
+++ b/pkgs/development/python-modules/helpdev/default.nix
@@ -4,29 +4,38 @@
   fetchPypi,
   importlib-metadata,
   psutil,
+  setuptools,
+  pip,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "helpdev";
   version = "0.7.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-u2KnmsusFB2t9Cyt65K7dFDdGLmCSmIEO2oLFJGQ2z0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  postPatch = ''
+    substituteInPlace helpdev/__init__.py \
+      --replace-fail "'pip'," "'${lib.getExe pip}',"
+  '';
+
+  dependencies = [
     importlib-metadata
     psutil
   ];
 
-  # No tests included in archive
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "Extracts information about the Python environment easily";
     mainProgram = "helpdev";
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/python-modules/interegular/default.nix b/pkgs/development/python-modules/interegular/default.nix
index cc5a193a52c8..477cd8aaf0d2 100644
--- a/pkgs/development/python-modules/interegular/default.nix
+++ b/pkgs/development/python-modules/interegular/default.nix
@@ -2,23 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "interegular";
   version = "0.3.3";
-  format = "setuptools";
+  pyproject = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-2baXshs0iEcROZug8DdpFLgYmc5nADJIbQ0Eg0SnZgA=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "interegular" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   meta = {
     description = "Library to check a subset of python regexes for intersections";
     homepage = "https://github.com/MegaIng/interegular";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lach ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/locate/default.nix b/pkgs/development/python-modules/locate/default.nix
new file mode 100644
index 000000000000..bedae25d7757
--- /dev/null
+++ b/pkgs/development/python-modules/locate/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "locate";
+  version = "1.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AutoActuary";
+    repo = "locate";
+    tag = finalAttrs.version;
+    hash = "sha256-cPBxSjcX0y0Ul7B6yOY+U2ylrQ1oBV6t3lN4qyutGlE=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "locate" ];
+
+  meta = {
+    description = "Locate files relative to the current Python script";
+    homepage = "https://github.com/AutoActuary/locate";
+    changelog = "https://github.com/AutoActuary/locate/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.geri1701 ];
+  };
+})
diff --git a/pkgs/development/python-modules/marklas/default.nix b/pkgs/development/python-modules/marklas/default.nix
new file mode 100644
index 000000000000..95722dc6a613
--- /dev/null
+++ b/pkgs/development/python-modules/marklas/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  uv-build,
+
+  # dependencies
+  mistune,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "marklas";
+  version = "0.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "byExist";
+    repo = "marklas";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vzjU1a/uWho9SpPO7RC3fgs3iXnh8BD3uCLTnZge2Po=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.21,<0.10.0" "uv_build>=0.9.21"
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [ mistune ];
+
+  pythonImportsCheck = [ "marklas" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Bidirectional converter between GitHub Flavored Markdown and Atlassian Document Format";
+    homepage = "https://github.com/byExist/marklas";
+    changelog = "https://github.com/byExist/marklas/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ caspersonn ];
+  };
+})
diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index 133679bc945f..4e7d727dbadc 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pwlf";
-  version = "2.5.3";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cjekel";
     repo = "piecewise_linear_fit_py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-En8zgImub4hMVphl7c0OkdQJ1LRTEBw0kI8dSs4V+N8=";
+    hash = "sha256-RBGOQTvnLm0XdIfDItce38Cdt8+tYr7SL0QzTbkS/fQ=";
   };
 
   build-system = [
@@ -47,7 +47,5 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
-    # See https://github.com/cjekel/piecewise_linear_fit_py/issues/134
-    broken = lib.versionAtLeast scipy.version "1.18";
   };
 })
diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix
index bbe20d0dd4b3..48a61de54ec9 100644
--- a/pkgs/development/python-modules/pyiceberg/default.nix
+++ b/pkgs/development/python-modules/pyiceberg/default.nix
@@ -80,6 +80,8 @@ buildPythonPackage (finalAttrs: {
   env.CIBUILDWHEEL = "1";
 
   pythonRelaxDeps = [
+    # cachetools<7.0,>=5.5 not satisfied by version 7.1.4
+    "cachetools"
     # rich<15.0.0,>=10.11.0 not satisfied by version 15.0.0
     "rich"
   ];
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index e129a26a5f2f..573f400a4bd7 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   black,
   fetchpatch,
@@ -11,10 +10,10 @@
 
   # dependencies
   python-lsp-server,
-  tomli,
 
   # checks
   pytestCheckHook,
+  setuptools_80,
 }:
 
 buildPythonPackage rec {
@@ -29,19 +28,23 @@ buildPythonPackage rec {
     hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY=";
   };
 
-  patches =
-    /**
-      includes a series of patches fixing tests not yet released as 2.0.1+ version
-       they are meant to keep up to date with black releases
-    */
-    lib.optional (lib.versionAtLeast black.version "24.2.0") (fetchpatch {
+  patches = [
+    # includes a series of patches fixing tests not yet released as 2.0.1+ version
+    # they are meant to keep up to date with black releases
+    (fetchpatch {
       url = "https://github.com/python-lsp/python-lsp-black/commit/d43b41431379f9c9bb05fab158c4d97e6d515f8f.patch";
       hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U=";
     })
-    ++ lib.optional (lib.versionAtLeast black.version "24.3.0") (fetchpatch {
+    (fetchpatch {
       url = "https://github.com/python-lsp/python-lsp-black/commit/9298585a9d14d25920c33b188d79e820dc98d4a9.patch";
       hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E=";
-    });
+    })
+    # https://github.com/python-lsp/python-lsp-black/pull/65 (black >= 26.5)
+    (fetchpatch {
+      url = "https://github.com/python-lsp/python-lsp-black/commit/35b5bc6f944bddac0c896127dc44a9404e95f482.patch";
+      hash = "sha256-FRxM8leFVkPjRiR3wNjy5g5BazHc6ZvtnoI8Qgz4co4=";
+    })
+  ];
 
   build-system = [ setuptools ];
 
@@ -52,7 +55,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pylsp_black" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    setuptools_80 # for pkg_resources, removed in setuptools 81+ (tests/test_plugin.py)
+  ];
 
   meta = {
     homepage = "https://github.com/python-lsp/python-lsp-black";
diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
index a4f3bb38a68d..18ebf2edf298 100644
--- a/pkgs/development/python-modules/textual-image/default.nix
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
+  hatchling,
 
   # dependencies
   rich,
@@ -18,7 +18,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "textual-image";
-  version = "0.12.0";
+  version = "0.13.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -26,10 +26,10 @@ buildPythonPackage (finalAttrs: {
     owner = "lnqs";
     repo = "textual-image";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W0f9ZnSZ58XqiPnr9SZEv22EE4yCsvXcgNA8eJebJQo=";
+    hash = "sha256-7TPng2rBYVY1r7Y1pkSZYo4r+MdyD8HzqJAMpzyNqZE=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     pillow
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 391d8de10f29..ed0e5e30a062 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -4,6 +4,7 @@
   poetry-core,
   regex,
   langcodes,
+  locate,
   ftfy,
   msgpack,
   mecab-python3,
@@ -12,16 +13,17 @@
   fetchFromGitHub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "wordfreq";
-  version = "3.0.2";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rspeer";
     repo = "wordfreq";
-    tag = "v${version}";
-    hash = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE=";
+    # The v3.2 tag points to the preceding commit before the version bump.
+    rev = "912caf64b657478d1dff1138efdc078947d54bb1";
+    hash = "sha256-Ni93q6557jWTPYpqWCEriFmkJeYtMy9I5A8GLxJ7QfQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -29,6 +31,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     regex
     langcodes
+    locate
     ftfy
     msgpack
     mecab-python3
@@ -46,6 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for looking up the frequencies of words in many languages, based on many sources of data";
     homepage = "https://github.com/rspeer/wordfreq/";
-    license = lib.licenses.mit;
+    changelog = "https://github.com/rspeer/wordfreq/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix
deleted file mode 100644
index e7768683ed7e..000000000000
--- a/pkgs/os-specific/linux/rtl8821ce/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  kernel,
-  kernelModuleMakeFlags,
-  bc,
-  nix-update-script,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rtl8821ce";
-  version = "0-unstable-2025-10-13";
-
-  src = fetchFromGitHub {
-    owner = "tomaspinho";
-    repo = "rtl8821ce";
-    rev = "4e6b887f0d8c4091a4df9da9fcead9a8294b41ad";
-    hash = "sha256-fY0j6VzwAIsD62+snAWfIgGXcwne0mOwIE/Yh25lwTY=";
-  };
-
-  hardeningDisable = [ "pic" ];
-
-  nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
-  makeFlags = kernelModuleMakeFlags;
-
-  prePatch = ''
-    substituteInPlace ./Makefile \
-      --replace-fail /lib/modules/ "${kernel.dev}/lib/modules/" \
-      --replace-fail /sbin/depmod \# \
-      --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-  '';
-
-  preInstall = ''
-    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-  '';
-
-  enableParallelBuilding = true;
-
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; };
-
-  meta = {
-    description = "Realtek rtl8821ce driver";
-    homepage = "https://github.com/tomaspinho/rtl8821ce";
-    license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ defelo ];
-    broken = stdenv.hostPlatform.isAarch64;
-  };
-})
diff --git a/pkgs/servers/home-assistant/custom-components/smartir/package.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix
index d01c8463b5ff..aaf49af5264d 100644
--- a/pkgs/servers/home-assistant/custom-components/smartir/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/smartir/package.nix
@@ -7,7 +7,7 @@
   nix-update-script,
 }:
 
-buildHomeAssistantComponent rec {
+buildHomeAssistantComponent (finalAttrs: {
   owner = "smartHomeHub";
   domain = "smartir";
   version = "1.18.1";
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "smartHomeHub";
     repo = "SmartIR";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-gi5xlBOY6ek5roQKNqL7I0jrmJNPrxHHwEqOB/n2Itk=";
   };
 
@@ -31,10 +31,10 @@ buildHomeAssistantComponent rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/smartHomeHub/SmartIR/releases/tag/v${version}";
+    changelog = "https://github.com/smartHomeHub/SmartIR/releases/tag/${finalAttrs.version}";
     description = "Integration for Home Assistant to control climate, TV and fan devices via IR/RF controllers (Broadlink, Xiaomi, MQTT, LOOKin, ESPHome)";
     homepage = "https://github.com/smartHomeHub/SmartIR";
     maintainers = with lib.maintainers; [ azuwis ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index 6c8c8c3ee18f..e493c9f5eaff 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -14,13 +14,13 @@
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.35";
+  version = "1.0.36";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-9OZ+N/zVmLp9kckmft1AbVB/wv5QQndYhp2mCNA3SAc=";
+    hash = "sha256-QL3R9mDPaQrFneBKSP8arZL1xxqmz7vp1zGn0eYBrj4=";
   };
 
   ignoreVersionRequirement = [
diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
deleted file mode 100644
index 9aa56af0c638..000000000000
--- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildHomeAssistantComponent,
-  yoto-api,
-}:
-
-buildHomeAssistantComponent rec {
-  owner = "cdnninja";
-  domain = "yoto";
-  version = "3.2.1";
-
-  src = fetchFromGitHub {
-    owner = "cdnninja";
-    repo = "yoto_ha";
-    tag = "v${version}";
-    hash = "sha256-LaDjT28m5JHIDRcIx9bVy2PNlbEbDANGgdw8fnh+BRU=";
-  };
-
-  dependencies = [
-    yoto-api
-  ];
-
-  meta = {
-    changelog = "https://github.com/cdnninja/yoto_ha/releases/tag/${src.tag}";
-    description = "Home Assistant Integration for Yoto";
-    homepage = "https://github.com/cdnninja/yoto_ha";
-    maintainers = with lib.maintainers; [ seberm ];
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cedd0218e0ee..9d55f467d73f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -575,6 +575,7 @@ mapAliases {
   commonsMath = warnAlias "'commonsMath' has been renamed to 'commons-math'" commons-math; # Added 2026-02-08
   computecpp = throw "'computecpp' has been removed because its source has been pulled"; # Added 2025-12-20
   computecpp-unwrapped = throw "'computecpp-unwrapped' has been removed because its source has been pulled"; # Added 2025-12-20
+  conduktor = throw "'conduktor' has been removed because Conduktor Desktop is now sunset and no longer works: https://docs.conduktor.io/desktop"; # Added 2026-07-23
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
@@ -1055,6 +1056,7 @@ mapAliases {
   hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
   hydraAntLogger = warnAlias "'hydraAntLogger' has been renamed to 'hydra-ant-logger'" hydra-ant-logger; # Added 2026-02-08
   hyprfreeze = warnAlias "'hyprfreeze' has been renamed to 'wl-freeze'" wl-freeze; # Added 2026-04-10
+  hyprmagnifier = throw "'hyprmagnifier' has been removed as it was unmaintained, consider using 'hyprmag' instead"; # Added 2026-07-22
   hyprpanel = throw "'hyprpanel' has been archived, consider using 'wayle' instead"; # Added 2026-07-21
   i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
   i3lock-pixeled = throw "'i3lock-pixeled' has been unmaintained for several years now."; # Converted to throw 2026-01-24
@@ -1312,6 +1314,7 @@ mapAliases {
   libXxf86misc = libxxf86misc; # Added 2026-02-06
   libXxf86vm = libxxf86vm; # Added 2026-02-06
   light = throw "'light' has been removed because it was unmaintained. 'brightnessctl' and 'acpilight' provide similar functionality."; # Added 2026-02-24
+  lightdm-enso-os-greeter = throw "'lightdm-enso-os-greeter' has been removed due to being archived upstream"; # Added 2026-07-19
   lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a552d5bc492e..c33b87cd6b67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10383,7 +10383,7 @@ with pkgs;
     (callPackage ./rocq-packages.nix {
       inherit (ocaml-ng)
         ocamlPackages_4_14
-        ocamlPackages_5_4
+        ocamlPackages_5_5
         ;
     })
     mkRocqPackages
@@ -10393,6 +10393,8 @@ with pkgs;
     rocq-core_9_1
     rocqPackages_9_2
     rocq-core_9_2
+    rocqPackages_9_3
+    rocq-core_9_3
     rocqPackages
     rocq-core
     ;
@@ -10404,12 +10406,13 @@ with pkgs;
         ocamlPackages_4_10
         ocamlPackages_4_12
         ocamlPackages_4_14
-        ocamlPackages_5_4
+        ocamlPackages_5_5
         ;
       inherit
         rocqPackages_9_0
         rocqPackages_9_1
         rocqPackages_9_2
+        rocqPackages_9_3
         rocqPackages
         ;
     })
@@ -10448,6 +10451,8 @@ with pkgs;
     coq_9_1
     coqPackages_9_2
     coq_9_2
+    coqPackages_9_3
+    coq_9_3
     coqPackages
     coq
     ;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index ebe42498e38a..ec4a42f8b692 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -9,10 +9,11 @@
   ocamlPackages_4_10,
   ocamlPackages_4_12,
   ocamlPackages_4_14,
-  ocamlPackages_5_4,
+  ocamlPackages_5_5,
   rocqPackages_9_0,
   rocqPackages_9_1,
   rocqPackages_9_2,
+  rocqPackages_9_3,
   rocqPackages,
   fetchpatch,
   makeWrapper,
@@ -311,7 +312,7 @@ let
         ocamlPackages_4_10
         ocamlPackages_4_12
         ocamlPackages_4_14
-        ocamlPackages_5_4
+        ocamlPackages_5_5
         ;
       rocqPackages = rp;
     };
@@ -351,6 +352,7 @@ rec {
   coqPackages_9_0 = mkCoqPackages (mkCoq "9.0" rocqPackages_9_0);
   coqPackages_9_1 = mkCoqPackages (mkCoq "9.1" rocqPackages_9_1);
   coqPackages_9_2 = mkCoqPackages (mkCoq "9.2" rocqPackages_9_2);
+  coqPackages_9_3 = mkCoqPackages (mkCoq "9.3" rocqPackages_9_3);
 
   coq_8_7 = coqPackages_8_7.coq;
   coq_8_8 = coqPackages_8_8.coq;
@@ -369,6 +371,7 @@ rec {
   coq_9_0 = coqPackages_9_0.coq;
   coq_9_1 = coqPackages_9_1.coq;
   coq_9_2 = coqPackages_9_2.coq;
+  coq_9_3 = coqPackages_9_3.coq;
 
   coqPackages = lib.recurseIntoAttrs coqPackages_9_1;
   coq = coqPackages.coq;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index e6ca68d1640b..f717a4041ac9 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -464,8 +464,6 @@ in
 
         rtl8821au = callPackage ../os-specific/linux/rtl8821au { };
 
-        rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { };
-
         rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { };
 
         rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { };
@@ -642,6 +640,7 @@ in
         hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30
         sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14
         rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14
+        rtl8821ce = throw "rtl8821ce has been removed due to lack of maintenance"; # Added 2026-07-22
         vm-tools = self.mm-tools;
         xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
         amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2527abb759c3..aed44234b45b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25653,10 +25653,10 @@ with self;
 
   NetDNS = buildPerlPackage {
     pname = "Net-DNS";
-    version = "1.48";
+    version = "1.56";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.48.tar.gz";
-      hash = "sha256-5V8+caMcK4VgJL9QYbEWCwP4edgBNUFPONgiBHaUR1M=";
+      url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.56.tar.gz";
+      hash = "sha256-WTDjn3aJWzgMfKEfwINS0VrXHEH+hMEt+2oyLRf2aUY=";
     };
     propagatedBuildInputs = [ DigestHMAC ];
     makeMakerFlags = [ "--noonline-tests" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae521dc418d2..327628c3d646 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9826,6 +9826,8 @@ self: super: with self; {
 
   localzone = callPackage ../development/python-modules/localzone { };
 
+  locate = callPackage ../development/python-modules/locate { };
+
   locationsharinglib = callPackage ../development/python-modules/locationsharinglib { };
 
   locket = callPackage ../development/python-modules/locket { };
@@ -10104,6 +10106,8 @@ self: super: with self; {
 
   markitdown = callPackage ../development/python-modules/markitdown { };
 
+  marklas = callPackage ../development/python-modules/marklas { };
+
   marko = callPackage ../development/python-modules/marko { };
 
   markuppy = callPackage ../development/python-modules/markuppy { };
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 7b48e4d73079..d3adb57ae40e 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -6,7 +6,7 @@
   callPackage,
   newScope,
   ocamlPackages_4_14,
-  ocamlPackages_5_4,
+  ocamlPackages_5_5,
   fetchpatch,
   makeWrapper,
 }@args:
@@ -91,7 +91,7 @@ let
       inherit
         version
         ocamlPackages_4_14
-        ocamlPackages_5_4
+        ocamlPackages_5_5
         ;
     };
 in
@@ -116,10 +116,12 @@ rec {
   rocq-core_9_0 = mkRocq "9.0";
   rocq-core_9_1 = mkRocq "9.1";
   rocq-core_9_2 = mkRocq "9.2";
+  rocq-core_9_3 = mkRocq "9.3";
 
   rocqPackages_9_0 = mkRocqPackages rocq-core_9_0;
   rocqPackages_9_1 = mkRocqPackages rocq-core_9_1;
   rocqPackages_9_2 = mkRocqPackages rocq-core_9_2;
+  rocqPackages_9_3 = mkRocqPackages rocq-core_9_3;
 
   rocqPackages = lib.recurseIntoAttrs rocqPackages_9_1;
   rocq-core = rocqPackages.rocq-core;