diff --git a/.gitattributes b/.gitattributes
index 01d363cbb1c1..32cd96ef9e2c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false
 
 nixos/modules/module-list.nix merge=union
 # pkgs/top-level/all-packages.nix merge=union
+
+ci/OWNERS linguist-language=CODEOWNERS
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f84abe7fc4b2..eb8b282c7b36 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,391 +1,4 @@
-# CODEOWNERS file
+# Use ci/OWNERS instead
 #
-# This file is used to describe who owns what in this repository. This file does not
-# replace `meta.maintainers` but is instead used for other things than derivations
-# and modules, like documentation, package sets, and other assets.
-#
-# For documentation on this file, see https://help.github.com/articles/about-codeowners/
-# Mentioned users will get code review requests.
-#
-# IMPORTANT NOTE: in order to actually get pinged, commit access is required.
-# This also holds true for GitHub teams. Since almost none of our teams have write
-# permissions, you need to list all members of the team with commit access individually.
-
-# CI
-/.github/workflows @NixOS/Security @Mic92 @zowoq
-/.github/workflows/check-nix-format.yml @infinisil
-/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
-/.github/workflows/codeowners.yml @infinisil
-/.github/OWNERS @infinisil
-/ci @infinisil @philiptaron @NixOS/Security
-
-# Development support
-/.editorconfig @Mic92 @zowoq
-/shell.nix @infinisil @NixOS/Security
-
-# Libraries
-/lib                        @infinisil
-/lib/systems                @alyssais @ericson2314
-/lib/generators.nix         @infinisil @Profpatsch
-/lib/cli.nix                @infinisil @Profpatsch
-/lib/debug.nix              @infinisil @Profpatsch
-/lib/asserts.nix            @infinisil @Profpatsch
-/lib/path/*                 @infinisil
-/lib/fileset                @infinisil
-## Libraries / Module system
-/lib/modules.nix            @infinisil @roberth
-/lib/types.nix              @infinisil @roberth
-/lib/options.nix            @infinisil @roberth
-/lib/tests/modules.sh       @infinisil @roberth
-/lib/tests/modules          @infinisil @roberth
-
-# Nixpkgs Internals
-/default.nix                                     @Ericson2314
-/pkgs/top-level/default.nix                      @Ericson2314
-/pkgs/top-level/impure.nix                       @Ericson2314
-/pkgs/top-level/stage.nix                        @Ericson2314
-/pkgs/top-level/splice.nix                       @Ericson2314
-/pkgs/top-level/release-cross.nix                @Ericson2314
-/pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
-/pkgs/stdenv                                     @philiptaron
-/pkgs/stdenv/generic                             @Ericson2314
-/pkgs/stdenv/generic/check-meta.nix              @Ericson2314
-/pkgs/stdenv/cross                               @Ericson2314
-/pkgs/build-support                              @philiptaron
-/pkgs/build-support/cc-wrapper                   @Ericson2314
-/pkgs/build-support/bintools-wrapper             @Ericson2314
-/pkgs/build-support/setup-hooks                  @Ericson2314
-/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
-/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
-/pkgs/pkgs-lib                                   @infinisil
-## Format generators/serializers
-/pkgs/pkgs-lib/formats/libconfig                 @h7x4
-/pkgs/pkgs-lib/formats/hocon                     @h7x4
-
-# Nixpkgs build-support
-/pkgs/build-support/writers @lassulus @Profpatsch
-
-# Nixpkgs make-disk-image
-/doc/build-helpers/images/makediskimage.section.md  @raitobezarius
-/nixos/lib/make-disk-image.nix                 @raitobezarius
-
-# Nix, the package manager
-# @raitobezarius is not "code owner", but is listed here to be notified of changes
-# pertaining to the Nix package manager.
-# i.e. no authority over those files.
-pkgs/tools/package-management/nix/                    @NixOS/nix-team @raitobezarius
-nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobezarius
-
-# Nixpkgs documentation
-/maintainers/scripts/db-to-md.sh @jtojnar @ryantm
-/maintainers/scripts/doc @jtojnar @ryantm
-
-# Contributor documentation
-/CONTRIBUTING.md @infinisil
-/.github/PULL_REQUEST_TEMPLATE.md @infinisil
-/doc/contributing/ @infinisil
-/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil
-/lib/README.md @infinisil
-/doc/README.md @infinisil
-/nixos/README.md @infinisil
-/pkgs/README.md @infinisil
-/pkgs/by-name/README.md @infinisil
-/maintainers/README.md @infinisil
-
-# User-facing development documentation
-/doc/development.md @infinisil
-/doc/development @infinisil
-
-# NixOS Internals
-/nixos/default.nix                                    @infinisil
-/nixos/lib/from-env.nix                               @infinisil
-/nixos/lib/eval-config.nix                            @infinisil
-/nixos/modules/system/activation/bootspec.nix         @grahamc @cole-h @raitobezarius
-/nixos/modules/system/activation/bootspec.cue         @grahamc @cole-h @raitobezarius
-
-# NixOS integration test driver
-/nixos/lib/test-driver  @tfc
-
-# NixOS QEMU virtualisation
-/nixos/modules/virtualisation/qemu-vm.nix           @raitobezarius
-
-# ACME
-/nixos/modules/security/acme                @arianvp @flokli @aanderse @emilazy # no merge permission: @m1cr0man
-
-# Systemd
-/nixos/modules/system/boot/systemd.nix      @NixOS/systemd
-/nixos/modules/system/boot/systemd          @NixOS/systemd
-/nixos/lib/systemd-*.nix                    @NixOS/systemd
-/pkgs/os-specific/linux/systemd             @NixOS/systemd
-
-# Systemd-boot
-/nixos/modules/system/boot/loader/systemd-boot      @JulienMalka
-
-# Images and installer media
-/nixos/modules/profiles/installation-device.nix @ElvishJerricco
-/nixos/modules/installer/cd-dvd/                @ElvishJerricco
-/nixos/modules/installer/sd-card/
-
-# Updaters
-## update.nix
-/maintainers/scripts/update.nix   @jtojnar
-/maintainers/scripts/update.py    @jtojnar
-## common-updater-scripts
-/pkgs/common-updater/scripts/update-source-version    @jtojnar
-
-# Python-related code and docs
-/doc/languages-frameworks/python.section.md   @mweinelt @natsukium
-/maintainers/scripts/update-python-libraries            @natsukium
-/pkgs/development/interpreters/python                   @natsukium
-/pkgs/top-level/python-packages.nix                     @natsukium
-/pkgs/top-level/release-python.nix                      @natsukium
-
-# Haskell
-/doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn
-/maintainers/scripts/haskell                  @sternenseemann @maralorn
-/pkgs/development/compilers/ghc               @sternenseemann @maralorn
-/pkgs/development/haskell-modules             @sternenseemann @maralorn
-/pkgs/test/haskell                            @sternenseemann @maralorn
-/pkgs/top-level/release-haskell.nix           @sternenseemann @maralorn
-/pkgs/top-level/haskell-packages.nix          @sternenseemann @maralorn
-
-# Perl
-/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg
-/pkgs/top-level/perl-packages.nix   @stigtsp @zakame @marcusramberg
-/pkgs/development/perl-modules      @stigtsp @zakame @marcusramberg
-
-# R
-/pkgs/applications/science/math/R   @jbedo
-/pkgs/development/r-modules         @jbedo
-
-# Rust
-/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
-/pkgs/build-support/rust @zowoq @winterqt @figsoda
-/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
-
-# C compilers
-/pkgs/development/compilers/gcc
-/pkgs/development/compilers/llvm @alyssais @RossComputerGuy
-/pkgs/development/compilers/emscripten @raitobezarius
-/doc/languages-frameworks/emscripten.section.md @raitobezarius
-
-# Audio
-/nixos/modules/services/audio/botamusique.nix @mweinelt
-/nixos/modules/services/audio/snapserver.nix @mweinelt
-/nixos/tests/botamusique.nix @mweinelt
-/nixos/tests/snapcast.nix @mweinelt
-
-# Browsers
-/pkgs/applications/networking/browsers/firefox @mweinelt
-/pkgs/applications/networking/browsers/chromium @emilylange
-/nixos/tests/chromium.nix @emilylange
-
-# Certificate Authorities
-pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
-pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt
-pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
-
-# Jetbrains
-/pkgs/applications/editors/jetbrains @edwtjo
-
-# Licenses
-/lib/licenses.nix @alyssais
-
-# Qt
-/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
-/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
-
-# KDE / Plasma 5
-/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
-/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
-/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
-
-# KDE / Plasma 6
-/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
-/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
-
-# PostgreSQL and related stuff
-/pkgs/servers/sql/postgresql @thoughtpolice
-/nixos/modules/services/databases/postgresql.md @thoughtpolice
-/nixos/modules/services/databases/postgresql.nix @thoughtpolice
-/nixos/tests/postgresql.nix @thoughtpolice
-
-# Hardened profile & related modules
-/nixos/modules/profiles/hardened.nix @joachifm
-/nixos/modules/security/lock-kernel-modules.nix @joachifm
-/nixos/modules/security/misc.nix @joachifm
-/nixos/tests/hardened.nix @joachifm
-/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm
-
-# Home Automation
-/nixos/modules/services/home-automation/home-assistant.nix @mweinelt
-/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt
-/nixos/tests/home-assistant.nix @mweinelt
-/nixos/tests/zigbee2mqtt.nix @mweinelt
-/pkgs/servers/home-assistant @mweinelt
-/pkgs/tools/misc/esphome @mweinelt
-
-# Network Time Daemons
-/pkgs/tools/networking/chrony @thoughtpolice
-/pkgs/tools/networking/ntp @thoughtpolice
-/pkgs/tools/networking/openntpd @thoughtpolice
-/nixos/modules/services/networking/ntp @thoughtpolice
-
-# Network
-/pkgs/tools/networking/kea/default.nix @mweinelt
-/pkgs/tools/networking/babeld/default.nix @mweinelt
-/nixos/modules/services/networking/babeld.nix @mweinelt
-/nixos/modules/services/networking/kea.nix @mweinelt
-/nixos/modules/services/networking/knot.nix @mweinelt
-/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
-/nixos/tests/babeld.nix @mweinelt
-/nixos/tests/kea.nix @mweinelt
-/nixos/tests/knot.nix @mweinelt
-
-# Web servers
-/doc/packages/nginx.section.md @raitobezarius
-/pkgs/servers/http/nginx/ @raitobezarius
-/nixos/modules/services/web-servers/nginx/ @raitobezarius
-
-# Dhall
-/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch @ehmry
-/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
-
-# Idris
-/pkgs/development/idris-modules @Infinisil
-/pkgs/development/compilers/idris2 @mattpolzin
-
-# Bazel
-/pkgs/development/tools/build-managers/bazel @Profpatsch
-
-# NixOS modules for e-mail and dns services
-/nixos/modules/services/mail/mailman.nix    @peti
-/nixos/modules/services/mail/postfix.nix    @peti
-/nixos/modules/services/networking/bind.nix @peti
-/nixos/modules/services/mail/rspamd.nix     @peti
-
-# Emacs
-/pkgs/applications/editors/emacs/elisp-packages @adisbladis
-/pkgs/applications/editors/emacs                @adisbladis
-/pkgs/top-level/emacs-packages.nix              @adisbladis
-
-# Kakoune
-/pkgs/applications/editors/kakoune     @philiptaron
-
-# Neovim
-/pkgs/applications/editors/neovim      @figsoda @teto
-
-# VimPlugins
-/pkgs/applications/editors/vim/plugins         @figsoda
-
-# VsCode Extensions
-/pkgs/applications/editors/vscode/extensions
-
-# PHP interpreter, packages, extensions, tests and documentation
-/doc/languages-frameworks/php.section.md          @aanderse @drupol @globin @ma27 @talyz
-/nixos/tests/php                                  @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php/build-pecl.nix            @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php                                     @drupol
-/pkgs/development/interpreters/php       @jtojnar @aanderse @drupol @globin @ma27 @talyz
-/pkgs/development/php-packages                    @aanderse @drupol @globin @ma27 @talyz
-/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @drupol @globin @ma27 @talyz
-
-# Docker tools
-/pkgs/build-support/docker                   @roberth
-/nixos/tests/docker-tools*                   @roberth
-/doc/build-helpers/images/dockertools.section.md  @roberth
-
-# Blockchains
-/pkgs/applications/blockchains  @mmahut @RaghavSood
-
-# Go
-/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq
-/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq
-/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq
-
-# GNOME
-/pkgs/desktops/gnome                              @jtojnar
-/pkgs/desktops/gnome/extensions                   @jtojnar
-/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
-
-# Cinnamon
-/pkgs/by-name/ci/cinnamon-*    @mkg20001
-/pkgs/by-name/cj/cjs           @mkg20001
-/pkgs/by-name/mu/muffin        @mkg20001
-/pkgs/by-name/ne/nemo          @mkg20001
-/pkgs/by-name/ne/nemo-*        @mkg20001
-
-# nim
-/pkgs/development/compilers/nim   @ehmry
-
-# terraform providers
-/pkgs/applications/networking/cluster/terraform-providers @zowoq
-
-# Forgejo
-nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
-pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
-
-# Dotnet
-/pkgs/build-support/dotnet                  @corngood
-/pkgs/development/compilers/dotnet          @corngood
-/pkgs/test/dotnet                           @corngood
-/doc/languages-frameworks/dotnet.section.md @corngood
-
-# Node.js
-/pkgs/build-support/node/build-npm-package      @winterqt
-/pkgs/build-support/node/fetch-npm-deps         @winterqt
-/doc/languages-frameworks/javascript.section.md @winterqt
-
-# OCaml
-/pkgs/build-support/ocaml           @ulrikstrid
-/pkgs/development/compilers/ocaml   @ulrikstrid
-/pkgs/development/ocaml-modules     @ulrikstrid
-
-# ZFS
-pkgs/os-specific/linux/zfs/2_1.nix        @raitobezarius
-pkgs/os-specific/linux/zfs/generic.nix    @raitobezarius
-nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius
-nixos/tests/zfs.nix                       @raitobezarius
-
-# Zig
-/pkgs/development/compilers/zig @figsoda
-/doc/hooks/zig.section.md       @figsoda
-
-# Buildbot
-nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
-nixos/tests/buildbot.nix                               @Mic92 @zowoq
-pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq
-
-# Pretix
-pkgs/by-name/pr/pretix/ @mweinelt
-pkgs/by-name/pr/pretalx/ @mweinelt
-nixos/modules/services/web-apps/pretix.nix @mweinelt
-nixos/modules/services/web-apps/pretalx.nix @mweinelt
-nixos/tests/web-apps/pretix.nix @mweinelt
-nixos/tests/web-apps/pretalx.nix @mweinelt
-
-# incus/lxc
-nixos/maintainers/scripts/incus/        @adamcstephens
-nixos/modules/virtualisation/incus.nix  @adamcstephens
-nixos/modules/virtualisation/lxc*       @adamcstephens
-nixos/tests/incus/                      @adamcstephens
-pkgs/by-name/in/incus/                  @adamcstephens
-pkgs/by-name/lx/lxc*                    @adamcstephens
-
-# ExpidusOS, Flutter
-/pkgs/development/compilers/flutter @RossComputerGuy
-/pkgs/desktops/expidus              @RossComputerGuy
-
-# GNU Tar & Zip
-/pkgs/tools/archivers/gnutar        @RossComputerGuy
-/pkgs/tools/archivers/zip           @RossComputerGuy
-
-# SELinux
-/pkgs/os-specific/linux/checkpolicy @RossComputerGuy
-/pkgs/os-specific/linux/libselinux  @RossComputerGuy
-/pkgs/os-specific/linux/libsepol    @RossComputerGuy
-
-# installShellFiles
-/pkgs/by-name/in/installShellFiles/*     @Ericson2314
-/pkgs/test/install-shell-files/*         @Ericson2314
-/doc/hooks/installShellFiles.section.md  @Ericson2314
+# This file would be for the native code owner feature of GitHub,
+# but is not being used because of its problems, see ci/OWNERS
diff --git a/.github/OWNERS b/.github/OWNERS
deleted file mode 100644
index 94f0ef5b6934..000000000000
--- a/.github/OWNERS
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Currently unused! Use CODEOWNERS for now, see workflows/codeowners.yml
-#
-####################
-#
-# This file is used to describe who owns what in this repository.
-# Users/teams will get review requests for PRs that change their files.
-#
-# This file does not replace `meta.maintainers`
-# but is instead used for other things than derivations and modules,
-# like documentation, package sets, and other assets.
-#
-# This file uses the same syntax as the natively supported CODEOWNERS file,
-# see https://help.github.com/articles/about-codeowners/ for documentation.
-# However it comes with some notable differences:
-# - There is no need for user/team listed here to have write access.
-# - No reviews will be requested for PRs that target the wrong base branch.
-#
-# Processing of this file is implemented in workflows/codeowners.yml
diff --git a/.github/workflows/codeowners.yml b/.github/workflows/codeowners.yml
index 01409dd57a66..164b5a1136f2 100644
--- a/.github/workflows/codeowners.yml
+++ b/.github/workflows/codeowners.yml
@@ -13,14 +13,9 @@ on:
     types: [opened, ready_for_review, synchronize, reopened, edited]
 
 env:
-  # TODO: Once confirmed that this works by seeing that the action would request
-  # reviews from the same people (or refuse for wrong base branches),
-  # move all entries from CODEOWNERS to OWNERS, remove these two lines and uncomment the ones below
-  OWNERS_FILE: .github/CODEOWNERS
-  DRY_MODE: 1
-  # OWNERS_FILE: .github/OWNERS
-  # # Don't do anything on draft PRs
-  # DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
+  OWNERS_FILE: ci/OWNERS
+  # Don't do anything on draft PRs
+  DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
 
 jobs:
   # Check that code owners is valid
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f3c3cfe611d2..74cf3c6ea7c2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -193,19 +193,12 @@ The last checkbox is about whether it fits the guidelines in this `CONTRIBUTING.
 [rebase]: #rebasing-between-branches-ie-from-master-to-staging
 
 From time to time, changes between branches must be rebased, for example, if the
-number of new rebuilds they would cause is too large for the target branch. When
-rebasing, care must be taken to include only the intended changes, otherwise
-many CODEOWNERS will be inadvertently requested for review. To achieve this,
-rebasing should not be performed directly on the target branch, but on the merge
-base between the current and target branch. As an additional precautionary measure,
-you should temporarily mark the PR as draft for the duration of the operation.
-This reduces the probability of mass-pinging people. (OfBorg might still
-request a couple of persons for reviews though.)
+number of new rebuilds they would cause is too large for the target branch.
 
 In the following example, we assume that the current branch, called `feature`,
 is based on `master`, and we rebase it onto the merge base between
-`master` and `staging` so that the PR can eventually be retargeted to
-`staging` without causing a mess. The example uses `upstream` as the remote for `NixOS/nixpkgs.git`
+`master` and `staging` so that the PR can be retargeted to
+`staging`. The example uses `upstream` as the remote for `NixOS/nixpkgs.git`
 while `origin` is the remote you are pushing to.
 
 
@@ -234,36 +227,6 @@ git status
 git push origin feature --force-with-lease
 ```
 
-#### Something went wrong and a lot of people were pinged
-
-It happens. Remember to be kind, especially to new contributors.
-There is no way back, so the pull request should be closed and locked
-(if possible). The changes should be re-submitted in a new PR, in which the people
-originally involved in the conversation need to manually be pinged again.
-No further discussion should happen on the original PR, as a lot of people
-are now subscribed to it.
-
-The following message (or a version thereof) might be left when closing to
-describe the situation, since closing and locking without any explanation
-is kind of rude:
-
-```markdown
-It looks like you accidentally mass-pinged a bunch of people, which are now subscribed
-and getting notifications for everything in this pull request. Unfortunately, they
-cannot be automatically unsubscribed from the issue (removing review request does not
-unsubscribe), therefore development cannot continue in this pull request anymore.
-
-Please open a new pull request with your changes, link back to this one and ping the
-people actually involved in here over there.
-
-In order to avoid this in the future, there are instructions for how to properly
-rebase between branches in our [contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging).
-Setting your pull request to draft prior to rebasing is strongly recommended.
-In draft status, you can preview the list of people that are about to be requested
-for review, which allows you to sidestep this issue.
-This is not a bulletproof method though, as OfBorg still does review requests even on draft PRs.
-```
-
 ## How to backport pull requests
 [pr-backport]: #how-to-backport-pull-requests
 
diff --git a/ci/OWNERS b/ci/OWNERS
new file mode 100644
index 000000000000..7c775d469baa
--- /dev/null
+++ b/ci/OWNERS
@@ -0,0 +1,393 @@
+# This file is used to describe who owns what in this repository.
+# Users/teams will get review requests for PRs that change their files.
+#
+# This file does not replace `meta.maintainers`
+# but is instead used for other things than derivations and modules,
+# like documentation, package sets, and other assets.
+#
+# This file uses the same syntax as the natively supported CODEOWNERS file,
+# see https://help.github.com/articles/about-codeowners/ for documentation.
+# However it comes with some notable differences:
+# - There is no need for user/team listed here to have write access.
+# - No reviews will be requested for PRs that target the wrong base branch.
+#
+# Processing of this file is implemented in workflows/codeowners.yml
+
+# CI
+/.github/workflows @NixOS/Security @Mic92 @zowoq
+/.github/workflows/check-nix-format.yml @infinisil
+/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
+/.github/workflows/codeowners.yml @infinisil
+/ci/OWNERS @infinisil
+/ci @infinisil @philiptaron @NixOS/Security
+
+# Development support
+/.editorconfig @Mic92 @zowoq
+/shell.nix @infinisil @NixOS/Security
+
+# Libraries
+/lib                        @infinisil
+/lib/systems                @alyssais @ericson2314
+/lib/generators.nix         @infinisil @Profpatsch
+/lib/cli.nix                @infinisil @Profpatsch
+/lib/debug.nix              @infinisil @Profpatsch
+/lib/asserts.nix            @infinisil @Profpatsch
+/lib/path/*                 @infinisil
+/lib/fileset                @infinisil
+## Libraries / Module system
+/lib/modules.nix            @infinisil @roberth
+/lib/types.nix              @infinisil @roberth
+/lib/options.nix            @infinisil @roberth
+/lib/tests/modules.sh       @infinisil @roberth
+/lib/tests/modules          @infinisil @roberth
+
+# Nixpkgs Internals
+/default.nix                                     @Ericson2314
+/pkgs/top-level/default.nix                      @Ericson2314
+/pkgs/top-level/impure.nix                       @Ericson2314
+/pkgs/top-level/stage.nix                        @Ericson2314
+/pkgs/top-level/splice.nix                       @Ericson2314
+/pkgs/top-level/release-cross.nix                @Ericson2314
+/pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
+/pkgs/stdenv                                     @philiptaron
+/pkgs/stdenv/generic                             @Ericson2314
+/pkgs/stdenv/generic/check-meta.nix              @Ericson2314
+/pkgs/stdenv/cross                               @Ericson2314
+/pkgs/build-support                              @philiptaron
+/pkgs/build-support/cc-wrapper                   @Ericson2314
+/pkgs/build-support/bintools-wrapper             @Ericson2314
+/pkgs/build-support/setup-hooks                  @Ericson2314
+/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
+/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
+/pkgs/pkgs-lib                                   @infinisil
+## Format generators/serializers
+/pkgs/pkgs-lib/formats/libconfig                 @h7x4
+/pkgs/pkgs-lib/formats/hocon                     @h7x4
+
+# Nixpkgs build-support
+/pkgs/build-support/writers @lassulus @Profpatsch
+
+# Nixpkgs make-disk-image
+/doc/build-helpers/images/makediskimage.section.md  @raitobezarius
+/nixos/lib/make-disk-image.nix                 @raitobezarius
+
+# Nix, the package manager
+# @raitobezarius is not "code owner", but is listed here to be notified of changes
+# pertaining to the Nix package manager.
+# i.e. no authority over those files.
+pkgs/tools/package-management/nix/                    @NixOS/nix-team @raitobezarius
+nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobezarius
+
+# Nixpkgs documentation
+/maintainers/scripts/db-to-md.sh @jtojnar @ryantm
+/maintainers/scripts/doc @jtojnar @ryantm
+
+# Contributor documentation
+/CONTRIBUTING.md @infinisil
+/.github/PULL_REQUEST_TEMPLATE.md @infinisil
+/doc/contributing/ @infinisil
+/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil
+/lib/README.md @infinisil
+/doc/README.md @infinisil
+/nixos/README.md @infinisil
+/pkgs/README.md @infinisil
+/pkgs/by-name/README.md @infinisil
+/maintainers/README.md @infinisil
+
+# User-facing development documentation
+/doc/development.md @infinisil
+/doc/development @infinisil
+
+# NixOS Internals
+/nixos/default.nix                                    @infinisil
+/nixos/lib/from-env.nix                               @infinisil
+/nixos/lib/eval-config.nix                            @infinisil
+/nixos/modules/system/activation/bootspec.nix         @grahamc @cole-h @raitobezarius
+/nixos/modules/system/activation/bootspec.cue         @grahamc @cole-h @raitobezarius
+
+# NixOS integration test driver
+/nixos/lib/test-driver  @tfc
+
+# NixOS QEMU virtualisation
+/nixos/modules/virtualisation/qemu-vm.nix           @raitobezarius
+
+# ACME
+/nixos/modules/security/acme                @arianvp @flokli @aanderse @emilazy # no merge permission: @m1cr0man
+
+# Systemd
+/nixos/modules/system/boot/systemd.nix      @NixOS/systemd
+/nixos/modules/system/boot/systemd          @NixOS/systemd
+/nixos/lib/systemd-*.nix                    @NixOS/systemd
+/pkgs/os-specific/linux/systemd             @NixOS/systemd
+
+# Systemd-boot
+/nixos/modules/system/boot/loader/systemd-boot      @JulienMalka
+
+# Images and installer media
+/nixos/modules/profiles/installation-device.nix @ElvishJerricco
+/nixos/modules/installer/cd-dvd/                @ElvishJerricco
+/nixos/modules/installer/sd-card/
+
+# Updaters
+## update.nix
+/maintainers/scripts/update.nix   @jtojnar
+/maintainers/scripts/update.py    @jtojnar
+## common-updater-scripts
+/pkgs/common-updater/scripts/update-source-version    @jtojnar
+
+# Python-related code and docs
+/doc/languages-frameworks/python.section.md   @mweinelt @natsukium
+/maintainers/scripts/update-python-libraries            @natsukium
+/pkgs/development/interpreters/python                   @natsukium
+/pkgs/top-level/python-packages.nix                     @natsukium
+/pkgs/top-level/release-python.nix                      @natsukium
+
+# Haskell
+/doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn
+/maintainers/scripts/haskell                  @sternenseemann @maralorn
+/pkgs/development/compilers/ghc               @sternenseemann @maralorn
+/pkgs/development/haskell-modules             @sternenseemann @maralorn
+/pkgs/test/haskell                            @sternenseemann @maralorn
+/pkgs/top-level/release-haskell.nix           @sternenseemann @maralorn
+/pkgs/top-level/haskell-packages.nix          @sternenseemann @maralorn
+
+# Perl
+/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg
+/pkgs/top-level/perl-packages.nix   @stigtsp @zakame @marcusramberg
+/pkgs/development/perl-modules      @stigtsp @zakame @marcusramberg
+
+# R
+/pkgs/applications/science/math/R   @jbedo
+/pkgs/development/r-modules         @jbedo
+
+# Rust
+/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
+/pkgs/build-support/rust @zowoq @winterqt @figsoda
+/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
+
+# C compilers
+/pkgs/development/compilers/gcc
+/pkgs/development/compilers/llvm @alyssais @RossComputerGuy
+/pkgs/development/compilers/emscripten @raitobezarius
+/doc/languages-frameworks/emscripten.section.md @raitobezarius
+
+# Audio
+/nixos/modules/services/audio/botamusique.nix @mweinelt
+/nixos/modules/services/audio/snapserver.nix @mweinelt
+/nixos/tests/botamusique.nix @mweinelt
+/nixos/tests/snapcast.nix @mweinelt
+
+# Browsers
+/pkgs/applications/networking/browsers/firefox @mweinelt
+/pkgs/applications/networking/browsers/chromium @emilylange
+/nixos/tests/chromium.nix @emilylange
+
+# Certificate Authorities
+pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
+pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt
+pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
+
+# Jetbrains
+/pkgs/applications/editors/jetbrains @edwtjo
+
+# Licenses
+/lib/licenses.nix @alyssais
+
+# Qt
+/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
+
+# KDE / Plasma 5
+/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
+
+# KDE / Plasma 6
+/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+
+# PostgreSQL and related stuff
+/pkgs/servers/sql/postgresql @thoughtpolice
+/nixos/modules/services/databases/postgresql.md @thoughtpolice
+/nixos/modules/services/databases/postgresql.nix @thoughtpolice
+/nixos/tests/postgresql.nix @thoughtpolice
+
+# Hardened profile & related modules
+/nixos/modules/profiles/hardened.nix @joachifm
+/nixos/modules/security/lock-kernel-modules.nix @joachifm
+/nixos/modules/security/misc.nix @joachifm
+/nixos/tests/hardened.nix @joachifm
+/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm
+
+# Home Automation
+/nixos/modules/services/home-automation/home-assistant.nix @mweinelt
+/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt
+/nixos/tests/home-assistant.nix @mweinelt
+/nixos/tests/zigbee2mqtt.nix @mweinelt
+/pkgs/servers/home-assistant @mweinelt
+/pkgs/tools/misc/esphome @mweinelt
+
+# Network Time Daemons
+/pkgs/tools/networking/chrony @thoughtpolice
+/pkgs/tools/networking/ntp @thoughtpolice
+/pkgs/tools/networking/openntpd @thoughtpolice
+/nixos/modules/services/networking/ntp @thoughtpolice
+
+# Network
+/pkgs/tools/networking/kea/default.nix @mweinelt
+/pkgs/tools/networking/babeld/default.nix @mweinelt
+/nixos/modules/services/networking/babeld.nix @mweinelt
+/nixos/modules/services/networking/kea.nix @mweinelt
+/nixos/modules/services/networking/knot.nix @mweinelt
+/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
+/nixos/tests/babeld.nix @mweinelt
+/nixos/tests/kea.nix @mweinelt
+/nixos/tests/knot.nix @mweinelt
+
+# Web servers
+/doc/packages/nginx.section.md @raitobezarius
+/pkgs/servers/http/nginx/ @raitobezarius
+/nixos/modules/services/web-servers/nginx/ @raitobezarius
+
+# Dhall
+/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch @ehmry
+/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
+
+# Idris
+/pkgs/development/idris-modules @Infinisil
+/pkgs/development/compilers/idris2 @mattpolzin
+
+# Bazel
+/pkgs/development/tools/build-managers/bazel @Profpatsch
+
+# NixOS modules for e-mail and dns services
+/nixos/modules/services/mail/mailman.nix    @peti
+/nixos/modules/services/mail/postfix.nix    @peti
+/nixos/modules/services/networking/bind.nix @peti
+/nixos/modules/services/mail/rspamd.nix     @peti
+
+# Emacs
+/pkgs/applications/editors/emacs/elisp-packages @adisbladis
+/pkgs/applications/editors/emacs                @adisbladis
+/pkgs/top-level/emacs-packages.nix              @adisbladis
+
+# Kakoune
+/pkgs/applications/editors/kakoune     @philiptaron
+
+# Neovim
+/pkgs/applications/editors/neovim      @figsoda @teto
+
+# VimPlugins
+/pkgs/applications/editors/vim/plugins         @figsoda
+
+# VsCode Extensions
+/pkgs/applications/editors/vscode/extensions
+
+# PHP interpreter, packages, extensions, tests and documentation
+/doc/languages-frameworks/php.section.md          @aanderse @drupol @globin @ma27 @talyz
+/nixos/tests/php                                  @aanderse @drupol @globin @ma27 @talyz
+/pkgs/build-support/php/build-pecl.nix            @aanderse @drupol @globin @ma27 @talyz
+/pkgs/build-support/php                                     @drupol
+/pkgs/development/interpreters/php       @jtojnar @aanderse @drupol @globin @ma27 @talyz
+/pkgs/development/php-packages                    @aanderse @drupol @globin @ma27 @talyz
+/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @drupol @globin @ma27 @talyz
+
+# Docker tools
+/pkgs/build-support/docker                   @roberth
+/nixos/tests/docker-tools*                   @roberth
+/doc/build-helpers/images/dockertools.section.md  @roberth
+
+# Blockchains
+/pkgs/applications/blockchains  @mmahut @RaghavSood
+
+# Go
+/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq
+/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq
+/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq
+
+# GNOME
+/pkgs/desktops/gnome                              @jtojnar
+/pkgs/desktops/gnome/extensions                   @jtojnar
+/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
+
+# Cinnamon
+/pkgs/by-name/ci/cinnamon-*    @mkg20001
+/pkgs/by-name/cj/cjs           @mkg20001
+/pkgs/by-name/mu/muffin        @mkg20001
+/pkgs/by-name/ne/nemo          @mkg20001
+/pkgs/by-name/ne/nemo-*        @mkg20001
+
+# nim
+/pkgs/development/compilers/nim   @ehmry
+
+# terraform providers
+/pkgs/applications/networking/cluster/terraform-providers @zowoq
+
+# Forgejo
+nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
+pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
+
+# Dotnet
+/pkgs/build-support/dotnet                  @corngood
+/pkgs/development/compilers/dotnet          @corngood
+/pkgs/test/dotnet                           @corngood
+/doc/languages-frameworks/dotnet.section.md @corngood
+
+# Node.js
+/pkgs/build-support/node/build-npm-package      @winterqt
+/pkgs/build-support/node/fetch-npm-deps         @winterqt
+/doc/languages-frameworks/javascript.section.md @winterqt
+
+# OCaml
+/pkgs/build-support/ocaml           @ulrikstrid
+/pkgs/development/compilers/ocaml   @ulrikstrid
+/pkgs/development/ocaml-modules     @ulrikstrid
+
+# ZFS
+pkgs/os-specific/linux/zfs/2_1.nix        @raitobezarius
+pkgs/os-specific/linux/zfs/generic.nix    @raitobezarius
+nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius
+nixos/tests/zfs.nix                       @raitobezarius
+
+# Zig
+/pkgs/development/compilers/zig @figsoda
+/doc/hooks/zig.section.md       @figsoda
+
+# Buildbot
+nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
+nixos/tests/buildbot.nix                               @Mic92 @zowoq
+pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq
+
+# Pretix
+pkgs/by-name/pr/pretix/ @mweinelt
+pkgs/by-name/pr/pretalx/ @mweinelt
+nixos/modules/services/web-apps/pretix.nix @mweinelt
+nixos/modules/services/web-apps/pretalx.nix @mweinelt
+nixos/tests/web-apps/pretix.nix @mweinelt
+nixos/tests/web-apps/pretalx.nix @mweinelt
+
+# incus/lxc
+nixos/maintainers/scripts/incus/        @adamcstephens
+nixos/modules/virtualisation/incus.nix  @adamcstephens
+nixos/modules/virtualisation/lxc*       @adamcstephens
+nixos/tests/incus/                      @adamcstephens
+pkgs/by-name/in/incus/                  @adamcstephens
+pkgs/by-name/lx/lxc*                    @adamcstephens
+
+# ExpidusOS, Flutter
+/pkgs/development/compilers/flutter @RossComputerGuy
+/pkgs/desktops/expidus              @RossComputerGuy
+
+# GNU Tar & Zip
+/pkgs/tools/archivers/gnutar        @RossComputerGuy
+/pkgs/tools/archivers/zip           @RossComputerGuy
+
+# SELinux
+/pkgs/os-specific/linux/checkpolicy @RossComputerGuy
+/pkgs/os-specific/linux/libselinux  @RossComputerGuy
+/pkgs/os-specific/linux/libsepol    @RossComputerGuy
+
+# installShellFiles
+/pkgs/by-name/in/installShellFiles/*     @Ericson2314
+/pkgs/test/install-shell-files/*         @Ericson2314
+/doc/hooks/installShellFiles.section.md  @Ericson2314
diff --git a/ci/request-reviews/get-reviewers.sh b/ci/request-reviews/get-reviewers.sh
index d5cd9e0a4fd4..be0fd10c5b22 100755
--- a/ci/request-reviews/get-reviewers.sh
+++ b/ci/request-reviews/get-reviewers.sh
@@ -10,16 +10,18 @@ log() {
     echo "$@" >&2
 }
 
-if (( "$#" < 5 )); then
-    log "Usage: $0 GIT_REPO BASE_REF HEAD_REF OWNERS_FILE PR_AUTHOR"
+if (( "$#" < 7 )); then
+    log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REPO BASE_REF HEAD_REF PR_NUMBER PR_AUTHOR"
     exit 1
 fi
 
 gitRepo=$1
-baseRef=$2
-headRef=$3
-ownersFile=$4
-prAuthor=$5
+ownersFile=$2
+baseRepo=$3
+baseRef=$4
+headRef=$5
+prNumber=$6
+prAuthor=$7
 
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
@@ -32,8 +34,8 @@ log "This PR touches ${#touchedFiles[@]} files"
 # remove code owners to avoid pinging them
 git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
 
-# Associative arrays with the team/user as the key for easy deduplication
-declare -A teams users
+# Associative array with the user as the key for easy de-duplication
+declare -A users=()
 
 for file in "${touchedFiles[@]}"; do
     result=$(codeowners --file "$tmp"/codeowners "$file")
@@ -59,10 +61,34 @@ for file in "${touchedFiles[@]}"; do
         fi
         # The first regex match is everything after the @
         entry=${BASH_REMATCH[1]}
-        if [[ "$entry" =~ .*/(.*) ]]; then
-            # Teams look like $org/$team, where we only need $team for the API
-            # call to request reviews from teams
-            teams[${BASH_REMATCH[1]}]=
+
+        if [[ "$entry" =~ (.*)/(.*) ]]; then
+            # Teams look like $org/$team
+            org=${BASH_REMATCH[1]}
+            team=${BASH_REMATCH[2]}
+
+            # Instead of requesting a review from the team itself,
+            # we request reviews from the individual users.
+            # This is because once somebody from a team reviewed the PR,
+            # the API doesn't expose that the team was already requested for a review,
+            # so we wouldn't be able to avoid rerequesting reviews
+            # without saving some some extra state somewhere
+
+            # We could also consider implementing a more advanced heuristic
+            # in the future that e.g. only pings one team member,
+            # but escalates to somebody else if that member doesn't respond in time.
+            gh api \
+                --cache=1h \
+                -H "Accept: application/vnd.github+json" \
+                -H "X-GitHub-Api-Version: 2022-11-28" \
+                "/orgs/$org/teams/$team/members" \
+                --jq '.[].login' > "$tmp/team-members"
+            readarray -t members < "$tmp/team-members"
+            log "Team $entry has these members: ${members[*]}"
+
+            for user in "${members[@]}"; do
+                users[$user]=
+            done
         else
             # Everything else is a user
             users[$entry]=
