From 962b58fcf2df7ed474461cc3c432c84f466a5cf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 04:50:33 +0000 Subject: [PATCH 01/48] irpf: 2025-1.2 -> 2025-1.3 --- pkgs/by-name/ir/irpf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index ec23c1b4a292..c5aeda60c640 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2025-1.2"; + version = "2025-1.3"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-RlkDioXLcD3wHm9DDLw42QCRT4z0rEwlM0sGMORxk/A="; + hash = "sha256-BWCxnKPvkijVkXfbA1iVbdcgLZqY5SAzASqnzdjXwiw="; }; passthru.updateScript = writeScript "update-irpf" '' From 19103e65ebcb68579b1df963f0dd6e86a5311da2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 23 May 2025 13:10:54 +0000 Subject: [PATCH 02/48] cucumber: 9.2.0 -> 9.2.1 --- pkgs/by-name/cu/cucumber/Gemfile.lock | 24 ++++++++-------- pkgs/by-name/cu/cucumber/gemset.nix | 40 +++++++++++++-------------- pkgs/by-name/cu/cucumber/package.nix | 4 +-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/cu/cucumber/Gemfile.lock b/pkgs/by-name/cu/cucumber/Gemfile.lock index cc2f3d54144d..5730c2bb6b82 100644 --- a/pkgs/by-name/cu/cucumber/Gemfile.lock +++ b/pkgs/by-name/cu/cucumber/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - bigdecimal (3.1.7) - builder (3.2.4) - cucumber (9.2.0) + bigdecimal (3.1.9) + builder (3.3.0) + cucumber (9.2.1) builder (~> 3.2) cucumber-ci-environment (> 9, < 11) cucumber-core (> 13, < 14) @@ -16,23 +16,23 @@ GEM multi_test (~> 1.1) sys-uname (~> 1.2) cucumber-ci-environment (10.0.1) - cucumber-core (13.0.1) + cucumber-core (13.0.3) cucumber-gherkin (>= 27, < 28) cucumber-messages (>= 20, < 23) cucumber-tag-expressions (> 5, < 7) - cucumber-cucumber-expressions (17.0.2) + cucumber-cucumber-expressions (17.1.0) bigdecimal cucumber-gherkin (27.0.0) cucumber-messages (>= 19.1.4, < 23) - cucumber-html-formatter (21.3.0) - cucumber-messages (> 19, < 25) + cucumber-html-formatter (21.9.0) + cucumber-messages (> 19, < 28) cucumber-messages (22.0.0) - cucumber-tag-expressions (6.1.0) - diff-lcs (1.5.1) - ffi (1.16.3) + cucumber-tag-expressions (6.1.2) + diff-lcs (1.6.2) + ffi (1.17.2) mini_mime (1.1.5) multi_test (1.1.0) - sys-uname (1.2.3) + sys-uname (1.3.1) ffi (~> 1.1) PLATFORMS @@ -42,4 +42,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 2.5.6 + 2.6.6 diff --git a/pkgs/by-name/cu/cucumber/gemset.nix b/pkgs/by-name/cu/cucumber/gemset.nix index ae0dee703c99..2bbb79135cd8 100644 --- a/pkgs/by-name/cu/cucumber/gemset.nix +++ b/pkgs/by-name/cu/cucumber/gemset.nix @@ -4,20 +4,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.9"; }; builder = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; cucumber = { dependencies = [ @@ -37,10 +37,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19qsfgahkah4k0pajxc04mjn8pig7g4n9nkcarg1nzs2612c29s8"; + sha256 = "0cbi1g6qwdh38z2jxm8a1mc63iz887108747c99s3g452hwn2hgs"; type = "gem"; }; - version = "9.2.0"; + version = "9.2.1"; }; cucumber-ci-environment = { groups = [ "default" ]; @@ -62,10 +62,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jf5ngxfc1q2y7l2nci3p91gp253aqdhkhazkz0yxq72n6zrszvm"; + sha256 = "0i2k5j3l8yy1367hzmg7x3xy984bnmihnzjh0ic8s2nwb3b2h770"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; cucumber-cucumber-expressions = { dependencies = [ "bigdecimal" ]; @@ -73,10 +73,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wsczwaqws1hbkirjhl0lh5s5xhc7cpmj2f790lkx10nr85rbpxi"; + sha256 = "14fkk7bfzm9cyacgcyzgkjc3nblflz4rcnlyz0pzd1ypwpqrvgm1"; type = "gem"; }; - version = "17.0.2"; + version = "17.1.0"; }; cucumber-gherkin = { dependencies = [ "cucumber-messages" ]; @@ -95,10 +95,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wznhl3b8b47zff0yx69828bx33n0vc60kh6110ml0xni7lx8xw1"; + sha256 = "18bfg6gpijjbka0pp7604src1ajjkmsr79nyvr6zjgw4j0nvdsfn"; type = "gem"; }; - version = "21.3.0"; + version = "21.9.0"; }; cucumber-messages = { groups = [ "default" ]; @@ -115,30 +115,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g0fl6v1677q71nkaib2g3p03jdzrwgfanpi96srb1743qd54bk1"; + sha256 = "0vcifp1fiha6yqi36m26n1vr8sz3dpnn5966hcz4a3dq43lf947p"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.2"; }; diff-lcs = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.2"; }; mini_mime = { groups = [ "default" ]; @@ -166,9 +166,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03j9qpqip89a0vk6s0gvhxzhbvafjcj5rss7i3jwha0831aivib3"; + sha256 = "177l8rrqnb4rxf657mw28sgvgc8a2m7nlqcbdbra5m4xga0ypcxp"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; } diff --git a/pkgs/by-name/cu/cucumber/package.nix b/pkgs/by-name/cu/cucumber/package.nix index 00354c0eb35f..ada310439fbf 100644 --- a/pkgs/by-name/cu/cucumber/package.nix +++ b/pkgs/by-name/cu/cucumber/package.nix @@ -4,12 +4,12 @@ bundlerUpdateScript, }: -bundlerApp { +bundlerApp rec { pname = "cucumber"; gemdir = ./.; exes = [ "cucumber" ]; - passthru.updateScript = bundlerUpdateScript "cucumber"; + passthru.updateScript = bundlerUpdateScript pname; meta = with lib; { description = "Tool for executable specifications"; From ae87721626245f449c12cae4a441cf9a1ddb1a29 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 23 May 2025 18:14:30 +0200 Subject: [PATCH 03/48] nixos-render-docs: make error message on broken redirects less verbose before, we were showing (almost) the same set of options twice in case of renaming an identifier, which is confusing and obsucres the recommendation. after this change we also show the recommendation in a much more frequent case, when contributors add a new identifier. --- .../src/nixos_render_docs/redirects.py | 46 ++++++------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py index 1a891a1af238..06049497344c 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py @@ -28,8 +28,7 @@ Identifiers must not be identical to any historical location's anchor of the sam The following identifiers violate this rule: - {"\n - ".join(self.conflicting_anchors)} - This can break links or redirects. If you added new content, choose a different identifier. -""") + This can break links or redirects. If you added new content, choose a different identifier.""") if self.divergent_redirects: error_messages.append(f""" All historical content locations must correspond to exactly one identifier. @@ -37,8 +36,7 @@ All historical content locations must correspond to exactly one identifier. - {"\n - ".join(self.divergent_redirects)} It leads to inconsistent behavior depending on which redirect is applied. - Please update doc/redirects.json or nixos/doc/manual/redirects.json! -""") + Please update doc/redirects.json or nixos/doc/manual/redirects.json!""") if self.identifiers_missing_current_outpath: error_messages.append(f""" The first element of an identifier's redirects list must denote its current location. @@ -46,14 +44,18 @@ The first element of an identifier's redirects list must denote its current loca - {"\n - ".join(self.identifiers_missing_current_outpath)} If you moved content, add its new location as the first element of the redirects mapping. - Please update doc/redirects.json or nixos/doc/manual/redirects.json! -""") + Please update doc/redirects.json or nixos/doc/manual/redirects.json!""") if self.identifiers_without_redirects: error_messages.append(f""" Identifiers present in the source must have a mapping in the redirects file. - - {"\n - ".join(self.identifiers_without_redirects)} - - This can happen when an identifier was added or renamed. + - {"\n - ".join(self.identifiers_without_redirects)}""") + if self.orphan_identifiers: + error_messages.append(f""" +Keys of the redirects mapping must correspond to some identifier in the source. + - {"\n - ".join(self.orphan_identifiers)}""") + if self.identifiers_without_redirects or self.orphan_identifiers or self.identifiers_missing_current_outpath: + error_messages.append(f""" +This can happen when an identifier was added, renamed, or removed. Added new content? redirects add-content ❬identifier❭ ❬path❭ @@ -67,31 +69,9 @@ Identifiers present in the source must have a mapping in the redirects file. Removed content? Redirect to alternatives or relevant release notes. redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭ - Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command. + NOTE: Run `nix-shell doc` or `nix-shell nixos/doc/manual` to make this command available. """) - if self.orphan_identifiers: - error_messages.append(f""" -Keys of the redirects mapping must correspond to some identifier in the source. - - {"\n - ".join(self.orphan_identifiers)} - - This can happen when an identifier was removed or renamed. - - Added new content? - redirects add-content ❬identifier❭ ❬path❭ - - Moved existing content to a different output path? - redirects move-content ❬identifier❭ ❬path❭ - - Renamed existing identifiers? - redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭ - - Removed content? (good for redirecting deprecations to new content or release notes) - redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭ - - Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command. -""") - - error_messages.append("NOTE: If your Manual build passes locally and you see this message in CI, you probably need a rebase.") + error_messages.append("NOTE: If your build passes locally and you see this message in CI, you probably need a rebase.") return "\n".join(error_messages) From 9f9a2a0ab6af1349be941a56b4b9d5e8bed7d6cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 17:04:23 +0000 Subject: [PATCH 04/48] hyprlandPlugins.hypr-dynamic-cursors: 0-unstable-2025-05-08 -> 0-unstable-2025-05-23 --- .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index 890bda27dff7..a25a2c419ec7 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2025-05-08"; + version = "0-unstable-2025-05-23"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "1aabd346eb7ad12a614fd18d095d13422d8b95b4"; - hash = "sha256-KophdgmuoPO4adpgXxhDBAMQoRRoHjngiFWQxLoGgWY="; + rev = "761acf0e602e0f6549e5e6c0289a0402e6073489"; + hash = "sha256-7L2MRMB2ONEh7wlgQzraEoA+0o88EOV87KNqZg7vpHA="; }; dontUseCmakeConfigure = true; From f1593e00b636929411fbbc5c015fdffc07b923cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 May 2025 00:13:29 +0000 Subject: [PATCH 05/48] airwindows: 0-unstable-2025-04-27 -> 0-unstable-2025-05-18 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index ea41dc9fbf98..0048aa8be958 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-04-27"; + version = "0-unstable-2025-05-18"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "f8a3f0d1b4ba5ad15777a7143f338731b9658d1a"; - hash = "sha256-Kdz8Q71LHeYhH+Lbgg9fhAYsC62LJLdQo5R+h9DwpXY="; + rev = "083d3d6df8ce3688fb328fd434e27653fa6433b5"; + hash = "sha256-Pfh+zVsAqlP7aVtzTzdaTDB0E/d3bJrexsFm6n93ABQ="; }; # we patch helpers because honestly im spooked out by where those variables From e45d7a752c47bfe31595edf3b01f7789b4607e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 May 2025 16:02:43 -0700 Subject: [PATCH 06/48] python3Packages.azure-search-documents: 14.0.0 -> 11.5.2 --- .../azure-search-documents/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix index 243d8d82ff09..c5a1095287f4 100644 --- a/pkgs/development/python-modules/azure-search-documents/default.nix +++ b/pkgs/development/python-modules/azure-search-documents/default.nix @@ -6,18 +6,19 @@ azure-common, azure-core, isodate, + gitUpdater, }: buildPythonPackage rec { pname = "azure-search-documents"; - version = "14.0.0"; + version = "11.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; - tag = "azure-mgmt-containerregistry_${version}"; - hash = "sha256-FRdXdk3+G/xPraB2laTV6Xs/yNY65gebvMCKPOgby1g="; + tag = "azure_search_documents_${version}"; + hash = "sha256-RcVdqI50lsYed9L6Kz7faNLec1Y9zq685SGnwaEw6Qc="; }; sourceRoot = "${src.name}/sdk/search/azure-search-documents"; @@ -35,8 +36,11 @@ buildPythonPackage rec { # require devtools_testutils which is a internal package for azure-sdk doCheck = false; - # multiple packages in the repo and the updater picks the wrong tag - passthru.skipBulkUpdate = true; + passthru = { + # multiple packages in the repo and the updater picks the wrong tag + skipBulkUpdate = true; + updateScript = gitUpdater { rev-prefix = "azure.search.documents_"; }; + }; meta = { description = "Microsoft Azure Cognitive Search Client Library for Python"; From 9b30091458b946045bd734b054bab461bfc9fda7 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 27 May 2025 21:28:45 +0200 Subject: [PATCH 07/48] zig-zlint: init at 0.7.6 Signed-off-by: Christoph Heiss --- pkgs/by-name/zi/zig-zlint/build.zig.zon.nix | 31 ++++++++++++ pkgs/by-name/zi/zig-zlint/package.nix | 56 +++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 pkgs/by-name/zi/zig-zlint/build.zig.zon.nix create mode 100644 pkgs/by-name/zi/zig-zlint/package.nix diff --git a/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix b/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix new file mode 100644 index 000000000000..dbdbc40b385e --- /dev/null +++ b/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix @@ -0,0 +1,31 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, + fetchgit, +}: + +linkFarm "zig-packages" [ + { + name = "chameleon-3.0.0-bqfnCfhtAAAAxXGw5t9odkb4ayCTTqOcPvL-TgSMUacF"; + path = fetchzip { + url = "https://github.com/DonIsaac/chameleon/archive/7c7477fa76da53c2791f9e1f860481f64140ccbc.zip"; + hash = "sha256-fbKhLQLE/6aHmpYr8+daxyUSWNpDq5zApHP4brRYvlo="; + }; + } + { + name = "recover-1.1.0-Zd97oqomAADqISI8KEhW_UUjiPSExhw9hzeoNpg1Nveo"; + path = fetchzip { + url = "https://github.com/dimdin/zig-recover/archive/36133afaa1b085db7063ffc97c08ae0bddc2de4e.zip"; + hash = "sha256-0oPP6BLVEIR79Q8KcvOlSeDfNLT+8inmIU6ZkuJWrfU="; + }; + } + { + name = "smart_pointers-0.0.3-NPos2MOwAABoujUzLcVLofXqRAgYWLc5pG-TKDhyK0cq"; + path = fetchzip { + url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.3.tar.gz"; + hash = "sha256-oSI76wyiAX7YDvKGhzRbZdEvl7+DPLtMb56w0QsYrkg="; + }; + } +] diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix new file mode 100644 index 000000000000..19a689ba6374 --- /dev/null +++ b/pkgs/by-name/zi/zig-zlint/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + callPackage, + zig_0_14, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig-zlint"; + version = "0.7.6"; + + src = fetchFromGitHub { + name = "zlint"; # tests expect this + owner = "DonIsaac"; + repo = "zlint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-S0FhugmrNHCEpIWX7oL1vZ8heikpo/mok7ciTgSdOpg="; + }; + + nativeBuildInputs = [ + zig_0_14.hook + ]; + + zigBuildFlags = [ + "-Dversion=v${finalAttrs.version}" + "--system" + (callPackage ./build.zig.zon.nix { }) + ]; + + doCheck = true; + zigCheckFlags = finalAttrs.zigBuildFlags; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/zlint"; + versionCheckProgramArg = "--version"; + + # `zig build` produces a lot more artifacts, just copy over the ones we want + installPhase = '' + runHook preInstall + install -vDm755 zig-out/bin/zlint $out/bin/zlint + runHook postInstall + ''; + + meta = { + description = "Linter for the Zig programming language"; + homepage = "https://github.com/DonIsaac/zlint"; + changelog = "https://github.com/DonIsaac/zlint/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ christoph-heiss ]; + mainProgram = "zlint"; + inherit (zig_0_14.meta) platforms; + }; +}) From b5720e2b3fd2daa367264ca6412db397e18257ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 22:21:08 +0200 Subject: [PATCH 08/48] lib/strings: init replaceString --- lib/default.nix | 1 + lib/strings.nix | 35 +++++++++++++++++++++++++++++++++++ lib/tests/misc.nix | 11 +++++++++++ 3 files changed, 47 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index 63e02882e2c3..6f8530296044 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -309,6 +309,7 @@ let stringLength substring isString + replaceString replaceStrings intersperse concatStringsSep diff --git a/lib/strings.nix b/lib/strings.nix index ba8c47b69037..ca97e5b4658b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -332,6 +332,41 @@ rec { */ concatLines = concatMapStrings (s: s + "\n"); + /** + Given string `s`, replace every occurrence of the string `from` with the string `to`. + + # Inputs + + `from` + : The string to be replaced + + `to` + : The string to replace with + + `s` + : The original string where replacements will be made + + # Type + + ``` + replaceString :: string -> string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.replaceString` usage example + + ```nix + replaceString "world" "Nix" "Hello, world!" + => "Hello, Nix!" + replaceString "." "_" "v1.2.3" + => "v1_2_3" + ``` + + ::: + */ + replaceString = from: to: replaceStrings [ from ] [ to ]; + /** Repeat a string `n` times, and concatenate the parts into a new string. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 0d8377ec6006..437714a2822e 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -91,6 +91,7 @@ let range recursiveUpdateUntil removePrefix + replaceString replicate runTests setFunctionArgs @@ -497,6 +498,11 @@ runTests { expected = "/usr/include:/usr/local/include"; }; + testReplaceStringString = { + expr = strings.replaceString "." "_" "v1.2.3"; + expected = "v1_2_3"; + }; + testReplicateString = { expr = strings.replicate 5 "hello"; expected = "hellohellohellohellohello"; @@ -1728,6 +1734,11 @@ runTests { ]; }; + testReplaceString = { + expr = replaceString "world" "Nix" "Hello, world!"; + expected = "Hello, Nix!"; + }; + testReplicate = { expr = replicate 3 "a"; expected = [ From b3b0fd266bbed6b1a5a12a0825c53d1aa9f02755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 27 May 2025 22:26:16 +0200 Subject: [PATCH 09/48] lib: prefer replaceString over replaceStrings --- lib/gvariant.nix | 4 ++-- lib/strings.nix | 2 +- lib/systems/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gvariant.nix b/lib/gvariant.nix index d316a3254a25..e66217db8188 100644 --- a/lib/gvariant.nix +++ b/lib/gvariant.nix @@ -18,7 +18,7 @@ let concatStrings escape head - replaceStrings + replaceString ; mkPrimitive = t: v: { @@ -451,7 +451,7 @@ rec { mkString = v: let - sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s); + sanitize = s: replaceString "\n" "\\n" (escape [ "'" "\\" ] s); in mkPrimitive type.string v // { diff --git a/lib/strings.nix b/lib/strings.nix index ca97e5b4658b..359e1a4cd8db 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1173,7 +1173,7 @@ rec { string = toString arg; in if match "[[:alnum:],._+:@%/-]+" string == null then - "'${replaceStrings [ "'" ] [ "'\\''" ] string}'" + "'${replaceString "'" "'\\''" string}'" else string; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 4d4a6d0030a6..6b9da270bf5f 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -14,7 +14,7 @@ let optionalAttrs optionalString removeSuffix - replaceStrings + replaceString toUpper ; @@ -522,7 +522,7 @@ let # # https://github.com/rust-lang/cargo/pull/9169 # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 - cargoEnvVarTarget = replaceStrings [ "-" ] [ "_" ] (toUpper final.rust.cargoShortTarget); + cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget); # True if the target is no_std # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 From 2b7e32baead539fcef450e1b509ffb77a7174e4d Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Tue, 27 May 2025 11:38:07 +0800 Subject: [PATCH 10/48] swww: 0.9.5 -> 0.10.0-unstable-2025-05-27 Changelog: https://github.com/LGFae/swww/releases/tag/v0.10.0 Diff: https://github.com/LGFae/swww/compare/v0.9.5...800619eb70c0f4293a5b449103f55a0a3cfe2963 --- pkgs/by-name/sw/swww/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index ca08abbd81d7..ee26b51a9786 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -7,25 +7,31 @@ libxkbcommon, installShellFiles, scdoc, + wayland-protocols, + wayland-scanner, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "swww"; - version = "0.9.5"; + version = "0.10.0-unstable-2025-05-27"; + # Fixes build for locating wayland.xml, go back to regular tagged releases at next version bump + # https://codeberg.org/LGFae/waybackend/issues/2 src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc="; + rev = "800619eb70c0f4293a5b449103f55a0a3cfe2963"; + hash = "sha256-zkw1r2mmICkplgXTyN6GckTy0XEBAEoz4H1VQuP8eMU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K1ww0bOD747EDtqYkA0Dlu7cwbjYcPwSXPSqQDbTwZo="; + cargoHash = "sha256-L2mbQJ0dAiB8+NOATnrPhVrjHvE5zjA1frhPbLUJ3sI="; buildInputs = [ lz4 libxkbcommon + wayland-protocols + wayland-scanner ]; doCheck = false; # Integration tests do not work in sandbox environment From 22162d223e0e9946cb9e59a19d403745bc2081fa Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 20 Apr 2023 11:53:57 +0300 Subject: [PATCH 11/48] pigpio: init at 79 --- pkgs/by-name/pi/pigpio/package.nix | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/pi/pigpio/package.nix diff --git a/pkgs/by-name/pi/pigpio/package.nix b/pkgs/by-name/pi/pigpio/package.nix new file mode 100644 index 000000000000..ddde61ca0b7b --- /dev/null +++ b/pkgs/by-name/pi/pigpio/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + buildPythonPackage ? null, +}: + +let + mkDerivation = + if builtins.isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage; +in +mkDerivation rec { + pname = "pigpio"; + version = "79"; + + src = fetchFromGitHub { + owner = "joan2937"; + repo = "pigpio"; + tag = "v${version}"; + hash = "sha256-Z+SwUlBbtWtnbjTe0IghR3gIKS43ZziN0amYtmXy7HE="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "C library for the Raspberry which allows control of the General Purpose Input Outputs (GPIO)"; + homepage = "https://github.com/joan2937/pigpio"; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.linux; + }; +} From 5899b0d12f639ee94c34a051cc5faa808b91c59b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 3 Jun 2024 21:23:39 +0300 Subject: [PATCH 12/48] python312Packages.pigpio: init at 79 --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16ed1fa0480e..e9f913506703 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11174,6 +11174,12 @@ self: super: with self; { piexif = callPackage ../development/python-modules/piexif { }; + pigpio = toPythonModule ( + pkgs.pigpio.override { + inherit buildPythonPackage; + } + ); + pijuice = callPackage ../development/python-modules/pijuice { }; pika = callPackage ../development/python-modules/pika { }; From 3397b0a70c8d70f42337050a6a88bd5d9a4e311b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 20 Apr 2023 12:14:52 +0300 Subject: [PATCH 13/48] piscope: init at 0.8 --- pkgs/by-name/pi/piscope/package.nix | 56 +++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/pi/piscope/package.nix diff --git a/pkgs/by-name/pi/piscope/package.nix b/pkgs/by-name/pi/piscope/package.nix new file mode 100644 index 000000000000..8191f53aa1c9 --- /dev/null +++ b/pkgs/by-name/pi/piscope/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + wrapGAppsHook3, + installShellFiles, + + # buildInputs + gtk3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "piscope"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "joan2937"; + repo = "piscope"; + tag = "V${finalAttrs.version}"; + hash = "sha256-VDrx/RLSpMhyD64PmdeWVacb9LleHakcy7D6zFxeyhw="; + }; + # Fix FHS paths + postConfigure = '' + substituteInPlace piscope.c \ + --replace /usr/share/piscope $out/share/piscope + ''; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + installShellFiles + ]; + buildInputs = [ + gtk3 + ]; + # Upstream's Makefile assumes FHS + installPhase = '' + runHook preInstall + + installBin piscope + install -D -m 0644 piscope.glade $out/share/piscope/piscope.glade + + runHook postInstall + ''; + + meta = { + homepage = "http://abyz.me.uk/rpi/pigpio/piscope.html"; + description = "A logic analyser (digital waveform viewer) for the Raspberry"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.linux; + }; +}) From 201c4b07578e53eedf4020a079974a8c93946e5e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 20 Apr 2023 12:50:04 +0300 Subject: [PATCH 14/48] lgpio: init at 0.2.2 --- pkgs/by-name/lg/lgpio/package.nix | 71 +++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/lg/lgpio/package.nix diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix new file mode 100644 index 000000000000..a472ceff3136 --- /dev/null +++ b/pkgs/by-name/lg/lgpio/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + swig, + # If we build the python packages, these two are not null + buildPythonPackage ? null, + lgpioWithoutPython ? null, + # When building a python Packages, this specifies the python subproject + pyProject ? "", +}: + +let + mkDerivation = if pyProject == "" then stdenv.mkDerivation else buildPythonPackage; +in +mkDerivation rec { + pname = "lgpio"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "joan2937"; + repo = "lg"; + tag = "v${version}"; + hash = "sha256-92lLV+EMuJj4Ul89KIFHkpPxVMr/VvKGEocYSW2tFiE="; + }; + + nativeBuildInputs = lib.optionals (pyProject == "PY_LGPIO") [ + swig + ]; + + preConfigure = + if pyProject != "" then + '' + cd ${pyProject} + '' + else + ""; + # Emulate ldconfig when building the C API + postConfigure = + if pyProject == "" then + '' + substituteInPlace Makefile \ + --replace ldconfig 'echo ldconfig' + '' + else + ""; + + preBuild = + if pyProject == "PY_LGPIO" then + '' + swig -python lgpio.i + '' + else + ""; + + buildInputs = [ + lgpioWithoutPython + ]; + + makeFlags = [ + "prefix=$(out)" + ]; + + meta = { + description = "Linux C libraries and Python modules for manipulating GPIO"; + homepage = "https://github.com/joan2937/lg"; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.linux; + }; +} From 456568f99eeb3886e793d06ce32c66c4f473e1a1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 3 Jun 2024 17:56:13 +0300 Subject: [PATCH 15/48] python312Packages.lgpio: init at 0.2.2 --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9f913506703..42cebe34084f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7791,6 +7791,14 @@ self: super: with self; { lexilang = callPackage ../development/python-modules/lexilang { }; + lgpio = toPythonModule ( + pkgs.lgpio.override { + inherit buildPythonPackage; + pyProject = "PY_LGPIO"; + lgpioWithoutPython = pkgs.lgpio; + } + ); + lhapdf = toPythonModule (pkgs.lhapdf.override { python3 = python; }); lib4package = callPackage ../development/python-modules/lib4package { }; From cf715599cdc39ad5a19aa26c719cf4daa397fa72 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 3 Jun 2024 17:56:26 +0300 Subject: [PATCH 16/48] python312Packages.rgpio: init at 0.2.2 --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42cebe34084f..c9e6a284a9cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15213,6 +15213,13 @@ self: super: with self; { rflink = callPackage ../development/python-modules/rflink { }; + rgpio = toPythonModule ( + pkgs.lgpio.override { + inherit buildPythonPackage; + pyProject = "PY_RGPIO"; + } + ); + rich = callPackage ../development/python-modules/rich { }; rich-argparse = callPackage ../development/python-modules/rich-argparse { }; From 99da5ec2bc2b370f06f9c911af209ad2c5e4661b Mon Sep 17 00:00:00 2001 From: Fiona Behrens Date: Wed, 28 May 2025 16:53:29 +0000 Subject: [PATCH 17/48] nixos/systemd-initrd: honor the enable option in contents The enable attribute of `boot.initrd.systemd.contents.` was ignored for building initrd storePaths. This resulted in building derivations for the initrd even if it was disabled. Found while testing a to build a nixos system with a kernel without lodable modules[0] [0]: https://github.com/NixOS/nixpkgs/pull/411792 --- nixos/modules/system/boot/systemd/initrd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index fd081d44cbd8..5381930c459c 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -133,7 +133,9 @@ let name = "initrd-${kernel-name}"; inherit (config.boot.initrd) compressor compressorArgs prepend; - contents = lib.filter ({ source, ... }: !lib.elem source cfg.suppressedStorePaths) cfg.storePaths; + contents = lib.filter ( + { source, enable, ... }: (!lib.elem source cfg.suppressedStorePaths) && enable + ) cfg.storePaths; }; in From 779f8185acdc0b12222b9022c779833703a49a50 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 28 May 2025 17:55:22 +0000 Subject: [PATCH 18/48] cucumber: remove rec --- pkgs/by-name/cu/cucumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cucumber/package.nix b/pkgs/by-name/cu/cucumber/package.nix index ada310439fbf..00354c0eb35f 100644 --- a/pkgs/by-name/cu/cucumber/package.nix +++ b/pkgs/by-name/cu/cucumber/package.nix @@ -4,12 +4,12 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { pname = "cucumber"; gemdir = ./.; exes = [ "cucumber" ]; - passthru.updateScript = bundlerUpdateScript pname; + passthru.updateScript = bundlerUpdateScript "cucumber"; meta = with lib; { description = "Tool for executable specifications"; From 9225715a2320abf8db95cc2e01ae771db3c2929f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 May 2025 19:56:54 +0200 Subject: [PATCH 19/48] nixos-render-docs: Suggest redirects is a command --- .../nixos-render-docs/src/nixos_render_docs/redirects.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py index 06049497344c..ba338edeb17a 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py @@ -58,16 +58,16 @@ Keys of the redirects mapping must correspond to some identifier in the source. This can happen when an identifier was added, renamed, or removed. Added new content? - redirects add-content ❬identifier❭ ❬path❭ + $ redirects add-content ❬identifier❭ ❬path❭ Moved existing content to a different output path? - redirects move-content ❬identifier❭ ❬path❭ + $ redirects move-content ❬identifier❭ ❬path❭ Renamed existing identifiers? - redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭ + $ redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭ Removed content? Redirect to alternatives or relevant release notes. - redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭ + $ redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭ NOTE: Run `nix-shell doc` or `nix-shell nixos/doc/manual` to make this command available. """) From 911d34e8d14e52cbcd3e02d59e79602245ff982d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 24 May 2025 14:22:29 +0000 Subject: [PATCH 20/48] xcode-install: update gems to latest versions. --- pkgs/by-name/xc/xcode-install/Gemfile.lock | 20 +++++++------- pkgs/by-name/xc/xcode-install/gemset.nix | 32 +++++++++++----------- pkgs/by-name/xc/xcode-install/package.nix | 4 +-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/xc/xcode-install/Gemfile.lock b/pkgs/by-name/xc/xcode-install/Gemfile.lock index ff44c187b2e2..5a015c6a640a 100644 --- a/pkgs/by-name/xc/xcode-install/Gemfile.lock +++ b/pkgs/by-name/xc/xcode-install/Gemfile.lock @@ -11,18 +11,18 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1075.0) - aws-sdk-core (3.221.0) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.99.0) + aws-sdk-kms (1.101.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.186.1) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -71,7 +71,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.0) + fastlane (2.227.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -111,7 +111,7 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) @@ -158,7 +158,7 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.10.2) + json (2.12.2) jwt (2.10.1) base64 logger (1.7.0) @@ -173,7 +173,7 @@ GEM optparse (0.6.0) os (1.1.4) plist (3.7.2) - public_suffix (6.0.1) + public_suffix (6.0.2) rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) @@ -185,7 +185,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.4.1) security (0.1.5) - signet (0.19.0) + signet (0.20.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -228,4 +228,4 @@ DEPENDENCIES xcode-install BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/by-name/xc/xcode-install/gemset.nix b/pkgs/by-name/xc/xcode-install/gemset.nix index 3b1531131812..2284c96f5556 100644 --- a/pkgs/by-name/xc/xcode-install/gemset.nix +++ b/pkgs/by-name/xc/xcode-install/gemset.nix @@ -55,10 +55,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i"; + sha256 = "0h25l48fy06yba48ymsflda93yclk0335kdcnf74f5axsah84qfn"; type = "gem"; }; - version = "1.1075.0"; + version = "1.1107.0"; }; aws-sdk-core = { dependencies = [ @@ -73,10 +73,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy"; + sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6"; type = "gem"; }; - version = "3.221.0"; + version = "3.224.0"; }; aws-sdk-kms = { dependencies = [ @@ -87,10 +87,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; + sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24"; type = "gem"; }; - version = "1.99.0"; + version = "1.101.0"; }; aws-sdk-s3 = { dependencies = [ @@ -102,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v"; type = "gem"; }; - version = "1.182.0"; + version = "1.186.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -461,10 +461,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; + sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z"; type = "gem"; }; - version = "2.227.0"; + version = "2.227.2"; }; fastlane-sirp = { dependencies = [ "sysrandom" ]; @@ -668,10 +668,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s"; type = "gem"; }; - version = "2.10.2"; + version = "2.12.2"; }; jwt = { dependencies = [ "base64" ]; @@ -809,10 +809,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; rake = { groups = [ "default" ]; @@ -910,10 +910,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk"; + sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw"; type = "gem"; }; - version = "0.19.0"; + version = "0.20.0"; }; simctl = { dependencies = [ diff --git a/pkgs/by-name/xc/xcode-install/package.nix b/pkgs/by-name/xc/xcode-install/package.nix index a00ee5f3bf42..d9a70d1f2411 100644 --- a/pkgs/by-name/xc/xcode-install/package.nix +++ b/pkgs/by-name/xc/xcode-install/package.nix @@ -4,12 +4,12 @@ bundlerUpdateScript, }: -bundlerApp { +bundlerApp rec { pname = "xcode-install"; gemdir = ./.; exes = [ "xcversion" ]; - passthru.updateScript = bundlerUpdateScript "xcode-install"; + passthru.updateScript = bundlerUpdateScript pname; meta = with lib; { description = "Install and update your Xcodes automatically"; From 122b29910699739ab82cf2e840dd3baa4379521b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 28 May 2025 18:02:45 +0000 Subject: [PATCH 21/48] xcode-install: remove rec --- pkgs/by-name/xc/xcode-install/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xc/xcode-install/package.nix b/pkgs/by-name/xc/xcode-install/package.nix index d9a70d1f2411..a00ee5f3bf42 100644 --- a/pkgs/by-name/xc/xcode-install/package.nix +++ b/pkgs/by-name/xc/xcode-install/package.nix @@ -4,12 +4,12 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { pname = "xcode-install"; gemdir = ./.; exes = [ "xcversion" ]; - passthru.updateScript = bundlerUpdateScript pname; + passthru.updateScript = bundlerUpdateScript "xcode-install"; meta = with lib; { description = "Install and update your Xcodes automatically"; From 797c77865fa1b2e3c0cd1192d7a17da5a18a45ae Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 26 May 2025 16:44:13 +0000 Subject: [PATCH 22/48] terraspace: update gems to latest versions terraspace: remove rec terraspace: remove pname --- pkgs/by-name/te/terraspace/Gemfile.lock | 33 ++++++------- pkgs/by-name/te/terraspace/gemset.nix | 61 +++++++++++++------------ 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/pkgs/by-name/te/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock index 74b43d988b07..10b57cecdbe3 100644 --- a/pkgs/by-name/te/terraspace/Gemfile.lock +++ b/pkgs/by-name/te/terraspace/Gemfile.lock @@ -15,17 +15,18 @@ GEM tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) aws-eventstream (1.3.2) - aws-partitions (1.1071.0) - aws-sdk-core (3.220.2) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.99.0) + logger + aws-sdk-kms (1.101.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) + aws-sdk-s3 (1.186.1) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -39,11 +40,11 @@ GEM text-table zeitwerk concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.3) deep_merge (1.2.2) - diff-lcs (1.6.0) - dotenv (3.1.7) - drb (2.2.1) + diff-lcs (1.6.2) + dotenv (3.1.8) + drb (2.2.3) dsl_evaluator (0.3.2) activesupport memoist @@ -58,11 +59,11 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) - logger (1.6.6) + logger (1.7.0) memoist (0.16.2) - mini_portile2 (2.8.8) + mini_portile2 (2.8.9) minitest (5.25.5) - nokogiri (1.18.5) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) racc (1.8.1) @@ -80,13 +81,13 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) + rspec-mocks (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.2) + rspec-support (3.13.3) rspec-terraspace (0.3.3) activesupport memoist @@ -132,7 +133,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uri (1.0.3) - zeitwerk (2.7.2) + zeitwerk (2.7.3) zip_folder (0.1.0) rubyzip @@ -143,4 +144,4 @@ DEPENDENCIES terraspace BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/by-name/te/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix index 6a07f9ece302..183797d226c4 100644 --- a/pkgs/by-name/te/terraspace/gemset.nix +++ b/pkgs/by-name/te/terraspace/gemset.nix @@ -38,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qlygf2bg086hr5cpyg8hh0jwvx4xvkh8v09maxdj7xqplzplhg7"; + sha256 = "0h25l48fy06yba48ymsflda93yclk0335kdcnf74f5axsah84qfn"; type = "gem"; }; - version = "1.1071.0"; + version = "1.1107.0"; }; aws-sdk-core = { dependencies = [ @@ -50,15 +50,16 @@ "aws-sigv4" "base64" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qydjik09i110rxpkz4g8kfq5n10x0fwp2cwpb9zw44kprzwvcmn"; + sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6"; type = "gem"; }; - version = "3.220.2"; + version = "3.224.0"; }; aws-sdk-kms = { dependencies = [ @@ -69,10 +70,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; + sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24"; type = "gem"; }; - version = "1.99.0"; + version = "1.101.0"; }; aws-sdk-s3 = { dependencies = [ @@ -84,10 +85,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v"; type = "gem"; }; - version = "1.182.0"; + version = "1.186.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -160,10 +161,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; }; deep_merge = { groups = [ "default" ]; @@ -180,30 +181,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1"; + sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66"; + sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; drb = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.3"; }; dsl_evaluator = { dependencies = [ @@ -289,10 +290,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.0"; }; memoist = { groups = [ "default" ]; @@ -309,10 +310,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc"; type = "gem"; }; - version = "2.8.8"; + version = "2.8.9"; }; minitest = { groups = [ "default" ]; @@ -333,10 +334,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8"; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; type = "gem"; }; - version = "1.18.5"; + version = "1.18.8"; }; racc = { groups = [ "default" ]; @@ -429,10 +430,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + sha256 = "1n7cb6szws90hxbzqrfybs4rj1xb0vhn24xa4l5r1vnzcnblahsf"; type = "gem"; }; - version = "3.13.3"; + version = "3.13.4"; }; rspec-mocks = { dependencies = [ @@ -443,20 +444,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + sha256 = "14xr5bq7s80hm97fcp3pvk4v515qfw3lrlsf20idalwwf6h5icbb"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.4"; }; rspec-support = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; + sha256 = "0hrzdcklbl8pv721cq906yfl38fmqmlnh33ff8l752z1ys9y6q9a"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.3"; }; rspec-terraspace = { dependencies = [ @@ -612,10 +613,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4"; + sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.3"; }; zip_folder = { dependencies = [ "rubyzip" ]; From ace1b4233b469bc3eaf27f7a7732472311310a2d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 24 May 2025 14:33:23 +0000 Subject: [PATCH 23/48] procodile: 1.0.23 -> 1.0.26 procodile: remove rec procodile: remove pname --- pkgs/by-name/pr/procodile/Gemfile.lock | 6 +++--- pkgs/by-name/pr/procodile/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/procodile/Gemfile.lock b/pkgs/by-name/pr/procodile/Gemfile.lock index f53a07d6657c..1efd63725204 100644 --- a/pkgs/by-name/pr/procodile/Gemfile.lock +++ b/pkgs/by-name/pr/procodile/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - json (2.2.0) - procodile (1.0.23) + json (2.12.2) + procodile (1.0.26) json PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES procodile BUNDLED WITH - 2.1.4 + 2.6.6 diff --git a/pkgs/by-name/pr/procodile/gemset.nix b/pkgs/by-name/pr/procodile/gemset.nix index bfb2a2d6a5bc..015ac84b9a0f 100644 --- a/pkgs/by-name/pr/procodile/gemset.nix +++ b/pkgs/by-name/pr/procodile/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s"; type = "gem"; }; - version = "2.2.0"; + version = "2.12.2"; }; procodile = { dependencies = [ "json" ]; @@ -15,9 +15,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "025pbr1kah7cgs527n5q56m5agaa2smzac4rpmpk619xg4r1rdhs"; + sha256 = "1f2xf460p0dd8871dfjm3mx669hiy4fz2n53za0pfrd6mvwx5qkq"; type = "gem"; }; - version = "1.0.23"; + version = "1.0.26"; }; } From 64ddb8dc33e5e7d8767da63372a54d9964749a0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 May 2025 19:36:29 +0000 Subject: [PATCH 24/48] pdfcpu: 0.10.2 -> 0.11.0 --- pkgs/by-name/pd/pdfcpu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index f05af5f56ea7..800ccce43934 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-vfU0mFfOW9K3rgVNdfN2RBiKJLbijoVMtuywsoclEgE="; + hash = "sha256-HTqaFl/ug/4sdchZBD4VQiXbD1L0/DVf2efZ3BV/vx4="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -37,7 +37,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk="; + vendorHash = "sha256-5qB3zXiee4yMFpV8Ia8jICZaw+8Zpxd2Fs7DZ/DW/Jg="; ldflags = [ "-s" From 8bdc2e5acf87d0b8ebac9a6016986844c7db4474 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 29 May 2025 03:40:34 +0800 Subject: [PATCH 25/48] dnscrypt-proxy: 2.1.9 -> 2.1.12 --- pkgs/by-name/dn/dnscrypt-proxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix index b1dcc7900ddc..2f9fe584de00 100644 --- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix +++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; - version = "2.1.9"; + version = "2.1.12"; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-8KnanJw9eBFm/zdy6f4OFCMStzic/n4Alnm5Y/pbDCA="; + hash = "sha256-HgpcZccx3gaR3dTJJRKPICvNxZj9KdeC0+2ll8TWgeM="; }; passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; }; From c599075cba42cbdc26ff67bfb384b7efca1e073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Wed, 28 May 2025 21:48:52 +0200 Subject: [PATCH 26/48] OWNERS: add owners for authelia files --- ci/OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 1ae7686efbb6..716dfd2df5b7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -477,6 +477,9 @@ pkgs/development/interpreters/erlang/ @NixOS/beam pkgs/development/interpreters/elixir/ @NixOS/beam pkgs/development/interpreters/lfe/ @NixOS/beam +# Authelia +pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem + # OctoDNS pkgs/by-name/oc/octodns/ @anthonyroussel From 575e5b882b57dd9310de0d2d9194639f5fe2cd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Wed, 28 May 2025 21:48:20 +0200 Subject: [PATCH 27/48] authelia: add current package maintainers as module maintainers --- nixos/modules/services/security/authelia.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index cd5273bd2163..7b93a7f9f7b3 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -476,4 +476,10 @@ in map (instance: lib.mkIf instance.enable (mkInstanceUsersConfig instance)) instances ); }; + + meta.maintainers = with lib.maintainers; [ + jk + dit7ya + nicomem + ]; } From c4741b2d5e5dc84ba602bf3a4d994030b9424987 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 29 May 2025 04:07:53 +0800 Subject: [PATCH 28/48] cromite: 135.0.7049.100 -> 137.0.7151.44 --- pkgs/by-name/cr/cromite/package.nix | 15 +++++++++------ pkgs/by-name/cr/cromite/update.sh | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100755 pkgs/by-name/cr/cromite/update.sh diff --git a/pkgs/by-name/cr/cromite/package.nix b/pkgs/by-name/cr/cromite/package.nix index 118bee32b0a0..93af344c49bb 100644 --- a/pkgs/by-name/cr/cromite/package.nix +++ b/pkgs/by-name/cr/cromite/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - makeBinaryWrapper, + makeWrapper, patchelf, copyDesktopItems, makeDesktopItem, @@ -166,15 +166,15 @@ let qt6.qtbase qt6.qtwayland ]; - commit = "0ffdb845a6a3308cbd9826bb78269d1d05cfb8aa"; in stdenv.mkDerivation (finalAttrs: { pname = "cromite"; - version = "135.0.7049.100"; + version = "137.0.7151.44"; + commit = "1abdac0aff0916b1e4a4bd52f1896eec00834262"; src = fetchurl { - url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz"; - hash = "sha256-bB6CPqgwT1p7aXIKauOrRhG4dhCQ9tyO+HHRrkbrsPQ="; + url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz"; + hash = "sha256-33GS4uD3RJHy9M0S5TRB6kRb1SZR+ABLyOR1oeVLQto="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = false; nativeBuildInputs = [ - makeBinaryWrapper + makeWrapper patchelf copyDesktopItems ]; @@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "cromite" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so @@ -247,6 +248,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { changelog = "https://github.com/uazo/cromite/releases"; description = "Bromite fork with ad blocking and privacy enhancements"; diff --git a/pkgs/by-name/cr/cromite/update.sh b/pkgs/by-name/cr/cromite/update.sh new file mode 100755 index 000000000000..5e604bc242db --- /dev/null +++ b/pkgs/by-name/cr/cromite/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts + +set -eou pipefail + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/uazo/cromite/releases/latest | jq --raw-output .tag_name | sed 's/^v//') +latestVersion="${latestTag%-*}" +commit="${latestTag#*-}" + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cromite.version or (lib.getVersion cromite)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version cromite $commit --version-key=commit || true +nix-update cromite --version $latestVersion From 48a96d6651dd6e26b4e69ea8e0943fbd8170b185 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 27 May 2025 13:18:49 +0200 Subject: [PATCH 29/48] python3Packages.cloudflare: fix meta.changelog URL --- pkgs/development/python-modules/cloudflare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 72e25bd96cc5..fb2d58d2bfb4 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Official Python library for the Cloudflare API"; homepage = "https://github.com/cloudflare/cloudflare-python"; - changelog = "https://github.com/cloudflare/cloudflare-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/cloudflare/cloudflare-python/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ marie jemand771 From f2ff67e5c270dd6fa6778336b8e4019d6314beae Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Wed, 28 May 2025 17:18:05 -0700 Subject: [PATCH 30/48] _1password-gui: 8.10.76 -> 8.10.78 --- pkgs/by-name/_1/_1password-gui/sources.json | 16 ++++++++-------- pkgs/by-name/_1/_1password-gui/versions.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 072a76f730b0..95bdc2c394e8 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,20 +1,20 @@ { "stable": { "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.76.x64.tar.gz", - "hash": "sha256-vEbmZP0WQ0Ha92V/owFKtxavahWMpV73vRiflZ1dpzQ=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.78.x64.tar.gz", + "hash": "sha256-COmXSjbCetPsbm40OrWGVtULPheEgnHEO0ZcIgWaG1w=" }, "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.76.arm64.tar.gz", - "hash": "sha256-4GHFLlpThIJ5oAVgwXUAy4Gb0569RLXK1kdLErOr6j8=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.78.arm64.tar.gz", + "hash": "sha256-diy7VhKRluSnVSR35Ogamf9RDHdqxSJifLOOYmMrJHE=" }, "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.76-x86_64.zip", - "hash": "sha256-hAIVQ7QVpZzQqW5ikCjp6HsskQWH5bbzM85DNyY0hFQ=" + "url": "https://downloads.1password.com/mac/1Password-8.10.78-x86_64.zip", + "hash": "sha256-8fbjEc/Z0xCdXq/uHp4bQE5Js5hNLbVCRZxnepUdLUs=" }, "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.76-aarch64.zip", - "hash": "sha256-jfdtLBsd1IvntJHZOJ0pxIrwjIUOcG3thfyjTMNIMK4=" + "url": "https://downloads.1password.com/mac/1Password-8.10.78-aarch64.zip", + "hash": "sha256-x03dZ/eVrvFcbese1cBAvyJKwtWe6rOcgytn0OsEFDQ=" } }, "beta": { diff --git a/pkgs/by-name/_1/_1password-gui/versions.json b/pkgs/by-name/_1/_1password-gui/versions.json index 93f47b2a9435..f41806f7dbfe 100644 --- a/pkgs/by-name/_1/_1password-gui/versions.json +++ b/pkgs/by-name/_1/_1password-gui/versions.json @@ -1,6 +1,6 @@ { - "stable-linux": "8.10.76", - "stable-darwin": "8.10.76", + "stable-linux": "8.10.78", + "stable-darwin": "8.10.78", "beta-linux":"8.10.76-32.BETA", "beta-darwin": "8.10.76-32.BETA" } From 694bf59ec84591111f48804b10d71c0fc7960d90 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Wed, 28 May 2025 17:19:09 -0700 Subject: [PATCH 31/48] _1password-gui-beta: 8.10.76-32 -> 8.10.80-18 --- pkgs/by-name/_1/_1password-gui/sources.json | 16 ++++++++-------- pkgs/by-name/_1/_1password-gui/versions.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 95bdc2c394e8..ef4f2c8ee395 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -19,20 +19,20 @@ }, "beta": { "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.76-32.BETA.x64.tar.gz", - "hash": "sha256-149kU1CKQ0iLlD6O7jOjrcwwlxMdd5iAm53ILK2mv2o=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.80-18.BETA.x64.tar.gz", + "hash": "sha256-X2Wu/dQQ7fv+tTAU2/70S38wL6WdJuc/DXWoiHZvSP4=" }, "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.76-32.BETA.arm64.tar.gz", - "hash": "sha256-xHurzI8OcooSOCkQlSgtOH1Bgdur2oO1sNwKUOvSckA=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.80-18.BETA.arm64.tar.gz", + "hash": "sha256-52aRg6QD/fKOzOHoG88q8VNJIizxnISFnpxek7bJ05w=" }, "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-x86_64.zip", - "hash": "sha256-LgDl5DLUdn4bSRXrx11QOv0J6VXyns+KQgbU/Y0JxDU=" + "url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-x86_64.zip", + "hash": "sha256-kUU+nm19DmdY8ZG6d+EJFQXcCy/BOauXh83suQLSvz0=" }, "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-aarch64.zip", - "hash": "sha256-mJFuejGiUKV0PEJF8ajiL3cMRQTRghoaCRyP8afatgY=" + "url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-aarch64.zip", + "hash": "sha256-eZG0QaB5NRwRCYcmlfZA/HTceLq7eUzR+AvzDeOrzAY=" } } } diff --git a/pkgs/by-name/_1/_1password-gui/versions.json b/pkgs/by-name/_1/_1password-gui/versions.json index f41806f7dbfe..491385dbe990 100644 --- a/pkgs/by-name/_1/_1password-gui/versions.json +++ b/pkgs/by-name/_1/_1password-gui/versions.json @@ -1,6 +1,6 @@ { "stable-linux": "8.10.78", "stable-darwin": "8.10.78", - "beta-linux":"8.10.76-32.BETA", - "beta-darwin": "8.10.76-32.BETA" + "beta-linux":"8.10.80-18.BETA", + "beta-darwin": "8.10.80-18.BETA" } From 427f860490c2833078f98eef80591fe20d668e4d Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 29 May 2025 08:56:19 +0200 Subject: [PATCH 32/48] tailwindcss_4: 4.1.7 -> 4.1.8 --- pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index c7a31b4ba1a1..c0dfe093055b 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.7"; + version = "4.1.8"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-CjzOBmhnEW0c+V6utNKPROhAOx1ql2vG8S4G1hT6Wdo="; - aarch64-linux = "sha256-jEGaZiGW8FcmVRrQBr2DQfR7i+344MtlFofZrjwK4GY="; - x86_64-darwin = "sha256-TN7TKW561j9qvgadL/P/cQhhum1lCrsjNglhxgz9GSw="; - x86_64-linux = "sha256-BwYpKTWpdzxsh54X0jYlMi5EkOfo96CtDmiPquTe+YE="; + aarch64-darwin = "sha256-GeUnkdNW3VnbaCdK42pYebqwzp2sI8x7Dxn8e3wdN6I="; + aarch64-linux = "sha256-KKd9Hlmw5FtBaDweOUdiH9/nP2iVsF23w09j8/SJjo0="; + x86_64-darwin = "sha256-SmyyYNdcS9ygck+8w7I6WttScVrW14WVRjyGEoyhwyk="; + x86_64-linux = "sha256-j4TOgQvf8iXlmXgdHi2qgrQoIikCHIZ6cbQZ9Z+aqDY="; } .${system} or throwSystem; in From 8bd119929d9add75c4c586f757c03c3fa6cbcd35 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 28 May 2025 23:58:58 -0700 Subject: [PATCH 33/48] androidenv: fix autoupdate and custom XMLs This regression happened during refactoring of mkrepo.rb. Do another round of it with a focus on fixing the autoupdate and use of custom repository XMLs. Add an example to check this behavior (but don't run it in the test suite, since it requires IFD). --- pkgs/development/mobile/androidenv/README.md | 8 +- .../androidenv/compose-android-packages.nix | 5 +- .../mobile/androidenv/examples/shell-ifd.nix | 60 +++++++ pkgs/development/mobile/androidenv/mkrepo.sh | 19 --- .../mobile/androidenv/test-suite.nix | 4 +- .../androidenv/{mkrepo.rb => update.rb} | 153 ++++++++++++------ pkgs/development/mobile/androidenv/update.sh | 5 - 7 files changed, 168 insertions(+), 86 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/examples/shell-ifd.nix delete mode 100755 pkgs/development/mobile/androidenv/mkrepo.sh rename pkgs/development/mobile/androidenv/{mkrepo.rb => update.rb} (82%) mode change 100644 => 100755 delete mode 100755 pkgs/development/mobile/androidenv/update.sh diff --git a/pkgs/development/mobile/androidenv/README.md b/pkgs/development/mobile/androidenv/README.md index bf3726342091..7ebb9d640c0b 100644 --- a/pkgs/development/mobile/androidenv/README.md +++ b/pkgs/development/mobile/androidenv/README.md @@ -1,15 +1,13 @@ # How to update -1. `./fetchrepo.sh` -2. `./mkrepo.sh` -3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk` -4. Update the relevant argument defaults in `compose-android-packages.nix` +`nix-shell maintainers/scripts/update.nix --argstr package androidenv.test-suite --argstr commit true` # How to run tests + You may need to make yourself familiar with [package tests](../../../README.md#package-tests), and [Writing larger package tests](../../../README.md#writing-larger-package-tests), then run tests locally with: ```shell $ export NIXPKGS_ALLOW_UNFREE=1 $ cd path/to/nixpkgs -$ nix-build -A androidenv.test-suite.tests +$ nix-build -A androidenv.test-suite ``` diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 57a9afc8a9de..1803a04a6638 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -31,7 +31,7 @@ in # Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store. if repoXmls != null then let - # Uses mkrepo.rb to create a repo spec. + # Uses update.rb to create a repo spec. mkRepoJson = { packages ? [ ], @@ -43,6 +43,7 @@ in ruby.withPackages ( pkgs: with pkgs; [ slop + curb nokogiri ] ) @@ -68,7 +69,7 @@ in preferLocalBuild = true; unpackPhase = "true"; buildPhase = '' - ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json + env ruby -e 'load "${./update.rb}"' -- ${lib.escapeShellArgs mkRepoRubyArguments} --input /dev/null --output repo.json ''; installPhase = '' mv repo.json $out diff --git a/pkgs/development/mobile/androidenv/examples/shell-ifd.nix b/pkgs/development/mobile/androidenv/examples/shell-ifd.nix new file mode 100644 index 000000000000..254bc6112311 --- /dev/null +++ b/pkgs/development/mobile/androidenv/examples/shell-ifd.nix @@ -0,0 +1,60 @@ +{ + # If you want to use the in-tree version of nixpkgs: + pkgs ? import ../../../../.. { + config.allowUnfree = true; + }, + + licenseAccepted ? pkgs.callPackage ../license.nix { }, +}: + +# Tests IFD with androidenv. Needs a folder of `../xml` in your local tree; +# use ../fetchrepo.sh to produce it. +let + androidEnv = pkgs.callPackage ./.. { + inherit pkgs licenseAccepted; + }; + + sdkArgs = { + repoXmls = { + packages = [ ../xml/repository2-3.xml ]; + images = [ + ../xml/android-sys-img2-3.xml + ../xml/android-tv-sys-img2-3.xml + ../xml/google_apis-sys-img2-3.xml + ../xml/google_apis_playstore-sys-img2-3.xml + ../xml/android-wear-sys-img2-3.xml + ../xml/android-wear-cn-sys-img2-3.xml + ../xml/android-automotive-sys-img2-3.xml + ]; + addons = [ ../xml/addon2-3.xml ]; + }; + }; + + androidComposition = androidEnv.composeAndroidPackages sdkArgs; + androidSdk = androidComposition.androidsdk; + platformTools = androidComposition.platform-tools; + jdk = pkgs.jdk; +in +pkgs.mkShell { + name = "androidenv-example-ifd-demo"; + packages = [ + androidSdk + platformTools + jdk + ]; + + LANG = "C.UTF-8"; + LC_ALL = "C.UTF-8"; + JAVA_HOME = jdk.home; + + # Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT. + ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; + + shellHook = '' + # Write out local.properties for Android Studio. + cat < local.properties + # This file was automatically generated by nix-shell. + sdk.dir=$ANDROID_SDK_ROOT + EOF + ''; +} diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh deleted file mode 100755 index 174b765e9c34..000000000000 --- a/pkgs/development/mobile/androidenv/mkrepo.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri moreutils ])" - -set -e - -pushd "$(dirname "$0")" &>/dev/null || exit 1 - -echo "Writing repo.json" >&2 -ruby mkrepo.rb \ - --packages ./xml/repository2-3.xml \ - --images ./xml/android-sys-img2-3.xml \ - --images ./xml/android-tv-sys-img2-3.xml \ - --images ./xml/android-wear-cn-sys-img2-3.xml \ - --images ./xml/android-wear-sys-img2-3.xml \ - --images ./xml/android-automotive-sys-img2-3.xml \ - --images ./xml/google_apis-sys-img2-3.xml \ - --images ./xml/google_apis_playstore-sys-img2-3.xml \ - --addons ./xml/addon2-3.xml <./repo.json -popd &>/dev/null diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix index ba745109462b..b4f4d06157bb 100644 --- a/pkgs/development/mobile/androidenv/test-suite.nix +++ b/pkgs/development/mobile/androidenv/test-suite.nix @@ -18,6 +18,7 @@ let in stdenv.mkDerivation { name = "androidenv-test-suite"; + version = "1"; buildInputs = lib.mapAttrsToList (name: value: value) all-tests; buildCommand = '' @@ -26,9 +27,8 @@ stdenv.mkDerivation { passthru.tests = all-tests; - # This is the toplevel package, so inherit the update script passthru.updateScript = { - command = [ ./update.sh ]; + command = [ ./update.rb ]; attrPath = "androidenv.test-suite"; supportedFeatures = [ "commit" ]; }; diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/update.rb old mode 100644 new mode 100755 similarity index 82% rename from pkgs/development/mobile/androidenv/mkrepo.rb rename to pkgs/development/mobile/androidenv/update.rb index 66fee5c47322..0b5f3be92fbc --- a/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/pkgs/development/mobile/androidenv/update.rb @@ -1,11 +1,15 @@ -#!/usr/bin/env ruby +#!/usr/bin/env nix-shell +#!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])" require 'json' require 'rubygems' -require 'nokogiri' -require 'slop' require 'shellwords' require 'erb' +require 'uri' +require 'stringio' +require 'slop' +require 'curb' +require 'nokogiri' # Returns a repo URL for a given package name. def repo_url value @@ -32,6 +36,36 @@ def image_url value, dir end end +# Runs a GET with curl. +def _curl_get url + curl = Curl::Easy.new(url) do |http| + http.headers['User-Agent'] = 'nixpkgs androidenv update bot' + yield http if block_given? + end + STDERR.print "GET #{url}" + curl.perform + STDERR.puts "... #{curl.response_code}" + + StringIO.new(curl.body_str) +end + +# Retrieves a repo from the filesystem or a URL. +def get location + uri = URI.parse(location) + case uri.scheme + when 'repo' + _curl_get repo_url("#{uri.host}#{uri.fragment}.xml") + when 'image' + _curl_get image_url("sys-img#{uri.fragment}.xml", uri.host) + else + if File.exist?(uri.path) + File.open(uri.path, 'rt') + else + raise "Repository #{uri} was neither a file nor a repo URL" + end + end +end + # Returns a JSON with the data and structure of the input XML def to_json_collector doc json = {} @@ -438,9 +472,19 @@ def merge dest, src end opts = Slop.parse do |o| - o.array '-p', '--packages', 'packages repo XMLs to parse' - o.array '-i', '--images', 'system image repo XMLs to parse' - o.array '-a', '--addons', 'addon repo XMLs to parse' + o.array '-p', '--packages', 'packages repo XMLs to parse', default: %w[repo://repository#2-3] + o.array '-i', '--images', 'system image repo XMLs to parse', default: %w[ + image://android#2-3 + image://android-tv#2-3 + image://android-wear#2-3 + image://android-wear-cn#2-3 + image://android-automotive#2-3 + image://google_apis#2-3 + image://google_apis_playstore#2-3 + ] + o.array '-a', '--addons', 'addon repo XMLs to parse', default: %w[repo://addon#2-3] + o.string '-I', '--input', 'input JSON file for repo', default: File.join(__dir__, 'repo.json') + o.string '-O', '--output', 'output JSON file for repo', default: File.join(__dir__, 'repo.json') end result = {} @@ -451,20 +495,20 @@ result['addons'] = {} result['extras'] = {} opts[:packages].each do |filename| - licenses, packages, extras = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) + licenses, packages, extras = parse_package_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks }) merge result['licenses'], licenses merge result['packages'], packages merge result['extras'], extras end opts[:images].each do |filename| - licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) + licenses, images = parse_image_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks }) merge result['licenses'], licenses merge result['images'], images end opts[:addons].each do |filename| - licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks }) + licenses, addons, extras = parse_addon_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks }) merge result['licenses'], licenses merge result['addons'], addons merge result['extras'], extras @@ -491,7 +535,14 @@ two_years_ago = today - 2 * 365 input = {} prev_latest = {} begin - input_json = (STDIN.tty?) ? "{}" : STDIN.read + input_json = if File.exist?(opts[:input]) + STDERR.puts "Reading #{opts[:input]}" + File.read(opts[:input]) + else + STDERR.puts "Creating new repo" + "{}" + end + if input_json != nil && !input_json.empty? input = expire_records(JSON.parse(input_json), two_years_ago) @@ -511,40 +562,37 @@ fixup_result = fixup(result) # therefore the old packages will work as long as the links are working on the Google servers. output = merge input, fixup_result -# See if there are any changes in the latest versions. -cur_latest = output['latest'] || {} - -old_versions = [] -new_versions = [] -changes = [] -changed = false - -cur_latest.each do |k, v| - prev = prev_latest[k] - if prev && prev != v - old_versions << "#{k}:#{prev}" - new_versions << "#{k}:#{v}" - changes << "#{k}: #{prev} -> #{v}" - changed = true - end -end - # Write the repository. Append a \n to keep nixpkgs Github Actions happy. -File.write 'repo.json', (JSON.pretty_generate(sort_recursively(output)) + "\n") +STDERR.puts "Writing #{opts[:output]}" +File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n") # Output metadata for the nixpkgs update script. -changed_paths = [] -if changed - if ENV['UPDATE_NIX_ATTR_PATH'] - # Instantiate it. - test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1` - test_status = $?.exitstatus - tests_ran = true - else - tests_ran = false +if ENV['UPDATE_NIX_ATTR_PATH'] + # See if there are any changes in the latest versions. + cur_latest = output['latest'] || {} + + old_versions = [] + new_versions = [] + changes = [] + changed = false + + cur_latest.each do |k, v| + prev = prev_latest[k] + if prev && prev != v + old_versions << "#{k}:#{prev}" + new_versions << "#{k}:#{v}" + changes << "#{k}: #{prev} -> #{v}" + changed = true + end end - template = ERB.new(<<-EOF, trim_mode: '<>-') + changed_paths = [] + if changed + # Instantiate it. + test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build #{Shellwords.escape(File.realpath(File.join(__dir__, '..', '..', '..', '..', 'default.nix')))} -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1` + test_status = $?.exitstatus + + template = ERB.new(<<-EOF, trim_mode: '<>-') androidenv: <%= changes.join('; ') %> Performed the following automatic androidenv updates: @@ -553,7 +601,6 @@ Performed the following automatic androidenv updates: - <%= change -%> <% end %> -<% if tests_ran %> Tests exited with status: <%= test_status -%> <% if !test_result.empty? %> @@ -562,19 +609,19 @@ Last 100 lines of output: <%= test_result.lines.last(100).join -%> ``` <% end %> -<% end %> EOF - changed_paths << { - attrPath: 'androidenv.androidPkgs.androidsdk', - oldVersion: old_versions.join('; '), - newVersion: new_versions.join('; '), - files: [ - File.realpath('repo.json') - ], - commitMessage: template.result(binding) - } -end + changed_paths << { + attrPath: 'androidenv.androidPkgs.androidsdk', + oldVersion: old_versions.join('; '), + newVersion: new_versions.join('; '), + files: [ + opts[:output] + ], + commitMessage: template.result(binding) + } + end -# nix-update info is on stderr -STDOUT.puts JSON.pretty_generate(changed_paths) + # nix-update info is on stdout + STDOUT.puts JSON.pretty_generate(changed_paths) +end diff --git a/pkgs/development/mobile/androidenv/update.sh b/pkgs/development/mobile/androidenv/update.sh deleted file mode 100755 index f79676069f9c..000000000000 --- a/pkgs/development/mobile/androidenv/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -pushd "$(dirname "$0")" &>/dev/null || exit 1 -./fetchrepo.sh && ./mkrepo.sh -popd &>/dev/null From 68995ee2b3936b87042e223a78a596b52378a70b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 29 May 2025 07:59:23 +0000 Subject: [PATCH 34/48] androidenv: ndk: 28.0.13004108 -> 28.1.13356709; cmake: 3.31.6 -> 4.0.2; emulator: 35.5.8 -> 35.6.9 Performed the following automatic androidenv updates: - ndk: 28.0.13004108 -> 28.1.13356709 - cmake: 3.31.6 -> 4.0.2 - emulator: 35.5.8 -> 35.6.9 Tests exited with status: 0 Last 100 lines of output: ``` /nix/store/vryxhh9i409xrsxb75ks0miqb7h97wpm-androidenv-test-suite ``` --- pkgs/development/mobile/androidenv/repo.json | 2321 ++++++++---------- 1 file changed, 1000 insertions(+), 1321 deletions(-) diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 26dc4252f547..d0bed2fdbd75 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -12,7 +12,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -91,7 +91,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -156,7 +156,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -233,7 +233,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -280,7 +280,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -357,7 +357,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -404,7 +404,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -483,7 +483,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -576,7 +576,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -669,7 +669,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -762,7 +762,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -855,7 +855,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -948,7 +948,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -1041,7 +1041,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -1134,7 +1134,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -1227,7 +1227,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -1320,7 +1320,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -1413,7 +1413,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -1478,7 +1478,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1543,7 +1543,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1608,7 +1608,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1673,7 +1673,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1738,7 +1738,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1803,7 +1803,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1869,7 +1869,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1900,7 +1900,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1931,7 +1931,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1960,7 +1960,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -2010,7 +2010,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-auto", "path": "extras/google/auto", @@ -2036,7 +2036,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -2072,7 +2072,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -2101,7 +2101,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -2130,7 +2130,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -2168,7 +2168,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -2197,7 +2197,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -2226,7 +2226,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -2256,7 +2256,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -2285,7 +2285,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -2314,7 +2314,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2984,7 +2984,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -3030,7 +3030,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -3078,7 +3078,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -3130,7 +3130,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -3179,7 +3179,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -3229,7 +3229,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -3275,7 +3275,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -3323,7 +3323,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -3375,7 +3375,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -3431,7 +3431,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -3470,7 +3470,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -3516,7 +3516,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -3564,7 +3564,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -3616,7 +3616,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -3672,7 +3672,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -3711,7 +3711,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -3757,7 +3757,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -3811,7 +3811,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3863,7 +3863,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3919,7 +3919,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3965,7 +3965,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -4013,7 +4013,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -4121,7 +4121,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -4167,7 +4167,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -4215,7 +4215,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -4267,7 +4267,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -4316,7 +4316,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -4353,7 +4353,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -4392,7 +4392,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -4438,7 +4438,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -4484,7 +4484,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -4530,7 +4530,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -4571,7 +4571,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -4623,7 +4623,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -4675,7 +4675,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -4727,7 +4727,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -4776,7 +4776,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -4815,7 +4815,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -4861,7 +4861,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -4907,7 +4907,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -4953,7 +4953,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -4994,7 +4994,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -5046,7 +5046,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -5098,7 +5098,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -5150,7 +5150,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -5199,7 +5199,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -5243,7 +5243,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -5282,7 +5282,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -5328,7 +5328,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -5374,7 +5374,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -5420,7 +5420,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -5461,7 +5461,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -5513,7 +5513,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -5565,7 +5565,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -5617,7 +5617,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -5673,7 +5673,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -5712,7 +5712,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -5758,7 +5758,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -5804,7 +5804,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -5850,7 +5850,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -5898,7 +5898,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -5950,7 +5950,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -6002,7 +6002,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -6056,7 +6056,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -6112,7 +6112,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -6158,7 +6158,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -6202,7 +6202,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -6241,7 +6241,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -6287,7 +6287,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -6333,7 +6333,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -6374,7 +6374,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -6426,7 +6426,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -6478,7 +6478,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -6530,7 +6530,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -6584,7 +6584,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -6655,7 +6655,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -6701,7 +6701,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -6752,7 +6752,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -6796,7 +6796,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -6840,7 +6840,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -6891,7 +6891,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -6958,7 +6958,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -7025,7 +7025,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -7094,7 +7094,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -7150,7 +7150,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -7201,7 +7201,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -7245,7 +7245,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -7289,7 +7289,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -7340,7 +7340,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -7407,7 +7407,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -7476,7 +7476,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -7537,7 +7537,7 @@ } }, "displayName": "Automotive Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-android-automotive-playstore-x86", "path": "system-images/android-28/android-automotive-playstore/x86", @@ -7582,7 +7582,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -7628,7 +7628,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -7679,7 +7679,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -7716,7 +7716,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -7753,7 +7753,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -7804,7 +7804,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -7871,7 +7871,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -7938,7 +7938,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -7997,7 +7997,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -8064,7 +8064,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -8131,7 +8131,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -8192,7 +8192,7 @@ } }, "displayName": "Automotive with Play Store Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-android-automotive-playstore-x86", "path": "system-images/android-29/android-automotive-playstore/x86", @@ -8252,7 +8252,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -8291,7 +8291,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -8354,7 +8354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -8417,7 +8417,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -8468,7 +8468,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -8525,7 +8525,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -8582,7 +8582,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -8641,7 +8641,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -8722,7 +8722,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -8803,7 +8803,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -8864,7 +8864,7 @@ } }, "displayName": "Automotive with Play Store Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-android-automotive-playstore-x86_64", "path": "system-images/android-30/android-automotive-playstore/x86_64", @@ -8924,7 +8924,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -8957,8 +8957,8 @@ { "arch": "all", "os": "all", - "sha1": "56c0c2550580f2ba1b33009c77db017dbcb3d470", - "size": 827418923, + "sha1": "ef7b5554a5f77fb33c7965604552411c155a38ac", + "size": 649112314, "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r12.zip" } ], @@ -8969,11 +8969,11 @@ } } }, - "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 20174, + "displayName": "China version of Wear OS 3 ARM 64 v8a System Image", + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", - "path": "system-images/android-30/android-wear/arm64-v8a", + "path": "system-images/android-30/android-wear-cn/arm64-v8a", "revision": "30-android-wear-arm64-v8a", "revision-details": { "major:0": "12" @@ -8991,7 +8991,7 @@ "id:0": "android-wear" }, "tag:2": { - "display:1": "Wear OS 3", + "display:1": "China version of Wear OS 3", "id:0": "android-wear" } } @@ -9001,8 +9001,8 @@ { "arch": "all", "os": "all", - "sha1": "73a96614a2ddcf586e4c659c436d2360bc25badc", - "size": 901929440, + "sha1": "42548b2bd1696ad6bd2f01a1cf83ef7a10971932", + "size": 759598676, "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r12.zip" } ], @@ -9013,11 +9013,11 @@ } } }, - "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 20174, + "displayName": "China version of Wear OS 3 Intel x86 Atom System Image", + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", - "path": "system-images/android-30/android-wear/x86", + "path": "system-images/android-30/android-wear-cn/x86", "revision": "30-android-wear-x86", "revision-details": { "major:0": "12" @@ -9035,7 +9035,7 @@ "id:0": "android-wear" }, "tag:2": { - "display:1": "Wear OS 3", + "display:1": "China version of Wear OS 3", "id:0": "android-wear" } } @@ -9053,7 +9053,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -9102,7 +9102,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -9153,7 +9153,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", @@ -9220,7 +9220,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -9287,7 +9287,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -9353,7 +9353,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -9434,7 +9434,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -9515,7 +9515,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -9586,7 +9586,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -9645,7 +9645,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -9696,7 +9696,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -9745,7 +9745,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -9806,7 +9806,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -9873,7 +9873,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -9949,7 +9949,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -10016,7 +10016,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -10077,7 +10077,7 @@ } }, "displayName": "Android Automotive with Google Play arm64-v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-arm64-v8a", "path": "system-images/android-32/android-automotive-playstore/arm64-v8a", @@ -10130,7 +10130,7 @@ } }, "displayName": "Android Automotive with Google Play x86_64 System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-x86_64", "path": "system-images/android-32/android-automotive-playstore/x86_64", @@ -10185,7 +10185,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -10234,7 +10234,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -10295,7 +10295,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -10362,7 +10362,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -10438,7 +10438,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -10519,7 +10519,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -10562,9 +10562,9 @@ { "arch": "all", "os": "all", - "sha1": "ca95328e871a6ec613fffc410b2e81ca7c7c2c95", - "size": 1314179288, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-33_r04.zip" + "sha1": "1350f29ead803659be77949886e4cc0fca543ae3", + "size": 1311397288, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-33_r05.zip" } ], "dependencies": { @@ -10580,13 +10580,13 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-automotive-arm64-v8a", "path": "system-images/android-33/android-automotive/arm64-v8a", "revision": "33-android-automotive-arm64-v8a", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:6": "arm64-v8a", @@ -10615,9 +10615,9 @@ { "arch": "all", "os": "all", - "sha1": "f23487d919389c9c5bf1882c030830de31ed0a21", - "size": 1336031457, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-33_r04.zip" + "sha1": "4657b6da29ad4273986f3b8fa9b1caac3bb5195f", + "size": 1333244962, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-33_r05.zip" } ], "dependencies": { @@ -10633,13 +10633,13 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-automotive-x86_64", "path": "system-images/android-33/android-automotive/x86_64", "revision": "33-android-automotive-x86_64", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:6": "x86_64", @@ -10698,7 +10698,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -10757,7 +10757,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -10803,7 +10803,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -10847,7 +10847,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -10898,7 +10898,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -10947,7 +10947,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -11008,7 +11008,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", @@ -11075,7 +11075,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", @@ -11144,7 +11144,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "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", @@ -11211,7 +11211,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -11286,7 +11286,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-33x-google_apis_playstore-arm64-v8a", "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a", @@ -11335,7 +11335,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-33x-google_apis_playstore-x86_64", "path": "system-images/android-33-ext4/google_apis_playstore/x86_64", @@ -11398,7 +11398,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", @@ -11458,7 +11458,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", @@ -11498,7 +11498,7 @@ } ], "displayName": "Wear OS 5 ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-android-wear-arm64-v8a", "path": "system-images/android-34/android-wear/arm64-v8a", @@ -11535,7 +11535,7 @@ } ], "displayName": "Wear OS 5 Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-android-wear-x86_64", "path": "system-images/android-34/android-wear/x86_64", @@ -11586,7 +11586,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -11635,7 +11635,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -11696,7 +11696,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", @@ -11764,7 +11764,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", @@ -11834,7 +11834,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", "path": "system-images/android-34/google_apis_playstore/arm64-v8a", @@ -11903,7 +11903,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", "path": "system-images/android-34/google_apis_playstore/x86_64", @@ -11948,9 +11948,9 @@ { "arch": "all", "os": "all", - "sha1": "2c0b4d0ed7aa50d498fb0e31ac500343deb90b7c", - "size": 1397481780, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r03.zip" + "sha1": "ce75a3152c34862f8092e31be13024693564cfa5", + "size": 1409602624, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r04.zip" } ], "dependencies": { @@ -11966,13 +11966,13 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-arm64-v8a", "path": "system-images/android-34-ext9/android-automotive/arm64-v8a", "revision": "34x-android-automotive-arm64-v8a", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:6": "arm64-v8a", @@ -12001,9 +12001,9 @@ { "arch": "all", "os": "all", - "sha1": "ccbfbf77c5b83a6bfb66032e25c1634104c66354", - "size": 1436319949, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r03.zip" + "sha1": "1a52bb3dc6a1b0e7ac19b1f512047df9d0b93c1b", + "size": 1451722407, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r04.zip" } ], "dependencies": { @@ -12019,13 +12019,13 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-x86_64", "path": "system-images/android-34-ext9/android-automotive/x86_64", "revision": "34x-android-automotive-x86_64", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:6": "x86_64", @@ -12088,7 +12088,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-34x-google_apis_playstore-arm64-v8a", "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", @@ -12137,7 +12137,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-34x-google_apis_playstore-x86_64", "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", @@ -12178,7 +12178,7 @@ } ], "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-arm64-v8a", "path": "system-images/android-35/android-wear/arm64-v8a", @@ -12210,7 +12210,7 @@ } ], "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-x86_64", "path": "system-images/android-35/android-wear/x86_64", @@ -12256,7 +12256,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35-default-arm64-v8a", "path": "system-images/android-35/default/arm64-v8a", @@ -12301,7 +12301,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35-default-x86_64", "path": "system-images/android-35/default/x86_64", @@ -12348,7 +12348,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis-arm64-v8a", "path": "system-images/android-35/google_apis/arm64-v8a", @@ -12406,7 +12406,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35-google_apis-x86_64", "path": "system-images/android-35/google_apis/x86_64", @@ -12466,7 +12466,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis_playstore-arm64-v8a", "path": "system-images/android-35/google_apis_playstore/arm64-v8a", @@ -12524,7 +12524,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35-google_apis_playstore-x86_64", "path": "system-images/android-35/google_apis_playstore/x86_64", @@ -12584,7 +12584,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-page_size_16kb-arm64-v8a", "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", @@ -12645,8 +12645,8 @@ } } }, - "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image", - "last-available-day": 20174, + "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35-page_size_16kb-x86_64", "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", @@ -12700,7 +12700,7 @@ } ], "displayName": "Wear OS 5.1 ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35x-android-wear-arm64-v8a", "path": "system-images/android-35-ext15/android-wear/arm64-v8a", @@ -12733,7 +12733,7 @@ } ], "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35x-android-wear-x86_64", "path": "system-images/android-35-ext15/android-wear/x86_64", @@ -12756,6 +12756,106 @@ } } }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "5ccebb92efc75d4924fb9f6a1680c2a90b4455d2", + "size": 1782795864, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35-ext15_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 20237, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35x-google_apis-arm64-v8a", + "path": "system-images/android-35-ext15/google_apis/arm64-v8a", + "revision": "35x-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:5": "arm64-v8a", + "api-level:0": "35x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "15", + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "5e359834781e52fefcccd922a15f04bef5bade76", + "size": 1742908646, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35-ext15_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "system-image-35x-google_apis-x86_64", + "path": "system-images/android-35-ext15/google_apis/x86_64", + "revision": "35x-google_apis-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:5": "x86_64", + "api-level:0": "35x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "15", + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -12780,10 +12880,10 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-35x-google_apis_playstore-arm64-v8a", - "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a", + "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a", "revision": "35x-google_apis_playstore-arm64-v8a", "revision-details": { "major:0": "1" @@ -12795,7 +12895,7 @@ "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "extension-level:1": "14", + "extension-level:1": "15", "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" @@ -12829,10 +12929,10 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-35x-google_apis_playstore-x86_64", - "path": "system-images/android-35-ext14/google_apis_playstore/x86_64", + "path": "system-images/android-35-ext15/google_apis_playstore/x86_64", "revision": "35x-google_apis_playstore-x86_64", "revision-details": { "major:0": "1" @@ -12844,7 +12944,7 @@ "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "extension-level:1": "14", + "extension-level:1": "15", "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" @@ -12858,15 +12958,83 @@ } }, "36": { + "android-wear": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "53f3fa2adea692b7eabf698d59fdc34d36ff08e4", + "size": 1139080003, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-36_signed_r01.zip" + } + ], + "displayName": "Wear OS 6.0 - Preview ARM 64 v8a System Image (signed)", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "system-image-36-android-wear-arm64-v8a", + "path": "system-images/signed/android-36/android-wear/arm64-v8a", + "revision": "36-android-wear-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "36", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "17", + "tag:3": { + "display:1": "Wear OS 6.0 - Preview", + "id:0": "android-wear" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "7ae6c4e1c614a649f75ccb653769ccd8cdb30e4a", + "size": 1116094453, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-36_signed_r01.zip" + } + ], + "displayName": "Wear OS 6.0 - Preview Intel x86_64 Atom System Image (signed)", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "system-image-36-android-wear-x86_64", + "path": "system-images/signed/android-36/android-wear/x86_64", + "revision": "36-android-wear-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "36", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "17", + "tag:3": { + "display:1": "Wear OS 6.0 - Preview", + "id:0": "android-wear" + } + } + } + }, "google_apis": { "arm64-v8a": { "archives": [ { "arch": "all", "os": "all", - "sha1": "82c8c75e78c73e80a663472f278e61ae3219ff7e", - "size": 1814357571, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36_r05.zip" + "sha1": "d4e36a020d33b1411e14ca1d4dd74d3b908e538f", + "size": 1852726191, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36_r06.zip" } ], "dependencies": { @@ -12882,13 +13050,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis-arm64-v8a", "path": "system-images/android-36/google_apis/arm64-v8a", "revision": "36-google_apis-arm64-v8a", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:5": "arm64-v8a", @@ -12913,9 +13081,9 @@ { "arch": "all", "os": "all", - "sha1": "069c5654cb549e7ff7c817e7023d0c680a623f8c", - "size": 1706610245, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36_r05.zip" + "sha1": "a9b0b4a0488e0c6c380f5485507950f011388511", + "size": 1875550742, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36_r06.zip" } ], "dependencies": { @@ -12931,13 +13099,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-36-google_apis-x86_64", "path": "system-images/android-36/google_apis/x86_64", "revision": "36-google_apis-x86_64", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:5": "x86_64", @@ -12964,9 +13132,9 @@ { "arch": "all", "os": "all", - "sha1": "1605ca6608e2e83f250c4375e15489ade9169c52", - "size": 1835226829, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r05.zip" + "sha1": "b4de516b43b508947d04484732351d9a36fee33f", + "size": 1874450592, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36_r06.zip" } ], "dependencies": { @@ -12982,13 +13150,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis_playstore-arm64-v8a", "path": "system-images/android-36/google_apis_playstore/arm64-v8a", "revision": "36-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:5": "arm64-v8a", @@ -13013,9 +13181,9 @@ { "arch": "all", "os": "all", - "sha1": "b24c50ec8e211cc116f448b67f49ed482c55bd55", - "size": 1741001393, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r05.zip" + "sha1": "398e02989fb3c274dd2d99541cf71255de538651", + "size": 1912630049, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36_r06.zip" } ], "dependencies": { @@ -13031,13 +13199,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-36-google_apis_playstore-x86_64", "path": "system-images/android-36/google_apis_playstore/x86_64", "revision": "36-google_apis_playstore-x86_64", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:5": "x86_64", @@ -13064,9 +13232,9 @@ { "arch": "all", "os": "all", - "sha1": "da544188ab47a89f4b3cf6614523cf3cb3440129", - "size": 1887754420, - "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36_r05.zip" + "sha1": "2edacb5f0d7cd63e838b9e313a2b0cd002f29381", + "size": 1928649616, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-playstore-ps16k-36_r06.zip" } ], "dependencies": { @@ -13082,13 +13250,13 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-page_size_16kb-arm64-v8a", "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a", "revision": "36-page_size_16kb-arm64-v8a", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:6": "arm64-v8a", @@ -13117,9 +13285,9 @@ { "arch": "all", "os": "all", - "sha1": "d1f4ccf971300511e5f8d606c6d5fabf97647b36", - "size": 1738939657, - "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36_r05.zip" + "sha1": "8ab4c932fce799060be81978ebfe00055303ebee", + "size": 1912261645, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-playstore-ps16k-36_r06.zip" } ], "dependencies": { @@ -13134,14 +13302,14 @@ } } }, - "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image", - "last-available-day": 20174, + "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-36-page_size_16kb-x86_64", "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64", "revision": "36-page_size_16kb-x86_64", "revision-details": { - "major:0": "5" + "major:0": "6" }, "type-details": { "abi:6": "x86_64", @@ -13192,7 +13360,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis-arm64-v8a", "path": "system-images/android-Baklava/google_apis/arm64-v8a", @@ -13242,7 +13410,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis-x86_64", "path": "system-images/android-Baklava/google_apis/x86_64", @@ -13294,7 +13462,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis_playstore-arm64-v8a", "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a", @@ -13344,7 +13512,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis_playstore-x86_64", "path": "system-images/android-Baklava/google_apis_playstore/x86_64", @@ -13396,7 +13564,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-page_size_16kb-arm64-v8a", "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a", @@ -13449,8 +13617,8 @@ } } }, - "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image", - "last-available-day": 20174, + "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image", + "last-available-day": 20237, "license": "android-sdk-license", "name": "system-image-Baklava-page_size_16kb-x86_64", "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64", @@ -13705,222 +13873,8 @@ }, "UpsideDownCake": { "google_apis": { - "arm64-v8a": { - "archives": [ - { - "os": "all", - "sha1": "2335c0cf2c76cb1883a6d6ee38e6fff99989596f", - "size": 1549237055, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-UpsideDownCake_r04.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } - } - }, - "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, - "license": "android-sdk-arm-dbt-license", - "name": "system-image-UpsideDownCake-google_apis-arm64-v8a", - "path": "system-images/android-UpsideDownCake/google_apis/arm64-v8a", - "revision": "UpsideDownCake-google_apis-arm64-v8a", - "revision-details": { - "major:0": "4" - }, - "type-details": { - "abi:4": "arm64-v8a", - "api-level:0": "33", - "codename:1": "UpsideDownCake", - "element-attributes": { - "xsi:type": "ns12:sysImgDetailsType" - }, - "tag:2": { - "display:1": "Google APIs", - "id:0": "google_apis" - }, - "vendor:3": { - "display:1": "Google Inc.", - "id:0": "google" - } - } - }, - "x86_64": { - "archives": [ - { - "os": "all", - "sha1": "15a514144f57865a84abbd6df8e6897c80bb8b88", - "size": 1491492723, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-UpsideDownCake_r04.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } - } - }, - "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "system-image-UpsideDownCake-google_apis-x86_64", - "path": "system-images/android-UpsideDownCake/google_apis/x86_64", - "revision": "UpsideDownCake-google_apis-x86_64", - "revision-details": { - "major:0": "4" - }, - "type-details": { - "abi:4": "x86_64", - "api-level:0": "33", - "codename:1": "UpsideDownCake", - "element-attributes": { - "xsi:type": "ns12:sysImgDetailsType" - }, - "tag:2": { - "display:1": "Google APIs", - "id:0": "google_apis" - }, - "vendor:3": { - "display:1": "Google Inc.", - "id:0": "google" - } - } - } }, "google_apis_playstore": { - "arm64-v8a": { - "archives": [ - { - "os": "macosx", - "sha1": "b9f7a7d25450e2385a8334af688ab862fc723dba", - "size": 1513459071, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCake_r04-darwin.zip" - }, - { - "os": "linux", - "sha1": "b9f7a7d25450e2385a8334af688ab862fc723dba", - "size": 1513459071, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCake_r04-linux.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } - } - }, - "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, - "license": "android-sdk-arm-dbt-license", - "name": "system-image-UpsideDownCake-google_apis_playstore-arm64-v8a", - "path": "system-images/android-UpsideDownCake/google_apis_playstore/arm64-v8a", - "revision": "UpsideDownCake-google_apis_playstore-arm64-v8a", - "revision-details": { - "major:0": "4" - }, - "type-details": { - "abi:4": "arm64-v8a", - "api-level:0": "33", - "codename:1": "UpsideDownCake", - "element-attributes": { - "xsi:type": "ns12:sysImgDetailsType" - }, - "tag:2": { - "display:1": "Google Play", - "id:0": "google_apis_playstore" - }, - "vendor:3": { - "display:1": "Google Inc.", - "id:0": "google" - } - } - }, - "x86_64": { - "archives": [ - { - "os": "all", - "sha1": "4647cbb1877cca1394b1a4fff52c644e6220d07a", - "size": 1464098477, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCake_r04.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } - } - }, - "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "system-image-UpsideDownCake-google_apis_playstore-x86_64", - "path": "system-images/android-UpsideDownCake/google_apis_playstore/x86_64", - "revision": "UpsideDownCake-google_apis_playstore-x86_64", - "revision-details": { - "major:0": "4" - }, - "type-details": { - "abi:4": "x86_64", - "api-level:0": "33", - "codename:1": "UpsideDownCake", - "element-attributes": { - "xsi:type": "ns12:sysImgDetailsType" - }, - "tag:2": { - "display:1": "Google Play", - "id:0": "google_apis_playstore" - }, - "vendor:3": { - "display:1": "Google Inc.", - "id:0": "google" - } - } - } } }, "UpsideDownCakePrivacySandbox": { @@ -14272,10 +14226,10 @@ }, "latest": { "build-tools": "36.0.0", - "cmake": "3.31.6", + "cmake": "4.0.2", "cmdline-tools": "19.0", - "emulator": "35.5.8", - "ndk": "28.0.13004108", + "emulator": "35.6.9", + "ndk": "28.1.13356709", "ndk-bundle": "22.1.7171670", "platform-tools": "35.0.2", "platforms": "36", @@ -14346,7 +14300,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14395,7 +14349,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14444,7 +14398,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14493,7 +14447,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14542,7 +14496,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14591,7 +14545,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14640,7 +14594,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14689,7 +14643,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14738,7 +14692,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -14786,7 +14740,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -14834,7 +14788,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14883,7 +14837,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14932,7 +14886,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -14981,7 +14935,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15030,7 +14984,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15079,7 +15033,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -15127,7 +15081,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15176,7 +15130,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -15224,7 +15178,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15273,7 +15227,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -15321,7 +15275,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -15369,7 +15323,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -15417,7 +15371,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -15465,7 +15419,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -15513,7 +15467,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -15561,7 +15515,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -15609,7 +15563,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -15657,7 +15611,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -15705,7 +15659,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -15753,7 +15707,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -15801,7 +15755,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -15849,7 +15803,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -15897,7 +15851,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -15945,7 +15899,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -15993,7 +15947,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -16041,7 +15995,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -16089,7 +16043,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -16137,7 +16091,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -16185,7 +16139,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -16233,7 +16187,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -16283,7 +16237,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -16333,7 +16287,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -16381,7 +16335,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -16429,7 +16383,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -16477,7 +16431,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -16525,7 +16479,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -16575,7 +16529,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -16625,7 +16579,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -16675,7 +16629,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -16723,7 +16677,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -16771,7 +16725,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -16819,7 +16773,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -16867,7 +16821,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -16915,7 +16869,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -16963,7 +16917,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -17004,7 +16958,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -17045,7 +16999,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -17086,7 +17040,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -17128,7 +17082,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -17169,7 +17123,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -17210,7 +17164,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -17251,7 +17205,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -17292,7 +17246,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -17333,7 +17287,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -17375,7 +17329,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -17417,7 +17371,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -17434,45 +17388,6 @@ } } }, - "34.0.0-rc4": { - "archives": [ - { - "os": "linux", - "sha1": "61f7cfa64786bffbf6c6c9a3d74d025a07239928", - "size": 61206867, - "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-linux.zip" - }, - { - "os": "macosx", - "sha1": "522431b33cd7fa1407914a8fa66a27bfe1755cbb", - "size": 76553187, - "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-macosx.zip" - }, - { - "os": "windows", - "sha1": "699f1cb99a8de88b1746ce12302d6c2ddce81186", - "size": 58219308, - "url": "https://dl.google.com/android/repository/build-tools_r34-rc4-windows.zip" - } - ], - "displayName": "Android SDK Build-Tools 34-rc4", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "build-tools", - "path": "build-tools/34.0.0-rc4", - "revision": "34.0.0-rc4", - "revision-details": { - "major:0": "34", - "micro:2": "0", - "minor:1": "0", - "preview:3": "4" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "35.0.0": { "archives": [ { @@ -17498,7 +17413,7 @@ } ], "displayName": "Android SDK Build-Tools 35", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.0", @@ -17539,7 +17454,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -17581,7 +17496,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -17623,7 +17538,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc3", @@ -17665,7 +17580,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc4", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc4", @@ -17707,7 +17622,7 @@ } ], "displayName": "Android SDK Build-Tools 35.0.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.1", @@ -17748,7 +17663,7 @@ } ], "displayName": "Android SDK Build-Tools 36", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/36.0.0", @@ -17789,7 +17704,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc1", @@ -17831,7 +17746,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc3", @@ -17873,7 +17788,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc4", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc4", @@ -17915,7 +17830,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc5", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc5", @@ -17966,7 +17881,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -18007,7 +17922,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -18048,7 +17963,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -18089,7 +18004,7 @@ } ], "displayName": "CMake 3.30.3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.3", @@ -18130,7 +18045,7 @@ } ], "displayName": "CMake 3.30.4", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.4", @@ -18171,7 +18086,7 @@ } ], "displayName": "CMake 3.30.5", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.5", @@ -18212,7 +18127,7 @@ } ], "displayName": "CMake 3.31.0", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.0", @@ -18253,7 +18168,7 @@ } ], "displayName": "CMake 3.31.1", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.1", @@ -18294,7 +18209,7 @@ } ], "displayName": "CMake 3.31.4", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.4", @@ -18335,7 +18250,7 @@ } ], "displayName": "CMake 3.31.5", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.5", @@ -18376,7 +18291,7 @@ } ], "displayName": "CMake 3.31.6", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.6", @@ -18424,7 +18339,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -18439,6 +18354,47 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "4.0.2": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "83295132168f6a41d6461746e1e9844583adac00", + "size": 30909648, + "url": "https://dl.google.com/android/repository/cmake-4.0.2-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "82f5dfe96433d1085f49697f7f985266ebece998", + "size": 43157416, + "url": "https://dl.google.com/android/repository/cmake-4.0.2-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "337378ae8fb6b7c88b8c439dbe2714cc17a3ab04", + "size": 20621162, + "url": "https://dl.google.com/android/repository/cmake-4.0.2-windows.zip" + } + ], + "displayName": "CMake 4.0.2", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "cmake", + "path": "cmake/4.0.2", + "revision": "4.0.2", + "revision-details": { + "major:0": "4", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmdline-tools": { @@ -18467,7 +18423,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -18507,7 +18463,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -18522,44 +18478,6 @@ } } }, - "10.0-rc04": { - "archives": [ - { - "os": "linux", - "sha1": "fe41906d2ce82df4cde74fe258e0ccdb283de60a", - "size": 138718717, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-9645777_latest.zip" - }, - { - "os": "macosx", - "sha1": "021540982a843ae2c9b4e0a5c2034b29681b4f70", - "size": 138718701, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-9645777_latest.zip" - }, - { - "os": "windows", - "sha1": "9c3877a2926c1e73af981964b0f4381a6d68fb21", - "size": 138694572, - "url": "https://dl.google.com/android/repository/commandlinetools-win-9645777_latest.zip" - } - ], - "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "cmdline-tools", - "path": "cmdline-tools/10.0-beta04", - "revision": "10.0-rc04", - "revision-details": { - "major:0": "10", - "minor:1": "0", - "preview:2": "04" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "11.0": { "archives": [ { @@ -18585,7 +18503,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -18638,44 +18556,6 @@ } } }, - "11.0-rc07": { - "archives": [ - { - "os": "linux", - "sha1": "c43e4fb8567c4625e8daf4cee0a5490f826a5442", - "size": 147822296, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-9644228_latest.zip" - }, - { - "os": "macosx", - "sha1": "2c97234849128cb75b0691cf652ab098707c610c", - "size": 147822280, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-9644228_latest.zip" - }, - { - "os": "windows", - "sha1": "2bfc8fad022acce100a5b0583def1ca5bc56eff1", - "size": 147798151, - "url": "https://dl.google.com/android/repository/commandlinetools-win-9644228_latest.zip" - } - ], - "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "cmdline-tools", - "path": "cmdline-tools/11.0-alpha07", - "revision": "11.0-rc07", - "revision-details": { - "major:0": "11", - "minor:1": "0", - "preview:2": "07" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "12.0": { "archives": [ { @@ -18701,7 +18581,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -18779,7 +18659,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -18819,7 +18699,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -18860,7 +18740,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -18901,7 +18781,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0", @@ -18941,7 +18821,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0-alpha01", @@ -18982,7 +18862,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/17.0", @@ -19022,7 +18902,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0", @@ -19062,7 +18942,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0-alpha01", @@ -19103,7 +18983,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -19144,7 +19024,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -19184,7 +19064,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -19224,7 +19104,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -19264,7 +19144,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -19304,7 +19184,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -19344,7 +19224,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -19384,7 +19264,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -19424,7 +19304,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -19441,96 +19321,6 @@ } }, "emulator": { - "31.3.10": { - "archives": [ - { - "os": "macosx", - "sha1": "4a35a2702f9138653cd1b67d04e01ffa65fb37bc", - "size": 347308456, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8807927.zip" - }, - { - "os": "linux", - "sha1": "43df6ed553b89e1553d588251526aae8f79da214", - "size": 293822881, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8807927.zip" - }, - { - "os": "windows", - "sha1": "52f8bfa4a09074e607d393302fe8a627846a18e9", - "size": 380246403, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8807927.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19469, - "license": "android-sdk-license", - "name": "emulator", - "path": "emulator", - "revision": "31.3.10", - "revision-details": { - "major:0": "31", - "micro:2": "10", - "minor:1": "3" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, - "31.3.14": { - "archives": [ - { - "os": "linux", - "sha1": "b5ab96ebffc6ea6816a5b0e9474859463b21ab78", - "size": 293826836, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-9322596.zip" - }, - { - "os": "windows", - "sha1": "632eba430f67abeddcf15ceb0a872b25fdbb7e62", - "size": 381130167, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-9322596.zip" - }, - { - "os": "macosx", - "sha1": "00e8685beffbe19f803cd5d698fbe6406b5ee6f3", - "size": 347313356, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9322596.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19469, - "license": "android-sdk-license", - "name": "emulator", - "path": "emulator", - "revision": "31.3.14", - "revision-details": { - "major:0": "31", - "micro:2": "14", - "minor:1": "3" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "32.1.10": { "archives": [ { @@ -19576,51 +19366,6 @@ } } }, - "32.1.12": { - "archives": [ - { - "os": "linux", - "sha1": "556fb884d6e72b597bf5c1fa959f59744994fb68", - "size": 270165820, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-9751036.zip" - }, - { - "os": "windows", - "sha1": "0ee17dd9b4410d38dc2f6a6227e899d6910b2c55", - "size": 332999329, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-9751036.zip" - }, - { - "os": "macosx", - "sha1": "d37d6e301f36d8f0797ca96a3fd6b8ee5f8d46ae", - "size": 307219070, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9751036.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19489, - "license": "android-sdk-license", - "name": "emulator", - "path": "emulator", - "revision": "32.1.12", - "revision-details": { - "major:0": "32", - "micro:2": "12", - "minor:1": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "32.1.14": { "archives": [ { @@ -19704,96 +19449,6 @@ } } }, - "32.1.8": { - "archives": [ - { - "os": "macosx", - "sha1": "13cadd038b401fdfa04e4af153a7f696ccd422cc", - "size": 309314692, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9310560.zip" - }, - { - "os": "linux", - "sha1": "7d82689a73aacdd56684d7134dc88cc3537fb911", - "size": 270158359, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-9310560.zip" - }, - { - "os": "windows", - "sha1": "8324aeb3bd74a214978252c51574b40cdb56b4ba", - "size": 333001267, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-9310560.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19469, - "license": "android-sdk-preview-license", - "name": "emulator", - "path": "emulator", - "revision": "32.1.8", - "revision-details": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, - "33.1.10": { - "archives": [ - { - "os": "macosx", - "sha1": "f38b9ec7e9c9ff3b8c4022e7f9baa1d6622634a0", - "size": 325272345, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10078095.zip" - }, - { - "os": "linux", - "sha1": "e97f77ce116ff8fb13bd8f89a2097cc4ab1dbc67", - "size": 180494623, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-10078095.zip" - }, - { - "os": "windows", - "sha1": "8738b20ee568c4e6a84b66b1fa848517db646c47", - "size": 354011689, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-10078095.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "emulator", - "path": "emulator", - "revision": "33.1.10", - "revision-details": { - "major:0": "33", - "micro:2": "10", - "minor:1": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "33.1.17": { "archives": [ { @@ -19877,96 +19532,6 @@ } } }, - "33.1.4": { - "archives": [ - { - "os": "macosx", - "sha1": "33be82356a352b79b742154f7c71f6f13455f27b", - "size": 345831055, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9936625.zip" - }, - { - "os": "linux", - "sha1": "cfa28a326b6328e2f3a068ac3030a075471d9df0", - "size": 260288819, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-9936625.zip" - }, - { - "os": "windows", - "sha1": "0aab97a7b84853c8f8c7618191dc23416e2a7a4b", - "size": 373623936, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-9936625.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19469, - "license": "android-sdk-preview-license", - "name": "emulator", - "path": "emulator", - "revision": "33.1.4", - "revision-details": { - "major:0": "33", - "micro:2": "4", - "minor:1": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, - "33.1.6": { - "archives": [ - { - "os": "macosx", - "sha1": "a31338f160fc5fa7973946d34a0d0ce1a2c0759a", - "size": 332134756, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10047184.zip" - }, - { - "os": "linux", - "sha1": "9f5c71277f52837d4fb43f72c80103bdf81c0569", - "size": 254562719, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-10047184.zip" - }, - { - "os": "windows", - "sha1": "11ba13425c6fcd275f5e1aa95923f736dd2bcb64", - "size": 361497029, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-10047184.zip" - } - ], - "dependencies": { - "dependency:0": { - "element-attributes": { - "path": "patcher;v4" - } - } - }, - "displayName": "Android Emulator", - "last-available-day": 19489, - "license": "android-sdk-preview-license", - "name": "emulator", - "path": "emulator", - "revision": "33.1.6", - "revision-details": { - "major:0": "33", - "micro:2": "6", - "minor:1": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "34.1.19": { "archives": [ { @@ -20501,6 +20066,54 @@ } } }, + "35.5.10": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "0f7336a0477654cfbe5593f1888d9c2b1bdf30e0", + "size": 301181039, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-13402964.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "5339e2be893ee74e352b3dde3d0700deda380a7d", + "size": 394068912, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13402964.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "4b607dfa4797de2356bf54f4c6caaef3b8bf187d", + "size": 312167479, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13402964.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "5523c285900e345adad65b1bd50daba101d692d0", + "size": 423391334, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-13402964.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.5.10", + "revision-details": { + "major:0": "35", + "micro:2": "10", + "minor:1": "5" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "35.5.2": { "archives": [ { @@ -20692,6 +20305,102 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.6.9": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "66a9c575d3bcc2098e0eba68fcf8b2c87d0eb241", + "size": 319085855, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-13473012.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "a9d670e765fc573c99273de7eb768a5256dea883", + "size": 394682677, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13473012.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "569e708aa89eb4d3d5787d97764215690f31b46b", + "size": 312519726, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13473012.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "2288e8aa9b9db7943093435875052f9c1cda7817", + "size": 440020709, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-13473012.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.6.9", + "revision-details": { + "major:0": "35", + "micro:2": "9", + "minor:1": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "36.1.2": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "74a1c093bea491f3ecbd80a027bc28dd7c184688", + "size": 324772288, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-13544801.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "802bbec21bbbe151440690f65fdb24b33005ef2a", + "size": 402124565, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13544801.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "26087d0d3b70cc196c2317d24d71b02b699fc3d8", + "size": 319759472, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13544801.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "8f7a97fb9d23e2c7f670bd2b03ea61215f43b25d", + "size": 446247044, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-13544801.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20237, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "36.1.2", + "revision-details": { + "major:0": "36", + "micro:2": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -20817,7 +20526,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -20879,7 +20588,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -20941,7 +20650,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -21003,7 +20712,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -21066,7 +20775,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -21128,7 +20837,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -21192,7 +20901,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -21256,7 +20965,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -21318,7 +21027,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -21366,7 +21075,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -21415,7 +21124,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -21463,7 +21172,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -21519,7 +21228,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -21575,7 +21284,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -21630,7 +21339,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -21686,7 +21395,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -21741,7 +21450,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -21796,7 +21505,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -21851,7 +21560,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -21907,7 +21616,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -21962,7 +21671,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -22017,7 +21726,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -22073,7 +21782,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -22129,7 +21838,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -22185,7 +21894,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -22234,7 +21943,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -22283,7 +21992,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -22332,7 +22041,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -22380,7 +22089,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -22428,7 +22137,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -22476,7 +22185,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -22525,7 +22234,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -22574,7 +22283,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -22623,7 +22332,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -22671,7 +22380,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -22720,7 +22429,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -22769,7 +22478,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -22818,7 +22527,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -22867,7 +22576,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -22915,7 +22624,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -22963,7 +22672,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -23011,7 +22720,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -23053,7 +22762,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -23095,7 +22804,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -23136,7 +22845,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -23177,7 +22886,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -23218,7 +22927,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -23259,7 +22968,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11718014", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11718014", @@ -23301,7 +23010,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11902837", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11902837", @@ -23343,7 +23052,7 @@ } ], "displayName": "NDK (Side by side) 27.0.12077973", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.0.12077973", @@ -23384,7 +23093,7 @@ } ], "displayName": "NDK (Side by side) 27.1.12297006", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.1.12297006", @@ -23425,7 +23134,7 @@ } ], "displayName": "NDK (Side by side) 27.2.12479018", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.2.12479018", @@ -23466,7 +23175,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12433566", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12433566", @@ -23508,7 +23217,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12674087", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12674087", @@ -23550,7 +23259,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12916984", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12916984", @@ -23592,7 +23301,7 @@ } ], "displayName": "NDK (Side by side) 28.0.13004108", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.0.13004108", @@ -23608,6 +23317,47 @@ } } }, + "28.1.13356709": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "f574d3165405bd59ffc5edaadac02689075a729f", + "size": 722264879, + "url": "https://dl.google.com/android/repository/android-ndk-r28b-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "6dec1444aceeadd46cf5e1438c28bcc521fc6668", + "size": 949590256, + "url": "https://dl.google.com/android/repository/android-ndk-r28b-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "c7d82072807fcabbd6ee356476761d8729307185", + "size": 748117965, + "url": "https://dl.google.com/android/repository/android-ndk-r28b-windows.zip" + } + ], + "displayName": "NDK (Side by side) 28.1.13356709", + "last-available-day": 20237, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/28.1.13356709", + "revision": "28.1.13356709", + "revision-details": { + "major:0": "28", + "micro:2": "13356709", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "29.0.13113456-rc1": { "archives": [ { @@ -23633,7 +23383,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13113456", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13113456", @@ -23698,7 +23448,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -23760,7 +23510,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -23822,7 +23572,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -23884,7 +23634,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -23947,7 +23697,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24009,7 +23759,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -24073,7 +23823,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -24137,7 +23887,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24199,7 +23949,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24247,7 +23997,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24296,7 +24046,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24344,7 +24094,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24400,7 +24150,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24456,7 +24206,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24511,7 +24261,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24567,7 +24317,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24622,7 +24372,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24677,7 +24427,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24732,7 +24482,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24788,7 +24538,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24843,7 +24593,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24898,7 +24648,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -24954,7 +24704,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25010,7 +24760,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25066,7 +24816,7 @@ } }, "displayName": "NDK", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -25111,82 +24861,6 @@ } }, "platform-tools": { - "33.0.3": { - "archives": [ - { - "os": "macosx", - "sha1": "250da3216e4c93ccd2612dcec0b64c2668354b09", - "size": 12767128, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-darwin.zip" - }, - { - "os": "linux", - "sha1": "deb43a0f9eaccd16a47937367ef3b53db3db8d10", - "size": 7505569, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-linux.zip" - }, - { - "os": "windows", - "sha1": "6028a80149c0ccde2db22d69e7fe84a352d852a2", - "size": 5642796, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.3-windows.zip" - } - ], - "displayName": "Android SDK Platform-Tools", - "last-available-day": 19469, - "license": "android-sdk-license", - "name": "platform-tools", - "path": "platform-tools", - "revision": "33.0.3", - "revision-details": { - "major:0": "33", - "micro:2": "3", - "minor:1": "0" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, - "34.0.1": { - "archives": [ - { - "os": "macosx", - "sha1": "40f24dc4f2baf911ccb2a53c14bfb69fb8088c57", - "size": 11215880, - "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-darwin.zip" - }, - { - "os": "linux", - "sha1": "7e8f205a0cfe574ffecb6ec41e6496f5328211fd", - "size": 6336109, - "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-linux.zip" - }, - { - "os": "windows", - "sha1": "3806f15fddb6ffc5ce38efe78df1708be666a9f4", - "size": 6079357, - "url": "https://dl.google.com/android/repository/platform-tools_r34.0.1-windows.zip" - } - ], - "displayName": "Android SDK Platform-Tools", - "last-available-day": 19489, - "license": "android-sdk-license", - "name": "platform-tools", - "path": "platform-tools", - "revision": "34.0.1", - "revision-details": { - "major:0": "34", - "micro:2": "1", - "minor:1": "0" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "34.0.4": { "archives": [ { @@ -25326,7 +25000,7 @@ } ], "displayName": "Android SDK Platform-Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", @@ -25341,6 +25015,47 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "36.0.0": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "ddb0cd76d952d9a1f4c8a32e4ec0e73d7a8bebb8", + "size": 7904253, + "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "48ebbd2fc67d894d7fd7b21679a7c8eb3fed9b28", + "size": 14186209, + "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "342b69dcbab46c9d3b802d7e21b95a91c8c9b3ff", + "size": 7138793, + "url": "https://dl.google.com/android/repository/platform-tools_r36.0.0-win.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 20237, + "license": "android-sdk-preview-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "36.0.0", + "revision-details": { + "major:0": "36", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -25355,7 +25070,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -25394,7 +25109,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -25433,7 +25148,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -25472,7 +25187,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -25511,7 +25226,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -25550,7 +25265,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -25589,7 +25304,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -25628,7 +25343,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -25667,7 +25382,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -25706,7 +25421,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -25759,7 +25474,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -25799,7 +25514,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -25838,7 +25553,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -25877,7 +25592,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -25916,7 +25631,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -25955,7 +25670,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -25994,7 +25709,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -26033,7 +25748,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -26072,7 +25787,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -26111,7 +25826,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -26150,7 +25865,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -26203,7 +25918,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -26243,7 +25958,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -26282,7 +25997,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -26321,7 +26036,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -26360,7 +26075,7 @@ } ], "displayName": "Android SDK Platform 33", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -26400,7 +26115,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33-ext5", @@ -26435,7 +26150,7 @@ } ], "displayName": "Android SDK Platform 34", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -26481,7 +26196,7 @@ } ], "displayName": "Android SDK Platform 34-ext12", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-34-ext12", @@ -26514,7 +26229,7 @@ } ], "displayName": "Android SDK Platform 35", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35", @@ -26551,11 +26266,11 @@ "url": "https://dl.google.com/android/repository/platform-35-ext14_r01.zip" } ], - "displayName": "Android SDK Platform 35-ext14", - "last-available-day": 20174, + "displayName": "Android SDK Platform 35-ext15", + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", - "path": "platforms/android-35-ext14", + "path": "platforms/android-35-ext15", "revision": "35x", "revision-details": { "major:0": "1" @@ -26566,7 +26281,7 @@ "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, - "extension-level:1": "14", + "extension-level:1": "15", "layoutlib:3": { "element-attributes": { "api": "15" @@ -26579,19 +26294,19 @@ { "arch": "all", "os": "all", - "sha1": "feed7041652a3744582bb233506013969dbadb46", - "size": 65749783, - "url": "https://dl.google.com/android/repository/platform-36_r01.zip" + "sha1": "2c1a80dd4d9f7d0e6dd336ec603d9b5c55a6f576", + "size": 65878410, + "url": "https://dl.google.com/android/repository/platform-36_r02.zip" } ], "displayName": "Android SDK Platform 36", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36", "revision": "36", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "api-level:0": "36", @@ -26632,7 +26347,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -26686,7 +26401,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -26740,7 +26455,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -26780,7 +26495,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -26819,7 +26534,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -26858,7 +26573,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -26897,7 +26612,7 @@ } ], "displayName": "Android SDK Platform Baklava", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-Baklava", @@ -26962,7 +26677,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -27055,42 +26770,6 @@ } }, "skiaparser": { - "1": { - "archives": [ - { - "os": "linux", - "sha1": "72be6f7630b28e02449a8bbadff7589688f3c3d6", - "size": 7014665, - "url": "https://dl.google.com/android/repository/skiaparser-8339467-linux.zip" - }, - { - "os": "macosx", - "sha1": "53c688b0d2458bcead273791745fb27efa3b58ce", - "size": 17231541, - "url": "https://dl.google.com/android/repository/skiaparser-8339467-mac.zip" - }, - { - "os": "windows", - "sha1": "8d08dc7c56531092f1704a24b3457bd0455a4be1", - "size": 10174177, - "url": "https://dl.google.com/android/repository/skiaparser-8339467-win.zip" - } - ], - "displayName": "Layout Inspector image server for API 31 and T", - "last-available-day": 19469, - "license": "android-sdk-license", - "name": "skiaparser", - "path": "skiaparser/3", - "revision": "1", - "revision-details": { - "major:0": "1" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "3": { "archives": [ { @@ -27116,7 +26795,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -27237,7 +26916,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -27283,7 +26962,7 @@ } ], "displayName": "Layout Inspector image server for API 31-36", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -27310,7 +26989,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -27340,7 +27019,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -27369,7 +27048,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -27398,7 +27077,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -27427,7 +27106,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -27456,7 +27135,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -27485,7 +27164,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -27514,7 +27193,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -27543,7 +27222,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -27572,7 +27251,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -27601,7 +27280,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -27630,7 +27309,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -27659,7 +27338,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -27688,7 +27367,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -27717,7 +27396,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -27746,7 +27425,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -27775,7 +27454,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -27804,7 +27483,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -27833,7 +27512,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -27862,7 +27541,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -27892,7 +27571,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -27922,7 +27601,7 @@ } ], "displayName": "Sources for Android 35", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-35", @@ -27946,13 +27625,13 @@ { "arch": "all", "os": "all", - "sha1": "57b6cbc3acff91f6b1bc56f4083c9446052a9851", - "size": 51345538, + "sha1": "cbd2cf0e67abf996c4ad6cf6955c3a781d75852a", + "size": 51654722, "url": "https://dl.google.com/android/repository/source-36_r01.zip" } ], "displayName": "Sources for Android 36", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "sources", "path": "sources/android-36", @@ -28019,7 +27698,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 20174, + "last-available-day": 20237, "license": "android-sdk-license", "name": "tools", "obsolete": "true", From 6dd418b7dc62e463c4ff285e2798883b23026ed1 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Wed, 28 May 2025 19:46:07 +0200 Subject: [PATCH 35/48] python313Packages.colcon-output: init at 0.2.13 --- .../python-modules/colcon-output/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/colcon-output/default.nix diff --git a/pkgs/development/python-modules/colcon-output/default.nix b/pkgs/development/python-modules/colcon-output/default.nix new file mode 100644 index 000000000000..388b49c4bbda --- /dev/null +++ b/pkgs/development/python-modules/colcon-output/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + colcon, + pytest-cov-stub, + pytestCheckHook, + setuptools, + scspell, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "colcon-output"; + version = "0.2.13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "colcon"; + repo = "colcon-output"; + tag = version; + hash = "sha256-6HFpqGJMjQswKaGSUXVdzoKW677mdmy/PeEZFBCzaMU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colcon + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + scspell + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ + "colcon_output" + ]; + + disabledTestPaths = [ + "test/test_flake8.py" + ]; + + meta = { + description = "Extension for colcon-core to customize the output in various ways"; + downloadPage = "https://github.com/colcon/colcon-output"; + homepage = "http://colcon.readthedocs.io/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e9257619529..516d356b65d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2695,6 +2695,8 @@ self: super: with self; { colcon-notification = callPackage ../development/python-modules/colcon-notification { }; + colcon-output = callPackage ../development/python-modules/colcon-output { }; + colcon-parallel-executor = callPackage ../development/python-modules/colcon-parallel-executor { }; colcon-ros-domain-id-coordinator = From 474b88cab98daa663336bc2b2b44d85efb1f8bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Sun, 2 Feb 2025 20:46:37 +0100 Subject: [PATCH 36/48] python3Packages.nodezator: init at 1.5.4 --- pkgs/by-name/no/nodezator/package.nix | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/no/nodezator/package.nix diff --git a/pkgs/by-name/no/nodezator/package.nix b/pkgs/by-name/no/nodezator/package.nix new file mode 100644 index 000000000000..ce27eb6e2758 --- /dev/null +++ b/pkgs/by-name/no/nodezator/package.nix @@ -0,0 +1,37 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: +python3Packages.buildPythonApplication rec { + pname = "nodezator"; + version = "1.5.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "IndieSmiths"; + repo = "nodezator"; + tag = "v${version}"; + hash = "sha256-kdkOAJB7cVaayJOzof7dV9EBczEoEKXzCM7TcY8Ex5g="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pygame-ce + numpy + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Generalist Python node editor"; + homepage = "https://nodezator.com"; + downloadPage = "https://github.com/IndiePython/nodezator"; + changelog = "https://github.com/IndiePython/nodezator/releases/tag/v${version}"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "nodezator"; + }; +} From 9e0df1205d7c2acb4504a25091ee603fd1dd9865 Mon Sep 17 00:00:00 2001 From: Justin Bassett Date: Thu, 29 May 2025 08:18:37 -0400 Subject: [PATCH 37/48] android-studio: 2024.3.2.14 -> 2024.3.2.15 --- pkgs/applications/editors/android-studio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 244af2428263..5f15e827ef02 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,16 +16,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.3.2.14"; # "Android Studio Meerkat Feature Drop | 2024.3.2" - sha256Hash = "sha256-LHtPAJe4Zo2FcYwO0j51vt8QUNPQ2Dwf2UT7H72DyKU="; + version = "2024.3.2.15"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Patch 1" + sha256Hash = "sha256-L8s8l1/Q4AJEGvdzTLLu9sRZlkNyRDMQvK8moZXOeIE="; }; betaVersion = { version = "2024.3.2.13"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 4" sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg="; }; latestVersion = { - version = "2025.1.1.10"; # "Android Studio Narwhal | 2025.1.1 Canary 10" - sha256Hash = "sha256-GKLOlDkA4hSbKeI3Oob3Pmfxq0ji+q2yTK/z2jPV8FU="; + version = "2025.1.2.2"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 2" + sha256Hash = "sha256-zQ3PK9Fq8iYocSRFsYXNrnJ34QJGUkQoLtSNhFA2Ido="; }; in { From 6c0caf2b3041367daebd92b1d1b5b340dad87161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 May 2025 12:57:39 +0000 Subject: [PATCH 38/48] python3Packages.google-genai: 1.16.1 -> 1.17.0 --- pkgs/development/python-modules/google-genai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 634683d16678..31d72928d775 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.16.1"; + version = "1.17.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-P37dGIfpr02aO7N6Y3jGWXTjwz8IZPuZQYG0uJqeek4="; + hash = "sha256-ks8MU+Sg6TM57QiNmZD6rTGF8Di32mKtHFTF1pCTouQ="; }; build-system = [ From f0d3e37f9c666a3c9ba81f0294a39b17ff445583 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 May 2025 13:20:24 +0000 Subject: [PATCH 39/48] python3Packages.unstructured-client: 0.35.0 -> 0.36.0 --- .../python-modules/unstructured-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 9f1e3770ce6a..feedb3e2a49e 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.35.0"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-f1sJei3OnLxVahsirZFUzdIpkEEMc8rZR3+8JfihCuM="; + hash = "sha256-WEltF3puitytIFN/CxG6TCpWGxs8dubCqvU7byba1Yg="; }; preBuild = '' From 41725bb0f7282182145bd1c9ed7c6a5c15a95167 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 8 Feb 2023 13:35:14 -0800 Subject: [PATCH 40/48] nixos/swap: require mkswap when encrypted the mkswap service manages a dm/luks block device when randomEncryption is enabled, and is not an optional dependency of the swap unit --- nixos/modules/config/swap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 20db5f8a40a4..cdc8d673ee12 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -277,6 +277,7 @@ in # avoid this race condition. after = [ "systemd-modules-load.service" ]; wantedBy = [ "${realDevice'}.swap" ]; + requiredBy = lib.optionals sw.randomEncryption.enable [ "${realDevice'}.swap" ]; before = [ "${realDevice'}.swap" "shutdown.target" From 1eb9538746a469baafb4736110b43612ca6ca767 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 29 May 2025 02:09:09 +0530 Subject: [PATCH 41/48] lact: fix opencl support Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/la/lact/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index 8da5d876e930..8058349d6a80 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -58,10 +58,12 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.makeLibraryPath [ vulkan-loader libdrm + ocl-icd ] }" "-C link-arg=-Wl,--add-needed,${vulkan-loader}/lib/libvulkan.so" "-C link-arg=-Wl,--add-needed,${libdrm}/lib/libdrm.so" + "-C link-arg=-Wl,--add-needed,${ocl-icd}/lib/libOpenCL.so" ] ); @@ -104,10 +106,12 @@ rustPlatform.buildRustPackage (finalAttrs: { patchelf $out/bin/.lact-wrapped \ --add-needed libvulkan.so \ --add-needed libdrm.so \ + --add-needed libOpenCL.so \ --add-rpath ${ lib.makeLibraryPath [ vulkan-loader libdrm + ocl-icd ] } ''; From f6e361c0d094e0ef8fd6b141aa9268a2d168f63f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 29 May 2025 22:39:05 +0800 Subject: [PATCH 42/48] maintainers: update moraxyc --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98f29cfab550..0be072ffb383 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16598,8 +16598,10 @@ moraxyc = { name = "Moraxyc Xu"; email = "i@qaq.li"; + matrix = "@moraxyc:qaq.li"; github = "Moraxyc"; githubId = 69713071; + keys = [ { fingerprint = "7DD1 A4DF 7DD6 AEEB F07B 1108 8296 4F3A B1D9 DE79"; } ]; }; moredread = { email = "code@apb.name"; From fb23f9882b81ccf2b28e32c5038439f19fbd26e4 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 29 May 2025 16:41:54 +0300 Subject: [PATCH 43/48] maintainers: donteatoreo remove expired keys --- maintainers/maintainer-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98f29cfab550..a27091632d70 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6554,7 +6554,6 @@ name = "DontEatOreo"; github = "DontEatOreo"; githubId = 57304299; - keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ]; }; dopplerian = { name = "Dopplerian"; From b5d5cc769d2987b1a1987c5d16404766a3f431e3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 29 May 2025 16:43:14 +0300 Subject: [PATCH 44/48] maintainers: donteatoreo add matrix --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a27091632d70..ce1cba13aa18 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6554,6 +6554,7 @@ name = "DontEatOreo"; github = "DontEatOreo"; githubId = 57304299; + matrix = "@donteatoreo:matrix.org"; }; dopplerian = { name = "Dopplerian"; From dc3e29aa46cc18ee9ead71c66bfb7870f127af60 Mon Sep 17 00:00:00 2001 From: zspher <66728045+zspher@users.noreply.github.com> Date: Thu, 29 May 2025 09:38:20 -0600 Subject: [PATCH 45/48] kdePackages.klevernote: add missing dependency --- pkgs/kde/misc/klevernotes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 0ad4056f0d15..2a7c14b9cefd 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -5,6 +5,7 @@ qtsvg, qtwebengine, kconfigwidgets, + kitemmodels, }: mkKdeDerivation rec { pname = "klevernotes"; @@ -19,6 +20,7 @@ mkKdeDerivation rec { qtsvg qtwebengine kconfigwidgets + kitemmodels ]; meta.license = with lib.licenses; [ From 29240c495d8d3e890ff401c3c22812d3eff06c0f Mon Sep 17 00:00:00 2001 From: patka Date: Mon, 12 May 2025 20:57:21 +0200 Subject: [PATCH 46/48] pcre16: drop There's nothing that relies on this. We want to get rid of pcre and if something specifically needs to be compiled with 16-bit code unit support they can do that with pcre2 instead --- pkgs/development/libraries/pcre/default.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/variants.nix | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7a49561e7a4f..ac6f192e3706 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -14,7 +14,6 @@ assert lib.elem variant [ null "cpp" - "pcre16" "pcre32" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d23a9b6d2d5e..00958a6fc011 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1476,6 +1476,7 @@ mapAliases { partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 paup = paup-cli; # Added 2024-09-11 + pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acf278a13c50..31d490db37ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9312,7 +9312,6 @@ with pkgs; }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused pcre-cpp = res.pcre.override { variant = "cpp"; }; diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index 8465c61da529..3609aa3ca178 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -119,7 +119,6 @@ self: super: { # causes shadowstack disablement pcre = super'.pcre.override { enableJit = false; }; pcre-cpp = super'.pcre-cpp.override { enableJit = false; }; - pcre16 = super'.pcre16.override { enableJit = false; }; } ) ] ++ overlays; From 738e5abd840deecb4648692efc72991a736b85d2 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 29 May 2025 18:25:29 +0200 Subject: [PATCH 47/48] maliit-keyboard: remove unused pcre dependency --- pkgs/applications/misc/maliit-keyboard/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index dd7d60049c46..d3522e47e16a 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -8,7 +8,6 @@ libchewing, libpinyin, maliit-framework, - pcre, presage, qtfeedback, qtmultimedia, @@ -42,7 +41,6 @@ mkDerivation rec { libchewing libpinyin maliit-framework - pcre presage qtfeedback qtmultimedia From a8d02413d7a97d9ca963ecffe257f1ff6abb52dd Mon Sep 17 00:00:00 2001 From: JollyDevelopment Date: Thu, 29 May 2025 10:49:44 -0400 Subject: [PATCH 48/48] tribler: add StartupWMClass for .desktop file --- pkgs/by-name/tr/tribler/package.nix | 4 ++++ pkgs/by-name/tr/tribler/startupwmclass.patch | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/by-name/tr/tribler/startupwmclass.patch diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix index 0ff1b90b8f60..1747d011fd8a 100644 --- a/pkgs/by-name/tr/tribler/package.nix +++ b/pkgs/by-name/tr/tribler/package.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; }; + patches = [ + ./startupwmclass.patch + ]; + nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper diff --git a/pkgs/by-name/tr/tribler/startupwmclass.patch b/pkgs/by-name/tr/tribler/startupwmclass.patch new file mode 100644 index 000000000000..ce1ec9e4a59a --- /dev/null +++ b/pkgs/by-name/tr/tribler/startupwmclass.patch @@ -0,0 +1,9 @@ +diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop +index b0472a18d..0e0be14f3 100644 +--- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop ++++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop +@@ -7,3 +7,4 @@ Terminal=false + Type=Application + Categories=Application;Network;P2P + MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent ++StartupWMClass=Tribler