diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 70802f7b04a5..3c166bab99be 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -249,6 +249,8 @@
 
 - `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`.
 
+- `zig_0_9` and `zig_0_10` have been removed, you should upgrade to `zig_0_13` (also available as just `zig`), `zig_0_12` or `zig_0_11` instead.
+
 - `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
 
 - `hardware.pulseaudio` has been renamed to `services.pulseaudio`.  The deprecated option names will continue to work, but causes a warning.
@@ -337,6 +339,8 @@
   +extraCreateArgs+=("--exclude" "/some/path")
   ```
 
+- `borgmatic` has been updated from 1.8.14 to 1.9.5, please check the [upstream changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases) for more details, especially for a few possibly breaking changes noted in the [1.9.0 changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases/tag/1.9.0).
+
 - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream.
 
 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
index 258598b46ab7..9ce476c5f3b6 100644
--- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
+++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
@@ -107,6 +107,7 @@ print_summary() {
         for module in "${failed_modules[@]}"; do
             echo -e "  ${RED}- $module${NC}"
         done
+        echo -e "\n${RED}Checkout https://nixos.org/manual/nixpkgs/unstable/#testing-neovim-plugins-neovim-require-check${NC}"
     fi
     echo "======================================================"
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 78181f5eb5f8..d752fb873f57 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -10,12 +10,12 @@
   vimUtils,
 }:
 let
-  version = "0.0.15";
+  version = "0.0.16";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
     tag = "v${version}";
-    hash = "sha256-REFF+4U0AjNwiK1ecbDPwF7C1jKRzITV29aolx+HI24=";
+    hash = "sha256-rnd+ASzKTOF3JXjbq6JaNd/tYPpEIvzKK0TZHmDJ+MQ=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index d401bf34b326..67ba89634834 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2025-01-24";
+  version = "0-unstable-2025-02-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "cea00d3aa54e61c929e8e205454793f45472c46d";
-    hash = "sha256-v/L9qEhsymWfpep3YKwLiS2OBC3OBCIVpXOZatLGpN4=";
+    rev = "82c214ba5ef00e4f31117ddf1c60728f93ca8dcc";
+    hash = "sha256-xq6nwKhZQAxmRskvxiDpwiGeMxjxn3XYjo9WoqD9E8Q=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix
index 7dcbb8ab29d3..fb89c507cd04 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003";
-  version = "0-unstable-2024-12-10";
+  version = "0-unstable-2025-01-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-libretro";
-    rev = "b6c6d52d8d630d1a172b6b771443dcbbdb45b76d";
-    hash = "sha256-E0kymRxy5aubvcwE5sHcS4T3OEY924TAOXtJN69wp+8=";
+    rev = "290027956a5bfc9e22e3e96fb4b5958968da6b70";
+    hash = "sha256-FlroIr4T5Z4tBPJ32AxDjXdSnQpU9ergDCznP5qvh3Y=";
   };
 
   # Fix build with GCC 14
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 0ba017a725f2..ecfda278b170 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -15,6 +15,7 @@
 
   # Native build inputs:
   ninja,
+  bashInteractive,
   pkg-config,
   python3,
   perl,
@@ -214,6 +215,7 @@ let
   };
 
   isElectron = packageName == "electron";
+  needsCompgen = chromiumVersionAtLeast "133";
 
   chromiumDeps = lib.mapAttrs (
     path: args:
@@ -291,6 +293,11 @@ let
     nativeBuildInputs =
       [
         ninja
+      ]
+      ++ lib.optionals needsCompgen [
+        bashInteractive # needed for compgen in buildPhase -> process_template
+      ]
+      ++ [
         pkg-config
         python3WithPackages
         perl
@@ -795,12 +802,12 @@ let
       let
         buildCommand = target: ''
           TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
-          (
+          ${lib.optionalString needsCompgen "bash -s << EOL\n"}(
             source chrome/installer/linux/common/installer.include
             PACKAGE=$packageName
             MENUNAME="Chromium"
             process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
-          )
+          )${lib.optionalString needsCompgen "\nEOL"}
         '';
         targets = extraAttrs.buildTargets or [ ];
         commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 0ef9d8572282..294733def83d 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,52 +1,52 @@
 {
   "chromium": {
-    "version": "132.0.6834.159",
+    "version": "133.0.6943.53",
     "chromedriver": {
-      "hash_darwin": "sha256-t1WACSAqvu8Lp5xJpEpALXfSjF92gPdN0mUHQzz71YA=",
-      "hash_darwin_aarch64": "sha256-T0fDfWegn9kjhdDtAAK/IAFbKZ0r5VmvO2VQXzuNmSg="
+      "hash_darwin": "sha256-aMpn8kj3Guj8HxNMEwujZbE2R4jNTRDVO+cg8JgOvkA=",
+      "hash_darwin_aarch64": "sha256-SWLTeD4aJVHKl2BXGUJRNL0eslMNhm+9zWrWh5EMQiY="
     },
     "deps": {
       "depot_tools": {
-        "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-        "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
+        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
       },
       "gn": {
-        "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
-        "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
+        "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd",
+        "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss="
       },
-      "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
+      "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2d77d3fc4452661469b78f115e0aed4d71269739",
-        "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=",
+        "rev": "9a80935019b0925b01cc21d254da203bc3986f04",
+        "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
-        "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
-        "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo="
+        "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+        "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
-        "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4="
+        "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da",
+        "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
-        "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8="
+        "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8",
+        "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
-        "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY="
+        "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b",
+        "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
-        "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4="
+        "rev": "039fea2058d14b408637a931b36a717169617227",
+        "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -65,18 +65,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
-        "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo="
+        "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a",
+        "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
-        "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw="
+        "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120",
+        "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "9616efc903b7469161996006c8cf963238e26503",
-        "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ="
+        "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9",
+        "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -90,8 +90,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
-        "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4="
+        "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a",
+        "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -105,8 +105,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "f674555ab03e6355e0981a647c115097e9fe5324",
-        "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs="
+        "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3",
+        "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -120,13 +120,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
-        "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk="
+        "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484",
+        "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b",
-        "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU="
+        "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776",
+        "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -135,8 +135,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
-        "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY="
+        "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96",
+        "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -160,8 +160,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
-        "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg="
+        "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12",
+        "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -175,13 +175,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
-        "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U="
+        "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898",
+        "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
-        "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc="
+        "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4",
+        "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -190,8 +190,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
-        "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk="
+        "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3",
+        "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -200,8 +200,8 @@
       },
       "src/third_party/chromium-variations": {
         "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
-        "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI="
+        "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c",
+        "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU="
       },
       "src/third_party/cld_3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -220,8 +220,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
-        "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI="
+        "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8",
+        "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -230,23 +230,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
-        "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc="
+        "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf",
+        "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
-        "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw="
+        "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670",
+        "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-        "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
+        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
-        "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs="
+        "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d",
+        "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -255,8 +255,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
-        "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4="
+        "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8",
+        "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -270,8 +270,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
-        "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE="
+        "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
+        "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -305,8 +305,8 @@
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
-        "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY="
+        "rev": "afc7000cacb8cc90ae61036858c5306defa1236a",
+        "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -320,13 +320,13 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
-        "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY="
+        "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
+        "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
-        "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q="
+        "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8",
+        "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
@@ -335,8 +335,8 @@
       },
       "src/third_party/instrumented_libs": {
         "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
-        "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
-        "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY="
+        "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
+        "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko="
       },
       "src/third_party/emoji-segmenter/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git",
@@ -355,8 +355,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "d144031940543e15423a25ae5a8a74141044862f",
-        "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY="
+        "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66",
+        "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -365,8 +365,8 @@
       },
       "src/third_party/icu": {
         "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
-        "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA="
+        "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22",
+        "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY="
       },
       "src/third_party/jsoncpp/source": {
         "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -375,18 +375,18 @@
       },
       "src/third_party/leveldatabase/src": {
         "url": "https://chromium.googlesource.com/external/leveldb.git",
-        "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
-        "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350="
+        "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633",
+        "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY="
       },
       "src/third_party/libFuzzer/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "a7128317fe7935a43d6c9f39df54f21113951941",
-        "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE="
+        "rev": "e31b99917861f891308269c36a32363b120126bb",
+        "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA="
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
-        "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o="
+        "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52",
+        "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -400,23 +400,23 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
-        "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI="
+        "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed",
+        "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg="
       },
       "src/third_party/libavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
-        "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
-        "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M="
+        "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992",
+        "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
-        "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q="
+        "rev": "879ca873d6648a01de65e4cb0b86336b581aa513",
+        "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
-        "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4="
+        "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921",
+        "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o="
       },
       "src/third_party/beto-core/src": {
         "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -428,11 +428,26 @@
         "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
         "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78="
       },
+      "src/third_party/speedometer/main": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e",
+        "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU="
+      },
       "src/third_party/speedometer/v3.0": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
         "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
         "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU="
       },
+      "src/third_party/speedometer/v2.0": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+        "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
+      },
+      "src/third_party/speedometer/v2.1": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+        "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM="
+      },
       "src/third_party/ukey2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git",
         "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
@@ -440,8 +455,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
-        "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc="
+        "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915",
+        "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -470,8 +485,8 @@
       },
       "src/third_party/libphonenumber/dist": {
         "url": "https://chromium.googlesource.com/external/libphonenumber.git",
-        "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-        "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo="
+        "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+        "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4="
       },
       "src/third_party/libprotobuf-mutator/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
@@ -480,18 +495,23 @@
       },
       "src/third_party/libsrtp": {
         "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
-        "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
-        "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg="
+        "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+        "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM="
       },
       "src/third_party/libsync/src": {
         "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git",
         "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
         "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E="
       },
+      "src/third_party/libva-fake-driver/src": {
+        "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git",
+        "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+        "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI="
+      },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
-        "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o="
+        "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a",
+        "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -500,13 +520,13 @@
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
-        "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I="
+        "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
+        "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4="
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
-        "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws="
+        "rev": "47ddac2996378c34aab9318f0d218303b1d282e7",
+        "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -530,8 +550,8 @@
       },
       "src/third_party/neon_2_sse/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
-        "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
-        "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0="
+        "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+        "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g="
       },
       "src/third_party/openh264/src": {
         "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
@@ -540,8 +560,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
-        "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U="
+        "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18",
+        "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -555,13 +575,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
-        "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI="
+        "rev": "c674dba647e81805158339785c0c7e3b57643f8c",
+        "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4="
       },
       "src/third_party/perfetto": {
         "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
-        "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo="
+        "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4",
+        "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -595,23 +615,23 @@
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "c08ec529fc91722bde519628d9449258082eb847",
-        "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY="
+        "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b",
+        "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a",
-        "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco="
+        "rev": "ecebe831881cdf52c65df518777210071f7970dd",
+        "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
-        "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
+        "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214",
         "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw="
       },
       "src/third_party/snappy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git",
-        "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-        "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0="
+        "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+        "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o="
       },
       "src/third_party/sqlite/src": {
         "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
@@ -620,8 +640,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
-        "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc="
+        "rev": "52586b554f93e50bc67277c6031673ed23a8d903",
+        "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -630,18 +650,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
-        "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8="
+        "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342",
+        "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
-        "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko="
+        "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb",
+        "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
-        "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw="
+        "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952",
+        "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -650,44 +670,49 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "996c728cf7dcfb29845cfa15222822318f047810",
-        "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A="
+        "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
+        "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
-        "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE="
+        "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad",
+        "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
-        "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA="
+        "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72",
+        "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
-        "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68="
+        "rev": "081b529a37f43249225114c4c0dea12a29ce605f",
+        "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "15f2de809304aba619ee327f3273425418ca83de",
-        "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo="
+        "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9",
+        "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
-        "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q="
+        "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920",
+        "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
-        "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g="
+        "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb",
+        "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
         "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
         "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ="
       },
+      "src/third_party/wasm_tts_engine/src": {
+        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
+        "rev": "6d5bc87a28e49361dac2964015957698b04a0df8",
+        "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA="
+      },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
         "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
@@ -720,13 +745,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
-        "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ="
+        "rev": "e99550b44ea9eedb364beb553d1a48549d0da115",
+        "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI="
+      },
+      "src/third_party/webpagereplay": {
+        "url": "https://chromium.googlesource.com/webpagereplay.git",
+        "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70",
+        "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
-        "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs="
+        "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0",
+        "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -745,23 +775,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "d1d33679661a34f03a806af2b813f699db3004f9",
-        "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE="
-      },
-      "src/tools/page_cycler/acid3": {
-        "url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
-        "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-        "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0="
+        "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea",
+        "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
-        "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs="
+        "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f",
+        "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "210ec27ca748c70580fe374f9811761667312b41",
-        "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8="
+        "rev": "fe051262efbbd92479a08436f733eba9f756e008",
+        "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY="
       }
     }
   },
diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
index 2a2b97c4345c..f040e078905d 100644
--- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0p3d0k4ckzrbd3xd4v9vb8rhw9jcl4ilx9ch94yhf8kxnnblgzyb"
+    "sha256": "cbff4797b57d22073d4990a54e23a14c260e335a3b6dd2fa682bffc9c8046d5c"
   },
   "airgap-images-arm": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0j9ajjz201w319gfryx2q7jnmyi8gg805v7jsdmy4xkyl8ki80jw"
+    "sha256": "5c021427a27e76e26bd3f2ec02d07b28fa6ae5c1a2fbec5e0a830720be942a49"
   },
   "airgap-images-arm64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1yc1yafr16mli1jk9xc4vgp6q36zk9z5p4rjmdng42dp0j6kvj0w"
+    "sha256": "1cc83d8d04b709f26cab32935b7e9adf0c6ceedb84f5346588b49a909df281f9"
   },
   "images-list": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
index 20f45a47ad9f..e13c13b6bdb7 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "12vvc79jy1nyvcpsr2bi6w1zf28rqx99vh7anjm13snzsk7kzqc2"
+    "sha256": "82e13fcfd4dfea11aab4eac09d52c71909f703377189ac2fdbde062fd3617b8b"
   },
   "airgap-images-arm": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0mhn1ilh830m403yg1y3nqzjcakhs3i6hgdq2s8w2spyz2kdrgv1"
+    "sha256": "61bfdca6f8fe6ac19116b83d68e2d0702a263fb6c387e70720150c04690c1656"
   },
   "airgap-images-arm64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0jdxf36dksypjvgil23wn8ins5rp0achmlavmv12vhijfllkqnn5"
+    "sha256": "c55a3c297532c22dc2ae5bd10a990237176d23b27c081adf96d7ebd9cc70bd49"
   },
   "images-list": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
index 7cc4d06679fa..a9eb9cb12757 100644
--- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1dykfk58sp4phf125jfrzx031pp1mj0g8q0kliis139sig14vagp"
+    "sha256": "f7a94dc28b3a8da063a41360f480ace1de3040ffd9c9228283975c8dca74d3b7"
   },
   "airgap-images-arm": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0z4h9yd8843q58hhm8jw072k1ixxnmprp9c30pwb796iy1mpirbm"
+    "sha256": "75e5786bf0d1a4b3f80583a59b6fb5bdc730c5015ca20a212a7810849a4f907c"
   },
   "airgap-images-arm64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0xsq095dkf89c6jjd126rrdl7k0zy7cxb38rimzpacb8zfj4ss82"
+    "sha256": "02694da4fb6831757f8d198dd5d9f11fcc435bce468426a56109b9d94a025877"
   },
   "images-list": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index cd79731e1bbb..41ed0588db15 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0sn4m1djj8npdx90mny7cwc843ri9q4s0w906rgabjw2v1h56qz0"
+    "sha256": "e0635360d882cba55e362071a0094e310f821867c7db0a526fd722295ba8c46a"
   },
   "airgap-images-arm": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "1mk8xjc4zj3a6jm53drwicqsipy58faxmq990s14lqvrhh3qjnh4"
+    "sha256": "045a89078479634a820629e1da9543c5dfa8318b3cb751aa346ac84f98ec68d6"
   },
   "airgap-images-arm64": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0s1h6lksn83r71ia61h9cjwiqigz9nw9n9jm92749782c8zi918x"
+    "sha256": "1d85143f62029d448e4855269bb84dff451cb9640906a362387920ab27353068"
   },
   "images-list": {
     "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-images.txt",
-    "sha256": "08qxykq9aylfgm24g8ybki62r2sdzvnmv72pan4i2nn0js93nnk9"
+    "sha256": "695a3b9296c05a118955579c5dedfe4d8b2c4c9ccba347447d8e7a95f0f41d23"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index 0e4985620f45..b709703535a4 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -70,21 +70,28 @@ cat > chart-versions.nix.update <<EOF
 EOF
 mv chart-versions.nix.update chart-versions.nix
 
+# Concatenate all sha256sums, one entry per line
+SHA256_HASHES="$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-amd64.txt")
+    \n$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm64.txt")
+    \n$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm.txt")"
+
 # Get all airgap images files associated with this release
 IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/k3s-io/k3s/releases/tags/v${K3S_VERSION}" | \
     # Filter the assets so that only zstd archives and text files that have "images" in their name remain
-    # Modify the name and write the modified name and download URL to a string
     jq -r '.assets[] | select(.name | contains("images")) |
         select(.content_type == "application/zstd" or .content_type == "text/plain; charset=utf-8") |
-        .name = (.name | sub("k3s-"; "") | sub(".tar.zst"; "") | sub(".txt"; "-list")) |
         "\(.name) \(.browser_download_url)"')
 
 # Create a JSON object for each airgap images file and prefetch all download URLs in the process
 # Combine all JSON objects and write the result to images-versions.json
 while read -r name url; do
-    jq --null-input --arg name "$name" \
+    # Pick the right hash based on the name
+    sha256=$(grep "$name" <<< "$SHA256_HASHES" | cut -d ' ' -f 1)
+    # Remove the k3s- prefix and file endings
+    clean_name=$(sed -e 's/^k3s-//' -e 's/\.tar\.zst//' -e 's/\.txt/-list/' <<< "$name")
+    jq --null-input --arg name "$clean_name" \
             --arg url "$url" \
-            --arg sha256 "$(nix-prefetch-url --quiet "${url}")" \
+            --arg sha256 "$sha256" \
         '{$name: {"url": $url, "sha256": $sha256}}'
 done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json
 
diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix
index ab7fe589fdf9..64c5ce015e6a 100644
--- a/pkgs/applications/version-management/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/pass-git-helper/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonApplication rec {
   pname = "pass-git-helper";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "languitar";
     repo = "pass-git-helper";
     tag = "v${version}";
-    sha256 = "sha256-HcafOaunDsyUm5KPcDNo/hENFMZseWSD8GYilKYOPco=";
+    sha256 = "sha256-Dc7oM5xzRCdD6M/F3jetg3JA1KMTITyONd8Tf9VpU5A=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 9bfa633e63e5..2a43a4295dfc 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -14,11 +14,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "1.8.14";
+  version = "1.9.5";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WYs7wiwZ1TvTdeUpWv7FbREXWfdGcYRarP4FXFOfp0Y=";
+    hash = "sha256-wVGM2BsgmZiKWttceIw5pbJGYY2V3+MY1Iv86PwIcU8=";
   };
 
   nativeCheckInputs =
@@ -36,6 +37,12 @@ python3Packages.buildPythonApplication rec {
     "test_borgmatic_version_matches_news_version"
   ];
 
+  # by default only 70.02% coverage is reached
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace '--cov-fail-under=100' '--cov-fail-under=70'
+  '';
+
   nativeBuildInputs = [ installShellFiles ];
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix
index ff7468be8699..22162241e6b3 100644
--- a/pkgs/by-name/dn/dnstwist/package.nix
+++ b/pkgs/by-name/dn/dnstwist/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dnstwist";
-  version = "20240812";
+  version = "20250130";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elceef";
     repo = "dnstwist";
     tag = version;
-    hash = "sha256-J6MfPKj7iACsiiSUU/2gxQdwtmqw9NKnjDoSdhxKoAw=";
+    hash = "sha256-cgSQ6KDCvTYX0vp0jqNzKHzo84IXrztoYqoTJNF+FiI=";
   };
 
   build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix
new file mode 100644
index 000000000000..db912ceca71f
--- /dev/null
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gjs,
+  glib,
+  gtk4,
+  libadwaita,
+  libportal,
+  meson,
+  ninja,
+  nix-update-script,
+  wrapGAppsHook4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dosage";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "diegopvlk";
+    repo = "Dosage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-u/HnlnitLJjYxt+LqbhS2DYUDVVBamZCakBym2eNK1c=";
+  };
+
+  # https://github.com/NixOS/nixpkgs/issues/318830
+  postPatch = ''
+    sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'io.github.diegopvlk.Dosage';" src/io.github.diegopvlk.Dosage.in
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    gjs
+    glib # For `glib-compile-schemas`
+    gtk4 # For `gtk-update-icon-theme`
+    meson
+    ninja
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gjs
+    libadwaita
+    libportal
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Medication tracker for Linux";
+    homepage = "https://github.com/diegopvlk/Dosage";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "io.github.diegopvlk.Dosage";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index a23dceac960a..ee45a9707a1d 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dumbpipe";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg=";
+    hash = "sha256-7Q+X1NcpzhWEmsCFhebW5KhT7gpzxSEDrgEtAOvHkqk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D9HBJXn68jdY8ocSNUNNQHJy21H3z4KccyzTECTYYx0=";
+  cargoHash = "sha256-8V/8aX/PFeekRuXj/kxGS3TQwxMS4mUD3seZMqc8oUk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix
new file mode 100644
index 000000000000..f1eac04a1687
--- /dev/null
+++ b/pkgs/by-name/ea/eas-cli/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  jq,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "eas-cli";
+  version = "14.7.1";
+
+  src = fetchFromGitHub {
+    owner = "expo";
+    repo = "eas-cli";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-h7LohShs4j9Z7Mbe6MSMqfszrEPBcGeTpB+ma3iBXyM=";
+  };
+
+  packageJson = finalAttrs.src + "/packages/eas-cli/package.json";
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
+    hash = "sha256-pnp9MI2S5v4a7KftxYC3Sgc487vooX8+7lmYkmRTWWs=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    jq
+  ];
+
+  # Add version field to package.json to prevent yarn pack from failing
+  preInstall = ''
+    echo "Adding version field to package.json"
+    jq '. + {version: "${finalAttrs.version}"}' package.json > package.json.tmp
+    mv package.json.tmp package.json
+  '';
+
+  postInstall = ''
+    echo "Creating symlink for eas-cli binary"
+    mkdir -p $out/bin
+    ln -sf $out/lib/node_modules/eas-cli-root/packages/eas-cli/bin/run $out/bin/eas
+    chmod +x $out/bin/eas
+  '';
+
+  meta = {
+    changelog = "https://github.com/expo/eas-cli/releases/tag/v${finalAttrs.version}";
+    description = "EAS command line tool from submodule";
+    homepage = "https://github.com/expo/eas-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zestsystem ];
+  };
+})
diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix
index b1b727c012d2..313d9ef3749e 100644
--- a/pkgs/by-name/fo/folio/package.nix
+++ b/pkgs/by-name/fo/folio/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folio";
-  version = "24.14";
+  version = "25.01";
 
   src = fetchFromGitHub {
     owner = "toolstack";
     repo = "Folio";
     tag = version;
-    hash = "sha256-A0vUM6oIchpC/1NEjPmZkT2/f/CmEWmPsMHQrGkDKXQ=";
+    hash = "sha256-EfZMHoF6xyRaxrLDLkBb07fvUxSQFDFViQJ2y68YhZg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index ac5750b524c5..740b45574e61 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.53";
+  version = "1.0.54";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-04USuwfoACJdEQ98DCzUKBVAyoGhTn1dHgVHw38xaWY=";
+    hash = "sha256-tTJz4LilzrSDDmsTwRRK3Svif3ewUWuU3nbUN8GyyPY=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix
index 28f2bf0bc843..136a90ae85d9 100644
--- a/pkgs/by-name/gc/gcfflasher/package.nix
+++ b/pkgs/by-name/gc/gcfflasher/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gcfflasher";
-  version = "4.5.2";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "dresden-elektronik";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-jBKYKjsog0vfyrPoixqTifej5Kb+qYS11Tn+il3J0w0=";
+    hash = "sha256-z7FsxTAsAmjz76NxbqZuecN1ywAZYHhgcPfOe6y5QNQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index eca6966b8087..5ecfdfa22a9c 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hayagriva";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-B0q5jwJVDpxywTuSspsfDameDfEkok5oTz/Oty9LkOI=";
+    hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1YCmPGxDDnZmty8vMDUec45ZYXZbFA8GAT6UJQxa/4M=";
+  cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";
 
   buildFeatures = [ "cli" ];
 
diff --git a/pkgs/by-name/hc/hcledit/package.nix b/pkgs/by-name/hc/hcledit/package.nix
index 671dfb4ed383..7b1c0984a67d 100644
--- a/pkgs/by-name/hc/hcledit/package.nix
+++ b/pkgs/by-name/hc/hcledit/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "hcledit";
-  version = "0.2.15";
+  version = "0.2.16";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-EJSV7CsxnRCsVcqsJcImqeELdeg6Mnf7N6S9TlMbTaE=";
+    hash = "sha256-ULoqb9+GQB+Rg5p/Lqa1gHvZDDAmcfNE6FOK/R5mVK8=";
   };
 
-  vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ=";
+  vendorHash = "sha256-V7Ppb5u6to8bc0TWgJirC04N9lMOYav/dgEPWHzvGro=";
 
   meta = with lib; {
     description = "Command line editor for HCL";
diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix
index 9c0dc3bf8344..cb6f1ffee402 100644
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "i2p";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchzip {
     urls =
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
         "https://files.i2p-projekt.de/"
         "https://download.i2p2.no/releases/"
       ]);
-    hash = "sha256-gw1i6jrmTfz9CZlCjtOUdH5R4vD57ysDeQxyyWifieg=";
+    hash = "sha256-Gw60l6aB9EcDxWowSHUF8LIoxs5bYamJYTVGKQI2V80=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 4bf9cb4325b9..c85e05fc552f 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -33,11 +33,16 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  configureFlags = [
-    "--enable-optional-progs"
-    "--enable-libkeymap"
-    "--disable-nls"
-  ];
+  configureFlags =
+    [
+      "--enable-optional-progs"
+      "--enable-libkeymap"
+      "--disable-nls"
+    ]
+    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+      "ac_cv_func_malloc_0_nonnull=yes"
+      "ac_cv_func_realloc_0_nonnull=yes"
+    ];
 
   patches = [
     ./search-paths.patch
diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 47db9dc25fb8..0228d47de9a6 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "keycloak";
-  version = "26.1.0";
+  version = "26.1.1";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    hash = "sha256-5Us/cBH10SnO6wiggmwg6V7u4FKoLd1V0x8Z4GNDaXc=";
+    hash = "sha256-glBfG/j9J3ZjTTmMrNIbJhHUUIOV0Kardc5P3ohT98Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix
index 86959409db00..476ed8e114f2 100644
--- a/pkgs/by-name/ku/kubecm/package.nix
+++ b/pkgs/by-name/ku/kubecm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubecm";
-  version = "0.32.2";
+  version = "0.32.3";
 
   src = fetchFromGitHub {
     owner = "sunny0826";
     repo = "kubecm";
     rev = "v${version}";
-    hash = "sha256-cW96teV0k0MJq6WJ37Ao4tDOOsB48uU2+WTD07n5EuQ=";
+    hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w=";
   };
 
-  vendorHash = "sha256-Fr31wLvzIoN2wIU2EmUrsqiMcPpdJpQI3ZfB//JYIXE=";
+  vendorHash = "sha256-2GFZ++7H0ii+9WJKPxtDBHikJTQQyDFqJ6qzwVvA84g=";
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index eb5b744e2ce5..8b4f4e9c1b9e 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "kubeone";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
     rev = "v${version}";
-    hash = "sha256-k/okEg9jiLyVn1v3zeduSJ2dY8xWppH5V8L7rud4/H8=";
+    hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA=";
   };
 
-  vendorHash = "sha256-gwyY6g//uEvvzChLQrTKlzq9REMUIXVjIDZXBMOHNO8=";
+  vendorHash = "sha256-dvsq2idsLmo1Tc8kfg3pJKNIMosrAMXN1fxvayS7glQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 23a1e9033ec3..e4d0c940e949 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "lean4";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RdFTxLk0Yahwhu/oQeTappvWnUtnim63dxN7gmU8Jt8=";
   };
 
   postPatch = ''
     substituteInPlace src/CMakeLists.txt \
-      --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")'
+      --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.tag}")'
 
     # Remove tests that fails in sandbox.
     # It expects `sourceRoot` to be a git repository.
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Automatic and interactive theorem prover";
     homepage = "https://leanprover.github.io/";
-    changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md";
+    changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.tag}/RELEASES.md";
     license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix
index 421d67096cf2..d2f93f4ec360 100644
--- a/pkgs/by-name/li/libspatialite/package.nix
+++ b/pkgs/by-name/li/libspatialite/package.nix
@@ -13,9 +13,10 @@
   sqlite,
   libiconv,
   zlib,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libspatialite";
   version = "5.1.0";
 
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${finalAttrs.version}.tar.gz";
     hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA=";
   };
 
@@ -36,6 +37,11 @@ stdenv.mkDerivation rec {
     ./xmlNanoHTTPCleanup.patch
   ];
 
+  postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    substituteInPlace spatialite.pc.in \
+      --replace-fail "@LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm" ""
+  '';
+
   nativeBuildInputs = [
     pkg-config
     validatePkgConfig
@@ -73,16 +79,21 @@ stdenv.mkDerivation rec {
     export DYLD_LIBRARY_PATH=$(pwd)/src/.libs
   '';
 
-  meta = with lib; {
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
     description = "Extensible spatial index library in C++";
     homepage = "https://www.gaia-gis.it/fossil/libspatialite";
     # They allow any of these
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl2Plus
       lgpl21Plus
       mpl11
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ];
+    pkgConfigModules = [ "spatialite" ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ dotlambda ];
   };
-}
+})
diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix
index 1104883f9ee6..546d45221681 100644
--- a/pkgs/by-name/ma/markuplinkchecker/package.nix
+++ b/pkgs/by-name/ma/markuplinkchecker/package.nix
@@ -8,7 +8,7 @@
   darwin,
 }:
 let
-  version = "0.19.0";
+  version = "0.19.2";
 in
 rustPlatform.buildRustPackage {
   pname = "markuplinkchecker";
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage {
     owner = "becheran";
     repo = "mlc";
     rev = "v${version}";
-    hash = "sha256-Nh+P5+dvl2gBQuvo0iKjsJgz/2OYQqAWSIJBzE7yO6I=";
+    hash = "sha256-NsGgUAe8CYAZhQMR/Jg+MGGKmL2ziFqK+MalrDSLcJQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CVfp87b/oTfZ3uXySTqrPnXDDRSSupXRUBJLzT3ZWDY=";
+  cargoHash = "sha256-4H5dsLOggB/KlDcZ/eCxZxreczkg5rXsGyCO9P+OLvw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index bc360daf08fc..bb17a83e9a82 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.7.4";
+  version = "4.7.5";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-R/7ozlbx7WAX7rLdhgckJGt9troBj+0rFcFDBz6eZiM=";
+    sha256 = "sha256-Bm2K3xXT/2+0YD2NizKraKZDs7Suv3GTS3B2bOseE9Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix
index a80b370a485f..cafca6d687e5 100644
--- a/pkgs/by-name/mo/modelscan/package.nix
+++ b/pkgs/by-name/mo/modelscan/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "modelscan";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "protectai";
     repo = "modelscan";
     tag = "v${version}";
-    hash = "sha256-MhwXarjIHZgSC7G7+XevVyCflM/SiaNagJMhzLvs1Uc=";
+    hash = "sha256-tpxonfkdqPNLQQPjn+uIYSEzpXfeoRk4PG14cXR+tS8=";
   };
 
   build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index d4cec1b96a15..814ddd08caf0 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.400";
+  version = "0.0.402";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-fsvyMel2OJZNkRJoBBZ4ibP6nX0r8ypFXGNA3A8YJ+M=";
+    hash = "sha256-1QqBfi9OL2b+mR2ubtErVtIFXIK95vO9WrzrdZWqqAo=";
   };
 
-  vendorHash = "sha256-b8er/iF7Dqq+BAulzE/tUebNeKmTMilc+a0yCAJ5E/0=";
+  vendorHash = "sha256-narbmKAmVFtTR8JkGkem8aHScoXiZ+0V+3a9Vkd7BSA=";
 
   subPackages = [
     "cmd/nsc"
diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index a74b4d42a03e..400eba78812a 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nu_scripts";
-  version = "0-unstable-2025-01-17";
+  version = "0-unstable-2025-02-03";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "fd686c0b0c10e284b1da72d6c3c42ab28c7504a7";
-    hash = "sha256-nO7Dyg1ZxjSInkWW+kHa32H0P1CQ6vc6ODLLTj2abcI=";
+    rev = "b45fd953c171bda74d8e201ce6822570467c1d68";
+    hash = "sha256-V+mCYfABDh2K/wVYX00ZtcxeSZOJe+9TlDLeoxaXJpM=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 748133fca0ae..cc9bbbc540d9 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -12,17 +12,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "3.20.2";
+  version = "3.21.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw=";
+    hash = "sha256-Y5kyf/F1Icf1GVkPY1pYTaMvh5IE07CgTuwy9KHQQjM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5+iUvAUqQZKm5uLYyVN+2Uoz/4htdgowDJZPY47AkOA=";
+  cargoHash = "sha256-a+b49uaqKvmdbV0XHT+qYy9weO3vhs2Jkaht5a74qGU=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix
index c06b60497acd..33055ab193c1 100644
--- a/pkgs/by-name/ri/rippkgs/package.nix
+++ b/pkgs/by-name/ri/rippkgs/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rippkgs";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "replit";
     repo = "rippkgs";
     tag = "v${version}";
-    hash = "sha256-k50q78ycjrFVFTDstTdOLF8aJjsUpQ3lFRbFD1nL8xM=";
+    hash = "sha256-CQGmTXzAj3wA7UTwdeL7gujbT4duS8QE5yZzGKwvzog=";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index aae56c1a5f5c..e22a2baf6418 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-f3OgG6PTv9UUT5Gn1hBTHRIATrlvzBz1pjJ6fuWiCXM=";
+    hash = "sha256-CLkzcHkQ/FngBc3VvQVnsZNYOHru2LKgQfcd6zlwSdc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OcZkjjAUIWvTyzKEscT6q+fUWGC2X34Lxk34kzMZ6rY=";
+  cargoHash = "sha256-m59piYO8zaP2aFNgzZrR47G319blvUerlcCMWlhevwc=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index a81e87f8ce6d..39b11f9620de 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -11,7 +11,7 @@
   libXxf86vm,
 }:
 let
-  version = "4.15.7";
+  version = "4.15.8";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-5EA4AaHP0RsceiCbXkwPrAiSH62xshVS8E9c68gTk+c=";
+    hash = "sha256-Ytov2n7XieMQtc0C0uvMzpamLHhhTEtkKSfoU88Mlaw=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 4f47cb15f8b6..4561fe4f17ff 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation rec {
   pname = "unifi-controller";
-  version = "9.0.108";
+  version = "9.0.114";
 
   # see https://community.ui.com/releases / https://www.ui.com/download/unifi
   src = fetchurl {
     url = "https://dl.ui.com/unifi/${version}/unifi_sysvinit_all.deb";
-    hash = "sha256-p+t4W8mR+CtmSXZqxpP1U55iHhKz7sXcL3Pu+0peNrU=";
+    hash = "sha256-3xumIIzr+tx60kPhPfSs2Kz2iJ39Kt5934Vca/MpUu4=";
   };
 
   nativeBuildInputs = [ dpkg ];
diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix
index 20bbf66a86eb..be1200432b10 100644
--- a/pkgs/by-name/ur/urn-timer/package.nix
+++ b/pkgs/by-name/ur/urn-timer/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "urn-timer";
-  version = "0-unstable-2024-03-05";
+  version = "0-unstable-2025-02-02";
 
   src = fetchFromGitHub {
     owner = "paoloose";
     repo = "urn";
-    rev = "10082428749fabb69db1556f19940d8700ce48a2";
-    hash = "sha256-sQjHQ/i1d4v4ZnM0YAay+MdIj5l/FfIYj+NdH48OqfU=";
+    rev = "124b411301f20d62b69832bbe1f7e6af2df85e9f";
+    hash = "sha256-7mSuu2eebKWlMPOQAHBTYRxEEkpygrfKK7C1Ts8py6U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 05248b13949b..45bd3e035d79 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -20,6 +20,7 @@
   nixosTests,
   nix-update-script,
   darwin,
+  zlib,
 }:
 
 let
@@ -62,6 +63,7 @@ rustPlatform.buildRustPackage {
       rust-jemalloc-sys
       libiconv
       coreutils
+      zlib
     ];
 
   # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect.
diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index 85d324c3effb..f6aecabe948f 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wgsl-analyzer";
-  version = "0.8.1";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "wgsl-analyzer";
     repo = "wgsl-analyzer";
     tag = "v${version}";
-    hash = "sha256-bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc=";
+    hash = "sha256-su9ZhDeZSGcDT3Wnoh/Z9i+rCaApD9bJRAWTgvWdFHA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+SeVxobUh2o2xNVBgXf1AgGI6hpNkoDNzXcKfabKEVc=";
+  cargoHash = "sha256-yGA6qugaoN39mryICi6cYNnnVdh+QCc1bRQdAgqcxcQ=";
 
   checkFlags = [
     # Imports failures
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index 6dd300275cb4..f59e1d1b3e6e 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xwallpaper";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "stoeckmann";
     repo = "xwallpaper";
     rev = "v${version}";
-    sha256 = "sha256-smhqovPgDdSLhAwW1y/hnPjNwFcpIUocs3MKizdvZj0=";
+    sha256 = "sha256-8VRQFH00yXplvhCqBuMGrwvOB7bJhfe50Ii6h8kvDMM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 262f5dadc457..b14400ed0d61 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "24.12.12";
+  version = "25.01.31";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oWMIT/mZ//+15hxGGy9r8mtjlZWMCooOMDJS8JZdcv0=";
+    sha256 = "sha256-LON73XRVZQxbEMJ32qKXU/TYf6Q8nWU9wms7eT/DHa8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 7387b16820fe..77884dbbdb78 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
   callPackage,
-  llvmPackages_13,
-  llvmPackages_15,
   llvmPackages_16,
   llvmPackages_17,
   llvmPackages_18,
@@ -10,14 +8,6 @@
 }:
 let
   versions = {
-    "0.9.1" = {
-      llvmPackages = llvmPackages_13;
-      hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
-    };
-    "0.10.1" = {
-      llvmPackages = llvmPackages_15;
-      hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
-    };
     "0.11.0" = {
       llvmPackages = llvmPackages_16;
       hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 0fd210f5da14..9042271fddd1 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -28,19 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit hash;
   };
 
-  patches =
-    args.patches or [ ]
-    ++ lib.optionals (lib.versions.majorMinor finalAttrs.version == "0.9") [
-      # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
-      ./patches/0.9-read-dynstr-at-rpath-offset.patch
-      # Fix build on macOS 13 (cherry-picked from 0.10-dev)
-      ./patches/0.9-bump-macos-supported-version.patch
-    ]
-    ++
-      lib.optional (lib.versions.majorMinor finalAttrs.version == "0.10")
-        # Backport alignment related panics from zig-master to 0.10.
-        # Upstream issue: https://github.com/ziglang/zig/issues/14559
-        ./patches/0.10-macho-fixes.patch;
+  patches = args.patches or [ ];
 
   nativeBuildInputs = [
     cmake
@@ -69,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
-  ] ++ lib.optional (lib.versionAtLeast finalAttrs.version "0.10") "doc";
+    "doc"
+  ];
 
   # strictDeps breaks zig when clang is being used.
   # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