@@ -77,11 +103,23 @@ if [[ -v users[$prAuthor] ]]; then
     unset 'users[$prAuthor]'
 fi
 
+gh api \
+    -H "Accept: application/vnd.github+json" \
+    -H "X-GitHub-Api-Version: 2022-11-28" \
+    "/repos/$baseRepo/pulls/$prNumber/reviews" \
+    --jq '.[].user.login' > "$tmp/already-reviewed-by"
+
+# And we don't want to rerequest reviews from people who already reviewed
+while read -r user; do
+    if [[ -v users[$user] ]]; then
+        log "User $user is a code owner but has already left a review, ignoring"
+        unset 'users[$user]'
+    fi
+done < "$tmp/already-reviewed-by"
+
 # Turn it into a JSON for the GitHub API call to request PR reviewers
 jq -n \
     --arg users "${!users[*]}" \
-    --arg teams "${!teams[*]}" \
     '{
       reviewers: $users | split(" "),
-      team_reviewers: $teams | split(" ")
     }'
diff --git a/ci/request-reviews/request-reviews.sh b/ci/request-reviews/request-reviews.sh
index d62ab309bcc8..a70a95a65b3a 100755
--- a/ci/request-reviews/request-reviews.sh
+++ b/ci/request-reviews/request-reviews.sh
@@ -80,7 +80,7 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep
 fi
 
 log "Getting code owners to request reviews from"
-"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$baseBranch" "$headRef" "$ownersFile" "$prAuthor" > "$tmp/reviewers.json"
+"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseRepo" "$baseBranch" "$headRef" "$prNumber" "$prAuthor" > "$tmp/reviewers.json"
 
 log "Requesting reviews from: $(<"$tmp/reviewers.json")"
 
diff --git a/ci/request-reviews/verify-base-branch.sh b/ci/request-reviews/verify-base-branch.sh
index 17d721c5ddd1..7be280db8d65 100755
--- a/ci/request-reviews/verify-base-branch.sh
+++ b/ci/request-reviews/verify-base-branch.sh
@@ -90,8 +90,9 @@ for testBranch in "${devBranches[@]}"; do
         log -e "\e[33m"
         echo "The PR's base branch is set to $baseBranch, but $extraCommits commits from the $testBranch branch are included. Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then:"
         echo "- If the changes should go to the $testBranch branch, [change the base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request) to $testBranch"
-        echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $testBranch branch:"
-        echo "  \`\`\`"
+        echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $baseBranch branch:"
+        echo "  \`\`\`bash"
+        echo "  # git rebase --onto \$(git merge-base upstream/$baseBranch HEAD) \$(git merge-base upstream/$testBranch HEAD)"
         echo "  git rebase --onto $prMergeBase $testMergeBase"
         echo "  git push --force-with-lease"
         echo "  \`\`\`"
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ffe0c78b9573..5b2f39708c7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -668,6 +668,12 @@
     githubId = 19290901;
     name = "Andrew Brooks";
   };
+  agilesteel = {
+    email = "agilesteel@gmail.com";
+    github = "agilesteel";
+    githubId = 1141462;
+    name = "Vladyslav Pekker";
+  };
   aherrmann = {
     email = "andreash87@gmx.ch";
     github = "aherrmann";
@@ -8239,6 +8245,13 @@
     github = "hacker1024";
     githubId = 20849728;
   };
+  hadilq = {
+    name = "Hadi Lashkari Ghouchani";
+    email = "hadilq.dev@gmail.com";
+    github = "hadilq";
+    githubId = 5190539;
+    keys = [ { fingerprint = "AD3D 53CB A68A FEC0 8065  BCBB 416A D9E8 E372 C075"; } ];
+  };
   hagl = {
     email = "harald@glie.be";
     github = "hagl";
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 549228a4dae4..4cd2f35113ec 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -436,6 +436,30 @@ in
         TimeoutSec = "300";
         WorkingDirectory = "${cfg.package}/share/redmine";
         ExecStart="${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";
+        AmbientCapabilities = "";
+        CapabilityBoundingSet = "";
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "noaccess";
+        ProtectSystem = "full";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        UMask = 027;
       };
 
     };
diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix
index 2d59783d3bbe..cf6429c0094e 100644
--- a/nixos/modules/services/web-apps/node-red.nix
+++ b/nixos/modules/services/web-apps/node-red.nix
@@ -118,7 +118,7 @@ in
       environment = {
         HOME = cfg.userDir;
       };
-      path = lib.optionals cfg.withNpmAndGcc [ pkgs.nodePackages.npm pkgs.gcc ];
+      path = lib.optionals cfg.withNpmAndGcc [ pkgs.nodejs pkgs.gcc ];
       serviceConfig = mkMerge [
         {
           User = cfg.user;
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index bb969408bac1..66a62f61908a 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -64,14 +64,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ardour";
-  version = "8.6";
+  version = "8.8";
 
   # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
     rev = version;
-    hash = "sha256-sMp24tjtX8fZJWc7dvb+9e6pEflT4ugoOZjDis6/3nM=";
+    hash = "sha256-S96hlk4M+38OjjF3T6lhDm3cBjN5t4y6EeYRmvAmVfE=";
   };
 
   bundledContent = fetchzip {
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index f80707c96ff1..8fab5a4e54da 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-07Pwh7qbw6Emr5+F89v9i2ARdSosukjjuarJ+uZR7xY=";
+    hash = "sha256-PT0WijNvcF7opTVxpj6oRb514Alz12gZCSMYa4bqyrY=";
   };
 
   strictDeps = true;
diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix
index 67f8f6825aa0..46ecfa025959 100644
--- a/pkgs/applications/editors/qemacs/default.nix
+++ b/pkgs/applications/editors/qemacs/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qemacs";
-  version = "6.1.1b";
+  version = "6.3.2";
 
   src = fetchFromGitHub {
     owner = "qemacs";
     repo = "qemacs";
-    rev = "06b3d373bbcc52b51ccb438bf3cab38a49492ff0";
-    hash = "sha256-Z4BbA8W3bYdw+cHgI24r55OP1Olr3GwKLlfRxjy45i8=";
+    rev = "0e90c181078f3d85d0d44d985d541184223668e1";
+    hash = "sha256-3kq89CoUi9ocR0q2SqYF8S/xNgBpInC4f2d/dJg/nEM=";
   };
 
   postPatch = ''
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://bellard.org/qemacs/";
     description = "Very small but powerful UNIX editor";
-    license = licenses.lgpl2Only;
+    license = licenses.mit;
     maintainers = with maintainers; [ iblech ];
   };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 137d364e5472..987e1755d3de 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -90,4 +90,5 @@ in
     license = licenses.asl20;
     maintainers = with maintainers; [ figsoda ];
   };
+  nvimRequireCheck = "nvim-treesitter";
 }
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a65e920150fb..bb74c4a41733 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1,139 +1,140 @@
-{ lib
-, stdenv
-, # nixpkgs functions
-  buildGoModule
-, buildVimPlugin
-, fetchFromGitHub
-, fetchFromSourcehut
-, fetchpatch
-, fetchurl
-, neovimUtils
-, substituteAll
-, # Language dependencies
-  fetchYarnDeps
-, mkYarnModules
-, python3
-, rustPlatform
-, # Misc dependencies
-  arrow-cpp
-, Cocoa
-, coc-clangd
-, coc-diagnostic
-, coc-pyright
-, code-minimap
-, dasht
-, deno
-, direnv
-, duckdb
-, fish
-, fzf
-, gawk
-, git
-, himalaya
-, htop
-, jq
-, khard
-, languagetool
-, llvmPackages
-, meson
-, neovim-unwrapped
-, nim1
-, nodePackages
-, openscad
-, pandoc
-, parinfer-rust
-, phpactor
-, ranger
-, ripgrep
-, skim
-, sqlite
-, statix
-, stylish-haskell
-, tabnine
-, taskwarrior2
-, taskwarrior3
-, tmux
-, tup
-, vim
-, which
-, xkb-switch
-, ycmd
-, zoxide
-, nodejs
-, xdotool
-, xorg
-, xxd
-, zathura
-, zenity
-, zsh
-, # codeium-nvim dependencies
-  codeium
-, # codesnap-nvim dependencies
-  clang
-, libuv
-, # command-t dependencies
-  getconf
-, ruby
-, # cornelis dependencies
-  cornelis
-, # cpsm dependencies
-  boost
-, cmake
-, icu
-, ncurses
-, # LanguageClient-neovim dependencies
-  CoreFoundation
-, CoreServices
-, # nvim-treesitter dependencies
-  callPackage
-, # Preview-nvim dependencies
-  md-tui
-, # sg.nvim dependencies
-  darwin
-, # sved dependencies
-  glib
-, gobject-introspection
-, wrapGAppsHook3
-, writeText
-, # sniprun dependencies
-  bashInteractive
-, coreutils
-, curl
-, gnugrep
-, gnused
-, makeWrapper
-, procps
-, # sg-nvim dependencies
-  openssl
-, pkg-config
-, # vim-agda dependencies
-  agda
-, # vim-go dependencies
-  asmfmt
-, delve
-, errcheck
-, go-motion
-, go-tools
-, gocode-gomod
-, godef
-, gogetdoc
-, golangci-lint
-, golint
-, gomodifytags
-, gopls
-, gotags
-, gotools
-, iferr
-, impl
-, reftools
-, revive
-, # hurl dependencies
-  hurl
-, # must be lua51Packages
-  luajitPackages
-, aider-chat
-,
-}: self: super:
+{
+  lib,
+  stdenv,
+  # nixpkgs functions
+  buildGoModule,
+  buildVimPlugin,
+  fetchFromGitHub,
+  fetchFromSourcehut,
+  fetchpatch,
+  fetchurl,
+  neovimUtils,
+  substituteAll,
+  # Language dependencies
+  fetchYarnDeps,
+  mkYarnModules,
+  python3,
+  rustPlatform,
+  # Misc dependencies
+  arrow-cpp,
+  Cocoa,
+  coc-clangd,
+  coc-diagnostic,
+  coc-pyright,
+  code-minimap,
+  dasht,
+  deno,
+  direnv,
+  duckdb,
+  fish,
+  fzf,
+  gawk,
+  git,
+  himalaya,
+  htop,
+  jq,
+  khard,
+  languagetool,
+  llvmPackages,
+  meson,
+  neovim-unwrapped,
+  nim1,
+  nodePackages,
+  openscad,
+  pandoc,
+  parinfer-rust,
+  phpactor,
+  ranger,
+  ripgrep,
+  skim,
+  sqlite,
+  statix,
+  stylish-haskell,
+  tabnine,
+  taskwarrior2,
+  taskwarrior3,
+  tmux,
+  tup,
+  vim,
+  which,
+  xkb-switch,
+  ycmd,
+  zoxide,
+  nodejs,
+  xdotool,
+  xorg,
+  xxd,
+  zathura,
+  zenity,
+  zsh,
+  # codeium-nvim dependencies
+  codeium,
+  # codesnap-nvim dependencies
+  clang,
+  libuv,
+  # command-t dependencies
+  getconf,
+  ruby,
+  # cornelis dependencies
+  cornelis,
+  # cpsm dependencies
+  boost,
+  cmake,
+  icu,
+  ncurses,
+  # LanguageClient-neovim dependencies
+  CoreFoundation,
+  CoreServices,
+  # nvim-treesitter dependencies
+  callPackage,
+  # Preview-nvim dependencies
+  md-tui,
+  # sg.nvim dependencies
+  darwin,
+  # sved dependencies
+  glib,
+  gobject-introspection,
+  wrapGAppsHook3,
+  writeText,
+  # sniprun dependencies
+  bashInteractive,
+  coreutils,
+  curl,
+  gnugrep,
+  gnused,
+  makeWrapper,
+  procps,
+  # sg-nvim dependencies
+  openssl,
+  pkg-config,
+  # vim-agda dependencies
+  agda,
+  # vim-go dependencies
+  asmfmt,
+  delve,
+  errcheck,
+  go-motion,
+  go-tools,
+  gocode-gomod,
+  godef,
+  gogetdoc,
+  golangci-lint,
+  golint,
+  gomodifytags,
+  gopls,
+  gotags,
+  gotools,
+  iferr,
+  impl,
+  reftools,
+  revive,
+  # hurl dependencies
+  hurl,
+  # must be lua51Packages
+  luajitPackages,
+  aider-chat,
+}:
+self: super:
 let
   luaPackages = neovim-unwrapped.lua.pkgs;
 in
@@ -143,7 +144,13 @@ in
   };
 
   advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
-    dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ];
+    dependencies = with super; [
+      telescope-nvim
+      vim-fugitive
+      vim-rhubarb
+    ];
+    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
+    # nvimRequireCheck = "advanced_git_search.utils";
   };
 
   animation-nvim = super.animation-nvim.overrideAttrs {
@@ -153,6 +160,7 @@ in
 
   autosave-nvim = super.autosave-nvim.overrideAttrs {
     dependencies = with super; [ plenary-nvim ];
+    nvimRequireCheck = "autosave";
   };
 
   avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs {
@@ -165,13 +173,17 @@ in
   };
 
   barbecue-nvim = super.barbecue-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig nvim-navic ];
+    dependencies = with self; [
+      nvim-lspconfig
+      nvim-navic
+    ];
     meta = {
       description = "VS Code like winbar for Neovim";
       homepage = "https://github.com/utilyre/barbecue.nvim";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ lightquantum ];
     };
+    nvimRequireCheck = "barbecue";
   };
 
   # The GitHub repository returns 404, which breaks the update script
@@ -201,8 +213,11 @@ in
   };
 
   chadtree = super.chadtree.overrideAttrs {
-    passthru.python3Dependencies = ps:
-      with ps; [
+    buildInputs = [
+      python3
+    ];
+    passthru.python3Dependencies =
+      ps: with ps; [
         pynvim-pp
         pyyaml
         std2
@@ -210,10 +225,17 @@ in
 
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/chadtree/emulate-venv.patch ];
+    nvimRequireCheck = "chadtree";
   };
 
   ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ];
+    dependencies = with self; [
+      nui-nvim
+      plenary-nvim
+      telescope-nvim
+    ];
+    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
+    # nvimRequireCheck = "chatgpt";
   };
 
   clang_complete = super.clang_complete.overrideAttrs {
@@ -227,7 +249,8 @@ in
         substituteInPlace "$out"/plugin/clang_complete.vim \
           --replace "let g:clang_library_path = ''
       + "''"
-      + ''        " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'"
+      + ''
+        " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'"
 
               substituteInPlace "$out"/plugin/libclang.py \
                 --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
@@ -245,119 +268,192 @@ in
     postPatch = ''
       sed -i -e 's/require "health"/vim.health/' lua/clipboard-image/health.lua
     '';
+    nvimRequireCheck = "clipboard-image";
   };
 
   cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "cmake-tools";
   };
 
   cmp-ai = super.cmp-ai.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      plenary-nvim
+    ];
+    nvimRequireCheck = "cmp_ai";
   };
 
   cmp-clippy = super.cmp-clippy.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      plenary-nvim
+    ];
+    nvimRequireCheck = "cmp_clippy";
   };
 
   cmp-copilot = super.cmp-copilot.overrideAttrs {
-    dependencies = with self; [ nvim-cmp copilot-vim ];
+    dependencies = with self; [
+      nvim-cmp
+      copilot-vim
+    ];
+    nvimRequireCheck = "cmp_copilot";
   };
 
   cmp-ctags = super.cmp-ctags.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_ctags";
   };
 
   cmp-dap = super.cmp-dap.overrideAttrs {
-    dependencies = with self; [ nvim-cmp nvim-dap ];
+    dependencies = with self; [
+      nvim-cmp
+      nvim-dap
+    ];
+    nvimRequireCheck = "cmp_dap";
   };
 
   cmp-dictionary = super.cmp-dictionary.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_dictionary";
   };
 
   cmp-digraphs = super.cmp-digraphs.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_digraphs";
   };
 
   cmp-fish = super.cmp-fish.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_fish";
   };
 
   cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs {
-    dependencies = with self; [ nvim-cmp fuzzy-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      fuzzy-nvim
+    ];
+    nvimRequireCheck = "cmp_fuzzy_buffer";
   };
 
   cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs {
-    dependencies = with self; [ nvim-cmp fuzzy-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      fuzzy-nvim
+    ];
+    nvimRequireCheck = "cmp_fuzzy_path";
   };
 
   cmp-git = super.cmp-git.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      plenary-nvim
+    ];
+    nvimRequireCheck = "cmp_git";
   };
 
   cmp-greek = super.cmp-greek.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_greek";
   };
 
   cmp-look = super.cmp-look.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_look";
   };
 
   cmp-neosnippet = super.cmp-neosnippet.overrideAttrs {
-    dependencies = with self; [ nvim-cmp neosnippet-vim ];
+    dependencies = with self; [
+      nvim-cmp
+      neosnippet-vim
+    ];
+    nvimRequireCheck = "cmp_neosnippet";
   };
 
   cmp-npm = super.cmp-npm.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      plenary-nvim
+    ];
+    nvimRequireCheck = "cmp-npm";
   };
 
   cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_nvim_lsp_signature_help";
   };
 
   cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_nvim_tags";
   };
 
   cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
+    dependencies = with self; [
+      nvim-cmp
+      plenary-nvim
+    ];
+    nvimRequireCheck = "cmp_pandoc";
   };
 
   cmp-rg = super.cmp-rg.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp-rg";
   };
 
   cmp-snippy = super.cmp-snippy.overrideAttrs {
-    dependencies = with self; [ nvim-cmp nvim-snippy ];
+    dependencies = with self; [
+      nvim-cmp
+      nvim-snippy
+    ];
+    nvimRequireCheck = "cmp_snippy";
   };
 
   cmp-tabby = super.cmp-tabby.overrideAttrs {
     dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_tabby";
   };
 
   cmp-tabnine = super.cmp-tabnine.overrideAttrs {
     buildInputs = [ tabnine ];
+    dependencies = with self; [ nvim-cmp ];
 
     postFixup = ''
       mkdir -p $target/binaries/${tabnine.version}
       ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
     '';
+    nvimRequireCheck = "cmp_tabnine";
   };
 
   cmp-tmux = super.cmp-tmux.overrideAttrs {
-    dependencies = with self; [ nvim-cmp tmux ];
+    dependencies = with self; [
+      nvim-cmp
+      tmux
+    ];
+    nvimRequireCheck = "cmp_tmux";
   };
 
   cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs {
-    dependencies = with self; [ nvim-cmp vim-lsp ];
+    dependencies = with self; [
+      nvim-cmp
+      vim-lsp
+    ];
   };
 
   cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
-    dependencies = with self; [ nvim-cmp vimwiki ];
+    dependencies = with self; [
+      nvim-cmp
+      vimwiki
+    ];
+    nvimRequireCheck = "cmp_vimwiki_tags";
   };
 
   cmp-zsh = super.cmp-zsh.overrideAttrs {
-    dependencies = with self; [ nvim-cmp zsh ];
+    dependencies = with self; [
+      nvim-cmp
+      zsh
+    ];
+    nvimRequireCheck = "cmp_zsh";
   };
 
   coc-clangd = buildVimPlugin {
@@ -382,79 +478,89 @@ in
     src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx";
   };
 
-  codeium-nvim = let
-    # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
-    codeiumVersion = "1.20.9";
-    codeiumHashes = {
-      x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
-      aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
-      x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
-      aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
-    };
-
-    codeium' = codeium.overrideAttrs rec {
-      version = codeiumVersion;
-
-      src = let
-        inherit (stdenv.hostPlatform) system;
-        throwSystem = throw "Unsupported system: ${system}";
-
-        platform = {
-          x86_64-linux = "linux_x64";
-          aarch64-linux = "linux_arm";
-          x86_64-darwin = "macos_x64";
-          aarch64-darwin = "macos_arm";
-        }.${system} or throwSystem;
-
-        hash = codeiumHashes.${system} or throwSystem;
-      in fetchurl {
-        name = "codeium-${version}.gz";
-        url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz";
-        inherit hash;
+  codeium-nvim =
+    let
+      # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
+      codeiumVersion = "1.20.9";
+      codeiumHashes = {
+        x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
+        aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
+        x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
+        aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
       };
-    };
 
-  in super.codeium-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-cmp plenary-nvim ];
-    buildPhase = ''
-      cat << EOF > lua/codeium/installation_defaults.lua
-      return {
-        tools = {
-          language_server = "${codeium'}/bin/codeium_language_server"
+      codeium' = codeium.overrideAttrs rec {
+        version = codeiumVersion;
+
+        src =
+          let
+            inherit (stdenv.hostPlatform) system;
+            throwSystem = throw "Unsupported system: ${system}";
+
+            platform =
+              {
+                x86_64-linux = "linux_x64";
+                aarch64-linux = "linux_arm";
+                x86_64-darwin = "macos_x64";
+                aarch64-darwin = "macos_arm";
+              }
+              .${system} or throwSystem;
+
+            hash = codeiumHashes.${system} or throwSystem;
+          in
+          fetchurl {
+            name = "codeium-${version}.gz";
+            url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz";
+            inherit hash;
+          };
+      };
+
+    in
+    super.codeium-nvim.overrideAttrs {
+      dependencies = with self; [
+        nvim-cmp
+        plenary-nvim
+      ];
+      buildPhase = ''
+        cat << EOF > lua/codeium/installation_defaults.lua
+        return {
+          tools = {
+            language_server = "${codeium'}/bin/codeium_language_server"
+          };
         };
-      };
-      EOF
-    '';
+        EOF
+      '';
 
-    doCheck = true;
-    checkInputs = [ jq ];
-    checkPhase = ''
-      runHook preCheck
+      doCheck = true;
+      checkInputs = [ jq ];
+      checkPhase = ''
+        runHook preCheck
 
-      expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
-      actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version)
+        expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
+        actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version)
 
-      expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
-      actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
+        expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
+        actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
 
-      if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
-        echo "
-      The version of codeium patched in vimPlugins.codeium-nvim is incorrect.
-      Expected stamp: $expected_codeium_stamp
-      Actual stamp: $actual_codeium_stamp
+        if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
+          echo "
+        The version of codeium patched in vimPlugins.codeium-nvim is incorrect.
+        Expected stamp: $expected_codeium_stamp
+        Actual stamp: $actual_codeium_stamp
 
-      Expected codeium version: $expected_codeium_version
-      Actual codeium version: $actual_codeium_version
+        Expected codeium version: $expected_codeium_version
+        Actual codeium version: $actual_codeium_version
 
-      Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to:
-      https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
-        "
-        exit 1
-      fi
+        Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to:
+        https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
+          "
+          exit 1
+        fi
 
-      runHook postCheck
-    '';
-  };
+        runHook postCheck
+      '';
+      nvimRequireCheck = "codeium";
+    };
 
   codesnap-nvim =
     let
@@ -478,11 +584,13 @@ in
           rustPlatform.bindgenHook
         ];
 