@@ -108,28 +97,20 @@ stdenv.mkDerivation (finalAttrs: {
       ''
         stage3/bin/zig build langref
       ''
-    else if lib.versionAtLeast finalAttrs.version "0.11" then
+    else
       ''
         stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
-      ''
-    else if lib.versionAtLeast finalAttrs.version "0.10" then
-      ''
-        ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
-      ''
-    else
-      null;
+      '';
 
   postInstall =
     if lib.versionAtLeast finalAttrs.version "0.13" then
       ''
         install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
       ''
-    else if lib.versionAtLeast finalAttrs.version "0.10" then
+    else
       ''
         install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
-      ''
-    else
-      null;
+      '';
 
   doInstallCheck = true;
   installCheckPhase = ''
diff --git a/pkgs/development/compilers/zig/patches/0.10-macho-fixes.patch b/pkgs/development/compilers/zig/patches/0.10-macho-fixes.patch
deleted file mode 100644
index 95f0bdf701e2..000000000000
--- a/pkgs/development/compilers/zig/patches/0.10-macho-fixes.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-From 405801d8a8be734425eca4f3eebc56287804ac93 Mon Sep 17 00:00:00 2001
-From: Jakub Konka <kubkon@jakubkonka.com>
-Date: Sun, 5 Feb 2023 10:04:34 +0100
-Subject: [PATCH] macho: temp fix alignment and enable some logs
-
----
- src/link/MachO/Object.zig  | 80 ++++++++++++++++++++++++++------------
- src/link/MachO/ZldAtom.zig | 29 +++++++-------
- src/link/MachO/zld.zig     | 22 +++++------
- 3 files changed, 79 insertions(+), 52 deletions(-)
-
-diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig
-index 401184da515..05638c1f858 100644
---- a/src/link/MachO/Object.zig
-+++ b/src/link/MachO/Object.zig
-@@ -54,12 +54,18 @@ atom_by_index_table: []AtomIndex = undefined,
- /// Can be undefined as set together with in_symtab.
- globals_lookup: []i64 = undefined,
- 
-+/// All relocs sorted and flattened.
-+relocs: std.ArrayListUnmanaged(macho.relocation_info) = .{},
-+sect_relocs_lookup: std.ArrayListUnmanaged(u32) = .{},
-+
- atoms: std.ArrayListUnmanaged(AtomIndex) = .{},
- 
- pub fn deinit(self: *Object, gpa: Allocator) void {
-     self.atoms.deinit(gpa);
-     gpa.free(self.name);
-     gpa.free(self.contents);
-+    self.relocs.deinit(gpa);
-+    self.sect_relocs_lookup.deinit(gpa);
-     if (self.in_symtab) |_| {
-         gpa.free(self.source_symtab_lookup);
-         gpa.free(self.source_address_lookup);
-@@ -101,6 +107,10 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch)
-         return error.MismatchedCpuArchitecture;
-     }
- 
-+    const nsects = self.getSourceSections().len;
-+    try self.sect_relocs_lookup.resize(allocator, nsects);
-+    mem.set(u32, self.sect_relocs_lookup.items, 0);
-+
-     var it = LoadCommandIterator{
-         .ncmds = self.header.ncmds,
-         .buffer = self.contents[@sizeOf(macho.mach_header_64)..][0..self.header.sizeofcmds],
-@@ -110,13 +120,11 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch)
-             .SYMTAB => {
-                 const symtab = cmd.cast(macho.symtab_command).?;
-                 self.in_symtab = @ptrCast(
--                    [*]const macho.nlist_64,
--                    @alignCast(@alignOf(macho.nlist_64), &self.contents[symtab.symoff]),
-+                    [*]align(1) const macho.nlist_64,
-+                    self.contents.ptr + symtab.symoff,
-                 )[0..symtab.nsyms];
-                 self.in_strtab = self.contents[symtab.stroff..][0..symtab.strsize];
- 
--                const nsects = self.getSourceSections().len;
--
-                 self.symtab = try allocator.alloc(macho.nlist_64, self.in_symtab.?.len + nsects);
-                 self.source_symtab_lookup = try allocator.alloc(u32, self.in_symtab.?.len);
-                 self.strtab_lookup = try allocator.alloc(u32, self.in_symtab.?.len);
-@@ -192,6 +200,17 @@ const SymbolAtIndex = struct {
-         return mem.sliceTo(@ptrCast([*:0]const u8, ctx.in_strtab.?.ptr + off), 0);
-     }
- 
-+    fn getSymbolSeniority(self: SymbolAtIndex, ctx: Context) u2 {
-+        const sym = self.getSymbol(ctx);
-+        if (!sym.ext()) {
-+            const sym_name = self.getSymbolName(ctx);
-+            if (mem.startsWith(u8, sym_name, "l") or mem.startsWith(u8, sym_name, "L")) return 0;
-+            return 1;
-+        }
-+        if (sym.weakDef() or sym.pext()) return 2;
-+        return 3;
-+    }
-+
-     /// Performs lexicographic-like check.
-     /// * lhs and rhs defined
-     ///   * if lhs == rhs
-@@ -206,23 +225,15 @@ const SymbolAtIndex = struct {
-         if (lhs.sect() and rhs.sect()) {
-             if (lhs.n_value == rhs.n_value) {
-                 if (lhs.n_sect == rhs.n_sect) {
--                    if (lhs.ext() and rhs.ext()) {
--                        if ((lhs.pext() or lhs.weakDef()) and (rhs.pext() or rhs.weakDef())) {
--                            return false;
--                        } else return rhs.pext() or rhs.weakDef();
--                    } else {
--                        const lhs_name = lhs_index.getSymbolName(ctx);
--                        const lhs_temp = mem.startsWith(u8, lhs_name, "l") or mem.startsWith(u8, lhs_name, "L");
--                        const rhs_name = rhs_index.getSymbolName(ctx);
--                        const rhs_temp = mem.startsWith(u8, rhs_name, "l") or mem.startsWith(u8, rhs_name, "L");
--                        if (lhs_temp and rhs_temp) {
--                            return false;
--                        } else return rhs_temp;
--                    }
-+                    const lhs_senior = lhs_index.getSymbolSeniority(ctx);
-+                    const rhs_senior = rhs_index.getSymbolSeniority(ctx);
-+                    if (lhs_senior == rhs_senior) {
-+                        return lessThanByNStrx(ctx, lhs_index, rhs_index);
-+                    } else return lhs_senior < rhs_senior;
-                 } else return lhs.n_sect < rhs.n_sect;
-             } else return lhs.n_value < rhs.n_value;
-         } else if (lhs.undf() and rhs.undf()) {
--            return false;
-+            return lessThanByNStrx(ctx, lhs_index, rhs_index);
-         } else return rhs.undf();
-     }
- 
-@@ -393,6 +404,16 @@ pub fn splitIntoAtoms(self: *Object, zld: *Zld, object_id: u31) !void {
-             zld.sections.items(.header)[out_sect_id].sectName(),
-         });
- 
-+        // Parse all relocs for the input section, and sort in descending order.
-+        // Previously, I have wrongly assumed the compilers output relocations for each
-+        // section in a sorted manner which is simply not true.
-+        const start = @intCast(u32, self.relocs.items.len);
-+        if (self.getSourceRelocs(section.header)) |relocs| {
-+            try self.relocs.appendUnalignedSlice(gpa, relocs);
-+            std.sort.sort(macho.relocation_info, self.relocs.items[start..], {}, relocGreaterThan);
-+        }
-+        self.sect_relocs_lookup.items[section.id] = start;
-+
-         const cpu_arch = zld.options.target.cpu.arch;
-         const sect_loc = filterSymbolsBySection(symtab[sect_sym_index..], sect_id + 1);
-         const sect_start_index = sect_sym_index + sect_loc.index;
-@@ -559,7 +580,7 @@ pub fn getSourceSections(self: Object) []const macho.section_64 {
-     } else unreachable;
- }
- 
--pub fn parseDataInCode(self: Object) ?[]const macho.data_in_code_entry {
-+pub fn parseDataInCode(self: Object) ?[]align(1) const macho.data_in_code_entry {
-     var it = LoadCommandIterator{
-         .ncmds = self.header.ncmds,
-         .buffer = self.contents[@sizeOf(macho.mach_header_64)..][0..self.header.sizeofcmds],
-@@ -569,10 +590,7 @@ pub fn parseDataInCode(self: Object) ?[]const macho.data_in_code_entry {
-             .DATA_IN_CODE => {
-                 const dice = cmd.cast(macho.linkedit_data_command).?;
-                 const ndice = @divExact(dice.datasize, @sizeOf(macho.data_in_code_entry));
--                return @ptrCast(
--                    [*]const macho.data_in_code_entry,
--                    @alignCast(@alignOf(macho.data_in_code_entry), &self.contents[dice.dataoff]),
--                )[0..ndice];
-+                return @ptrCast([*]align(1) const macho.data_in_code_entry, self.contents.ptr + dice.dataoff)[0..ndice];
-             },
-             else => {},
-         }
-@@ -632,11 +650,23 @@ pub fn getSectionAliasSymbolPtr(self: *Object, sect_id: u8) *macho.nlist_64 {
-     return &self.symtab[self.getSectionAliasSymbolIndex(sect_id)];
- }
- 
--pub fn getRelocs(self: Object, sect: macho.section_64) []align(1) const macho.relocation_info {
--    if (sect.nreloc == 0) return &[0]macho.relocation_info{};
-+fn getSourceRelocs(self: Object, sect: macho.section_64) ?[]align(1) const macho.relocation_info {
-+    if (sect.nreloc == 0) return null;
-     return @ptrCast([*]align(1) const macho.relocation_info, self.contents.ptr + sect.reloff)[0..sect.nreloc];
- }
- 
-+pub fn getRelocs(self: Object, sect_id: u16) []const macho.relocation_info {
-+    const sect = self.getSourceSection(sect_id);
-+    const start = self.sect_relocs_lookup.items[sect_id];
-+    const len = sect.nreloc;
-+    return self.relocs.items[start..][0..len];
-+}
-+
-+fn relocGreaterThan(ctx: void, lhs: macho.relocation_info, rhs: macho.relocation_info) bool {
-+    _ = ctx;
-+    return lhs.r_address > rhs.r_address;
-+}
-+
- pub fn getSymbolName(self: Object, index: u32) []const u8 {
-     const strtab = self.in_strtab.?;
-     const sym = self.symtab[index];
-diff --git a/src/link/MachO/ZldAtom.zig b/src/link/MachO/ZldAtom.zig
-index 817aa816625..b42309598d7 100644
---- a/src/link/MachO/ZldAtom.zig
-+++ b/src/link/MachO/ZldAtom.zig
-@@ -465,7 +465,7 @@ pub fn resolveRelocs(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
--    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
- ) !void {
-     const arch = zld.options.target.cpu.arch;
-@@ -540,7 +540,7 @@ fn resolveRelocsArm64(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
--    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
-     context: RelocContext,
- ) !void {
-@@ -579,7 +579,6 @@ fn resolveRelocsArm64(
-         }
- 
-         const target = parseRelocTarget(zld, atom_index, rel, reverse_lookup);
--        const rel_offset = @intCast(u32, rel.r_address - context.base_offset);
- 
-         log.debug("  RELA({s}) @ {x} => %{d} ('{s}') in object({?})", .{
-             @tagName(rel_type),
-@@ -589,6 +588,7 @@ fn resolveRelocsArm64(
-             target.file,
-         });
- 
-+        const rel_offset = @intCast(u32, rel.r_address - context.base_offset);
-         const source_addr = blk: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             break :blk source_sym.n_value + rel_offset;
-@@ -596,7 +596,7 @@ fn resolveRelocsArm64(
-         const is_tlv = is_tlv: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             const header = zld.sections.items(.header)[source_sym.n_sect - 1];
--            break :is_tlv header.@"type"() == macho.S_THREAD_LOCAL_VARIABLES;
-+            break :is_tlv header.type() == macho.S_THREAD_LOCAL_VARIABLES;
-         };
-         const target_addr = try getRelocTargetAddress(zld, rel, target, is_tlv);
- 
-@@ -831,7 +831,7 @@ fn resolveRelocsX86(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
--    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
-     context: RelocContext,
- ) !void {
-@@ -877,7 +877,7 @@ fn resolveRelocsX86(
-         const is_tlv = is_tlv: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             const header = zld.sections.items(.header)[source_sym.n_sect - 1];
--            break :is_tlv header.@"type"() == macho.S_THREAD_LOCAL_VARIABLES;
-+            break :is_tlv header.type() == macho.S_THREAD_LOCAL_VARIABLES;
-         };
- 
-         log.debug("    | source_addr = 0x{x}", .{source_addr});
-@@ -1015,27 +1015,24 @@ pub fn getAtomCode(zld: *Zld, atom_index: AtomIndex) []const u8 {
-     return code[offset..][0..code_len];
- }
- 
--pub fn getAtomRelocs(zld: *Zld, atom_index: AtomIndex) []align(1) const macho.relocation_info {
-+pub fn getAtomRelocs(zld: *Zld, atom_index: AtomIndex) []const macho.relocation_info {
-     const atom = zld.getAtomPtr(atom_index);
-     assert(atom.getFile() != null); // Synthetic atom shouldn't need to unique for relocs.
-     const object = zld.objects.items[atom.getFile().?];
- 
--    const source_sect = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
--        const source_sect = object.getSourceSection(source_sym.n_sect - 1);
--        assert(!source_sect.isZerofill());
--        break :blk source_sect;
-+    const source_sect_id = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
-+        break :blk source_sym.n_sect - 1;
-     } else blk: {
-         // If there was no matching symbol present in the source symtab, this means
-         // we are dealing with either an entire section, or part of it, but also
-         // starting at the beginning.
-         const nbase = @intCast(u32, object.in_symtab.?.len);
-         const sect_id = @intCast(u16, atom.sym_index - nbase);
--        const source_sect = object.getSourceSection(sect_id);
--        assert(!source_sect.isZerofill());
--        break :blk source_sect;
-+        break :blk sect_id;
-     };
--
--    const relocs = object.getRelocs(source_sect);
-+    const source_sect = object.getSourceSection(source_sect_id);
-+    assert(!source_sect.isZerofill());
-+    const relocs = object.getRelocs(source_sect_id);
- 
-     if (atom.cached_relocs_start == -1) {
-         const indexes = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
-diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig
-index 3a2ea79c6ec..cee3f302c08 100644
---- a/src/link/MachO/zld.zig
-+++ b/src/link/MachO/zld.zig
-@@ -396,7 +396,7 @@ pub const Zld = struct {
-                 break :blk null;
-             }
- 
--            switch (sect.@"type"()) {
-+            switch (sect.type()) {
-                 macho.S_4BYTE_LITERALS,
-                 macho.S_8BYTE_LITERALS,
-                 macho.S_16BYTE_LITERALS,
-@@ -1701,7 +1701,7 @@ pub const Zld = struct {
-                             break :outer;
-                         }
-                     }
--                    switch (header.@"type"()) {
-+                    switch (header.type()) {
-                         macho.S_NON_LAZY_SYMBOL_POINTERS => {
-                             try self.writeGotPointer(count, buffer.writer());
-                         },
-@@ -1718,7 +1718,7 @@ pub const Zld = struct {
-                                     break :outer;
-                                 }
-                             }
--                            if (header.@"type"() == macho.S_SYMBOL_STUBS) {
-+                            if (header.type() == macho.S_SYMBOL_STUBS) {
-                                 try self.writeStubCode(atom_index, count, buffer.writer());
-                             } else if (mem.eql(u8, header.sectName(), "__stub_helper")) {
-                                 try self.writeStubHelperCode(atom_index, buffer.writer());
-@@ -1802,7 +1802,7 @@ pub const Zld = struct {
-         for (slice.items(.header)) |*header, sect_id| {
-             if (header.size == 0) continue;
-             if (self.requiresThunks()) {
--                if (header.isCode() and !(header.@"type"() == macho.S_SYMBOL_STUBS) and !mem.eql(u8, header.sectName(), "__stub_helper")) continue;
-+                if (header.isCode() and !(header.type() == macho.S_SYMBOL_STUBS) and !mem.eql(u8, header.sectName(), "__stub_helper")) continue;
-             }
- 
-             var atom_index = slice.items(.first_atom_index)[sect_id];
-@@ -1830,7 +1830,7 @@ pub const Zld = struct {
-         if (self.requiresThunks()) {
-             for (slice.items(.header)) |header, sect_id| {
-                 if (!header.isCode()) continue;
--                if (header.@"type"() == macho.S_SYMBOL_STUBS) continue;
-+                if (header.type() == macho.S_SYMBOL_STUBS) continue;
-                 if (mem.eql(u8, header.sectName(), "__stub_helper")) continue;
- 
-                 // Create jump/branch range extenders if needed.
-@@ -1994,10 +1994,10 @@ pub const Zld = struct {
-         const section_precedence: u4 = blk: {
-             if (header.isCode()) {
-                 if (mem.eql(u8, "__text", header.sectName())) break :blk 0x0;
--                if (header.@"type"() == macho.S_SYMBOL_STUBS) break :blk 0x1;
-+                if (header.type() == macho.S_SYMBOL_STUBS) break :blk 0x1;
-                 break :blk 0x2;
-             }
--            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_NON_LAZY_SYMBOL_POINTERS,
-                 macho.S_LAZY_SYMBOL_POINTERS,
-                 => break :blk 0x0,
-@@ -2121,7 +2121,7 @@ pub const Zld = struct {
- 
-         // Finally, unpack the rest.
-         for (slice.items(.header)) |header, sect_id| {
--            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_LITERAL_POINTERS,
-                 macho.S_REGULAR,
-                 macho.S_MOD_INIT_FUNC_POINTERS,
-@@ -2252,7 +2252,7 @@ pub const Zld = struct {
-         // Finally, unpack the rest.
-         const slice = self.sections.slice();
-         for (slice.items(.header)) |header, sect_id| {
--            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_LITERAL_POINTERS,
-                 macho.S_REGULAR,
-                 macho.S_MOD_INIT_FUNC_POINTERS,
-@@ -2707,10 +2707,10 @@ pub const Zld = struct {
-     }
- 
-     fn filterDataInCode(
--        dices: []const macho.data_in_code_entry,
-+        dices: []align(1) const macho.data_in_code_entry,
-         start_addr: u64,
-         end_addr: u64,
--    ) []const macho.data_in_code_entry {
-+    ) []align(1) const macho.data_in_code_entry {
-         const Predicate = struct {
-             addr: u64,
- 
-
diff --git a/pkgs/development/compilers/zig/patches/0.9-bump-macos-supported-version.patch b/pkgs/development/compilers/zig/patches/0.9-bump-macos-supported-version.patch
deleted file mode 100644
index 07b90e223553..000000000000
--- a/pkgs/development/compilers/zig/patches/0.9-bump-macos-supported-version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 98285b17b3887de37b630da66f09a44f42ddbe01 Mon Sep 17 00:00:00 2001
-From: Jakub Konka <kubkon@jakubkonka.com>
-Date: Tue, 25 Oct 2022 11:46:42 +0200
-Subject: [PATCH] darwin: bump max macOS version to 13.0
-
----
- lib/std/target.zig | 4 ++--
- src/target.zig     | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/std/target.zig b/lib/std/target.zig
-index d791e3b0350..7fbad5baa3c 100644
---- a/lib/std/target.zig
-+++ b/lib/std/target.zig
-@@ -277,13 +277,13 @@ pub const Target = struct {
-                         .aarch64 => VersionRange{
-                             .semver = .{
-                                 .min = .{ .major = 11, .minor = 6 },
--                                .max = .{ .major = 12, .minor = 0 },
-+                                .max = .{ .major = 13, .minor = 0 },
-                             },
-                         },
-                         .x86_64 => VersionRange{
-                             .semver = .{
-                                 .min = .{ .major = 10, .minor = 13 },
--                                .max = .{ .major = 12, .minor = 0 },
-+                                .max = .{ .major = 13, .minor = 0 },
-                             },
-                         },
-                         else => unreachable,
-diff --git a/src/target.zig b/src/target.zig
-index 9e2d26dac65..fc585912c45 100644
---- a/src/target.zig
-+++ b/src/target.zig
-@@ -18,6 +18,7 @@ pub const available_libcs = [_]ArchOsAbi{
-     .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
-     .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-     .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
-+    .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
-     .{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
-     .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
-     .{ .arch = .armeb, .os = .linux, .abi = .musleabi },
-@@ -73,6 +74,7 @@ pub const available_libcs = [_]ArchOsAbi{
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } },
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
-+    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
- };
- 
- pub fn libCGenericName(target: std.Target) [:0]const u8 {
diff --git a/pkgs/development/compilers/zig/patches/0.9-read-dynstr-at-rpath-offset.patch b/pkgs/development/compilers/zig/patches/0.9-read-dynstr-at-rpath-offset.patch
deleted file mode 100644
index 70633193f944..000000000000
--- a/pkgs/development/compilers/zig/patches/0.9-read-dynstr-at-rpath-offset.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ebcdbd9b3c9d437780aee4d6af76bbd2ab32ea06
-Author: LeRoyce Pearson <contact@leroycepearson.dev>
-Date:   2022-07-17 16:01:22 -0600
-
-    Read dynstr starting at rpath offset
-    
-    Since we know the offset, we may as well read starting there. Still expects
-    rpath to fit in 4096 bytes; that might be worth fixing in the future.
-    
-    Fixes issue #12112
-
-diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig
-index af41fc790579..ad0b6d5ce1e1 100644
---- a/lib/std/zig/system/NativeTargetInfo.zig
-+++ b/lib/std/zig/system/NativeTargetInfo.zig
-@@ -652,14 +652,19 @@ pub fn abiAndDynamicLinkerFromFile(
-             } else null;
- 
-             if (dynstr) |ds| {
--                const strtab_len = std.math.min(ds.size, strtab_buf.len);
--                const strtab_read_len = try preadMin(file, &strtab_buf, ds.offset, strtab_len);
--                const strtab = strtab_buf[0..strtab_read_len];
-                 // TODO this pointer cast should not be necessary
-                 const rpoff_usize = std.math.cast(usize, rpoff) catch |err| switch (err) {
-                     error.Overflow => return error.InvalidElfFile,
-                 };
--                const rpath_list = mem.sliceTo(std.meta.assumeSentinel(strtab[rpoff_usize..].ptr, 0), 0);
-+                if (rpoff_usize > ds.size) return error.InvalidElfFile;
-+                const rpoff_file = ds.offset + rpoff_usize;
-+                const rp_max_size = ds.size - rpoff_usize;
-+
-+                const strtab_len = std.math.min(rp_max_size, strtab_buf.len);
-+                const strtab_read_len = try preadMin(file, &strtab_buf, rpoff_file, strtab_len);
-+                const strtab = strtab_buf[0..strtab_read_len];
-+
-+                const rpath_list = mem.sliceTo(std.meta.assumeSentinel(strtab.ptr, 0), 0);
-                 var it = mem.tokenize(u8, rpath_list, ":");
-                 while (it.next()) |rpath| {
-                     var dir = fs.cwd().openDir(rpath, .{}) catch |err| switch (err) {
diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix
index 387362906e2e..ec9360729fcd 100644
--- a/pkgs/development/libraries/valhalla/default.nix
+++ b/pkgs/development/libraries/valhalla/default.nix
@@ -2,17 +2,20 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   boost,
   curl,
+  cxxopts,
+  gdal,
   geos,
   libspatialite,
   luajit,
+  lz4,
   prime-server,
   protobuf,
   python3,
+  rapidjson,
   sqlite,
   zeromq,
   zlib,
@@ -21,35 +24,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valhalla";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "valhalla";
     repo = "valhalla";
-    rev = finalAttrs.version;
-    hash = "sha256-1X9vsWsgnzmXn7bCMhN2PNwtfV0RRdzRFZIrQN2PLfA=";
+    tag = finalAttrs.version;
+    hash = "sha256-v/EwoJA1j8PuF9jOsmxQL6i+MT0rXbyLUE4HvBHUWDo=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Fix build
-    (fetchpatch {
-      url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch";
-      hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U=";
-    })
-
-    # Fix gcc-13 build:
-    #   https://github.com/valhalla/valhalla/pull/4154
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/valhalla/valhalla/commit/ed93f30272377cc6803533a1bb94fe81d14af81c.patch";
-      hash = "sha256-w4pnOqk/Jj3unVuesE64QSecrUIVSqwK69t9xNVc4GA=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace src/bindings/python/CMakeLists.txt \
-      --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
+      --replace-fail "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "rapidjson_include_dir rapidjson" "rapidjson_include_dir RapidJSON"
   '';
 
   nativeBuildInputs = [
@@ -58,35 +47,33 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DENABLE_TESTS=OFF"
-    "-DENABLE_BENCHMARKS=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750
-    "-Wno-error=stringop-overflow"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "ENABLE_TESTS" false)
+    (lib.cmakeBool "ENABLE_SINGLE_FILES_WERROR" false)
+    (lib.cmakeBool "PREFER_EXTERNAL_DEPS" true)
   ];
 
   buildInputs = [
     boost
+    cxxopts
+    lz4
+    (python3.withPackages (ps: [ ps.pybind11 ]))
+    rapidjson
+    zeromq
+  ];
+
+  propagatedBuildInputs = [
     curl
+    gdal
     geos
     libspatialite
     luajit
     prime-server
     protobuf
-    python3
     sqlite
-    zeromq
     zlib
   ];
 
-  postFixup = ''
-    substituteInPlace "$out"/lib/pkgconfig/libvalhalla.pc \
-      --replace '=''${prefix}//' '=/' \
-      --replace '=''${exec_prefix}//' '=/'
-  '';
-
   passthru.tests = {
     pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index ff9e591330ba..65b48dd1419f 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -7,7 +7,7 @@
 , platformToolsVersion ? "35.0.2"
 , buildToolsVersions ? [ "35.0.0" ]
 , includeEmulator ? false
-, emulatorVersion ? "35.1.4"
+, emulatorVersion ? "35.3.10"
 , platformVersions ? []
 , includeSources ? false
 , includeSystemImages ? false
@@ -150,16 +150,10 @@ rec {
 
     postInstall = ''
       ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
-      ${linkPlugin { name = "patcher"; plugin = patcher; }}
       ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
     '';
   };
 
-  patcher = callPackage ./patcher.nix {
-    inherit deployAndroidPackage os;
-    package = packages.patcher."1";
-  };
-
   build-tools = map (version:
     callPackage ./build-tools.nix {
       inherit deployAndroidPackage os;
@@ -339,7 +333,6 @@ rec {
       # Symlink all requested plugins
       ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
       ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}
-      ${linkPlugin { name = "patcher"; plugin = patcher; }}
       ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
       ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
       ${linkPlugins { name = "platforms"; plugins = platforms; }}
@@ -354,16 +347,16 @@ rec {
       # Link extras
       ${lib.concatMapStrings (identifier:
         let
-          path = addons.extras.${identifier}.path;
-          addon = deployAndroidPackage {
-            inherit os;
-            package = addons.extras.${identifier};
+          package = addons.extras.${identifier};
+          path = package.path;
+          extras = callPackage ./extras.nix {
+            inherit deployAndroidPackage package os;
           };
         in
         ''
           targetDir=$(dirname ${path})
           mkdir -p $targetDir
-          ln -s ${addon}/libexec/android-sdk/${path} $targetDir
+          ln -s ${extras}/libexec/android-sdk/${path} $targetDir
         '') includeExtras}
 
       # Expose common executables in bin/
diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
index 2ebd0a72e42c..7fc07fa4d10c 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
@@ -134,7 +134,7 @@ pkgs.mkShell rec {
 
           packages=(
             "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \
+            "emulator" "platform-tools" "platforms;android-35" \
             "system-images;android-35;google_apis;x86_64"
           )
 
diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
index d43592c1b7e2..5e239942e653 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
@@ -127,7 +127,7 @@ pkgs.mkShell rec {
 
           packages=(
             "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "patcher;v4" "platform-tools" "platforms;android-35"
+            "platform-tools" "platforms;android-35"
           )
 
           for package in "''${packages[@]}"; do
diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix
index 7f08389e7e31..2c0491ce67cc 100644
--- a/pkgs/development/mobile/androidenv/examples/shell.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -37,7 +37,10 @@ let
 
     platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ];
     abis = [ "x86_64" ];
-    extras = ["extras;google;gcm"];
+    extras = [
+      "extras;google;gcm"
+      "extras;google;auto"
+    ];
   };
 
   # If you copy this example out of nixpkgs, something like this will work:
@@ -180,7 +183,9 @@ pkgs.mkShell rec {
         "system-images;android-32;google_apis_playstore;x86_64" \
         "system-images;android-33;google_apis_playstore;x86_64" \
         "system-images;android-34;google_apis;x86_64" \
-        "system-images;android-35;google_apis_playstore_ps16k;x86_64"
+        "system-images;android-35;google_apis;x86_64" \
+        "extras;google;gcm"
+        "extras;google;auto"
       )
 
       for package in "''${packages[@]}"; do
diff --git a/pkgs/development/mobile/androidenv/extras.nix b/pkgs/development/mobile/androidenv/extras.nix
new file mode 100644
index 000000000000..7e6123635f59
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/extras.nix
@@ -0,0 +1,39 @@
+{
+  deployAndroidPackage,
+  lib,
+  package,
+  os,
+  autoPatchelfHook,
+  makeWrapper,
+  pkgs,
+}:
+
+deployAndroidPackage {
+  inherit package os;
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
+  buildInputs = lib.optionals (os == "linux") (
+    with pkgs;
+    [
+      llvmPackages.libcxx
+      SDL2
+    ]
+  );
+
+  patchInstructions = lib.optionalString (os == "linux") ''
+    autoPatchelf --no-recurse $packageBaseDir
+
+    if [ -f $PWD/desktop-head-unit ]; then
+      echo "desktop-head-unit exists"
+      wrapProgram $PWD/desktop-head-unit \
+        --prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath (
+            with pkgs;
+            [
+              xorg.libX11
+              xorg.libXrandr
+            ]
+          )
+        }
+    fi
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb
index 4263935177e7..8c38a09c513a 100644
--- a/pkgs/development/mobile/androidenv/mkrepo.rb
+++ b/pkgs/development/mobile/androidenv/mkrepo.rb
@@ -248,11 +248,18 @@ end
 def parse_package_xml doc
   licenses = get_licenses doc
   packages = {}
+  # check https://github.com/NixOS/nixpkgs/issues/373785
+  extras = {}
 
   doc.css('remotePackage').each do |package|
     name, _, version = package['path'].partition(';')
     next if version == 'latest'
 
+    is_extras = name == 'extras'
+    if is_extras
+      name = package['path'].tr(';', '-')
+    end
+
     type, revision, _ = package_revision(package)
     next unless revision
 
@@ -267,8 +274,14 @@ def parse_package_xml doc
     dependencies_xml = package.at_css('> dependencies')
     dependencies = to_json_collector dependencies_xml if dependencies_xml
 
-    target = (packages[name] ||= {})
-    target = (target[revision] ||= {})
+    if is_extras
+      target = extras
+      component = package['path']
+      target = (target[component] ||= {})
+    else
+      target = (packages[name] ||= {})
+      target = (target[revision] ||= {})
+    end
 
     target['name'] ||= name
     target['path'] ||= path
@@ -284,7 +297,7 @@ def parse_package_xml doc
     target['last-available-day'] = today
   end
 
-  [licenses, packages]
+  [licenses, packages, extras]
 end
 
 def parse_image_xml doc
@@ -431,9 +444,10 @@ result['addons'] = {}
 result['extras'] = {}
 
 opts[:packages].each do |filename|
-  licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
+  licenses, packages, extras = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
   merge result['licenses'], licenses
   merge result['packages'], packages
+  merge result['extras'], extras
 end
 
 opts[:images].each do |filename|
diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh
index f1b6ec73798c..70ceeb8f43be 100755
--- a/pkgs/development/mobile/androidenv/mkrepo.sh
+++ b/pkgs/development/mobile/androidenv/mkrepo.sh
@@ -12,6 +12,7 @@ cat ./repo.json | ruby mkrepo.rb \
     --images ./xml/android-tv-sys-img2-1.xml \
     --images ./xml/android-wear-cn-sys-img2-1.xml \
     --images ./xml/android-wear-sys-img2-1.xml \
+    --images ./xml/android-automotive-sys-img2-1.xml \
     --images ./xml/google_apis-sys-img2-1.xml \
     --images ./xml/google_apis_playstore-sys-img2-1.xml \
     --addons ./xml/addon2-1.xml \
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 82f7c5f48404..2d116dd6778b 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -11,7 +11,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -64,7 +64,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -110,7 +110,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -161,7 +161,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -198,7 +198,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -249,7 +249,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -286,7 +286,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -339,7 +339,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -399,7 +399,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -459,7 +459,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -519,7 +519,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -579,7 +579,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -639,7 +639,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -699,7 +699,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -759,7 +759,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -819,7 +819,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -879,7 +879,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -939,7 +939,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -985,7 +985,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1031,7 +1031,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1077,7 +1077,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1123,7 +1123,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1169,7 +1169,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1215,7 +1215,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1262,7 +1262,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1292,7 +1292,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1322,7 +1322,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1350,7 +1350,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1368,6 +1368,43 @@
         }
       }
     },
+    "extras;google;auto": {
+      "archives": [
+        {
+          "os": "macosx",
+          "sha1": "4f8a3d3e32b27de1fc190d149039842e76a55bdd",
+          "size": 7797329,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.1.zip"
+        },
+        {
+          "os": "linux",
+          "sha1": "5d87eb87a1421e59d528eac1f5cdd406c0b39f51",
+          "size": 6927985,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.1.zip"
+        },
+        {
+          "os": "windows",
+          "sha1": "c27bf84e59dda7b79315b6ca2a314063feffd6ac",
+          "size": 7012059,
+          "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.1.zip"
+        }
+      ],
+      "displayName": "Android Auto Desktop Head Unit Emulator",
+      "last-available-day": 20112,
+      "license": "android-sdk-license",
+      "name": "extras-google-auto",
+      "path": "extras/google/auto",
+      "revision": "2.0",
+      "revision-details": {
+        "major:0": "2",
+        "minor:1": "0"
+      },
+      "type-details": {
+        "element-attributes": {
+          "xsi:type": "ns5:genericDetailsType"
+        }
+      }
+    },
     "extras;google;gcm": {
       "archives": [
         {
@@ -1378,7 +1415,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -1413,7 +1450,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -1441,7 +1478,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -1469,7 +1506,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -1506,7 +1543,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -1534,7 +1571,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -1562,7 +1599,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -1591,7 +1628,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -1619,7 +1656,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -1647,7 +1684,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 19954,
+      "last-available-day": 20112,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2316,7 +2353,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -2354,7 +2391,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -2394,7 +2431,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -2435,7 +2472,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -2473,7 +2510,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -2515,7 +2552,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -2553,7 +2590,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -2593,7 +2630,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -2634,7 +2671,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -2679,7 +2716,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -2710,7 +2747,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -2748,7 +2785,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -2788,7 +2825,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -2829,7 +2866,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -2874,7 +2911,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -2905,7 +2942,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -2943,7 +2980,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -2986,7 +3023,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3027,7 +3064,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3072,7 +3109,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3110,7 +3147,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3150,7 +3187,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -3191,7 +3228,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -3236,7 +3273,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -3274,7 +3311,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -3314,7 +3351,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -3355,7 +3392,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -3393,7 +3430,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -3423,7 +3460,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -3455,7 +3492,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -3493,7 +3530,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -3531,7 +3568,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -3569,7 +3606,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -3602,7 +3639,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -3643,7 +3680,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -3684,7 +3721,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -3725,7 +3762,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -3763,7 +3800,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -3795,7 +3832,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -3833,7 +3870,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -3871,7 +3908,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -3909,7 +3946,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -3942,7 +3979,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -3983,7 +4020,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -4024,7 +4061,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -4065,7 +4102,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -4103,7 +4140,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -4140,7 +4177,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -4172,7 +4209,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -4210,7 +4247,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -4248,7 +4285,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -4286,7 +4323,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -4319,7 +4356,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -4360,7 +4397,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -4401,7 +4438,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -4442,7 +4479,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -4487,7 +4524,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -4519,7 +4556,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -4557,7 +4594,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -4595,7 +4632,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -4633,7 +4670,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -4673,7 +4710,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -4714,7 +4751,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -4755,7 +4792,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -4798,7 +4835,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -4843,7 +4880,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -4882,7 +4919,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -4919,7 +4956,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -4951,7 +4988,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -4989,7 +5026,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -5027,7 +5064,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -5060,7 +5097,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -5101,7 +5138,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -5142,7 +5179,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -5183,7 +5220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -5226,7 +5263,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -5286,7 +5323,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -5325,7 +5362,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -5369,7 +5406,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -5406,7 +5443,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -5443,7 +5480,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -5487,7 +5524,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -5543,7 +5580,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -5599,7 +5636,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -5657,7 +5694,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -5702,7 +5739,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -5746,7 +5783,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -5783,7 +5820,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -5820,7 +5857,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -5864,7 +5901,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -5920,7 +5957,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -5978,7 +6015,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -6005,6 +6042,54 @@
       }
     },
     "28": {
+      "android-automotive-playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "a1f224245056ddaa89651e379efbde7357b15046",
+              "size": 859616969,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive-playstore/x86-28_r05.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "29",
+                "micro:2": "2",
+                "minor:1": "0"
+              }
+            }
+          },
+          "displayName": "Automotive Intel x86 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-28-android-automotive-playstore-x86",
+          "path": "system-images/android-28/android-automotive-playstore/x86",
+          "revision": "28-android-automotive-playstore-x86",
+          "revision-details": {
+            "major:0": "5"
+          },
+          "type-details": {
+            "abi:3": "x86",
+            "api-level:0": "28",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive-playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "android-tv": {
         "x86": {
           "archives": [
@@ -6023,7 +6108,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -6062,7 +6147,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -6106,7 +6191,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -6136,7 +6221,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -6166,7 +6251,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -6210,7 +6295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -6266,7 +6351,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -6322,7 +6407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -6370,7 +6455,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -6426,7 +6511,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -6482,7 +6567,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -6509,6 +6594,54 @@
       }
     },
     "29": {
+      "android-automotive-playstore": {
+        "x86": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "8fb2624c63c34a01c27dd8085277b2a5fb8d7fbc",
+              "size": 923839106,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive-playstore/x86-29_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "29",
+                "micro:2": "2",
+                "minor:1": "0"
+              }
+            }
+          },
+          "displayName": "Automotive with Play Store Intel x86 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-29-android-automotive-playstore-x86",
+          "path": "system-images/android-29/android-automotive-playstore/x86",
+          "revision": "29-android-automotive-playstore-x86",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:3": "x86",
+            "api-level:0": "29",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive with Play Store",
+              "id:0": "android-automotive-playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "android-tv": {
         "x86": {
           "archives": [
@@ -6542,7 +6675,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -6574,7 +6707,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -6628,7 +6761,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -6682,7 +6815,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -6726,7 +6859,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -6772,7 +6905,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -6818,7 +6951,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -6872,7 +7005,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -6940,7 +7073,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -7008,7 +7141,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -7035,6 +7168,54 @@
       }
     },
     "30": {
+      "android-automotive-playstore": {
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "7aec48997addb860118a98741458922bdec606c9",
+              "size": 1182802747,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive-playstore/x86_64-30_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "29",
+                "micro:2": "2",
+                "minor:1": "0"
+              }
+            }
+          },
+          "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-30-android-automotive-playstore-x86_64",
+          "path": "system-images/android-30/android-automotive-playstore/x86_64",
+          "revision": "30-android-automotive-playstore-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "30",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive with Play Store",
+              "id:0": "android-automotive-playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "android-tv": {
         "x86": {
           "archives": [
@@ -7068,7 +7249,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -7107,7 +7288,7 @@
             }
           },
           "displayName": "Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear/arm64-v8a",
@@ -7144,7 +7325,7 @@
             }
           },
           "displayName": "Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear/x86",
@@ -7176,7 +7357,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -7218,7 +7399,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -7262,7 +7443,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -7318,7 +7499,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -7374,7 +7555,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -7428,7 +7609,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -7496,7 +7677,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -7564,7 +7745,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -7624,7 +7805,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -7676,7 +7857,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -7720,7 +7901,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -7762,7 +7943,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -7816,7 +7997,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -7872,7 +8053,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -7936,7 +8117,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -7992,7 +8173,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -8019,6 +8200,100 @@
       }
     },
     "32": {
+      "android-automotive-playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "1b07fe1bc8a4f5a9b249ff12d5bf142cb43a2093",
+              "size": 948247935,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive-playstore/arm64-v8a-32_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google Play arm64-v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-32-android-automotive-playstore-arm64-v8a",
+          "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
+          "revision": "32-android-automotive-playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "32",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive-playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "8f8309ae9e25b0c5eeb869bb0cb2515021073693",
+              "size": 1012590435,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive-playstore/x86_64-32_r01.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google Play x86_64 System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-32-android-automotive-playstore-x86_64",
+          "path": "system-images/android-32/android-automotive-playstore/x86_64",
+          "revision": "32-android-automotive-playstore-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "32",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive-playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "default": {
         "arm64-v8a": {
           "archives": [
@@ -8042,7 +8317,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -8084,7 +8359,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -8138,7 +8413,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -8194,7 +8469,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -8258,7 +8533,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
@@ -8326,7 +8601,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -8353,6 +8628,100 @@
       }
     },
     "33": {
+      "android-automotive": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "ca95328e871a6ec613fffc410b2e81ca7c7c2c95",
+              "size": 1314179288,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-33_r04.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "1",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-33-android-automotive-arm64-v8a",
+          "path": "system-images/android-33/android-automotive/arm64-v8a",
+          "revision": "33-android-automotive-arm64-v8a",
+          "revision-details": {
+            "major:0": "4"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "33",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "f23487d919389c9c5bf1882c030830de31ed0a21",
+              "size": 1336031457,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-33_r04.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "1",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google APIs x86_64 System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-33-android-automotive-x86_64",
+          "path": "system-images/android-33/android-automotive/x86_64",
+          "revision": "33-android-automotive-x86_64",
+          "revision-details": {
+            "major:0": "4"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "33",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "android-tv": {
         "arm64-v8a": {
           "archives": [
@@ -8386,7 +8755,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -8438,7 +8807,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -8464,9 +8833,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "949a8b23b3abb217ad2f710bbffe58d4b81dd8db",
-              "size": 1063091901,
-              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-33_r03.zip"
+              "sha1": "9ef3b7a4fd76e7633e4b0616e535d9c5806140ce",
+              "size": 1063145250,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-33_r04.zip"
             }
           ],
           "dependencies": {
@@ -8477,8 +8846,8 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 19954,
-          "license": "android-sdk-preview-license",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
           "revision": "33-android-wear-arm64-v8a",
@@ -8501,9 +8870,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "94de5073c7078126614d8b7510aa4adde4327dd5",
-              "size": 1100218729,
-              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-33_r03.zip"
+              "sha1": "250b8682cc0a4430c8963f2927a097296856fe22",
+              "size": 1100277497,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-33_r04.zip"
             }
           ],
           "dependencies": {
@@ -8514,8 +8883,8 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
-          "license": "android-sdk-preview-license",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
           "revision": "33-android-wear-x86_64",
@@ -8558,7 +8927,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -8600,7 +8969,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -8626,9 +8995,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "8143bc8b517db20f1f34dd5d93a021b131d73720",
-              "size": 1751160645,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r16.zip"
+              "sha1": "47516ccb88230c42965940a929f51053562ee351",
+              "size": 1761582980,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r17.zip"
             }
           ],
           "dependencies": {
@@ -8654,13 +9023,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
           "revision": "33-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "16"
+            "major:0": "17"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -8682,9 +9051,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "a18ba5146f8a10e6f3c1d45df4a8d22c68306ee3",
-              "size": 1697603005,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r16.zip"
+              "sha1": "2b96f5bd5c79bfe1cc645e70b3e630b5755d9711",
+              "size": 1707857511,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r17.zip"
             }
           ],
           "dependencies": {
@@ -8710,13 +9079,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
           "revision": "33-google_apis-x86_64",
           "revision-details": {
-            "major:0": "16"
+            "major:0": "17"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -8738,17 +9107,23 @@
       "google_apis_playstore": {
         "arm64-v8a": {
           "archives": [
+            {
+              "os": "all",
+              "sha1": "e6adbdead6a9282fdb2bd471691bb13c9208dfdd",
+              "size": 1712020800,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33-ext5_r02.zip"
+            },
             {
               "os": "macosx",
-              "sha1": "51169278b759ce1f347a235497729bf5b558ecb2",
-              "size": 1475820733,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-darwin_ext05.zip"
+              "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba",
+              "size": 1474557980,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-darwin.zip"
             },
             {
               "os": "linux",
-              "sha1": "51169278b759ce1f347a235497729bf5b558ecb2",
-              "size": 1475820733,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-linux_ext05.zip"
+              "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba",
+              "size": 1474557980,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-linux.zip"
             }
           ],
           "dependencies": {
@@ -8774,13 +9149,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "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",
           "revision": "33-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "7"
+            "major:0": "9"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -8802,9 +9177,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "e80584a2c9f8ba863a3fa961efc6d8866650f2eb",
-              "size": 1479931636,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r01_ext05.zip"
+              "sha1": "b74ad29a35dab4ac19e9b2a5cf3ccd0d1952b97d",
+              "size": 1668794037,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33-ext5_r02.zip"
             }
           ],
           "dependencies": {
@@ -8830,13 +9205,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
           "revision": "33-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "7"
+            "major:0": "9"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -8857,6 +9232,100 @@
       }
     },
     "34": {
+      "android-automotive": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "5a7158edbf14b259892e36495f748a2cd5bfee17",
+              "size": 1392202709,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-34-android-automotive-arm64-v8a",
+          "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
+          "revision": "34-android-automotive-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "34",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "49ff6a8de43f069bad440d615ab3c25e24822416",
+              "size": 1393873908,
+              "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "9",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Android Automotive with Google APIs x86_64 System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-34-android-automotive-x86_64",
+          "path": "system-images/android-34-ext9/android-automotive/x86_64",
+          "revision": "34-android-automotive-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "34",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Automotive",
+              "id:0": "android-automotive"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
       "android-tv": {
         "arm64-v8a": {
           "archives": [
@@ -8890,7 +9359,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -8942,7 +9411,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -8968,13 +9437,13 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "29a733a9e6d89a70f26dabff7525edc657be6b07",
-              "size": 1215167945,
+              "sha1": "0352eee45f1e738b10a64b547a1f51d6d3baee42",
+              "size": 1215167643,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-34_r01.zip"
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -8998,13 +9467,13 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "851c223ddf735d692d3cca96fdffa4c1f7ca4316",
-              "size": 1209506837,
+              "sha1": "9062ebd4ea15d324c2ae14d0e938d7a768f3e190",
+              "size": 1209508768,
               "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-34_r01.zip"
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -9048,7 +9517,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -9090,7 +9559,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -9127,9 +9596,9 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
+                "major:0": "34",
+                "micro:2": "16",
+                "minor:1": "2"
               }
             },
             "dependency:1": {
@@ -9144,7 +9613,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -9183,9 +9652,9 @@
                 "path": "emulator"
               },
               "min-revision:0": {
-                "major:0": "32",
-                "micro:2": "8",
-                "minor:1": "1"
+                "major:0": "34",
+                "micro:2": "16",
+                "minor:1": "2"
               }
             },
             "dependency:1": {
@@ -9200,7 +9669,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -9270,7 +9739,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -9327,7 +9796,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -9355,24 +9824,184 @@
       }
     },
     "35": {
+      "android-wear": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "46c7b39766b2704d16cc527c67996cd80a07e5ab",
+              "size": 1235396821,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-35_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-35-android-wear-arm64-v8a",
+          "path": "system-images/android-35/android-wear/arm64-v8a",
+          "revision": "35-android-wear-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:2": "arm64-v8a",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Wear OS 5.1 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "bac5234ebf934cbf25357cda5c0311720a48616f",
+              "size": 1230585975,
+              "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-35_r01.zip"
+            }
+          ],
+          "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-preview-license",
+          "name": "system-image-35-android-wear-x86_64",
+          "path": "system-images/android-35/android-wear/x86_64",
+          "revision": "35-android-wear-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:2": "x86_64",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Wear OS 5.1 - Preview",
+              "id:0": "android-wear"
+            }
+          }
+        }
+      },
+      "default": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "2026a06409db630b56711afdbffb457c1dbaed49",
+              "size": 769099654,
+              "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-35_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "29",
+                "micro:2": "11",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "ARM 64 v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-35-default-arm64-v8a",
+          "path": "system-images/android-35/default/arm64-v8a",
+          "revision": "35-default-arm64-v8a",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:2": "arm64-v8a",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Default Android System Image",
+              "id:0": "default"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "2d857d170c0d1b827149565da34b3383e5306f7f",
+              "size": 782404023,
+              "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-35_r02.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "29",
+                "micro:2": "11",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-35-default-x86_64",
+          "path": "system-images/android-35/default/x86_64",
+          "revision": "35-default-x86_64",
+          "revision-details": {
+            "major:0": "2"
+          },
+          "type-details": {
+            "abi:2": "x86_64",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Default Android System Image",
+              "id:0": "default"
+            }
+          }
+        }
+      },
       "google_apis": {
         "arm64-v8a": {
           "archives": [
             {
               "os": "all",
-              "sha1": "4bb0111ce3e386f40337c652c0230524d97a05ae",
-              "size": 1766503283,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r07.zip"
+              "sha1": "50b337d09eff0540022d24e5097f6df29407e7c1",
+              "size": 1776920399,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r08.zip"
             }
           ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
           "revision": "35-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "7"
+            "major:0": "8"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -9394,19 +10023,31 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "febd4186e0d234d60fecd50a37aaabf07bac6605",
-              "size": 1689421014,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r07.zip"
+              "sha1": "d79169884cabc6680cb29d32c2112ad46c858c1b",
+              "size": 1736662833,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r08.zip"
             }
           ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
           "revision": "35-google_apis-x86_64",
           "revision-details": {
-            "major:0": "7"
+            "major:0": "8"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -9430,19 +10071,31 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "ecb2b9dbedda0e8aca02b23bc069c462499731ce",
-              "size": 1776691122,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35_r07.zip"
+              "sha1": "b01416bc0bca12a85295dad179f9b8a1cae3d1e6",
+              "size": 1789211399,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35_r09.zip"
             }
           ],
-          "displayName": "Google Play Experimental 16k Page Size ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
+          "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a",
           "revision": "35-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "1"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -9451,7 +10104,7 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": "Google APIs PlayStore",
+              "display:1": "Google Play",
               "id:0": "google_apis_playstore"
             },
             "vendor:2": {
@@ -9464,19 +10117,31 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "b06db9ec697e40e2acd301653ff76bb6b2abe1d8",
-              "size": 1714146193,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35_r07.zip"
+              "sha1": "2f0054868e6aab3c098acd3decba17a82aed4176",
+              "size": 1762061559,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35_r09.zip"
             }
           ],
-          "displayName": "Google Play Experimental 16k Page Size Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
-          "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
+          "path": "system-images/android-35-ext14/google_apis_playstore/x86_64",
           "revision": "35-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "1"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -9485,7 +10150,7 @@
               "xsi:type": "ns12:sysImgDetailsType"
             },
             "tag:1": {
-              "display:1": "Google APIs PlayStore",
+              "display:1": "Google Play",
               "id:0": "google_apis_playstore"
             },
             "vendor:2": {
@@ -9500,19 +10165,31 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "bcb011c34aa3ae9f198b5adf728430d5c0cafc25",
-              "size": 1522862879,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-35_r03.zip"
+              "sha1": "106d90f480a5e9619062944271b94eaf5b22ffb6",
+              "size": 1590150760,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-35_r05.zip"
             }
           ],
-          "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19954,
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
+          "last-available-day": 20112,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
-          "path": "system-images/android-35/google_apis_ps16k/arm64-v8a",
+          "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "35-page_size_16kb-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -9534,19 +10211,31 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "e5ba89f23ee36ec6c46bd06df332ab876f123b13",
-              "size": 1444723260,
-              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-35_r03.zip"
+              "sha1": "921af95f9566e79cd2e2c9d08fd253c58d18595e",
+              "size": 1510397655,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-35_r05.zip"
             }
           ],
-          "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19954,
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "33",
+                "micro:2": "24",
+                "minor:1": "1"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
-          "path": "system-images/android-35/google_apis_ps16k/x86_64",
+          "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
           "revision": "35-page_size_16kb-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -9566,6 +10255,296 @@
         }
       }
     },
+    "Baklava": {
+      "google_apis": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "9252bbb0cced0cfb7373a3236a7295ebf0f2945c",
+              "size": 1807500394,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-Baklava-google_apis-arm64-v8a",
+          "path": "system-images/android-Baklava/google_apis/arm64-v8a",
+          "revision": "Baklava-google_apis-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "1548664b809576557fb4823e0f03e7c550fec443",
+              "size": 1814866164,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-Baklava-google_apis-x86_64",
+          "path": "system-images/android-Baklava/google_apis/x86_64",
+          "revision": "Baklava-google_apis-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "029e0b3732aba5a4cb97621b84f5edea9b71775b",
+              "size": 1825799645,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a",
+          "revision": "Baklava-google_apis_playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "4fd21b8fa1b92c8f9a9f7838ffab55a1c344aa0a",
+              "size": 1848004792,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Google Play Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-Baklava-google_apis_playstore-x86_64",
+          "path": "system-images/android-Baklava/google_apis_playstore/x86_64",
+          "revision": "Baklava-google_apis_playstore-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "Google Play",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "page_size_16kb": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "9ed66f7ad190fedf5b20989a3914501234fbeff2",
+              "size": 1623140308,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
+          "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a",
+          "revision": "Baklava-page_size_16kb-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "8242bdada27c1db6209d8b2fa68bd86d7b3ee3b9",
+              "size": 1588410201,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-Baklava_r03.zip"
+            }
+          ],
+          "dependencies": {
+            "dependency:0": {
+              "element-attributes": {
+                "path": "emulator"
+              },
+              "min-revision:0": {
+                "major:0": "35",
+                "micro:2": "10",
+                "minor:1": "2"
+              }
+            }
+          },
+          "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image",
+          "last-available-day": 20112,
+          "license": "android-sdk-license",
+          "name": "system-image-Baklava-page_size_16kb-x86_64",
+          "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64",
+          "revision": "Baklava-page_size_16kb-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "35",
+            "codename:1": "Baklava",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:2": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      }
+    },
     "TiramisuPrivacySandbox": {
       "google_apis": {
         "arm64-v8a": {
@@ -10357,6 +11336,9 @@
     "android-googletv-license": [
       "Terms and Conditions\n\nThis is the Google TV Add-on for the Android Software Development Kit License Agreement.\n\n1. Introduction\n\n1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the \"Google TV Add-on\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.\n\n1.2 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.\n\n2.2 You can accept this License Agreement by:\n\n(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or\n\n(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.\n\n2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.\n\n2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.\n\n3. Google TV Add-on License from Google\n\n3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.\n\n3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.\n\n3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.\n\n3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.\n\n4. Use of the Google TV Add-on by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.\n\n4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.\n\n7. Third Party Applications for the Google TV Platform\n\n7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Google TV APIs\n\n8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services\n\n8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.\n\n8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:\n\n(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;\n\n(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or\n\n(c) not create any commercial audience measurement tool or service using the Google TV API Content\n\n9. Terminating this License Agreement\n\n9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.\n\n9.3 Google may at any time, terminate this License Agreement with you if:\n\n(A) you have breached any provision of this License Agreement; or\n\n(B) Google is required to do so by law; or\n\n(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or\n\n(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.\n\n14. General Legal Terms\n\n14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.\n\n14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nAugust 15, 2011"
     ],
+    "android-googlexr-license": [
+      "To get started with the Android XR Emulator System Image SDK, you must agree to the following terms and conditions. As described below, please note that this is a preview, emulated version of the Android XR OS, subject to change, that you use at your own risk.\n\nThis is the Android XR Emulator System Image SDK License Agreement\n\n1. Introduction\n\n1.1 The Android Android XR Emulator System Image SDK (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files,, packaged APIs, library files (if and when they are made available), and Google applications and APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: https://source.android.com/, as updated from time to time.\n\n1.3 \"Google\" means Google LLC, organized under the laws of the State of Delaware, USA, and operating under the laws of the USA with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA.\n\n2. Accepting this License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept and/or using this SDK, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for Android XR.\n\n3.2 You may not use this SDK to develop applications for other platforms or to develop another SDK. You are of course free to develop applications for other platforms provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 The SDK is in development, and your testing and feedback are an important part of the development process. By using the SDK, you acknowledge that implementation of some features are still under development and that you should not rely on the SDK having the full functionality of a stable release.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy, which is located at the following URL: https://policies.google.com/privacy\n\n6.3 Anonymized and aggregated sets of the data may be shared with Google partners to improve the SDK.\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware that the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n9. Terminating this License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction."
+    ],
     "android-sdk-arm-dbt-license": [
       "Terms and Conditions\n\nThis is the Android Software Development Kit License Agreement\n\n1. Introduction\n\n1.1 The Android Software Development Kit (referred to in the License Agreement as the \"SDK\" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.\n\n1.2 \"Android\" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.\n\n1.3 A \"compatible implementation\" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).\n\n1.4 \"Google\" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.\n\n\n2. Accepting the License Agreement\n\n2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.\n\n2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.\n\n2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.\n\n2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.\n\n\n3. SDK License from Google\n\n3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.\n\n3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.\n\n3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. \"Intellectual Property Rights\" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.\n\n3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.\n\n3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.\n\n3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.\n\n3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.\n\n3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.\n\n\n4. Use of the SDK by You\n\n4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.\n\n4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).\n\n4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.\n\n4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.\n\n4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.\n\n4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.\n\n4.7 This software enables the execution of intellectual property owned by Arm Limited. You agree that your use of the software, that allows execution of ARM Instruction Set Architecture (“ISA”) compliant executables for application development and debug only on x86 desktop, laptop, customer on-premise servers, and customer-procured cloud-based environments.\n\n5. Your Developer Credentials\n\n5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.\n\n6. Privacy and Information\n\n6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.\n\n6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.\n\n\n7. Third Party Applications\n\n7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.\n\n7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.\n\n7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.\n\n\n8. Using Android APIs\n\n8.1 Google Data APIs\n\n8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.\n\n8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. If you use the Android Recognition Service API, documented at the following URL: https://developer.android.com/reference/android/speech/RecognitionService, as updated from time to time, you acknowledge that the use of the API is subject to the Data Processing Addendum for Products where Google is a Data Processor, which is located at the following URL: https://privacy.google.com/businesses/gdprprocessorterms/, as updated from time to time. By clicking to accept, you hereby agree to the terms of the Data Processing Addendum for Products where Google is a Data Processor.\n\n\n9. Terminating the License Agreement\n\n9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.\n\n9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.\n\n9.3 Google may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Google is required to do so by law; or (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or (D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.\n\n9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.\n\n\n10. DISCLAIMER OF WARRANTIES\n\n10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED \"AS IS\" AND \"AS AVAILABLE\" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.\n\n10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.\n\n10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\n\n\n11. LIMITATION OF LIABILITY\n\n11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.\n\n\n12. Indemnification\n\n12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.\n\n\n13. Changes to the License Agreement\n\n13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.\n\n\n14. General Legal Terms\n\n14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.\n\n14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.\n\n14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.\n\n14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.\n\n14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.\n\n14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.\n\n14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.\n\n\nJanuary 16, 2019"
     ],
@@ -10410,7 +11392,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10456,7 +11438,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10502,7 +11484,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10548,7 +11530,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10594,7 +11576,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10640,7 +11622,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10686,7 +11668,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10732,7 +11714,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10778,7 +11760,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -10823,7 +11805,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -10868,7 +11850,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10914,7 +11896,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10960,7 +11942,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11006,7 +11988,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11052,7 +12034,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11098,7 +12080,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -11143,7 +12125,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11189,7 +12171,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -11234,7 +12216,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11280,7 +12262,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -11325,7 +12307,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -11370,7 +12352,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -11415,7 +12397,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -11460,7 +12442,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -11505,7 +12487,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -11550,7 +12532,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -11595,7 +12577,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -11640,7 +12622,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -11685,7 +12667,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -11730,7 +12712,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -11775,7 +12757,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -11820,7 +12802,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -11865,7 +12847,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -11910,7 +12892,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -11955,7 +12937,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -12000,7 +12982,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -12045,7 +13027,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -12090,7 +13072,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -12135,7 +13117,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -12180,7 +13162,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12227,7 +13209,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12274,7 +13256,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -12319,7 +13301,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -12364,7 +13346,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -12409,7 +13391,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -12454,7 +13436,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12501,7 +13483,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12548,7 +13530,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12595,7 +13577,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -12640,7 +13622,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -12685,7 +13667,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -12730,7 +13712,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -12775,7 +13757,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -12820,7 +13802,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -12865,7 +13847,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -12903,7 +13885,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -12941,7 +13923,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -12979,7 +13961,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -13018,7 +14000,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -13056,7 +14038,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -13094,7 +14076,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -13132,7 +14114,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -13170,7 +14152,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -13208,7 +14190,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -13247,7 +14229,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -13286,7 +14268,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -13364,7 +14346,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -13402,7 +14384,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -13441,7 +14423,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -13480,7 +14462,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -13519,7 +14501,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -13535,6 +14517,161 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.0.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "e009a9b188cfeb1d2b4c318ab5cb4f1ddc368861",
+            "size": 61959297,
+            "url": "https://dl.google.com/android/repository/build-tools_r35.0.1_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "1cbfa5564b62504a1111352edda35914cf723a20",
+            "size": 59876477,
+            "url": "https://dl.google.com/android/repository/build-tools_r35.0.1_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f4dda6855ddf1ea1a51ee3ab6587104bd0c1d727",
+            "size": 76857925,
+            "url": "https://dl.google.com/android/repository/build-tools_r35.0.1_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 35.0.1",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/35.0.1",
+        "revision": "35.0.1",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "1",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.0.0-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b0a48cef38ee02e2170e6eeb769956c46b8a294b",
+            "size": 62558889,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc1_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "dfa48ceb8bd185891a11cd8babcc3782abca35e3",
+            "size": 57851822,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc1_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "7a1149c9a0603a831396b7f522505b4357d80744",
+            "size": 78312030,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc1_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 36-rc1",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/36.0.0-rc1",
+        "revision": "36.0.0-rc1",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.0.0-rc3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "af37c3b9c58d62b885c80c5f3968106a22c37495",
+            "size": 62577193,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc3_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "acac220c05062b6ea56ab4c9561a544d15223150",
+            "size": 57872335,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc3_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "ae832d578f78dceca3c536479a58ca69c109dbaf",
+            "size": 78345346,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc3_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 36-rc3",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/36.0.0-rc3",
+        "revision": "36.0.0-rc3",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "36.0.0-rc4": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "2ebea22941d2c8d661b9bf3c20193677ffd50334",
+            "size": 62785278,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc4_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "66abc0f7c3efcd82b5e418d9613e97efd16ff370",
+            "size": 58085095,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc4_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "e5917875bb11fe08e69e6539bae079ddbe840586",
+            "size": 78583529,
+            "url": "https://dl.google.com/android/repository/build-tools_r36-rc4_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 36-rc4",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/36.0.0-rc4",
+        "revision": "36.0.0-rc4",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "4"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmake": {
@@ -13560,7 +14697,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -13598,7 +14735,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -13636,7 +14773,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -13652,6 +14789,234 @@
           }
         }
       },
+      "3.30.3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "dc0d803d79b66eb7aa4b12b3056db5734ec1841f",
+            "size": 29565700,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "99ee0e31ad78ca5d50fa68fa203543adbe49f412",
+            "size": 41486046,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.3-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e25190d483d169ca8522ca4e15412188183b1d02",
+            "size": 19897608,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.3-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.30.3",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.30.3",
+        "revision": "3.30.3",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "3",
+          "minor:1": "30"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "3.30.4": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "b7d4287a46737718d88611655608d567fcc07c1e",
+            "size": 29566348,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.4-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "73e4d81d4ee1917e9b56ea6f35764c1861a52c45",
+            "size": 41484902,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.4-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "c4ed0e13447b94ddf548f67c6faac7e5ac878fb8",
+            "size": 19898645,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.4-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.30.4",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.30.4",
+        "revision": "3.30.4",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "4",
+          "minor:1": "30"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "3.30.5": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "c999a37fa18cb3e24dc003386cffe1d86add91b5",
+            "size": 29566687,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.5-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "3a7d78b52bdb455d9f041b1e521fc3e0dcbaef29",
+            "size": 41485176,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.5-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "308c94365edb2760f38eef8f745e313e36908a18",
+            "size": 19898983,
+            "url": "https://dl.google.com/android/repository/cmake-3.30.5-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.30.5",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.30.5",
+        "revision": "3.30.5",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "5",
+          "minor:1": "30"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "3.31.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "13b9505857aa3bbfc1d80ec6b587e3ba2d2929f3",
+            "size": 30452943,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.0-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d20697c5eb256dff2d29d52440e9cfe0f973538f",
+            "size": 42747441,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.0-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "39fa0e1898861bdef2da13f7b19ad0d0be5dac83",
+            "size": 20441934,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.0-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.31.0",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.31.0",
+        "revision": "3.31.0",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "0",
+          "minor:1": "31"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "3.31.1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "477e6cd2d8094d2653464a60869aa15e0d79a24f",
+            "size": 30474570,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "11b79b8908377bdd038aac0625e7d8aa32aed503",
+            "size": 42781652,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.1-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3a8f1f1b33e0ed2a639b6e709ab15806648979c9",
+            "size": 20462685,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.1-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.31.1",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.31.1",
+        "revision": "3.31.1",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "1",
+          "minor:1": "31"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "3.31.4": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "329d5d23600fc7cff8ebff8136a0fd0e7994c069",
+            "size": 30482338,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.4-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "4094e82ed72c994bf9c0244d71db555a7c97e693",
+            "size": 42791670,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.4-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "7012f994ba691ca888b0733e95ab62c3f300d7dc",
+            "size": 20465800,
+            "url": "https://dl.google.com/android/repository/cmake-3.31.4-windows.zip"
+          }
+        ],
+        "displayName": "CMake 3.31.4",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/3.31.4",
+        "revision": "3.31.4",
+        "revision-details": {
+          "major:0": "3",
+          "micro:2": "4",
+          "minor:1": "31"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "3.6.4111459": {
         "archives": [
           {
@@ -13674,7 +15039,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -13714,7 +15079,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -13751,7 +15116,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -13826,7 +15191,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -13939,7 +15304,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -14014,7 +15379,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -14051,7 +15416,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -14089,7 +15454,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -14105,6 +15470,43 @@
           }
         }
       },
+      "16.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "47e61d3bb57b5e907a74f225a767a767a8b4d7a5",
+            "size": 165618711,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-12266719_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "b2fb3e403104bf342be7abf0631c23e30559d222",
+            "size": 143967391,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-12266719_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "32787c10f55911fd109848906b1275723e79f659",
+            "size": 143481958,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-12266719_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/16.0",
+        "revision": "16.0",
+        "revision-details": {
+          "major:0": "16",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "16.0-rc01": {
         "archives": [
           {
@@ -14127,7 +15529,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -14143,6 +15545,43 @@
           }
         }
       },
+      "17.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "da3424ea38b72d85258174a76aa286b7d4e0b700",
+            "size": 163426701,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-12700392_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "625e146cf61d6b4fbdfdd9ad34105af23b0486c2",
+            "size": 142285185,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-12700392_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "4a0902fb473afb7ce90a0ff6181d997138a15d9c",
+            "size": 141848100,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-12700392_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/17.0",
+        "revision": "17.0",
+        "revision-details": {
+          "major:0": "17",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "2.0": {
         "archives": [
           {
@@ -14165,7 +15604,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -14203,7 +15642,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -14240,7 +15679,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -14277,7 +15716,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -14314,7 +15753,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -14351,7 +15790,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -14388,7 +15827,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -14425,7 +15864,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -14462,7 +15901,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -15346,39 +16785,38 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
-      }
-    },
-    "extras": {
-      "2.0": {
+      },
+      "35.3.10": {
         "archives": [
           {
-            "os": "macosx",
-            "sha1": "d4d12a2173fef608ad62b94fed3a112bfa146759",
-            "size": 8030009,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.0.zip"
+            "os": "linux",
+            "sha1": "1ee50867296f9b594ba2fa1a4f84a624cdd69e35",
+            "size": 303581032,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12721668.zip"
           },
           {
-            "os": "linux",
-            "sha1": "77e3f80c2834e1fad33f56539ceb0215da408fab",
-            "size": 6895443,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.0.zip"
+            "os": "macosx",
+            "sha1": "d1170e33688db3cce7e79804e6ed66037321469d",
+            "size": 400795998,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12721668.zip"
           },
           {
             "os": "windows",
-            "sha1": "680418d5aca256cce151eb7f9527294e95b6bb8a",
-            "size": 6801703,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.0.zip"
+            "sha1": "2e751a972fab5a96b2d82a7c8bb27fcfc65da031",
+            "size": 426363761,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12721668.zip"
           }
         ],
-        "displayName": "Android Auto Desktop Head Unit Emulator",
-        "last-available-day": 19954,
+        "displayName": "Android Emulator",
+        "last-available-day": 20112,
         "license": "android-sdk-license",
-        "name": "extras",
-        "path": "extras/google/auto",
-        "revision": "2.0",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.3.10",
         "revision-details": {
-          "major:0": "2",
-          "minor:1": "0"
+          "major:0": "35",
+          "micro:2": "10",
+          "minor:1": "3"
         },
         "type-details": {
           "element-attributes": {
@@ -15386,36 +16824,75 @@
           }
         }
       },
-      "2.1": {
+      "35.3.11": {
         "archives": [
           {
-            "os": "macosx",
-            "sha1": "4f8a3d3e32b27de1fc190d149039842e76a55bdd",
-            "size": 7797329,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.1.zip"
+            "os": "linux",
+            "sha1": "99d847b09428b9842a3e52430e3f0decfc79c080",
+            "size": 297018762,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12836668.zip"
           },
           {
-            "os": "linux",
-            "sha1": "5d87eb87a1421e59d528eac1f5cdd406c0b39f51",
-            "size": 6927985,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.1.zip"
+            "os": "macosx",
+            "sha1": "e6149d02d8c05b6184b9f8c8d1d86420335974ec",
+            "size": 392168292,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12836668.zip"
           },
           {
             "os": "windows",
-            "sha1": "c27bf84e59dda7b79315b6ca2a314063feffd6ac",
-            "size": 7012059,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.1.zip"
+            "sha1": "4facc1af6ee937aca3831248c25195204e827b01",
+            "size": 419748179,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12836668.zip"
           }
         ],
-        "displayName": "Android Auto Desktop Head Unit Emulator",
-        "last-available-day": 19954,
+        "displayName": "Android Emulator",
+        "last-available-day": 20112,
         "license": "android-sdk-license",
-        "name": "extras",
-        "path": "extras/google/auto",
-        "revision": "2.1",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.3.11",
         "revision-details": {
-          "major:0": "2",
-          "minor:1": "1"
+          "major:0": "35",
+          "micro:2": "11",
+          "minor:1": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "35.4.6": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "fb077c566b882aeaed465d91b7313cd739cfc35d",
+            "size": 303702485,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12930357.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "7f337706bdb6d3da3dca20be433c3af2bc944bd1",
+            "size": 401067221,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12930357.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "0230221cb125140c7ce346525ca1a46e861881f9",
+            "size": 427996108,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12930357.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.4.6",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "6",
+          "minor:1": "4"
         },
         "type-details": {
           "element-attributes": {
@@ -15454,7 +16931,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -15499,7 +16976,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -15544,7 +17021,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -15589,7 +17066,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15635,7 +17112,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -15680,7 +17157,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15727,7 +17204,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15774,7 +17251,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -15819,7 +17296,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -15864,7 +17341,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -15910,7 +17387,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -15955,7 +17432,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -16001,7 +17478,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -16047,7 +17524,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -16092,7 +17569,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -16138,7 +17615,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -16183,7 +17660,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -16228,7 +17705,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -16273,7 +17750,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -16319,7 +17796,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -16364,7 +17841,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -16409,7 +17886,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -16455,7 +17932,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -16501,7 +17978,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -16547,7 +18024,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -16593,7 +18070,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -16639,7 +18116,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -16685,7 +18162,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -16730,7 +18207,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -16775,7 +18252,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -16820,7 +18297,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -16866,7 +18343,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -16912,7 +18389,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -16958,7 +18435,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -17003,7 +18480,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -17049,7 +18526,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -17095,7 +18572,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -17141,7 +18618,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -17187,7 +18664,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -17232,7 +18709,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -17277,7 +18754,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -17322,7 +18799,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -17361,7 +18838,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -17400,7 +18877,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -17438,7 +18915,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -17476,7 +18953,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -17514,7 +18991,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -17552,7 +19029,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -17591,7 +19068,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -17630,7 +19107,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -17645,6 +19122,199 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "27.1.12297006": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "6fc476b2e57d7c01ac0c95817746b927035b9749",
+            "size": 663976775,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27b-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "c70c9791b0d258858678f6df31c4319140e2926e",
+            "size": 836151734,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27b-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "3bb7efc850cd0af7707854b7e0d5c3b6a7153703",
+            "size": 781495902,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27b-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.1.12297006",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/27.1.12297006",
+        "revision": "27.1.12297006",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "12297006",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "27.2.12479018": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "090e8083a715fdb1a3e402d0763c388abb03fb4e",
+            "size": 663987688,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27c-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0217c10ffbec496bb9fbfbb3c6fc2477c6b77297",
+            "size": 836128272,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27c-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ac5f7762764b1f15341094e148ad4f847d050c38",
+            "size": 781511249,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27c-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.2.12479018",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/27.2.12479018",
+        "revision": "27.2.12479018",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "12479018",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "28.0.12433566-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "92dd6d941340624c4fc702ebc7e7cbd6faeb703d",
+            "size": 626833250,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "768dde1389e3245ca5a8a8151161b6d1ee60c78d",
+            "size": 810429167,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta1-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "97328457d44dceae79f1cf488684419e0fec851a",
+            "size": 746848976,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta1-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 28.0.12433566",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/28.0.12433566",
+        "revision": "28.0.12433566-rc1",
+        "revision-details": {
+          "major:0": "28",
+          "micro:2": "12433566",
+          "minor:1": "0",
+          "preview:3": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "28.0.12674087-rc2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "4b901eeb50a76ba521e4eb1e611cb43658b54440",
+            "size": 721452166,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "1b702451e4cae82eb1d5449bc03875b248a47dc6",
+            "size": 946868930,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta2-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "410a9863a8c2559bd4bb1f29517ea525c41859ab",
+            "size": 746919470,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta2-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 28.0.12674087",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/28.0.12674087",
+        "revision": "28.0.12674087-rc2",
+        "revision-details": {
+          "major:0": "28",
+          "micro:2": "12674087",
+          "minor:1": "0",
+          "preview:3": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "28.0.12916984-rc3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "69348e24577122339b3996d2ef1ac4e6f7f5d627",
+            "size": 723256962,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta3-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "cd2f13196082923d2568c9e43f08bc1cbd2f1c76",
+            "size": 950521645,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta3-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "72e641edd8ef24b7b3c4935ac0b0340d87251450",
+            "size": 749041370,
+            "url": "https://dl.google.com/android/repository/android-ndk-r28-beta3-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 28.0.12916984",
+        "last-available-day": 20112,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/28.0.12916984",
+        "revision": "28.0.12916984-rc3",
+        "revision-details": {
+          "major:0": "28",
+          "micro:2": "12916984",
+          "minor:1": "0",
+          "preview:3": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "ndk-bundle": {
@@ -17677,7 +19347,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17722,7 +19392,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17767,7 +19437,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17812,7 +19482,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17858,7 +19528,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17903,7 +19573,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17950,7 +19620,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17997,7 +19667,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18042,7 +19712,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18087,7 +19757,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18133,7 +19803,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18178,7 +19848,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18224,7 +19894,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18270,7 +19940,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18315,7 +19985,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18361,7 +20031,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18406,7 +20076,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18451,7 +20121,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18496,7 +20166,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18542,7 +20212,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18587,7 +20257,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18632,7 +20302,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18678,7 +20348,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18724,7 +20394,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18770,7 +20440,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -19027,7 +20697,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -19055,7 +20725,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -19087,7 +20757,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -19119,7 +20789,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -19151,7 +20821,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -19183,7 +20853,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -19215,7 +20885,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -19247,7 +20917,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -19279,7 +20949,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -19311,7 +20981,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -19343,7 +21013,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -19387,7 +21057,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19420,7 +21090,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -19452,7 +21122,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -19484,7 +21154,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -19516,7 +21186,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -19548,7 +21218,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -19580,7 +21250,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -19612,7 +21282,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -19644,7 +21314,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -19676,7 +21346,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -19708,7 +21378,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -19752,7 +21422,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19785,7 +21455,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -19817,7 +21487,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -19849,7 +21519,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -19881,7 +21551,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -19913,7 +21583,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19945,13 +21615,13 @@
         "archives": [
           {
             "os": "all",
-            "sha1": "c84ed39cecaeec13bc06c67639fcf86734013d98",
-            "size": 64281654,
-            "url": "https://dl.google.com/android/repository/platform-35_r01.zip"
+            "sha1": "2a0b06a1c89b52a3d70ce5d40554b094c1c1d0ac",
+            "size": 64281656,
+            "url": "https://dl.google.com/android/repository/platform-35_r02.zip"
           }
         ],
-        "displayName": "Android SDK Platform 35",
-        "last-available-day": 19954,
+        "displayName": "Android SDK Platform 35-ext14",
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -19993,7 +21663,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -20038,7 +21708,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -20083,7 +21753,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -20116,7 +21786,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -20148,7 +21818,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -20180,7 +21850,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -20202,6 +21872,37 @@
           }
         }
       },
+      "Baklava": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "69909269fe199e2d3817c10ecc13cd338da55d3b",
+            "size": 65460575,
+            "url": "https://dl.google.com/android/repository/platform-Baklava_r04.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform Baklava",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-Baklava",
+        "revision": "Baklava",
+        "revision-details": {
+          "major:0": "4"
+        },
+        "type-details": {
+          "api-level:0": "35",
+          "codename:1": "Baklava",
+          "element-attributes": {
+            "xsi:type": "ns11:platformDetailsType"
+          },
+          "layoutlib:2": {
+            "element-attributes": {
+              "api": "15"
+            }
+          }
+        }
+      },
       "TiramisuPrivacySandbox": {
         "archives": [
           {
@@ -20243,7 +21944,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -20387,7 +22088,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -20437,6 +22138,42 @@
           }
         }
       },
+      "5": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f1f9acd490c2a94402fa5fc0a548f529acab91b1",
+            "size": 9059335,
+            "url": "https://dl.google.com/android/repository/skiaparser-12616120-linux-x64.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d320af2c33979fce796d436e6e68351a9d1a02d2",
+            "size": 2932763,
+            "url": "https://dl.google.com/android/repository/skiaparser-12616120-darwin-x64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "afd28844313af84f7245cef5d5be8d9a9de848e1",
+            "size": 2952673,
+            "url": "https://dl.google.com/android/repository/skiaparser-12616120-win-x64.zip"
+          }
+        ],
+        "displayName": "Layout Inspector image server for API 31-36",
+        "last-available-day": 20112,
+        "license": "android-sdk-license",
+        "name": "skiaparser",
+        "path": "skiaparser/3",
+        "revision": "5",
+        "revision-details": {
+          "major:0": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "6": {
         "archives": [
           {
@@ -20459,7 +22196,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -20485,7 +22222,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -20513,7 +22250,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -20540,7 +22277,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -20567,7 +22304,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -20594,7 +22331,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -20621,7 +22358,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -20648,7 +22385,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -20675,7 +22412,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -20702,7 +22439,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -20729,7 +22466,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -20756,7 +22493,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -20783,7 +22520,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -20810,7 +22547,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -20837,7 +22574,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -20864,7 +22601,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -20891,7 +22628,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -20918,7 +22655,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -20945,7 +22682,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -20972,7 +22709,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -20999,7 +22736,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -21026,7 +22763,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -21053,7 +22790,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -21117,7 +22854,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 19954,
+        "last-available-day": 20112,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 89373478f71c..dff8b0a81218 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -97,6 +97,7 @@ mapAliases {
   inherit (pkgs.elmPackages) elm-test;
   inherit (pkgs) eslint; # Added 2024-08-28
   inherit (pkgs) eslint_d; # Added 2023-05-26
+  inherit (pkgs) eas-cli; # added 2025-01-08
   expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02
   inherit (pkgs) firebase-tools; # added 2023-08-18
   inherit (pkgs) fixjson; # added 2024-06-26
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 7e2bc43159b8..800f52302ad5 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -76,7 +76,6 @@
 , "dotenv-vault"
 , "elasticdump"
 , "@electron-forge/cli"
-, "eas-cli"
 , "elm-oracle"
 , "emoj"
 , "emojione"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 1632c672f57e..0fa535bc96d6 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -61423,655 +61423,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  eas-cli = nodeEnv.buildNodePackage {
-    name = "eas-cli";
-    packageName = "eas-cli";
-    version = "12.4.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eas-cli/-/eas-cli-12.4.1.tgz";
-      sha512 = "BcQGQ82KnQLHk2F2gKhCkb1GTiwnJ5EThnzd/1MpFL8dbPns2vFElxWHj+byKPUjMMurhWa3YCYyEtiI1EGPrg==";
-    };
-    dependencies = [
-      sources."@0no-co/graphql.web-1.0.8"
-      sources."@babel/code-frame-7.10.4"
-      sources."@babel/helper-validator-identifier-7.24.7"
-      (sources."@babel/highlight-7.24.7" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      (sources."@cspotcode/source-map-support-0.8.1" // {
-        dependencies = [
-          sources."@jridgewell/trace-mapping-0.3.9"
-        ];
-      })
-      sources."@expo/apple-utils-1.8.0"
-      (sources."@expo/bunyan-4.0.1" // {
-        dependencies = [
-          sources."uuid-8.3.2"
-        ];
-      })
-      sources."@expo/code-signing-certificates-0.0.5"
-      (sources."@expo/config-8.5.4" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-7.1.6"
-          sources."minimatch-3.1.2"
-          sources."semver-7.5.3"
-        ];
-      })
-      (sources."@expo/config-plugins-7.8.4" // {
-        dependencies = [
-          sources."@expo/json-file-8.3.3"
-          sources."@expo/plist-0.1.3"
-          sources."brace-expansion-1.1.11"
-          sources."find-up-5.0.0"
-          sources."glob-7.1.6"
-          sources."locate-path-6.0.0"
-          sources."minimatch-3.1.2"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."@expo/config-types-50.0.0"
-      (sources."@expo/eas-build-job-1.0.133" // {
-        dependencies = [
-          sources."joi-17.13.3"
-          sources."semver-7.6.3"
-        ];
-      })
-      (sources."@expo/eas-json-12.0.0" // {
-        dependencies = [
-          (sources."@babel/code-frame-7.23.5" // {
-            dependencies = [
-              sources."chalk-2.4.2"
-            ];
-          })
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."semver-7.5.2"
-          sources."supports-color-5.5.0"
-          sources."tslib-2.4.1"
-        ];
-      })
-      (sources."@expo/env-0.3.0" // {
-        dependencies = [
-          sources."dotenv-16.4.5"
-        ];
-      })
-      (sources."@expo/fingerprint-0.6.1" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."find-up-5.0.0"
-          sources."locate-path-6.0.0"
-          sources."minimatch-3.1.2"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      (sources."@expo/image-utils-0.4.2" // {
-        dependencies = [
-          sources."@expo/spawn-async-1.5.0"
-          (sources."cross-spawn-6.0.5" // {
-            dependencies = [
-              sources."semver-5.7.2"
-            ];
-          })
-          sources."fs-extra-9.0.0"
-          sources."path-key-2.0.1"
-          sources."semver-7.3.2"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."universalify-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."@expo/json-file-8.2.37"
-      sources."@expo/logger-1.0.117"
-      sources."@expo/multipart-body-parser-1.1.0"
-      sources."@expo/osascript-2.0.33"
-      (sources."@expo/package-manager-1.1.2" // {
-        dependencies = [
-          sources."find-up-5.0.0"
-          sources."locate-path-6.0.0"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."@expo/pkcs12-0.0.8"
-      sources."@expo/plist-0.0.20"
-      (sources."@expo/plugin-help-5.1.23" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      (sources."@expo/plugin-warn-if-update-available-2.5.1" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."fs-extra-10.1.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      (sources."@expo/prebuild-config-6.7.3" // {
-        dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."semver-7.5.3"
-        ];
-      })
-      sources."@expo/results-1.0.0"
-      (sources."@expo/rudder-sdk-node-1.1.1" // {
-        dependencies = [
-          sources."uuid-8.3.2"
-        ];
-      })
-      sources."@expo/sdk-runtime-versions-1.0.0"
-      sources."@expo/spawn-async-1.7.0"
-      (sources."@expo/steps-1.0.134" // {
-        dependencies = [
-          sources."@expo/spawn-async-1.7.2"
-          sources."joi-17.13.3"
-        ];
-      })
-      sources."@expo/timeago.js-1.0.0"
-      sources."@hapi/hoek-9.3.0"
-      sources."@hapi/topo-5.1.0"
-      (sources."@isaacs/cliui-8.0.2" // {
-        dependencies = [
-          sources."ansi-regex-6.1.0"
-          sources."ansi-styles-6.2.1"
-          sources."strip-ansi-7.1.0"
-          sources."wrap-ansi-8.1.0"
-        ];
-      })
-      sources."@jridgewell/gen-mapping-0.3.5"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      (sources."@oclif/core-1.26.2" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."fs-extra-9.1.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      sources."@oclif/linewrap-1.0.0"
-      (sources."@oclif/plugin-autocomplete-2.3.10" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      sources."@oclif/screen-3.0.8"
-      sources."@react-native/normalize-color-2.1.0"
-      sources."@segment/ajv-human-errors-2.13.0"
-      sources."@segment/loosely-validate-event-2.0.0"
-      sources."@sideway/address-4.1.5"
-      sources."@sideway/formula-3.0.1"
-      sources."@sideway/pinpoint-2.0.0"
-      sources."@swc/core-1.7.26"
-      sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.13"
-      sources."@swc/types-0.1.12"
-      sources."@swc/wasm-1.7.26"
-      sources."@tsconfig/node10-1.0.11"
-      sources."@tsconfig/node12-1.0.11"
-      sources."@tsconfig/node14-1.0.3"
-      sources."@tsconfig/node16-1.0.4"
-      sources."@types/bunyan-1.8.11"
-      sources."@types/cli-progress-3.11.6"
-      sources."@types/node-22.5.5"
-      sources."@urql/core-4.0.11"
-      sources."@urql/exchange-retry-1.2.0"
-      sources."@xmldom/xmldom-0.7.13"
-      sources."acorn-8.12.1"
-      sources."acorn-walk-8.3.4"
-      sources."agent-base-6.0.2"
-      sources."ajv-8.11.0"
-      sources."ajv-formats-2.1.1"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."ansicolors-0.3.2"
-      sources."any-promise-1.3.0"
-      sources."arg-5.0.2"
-      sources."argparse-1.0.10"
-      sources."array-union-2.1.0"
-      sources."asn1-0.2.6"
-      sources."astral-regex-2.0.0"
-      sources."async-3.2.6"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."b4a-1.6.6"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."better-opn-3.0.2"
-      sources."big-integer-1.6.52"
-      sources."bplist-creator-0.1.1"
-      sources."bplist-parser-0.3.2"
-      sources."brace-expansion-2.0.1"
-      sources."braces-3.0.3"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."builtins-1.0.3"
-      sources."bunyan-1.8.15"
-      sources."cardinal-2.1.1"
-      sources."chalk-4.1.2"
-      sources."charenc-0.0.2"
-      sources."chownr-2.0.0"
-      (sources."clean-stack-3.0.1" // {
-        dependencies = [
-          sources."escape-string-regexp-4.0.0"
-        ];
-      })
-      sources."cli-cursor-3.1.0"
-      (sources."cli-progress-3.12.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."cli-spinners-2.9.2"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."combined-stream-1.0.8"
-      sources."commander-4.1.1"
-      sources."component-type-1.2.2"
-      sources."concat-map-0.0.1"
-      sources."content-type-1.0.5"
-      sources."create-require-1.1.1"
-      sources."cross-spawn-7.0.3"
-      sources."crypt-0.0.2"
-      sources."crypto-random-string-1.0.0"
-      sources."dateformat-4.6.3"
-      sources."debug-4.3.7"
-      sources."defaults-1.0.4"
-      sources."define-lazy-prop-2.0.0"
-      sources."delayed-stream-1.0.0"
-      sources."dicer-0.3.1"
-      sources."diff-4.0.2"
-      sources."dir-glob-3.0.1"
-      sources."domino-2.1.6"
-      sources."dotenv-16.3.1"
-      (sources."dotenv-expand-11.0.6" // {
-        dependencies = [
-          sources."dotenv-16.4.5"
-        ];
-      })
-      sources."dtrace-provider-0.8.8"
-      sources."eastasianwidth-0.2.0"
-      sources."ecdsa-sig-formatter-1.0.11"
-      sources."ejs-3.1.10"
-      sources."emoji-regex-9.2.2"
-      sources."encoding-0.1.13"
-      sources."env-paths-2.2.0"
-      sources."env-string-1.0.1"
-      sources."envinfo-7.11.0"
-      sources."err-code-2.0.3"
-      sources."error-ex-1.3.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."exec-async-2.2.0"
-      (sources."expo-modules-autolinking-1.11.2" // {
-        dependencies = [
-          sources."commander-7.2.0"
-          sources."find-up-5.0.0"
-          sources."fs-extra-9.1.0"
-          sources."locate-path-6.0.0"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-fifo-1.3.2"
-      sources."fast-glob-3.3.2"
-      sources."fastq-1.17.1"
-      sources."fetch-retry-4.1.1"
-      sources."figures-3.2.0"
-      sources."filelist-1.0.4"
-      sources."fill-range-7.1.1"
-      sources."find-up-4.1.0"
-      sources."find-yarn-workspace-root-2.0.0"
-      (sources."foreground-child-3.3.0" // {
-        dependencies = [
-          sources."signal-exit-4.1.0"
-        ];
-      })
-      sources."form-data-4.0.0"
-      sources."fs-extra-11.2.0"
-      (sources."fs-minipass-2.1.0" // {
-        dependencies = [
-          sources."minipass-3.3.6"
-        ];
-      })
-      sources."fs.realpath-1.0.0"
-      sources."get-package-type-0.1.0"
-      sources."getenv-1.0.0"
-      (sources."glob-10.4.5" // {
-        dependencies = [
-          sources."minimatch-9.0.5"
-          sources."minipass-7.1.2"
-        ];
-      })
-      sources."glob-parent-5.1.2"
-      sources."globby-11.1.0"
-      sources."golden-fleece-1.0.9"
-      sources."graceful-fs-4.2.11"
-      sources."gradle-to-js-2.0.1"
-      sources."graphql-16.8.1"
-      sources."graphql-tag-2.12.6"
-      sources."has-flag-4.0.0"
-      sources."hosted-git-info-3.0.8"
-      sources."http-call-5.3.0"
-      sources."https-proxy-agent-5.0.1"
-      sources."hyperlinker-1.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."ignore-5.3.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-interactive-1.0.0"
-      sources."is-number-7.0.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-stream-2.0.1"
-      sources."is-unicode-supported-0.1.0"
-      sources."is-wsl-2.2.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      (sources."jake-10.9.2" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."minimatch-3.1.2"
-        ];
-      })
-      sources."jimp-compact-0.16.1"
-      sources."jks-js-1.1.0"
-      sources."joi-17.11.0"
-      sources."join-component-1.1.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
-      sources."jsep-1.3.9"
-      sources."json-parse-better-errors-1.0.2"
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-2.2.3"
-      sources."jsonfile-6.1.0"
-      sources."jsonwebtoken-9.0.0"
-      sources."jwa-1.4.1"
-      sources."jws-3.2.2"
-      sources."keychain-1.5.0"
-      sources."kleur-3.0.3"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.get-4.4.2"
-      sources."lodash.merge-4.6.2"
-      sources."log-symbols-4.1.0"
-      sources."lru-cache-6.0.0"
-      sources."make-error-1.3.6"
-      sources."md5-2.3.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.8"
-      sources."mime-3.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-2.1.0"
-      sources."minimatch-5.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (sources."minizlib-3.0.1" // {
-        dependencies = [
-          sources."minipass-7.1.2"
-        ];
-      })
-      sources."mkdirp-1.0.4"
-      sources."moment-2.30.1"
-      sources."ms-2.1.3"
-      sources."mute-stream-0.0.8"
-      (sources."mv-2.1.1" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-6.0.4"
-          sources."minimatch-3.1.2"
-          sources."mkdirp-0.5.6"
-          sources."rimraf-2.4.5"
-        ];
-      })
-      sources."mz-2.7.0"
-      sources."nan-2.20.0"
-      sources."nanoid-3.3.4"
-      sources."natural-orderby-2.0.3"
-      sources."ncp-2.0.0"
-      sources."nice-try-1.0.5"
-      sources."node-fetch-2.6.7"
-      sources."node-forge-1.3.1"
-      sources."node-int64-0.4.0"
-      sources."node-rsa-1.1.1"
-      (sources."npm-package-arg-7.0.0" // {
-        dependencies = [
-          sources."semver-5.7.2"
-        ];
-      })
-      sources."nullthrows-1.1.1"
-      sources."object-assign-4.1.1"
-      sources."object-treeify-1.1.33"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-8.4.2"
-      sources."ora-5.1.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."package-json-from-dist-1.0.0"
-      sources."parse-json-4.0.0"
-      (sources."parse-png-2.1.0" // {
-        dependencies = [
-          sources."pngjs-3.4.0"
-        ];
-      })
-      sources."password-prompt-1.1.3"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      (sources."path-scurry-1.11.1" // {
-        dependencies = [
-          sources."lru-cache-10.4.3"
-        ];
-      })
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.0"
-      sources."picomatch-2.3.1"
-      sources."pirates-4.0.6"
-      sources."pkg-dir-4.2.0"
-      (sources."plist-3.1.0" // {
-        dependencies = [
-          sources."@xmldom/xmldom-0.8.10"
-          sources."xmlbuilder-15.1.1"
-        ];
-      })
-      sources."pngjs-7.0.0"
-      sources."promise-limit-2.7.0"
-      sources."promise-retry-2.0.1"
-      sources."prompts-2.4.2"
-      sources."punycode-2.3.1"
-      sources."qrcode-terminal-0.12.0"
-      sources."queue-microtask-1.2.3"
-      sources."queue-tick-1.0.1"
-      sources."redeyed-2.1.1"
-      sources."remove-trailing-slash-0.1.1"
-      sources."require-from-string-2.0.2"
-      sources."resolve-from-5.0.0"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.0.4"
-      sources."rimraf-5.0.10"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."safe-json-stringify-1.2.0"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."semver-7.5.4"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."simple-plist-1.4.0"
-      sources."sisteransi-1.0.5"
-      sources."slash-3.0.0"
-      sources."slice-ansi-4.0.0"
-      sources."slugify-1.6.6"
-      sources."split-1.0.1"
-      sources."sprintf-js-1.0.3"
-      sources."stream-buffers-2.2.0"
-      sources."streamsearch-1.1.0"
-      sources."streamx-2.20.1"
-      (sources."string-width-5.1.2" // {
-        dependencies = [
-          sources."ansi-regex-6.1.0"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      (sources."string-width-cjs-4.2.3" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-        ];
-      })
-      sources."strip-ansi-6.0.1"
-      sources."strip-ansi-cjs-6.0.1"
-      sources."structured-headers-0.4.1"
-      (sources."sucrase-3.34.0" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-7.1.6"
-          sources."minimatch-3.1.2"
-        ];
-      })
-      sources."sudo-prompt-9.1.1"
-      sources."supports-color-7.2.0"
-      sources."supports-hyperlinks-2.3.0"
-      (sources."tar-6.2.1" // {
-        dependencies = [
-          (sources."minizlib-2.1.2" // {
-            dependencies = [
-              sources."minipass-3.3.6"
-            ];
-          })
-        ];
-      })
-      sources."tar-stream-3.1.7"
-      sources."temp-dir-1.0.0"
-      (sources."tempy-0.3.0" // {
-        dependencies = [
-          sources."type-fest-0.3.1"
-        ];
-      })
-      sources."terminal-link-2.1.1"
-      sources."text-decoder-1.2.0"
-      sources."thenify-3.3.1"
-      sources."thenify-all-1.6.0"
-      sources."this-file-2.0.3"
-      sources."through-2.3.8"
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."ts-interface-checker-0.1.13"
-      (sources."ts-node-10.9.2" // {
-        dependencies = [
-          sources."arg-4.1.3"
-        ];
-      })
-      sources."tslib-2.6.2"
-      sources."tunnel-agent-0.6.0"
-      sources."turndown-7.1.2"
-      sources."type-fest-0.21.3"
-      sources."typescript-5.6.2"
-      sources."undici-types-6.19.8"
-      sources."unique-string-1.0.0"
-      sources."universalify-2.0.1"
-      sources."untildify-4.0.0"
-      sources."uri-js-4.4.1"
-      sources."uuid-9.0.1"
-      sources."v8-compile-cache-lib-3.0.1"
-      sources."validate-npm-package-name-3.0.0"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      (sources."widest-line-3.1.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."wonka-6.3.4"
-      sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-7.0.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      (sources."wrap-ansi-cjs-7.0.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.4.3"
-      (sources."xcode-3.0.1" // {
-        dependencies = [
-          sources."uuid-7.0.3"
-        ];
-      })
-      (sources."xml2js-0.6.0" // {
-        dependencies = [
-          sources."xmlbuilder-11.0.1"
-        ];
-      })
-      sources."xmlbuilder-14.0.0"
-      sources."yallist-4.0.0"
-      sources."yaml-2.5.1"
-      sources."yn-3.1.1"
-      sources."yocto-queue-0.1.0"
-      sources."zod-3.23.8"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "EAS command line tool";
-      homepage = "https://github.com/expo/eas-cli";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   elm-oracle = nodeEnv.buildNodePackage {
     name = "elm-oracle";
     packageName = "elm-oracle";
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 5e05f595823e..3b3ad81d3d24 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.4.1";
+  version = "3.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-Kn2Ixai1EUpFR2PpPOUOrsTPn/LbLXavWUZVUcO/lq8=";
+    hash = "sha256-otMKT7GQbI1ORqVRIf9gVzC28nwx8uWYjZcfth5PS/E=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/flexit-bacnet/default.nix b/pkgs/development/python-modules/flexit-bacnet/default.nix
index 264bce517b8b..7bdba2f731ab 100644
--- a/pkgs/development/python-modules/flexit-bacnet/default.nix
+++ b/pkgs/development/python-modules/flexit-bacnet/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "flexit-bacnet";
-  version = "2.2.1";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "piotrbulinski";
     repo = "flexit_bacnet";
     tag = version;
-    hash = "sha256-Cy/WHKtJoZWSFOs+9rBYSLqZTF/68WRM1HiYXDyb9KM=";
+    hash = "sha256-c5561ewnAybYcdqesWYEgfT7Y+TetOjxLZeMTJ1ToUk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index 5797bd47e7f7..6c0760d18310 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "mcdreforged";
-  version = "2.14.4";
+  version = "2.14.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
     tag = "v${version}";
-    hash = "sha256-R9zM86ohABEaxj7NYj8FCPIYsMDJp0sKjOhWzit69B8=";
+    hash = "sha256-zhg4KK40nQAuKMaihALTXEeQuusKeSVp18yp8WKVZ2I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 4042c0a235c5..a07daa519cf5 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   pdm-backend,
   pytz,
   oauthlib,
@@ -12,26 +12,21 @@
 
 buildPythonPackage rec {
   pname = "pyfireservicerota";
-  version = "0.0.44";
+  version = "0.0.45";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-OknGX4xP+AHXRuhizbeTVAfiOX0uRGzAly7FJ1vopDI=";
+  src = fetchFromGitHub {
+    owner = "cyberjunky";
+    repo = "python-fireservicerota";
+    tag = version;
+    hash = "sha256-lQkn/DlqJMLxQlh1sn+v7d6xHHCC9r8mnUJchyTTUqA=";
   };
 
-  postPatch = ''
-    # https://github.com/cyberjunky/python-fireservicerota/pull/1
-    substituteInPlace pyproject.toml \
-      --replace-fail '"aiohttp",' '"requests",' \
-      --replace-fail '"aiohttp_retry",' ""
-  '';
+  build-system = [ pdm-backend ];
 
-  nativeBuildInputs = [ pdm-backend ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     pytz
     oauthlib
     requests
@@ -44,6 +39,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pyfireservicerota" ];
 
   meta = with lib; {
+    changelog = "https://github.com/cyberjunky/python-fireservicerota/releases/tag/${src.tag}";
     description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster";
     homepage = "https://github.com/cyberjunky/python-fireservicerota";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix
index ce4e509174c8..f4662d07d2b0 100644
--- a/pkgs/development/python-modules/pykalman/default.nix
+++ b/pkgs/development/python-modules/pykalman/default.nix
@@ -4,27 +4,29 @@
   fetchFromGitHub,
   numpy,
   scipy,
+  scikit-base,
   pytestCheckHook,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pykalman";
-  version = "0.9.7";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pykalman";
     repo = "pykalman";
-    rev = "aaf8c8574b0474b6f41b7b135a9a7f2dfbd0e86c"; # no tags
-    hash = "sha256-++YqxGMsFGv5OxicDFO9Xz89e62NG8X+6oR6M9ePUcg=";
+    tag = "v${version}";
+    hash = "sha256-9HaDNYVPdRvQH3r5j7r0uHqyuR6HqV7QaNuxKEYDcy8=";
   };
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
+    scikit-base
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
index 8547016c2025..772bf80d35db 100644
--- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
+++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "python-homeassistant-analytics";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-homeassistant-analytics";
     tag = "v${version}";
-    hash = "sha256-TfD1N4KoeIVoDp1YoOhBw8E7adow1nU1N6vj2j3W2No=";
+    hash = "sha256-Deh3pZKpqdrlgv6LQk3NHuATz3porWiM8dewjbdbR7M=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix
new file mode 100644
index 000000000000..acf4b9332b95
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-base/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  toml,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-base";
+  version = "0.12.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sktime";
+    repo = "skbase";
+    tag = "v${version}";
+    hash = "sha256-UGYkYhgo6LzlZTg6YDehJXd4D5p8FfUgWPdlW4PPOdI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ toml ];
+
+  pythonImportsCheck = [ "skbase" ];
+
+  meta = with lib; {
+    description = "Base classes for creating scikit-learn-like parametric objects, and tools for working with them";
+    homepage = "https://github.com/sktime/skbase";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kirillrdy ];
+  };
+}
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 5a48bb73d802..f25ce7248c60 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.361";
+  version = "3.2.364";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-7w8oAIBAgYH/TXNnAVKC6E3AT37WJDSSgnpAeRfY4vA=";
+    hash = "sha256-ZmvIICAnC9RDizKl06aOD1LNEAo8WG7E1ZZB3Rero+c=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];
diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix
index 834bf8927859..1fa45834a327 100644
--- a/pkgs/development/tools/database/surrealdb-migrations/default.nix
+++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "surrealdb-migrations";
-  version = "2.1.0";
+  version = "2.1.2";
 in
 rustPlatform.buildRustPackage rec {
   inherit pname version;
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
     owner = "Odonno";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk=";
+    hash = "sha256-U44TaixLjLgQJQGohBydWPLt6GTPVORQDYtuoniSY0Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0O4WWBevEyPMPS59rDmYHWpgKTc713jLn9MNHoLVd0I=";
+  cargoHash = "sha256-Jw6Dj6LRiOwIqZABS58l795TpQxyLY7pTQm2I9+r+Nc=";
 
   buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
 
diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index 135cce1f47ff..c1d92e0f719d 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-lambda";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg=";
+    hash = "sha256-GiV5yjlzU4iU4BJ8Fq8I9uOchVCF2UGb+WLMMr7n8pc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GtlT2ek/HjRN/+1Ocp/bJgEL5Oy6Dm1p+CdWjs7NW7Q=";
+  cargoHash = "sha256-JMYGcIli72pH5O8DXQb7++bvnIgBpyYykqRbddObaAI=";
 
   nativeCheckInputs = [ cacert ];
 
diff --git a/pkgs/tools/typesetting/tex/texpresso/default.nix b/pkgs/tools/typesetting/tex/texpresso/default.nix
index c5a5fad4046f..17f27483b7a6 100644
--- a/pkgs/tools/typesetting/tex/texpresso/default.nix
+++ b/pkgs/tools/typesetting/tex/texpresso/default.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "texpresso";
-  version = "0-unstable-2024-07-02";
+  version = "0-unstable-2025-01-29";
 
   postPatch = ''
     substituteInPlace Makefile \
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "texpresso";
-    rev = "0e14b1df6269b07c2c985f001e32b48673495a8b";
-    hash = "sha256-av1yadR2giJUxFQuHSXFgTbCNsmccrzKOmLVnAGJt6c=";
+    rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";
+    hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";
   };
 
   buildFlags = [ "texpresso" ];
diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix
index 21f8e73bbd39..d06f8de181e2 100644
--- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix
+++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix
@@ -10,8 +10,8 @@ tectonic-unwrapped.override (old: {
           src = fetchFromGitHub {
             owner = "let-def";
             repo = "tectonic";
-            rev = "5b844105c06e0b16e40b1254359f8c28e8956280";
-            hash = "sha256-RPsXmp+5MF9h+H3wdL1O1hXSRZWjWTY8lXq/dWZIM1g=";
+            rev = "b38cb3b2529bba947d520ac29fbb7873409bd270";
+            hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";
             fetchSubmodules = true;
           };
           useFetchCargoVendor = true;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cda951863212..a9f4bc49bffb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1570,6 +1570,8 @@ mapAliases {
   zfsStable = zfs; # Added 2024-02-26
   zfsUnstable = zfs_unstable; # Added 2024-02-26
   zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
+  zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
+  zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
   zinc = zincsearch; # Added 2023-05-28
   zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
   zkg = throw "'zkg' has been replaced by 'zeek'";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4541e5f06116..f625b4590645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10845,14 +10845,10 @@ with pkgs;
   inherit (rec {
     zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig {});
 
-    zig_0_9 = zigPackages."0.9";
-    zig_0_10 = zigPackages."0.10";
     zig_0_11 = zigPackages."0.11";
     zig_0_12 = zigPackages."0.12";
     zig_0_13 = zigPackages."0.13";
   }) zigPackages
-     zig_0_9
-     zig_0_10
      zig_0_11
      zig_0_12
      zig_0_13;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59d271bfdfc5..7e557091f1da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14625,6 +14625,8 @@ self: super: with self; {
 
   scim2-tester = callPackage ../development/python-modules/scim2-tester { };
 
+  scikit-base = callPackage ../development/python-modules/scikit-base { };
+
   scikit-bio = callPackage ../development/python-modules/scikit-bio { };
 
   scikit-build = callPackage ../development/python-modules/scikit-build { };