-        buildInputs = [
-          libuv.dev
-        ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          darwin.apple_sdk.frameworks.AppKit
-        ];
+        buildInputs =
+          [
+            libuv.dev
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isDarwin [
+            darwin.apple_sdk.frameworks.AppKit
+          ];
       };
     in
     buildVimPlugin {
@@ -493,12 +601,14 @@ in
       # - Copy the resulting binary from the codesnap-lib derivation
       # Note: the destination should be generator.so, even on darwin
       # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh
-      postInstall = let
-        extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
-      in ''
-        rm -r $out/lua/*.so
-        cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so
-      '';
+      postInstall =
+        let
+          extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
+        in
+        ''
+          rm -r $out/lua/*.so
+          cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so
+        '';
 
       doInstallCheck = true;
       nvimRequireCheck = "codesnap";
@@ -510,7 +620,10 @@ in
     };
 
   command-t = super.command-t.overrideAttrs {
-    nativeBuildInputs = [ getconf ruby ];
+    nativeBuildInputs = [
+      getconf
+      ruby
+    ];
     buildPhase = ''
       substituteInPlace lua/wincent/commandt/lib/Makefile \
         --replace '/bin/bash' 'bash' \
@@ -518,6 +631,7 @@ in
       make build
       rm ruby/command-t/ext/command-t/*.o
     '';
+    nvimRequireCheck = "wincent.commandt";
   };
 
   competitest-nvim = super.competitest-nvim.overrideAttrs {
@@ -538,6 +652,7 @@ in
 
   compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "compiler-explorer";
   };
 
   compiler-nvim = super.compiler-nvim.overrideAttrs {
@@ -547,6 +662,7 @@ in
 
   completion-buffers = super.completion-buffers.overrideAttrs {
     dependencies = with self; [ completion-nvim ];
+    nvimRequireCheck = "completion_buffers";
   };
 
   completion-tabnine = super.completion-tabnine.overrideAttrs {
@@ -559,15 +675,25 @@ in
   };
 
   completion-treesitter = super.completion-treesitter.overrideAttrs {
-    dependencies = with self; [ completion-nvim nvim-treesitter ];
+    dependencies = with self; [
+      completion-nvim
+      nvim-treesitter
+    ];
   };
 
   CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs {
-    dependencies = with self; [ copilot-lua plenary-nvim ];
+    dependencies = with self; [
+      copilot-lua
+      plenary-nvim
+    ];
+    nvimRequireCheck = "CopilotChat";
   };
 
   copilot-lualine = super.copilot-lualine.overrideAttrs {
-    dependencies = with self; [ copilot-lua lualine-nvim ];
+    dependencies = with self; [
+      copilot-lua
+      lualine-nvim
+    ];
     doInstallCheck = true;
     nvimRequireCheck = "copilot-lualine";
   };
@@ -585,8 +711,8 @@ in
   });
 
   coq_nvim = super.coq_nvim.overrideAttrs {
-    passthru.python3Dependencies = ps:
-      with ps; [
+    passthru.python3Dependencies =
+      ps: with ps; [
         pynvim-pp
         pyyaml
         std2
@@ -594,6 +720,7 @@ in
 
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/coq_nvim/emulate-venv.patch ];
+    nvimRequireCheck = "coq";
   };
 
   cord-nvim =
@@ -612,11 +739,13 @@ in
 
         cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc=";
 
-        installPhase = let
-          cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget;
-        in ''
-          install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension}
-        '';
+        installPhase =
+          let
+            cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget;
+          in
+          ''
+            install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension}
+          '';
       };
     in
     buildVimPlugin {
@@ -671,6 +800,7 @@ in
 
   crates-nvim = super.crates-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "crates";
   };
 
   ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs {
@@ -688,7 +818,10 @@ in
         sha256 = "sha256-yXKCq8sqO0Db/sZREuSeqKwKO71cmTsAvWftoOQehZo=";
       })
     ];
-    buildInputs = with python3.pkgs; [ python3 setuptools ];
+    buildInputs = with python3.pkgs; [
+      python3
+      setuptools
+    ];
     buildPhase = ''
       patchShebangs .
       ./install.sh
@@ -701,6 +834,7 @@ in
 
   ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
     dependencies = with self; [ ddc-vim ];
+    nvimRequireCheck = "ddc_source_lsp";
   };
 
   ddc-vim = super.ddc-vim.overrideAttrs {
@@ -716,7 +850,10 @@ in
   };
 
   ddc-ui-pum = super.ddc-ui-pum.overrideAttrs {
-    dependencies = with self; [ ddc-vim pum-vim ];
+    dependencies = with self; [
+      ddc-vim
+      pum-vim
+    ];
   };
 
   defx-nvim = super.defx-nvim.overrideAttrs {
@@ -731,7 +868,10 @@ in
   };
 
   deoplete-fish = super.deoplete-fish.overrideAttrs {
-    dependencies = with self; [ deoplete-nvim vim-fish ];
+    dependencies = with self; [
+      deoplete-nvim
+      vim-fish
+    ];
   };
 
   deoplete-go = super.deoplete-go.overrideAttrs {
@@ -757,6 +897,7 @@ in
 
   diagram-nvim = super.diagram-nvim.overrideAttrs {
     dependencies = with self; [ image-nvim ];
+    nvimRequireCheck = "diagram";
   };
 
   diffview-nvim = super.diffview-nvim.overrideAttrs {
@@ -768,8 +909,7 @@ in
 
   direnv-vim = super.direnv-vim.overrideAttrs (old: {
     preFixup =
-      old.preFixup
-        or ""
+      old.preFixup or ""
       + ''
         substituteInPlace $out/autoload/direnv.vim \
           --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
@@ -778,13 +918,16 @@ in
   });
 
   elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
     fixupPhase = ''
       patchShebangs $(find $out/bin/ -type f -not -name credo-language-server)
     '';
+    nvimRequireCheck = "elixir";
   };
 
   executor-nvim = super.executor-nvim.overrideAttrs {
     dependencies = with self; [ nui-nvim ];
+    nvimRequireCheck = "executor";
   };
 
   fcitx-vim = super.fcitx-vim.overrideAttrs {
@@ -797,6 +940,7 @@ in
 
   flit-nvim = super.flit-nvim.overrideAttrs {
     dependencies = with self; [ leap-nvim ];
+    nvimRequireCheck = "flit";
   };
 
   forms = super.forms.overrideAttrs {
@@ -840,6 +984,7 @@ in
 
   fuzzy-nvim = super.fuzzy-nvim.overrideAttrs {
     dependencies = with self; [ telescope-fzf-native-nvim ];
+    nvimRequireCheck = "fuzzy_nvim";
   };
 
   fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs {
@@ -867,6 +1012,8 @@ in
 
   fzf-lua = super.fzf-lua.overrideAttrs {
     propagatedBuildInputs = [ fzf ];
+    # FIXME: address already in use
+    # nvimRequireCheck = "fzf-lua";
   };
 
   fzf-vim = super.fzf-vim.overrideAttrs {
@@ -890,22 +1037,29 @@ in
 
   gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "gitlinker";
   };
 
   gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "gitsigns";
   };
 
   git-worktree-nvim = super.git-worktree-nvim.overrideAttrs {
     dependencies = with super; [ plenary-nvim ];
+    nvimRequireCheck = "git-worktree";
   };
 
   guard-nvim = super.guard-nvim.overrideAttrs {
     dependencies = with self; [ guard-collection ];
+    nvimRequireCheck = "guard";
   };
 
   hardhat-nvim = super.hardhat-nvim.overrideAttrs {
-    dependencies = with self; [ overseer-nvim plenary-nvim ];
+    dependencies = with self; [
+      overseer-nvim
+      plenary-nvim
+    ];
 
     doInstallCheck = true;
     nvimRequireCheck = "hardhat";
@@ -913,26 +1067,34 @@ in
 
   harpoon = super.harpoon.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "harpoon";
   };
 
   harpoon2 = super.harpoon2.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "harpoon";
   };
 
   haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
     dependencies = [ self.luasnip ];
+    nvimRequireCheck = "haskell-snippets";
   };
 
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
+    nvimRequireCheck = "haskell-scope-highlighting";
   };
 
-  haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; };
+  haskell-tools-nvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.haskell-tools-nvim;
+    nvimRequireCheck = "haskell-tools";
+  };
 
   hex-nvim = super.hex-nvim.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd
     '';
+    nvimRequireCheck = "hex";
   };
 
   himalaya-vim = super.himalaya-vim.overrideAttrs {
@@ -955,7 +1117,10 @@ in
   };
 
   idris2-nvim = super.idris2-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim nvim-lspconfig ];
+    dependencies = with self; [
+      nui-nvim
+      nvim-lspconfig
+    ];
 
     doInstallCheck = true;
     nvimRequireCheck = "idris2";
@@ -994,6 +1159,7 @@ in
 
   jupytext-nvim = super.jupytext-nvim.overrideAttrs {
     passthru.python3Dependencies = ps: [ ps.jupytext ];
+    nvimRequireCheck = "jupytext";
   };
 
   kulala-nvim = super.kulala-nvim.overrideAttrs {
@@ -1006,6 +1172,7 @@ in
       substituteInPlace lua/kulala/config/init.lua \
         --replace 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'
     '';
+    nvimRequireCheck = "kulala";
   };
 
   LanguageClient-neovim =
@@ -1047,18 +1214,28 @@ in
 
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
     dependencies = with self; [ nvim-lspconfig ];
+    nvimRequireCheck = "lazy-lsp";
   };
 
   lazy-nvim = super.lazy-nvim.overrideAttrs {
     patches = [ ./patches/lazy-nvim/no-helptags.patch ];
+    nvimRequireCheck = "lazy";
   };
 
   lean-nvim = super.lean-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig plenary-nvim ];
+    dependencies = with self; [
+      nvim-lspconfig
+      plenary-nvim
+    ];
+    nvimRequireCheck = "lean";
   };
 
   leap-ast-nvim = super.leap-ast-nvim.overrideAttrs {
-    dependencies = with self; [ leap-nvim nvim-treesitter ];
+    dependencies = with self; [
+      leap-nvim
+      nvim-treesitter
+    ];
+    nvimRequireCheck = "leap-ast";
   };
 
   lens-vim = super.lens-vim.overrideAttrs {
@@ -1079,6 +1256,7 @@ in
 
   lir-nvim = super.lir-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "lir";
   };
 
   lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
@@ -1087,14 +1265,24 @@ in
   };
 
   luasnip = super.luasnip.overrideAttrs {
-    dependencies = with self; [ luaPackages.jsregexp ];
+    dependencies = [ luaPackages.jsregexp ];
+    nvimRequireCheck = "luasnip";
   };
 
-  lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; };
+  lz-n = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.lz-n;
+    nvimRequireCheck = "lz.n";
+  };
 
-  lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; };
+  lze = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.lze;
+    nvimRequireCheck = "lze";
+  };
 
-  lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; };
+  lzn-auto-require = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.lzn-auto-require;
+    nvimRequireCheck = "lzn-auto-require.loader";
+  };
 
   magma-nvim-goose = buildVimPlugin {
     pname = "magma-nvim-goose";
@@ -1105,8 +1293,8 @@ in
       rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
       sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja";
     };
-    passthru.python3Dependencies = ps:
-      with ps; [
+    passthru.python3Dependencies =
+      ps: with ps; [
         pynvim
         jupyter-client
         ueberzug
@@ -1152,11 +1340,16 @@ in
     };
 
   mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs {
-    dependencies = with self; [ mason-nvim nvim-lspconfig ];
+    dependencies = with self; [
+      mason-nvim
+      nvim-lspconfig
+    ];
+    nvimRequireCheck = "mason-lspconfig";
   };
 
   mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs {
     dependencies = with self; [ mason-nvim ];
+    nvimRequireCheck = "mason-tool-installer";
   };
 
   meson = buildVimPlugin {
@@ -1194,44 +1387,59 @@ in
     meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
   };
 
-  moveline-nvim = let
-    version = "2024-07-25";
-    src = fetchFromGitHub {
-      owner = "willothy";
-      repo = "moveline.nvim";
-      rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8";
-      sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY=";
-    };
-    moveline-lib = rustPlatform.buildRustPackage {
+  moveline-nvim =
+    let
+      version = "2024-07-25";
+      src = fetchFromGitHub {
+        owner = "willothy";
+        repo = "moveline.nvim";
+        rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8";
+        sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY=";
+      };
+      moveline-lib = rustPlatform.buildRustPackage {
+        inherit src version;
+        pname = "moveline-lib";
+        cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU=";
+      };
+    in
+    buildVimPlugin {
       inherit src version;
-      pname = "moveline-lib";
-      cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU=";
+      pname = "moveline-nvim";
+      preInstall = ''
+        mkdir -p lua
+        ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so
+      '';
+      meta = {
+        description = "Neovim plugin for moving lines up and down";
+        homepage = "https://github.com/willothy/moveline.nvim";
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [ redxtech ];
+        badPlatforms = [
+          "aarch64-darwin"
+          "x86_64-darwin"
+        ];
+      };
+      nvimRequireCheck = "moveline";
     };
-  in buildVimPlugin {
-    inherit src version;
-    pname = "moveline-nvim";
-    preInstall = ''
-      mkdir -p lua
-      ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so
-    '';
-    meta = {
-      description = "Neovim plugin for moving lines up and down";
-      homepage = "https://github.com/willothy/moveline.nvim";
-      license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ redxtech ];
-    };
-  };
 
   multicursors-nvim = super.multicursors-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter hydra-nvim ];
+    dependencies = with self; [
+      nvim-treesitter
+      hydra-nvim
+    ];
+    nvimRequireCheck = "multicursors";
   };
 
   ncm2 = super.ncm2.overrideAttrs {
     dependencies = with self; [ nvim-yarp ];
+    nvimRequireCheck = "ncm2";
   };
 
   ncm2-jedi = super.ncm2-jedi.overrideAttrs {
-    dependencies = with self; [ nvim-yarp ncm2 ];
+    dependencies = with self; [
+      nvim-yarp
+      ncm2
+    ];
     passthru.python3Dependencies = ps: with ps; [ jedi ];
   };
 
@@ -1253,6 +1461,7 @@ in
 
   neogit = super.neogit.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "neogit";
   };
 
   neorg = neovimUtils.buildNeovimPlugin {
@@ -1263,55 +1472,76 @@ in
   };
 
   neotest = super.neotest.overrideAttrs {
-    dependencies = with self; [ nvim-nio plenary-nvim ];
+    dependencies = with self; [
+      nvim-nio
+      plenary-nvim
+    ];
+    nvimRequirecheck = "neotest";
   };
 
   neotest-gradle = super.neotest-gradle.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequirecheck = "neotest-gradle";
   };
 
   neotest-gtest = super.neotest-gtest.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
+    nvimRequirecheck = "neotest-gtest";
   };
 
   neotest-playwright = super.neotest-playwright.overrideAttrs {
     dependencies = [ self.telescope-nvim ];
+    nvimRequirecheck = "neotest-playwright";
   };
 
   neotest-golang = super.neotest-golang.overrideAttrs {
     dependencies = [ self.nvim-dap-go ];
+    nvimRequirecheck = "neotest-golang";
   };
 
   neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim nui-nvim ];
+    dependencies = with self; [
+      plenary-nvim
+      nui-nvim
+    ];
+    nvimRequirecheck = "neo-tree";
   };
 
   noice-nvim = super.noice-nvim.overrideAttrs {
     dependencies = with self; [ nui-nvim ];
+    nvimRequirecheck = "noice";
   };
 
   none-ls-nvim = super.none-ls-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
+    nvimRequireCheck = "null-ls";
   };
 
   null-ls-nvim = super.null-ls-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "null-ls";
   };
 
   nvim-coverage = super.nvim-coverage.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "coverage";
   };
 
   nvim-dap-python = super.nvim-dap-python.overrideAttrs {
     dependencies = with self; [ nvim-dap ];
+    nvimRequireCheck = "dap-python";
   };
 
   nvim-dap-rego = super.nvim-dap-rego.overrideAttrs {
     dependencies = with self; [ nvim-dap ];
+    nvimRequireCheck = "dap-rego";
   };
 
   nvim-dap-ui = super.nvim-dap-ui.overrideAttrs {
-    dependencies = with self; [ nvim-dap nvim-nio ];
+    dependencies = with self; [
+      nvim-dap
+      nvim-nio
+    ];
 
     doInstallCheck = true;
     nvimRequireCheck = "dapui";
@@ -1319,6 +1549,7 @@ in
 
   nvim-dap-rr = super.nvim-dap-rr.overrideAttrs {
     dependencies = [ self.nvim-dap ];
+    nvimRequireCheck = "nvim-dap-rr";
   };
 
   nvim-genghis = super.nvim-genghis.overrideAttrs {
@@ -1330,52 +1561,68 @@ in
 
   nvim-lsputils = super.nvim-lsputils.overrideAttrs {
     dependencies = with self; [ popfix ];
+    nvimRequireCheck = "lsputil.codeAction";
   };
 
   nvim-metals = super.nvim-metals.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
     dontBuild = true;
+    nvimRequireCheck = "metals";
   };
 
   nvim-navbuddy = super.nvim-navbuddy.overrideAttrs {
-    dependencies = with self; [ nui-nvim nvim-lspconfig nvim-navic ];
+    dependencies = with self; [
+      nui-nvim
+      nvim-lspconfig
+      nvim-navic
+    ];
+    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
+    # nvimRequireCheck = "nvim-navbuddy";
   };
 
   vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
     passthru.python3Dependencies = [ python3.pkgs.mwclient ];
   };
 
-  nvim-dbee = super.nvim-dbee.overrideAttrs (oa: let
-        dbee-go = buildGoModule {
-          name = "nvim-dbee";
-          src = "${oa.src}/dbee";
-          vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A=";
-          buildInputs = [
-            arrow-cpp
-            duckdb
-          ];
-        };
-      in {
-    dependencies = [ self.nui-nvim ];
+  nvim-dbee = super.nvim-dbee.overrideAttrs (
+    oa:
+    let
+      dbee-go = buildGoModule {
+        name = "nvim-dbee";
+        src = "${oa.src}/dbee";
+        vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A=";
+        buildInputs = [
+          arrow-cpp
+          duckdb
+        ];
+      };
+    in
+    {
+      dependencies = [ self.nui-nvim ];
 
-    # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua
-    postPatch = ''
-      substituteInPlace lua/dbee/install/init.lua \
-        --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"'
-    '';
-
-    preFixup = ''
-      mkdir $target/bin
-      ln -s ${dbee-go}/bin/dbee $target/bin/dbee
+      # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua
+      postPatch = ''
+        substituteInPlace lua/dbee/install/init.lua \
+          --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"'
       '';
 
-    meta.platforms = lib.platforms.linux;
-  });
+      preFixup = ''
+        mkdir $target/bin
+        ln -s ${dbee-go}/bin/dbee $target/bin/dbee
+      '';
+
+      meta.platforms = lib.platforms.linux;
+      nvimRequireCheck = "dbee";
+    }
+  );
 
   nvim-navic = super.nvim-navic.overrideAttrs {
-    dependencies =  [ self.nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
+    nvimRequireCheck = "nvim-navic";
   };
 
-  nvim-spectre = super.nvim-spectre.overrideAttrs (old:
+  nvim-spectre = super.nvim-spectre.overrideAttrs (
+    old:
     let
       spectre_oxi = rustPlatform.buildRustPackage {
         pname = "spectre_oxi";
@@ -1395,12 +1642,13 @@ in
       };
     in
     {
-      dependencies = with self;
-        [ plenary-nvim ];
+      dependencies = with self; [ plenary-nvim ];
       postInstall = ''
         ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so
       '';
-    });
+      nvimRequireCheck = "spectre";
+    }
+  );
 
   nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
     postPatch = ''
@@ -1413,22 +1661,30 @@ in
   nvim-treesitter = super.nvim-treesitter.overrideAttrs (
     callPackage ./nvim-treesitter/overrides.nix { } self super
   );
+
   nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins;
 
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = with self; [ promise-async ];
+    nvimRequireCheck = "ufo";
   };
 
   obsidian-nvim = super.obsidian-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "obsidian";
   };
 
   octo-nvim = super.octo-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim plenary-nvim ];
+    dependencies = with self; [
+      telescope-nvim
+      plenary-nvim
+    ];
+    nvimRequireCheck = "octo";
   };
 
   ollama-nvim = super.ollama-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
+    nvimRequireCheck = "ollama";
   };
 
   onehalf = super.onehalf.overrideAttrs {
@@ -1438,8 +1694,14 @@ in
   # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we
   # avoid choosing one of them and leave it to the user
   openscad-nvim = super.openscad-nvim.overrideAttrs {
-    buildInputs = [ zathura htop openscad ];
+    buildInputs = [
+      zathura
+      htop
+      openscad
+    ];
 
+    # FIXME: cant find plugin root dir
+    # nvimRequireCheck = "openscad";
     patches = [
       (substituteAll {
         src = ./patches/openscad.nvim/program_paths.patch;
@@ -1452,10 +1714,12 @@ in
 
   orgmode = super.orgmode.overrideAttrs {
     dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];
+    nvimRequireCheck = "orgmode";
   };
 
   otter-nvim = super.otter-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
+    nvimRequirecheck = "otter";
   };
 
   overseer-nvim = super.overseer-nvim.overrideAttrs {
@@ -1471,12 +1735,18 @@ in
 
       runHook postCheck
     '';
+    nvimRequireCheck = "overseer";
   };
 
   inherit parinfer-rust;
 
   phpactor = buildVimPlugin {
-    inherit (phpactor) pname src meta version;
+    inherit (phpactor)
+      pname
+      src
+      meta
+      version
+      ;
     postPatch = ''
       substituteInPlace plugin/phpactor.vim \
         --replace "g:phpactorpath = expand('<sfile>:p:h') . '/..'" "g:phpactorpath = '${phpactor}'"
@@ -1488,6 +1758,7 @@ in
       # we need the 'query' grammer to make
       (nvim-treesitter.withPlugins (p: [ p.query ]))
     ];
+    nvimRequireCheck = "nvim-treesitter-playground";
   };
 
   plenary-nvim = super.plenary-nvim.overrideAttrs {
@@ -1511,6 +1782,7 @@ in
 
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = with self; [ cmd-parser-nvim ];
+    nvimRequireCheck = "range-highlight";
   };
 
   ranger-nvim = super.ranger-nvim.overrideAttrs {
@@ -1519,6 +1791,7 @@ in
     postPatch = ''
       substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}/bin/ranger
     '';
+    nvimRequireCheck = "ranger-nvim";
   };
 
   aider-nvim = super.aider-nvim.overrideAttrs {
@@ -1528,33 +1801,56 @@ in
       substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider
       substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider
     '';
+    nvimRequireCheck = "aider";
   };
 
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter plenary-nvim ];
+    dependencies = with self; [
+      nvim-treesitter
+      plenary-nvim
+    ];
+    nvimRequireCheck = "refactoring";
   };
 
   # needs  "http" and "json" treesitter grammars too
   rest-nvim = super.rest-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
-      (nvim-treesitter.withPlugins (p: [ p.http p.json ]))
+      (nvim-treesitter.withPlugins (p: [
+        p.http
+        p.json
+      ]))
     ];
+    nvimRequireCheck = "rest-nvim";
   };
 
-  rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; };
+  rocks-nvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.rocks-nvim;
+    nvimRequireCheck = "rocks";
+  };
 
-  rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; };
+  rocks-config-nvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.rocks-config-nvim;
+    nvimRequireCheck = "rocks-config";
+  };
 
   roslyn-nvim = super.roslyn-nvim.overrideAttrs {
     dependencies = with self; [ nvim-lspconfig ];
+    nvimRequireCheck = "roslyn";
   };
 
-  rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; };
+  rtp-nvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.rtp-nvim;
+    nvimRequireCheck = "rtp_nvim";
+  };
 
-  rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rustaceanvim; };
+  rustaceanvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.rustaceanvim;
+    nvimRequireCheck = "rustaceanvim";
+  };
 
-  sg-nvim = super.sg-nvim.overrideAttrs (old:
+  sg-nvim = super.sg-nvim.overrideAttrs (
+    old:
     let
       sg-nvim-rust = rustPlatform.buildRustPackage {
         pname = "sg-nvim-rust";
@@ -1589,7 +1885,9 @@ in
         mkdir -p $out/target/debug
         ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
       '';
-    });
+      nvimRequireCheck = "sg";
+    }
+  );
 
   skim = buildVimPlugin {
     pname = "skim";
@@ -1602,7 +1900,10 @@ in
   };
 
   smart-open-nvim = super.smart-open-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim sqlite-lua ];
+    dependencies = with self; [
+      telescope-nvim
+      sqlite-lua
+    ];
   };
 
   sniprun =
@@ -1628,7 +1929,16 @@ in
 
         postInstall = ''
           wrapProgram $out/bin/sniprun \
-            --prefix PATH ${lib.makeBinPath [bashInteractive coreutils curl gnugrep gnused procps]}
+            --prefix PATH ${
+              lib.makeBinPath [
+                bashInteractive
+                coreutils
+                curl
+                gnugrep
+                gnused
+                procps
+              ]
+            }
         '';
 
         doCheck = false;
@@ -1650,6 +1960,7 @@ in
         changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md";
         maintainers = with lib.maintainers; [ GaetanLepage ];
       };
+      nvimRequireCheck = "sniprun";
     };
 
   # The GitHub repository returns 404, which breaks the update script
@@ -1675,17 +1986,19 @@ in
           --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
       '';
 
-      passthru = oa.passthru // {
-        initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"'';
-      };
+    passthru = oa.passthru // {
+      initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"'';
+    };
   });
 
   ssr = super.ssr-nvim.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
+    nvimRequireCheck = "ssr";
   };
 
   startup-nvim = super.startup-nvim.overrideAttrs {
     dependencies = with super; [ plenary-nvim ];
+    nvimRequireCheck = "startup";
   };
 
   statix = buildVimPlugin rec {
@@ -1708,6 +2021,7 @@ in
       substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
       substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
     '';
+    nvimRequireCheck = "stylish";
   };
 
   sved =
@@ -1716,10 +2030,19 @@ in
       svedbackend = stdenv.mkDerivation {
         name = "svedbackend-${super.sved.name}";
         inherit (super.sved) src;
-        nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
+        nativeBuildInputs = [
+          wrapGAppsHook3
+          gobject-introspection
+        ];
         buildInputs = [
           glib
-          (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ]))
+          (python3.withPackages (
+            ps: with ps; [
+              pygobject3
+              pynvim
+              dbus-python
+            ]
+          ))
         ];
         preferLocalBuild = true;
         installPhase = ''
@@ -1727,12 +2050,14 @@ in
         '';
       };
       # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper
-      pythonWrapper = writeText "evinceSync-wrapper.py" /* python */ ''
-        #!${python3}/bin/python3
-        import os
-        import sys
-        os.execv("${svedbackend}/bin/evinceSync.py", sys.argv)
-      '';
+      pythonWrapper =
+        writeText "evinceSync-wrapper.py" # python
+          ''
+            #!${python3}/bin/python3
+            import os
+            import sys
+            os.execv("${svedbackend}/bin/evinceSync.py", sys.argv)
+          '';
     in
     super.sved.overrideAttrs {
       preferLocalBuild = true;
@@ -1748,6 +2073,7 @@ in
   syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
     meta.maintainers = with lib.maintainers; [ callumio ];
+    nvimRequireCheck = "syntax-tree-surfer";
   };
 
   taskwarrior3 = buildVimPlugin {
@@ -1761,11 +2087,17 @@ in
   };
 
   telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {
-    dependencies = with self; [ sqlite-lua telescope-nvim ];
+    dependencies = with self; [
+      sqlite-lua
+      telescope-nvim
+    ];
   };
 
   telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs {
-    dependencies = with self; [ sqlite-lua telescope-nvim ];
+    dependencies = with self; [
+      sqlite-lua
+      telescope-nvim
+    ];
   };
 
   telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs {
@@ -1803,7 +2135,11 @@ in
   });
 
   telescope-media-files-nvim = super.telescope-media-files-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim popup-nvim plenary-nvim ];
+    dependencies = with self; [
+      telescope-nvim
+      popup-nvim
+      plenary-nvim
+    ];
   };
 
   telescope-nvim = super.telescope-nvim.overrideAttrs {
@@ -1840,6 +2176,7 @@ in
 
   tssorter-nvim = super.tssorter-nvim.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
+    nvimRequireCheck = "tssorter";
   };
 
   tup =
@@ -1861,7 +2198,11 @@ in
     };
 
   typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig plenary-nvim ];
+    dependencies = with self; [
+      nvim-lspconfig
+      plenary-nvim
+    ];
+    nvimRequireCheck = "typescript-tools";
   };
 
   unicode-vim =
@@ -1900,7 +2241,10 @@ in
   };
 
   vim-addon-actions = super.vim-addon-actions.overrideAttrs {
-    dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
+    dependencies = with self; [
+      vim-addon-mw-utils
+      tlib_vim
+    ];
   };
 
   vim-addon-async = super.vim-addon-async.overrideAttrs {
@@ -1924,7 +2268,10 @@ in
   };
 
   vim-addon-mru = super.vim-addon-mru.overrideAttrs {
-    dependencies = with self; [ vim-addon-other vim-addon-mw-utils ];
+    dependencies = with self; [
+      vim-addon-other
+      vim-addon-mw-utils
+    ];
   };
 
   vim-addon-nix = super.vim-addon-nix.overrideAttrs {
@@ -1939,19 +2286,34 @@ in
   };
 
   vim-addon-sql = super.vim-addon-sql.overrideAttrs {
-    dependencies = with self; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
+    dependencies = with self; [
+      vim-addon-completion
+      vim-addon-background-cmd
+      tlib_vim
+    ];
   };
 
   vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs {
-    dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
+    dependencies = with self; [
+      vim-addon-mw-utils
+      tlib_vim
+    ];
   };
 
   vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs {
-    dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
+    dependencies = with self; [
+      vim-addon-mw-utils
+      tlib_vim
+    ];
   };
 
   vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs {
-    dependencies = with self; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
+    dependencies = with self; [
+      webapi-vim
+      vim-addon-mw-utils
+      vim-addon-signs
+      vim-addon-async
+    ];
   };
 
   vim-agda = super.vim-agda.overrideAttrs {
@@ -2120,7 +2482,10 @@ in
   };
 
   vim-snipmate = super.vim-snipmate.overrideAttrs {
-    dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
+    dependencies = with self; [
+      vim-addon-mw-utils
+      tlib_vim
+    ];
   };
 
   vim-speeddating = super.vim-speeddating.overrideAttrs {
@@ -2129,8 +2494,7 @@ in
 
   vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
     postPatch =
-      old.postPatch
-        or ""
+      old.postPatch or ""
       + ''
         substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \
           'g:stylish_haskell_command = "stylish-haskell"' \
@@ -2250,16 +2614,23 @@ in
   };
 
   vim-zettel = super.vim-zettel.overrideAttrs {
-    dependencies = with self; [ vimwiki fzf-vim ];
+    dependencies = with self; [
+      vimwiki
+      fzf-vim
+    ];
   };
 
   windows-nvim = super.windows-nvim.overrideAttrs {
-    dependencies = with self; [ middleclass animation-nvim ];
+    dependencies = with self; [
+      middleclass
+      animation-nvim
+    ];
     nvimRequireCheck = "windows";
   };
 
   wtf-nvim = super.wtf-nvim.overrideAttrs {
     dependencies = with self; [ nui-nvim ];
+    nvimRequireCheck = "wtf";
   };
 
   YankRing-vim = super.YankRing-vim.overrideAttrs {
@@ -2268,6 +2639,7 @@ in
 
   yazi-nvim = super.yazi-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
+    nvimRequireCheck = "yazi";
   };
 
   YouCompleteMe = super.YouCompleteMe.overrideAttrs {
@@ -2284,7 +2656,10 @@ in
       description = "Code-completion engine for Vim";
       homepage = "https://github.com/Valloric/YouCompleteMe";
       license = licenses.gpl3;
-      maintainers = with maintainers; [ marcweber jagajaga ];
+      maintainers = with maintainers; [
+        marcweber
+        jagajaga
+      ];
       platforms = platforms.unix;
     };
   };
@@ -2310,7 +2685,7 @@ in
     stripDebugList = [ "autoload/leaderf/python" ];
   };
 }
-  // (
+// (
   let
     nodePackageNames = [
       "coc-cmake"
@@ -2360,7 +2735,8 @@ in
       "coc-yaml"
       "coc-yank"
     ];
-    nodePackage2VimPackage = name:
+    nodePackage2VimPackage =
+      name:
       buildVimPlugin {
         pname = name;
         inherit (nodePackages.${name}) version meta;
diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 73e603bbde85..d1dcbafac6d1 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-PcCZkY1+ks9J5JaDJLVgiJuXgRxIvUZHI00gatjeVbA=";
+    hash = "sha256-CQVujtl1SFcUmEG7O1cvN2gr6v3kcWMMZz+oYEkclKI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 54a1a98ad7c6..c0797da3bf53 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf";
-    x86_64-darwin = "10k4qgck48xh12xq80y8x3jf9qp5fn15n995mn8gbid39907ars0";
-    aarch64-linux = "0jk33jw5rj98qr6fhi4r3vz5f1673m5v1g28jdyn3prs20hp0msg";
-    aarch64-darwin = "1sw39iyz5m0hdy875b3ygzvpl7vz9j3d1w6fpmf30a3iyl3ndh66";
-    armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj";
+    x86_64-linux = "0wx0jjckyz2hxas3108m9l2nm8vlgxh8rc9g673g9a43zzg98prf";
+    x86_64-darwin = "1s56qd9ycqnm4fxg4c75cfjxy0hpn762f84l4gg2054yic7c3s2v";
+    aarch64-linux = "070wj6h5riv9vp73np9k9qk85y26wj22626jafvss0zjkdjrrhgh";
+    aarch64-darwin = "09pl31zplrixi828yxqyl1khyxp3mw4d3gsfrj1dz62rxbnahmq6";
+    armv7l-linux = "1sqidmzdyrxgskylhyi1xav7apq0f8ca9qz0g7svcy5jn1wk855f";
   }.${system} or throwSystem;
 
   sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.93.1.24256";
+    version = "1.94.0.24282";
     pname = "vscodium";
 
     executableName = "codium";
diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix
index 7c9d4298cb7b..88f0a64df13a 100644
--- a/pkgs/applications/graphics/curtail/default.nix
+++ b/pkgs/applications/graphics/curtail/default.nix
@@ -20,14 +20,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "curtail";
-  version = "1.10.0";
+  version = "1.11.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Huluti";
     repo = "Curtail";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-xwpjyMMdjYMrd79/EzoNae4rQuq2VjwJRNoudNGD78E=";
+    sha256 = "sha256-bN901v2M644EN7tBKN9/kv12AE2XuIPjDSCoohfevFI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 4c2ee8a3c357..5d437695be93 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,11 +1,11 @@
 {
   stable = {
     chromedriver = {
-      hash_darwin = "sha256-cWY8P3D+PrIlbEdMYPp+4cFQZfOLbGeebC1Glg53Sx4=";
+      hash_darwin = "sha256-/0mBZCSNULvZSQ/irsQSgNPsuOSWiRRnJA/6ogHYeGk=";
       hash_darwin_aarch64 =
-        "sha256-Tu11SCTlB+8/ao0uS7AbknB5WuvN+cw/gHiyL6xKH1o=";
-      hash_linux = "sha256-Da+xaXNNP8eRccq87LBxMb+2oXJ4WRGLdWoCAhG2yAQ=";
-      version = "129.0.6668.89";
+        "sha256-JWcYFYaaXM2KN6oSu7wwxztYPbhql2XYZlvL2ymKgwI=";
+      hash_linux = "sha256-odFoTWjDa9ilyOrQ0T+0xxedRD7YOe/s7xdAyyku74w=";
+      version = "129.0.6668.91";
     };
     deps = {
       gn = {
@@ -15,8 +15,8 @@
         version = "2024-08-19";
       };
     };
-    hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII=";
-    version = "129.0.6668.89";
+    hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA=";
+    version = "129.0.6668.100";
   };
   ungoogled-chromium = {
     deps = {
diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 08a45eddd14f..66303b7cceff 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -57,6 +57,9 @@
       maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
       license = lib.licenses.mpl20;
       mainProgram = "floorp";
+      knownVulnerabilities = [
+        "CVE-2024-9680"
+      ];
     };
     tests = [ nixosTests.floorp ];
   }).override
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 575b93651312..fc7600f56fea 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "130.0-3",
+  "packageVersion": "131.0.2-1",
   "source": {
-    "rev": "130.0-3",
-    "sha256": "0ah6k4637fg3v3l13rk6bw6wxsx0mc41hvi9sld5psbl8l2kyk29"
+    "rev": "131.0.2-1",
+    "sha256": "1knx485kdjv8d0rn5ai1x1jp0403dvxz9m7lpim1y2d2ilyi26x7"
   },
   "firefox": {
-    "version": "130.0",
-    "sha512": "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40"
+    "version": "131.0.2",
+    "sha512": "fb1a1179a8c62de975c93e1ac6f058cb5492e955bbb7ac2d4b83cdd14ba17bdb2450078bd6f626124b14542f3fda9514bea476aaa34ff4f5a2bee6b1625ec963"
   }
 }
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 16c2bcf66cef..336afd89ce3c 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "protonmail-bridge";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-bridge";
     rev = "v${version}";
-    hash = "sha256-rwESt2s/TCAFNkf+JwMa7sfYpRvMT8FoIii4EzR/Z6U=";
+    hash = "sha256-Pup+A637FvsX4dV0G7K/LMB4HCruh5BT1iu4tIXRI7I=";
   };
 
-  vendorHash = "sha256-jmXh53KwzPvmu7RP1F1Ein9/EfJ5m/GGVAqjJVcEVsE=";
+  vendorHash = "sha256-I/OFpEa3aB+qDBS/sbX5WOgrlSyR7aZaQYrsaSVNAAk=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix
index 00aa166d41b0..22713841cccb 100644
--- a/pkgs/applications/radio/cloudlog/default.nix
+++ b/pkgs/applications/radio/cloudlog/default.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.6.15";
+  version = "2.6.16";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-G+PnzyOG/HZ8I66BHdtK0GOUF7ATrTYpzM9sVaSjMDQ=";
+    hash = "sha256-1GdIC1vC/SG9duQkrOXIe24OyIwdLgeEiG7i+KYP8Cs=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix
index 1cef974df577..ac2b0a8f4910 100644
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@@ -34,6 +34,7 @@ buildDotnetModule rec {
     lib.optional withLibsecretSupport libsecret;
   makeWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}"
+    "--inherit-argv0"
   ];
 
   passthru = {
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 96e457b40724..c36ed736176a 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "crosvm";
-  version = "127.0";
+  version = "128.1";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "8fdfed12c960850e9d5e809cfd2a40ce3bdd98d6";
-    hash = "sha256-W0zLYM91xoq9vURgYs2noc9F9RtvoXztIIHMx0HVK5g=";
+    rev = "57702acf01cbd0e560e058dc97d22378d0c49ecc";
+    hash = "sha256-lQStmmTxMC9Iq6vJxJMFIUUtaixJNGuBfAvBo9KKrjU=";
     fetchSubmodules = true;
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-nEJBRlwMqTahaIC9WdtoxGLVfc+U9sJ0ilzLhavcbD0=";
+  cargoHash = "sha256-qKCO9Rkk04HznExgYKJgpssZDjWfhsY2XOBifvtHFos=";
 
   nativeBuildInputs = [
     pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index 9d22cefc461b..ab9f8c5e2340 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -1,5 +1,4 @@
 { lib, stdenv, fetchFromGitHub
-, substituteAll
 , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
 , wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm
 , systemd, libGL, libX11, mesa
@@ -9,24 +8,15 @@
 
 stdenv.mkDerivation rec {
   pname = "cage";
-  version = "0.1.5-unstable-2024-07-29";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "cage-kiosk";
     repo = "cage";
-    rev = "d3fb99d6654325ec46277cfdb589f89316bed701";
-    hash = "sha256-WP0rWO9Wbs/09wTY8IlIUybnVUnwiNdXD9JgsoVG4rM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g=";
   };
 
-  patches = [
-    # TODO: Remove on next stable release.
-    (substituteAll {
-      src = ./inject-git-commit.patch;
-      gitCommit = lib.substring 0 7 src.rev;
-      gitBranch = "master";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];
diff --git a/pkgs/applications/window-managers/cage/inject-git-commit.patch b/pkgs/applications/window-managers/cage/inject-git-commit.patch
deleted file mode 100644
index b1c73f4a0761..000000000000
--- a/pkgs/applications/window-managers/cage/inject-git-commit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 4c0cbe280f..d4479741c8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -68,14 +68,12 @@
- 
- version = '@0@'.format(meson.project_version())
- git = find_program('git', native: true, required: false)
--if git.found()
--  git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
--  git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
--  if git_commit.returncode() == 0 and git_branch.returncode() == 0
-+if true
-+  if true
-     version = '@0@-@1@ (branch \'@2@\')'.format(
-       meson.project_version(),
--      git_commit.stdout().strip(),
--      git_branch.stdout().strip(),
-+      '@gitCommit@'.strip(),
-+      '@gitBranch@'.strip(),
-     )
-   endif
- endif
diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix
index c9b1c9d7c618..e7d7795ed17d 100644
--- a/pkgs/by-name/al/alacarte/package.nix
+++ b/pkgs/by-name/al/alacarte/package.nix
@@ -17,14 +17,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "alacarte";
-  version = "3.52.0";
+  version = "3.54.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "alacarte";
     rev = version;
-    hash = "sha256-SkolSk6RireH3aKkRTUCib/nflqD02PR9uVtXePRHQY=";
+    hash = "sha256-btqSlO0vM4fmoBcxh3mshv0t2oZSxm8Vr26UvH5fVvE=";
   };
 
   format = "other";
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index e2bdedc60f0d..33d0b5aedc5e 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -2,22 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pnpm_8,
+  pnpm,
   nodejs_22,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "astro-language-server";
-  version = "2.14.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "withastro";
     repo = "language-tools";
     rev = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-4GaLyaRUN9qS2U7eSzASB6fSQY2+fWtgfb54uuHjuh4=";
+    hash = "sha256-2MaoW04mX016VIrtfnBX/jzMNCOXE10lSInSyhqot5E=";
   };
 
-  pnpmDeps = pnpm_8.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs)
       pname
       version
@@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspace
       prePnpmInstall
       ;
-    hash = "sha256-q9a4nFPRhR6W/PT1l/Q1799iDmI+WTsudUP8rb8e97g=";
+    hash = "sha256-zCCDlwsKPZQVEYrv85WcMY2JlWgz0tD6iHLSJg1RkRU=";
   };
 
   nativeBuildInputs = [
     nodejs_22
-    pnpm_8.configHook
+    pnpm.configHook
   ];
 
   buildInputs = [ nodejs_22 ];
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 74511b866a38..82a0144e1a58 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -70,7 +70,7 @@ let
       openapi-generator-cli generate -i ./schema.yml \
       -g typescript-fetch -o $out \
       -c ./scripts/api-ts-config.yaml \
-        --additional-properties=npmVersion=${nodejs.pkgs.npm.version} \
+        --additional-properties=npmVersion="$(${lib.getExe' nodejs "npm"} --version)" \
         --git-repo-id authentik --git-user-id goauthentik
       runHook postBuild
     '';
diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix
index 895f3a6ba3de..f16bf84c4f5d 100644
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "circom";
-  version = "2.1.9";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "iden3";
     repo = "circom";
     rev = "v${version}";
-    hash = "sha256-l8204koaKTluYEvk6j9+MokdOqFCq2oExT5P2aW3kzc=";
+    hash = "sha256-OxfqbsxSIy0tLDMfDmdCZeMb2LCSG7I+Vm9RHb7tXFc=";
   };
 
-  cargoHash = "sha256-M4FR/dPLIq1Ps0j1B69khmSl4uRE5wxN4dh3iuO/9A4=";
+  cargoHash = "sha256-KmUTlzRRmtD9vKJmh0MSUQxN8gz4qnp9fLs5Z0Lmypw=";
   doCheck = false;
 
   meta = with lib; {
diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix
index 372ebbce2a50..bbc48a13715a 100644
--- a/pkgs/by-name/cp/cpu-x/package.nix
+++ b/pkgs/by-name/cp/cpu-x/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpu-x";
-  version = "5.0.4";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "X0rg";
     repo = "CPU-X";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo=";
+    hash = "sha256-4wW8elGsU3EhDDMPxa5di01NlB0dJ8MN8TiaIBo2qxo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix
index 359098559bca..085845400af2 100644
--- a/pkgs/by-name/de/delfin/package.nix
+++ b/pkgs/by-name/de/delfin/package.nix
@@ -21,20 +21,20 @@
 
 stdenv.mkDerivation rec {
   pname = "delfin";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "avery42";
     repo = "delfin";
     rev = "v${version}";
-    hash = "sha256-kCPLfGeMsWAjNrtrxUeXaLv1ZkDCfhDl0HLwYDaoMTY=";
+    hash = "sha256-F4ipIOqMS42nXHRSRpzIlTh61g2xjpog7Zmxn6D29nE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-LOW4Gm69e0Cyif3UuzYITy0GMGEgZOHURNxrsZRLdWo=";
+    hash = "sha256-ciw178jBwz4I6I1x6iI45RJ2ITw0JfukLWNyBmE3FZg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix
index ed59d32299fa..c2d54101db63 100644
--- a/pkgs/by-name/ei/eiwd/package.nix
+++ b/pkgs/by-name/ei/eiwd/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eiwd";
-  version = "2.16-1";
+  version = "2.22-1";
 
   src = fetchFromGitHub {
     owner = "illiliti";
     repo = "eiwd";
     rev = finalAttrs.version;
-    hash = "sha256-TQA9aVdXGX2hje7lRQ8T9QDpSTYGpB5cIDlNYsUg/dM=";
+    hash = "sha256-rmkXR4RZbtD6lh8cGrHLWVGTw4fQqP9+Z9qaftG1ld0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 3b5e5ccdf579..e68a58be66e6 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -33,18 +33,18 @@ let
   };
 in buildGoModule rec {
   pname = "gitea";
-  version = "1.22.2";
+  version = "1.22.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${gitea.version}";
-    hash = "sha256-PwA23cbRgw5crzZmngDjAAIODMtguwBCqc9NqWMjF3o=";
+    hash = "sha256-F1vvyf/FE/OIfDjM0CCOef/cXy+GPA+8n1AypE0r6p8=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-rMTKmztQNse/9CK1qFGWmSwqunwh918EvcuIHk6BSTY=";
+  vendorHash = "sha256-iKf4ozCBcTJQ6bm6dX4dd4buVMGNDVF+rLuYkb7Zxw8=";
 
   outputs = [ "out" "data" ];
 
diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix
index 1b5c918bee45..0fafb235b7b6 100644
--- a/pkgs/by-name/hy/hypre/package.nix
+++ b/pkgs/by-name/hy/hypre/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   name = "hypre";
-  version = "2.31.0";
+  version = "2.32.0";
 
   src = fetchFromGitHub {
     owner = "hypre-space";
     repo = "hypre";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-eFOyM3IzQUNm7cSnORA3NrKYotEBmLKC8mi+fcwPMQA=";
+    hash = "sha256-h16+nZ6+GfddfBJDF6sphuZ9Sff++PxW2R58XgJsnsI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
new file mode 100644
index 000000000000..bd03de8f4956
--- /dev/null
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  fetchpatch,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libblake3";
+  version = "1.5.4";
+
+  src = fetchFromGitHub {
+    owner = "BLAKE3-team";
+    repo = "BLAKE3";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-WatbhExS0j2neYsrfbNhYxrckLiXHwQBjctuowtQW+U=";
+  };
+
+  sourceRoot = finalAttrs.src.name + "/c";
+
+  patches = [
+    # Fix pkg-config for absolute CMAKE_INSTALL_*DIR
+    (fetchpatch {
+      url = "https://github.com/BLAKE3-team/BLAKE3/commit/aa3e8ec32a389461babde3789d6ac50ee3c38662.patch";
+      hash = "sha256-V8o85EnRoqYvatqYwdr7h2TBwSOSlKrqfJWPPkQhU+c=";
+      stripLen = 1;
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Official C implementation of BLAKE3";
+    homepage = "https://github.com/BLAKE3-team/BLAKE3/tree/master/c";
+    license = with lib.licenses; [
+      asl20
+      cc0
+    ];
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix
index 80c0875fa69c..221d8092ec6b 100644
--- a/pkgs/by-name/li/librewolf-bin/package.nix
+++ b/pkgs/by-name/li/librewolf-bin/package.nix
@@ -31,5 +31,8 @@ appimageTools.wrapType2 {
     platforms = [ "x86_64-linux" ];
     mainProgram = "librewolf";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    knownVulnerabilities = [
+      "CVE-2024-9680"
+    ];
   };
 }
diff --git a/pkgs/by-name/li/lilipod/package.nix b/pkgs/by-name/li/lilipod/package.nix
index 0185a25c8a48..9d26c94d7bda 100644
--- a/pkgs/by-name/li/lilipod/package.nix
+++ b/pkgs/by-name/li/lilipod/package.nix
@@ -1,8 +1,11 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, stdenv
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+  shadow,
+  util-linux,
 }:
 
 buildGoModule rec {
@@ -18,8 +21,6 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  nativeBuildInputs = [ installShellFiles ];
-
   buildPhase = ''
     runHook preBuild
 
@@ -44,13 +45,6 @@ buildGoModule rec {
     runHook postInstall
   '';
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd lilipod \
-      --bash <($out/bin/lilipod completion bash) \
-      --fish <($out/bin/lilipod completion fish) \
-      --zsh <($out/bin/lilipod completion zsh)
-  '';
-
   meta = {
     description = "Very simple (as in few features) container and image manager";
     longDescription = ''
diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/by-name/me/mediamtx/package.nix
similarity index 79%
rename from pkgs/servers/mediamtx/default.nix
rename to pkgs/by-name/me/mediamtx/package.nix
index 58c3bab2b160..b0cc36acefcd 100644
--- a/pkgs/servers/mediamtx/default.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,26 +15,27 @@ in
 buildGoModule rec {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-DCt0P0DHlWFAQ5i4+7U5+Q2XcCPlSZrlj+Ljcyg/Wj0=";
+    hash = "sha256-aHVSGyrLuLX/RYf1I1dDackmOeU3m24QcwBus4Uly0I=";
   };
 
-  vendorHash = "sha256-YKNNQPEdO8K7Lpm/S86GKD3QcNcyvwZSrBspZJMJ78Y=";
+  vendorHash = "sha256-YpwbFCfI2kfmX3nI1G9OGUv5qpZ/JMis5VyUkqsESZA=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js
+    echo "v${version}" > internal/core/VERSION
   '';
 
+  subPackages = [ "." ];
+
   # Tests need docker
   doCheck = false;
 
-  ldflags = [ "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" ];
-
   passthru.tests = {
     inherit (nixosTests) mediamtx;
   };
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/by-name/mt/mtdutils/package.nix
similarity index 56%
rename from pkgs/tools/filesystems/mtdutils/default.nix
rename to pkgs/by-name/mt/mtdutils/package.nix
index 3214694e5290..15359970cfca 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/by-name/mt/mtdutils/package.nix
@@ -1,17 +1,45 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }:
+{
+  lib,
+  stdenv,
+  fetchgit,
+  autoreconfHook,
+  pkg-config,
+  cmocka,
+  acl,
+  libuuid,
+  lzo,
+  util-linux,
+  zlib,
+  zstd,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mtd-utils";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchgit {
     url = "git://git.infradead.org/mtd-utils.git";
     rev = "v${version}";
-    hash = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc=";
+    hash = "sha256-vGgBOKu+ClmyRZHQkAS8r/YJtZihr/oD/yj8V7DeAQ8=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
-  buildInputs = [ acl libuuid lzo zlib zstd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ] ++ lib.optional doCheck cmocka;
+  buildInputs = [
+    acl
+    libuuid
+    lzo
+    util-linux
+    zlib
+    zstd
+  ];
+
+  postPatch = ''
+    substituteInPlace ubifs-utils/mount.ubifs \
+      --replace-fail "/bin/mount" "${util-linux}/bin/mount"
+  '';
 
   enableParallelBuilding = true;
 
@@ -20,13 +48,14 @@ stdenv.mkDerivation rec {
     (lib.enableFeature doCheck "tests")
   ];
 
-  makeFlags = [
-    "AR:=$(AR)"
-  ];
+  makeFlags = [ "AR:=$(AR)" ];
 
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   postInstall = ''
     mkdir -p $dev/lib
diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix
index 6184aa0ac3ad..f7c33bc22b98 100644
--- a/pkgs/by-name/mu/muffon/package.nix
+++ b/pkgs/by-name/mu/muffon/package.nix
@@ -7,10 +7,10 @@
 
 let
   pname = "muffon";
-  version = "2.0.3";
+  version = "2.1.0";
   src = fetchurl {
     url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage";
-    hash = "sha256-2eLe/xvdWcOcUSE0D+pMOcOYCfFVEyKO13LiaJiZgX0=";
+    hash = "sha256-GT91MLjBWsbk9P5fsIxlYUNziAPsdvMSPq9bLL3rKDw=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname src version; };
 in
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 8c847f3c365b..2dd6f0463833 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -90,7 +90,7 @@ let
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "13.5.6";
+  version = "13.5.7";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -102,7 +102,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-AayGWFfsdAK9Ku4J4nDolJxnQn0HhGeZeEf//9OspWA=";
+      hash = "sha256-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU=";
     };
   };
 
diff --git a/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix
new file mode 100644
index 000000000000..51d448ee808c
--- /dev/null
+++ b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchFromGitHub,
+}:
+let
+  pname = "nitrokey-storage-firmware";
+  version = "0.57";
+
+  src = fetchFromGitHub {
+    owner = "Nitrokey";
+    repo = "nitrokey-storage-firmware";
+    rev = "V${version}";
+    hash = "sha256-u8IK57NVS/IOPIE3Ah/O8WuOIr0EY6AF1bEaeDgIBuk=";
+  };
+
+  toolchain = stdenv.mkDerivation (finalAttrs: {
+    pname = "avr32-toolchain";
+    version = "3.0.0.201009140852";
+
+    src = fetchzip {
+      url = "https://ww1.microchip.com/downloads/archive/avr32studio-ide-2.6.0.753-linux.gtk.x86_64.zip";
+      hash = "sha256-MwsaGyNqbO0lBy1rcczuvKOaGbO3f0V+j84sUCkRlxc=";
+    };
+
+    postPatch = ''
+      cp ${src}/pm_240.h plugins/com.atmel.avr.toolchains.linux.x86_64_${finalAttrs.version}/os/linux/x86_64/avr32/include/avr32/pm_231.h
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r plugins/com.atmel.avr.toolchains.linux.x86_64_${finalAttrs.version}/os/linux/x86_64 $out
+      rm -r $out/avr $out/bin/avr-*
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "AVR32 toolchain";
+      homepage = "https://web.archive.org/web/20210419192039/https://www.microchip.com/mplab/avr-support/avr-and-sam-downloads-archive";
+      # The zip does not explicitly say this,
+      # it only mentions the license(s) of AVR32 Studio.
+      # Because it is very clearly a fork of GCC 4.3.3,
+      # it should be licensed under GPLv2+
+      license = lib.licenses.gpl2Plus;
+      platforms = [ "x86_64-linux" ];
+    };
+  });
+in
+stdenv.mkDerivation {
+  inherit pname version src;
+
+  sourceRoot = "source/src";
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail '$(shell git describe)' "V${version}"
+  '';
+
+  makeFlags = [
+    "CC=${toolchain}/bin/avr32-gcc"
+    "nitrokey-storage-V${version}-reproducible.hex"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -D nitrokey-storage-V${version}-reproducible.hex $out/nitrokey-storage-V${version}-reproducible.hex
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Firmware for the Nitrokey Storage device";
+    homepage = "https://github.com/Nitrokey/nitrokey-storage-firmware";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      imadnyc
+      kiike
+      amerino
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix
index bb090ef755cd..e7cca5184cbf 100644
--- a/pkgs/by-name/no/normaliz/package.nix
+++ b/pkgs/by-name/no/normaliz/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "normaliz";
-  version = "3.10.3";
+  version = "3.10.4";
 
   src = fetchFromGitHub {
     owner = "normaliz";
     repo = "normaliz";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9jN3EbYfWmir+pa4XuJpeT7CnQdhVU9pP8G11npIG00=";
+    hash = "sha256-qmbLgjAkLrW8rqFthK3H4n63zLVJ33Pe82V7yU1StOo=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix
new file mode 100644
index 000000000000..e6260be6eaa5
--- /dev/null
+++ b/pkgs/by-name/nv/nvrh/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "nvrh";
+  version = "0.1.8";
+
+  src = fetchFromGitHub {
+    owner = "mikew";
+    repo = "nvrh";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-a/TFSS4PeZWEYph4B8qDr4BJPY4CnHafvw07t1ytofo=";
+  };
+
+  postPatch = ''
+    substituteInPlace go.mod \
+      --replace-fail "go 1.23.1" "go 1.22.7"
+  '';
+
+  preBuild = ''
+    cp manifest.json src/
+  '';
+
+  vendorHash = "sha256-Ao2BrB6fUOw2uFziQWNKeVTZtIeoW0MP7aLyuI1J3ng=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  postInstall = ''
+    mv $out/bin/src $out/bin/nvrh
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Aims to be similar to VSCode Remote, but for Neovim";
+    homepage = "https://github.com/mikew/nvrh";
+    changelog = "https://github.com/mikew/nvrh/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "nvrh";
+  };
+}
diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix
index 8fe3904e744c..97d58a58bbc7 100644
--- a/pkgs/by-name/op/openapi-changes/package.nix
+++ b/pkgs/by-name/op/openapi-changes/package.nix
@@ -1,19 +1,19 @@
 { lib
-, buildGoModule
+, buildGo123Module
 , fetchFromGitHub
 , git
 , makeWrapper
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "openapi-changes";
-  version = "0.0.67";
+  version = "0.0.68";
 
   src = fetchFromGitHub {
     owner = "pb33f";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SNH11z/0DeaYfGwBKW3iIeCVdlpcoZ1elIlgl+quWIY=";
+    hash = "sha256-v+THD4ZWnpeuxLfxaA4LUGdYV3X5rUKeCWq9HIub59Y=";
   };
 
   # this test requires the `.git` of the project to be present
@@ -27,7 +27,7 @@ buildGoModule rec {
     wrapProgram $out/bin/openapi-changes --prefix PATH : ${lib.makeBinPath [ git ]}
   '';
 
-  vendorHash = "sha256-VtwIAP2+FZ6Vpexcb9O68WfJdsTMrJn5bDjkxDe69e4=";
+  vendorHash = "sha256-IiI+mSbJNEpM6rryGtAnGSOcY2RXnvqXTZmZ82L1HPc=";
 
   meta = with lib; {
     description = "World's sexiest OpenAPI breaking changes detector";
diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix
index db0ba62beb0f..556d9170df49 100644
--- a/pkgs/by-name/op/openpgl/package.nix
+++ b/pkgs/by-name/op/openpgl/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openpgl";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "OpenPathGuidingLibrary";
     repo = "openpgl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs=";
+    hash = "sha256-HX3X1dmOazUUiYCqa6irpNm37YthB2YHb8u1P1qDHco=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
new file mode 100644
index 000000000000..7ff52f13a85a
--- /dev/null
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchzip,
+  appimageTools,
+  makeWrapper,
+}:
+
+let
+  pname = "osu-lazer-bin";
+  version = "2024.1009.1";
+
+  src =
+    {
+      aarch64-darwin = fetchzip {
+        url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
+        hash = "sha256-fH7cuk879nS8FDIZ8p29pg2aXLJUT+j6Emb39Y6FXq4=";
+        stripRoot = false;
+      };
+      x86_64-darwin = fetchzip {
+        url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
+        hash = "sha256-kIH+zlNaqMVbr8FVDiLUh19gfrFUDPGBvMOrZqkMZAE=";
+        stripRoot = false;
+      };
+      x86_64-linux = fetchurl {
+        url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
+        hash = "sha256-G7+Mr0Zd/p8XUVU5aG7KywvLD2hz2N37kEbm5rlghEw=";
+      };
+    }
+    .${stdenv.system} or (throw "osu-lazer-bin: ${stdenv.system} is unsupported.");
+
+  meta = {
+    description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)";
+    homepage = "https://osu.ppy.sh";
+    license = with lib.licenses; [
+      mit
+      cc-by-nc-40
+      unfreeRedistributable # osu-framework contains libbass.so in repository
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [
+      gepbird
+      stepbrobd
+    ];
+    mainProgram = "osu!";
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
+  };
+
+  passthru.updateScript = ./update.sh;
+in
+if stdenv.hostPlatform.isDarwin then
+  stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      meta
+      passthru
+      ;
+
+    installPhase = ''
+      runHook preInstall
+      APP_DIR="$out/Applications"
+      mkdir -p "$APP_DIR"
+      cp -r . "$APP_DIR"
+      runHook postInstall
+    '';
+  }
+else
+  appimageTools.wrapType2 {
+    inherit
+      pname
+      version
+      src
+      meta
+      passthru
+      ;
+
+    extraPkgs = pkgs: with pkgs; [ icu ];
+
+    extraInstallCommands =
+      let
+        contents = appimageTools.extract { inherit pname version src; };
+      in
+      ''
+        . ${makeWrapper}/nix-support/setup-hook
+        mv -v $out/bin/${pname} $out/bin/osu!
+        wrapProgram $out/bin/osu! \
+          --set OSU_EXTERNAL_UPDATE_PROVIDER 1
+        install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications
+        for i in 16 32 48 64 96 128 256 512 1024; do
+          install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png
+        done
+      '';
+  }
diff --git a/pkgs/games/osu-lazer/update-bin.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
similarity index 91%
rename from pkgs/games/osu-lazer/update-bin.sh
rename to pkgs/by-name/os/osu-lazer-bin/update.sh
index 182875a42731..0b06950762b5 100755
--- a/pkgs/games/osu-lazer/update-bin.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -3,16 +3,16 @@
 set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-bin_file="$(realpath ./bin.nix)"
+bin_file="$(realpath ./package.nix)"
 
 new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./bin.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Already up to date."
     exit 0
 fi
 
-cd ../../..
+cd ../../../..
 
 echo "Updating osu-lazer-bin from $old_version to $new_version..."
 sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file"
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/by-name/os/osu-lazer/deps.nix
similarity index 98%
rename from pkgs/games/osu-lazer/deps.nix
rename to pkgs/by-name/os/osu-lazer/deps.nix
index bd57355c7910..0e3bee1048e1 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/by-name/os/osu-lazer/deps.nix
@@ -138,13 +138,13 @@
   (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; })
   (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; })
   (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; })
-  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.907.1"; hash = "sha256-h9wQPX7EP4b6+a7D/qU3qvSi05yp2rOj52nBmko1Y2o="; })
+  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.1009.0"; hash = "sha256-aLZcnVYyrLMeaoz/Jt49m5Po5i814MvtcGcVOVu18ls="; })
   (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; })
   (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; })
-  (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.904.0"; hash = "sha256-x3et2Rnr90bdlFzR852Pt1EkW69/eQxlXciPNtFrN44="; })
+  (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.1003.0"; hash = "sha256-aeY9jfvyC+GFovHs0b5SSGZHMOO5tMMplZQWIRxo9DA="; })
   (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; })
   (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; })
-  (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.807.1"; hash = "sha256-9ppVYCkc43NIsfe9iKWlxd8elgECZqP+pRPT9ybxiAU="; })
+  (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.916.0"; hash = "sha256-ioILyAlyMiaVVGYxoLzNH78Mlp1Dfbv5xKjDWtwCP8M="; })
   (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.62-gca0239da6b"; hash = "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="; })
   (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="; })
   (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="; })
@@ -237,7 +237,7 @@
   (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
   (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
   (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
-  (fetchNuGet { pname = "System.IO.Packaging"; version = "8.0.0"; hash = "sha256-kBOaG1Y3te708l81mIig7YKl6wPbEIAQ9J8mzHUdO/A="; })
+  (fetchNuGet { pname = "System.IO.Packaging"; version = "8.0.1"; hash = "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4="; })
   (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; })
   (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
   (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
@@ -321,7 +321,7 @@
   (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
   (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
   (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; })
-  (fetchNuGet { pname = "Velopack"; version = "0.0.598-g933b2ab"; hash = "sha256-i1VR1tZ+rNl8F4EL8x5OAdnqfIRuHmviTp19uPFi14A="; })
+  (fetchNuGet { pname = "Velopack"; version = "0.0.630-g9c52e40"; hash = "sha256-6dSuIl1HpqOaIPiCziQSgkDGiPf04q253ADYAo0rghA="; })
   (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; hash = "sha256-LXdgts8lKbTU67c1W001XRbq5nenzf8XcYCRxc75jR8="; })
   (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; hash = "sha256-hU4qzLKhv4QxiP2c9s4IZUGgeQxsOjRhgurrlXXq/qM="; })
   (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; })
diff --git a/pkgs/games/osu-lazer/osu.runtimeconfig.json b/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json
similarity index 100%
rename from pkgs/games/osu-lazer/osu.runtimeconfig.json
rename to pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/by-name/os/osu-lazer/package.nix
similarity index 71%
rename from pkgs/games/osu-lazer/default.nix
rename to pkgs/by-name/os/osu-lazer/package.nix
index d2826e295ed9..a2523df7853c 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -1,30 +1,31 @@
-{ lib
-, stdenvNoCC
-, buildDotnetModule
-, fetchFromGitHub
-, dotnetCorePackages
-, makeDesktopItem
-, copyDesktopItems
-, makeWrapper
-, ffmpeg
-, alsa-lib
-, SDL2
-, lttng-ust
-, numactl
-, libglvnd
-, xorg
-, udev
+{
+  lib,
+  stdenvNoCC,
+  buildDotnetModule,
+  fetchFromGitHub,
+  dotnetCorePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+  makeWrapper,
+  ffmpeg,
+  alsa-lib,
+  SDL2,
+  lttng-ust,
+  numactl,
+  libglvnd,
+  xorg,
+  udev,
 }:
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.906.2";
+  version = "2024.1009.1";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    hash = "sha256-ykCO+q28IUJumt3nra1BUlwuXqLS1FYOqcDe2LPPGVY=";
+    hash = "sha256-odWTLvx41miFgn4O/EDzwm2pfWKxj4B1ieSfNS0hrW8=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
@@ -76,27 +77,32 @@ buildDotnetModule rec {
     runHook postFixup
   '';
 
-  desktopItems = [(makeDesktopItem {
-    desktopName = "osu!";
-    name = "osu";
-    exec = "osu!";
-    icon = "osu!";
-    comment = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)";
-    type = "Application";
-    categories = [ "Game" ];
-  })];
+  desktopItems = [
+    (makeDesktopItem {
+      desktopName = "osu!";
+      name = "osu";
+      exec = "osu!";
+      icon = "osu!";
+      comment = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)";
+      type = "Application";
+      categories = [ "Game" ];
+    })
+  ];
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)";
     homepage = "https://osu.ppy.sh";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       cc-by-nc-40
       unfreeRedistributable # osu-framework contains libbass.so in repository
     ];
-    maintainers = with maintainers; [ gepbird thiagokokada ];
+    maintainers = with lib.maintainers; [
+      gepbird
+      thiagokokada
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "osu!";
   };
diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/by-name/os/osu-lazer/update.sh
similarity index 86%
rename from pkgs/games/osu-lazer/update.sh
rename to pkgs/by-name/os/osu-lazer/update.sh
index 7ef726621a09..194b644e7777 100755
--- a/pkgs/games/osu-lazer/update.sh
+++ b/pkgs/by-name/os/osu-lazer/update.sh
@@ -4,13 +4,13 @@ set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
 new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Up to date"
     exit 0
 fi
 
-cd ../../..
+cd ../../../..
 
 if [[ "$1" != "--deps-only" ]]; then
     update-source-version osu-lazer "$new_version"
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index bade7387f410..f99244a8bd08 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -4,7 +4,7 @@
 
 owner = "kaii-lb";
 name = "overskride";
-version = "0.6.0";
+version = "0.6.1";
 
 in rustPlatform.buildRustPackage {
 
@@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage {
     inherit owner;
     repo = name;
     rev = "v${version}";
-    hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k=";
+    hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc=";
   };
 
-  cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI=";
+  cargoHash = "sha256-jSTCCPNPKPNVr3h8uZ21dP8Z7shbX+QmoWM/jk1qjfg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index b6754c63a426..a6f442e055b0 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.13";
+  version = "0.4.20";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eIW30Tl/vOLXlUXiN3lAcww7Ipkfshzilb9ntxjF8C0=";
+    hash = "sha256-nnobk1N+r1tLekc8CLiAULsEQFjgzoQQvRz3F8vVjzU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index dcc5606ea4ea..489493862d3b 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-09-27";
+  version = "0-unstable-2024-10-06";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "a8c18f9b9418ac42922eee1e31b1e3c9f791c1dc";
-    hash = "sha256-LUHU6Buh+91b99pF7d8jqmAoYD1EmkKzsAOxiP7w3So=";
+    rev = "03b777340d4b17957c7533d20bc3f8fca5a6dff8";
+    hash = "sha256-qytv7haQj+xuRm5ks4rnyY0eu7i3Kv4X4gAsFLDvLSk=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock
index 1a6ee19b4075..27b544bcf020 100644
--- a/pkgs/by-name/ti/tinymist/Cargo.lock
+++ b/pkgs/by-name/ti/tinymist/Cargo.lock
@@ -3679,7 +3679,7 @@ dependencies = [
 
 [[package]]
 name = "sync-lsp"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "anyhow",
  "clap",
@@ -3819,7 +3819,7 @@ dependencies = [
 
 [[package]]
 name = "tests"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "insta",
  "lsp-server",
@@ -3916,7 +3916,7 @@ dependencies = [
 
 [[package]]
 name = "tinymist"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3956,7 +3956,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sync-lsp",
- "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "tinymist-query",
  "tinymist-render",
  "tinymist-world",
@@ -3982,7 +3982,7 @@ dependencies = [
 
 [[package]]
 name = "tinymist-analysis"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "base64 0.22.1",
  "comemo 0.4.0",
@@ -3999,17 +3999,17 @@ dependencies = [
 
 [[package]]
 name = "tinymist-assets"
-version = "0.11.28"
+version = "0.11.32"
 
 [[package]]
 name = "tinymist-assets"
-version = "0.11.28"
+version = "0.11.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08ac1383bf5177ca572a0f88fb2175373ebe591d0c1bde0b85d6e0fa25d2f6b"
+checksum = "ea141357280a85cdacb962dc64b07ae6fa4381df468f6aba1d3dd93483afdc38"
 
 [[package]]
 name = "tinymist-query"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -4060,7 +4060,7 @@ dependencies = [
 
 [[package]]
 name = "tinymist-render"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "base64 0.22.1",
  "log",
@@ -4071,7 +4071,7 @@ dependencies = [
 
 [[package]]
 name = "tinymist-world"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "anyhow",
  "chrono",
@@ -4086,7 +4086,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tar",
- "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "typst-assets",
 ]
 
@@ -4348,7 +4348,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "typlite"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "base64 0.22.1",
  "comemo 0.4.0",
@@ -4492,7 +4492,7 @@ dependencies = [
 
 [[package]]
 name = "typst-preview"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "clap",
  "comemo 0.4.0",
@@ -4505,7 +4505,7 @@ dependencies = [
  "reflexo-vec2svg",
  "serde",
  "serde_json",
- "tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinymist-assets 0.11.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio",
  "typst",
  "typst-assets",
@@ -4533,7 +4533,7 @@ dependencies = [
 
 [[package]]
 name = "typst-shim"
-version = "0.11.28"
+version = "0.11.32"
 dependencies = [
  "cfg-if",
  "typst",
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 16d8ba5951c9..0de208f818bd 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.11.28";
+  version = "0.11.32";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Wiuf53HlTMJeYJG815e9PgOtJBRxYRPllus7mmxdvM4=";
+    hash = "sha256-xXrE4LOzcR4TCoBD7jbS1Ba7kBLBPiF3GI0wjq5GXWA=";
   };
 
   cargoLock = {
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 43293874ddf6..f84198772eeb 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "13.5.6";
+  version = "13.5.7";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-dEairGoBMsXF4gtnnqa2KsA8PpW9VwF8woUrInVWuKM=";
+      hash = "sha256-w+W3J07+7/DERDsX0EubHKZfCr9Bc3dKmnS33UA3sdU=";
     };
 
     i686-linux = fetchurl {
@@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-9WRN+iU7vvt9KvVudsS7qe0hoJwDP/J+yOTHW7nmrxs=";
+      hash = "sha256-GZ6tBxnX3Y4Ot71phDYkpiWDecr3AltuAVFWSNhX3CY=";
     };
   };
 
diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index 896597eb5792..c6622a32c884 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vault-bin";
-  version = "1.17.6";
+  version = "1.18.0";
 
   src =
     let
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-K9yNZ4M8u8FfisWi6Y6TsBJy6FQytr3htNCsKh2MlyA=";
-        aarch64-linux = "sha256-KLHkxUGvekHT/bPtoIlmylCubTWH+I7Q0wJM0UG0Hp8=";
-        i686-linux = "sha256-jBS/nGKP27weFw4u6Q10athYwCqWLzpb7ph39v+QAN8=";
-        x86_64-darwin = "sha256-5KfWqtJldk66dO5ImYKivDau4JzacUIXBfAzWkkPfoE=";
-        aarch64-darwin = "sha256-wjmNY1lunJDjpkWDXl0upAeNBqBx8momlY4a3j+hMd0=";
+        x86_64-linux = "sha256-fyVkSZ20tUcBv9/iT1h3o/2KkoCJ5op7DBoMc0US7SM=";
+        aarch64-linux = "sha256-Vsc0ra+OzrDBwmKke0ef4kfy5CWu5m34gC7u0BDL7uo=";
+        i686-linux = "sha256-3uAkBPOoMbdfS5EfII03JbVl1ekfRXm4yv1rL5A7x7c=";
+        x86_64-darwin = "sha256-fydYqDEihbGuZ9I1quJSJk+lJxnSkqF+t1mOP8EA2Ok=";
+        aarch64-darwin = "sha256-yJmNM9eQydbRdY6+JK28hhzXJ9Hj3CcwUJkhS60aCyA=";
       };
     in
     fetchzip {
diff --git a/pkgs/by-name/va/vault-bin/update-bin.sh b/pkgs/by-name/va/vault-bin/update-bin.sh
index cd91fe4b608d..f397f48c6852 100755
--- a/pkgs/by-name/va/vault-bin/update-bin.sh
+++ b/pkgs/by-name/va/vault-bin/update-bin.sh
@@ -4,7 +4,7 @@
 set -euo pipefail
 
 ROOT="$(dirname "$(readlink -f "$0")")"
-NIX_DRV="$ROOT/vault-bin.nix"
+NIX_DRV="$ROOT/package.nix"
 if [ ! -f "$NIX_DRV" ]; then
   echo "ERROR: cannot find vault-bin in $ROOT"
   exit 1
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index f34203cf9669..cdb465e980a9 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.17.6";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw=";
+    hash = "sha256-5CqA2dZZdV1IiGSGwCA2eQIhp3lrsDIJt4rDK1vdvmE=";
   };
 
-  vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U=";
+  vendorHash = "sha256-2txRuunh6x+iDKRpljGpSX6Q8q11a84CPVm6d299NNY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
new file mode 100644
index 000000000000..8ea14e4b7c37
--- /dev/null
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  python3Packages,
+  dnsmasq,
+  gawk,
+  getent,
+  gobject-introspection,
+  gtk3,
+  kmod,
+  lxc,
+  iproute2,
+  iptables,
+  util-linux,
+  wrapGAppsHook3,
+  wl-clipboard,
+  runtimeShell,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "waydroid";
+  version = "1.4.3";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "waydroid";
+    repo = "waydroid";
+    rev = "refs/tags/${version}";
+    hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk=";
+  };
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    dbus-python
+    gbinder-python
+    pyclip
+    pygobject3
+  ];
+
+  dontUseSetuptoolsBuild = true;
+  dontUsePipInstall = true;
+  dontUseSetuptoolsCheck = true;
+  dontWrapPythonPrograms = true;
+  dontWrapGApps = true;
+
+  installFlags = [
+    "PREFIX=$(out)"
+    "USE_SYSTEMD=0"
+    "SYSCONFDIR=$(out)/etc"
+  ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+
+    patchShebangs --host $out/lib/waydroid/data/scripts
+    wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
+      --prefix PATH ":" ${
+        lib.makeBinPath [
+          dnsmasq
+          getent
+          iproute2
+          iptables
+        ]
+      }
+
+    wrapPythonProgramsIn $out/lib/waydroid/ "${
+      lib.concatStringsSep " " (
+        [
+          "$out"
+        ]
+        ++ propagatedBuildInputs
+        ++ [
+          gawk
+          kmod
+          lxc
+          util-linux
+          wl-clipboard
+        ]
+      )
+    }"
+
+    substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
+      --replace '"sh"' '"${runtimeShell}"'
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Container-based approach to boot a full Android system on a regular GNU/Linux system";
+    mainProgram = "waydroid";
+    homepage = "https://github.com/waydroid/waydroid";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ mcaju ];
+  };
+}
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index 4dd661666803..aad6ed2b4018 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "whatsie";
-  version = "4.15.5";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "keshavbhatt";
     repo = "whatsie";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-6tczt9oPtcKvA59YqRHGOE2VFQLRNbyHpCJ6b4kzgks=";
+    hash = "sha256-+sbnpaR+pR5aKbGUIVM3yRpco7/jE9LkCbQKrgFDYwM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index d0ccf32ce32c..f06b46c30692 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "31.7.1";
+  version = "31.8.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-yio+ZJ+hgybgEUfxXt/xk3ahM5lollKGJC0821vi9e0=";
+    hash = "sha256-GGtbW4Y/02ubdufTXmywGS4jyMfm8RfOMvmUNoUcLQg=";
   };
 
-  npmDepsHash = "sha256-gtBQdeX7hkactPSq609DMoc8rY2AHfg2nkpj26ZV88A=";
+  npmDepsHash = "sha256-/zLWtIIPNOMrICKaj5SY1Bo3Pdso6a776fIYY/7X0U4=";
 
   nativeBuildInputs = [
     remarshal
diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix
index 0749175f0837..b77bd2357b17 100644
--- a/pkgs/development/compilers/cairo/default.nix
+++ b/pkgs/development/compilers/cairo/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cairo";
-  version = "2.8.2";
+  version = "2.8.4";
 
   src = fetchFromGitHub {
     owner = "starkware-libs";
     repo = "cairo";
     rev = "v${version}";
-    hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk=";
+    hash = "sha256-xHvBbm1ewNu96TyK//l2emiq+jaPhSWvvbVK9Q/O5lo=";
   };
 
-  cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI=";
+  cargoHash = "sha256-E6nnT+I5ur4PPvLjwfebR1Tdm206hI05HCVc3IWDqFY=";
 
   # openssl crate requires perl during build process
   nativeBuildInputs = [
diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix
index 493a42613584..c3f16b447e2f 100644
--- a/pkgs/development/compilers/circt/default.nix
+++ b/pkgs/development/compilers/circt/default.nix
@@ -18,12 +18,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.86.0";
+  version = "1.87.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI=";
+    hash = "sha256-buWpoym57YxyHJySYaektAUmuSRXMS+YBwtjWpoV1Vg=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix
index 513f8a99180f..de15795895d2 100644
--- a/pkgs/development/compilers/typescript/default.nix
+++ b/pkgs/development/compilers/typescript/default.nix
@@ -2,20 +2,20 @@
 
 buildNpmPackage rec {
   pname = "typescript";
-  version = "5.6.2";
+  version = "5.6.3";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
     rev = "v${version}";
-    hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris=";
+    hash = "sha256-DsGTVqCbzifPmgCrca5M7qeUPiMThByq6esN+bMt4fU=";
   };
 
   patches = [
     ./disable-dprint-dstBundler.patch
   ];
 
-  npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc=";
+  npmDepsHash = "sha256-w3Tm7BJ2usrjut6HrhjgXe7TIgq5PxYeHRenz4aybk4=";
 
   passthru.tests = {
     version = testers.testVersion {
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 93c6f05c20eb..b936ea1e222a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -93,9 +93,9 @@ in {
       major = "3";
       minor = "13";
       patch = "0";
-      suffix = "rc3";
+      suffix = "";
     };
-    hash = "sha256-yLx5AYWvHLd7dcAcvBqmQt/c+Xo3DS0QCQvHuqcNpX4=";
+    hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0=";
     inherit (darwin) configd;
     inherit passthruFun;
   };
diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix
index a8e697132e90..b5c0f5451c23 100644
--- a/pkgs/development/libraries/science/math/faiss/default.nix
+++ b/pkgs/development/libraries/science/math/faiss/default.nix
@@ -21,13 +21,11 @@
     in
     # Choose the maximum available optimization level
     builtins.head optLevels,
-  faiss, # To run demos in the tests
-  runCommand,
 }@inputs:
 
 let
   pname = "faiss";
-  version = "1.8.0";
+  version = "1.9.0";
 
   inherit (cudaPackages) flags backendStdenv;
 
@@ -46,27 +44,15 @@ in
 stdenv.mkDerivation {
   inherit pname version;
 
-  outputs = [
-    "out"
-    "demos"
-  ] ++ lib.optionals pythonSupport [ "dist" ];
+  outputs = [ "out" ] ++ lib.optionals pythonSupport [ "dist" ];
 
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I=";
+    hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ=";
   };
 
-  # Remove the following substituteInPlace when updating
-  # to a release that contains change from PR
-  # https://github.com/facebookresearch/faiss/issues/3239
-  # that fixes building faiss with swig 4.2.x
-  postPatch = ''
-    substituteInPlace faiss/python/swigfaiss.swig \
-      --replace-fail '#ifdef SWIGWORDSIZE64' '#if (__SIZEOF_LONG__ == 8)'
-  '';
-
   nativeBuildInputs =
     [ cmake ]
     ++ lib.optionals cudaSupport [
@@ -99,13 +85,7 @@ stdenv.mkDerivation {
       (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
     ];
 
-  buildFlags =
-    [ "faiss" ]
-    # This is just a demo app used as a test.
-    # Disabled because linkage fails:
-    # https://github.com/facebookresearch/faiss/issues/3484
-    ++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ]
-    ++ lib.optionals pythonSupport [ "swigfaiss" ];
+  buildFlags = [ "faiss" ] ++ lib.optionals pythonSupport [ "swigfaiss" ];
 
   # pip wheel->pip install commands copied over from opencv4
 
@@ -114,32 +94,10 @@ stdenv.mkDerivation {
      python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .)
   '';
 
-  postInstall =
-    ''
-      mkdir -p $demos/bin
-      if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then
-        cp ./demos/demo_ivfpq_indexing $demos/bin/
-      fi
-    ''
-    + lib.optionalString pythonSupport ''
-      mkdir "$dist"
-      cp faiss/python/dist/*.whl "$dist/"
-    '';
-
-  passthru = {
-    inherit cudaSupport cudaPackages pythonSupport;
-
-    tests = {
-      runDemos =
-        runCommand "${pname}-run-demos" { buildInputs = [ faiss.demos ]; }
-          # There are more demos, we run just the one that documentation mentions
-          ''
-            demo_ivfpq_indexing && touch $out
-          '';
-      pythonFaiss = pythonPackages.faiss;
-      pytest = pythonPackages.faiss.tests.pytest;
-    };
-  };
+  postInstall = lib.optionalString pythonSupport ''
+    mkdir "$dist"
+    cp faiss/python/dist/*.whl "$dist/"
+  '';
 
   meta = {
     description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research";
@@ -148,7 +106,5 @@ stdenv.mkDerivation {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ SomeoneSerge ];
-    # error: use of undeclared identifier 'SWIGTYPE_p_long'
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index f9a87aa73b51..e328a4c0f632 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   pname = "tdlib";
-  version = "1.8.35";
+  version = "1.8.37";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "8d08b34e22a08e58db8341839c4e18ee06c516c5";
-    hash = "sha256-RxFiOp3QDpLeikPqd8vstvhdglFLtOmwpcfGvvdgI5Y=";
+    rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774";
+    hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU=";
   };
 
   buildInputs = [ gperf openssl readline zlib ];
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index a880c8fc9190..ff9e591330ba 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -4,8 +4,8 @@
 
 { cmdLineToolsVersion ? "13.0"
 , toolsVersion ? "26.1.1"
-, platformToolsVersion ? "35.0.1"
-, buildToolsVersions ? [ "34.0.0" ]
+, platformToolsVersion ? "35.0.2"
+, buildToolsVersions ? [ "35.0.0" ]
 , includeEmulator ? false
 , emulatorVersion ? "35.1.4"
 , platformVersions ? []
@@ -15,7 +15,7 @@
 , abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ]
 , cmakeVersions ? [ ]
 , includeNDK ? false
-, ndkVersion ? "26.3.11579264"
+, ndkVersion ? "27.0.12077973"
 , ndkVersions ? [ndkVersion]
 , useGoogleAPIs ? false
 , useGoogleTVAddOns ? false
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 6c6f974be706..fbababf9af2c 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -16,11 +16,17 @@ rec {
   };
 
   androidPkgs = composeAndroidPackages {
-    platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ];
+    platformVersions = [ "28" "29" "30" "31" "32" "33" "34" "35" ];
     includeEmulator = true;
     includeSystemImages = true;
     includeNDK = true;
   };
 
   test-suite = pkgs.callPackage ./test-suite.nix {};
+
+  meta = with pkgs.lib; {
+    description = "Android SDK & sdkmanager";
+    homepage = "https://developer.android.com/tools/sdkmanager";
+    maintainers = with maintainers; [ numinit hadilq ];
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index e4b3af304fa9..94bf0084ed27 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -1,8 +1,8 @@
 { composeAndroidPackages, stdenv, lib, runtimeShell }:
 { name
 , app ? null
-, platformVersion ? "33"
-, abiVersion ? "armeabi-v7a"
+, platformVersion ? "35"
+, abiVersion ? "x86"
 , systemImageType ? "default"
 , enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below.
 , configOptions ? (
diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
index 637dbc58f4dd..0a710e45843c 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
@@ -26,9 +26,9 @@ let
   # Declaration of versions for everything. This is useful since these
   # versions may be used in multiple places in this Nix expression.
   android = {
-    platforms = [ "34" ];
+    platforms = [ "35" ];
     systemImageTypes = [ "google_apis" ];
-    abis = [ "arm64-v8a" "x86_64" ];
+    abis = [ "x86_64" ];
   };
 
   # If you copy this example out of nixpkgs, something like this will work:
@@ -116,10 +116,9 @@ pkgs.mkShell rec {
       echo "installed_packages_section: ''${installed_packages_section}"
 
       packages=(
-        "build-tools;34.0.0" "cmdline-tools;11.0" \
-        "emulator" "patcher;v4" "platform-tools" "platforms;android-34" \
-        "system-images;android-34;google_apis;arm64-v8a" \
-        "system-images;android-34;google_apis;x86_64"
+        "build-tools;35.0.0" "cmdline-tools;13.0" \
+        "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \
+        "system-images;android-35;google_apis;x86_64"
       )
 
       for package in "''${packages[@]}"; do
@@ -142,7 +141,7 @@ pkgs.mkShell rec {
       excluded_packages=(
         "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
         "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
-        "platforms;android-31" "platforms;android-32" "platforms;android-33" \
+        "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \
         "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \
         "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \
         "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
@@ -169,7 +168,7 @@ pkgs.mkShell rec {
       nativeBuildInputs = [ androidSdk androidEmulator jdk ];
     } ''
       avdmanager delete avd -n testAVD || true
-      echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64'
+      echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64'
       result=$(avdmanager list avd)
 
       if [[ ! $result =~ "Name: testAVD" ]]; then
diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
index a1308a9c1088..25b90e6d21a0 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
@@ -26,11 +26,11 @@ let
   # versions may be used in multiple places in this Nix expression.
   android = {
     versions = {
-      cmdLineToolsVersion = "11.0";
-      platformTools = "34.0.5";
-      buildTools = "34.0.0";
+      cmdLineToolsVersion = "13.0";
+      platformTools = "35.0.2";
+      buildTools = "35.0.0";
     };
-    platforms = [ "34" ];
+    platforms = [ "35" ];
   };
 
   # If you copy this example out of nixpkgs, something like this will work:
@@ -113,8 +113,8 @@ pkgs.mkShell rec {
       echo "installed_packages_section: ''${installed_packages_section}"
 
       packages=(
-        "build-tools;34.0.0" "cmdline-tools;11.0" \
-        "patcher;v4" "platform-tools" "platforms;android-34"
+        "build-tools;35.0.0" "cmdline-tools;13.0" \
+        "patcher;v4" "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 0f4c0589adb0..7f08389e7e31 100644
--- a/pkgs/development/mobile/androidenv/examples/shell.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -26,17 +26,17 @@ let
   android = {
     versions = {
       cmdLineToolsVersion = "13.0";
-      platformTools = "35.0.1";
-      buildTools = "34.0.0";
+      platformTools = "35.0.2";
+      buildTools = "35.0.0";
       ndk = [
-        "26.3.11579264"
+        "27.0.12077973"
       ];
       cmake = "3.6.4111459";
       emulator = "35.1.4";
     };
 
-    platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
-    abis = ["armeabi-v7a" "arm64-v8a"];
+    platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ];
+    abis = [ "x86_64" ];
     extras = ["extras;google;gcm"];
   };
 
@@ -163,21 +163,24 @@ pkgs.mkShell rec {
       output="$(sdkmanager --list)"
       installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
 
+      # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?!
       packages=(
-        "build-tools;34.0.0" "platform-tools" \
+        "build-tools;35.0.0" "platform-tools" \
         "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
         "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
-        "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \
+        "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-35" \
         "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \
         "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \
         "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
-        "system-images;android-28;google_apis_playstore;arm64-v8a" \
-        "system-images;android-29;google_apis_playstore;arm64-v8a" \
-        "system-images;android-30;google_apis_playstore;arm64-v8a" \
-        "system-images;android-31;google_apis_playstore;arm64-v8a" \
-        "system-images;android-32;google_apis_playstore;arm64-v8a" \
-        "system-images;android-33;google_apis_playstore;arm64-v8a" \
-        "system-images;android-34;google_apis_playstore;arm64-v8a"
+        "sources;android-35" \
+        "system-images;android-28;google_apis_playstore;x86_64" \
+        "system-images;android-29;google_apis_playstore;x86_64" \
+        "system-images;android-30;google_apis_playstore;x86_64" \
+        "system-images;android-31;google_apis_playstore;x86_64" \
+        "system-images;android-32;google_apis_playstore;x86_64" \
+        "system-images;android-33;google_apis_playstore;x86_64" \
+        "system-images;android-34;google_apis;x86_64" \
+        "system-images;android-35;google_apis_playstore_ps16k;x86_64"
       )
 
       for package in "''${packages[@]}"; do
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 0cf9ea53ceb6..82f7c5f48404 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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+        "last-available-day": 19954,
         "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": 19823,
+      "last-available-day": 19954,
       "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": 19823,
+      "last-available-day": 19954,
       "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": 19823,
+      "last-available-day": 19954,
       "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": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1378,7 +1378,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -1413,7 +1413,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -1441,7 +1441,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -1469,7 +1469,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -1506,7 +1506,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -1534,7 +1534,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -1562,7 +1562,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -1591,7 +1591,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -1619,7 +1619,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -1647,7 +1647,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 19823,
+      "last-available-day": 19954,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2316,7 +2316,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -2354,7 +2354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -2394,7 +2394,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -2435,7 +2435,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -2473,7 +2473,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -2515,7 +2515,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -2553,7 +2553,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -2593,7 +2593,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -2634,7 +2634,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -2679,7 +2679,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -2710,7 +2710,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -2748,7 +2748,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -2788,7 +2788,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -2829,7 +2829,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -2874,7 +2874,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -2905,7 +2905,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -2943,7 +2943,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -2986,7 +2986,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3027,7 +3027,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3072,7 +3072,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3110,7 +3110,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3150,7 +3150,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -3191,7 +3191,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -3236,7 +3236,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -3274,7 +3274,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -3314,7 +3314,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -3355,7 +3355,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -3393,7 +3393,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -3423,7 +3423,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -3455,7 +3455,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -3493,7 +3493,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -3531,7 +3531,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -3569,7 +3569,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -3602,7 +3602,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -3643,7 +3643,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -3684,7 +3684,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -3725,7 +3725,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -3763,7 +3763,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -3795,7 +3795,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -3833,7 +3833,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -3871,7 +3871,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -3909,7 +3909,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -3942,7 +3942,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -3983,7 +3983,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -4024,7 +4024,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -4103,7 +4103,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -4140,7 +4140,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -4172,7 +4172,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -4210,7 +4210,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -4248,7 +4248,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -4286,7 +4286,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -4319,7 +4319,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -4360,7 +4360,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -4401,7 +4401,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -4442,7 +4442,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -4487,7 +4487,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -4519,7 +4519,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -4557,7 +4557,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -4595,7 +4595,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -4633,7 +4633,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -4673,7 +4673,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -4714,7 +4714,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -4755,7 +4755,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -4798,7 +4798,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -4843,7 +4843,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -4882,7 +4882,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -4919,7 +4919,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -4951,7 +4951,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -4989,7 +4989,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -5027,7 +5027,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -5060,7 +5060,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -5101,7 +5101,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -5142,7 +5142,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -5183,7 +5183,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -5226,7 +5226,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -5286,7 +5286,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -5325,7 +5325,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -5369,7 +5369,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -5406,7 +5406,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -5443,7 +5443,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -5487,7 +5487,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -5543,7 +5543,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -5599,7 +5599,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -5657,7 +5657,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -5702,7 +5702,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -5746,7 +5746,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -5783,7 +5783,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -5820,7 +5820,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -5864,7 +5864,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -5920,7 +5920,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -5978,7 +5978,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -6023,7 +6023,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -6062,7 +6062,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -6106,7 +6106,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -6136,7 +6136,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -6166,7 +6166,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -6210,7 +6210,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -6266,7 +6266,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -6322,7 +6322,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -6370,7 +6370,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +6426,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -6482,7 +6482,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -6542,7 +6542,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -6574,7 +6574,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -6628,7 +6628,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -6682,7 +6682,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -6726,7 +6726,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +6772,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -6818,7 +6818,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -6872,7 +6872,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +6940,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -7008,7 +7008,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -7068,7 +7068,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -7107,7 +7107,7 @@
             }
           },
           "displayName": "Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear/arm64-v8a",
@@ -7144,7 +7144,7 @@
             }
           },
           "displayName": "Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear/x86",
@@ -7176,7 +7176,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -7218,7 +7218,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -7244,9 +7244,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "c3575404189a32f1d77ef0f080a09b8697ebb14b",
-              "size": 1244307632,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r13.zip"
+              "sha1": "0e66987d6b4db2e278af83d453ce5d74a7e6ced3",
+              "size": 1244324730,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r16.zip"
             }
           ],
           "dependencies": {
@@ -7262,13 +7262,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
-          "license": "android-sdk-license",
+          "last-available-day": 19954,
+          "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
           "revision": "30-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "13"
+            "major:0": "16"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -7290,9 +7290,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "c1d3209b861461e9c37273710bc4140ce2ae6056",
-              "size": 1240622989,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r12.zip"
+              "sha1": "a58447e540a8581394dd04ee419c6771d62723d8",
+              "size": 1240551553,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r16.zip"
             }
           ],
           "dependencies": {
@@ -7318,13 +7318,13 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 19823,
-          "license": "android-sdk-arm-dbt-license",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
           "revision": "30-google_apis-x86",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "16"
           },
           "type-details": {
             "abi:3": "x86",
@@ -7346,9 +7346,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "efb07cd6268d93d7e2be88883bc9249a00b378b3",
-              "size": 1438275289,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r12.zip"
+              "sha1": "6ae21030eaadc041078444d3798e4b399f3e787d",
+              "size": 1438186618,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r16.zip"
             }
           ],
           "dependencies": {
@@ -7374,13 +7374,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
-          "license": "android-sdk-arm-dbt-license",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
           "revision": "30-google_apis-x86_64",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "16"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -7428,7 +7428,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +7496,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -7564,7 +7564,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +7624,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -7676,7 +7676,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -7720,7 +7720,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -7762,7 +7762,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -7816,7 +7816,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +7872,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -7936,7 +7936,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +7992,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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",
@@ -8042,7 +8042,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -8084,7 +8084,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -8138,7 +8138,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +8194,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -8258,7 +8258,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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 +8326,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -8386,7 +8386,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -8438,7 +8438,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -8477,7 +8477,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -8514,7 +8514,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -8558,7 +8558,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -8600,7 +8600,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -8626,9 +8626,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "9e314318536875458eaf68d02d411c59a386ab59",
-              "size": 1629980162,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r15.zip"
+              "sha1": "8143bc8b517db20f1f34dd5d93a021b131d73720",
+              "size": 1751160645,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r16.zip"
             }
           ],
           "dependencies": {
@@ -8654,13 +8654,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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": "15"
+            "major:0": "16"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -8682,9 +8682,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "966eadeb61cd888a79477851e51349eed103e5c8",
-              "size": 1545118291,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r15.zip"
+              "sha1": "a18ba5146f8a10e6f3c1d45df4a8d22c68306ee3",
+              "size": 1697603005,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r16.zip"
             }
           ],
           "dependencies": {
@@ -8710,13 +8710,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
-          "license": "android-sdk-arm-dbt-license",
+          "last-available-day": 19954,
+          "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": "15"
+            "major:0": "16"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -8774,7 +8774,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "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",
@@ -8830,7 +8830,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -8862,9 +8862,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "81b98fc5c3521a3a872667851c7f6bf61dfcdd5a",
-              "size": 883278287,
-              "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r02.zip"
+              "sha1": "a31d0d8326f2c82787f95dd387614274082a96a0",
+              "size": 815200224,
+              "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r03.zip"
             }
           ],
           "dependencies": {
@@ -8890,13 +8890,13 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
           "revision": "34-android-tv-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:2": "arm64-v8a",
@@ -8914,9 +8914,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "3be0ccf9611c7125e9c43083ae3ca6abba5f45b7",
-              "size": 880214246,
-              "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r02.zip"
+              "sha1": "8de1dcb502b0b4080e6f363828db64e609b3aa2a",
+              "size": 809947873,
+              "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r03.zip"
             }
           ],
           "dependencies": {
@@ -8942,13 +8942,13 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
           "revision": "34-android-tv-x86",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:2": "x86",
@@ -8963,6 +8963,68 @@
           }
         }
       },
+      "android-wear": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "29a733a9e6d89a70f26dabff7525edc657be6b07",
+              "size": 1215167945,
+              "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,
+          "license": "android-sdk-license",
+          "name": "system-image-34-android-wear-arm64-v8a",
+          "path": "system-images/android-34/android-wear/arm64-v8a",
+          "revision": "34-android-wear-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:2": "arm64-v8a",
+            "api-level:0": "34",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Wear OS 5",
+              "id:0": "android-wear"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "851c223ddf735d692d3cca96fdffa4c1f7ca4316",
+              "size": 1209506837,
+              "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,
+          "license": "android-sdk-license",
+          "name": "system-image-34-android-wear-x86_64",
+          "path": "system-images/android-34/android-wear/x86_64",
+          "revision": "34-android-wear-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:2": "x86_64",
+            "api-level:0": "34",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Wear OS 5",
+              "id:0": "android-wear"
+            }
+          }
+        }
+      },
       "default": {
         "arm64-v8a": {
           "archives": [
@@ -8986,7 +9048,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -9028,7 +9090,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -9054,9 +9116,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "0981c5416516d609b1df5f29d3781c99d9fe061c",
-              "size": 1588261149,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r12.zip"
+              "sha1": "2fe8b46d419a3400e30f31b0152b241b50c8b99f",
+              "size": 1610393229,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r14.zip"
             }
           ],
           "dependencies": {
@@ -9082,13 +9144,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
           "revision": "34-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "14"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
@@ -9110,9 +9172,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "3392de02e09144d61e3a789c0f17ce447b70b191",
-              "size": 1541568922,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r12.zip"
+              "sha1": "e0f6c9a0691aa27bd597d0deb1bcfdc943ac8ca7",
+              "size": 1563721130,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r14.zip"
             }
           ],
           "dependencies": {
@@ -9138,13 +9200,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
-          "license": "android-sdk-arm-dbt-license",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
           "revision": "34-google_apis-x86_64",
           "revision-details": {
-            "major:0": "12"
+            "major:0": "14"
           },
           "type-details": {
             "abi:3": "x86_64",
@@ -9168,9 +9230,9 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "a4fec7b9035d6f182fad788a4c1e5fef0fa94cb1",
-              "size": 1549222105,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext8_r02.zip"
+              "sha1": "c307c3301dc52635ebc78b943c39b3c377856ebc",
+              "size": 1548905381,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r14.zip"
             },
             {
               "os": "macosx",
@@ -9208,13 +9270,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-34-ext10/google_apis_playstore/arm64-v8a",
+          "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
           "revision": "34-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:2": "arm64-v8a",
@@ -9265,13 +9327,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
-          "path": "system-images/android-34-ext10/google_apis_playstore/x86_64",
+          "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
           "revision": "34-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:2": "x86_64",
@@ -9292,6 +9354,218 @@
         }
       }
     },
+    "35": {
+      "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"
+            }
+          ],
+          "displayName": "Google APIs ARM 64 v8a System Image",
+          "last-available-day": 19954,
+          "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"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "febd4186e0d234d60fecd50a37aaabf07bac6605",
+              "size": 1689421014,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r07.zip"
+            }
+          ],
+          "displayName": "Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 19954,
+          "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"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Google APIs",
+              "id:0": "google_apis"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "ecb2b9dbedda0e8aca02b23bc069c462499731ce",
+              "size": 1776691122,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35_r07.zip"
+            }
+          ],
+          "displayName": "Google Play Experimental 16k Page Size ARM 64 v8a System Image",
+          "last-available-day": 19954,
+          "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",
+          "revision": "35-google_apis_playstore-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "archives": [
+            {
+              "os": "all",
+              "sha1": "b06db9ec697e40e2acd301653ff76bb6b2abe1d8",
+              "size": 1714146193,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35_r07.zip"
+            }
+          ],
+          "displayName": "Google Play Experimental 16k Page Size Intel x86_64 Atom System Image",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
+          "name": "system-image-35-google_apis_playstore-x86_64",
+          "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
+          "revision": "35-google_apis_playstore-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "Google APIs PlayStore",
+              "id:0": "google_apis_playstore"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      },
+      "page_size_16kb": {
+        "arm64-v8a": {
+          "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"
+            }
+          ],
+          "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
+          "last-available-day": 19954,
+          "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",
+          "revision": "35-page_size_16kb-arm64-v8a",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "arm64-v8a",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        },
+        "x86_64": {
+          "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"
+            }
+          ],
+          "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
+          "name": "system-image-35-page_size_16kb-x86_64",
+          "path": "system-images/android-35/google_apis_ps16k/x86_64",
+          "revision": "35-page_size_16kb-x86_64",
+          "revision-details": {
+            "major:0": "3"
+          },
+          "type-details": {
+            "abi:3": "x86_64",
+            "api-level:0": "35",
+            "element-attributes": {
+              "xsi:type": "ns12:sysImgDetailsType"
+            },
+            "tag:1": {
+              "display:1": "16 KB Page Size",
+              "id:0": "page_size_16kb"
+            },
+            "vendor:2": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            }
+          }
+        }
+      }
+    },
     "TiramisuPrivacySandbox": {
       "google_apis": {
         "arm64-v8a": {
@@ -9316,7 +9590,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-TiramisuPrivacySandbox-google_apis-arm64-v8a",
           "path": "system-images/android-TiramisuPrivacySandbox/google_apis/arm64-v8a",
@@ -9363,7 +9637,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-TiramisuPrivacySandbox-google_apis-x86_64",
           "path": "system-images/android-TiramisuPrivacySandbox/google_apis/x86_64",
@@ -9428,7 +9702,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a",
@@ -9485,7 +9759,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64",
           "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64",
@@ -9772,7 +10046,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a",
@@ -9829,7 +10103,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-preview-license",
           "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64",
           "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64",
@@ -9862,22 +10136,23 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "d87d6bb8cc98e91bd76a3585fed3f3616ad3140b",
-              "size": 1852895338,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r03.zip"
+              "sha1": "896dec0aaae40954e2da30527f0763f292511217",
+              "size": 1737853248,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r05.zip"
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-VanillaIceCream-google_apis-arm64-v8a",
           "path": "system-images/android-VanillaIceCream/google_apis/arm64-v8a",
           "revision": "VanillaIceCream-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
+            "abi:4": "arm64-v8a",
             "api-level:0": "34",
             "codename:1": "VanillaIceCream",
             "element-attributes": {
@@ -9886,6 +10161,10 @@
             "tag:2": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
             }
           }
         },
@@ -9893,22 +10172,23 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "f64e861db5568cfb0e6392dd4b34d78e41c1be8c",
-              "size": 1648708425,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r03.zip"
+              "sha1": "2efa686b5a420f3b9cb30e45a1e0e78a10a5fba8",
+              "size": 1682110854,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r05.zip"
             }
           ],
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-VanillaIceCream-google_apis-x86_64",
           "path": "system-images/android-VanillaIceCream/google_apis/x86_64",
           "revision": "VanillaIceCream-google_apis-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "x86_64",
+            "abi:4": "x86_64",
             "api-level:0": "34",
             "codename:1": "VanillaIceCream",
             "element-attributes": {
@@ -9917,6 +10197,10 @@
             "tag:2": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
             }
           }
         }
@@ -9926,22 +10210,23 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "d0b5b5d7a7df6df55aa41b49460936ecf72625d1",
-              "size": 1863404889,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r03.zip"
+              "sha1": "41c8b6df52b60c76881fa5f819363678f9ef096c",
+              "size": 1745670932,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r05.zip"
             }
           ],
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-VanillaIceCream-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-VanillaIceCream/google_apis_playstore/arm64-v8a",
           "revision": "VanillaIceCream-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "arm64-v8a",
+            "abi:4": "arm64-v8a",
             "api-level:0": "34",
             "codename:1": "VanillaIceCream",
             "element-attributes": {
@@ -9950,6 +10235,10 @@
             "tag:2": {
               "display:1": "Google Play",
               "id:0": "google_apis_playstore"
+            },
+            "vendor:3": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
             }
           }
         },
@@ -9957,22 +10246,23 @@
           "archives": [
             {
               "os": "all",
-              "sha1": "3bfcf04fc5476d65588fbfc51798a9bbc94b5e19",
-              "size": 1673530237,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r03.zip"
+              "sha1": "0d4c047003eaa8c78698f9aea0708e71b0895248",
+              "size": 1704139494,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r05.zip"
             }
           ],
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 19823,
+          "last-available-day": 19954,
           "license": "android-sdk-license",
           "name": "system-image-VanillaIceCream-google_apis_playstore-x86_64",
           "path": "system-images/android-VanillaIceCream/google_apis_playstore/x86_64",
           "revision": "VanillaIceCream-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "5"
           },
           "type-details": {
             "abi:3": "x86_64",
+            "abi:4": "x86_64",
             "api-level:0": "34",
             "codename:1": "VanillaIceCream",
             "element-attributes": {
@@ -9981,6 +10271,82 @@
             "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": "167fc0f1baae778d3382a7ec4a463a1bfbc3253c",
+              "size": 1392391828,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-VanillaIceCream_r01.zip"
+            }
+          ],
+          "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
+          "last-available-day": 19954,
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-VanillaIceCream-page_size_16kb-arm64-v8a",
+          "path": "system-images/android-VanillaIceCream/google_apis_ps16k/arm64-v8a",
+          "revision": "VanillaIceCream-page_size_16kb-arm64-v8a",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "arm64-v8a",
+            "api-level:0": "34",
+            "codename:1": "VanillaIceCream",
+            "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": "4a48eab34ea526f9a4cd60948ed7e6698b3e5cfd",
+              "size": 1332306731,
+              "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-VanillaIceCream_r01.zip"
+            }
+          ],
+          "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
+          "last-available-day": 19954,
+          "license": "android-sdk-license",
+          "name": "system-image-VanillaIceCream-page_size_16kb-x86_64",
+          "path": "system-images/android-VanillaIceCream/google_apis_ps16k/x86_64",
+          "revision": "VanillaIceCream-page_size_16kb-x86_64",
+          "revision-details": {
+            "major:0": "1"
+          },
+          "type-details": {
+            "abi:4": "x86_64",
+            "api-level:0": "34",
+            "codename:1": "VanillaIceCream",
+            "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"
             }
           }
         }
@@ -10044,7 +10410,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10090,7 +10456,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10136,7 +10502,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10182,7 +10548,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10228,7 +10594,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10274,7 +10640,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10320,7 +10686,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10366,7 +10732,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10412,7 +10778,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -10457,7 +10823,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -10502,7 +10868,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10548,7 +10914,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10594,7 +10960,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10640,7 +11006,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10686,7 +11052,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10732,7 +11098,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -10777,7 +11143,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10823,7 +11189,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -10868,7 +11234,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -10914,7 +11280,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -10959,7 +11325,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -11004,7 +11370,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -11049,7 +11415,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -11094,7 +11460,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -11139,7 +11505,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -11184,7 +11550,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -11229,7 +11595,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -11274,7 +11640,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -11319,7 +11685,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -11364,7 +11730,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -11409,7 +11775,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -11454,7 +11820,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -11499,7 +11865,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -11544,7 +11910,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -11589,7 +11955,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -11634,7 +12000,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -11679,7 +12045,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -11724,7 +12090,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -11769,7 +12135,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -11814,7 +12180,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11861,7 +12227,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -11908,7 +12274,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -11953,7 +12319,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -11998,7 +12364,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -12043,7 +12409,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -12088,7 +12454,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12135,7 +12501,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12182,7 +12548,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -12229,7 +12595,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -12274,7 +12640,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -12319,7 +12685,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -12364,7 +12730,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -12409,7 +12775,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -12454,7 +12820,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -12499,7 +12865,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -12537,7 +12903,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -12575,7 +12941,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -12613,7 +12979,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -12652,7 +13018,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -12690,7 +13056,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -12728,7 +13094,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -12766,7 +13132,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -12804,7 +13170,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -12842,7 +13208,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -12881,7 +13247,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -12920,7 +13286,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -12976,6 +13342,44 @@
           }
         }
       },
+      "35.0.0": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "2cfaa0bbb2336e9ec18ed3ecea84fa2e2af607bc",
+            "size": 61958799,
+            "url": "https://dl.google.com/android/repository/build-tools_r35_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "af059bb67cf7786f45ee0db85e2d24985df1b4b6",
+            "size": 59878107,
+            "url": "https://dl.google.com/android/repository/build-tools_r35_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "93ab8ce91230e067b5add4bfa79919c52b27f072",
+            "size": 76857898,
+            "url": "https://dl.google.com/android/repository/build-tools_r35_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 35",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "build-tools",
+        "path": "build-tools/35.0.0",
+        "revision": "35.0.0",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "0",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "35.0.0-rc1": {
         "archives": [
           {
@@ -12998,7 +13402,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -13037,7 +13441,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -13053,6 +13457,84 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.0.0-rc3": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "25a13fd75a525385d77864f5470db9c1c48b5a40",
+            "size": 62746687,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "f04f402d7d92edc14502e7b94034d1a1695ac12e",
+            "size": 59812048,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f0d2a565d3634d2fd7a22838eafad792e8538c0a",
+            "size": 78263822,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 35-rc3",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/35.0.0-rc3",
+        "revision": "35.0.0-rc3",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "35.0.0-rc4": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "08049ed693a2ba9bf6b9fa0edec897abac9f85ed",
+            "size": 61882448,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "e08195bf5ce51105aca15f9eba758fceeb7b4b5d",
+            "size": 59901374,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_windows.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "d9ce6ae1b0d720d7c2abd6510843c881f9d65188",
+            "size": 76832786,
+            "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_macosx.zip"
+          }
+        ],
+        "displayName": "Android SDK Build-Tools 35-rc4",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "build-tools",
+        "path": "build-tools/35.0.0-rc4",
+        "revision": "35.0.0-rc4",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "0",
+          "minor:1": "0",
+          "preview:3": "4"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmake": {
@@ -13078,7 +13560,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -13116,7 +13598,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -13154,7 +13636,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -13192,7 +13674,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -13232,7 +13714,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -13269,7 +13751,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -13344,7 +13826,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -13457,7 +13939,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -13532,7 +14014,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -13569,7 +14051,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -13607,7 +14089,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -13623,6 +14105,44 @@
           }
         }
       },
+      "16.0-rc01": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "818d632f1d727edaecd4ff94aa5f86b5a8a129a6",
+            "size": 165618743,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-12172612_latest.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "8c7e4cc8fa9b2594ab8b56343bf56618ebdf04b9",
+            "size": 143967294,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-12172612_latest.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "b2ae4d96dca0f10358a041adc9b79eedf399779b",
+            "size": 143481957,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-12172612_latest.zip"
+          }
+        ],
+        "displayName": "Android SDK Command-line Tools",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "cmdline-tools",
+        "path": "cmdline-tools/16.0-alpha01",
+        "revision": "16.0-rc01",
+        "revision-details": {
+          "major:0": "16",
+          "minor:1": "0",
+          "preview:2": "01"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "2.0": {
         "archives": [
           {
@@ -13645,7 +14165,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -13683,7 +14203,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -13720,7 +14240,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -13757,7 +14277,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -13794,7 +14314,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -13831,7 +14351,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -13868,7 +14388,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -13905,7 +14425,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -13942,7 +14462,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -14599,6 +15119,82 @@
           }
         }
       },
+      "34.2.16": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "fe7a96bf6fbe7b026555dd7f76b713f22a07ec8b",
+            "size": 292750827,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12038310.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "8da9494f5a08c2a04f50aeef543fd32ca8424f12",
+            "size": 387388734,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12038310.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "76a5cbca04dc11bc04421e30392e78ab3b744d33",
+            "size": 412503831,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12038310.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "34.2.16",
+        "revision-details": {
+          "major:0": "34",
+          "micro:2": "16",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "35.1.19": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "728fb67266a7648aee58c1f4eaadeb8781c646d8",
+            "size": 295185796,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12171648.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "a7c61d2f057186e54f41e0573f5cb5659daca9c4",
+            "size": 390781280,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12171648.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "a954a95bf3f49907ea8e3b4dbeda8f963394540c",
+            "size": 420058404,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12171648.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.1.19",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "19",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "35.1.2": {
         "archives": [
           {
@@ -14712,6 +15308,44 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.2.5": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "cc22b6fb2d6dbb17f436af29364929aba5f776ae",
+            "size": 301992613,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-12205771.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "32e32d993b1af0c4c93a3aed775baeed881e0ce7",
+            "size": 399727915,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12205771.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "739dd017682373c745ec60189d2cb52be016181d",
+            "size": 426685873,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-12205771.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "35.2.5",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "5",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -14737,7 +15371,7 @@
           }
         ],
         "displayName": "Android Auto Desktop Head Unit Emulator",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "extras",
         "path": "extras/google/auto",
@@ -14774,7 +15408,7 @@
           }
         ],
         "displayName": "Android Auto Desktop Head Unit Emulator",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "extras",
         "path": "extras/google/auto",
@@ -14820,7 +15454,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -14865,7 +15499,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -14910,7 +15544,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -14955,7 +15589,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15001,7 +15635,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -15046,7 +15680,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15093,7 +15727,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -15140,7 +15774,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -15185,7 +15819,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -15230,7 +15864,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -15276,7 +15910,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -15321,7 +15955,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -15367,7 +16001,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -15413,7 +16047,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -15458,7 +16092,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -15504,7 +16138,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -15549,7 +16183,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -15594,7 +16228,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -15639,7 +16273,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -15685,7 +16319,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -15730,7 +16364,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -15775,7 +16409,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -15821,7 +16455,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -15867,7 +16501,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -15913,7 +16547,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -15959,7 +16593,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -16005,7 +16639,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -16051,7 +16685,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -16096,7 +16730,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -16141,7 +16775,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -16186,7 +16820,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -16232,7 +16866,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -16278,7 +16912,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -16324,7 +16958,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -16369,7 +17003,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -16415,7 +17049,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -16461,7 +17095,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -16507,7 +17141,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -16553,7 +17187,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -16598,7 +17232,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -16643,7 +17277,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -16688,7 +17322,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -16727,7 +17361,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -16766,7 +17400,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -16804,7 +17438,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -16842,7 +17476,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -16880,7 +17514,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -16895,6 +17529,122 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "27.0.11718014-rc1": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "35a78f7544ccc72d8438d8ea2feb7f252a062abe",
+            "size": 658958615,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "0206d7e1c4255c40acc691fad8bf943f055e627e",
+            "size": 841636299,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "147b5b333cc57875e34b88ccd29efbe58963264d",
+            "size": 785017110,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.0.11718014",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/27.0.11718014",
+        "revision": "27.0.11718014-rc1",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "11718014",
+          "minor:1": "0",
+          "preview:3": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "27.0.11902837-rc2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "93103e182405b9d7757231a1d9dad58937a6374b",
+            "size": 662398163,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "48af6bb62dbfff2f68b39cf118494ebd5ba3b8ad",
+            "size": 836162827,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "30f4103bc32fd28a5b93bb610db0130cfe9ff125",
+            "size": 781461627,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.0.11902837",
+        "last-available-day": 19954,
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/27.0.11902837",
+        "revision": "27.0.11902837-rc2",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "11902837",
+          "minor:1": "0",
+          "preview:3": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
+      "27.0.12077973": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "5e5cd517bdb98d7e0faf2c494a3041291e71bdcc",
+            "size": 663957918,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "1a4a8c39c018430ff170657fc1673d895f5e4570",
+            "size": 836135405,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "0ea2756e6815356831bda3af358cce4cdb6a981e",
+            "size": 781482169,
+            "url": "https://dl.google.com/android/repository/android-ndk-r27-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 27.0.12077973",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/27.0.12077973",
+        "revision": "27.0.12077973",
+        "revision-details": {
+          "major:0": "27",
+          "micro:2": "12077973",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "ndk-bundle": {
@@ -16927,7 +17677,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -16972,7 +17722,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17017,7 +17767,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17062,7 +17812,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17108,7 +17858,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17153,7 +17903,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17200,7 +17950,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -17247,7 +17997,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17292,7 +18042,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17337,7 +18087,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17383,7 +18133,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17428,7 +18178,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17474,7 +18224,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17520,7 +18270,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17565,7 +18315,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17611,7 +18361,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17656,7 +18406,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17701,7 +18451,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17746,7 +18496,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17792,7 +18542,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17837,7 +18587,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17882,7 +18632,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17928,7 +18678,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -17974,7 +18724,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18020,7 +18770,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -18254,6 +19004,44 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "35.0.2": {
+        "archives": [
+          {
+            "os": "linux",
+            "sha1": "f6406982a79d67e40b1ca3cb9e5e2cc783c0f232",
+            "size": 7472902,
+            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "f6b3158097ca0e9d6fe2024b790ac68af3f2faf2",
+            "size": 13335867,
+            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-darwin.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "6d204cdff21bce8a39c1d2367084e6174f854c2c",
+            "size": 6700829,
+            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-win.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "35.0.2",
+        "revision-details": {
+          "major:0": "35",
+          "micro:2": "2",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "platforms": {
@@ -18267,7 +19055,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -18299,7 +19087,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -18331,7 +19119,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -18363,7 +19151,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -18395,7 +19183,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -18427,7 +19215,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -18459,7 +19247,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -18491,7 +19279,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -18523,7 +19311,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -18555,7 +19343,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -18599,7 +19387,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -18632,7 +19420,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -18664,7 +19452,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -18696,7 +19484,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -18728,7 +19516,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -18760,7 +19548,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -18792,7 +19580,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -18824,7 +19612,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -18856,7 +19644,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -18888,7 +19676,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -18920,7 +19708,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -18964,7 +19752,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -18997,7 +19785,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -19029,7 +19817,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -19061,7 +19849,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -19093,7 +19881,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -19124,8 +19912,8 @@
             "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip"
           }
         ],
-        "displayName": "Android SDK Platform 34-ext10",
-        "last-available-day": 19823,
+        "displayName": "Android SDK Platform 34-ext12",
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19141,6 +19929,11 @@
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
+          "layoutlib:1": {
+            "element-attributes": {
+              "api": "15"
+            }
+          },
           "layoutlib:2": {
             "element-attributes": {
               "api": "15"
@@ -19148,6 +19941,36 @@
           }
         }
       },
+      "35": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "c84ed39cecaeec13bc06c67639fcf86734013d98",
+            "size": 64281654,
+            "url": "https://dl.google.com/android/repository/platform-35_r01.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 35",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-35",
+        "revision": "35",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "35",
+          "element-attributes": {
+            "xsi:type": "ns11:platformDetailsType"
+          },
+          "layoutlib:1": {
+            "element-attributes": {
+              "api": "15"
+            }
+          }
+        }
+      },
       "4": {
         "archives": [
           {
@@ -19170,7 +19993,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19215,7 +20038,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19260,7 +20083,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19293,7 +20116,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -19325,7 +20148,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -19357,7 +20180,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -19389,7 +20212,7 @@
           }
         ],
         "displayName": "Android SDK Platform TiramisuPrivacySandbox",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-TiramisuPrivacySandbox",
@@ -19420,7 +20243,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -19452,7 +20275,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-UpsideDownCakePrivacySandbox",
@@ -19477,19 +20300,19 @@
         "archives": [
           {
             "os": "all",
-            "sha1": "b95f5a8a2bb908f8d13b6f874ab622e194c5aa20",
-            "size": 64097940,
-            "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r02.zip"
+            "sha1": "593df928592daf8e8b904a1680f54be715b32e98",
+            "size": 64462100,
+            "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r04.zip"
           }
         ],
         "displayName": "Android SDK Platform VanillaIceCream",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-VanillaIceCream",
         "revision": "VanillaIceCream",
         "revision-details": {
-          "major:0": "2"
+          "major:0": "4"
         },
         "type-details": {
           "api-level:0": "34",
@@ -19564,7 +20387,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -19600,7 +20423,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-35",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -19636,7 +20459,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -19662,7 +20485,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -19690,7 +20513,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -19717,7 +20540,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -19744,7 +20567,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -19771,7 +20594,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -19798,7 +20621,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -19825,7 +20648,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -19852,7 +20675,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -19879,7 +20702,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -19906,7 +20729,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -19933,7 +20756,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -19960,7 +20783,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -19987,7 +20810,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -20014,7 +20837,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -20041,7 +20864,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -20068,7 +20891,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -20095,7 +20918,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -20122,7 +20945,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -20149,7 +20972,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -20176,7 +20999,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -20203,7 +21026,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -20219,6 +21042,33 @@
             "xsi:type": "ns11:sourceDetailsType"
           }
         }
+      },
+      "35": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "c2770115a5f5ad787c8b298b93687a27eebb85b9",
+            "size": 48616636,
+            "url": "https://dl.google.com/android/repository/source-35_r01.zip"
+          }
+        ],
+        "displayName": "Sources for Android 35",
+        "last-available-day": 19954,
+        "license": "android-sdk-license",
+        "name": "sources",
+        "path": "sources/android-35",
+        "revision": "35",
+        "revision-details": {
+          "major:0": "1"
+        },
+        "type-details": {
+          "api-level:0": "35",
+          "codename:1": {
+          },
+          "element-attributes": {
+            "xsi:type": "ns11:sourceDetailsType"
+          }
+        }
       }
     },
     "tools": {
@@ -20267,7 +21117,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 19823,
+        "last-available-day": 19954,
         "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 f8332ddd3654..b81b0d60678a 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -136,6 +136,7 @@ mapAliases {
   inherit (pkgs) node-pre-gyp; # added 2024-08-05
   inherit (pkgs) node-red; # added 2024-10-06
   inherit (pkgs) nodemon; # added 2024-06-28
+  npm = pkgs.nodejs.overrideAttrs (old: { meta = old.meta // { mainProgram = "npm"; }; }); # added 2024-10-04
   inherit (pkgs) npm-check-updates; # added 2023-08-22
   ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
   parcel-bundler = self.parcel; # added 2023-09-04
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3844e327f3da..ba88f38d9fcf 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -147,7 +147,6 @@
 , "node-gyp-build"
 , "node2nix"
 , "np"
-, "npm"
 , "npm-merge-driver"
 , "nrm"
 , "orval"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 42ca576348cb..5183a1811ca7 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -76280,24 +76280,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  npm = nodeEnv.buildNodePackage {
-    name = "npm";
-    packageName = "npm";
-    version = "10.8.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz";
-      sha512 = "0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "a package manager for JavaScript";
-      homepage = "https://docs.npmjs.com/";
-      license = "Artistic-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   npm-merge-driver = nodeEnv.buildNodePackage {
     name = "npm-merge-driver";
     packageName = "npm-merge-driver";
diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix
index a9eba3978ae2..4216dd180cf2 100644
--- a/pkgs/development/python-modules/datasalad/default.nix
+++ b/pkgs/development/python-modules/datasalad/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "datasalad";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datasalad";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WkU3MqAveeANrRGLj1A4UGlT5Sel5wxNcYbIeKlPIqE=";
+    hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 316c604750ab..ce56a19501cc 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    broken = true;
     description = "Communication library between internal components for Ultimaker software";
     homepage = "https://github.com/Ultimaker/libArcus";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index b0d9c72ad224..b6db8634c06e 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bloop";
-  version = "2.0.2";
+  version = "2.0.3";
 
   platform =
     if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux"
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
   bloop-binary = fetchurl rec {
     url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
     sha256 =
-      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4="
-      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg="
-      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk="
+      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-aEsEXGaKi+wziNAuuX3s/LWB6/fIjon9NF3w9c/lTUE="
+      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-dEVWDwFVsg1eqrAAfuuR5FUFyAt44ev7UP7zxByzW14="
+      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-0rYdivIas6ECwGPm3bACMzHhS+yxQNLtEPxPQAXkSg0="
       else throw "unsupported platform";
   };
 
@@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
     description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
     mainProgram = "bloop";
     platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
-    maintainers = with maintainers; [ kubukoz tomahna ];
+    maintainers = with maintainers; [ agilesteel kubukoz tomahna ];
   };
 }
diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix
index 5d2be8f5a4c8..f30459a08d66 100644
--- a/pkgs/development/tools/misc/terramate/default.nix
+++ b/pkgs/development/tools/misc/terramate/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "terramate";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${version}";
-    hash = "sha256-6IG6wIKz13yBR+LZYkabfckUomIEcjpGbHZ7HCvGs7M=";
+    hash = "sha256-CvvOJO57DotHpLB2FiAyYhF+WWXGuKEKCksnBWBiZ20=";
   };
 
   vendorHash = "sha256-kjzpXOoyTwjpYLBqDuB6Eup5Yzgej2U+HUo4z8V+cEI=";
@@ -30,6 +30,6 @@ buildGoModule rec {
     homepage = "https://github.com/terramate-io/terramate";
     changelog = "https://github.com/terramate-io/terramate/releases/tag/v${version}";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ dit7ya ];
+    maintainers = with maintainers; [ dit7ya asininemonkey ];
   };
 }
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index aec4eab2e5de..67e90744c5d0 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -8,8 +8,8 @@ let
       hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY=";
     };
     "9" = {
-      version = "9.12.0";
-      hash = "sha256-phtn/2zJevhkVk9EQlVsIqBPLlp3FPvudqEBE2HZtyY=";
+      version = "9.12.1";
+      hash = "sha256-kUUv36RiNK5EfUbVxPxOfgpwWPkElcS293+L7ruxVOM=";
     };
   };
 
diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix
deleted file mode 100644
index 89ebe14cb41e..000000000000
--- a/pkgs/games/osu-lazer/bin.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchzip
-, appimageTools
-, makeWrapper
-}:
-
-let
-  pname = "osu-lazer-bin";
-  version = "2024.906.2";
-
-  src = {
-    aarch64-darwin = fetchzip {
-      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      hash = "sha256-KyvC8gEqZvXMATxS2513X0WdlR7nF8tHS4R/TPFrHao=";
-      stripRoot = false;
-    };
-    x86_64-darwin = fetchzip {
-      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      hash = "sha256-ToxDZHL59YPmybvB9tsiOnFEd+FJJE4mNMfaK6btYKo=";
-      stripRoot = false;
-    };
-    x86_64-linux = fetchurl {
-      url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      hash = "sha256-zQnR3KwlE1gTWH8f+GDRBsc7Whfn9XpT1D/NLg5TtrU=";
-    };
-  }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
-
-  meta = {
-    description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)";
-    homepage = "https://osu.ppy.sh";
-    license = with lib.licenses; [
-      mit
-      cc-by-nc-40
-      unfreeRedistributable # osu-framework contains libbass.so in repository
-    ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ gepbird stepbrobd ];
-    mainProgram = "osu!";
-    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
-  };
-
-  passthru.updateScript = ./update-bin.sh;
-in
-if stdenv.hostPlatform.isDarwin
-then stdenv.mkDerivation {
-  inherit pname version src meta passthru;
-
-  installPhase = ''
-    runHook preInstall
-    APP_DIR="$out/Applications"
-    mkdir -p "$APP_DIR"
-    cp -r . "$APP_DIR"
-    runHook postInstall
-  '';
-}
-else appimageTools.wrapType2 {
-  inherit pname version src meta passthru;
-
-  extraPkgs = pkgs: with pkgs; [ icu ];
-
-  extraInstallCommands =
-    let
-      contents = appimageTools.extract { inherit pname version src; };
-    in
-    ''
-      . ${makeWrapper}/nix-support/setup-hook
-      mv -v $out/bin/${pname} $out/bin/osu!
-      wrapProgram $out/bin/osu! \
-        --set OSU_EXTERNAL_UPDATE_PROVIDER 1
-      install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications
-      for i in 16 32 48 64 96 128 256 512 1024; do
-        install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png
-      done
-    '';
-}
diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index a8efe02630e0..0ea8bc830ba9 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -60,7 +60,7 @@
         "version": "1.21-130"
     },
     "1.21.1": {
-        "hash": "sha256-1oKvRB00bfdJZ7uVsUabv9EAFiT2YwEsLXetQ3BrVvA=",
-        "version": "1.21.1-110"
+        "hash": "sha256-/vQuRNBU4elCAkkZxw1DVJcAYUM+wb9p7jjXYHOZ/3o=",
+        "version": "1.21.1-119"
     }
 }
diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix
deleted file mode 100644
index 5e29b911ca54..000000000000
--- a/pkgs/os-specific/linux/waydroid/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ lib
-, fetchFromGitHub
-, fetchpatch
-, python3Packages
-, dnsmasq
-, gawk
-, getent
-, gobject-introspection
-, gtk3
-, kmod
-, lxc
-, iproute2
-, iptables
-, util-linux
-, wrapGAppsHook3
-, wl-clipboard
-, runtimeShell
-}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "waydroid";
-  version = "1.4.2";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI=";
-  };
-
-  patches = [
-    # https://github.com/waydroid/waydroid/pull/1218
-    (fetchpatch {
-      url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch";
-      hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    gobject-introspection
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk3
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    dbus-python
-    gbinder-python
-    pyclip
-    pygobject3
-  ];
-
-  dontUseSetuptoolsBuild = true;
-  dontUsePipInstall = true;
-  dontUseSetuptoolsCheck = true;
-  dontWrapPythonPrograms = true;
-  dontWrapGApps = true;
-
-  installPhase = ''
-    make install PREFIX=$out USE_SYSTEMD=0
-  '';
-
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-
-    patchShebangs --host $out/lib/waydroid/data/scripts
-    wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \
-      --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]}
-
-    wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([
-      "$out"
-    ] ++ propagatedBuildInputs ++ [
-      gawk
-      kmod
-      lxc
-      util-linux
-      wl-clipboard
-    ])}"
-
-    substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
-      --replace '"sh"' '"${runtimeShell}"'
-  '';
-
-  meta = {
-    description = "Waydroid is a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu";
-    mainProgram = "waydroid";
-    homepage = "https://github.com/waydroid/waydroid";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ mcaju ];
-  };
-}
diff --git a/pkgs/servers/authelia/update.sh b/pkgs/servers/authelia/update.sh
index 21776af2a033..a7f56fc6c571 100755
--- a/pkgs/servers/authelia/update.sh
+++ b/pkgs/servers/authelia/update.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodePackages.npm
+#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodejs
 set -euo pipefail
 
 DRV_DIR="$(dirname "${BASH_SOURCE[0]}")"
diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix
index e975b7515b0e..15f79d125915 100644
--- a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "marcolivierarsenault";
   domain = "moonraker";
-  version = "1.3.5";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "marcolivierarsenault";
     repo = "moonraker-home-assistant";
     rev = "refs/tags/${version}";
-    hash = "sha256-DufryUG4+tT77ErD6IzEkClnNJ4Rzz0ojkCZuZzhAlU=";
+    hash = "sha256-Mz78wCBP3U1CWbr3KajZ5RjQOIqhjFvmL9Walx+xxzQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix
index 0db6ded31699..78f998952c91 100644
--- a/pkgs/servers/sql/rqlite/default.nix
+++ b/pkgs/servers/sql/rqlite/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "rqlite";
-  version = "8.31.0";
+  version = "8.31.2";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-7yuc3W298Fay5A16a74TKuDd3huhtCpbefyI+aobgqM=";
+    sha256 = "sha256-qxv7HuT7nV0Kr95WH1o02qbtn+oA85b4ZHm/rHGq25A=";
   };
 
   vendorHash = "sha256-P8v0vqxOfN9JjwsdoM6JmqGujGP5V68OAUc3KB/YU+k=";
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index f062ee261fcb..4c5dad4590c2 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "argyllcms";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
-    hash = "sha256-t2dvbYFHEz9IUYpcM5HqDju4ugHrD7seG3QxumspxDg=";
+    hash = "sha256-xpbj15GzpGS0d1UjzvYiZ1nmmTjNIyv0ST2blmi7ZSk=";
   };
 
   nativeBuildInputs = [ jam unzip ];
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index c01e2c2cff0d..f4d7700b9000 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nethogs";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
     rev = "v${version}";
-    sha256 = "10shdwvfj90lp2fxz9260342a1c2n1jbw058qy5pyq5kh3xwr9b8";
+    sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU=";
   };
 
   buildInputs = [ ncurses libpcap ];
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 895b4300ac45..bf3f8e39e219 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -9,6 +9,7 @@
   cacert,
   git,
   nix,
+  versionCheckHook,
 
   withAutocomplete ? true,
   withSandboxSupport ? false,
@@ -17,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.10.5";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     rev = "refs/tags/${version}";
-    hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ=";
+    hash = "sha256-QK9VTMh31aaY+DXHKVzSETMyzCD4jVw3d4ntBnmlkO8=";
   };
 
   build-system = [
@@ -57,8 +58,6 @@ python3Packages.buildPythonApplication rec {
       "--unset PYTHONPATH"
     ];
 
-  doCheck = false;
-
   postInstall = lib.optionalString withAutocomplete ''
     for cmd in nix-review nixpkgs-review; do
       installShellCompletion --cmd $cmd \
@@ -68,13 +67,18 @@ python3Packages.buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
     changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
     description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
     homepage = "https://github.com/Mic92/nixpkgs-review";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "nixpkgs-review";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       mic92
     ];
diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix
index 6d8c4cd28c0b..481a75e1bd12 100644
--- a/pkgs/tools/text/riffdiff/default.nix
+++ b/pkgs/tools/text/riffdiff/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     rev = version;
-    hash = "sha256-V+YR0j0Dpmsc2psXb/sb/Rp4Eu8/uuBAkmYTPOfkC+g=";
+    hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ=";
   };
 
-  cargoHash = "sha256-/xUMfORiZVj5RmDweLCDdD6MkgzCIsTdiYpyO3CDT+M=";
+  cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg=";
 
   meta = with lib; {
     description = "Diff filter highlighting which line parts have changed";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96802e0e53c3..58a3146708ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3826,8 +3826,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  waydroid = callPackage ../os-specific/linux/waydroid { };
-
   wgo = callPackage ../development/tools/wgo { };
 
   wiiload = callPackage ../development/tools/wiiload { };
@@ -10158,8 +10156,6 @@ with pkgs;
 
   ms-sys = callPackage ../tools/misc/ms-sys { };
 
-  mtdutils = callPackage ../tools/filesystems/mtdutils { };
-
   mtools = callPackage ../tools/filesystems/mtools { };
 
   mtr = callPackage ../tools/networking/mtr { };
@@ -26356,8 +26352,6 @@ with pkgs;
 
   rojo = callPackage ../development/tools/rojo { };
 
-  mediamtx = callPackage ../servers/mediamtx { };
-
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
   rt-tests = callPackage ../os-specific/linux/rt-tests { };
@@ -28429,7 +28423,7 @@ with pkgs;
   cardo = callPackage ../data/fonts/cardo { };
 
   cage = callPackage ../applications/window-managers/cage {
-    wlroots = wlroots_0_17;
+    wlroots = wlroots_0_18;
   };
 
   calf = callPackage ../applications/audio/calf {
@@ -34431,10 +34425,6 @@ with pkgs;
 
   opensearch = callPackage ../servers/search/opensearch { };
 
-  osu-lazer = callPackage ../games/osu-lazer { };
-
-  osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { };
-
   pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
 
   qgo = libsForQt5.callPackage ../games/qgo { };