From 181e0e91ba9f1d57d608d8b0e95278fbc14c9711 Mon Sep 17 00:00:00 2001 From: Hadi Date: Thu, 12 Jan 2023 10:02:40 -0500 Subject: [PATCH 01/45] androidenv: generate package.xml in packages' directory --- .../androidenv/deploy-androidpackages.nix | 59 + pkgs/development/mobile/androidenv/mkrepo.rb | 75 +- pkgs/development/mobile/androidenv/repo.json | 9031 ++++++++++++++++- 3 files changed, 8706 insertions(+), 459 deletions(-) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index d495f2afd46..aaedae1eb4b 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -4,6 +4,59 @@ let extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ]; sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages; + + mkXmlAttrs = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs); + mkXmlValues = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + in + if builtins.typeOf value == "string" then "<${tag}>${value}" else mkXmlDoc name value + ) attrs); + mkXmlDoc = name: doc: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + hasXmlAttrs = builtins.hasAttr "element-attributes" doc; + xmlValues = removeAttrs doc [ "element-attributes" ]; + hasXmlValues = builtins.length (builtins.attrNames xmlValues) > 0; + in + if hasXmlAttrs && hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues }" + else if hasXmlAttrs && !hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}/>" + else if !hasXmlAttrs && hasXmlValues then "<${tag}>${mkXmlValues xmlValues}" + else "<${tag}/>"; + mkXmlPackage = package: '' + + + ${lib.concatStringsSep "---" (mkLicenses package.license)} + + ${mkXmlDoc "type-details" package.type-details} + ${mkXmlDoc "revision" package.revision-details} + ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package) + (mkXmlDoc "dependencies" package.dependencies) + } + ${package.displayName} + + + + ''; in stdenv.mkDerivation ({ inherit buildInputs; @@ -44,6 +97,12 @@ stdenv.mkDerivation ({ cd $packageBaseDir cp -a $extractedZip/* . ${patchesInstructions.${package.name}} + + if [ ! -f $packageBaseDir/package.xml ]; then + cat << EOF > $packageBaseDir/package.xml + ${mkXmlPackage package} + EOF + fi '') packages); # Some executables that have been patched with patchelf may not work any longer after they have been stripped. diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb index 06ed081dc72..fa813301558 100644 --- a/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/pkgs/development/mobile/androidenv/mkrepo.rb @@ -29,6 +29,49 @@ def image_url value, dir end end +# Returns a JSON with the data and structure of the input XML +def to_json_collector doc + json = {} + index = 0 + doc.element_children.each { |node| + if node.children.length == 1 and node.children.first.text? + json["#{node.name}:#{index}"] ||= node.content + index += 1 + next + end + json["#{node.name}:#{index}"] ||= to_json_collector node + index += 1 + } + element_attributes = {} + doc.attribute_nodes.each do |attr| + if attr.name == "type" + type = attr.value.split(':', 2).last + case attr.value + when 'generic:genericDetailsType' + element_attributes["xsi:type"] ||= "ns5:#{type}" + when 'addon:extraDetailsType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'addon:mavenType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'sdk:platformDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sdk:sourceDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sys-img:sysImgDetailsType' + element_attributes["xsi:type"] ||= "ns12:#{type}" + when 'addon:addonDetailsType' then + element_attributes["xsi:type"] ||= "ns8:#{type}" + end + else + element_attributes[attr.name] ||= attr.value + end + end + if !element_attributes.empty? + json['element-attributes'] ||= element_attributes + end + json +end + # Returns a tuple of [type, revision, revision components] for a package node. def package_revision package type_details = package.at_css('> type-details') @@ -148,7 +191,7 @@ def fixup value else [k, v] end - end.sort {|(k1, v1), (k2, v2)| k1 <=> k2}] + end.sort {|(k1, v1), (k2, v2)| k1 <=> k2 }] end # Normalize the specified license text. @@ -189,7 +232,12 @@ def parse_package_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete ||= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = (packages[name] ||= {}) target = (target[revision] ||= {}) @@ -199,6 +247,10 @@ def parse_package_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete == 'true' + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -218,11 +270,17 @@ def parse_image_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| image_url url, components[-2]} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = images components.each do |component| - target = (target[component] ||= {}) + target[component] ||= {} + target = target[component] end target['name'] ||= "system-image-#{revision}" @@ -230,6 +288,10 @@ def parse_image_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -249,7 +311,12 @@ def parse_addon_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml case type when 'addon:addonDetailsType' @@ -278,6 +345,10 @@ def parse_addon_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index e27ec0bc304..0a4a733a49e 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -14,7 +14,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "11": { @@ -31,7 +66,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "12": { @@ -48,7 +111,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -63,7 +161,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "13": { @@ -80,7 +197,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -95,7 +247,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "14": { @@ -112,7 +283,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "15": { @@ -129,7 +335,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "16": { @@ -146,7 +394,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "17": { @@ -163,7 +453,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "18": { @@ -180,7 +512,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "19": { @@ -197,7 +571,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "21": { @@ -214,7 +630,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "22": { @@ -231,7 +689,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "23": { @@ -248,7 +748,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "24": { @@ -265,7 +807,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "25": { @@ -282,7 +866,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "3": { @@ -299,7 +925,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "4": { @@ -316,7 +970,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "5": { @@ -333,7 +1015,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "6": { @@ -350,7 +1060,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "7": { @@ -367,7 +1105,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "8": { @@ -384,7 +1150,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "9": { @@ -401,7 +1195,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -419,7 +1241,21 @@ "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", - "revision": "47.0.0" + "revision": "47.0.0", + "revision-details": { + "major:0": "47", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;google;Android_Emulator_Hypervisor_Driver": { "archives": [ @@ -434,7 +1270,21 @@ "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", - "revision": "1.8.0" + "revision": "1.8.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "8" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google LLC.", + "id:0": "google" + } + } }, "extras;google;admob_ads_sdk": { "archives": [ @@ -449,7 +1299,19 @@ "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;analytics_sdk_v2": { "archives": [ @@ -464,7 +1326,19 @@ "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;gcm": { "archives": [ @@ -479,7 +1353,19 @@ "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services": { "archives": [ @@ -490,11 +1376,30 @@ "url": "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play services", "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", - "revision": "49" + "revision": "49", + "revision-details": { + "major:0": "49" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services_froyo": { "archives": [ @@ -509,7 +1414,19 @@ "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;instantapps": { "archives": [ @@ -524,7 +1441,21 @@ "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", - "revision": "1.9.0" + "revision": "1.9.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "9" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;m2repository": { "archives": [ @@ -535,11 +1466,30 @@ "url": "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Repository", "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", - "revision": "58" + "revision": "58", + "revision-details": { + "major:0": "58" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_apk_expansion": { "archives": [ @@ -554,7 +1504,19 @@ "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_licensing": { "archives": [ @@ -569,7 +1531,20 @@ "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": { + }, + "id:0": "google" + } + } }, "extras;google;simulators": { "archives": [ @@ -584,7 +1559,19 @@ "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;usb_driver": { "archives": [ @@ -599,7 +1586,19 @@ "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "13" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;webdriver": { "archives": [ @@ -614,7 +1613,19 @@ "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": { "archives": [ @@ -629,7 +1640,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": { "archives": [ @@ -644,7 +1667,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": { "archives": [ @@ -659,7 +1694,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": { "archives": [ @@ -674,7 +1721,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": { "archives": [ @@ -689,7 +1748,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": { "archives": [ @@ -704,7 +1775,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": { "archives": [ @@ -719,7 +1802,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": { "archives": [ @@ -734,7 +1829,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": { "archives": [ @@ -749,7 +1856,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": { "archives": [ @@ -764,7 +1883,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": { "archives": [ @@ -775,11 +1906,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": { "archives": [ @@ -790,11 +1940,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" + } + } + }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": { "archives": [ @@ -805,11 +1974,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": { "archives": [ @@ -820,11 +2008,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": { "archives": [ @@ -835,11 +2042,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": { "archives": [ @@ -850,11 +2076,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": { "archives": [ @@ -865,11 +2110,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": { "archives": [ @@ -880,11 +2144,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": { "archives": [ @@ -895,11 +2178,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": { "archives": [ @@ -910,11 +2212,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } } }, "images": { @@ -926,14 +2247,36 @@ "os": "all", "sha1": "8537616a7add47cce24c60f18bc2429e3dc90ae3", "size": 67927049, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-10_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", - "revision": "10-default-armeabi-v7a" + "revision": "10-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -941,14 +2284,36 @@ "os": "all", "sha1": "a166d5ccbb165e1dd5464fbfeec30a61f77790d8", "size": 75386095, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-10_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", - "revision": "10-default-x86" + "revision": "10-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -961,11 +2326,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", - "revision": "10-google_apis-armeabi-v7a" + "revision": "10-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -976,11 +2366,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", - "revision": "10-google_apis-x86" + "revision": "10-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -992,14 +2407,29 @@ "os": "all", "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b", "size": 99621822, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_armv7a-14_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip" } ], "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", - "revision": "14-default-armeabi-v7a" + "revision": "14-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "14", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } } }, @@ -1011,14 +2441,36 @@ "os": "all", "sha1": "03d7ed95a9d3b107e3f2e5b166d017ea12529e70", "size": 102452069, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-15_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", - "revision": "15-default-armeabi-v7a" + "revision": "15-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1026,14 +2478,36 @@ "os": "all", "sha1": "61381aef3fd0cdc8255cb3298072a920c80186ca", "size": 116030933, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-15_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-15_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", - "revision": "15-default-x86" + "revision": "15-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1046,11 +2520,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", - "revision": "15-google_apis-armeabi-v7a" + "revision": "15-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1061,11 +2560,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", - "revision": "15-google_apis-x86" + "revision": "15-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1077,14 +2601,36 @@ "os": "all", "sha1": "69b944b0d5a18c8563fa80d7d229af64890f724e", "size": 118646340, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-16_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", - "revision": "16-default-armeabi-v7a" + "revision": "16-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "mips": { "archives": [ @@ -1092,14 +2638,29 @@ "os": "all", "sha1": "67943c54fb3943943ffeb05fdd39c0b753681f6e", "size": 122482530, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-16_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip" } ], "displayName": "MIPS System Image", "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", - "revision": "16-default-mips" + "revision": "16-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1107,14 +2668,36 @@ "os": "all", "sha1": "ee6718e7556c8f8bd8d3f470b34f2c5dbf9bcff4", "size": 135305313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-16_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-16_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", - "revision": "16-default-x86" + "revision": "16-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1127,11 +2710,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", - "revision": "16-google_apis-armeabi-v7a" + "revision": "16-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1142,11 +2750,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", - "revision": "16-google_apis-x86" + "revision": "16-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1158,14 +2791,36 @@ "os": "all", "sha1": "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6", "size": 124437041, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-17_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", - "revision": "17-default-armeabi-v7a" + "revision": "17-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "mips": { "archives": [ @@ -1173,14 +2828,29 @@ "os": "all", "sha1": "f0c6e153bd584c29e51b5c9723cfbf30f996a05d", "size": 131781761, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-17_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip" } ], "displayName": "MIPS System Image", "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", - "revision": "17-default-mips" + "revision": "17-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1188,14 +2858,39 @@ "os": "all", "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", "size": 194811128, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-17_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-17_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", - "revision": "17-default-x86" + "revision": "17-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "default" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis": { @@ -1208,11 +2903,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", - "revision": "17-google_apis-armeabi-v7a" + "revision": "17-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1223,11 +2943,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", - "revision": "17-google_apis-x86" + "revision": "17-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1239,14 +2984,36 @@ "os": "all", "sha1": "580b583720f7de671040d5917c8c9db0c7aa03fd", "size": 130590545, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-18_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", - "revision": "18-default-armeabi-v7a" + "revision": "18-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1254,14 +3021,36 @@ "os": "all", "sha1": "7a4ced4d9b0ab48047825491b4072dc2eb9b610e", "size": 150097655, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-18_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", - "revision": "18-default-x86" + "revision": "18-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1274,11 +3063,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", - "revision": "18-google_apis-armeabi-v7a" + "revision": "18-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1289,11 +3103,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", - "revision": "18-google_apis-x86" + "revision": "18-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1305,14 +3144,36 @@ "os": "all", "sha1": "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa", "size": 159871567, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-19_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", - "revision": "19-default-armeabi-v7a" + "revision": "19-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1320,14 +3181,36 @@ "os": "all", "sha1": "2ac82153aae97f7eae4c5a0761224fe04321d03d", "size": 185886274, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-19_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", - "revision": "19-default-x86" + "revision": "19-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1340,11 +3223,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", - "revision": "19-google_apis-armeabi-v7a" + "revision": "19-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1355,11 +3263,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", - "revision": "19-google_apis-x86" + "revision": "19-google_apis-x86", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1378,7 +3311,21 @@ "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", - "revision": "21-android-tv-armeabi-v7a" + "revision": "21-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -1393,7 +3340,21 @@ "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", - "revision": "21-android-tv-x86" + "revision": "21-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1403,14 +3364,29 @@ "os": "all", "sha1": "c4375f1b4b4cd21a8617660e25f621cedcbd8332", "size": 211426314, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-21_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-21_r04.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", - "revision": "21-default-arm64-v8a" + "revision": "21-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1418,14 +3394,36 @@ "os": "all", "sha1": "8c606f81306564b65e41303d2603e4c42ded0d10", "size": 187163871, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-21_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", - "revision": "21-default-armeabi-v7a" + "revision": "21-default-armeabi-v7a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1433,14 +3431,36 @@ "os": "all", "sha1": "00f0eb0a1003efe3316347f762e20a85d8749cff", "size": 208212529, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-21_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", - "revision": "21-default-x86" + "revision": "21-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1448,14 +3468,36 @@ "os": "all", "sha1": "9078a095825a69e5e215713f0866c83cef65a342", "size": 292623982, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-21_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", - "revision": "21-default-x86_64" + "revision": "21-default-x86_64", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1472,7 +3514,25 @@ "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", - "revision": "21-google_apis-arm64-v8a" + "revision": "21-google_apis-arm64-v8a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1483,11 +3543,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", - "revision": "21-google_apis-armeabi-v7a" + "revision": "21-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1498,11 +3583,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", - "revision": "21-google_apis-x86" + "revision": "21-google_apis-x86", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1513,11 +3623,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", - "revision": "21-google_apis-x86_64" + "revision": "21-google_apis-x86_64", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1536,7 +3671,21 @@ "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", - "revision": "22-android-tv-x86" + "revision": "22-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1546,14 +3695,29 @@ "os": "all", "sha1": "703e27a9a4fb7a6e763cb7d713b89e5249a8fc99", "size": 219124634, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-22_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-22_r02.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", - "revision": "22-default-arm64-v8a" + "revision": "22-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1561,14 +3725,36 @@ "os": "all", "sha1": "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1", "size": 194596267, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-22_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", - "revision": "22-default-armeabi-v7a" + "revision": "22-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1576,14 +3762,36 @@ "os": "all", "sha1": "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e", "size": 214268954, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-22_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", - "revision": "22-default-x86" + "revision": "22-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1591,14 +3799,36 @@ "os": "all", "sha1": "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4", "size": 299976630, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-22_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", - "revision": "22-default-x86_64" + "revision": "22-default-x86_64", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1615,7 +3845,25 @@ "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", - "revision": "22-google_apis-arm64-v8a" + "revision": "22-google_apis-arm64-v8a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1626,11 +3874,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", - "revision": "22-google_apis-armeabi-v7a" + "revision": "22-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1641,11 +3914,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", - "revision": "22-google_apis-x86" + "revision": "22-google_apis-x86", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1656,11 +3954,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", - "revision": "22-google_apis-x86_64" + "revision": "22-google_apis-x86_64", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1679,7 +4002,21 @@ "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", - "revision": "23-android-tv-armeabi-v7a" + "revision": "23-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -1690,11 +4027,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r21.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", - "revision": "23-android-tv-x86" + "revision": "23-android-tv-x86", + "revision-details": { + "major:0": "21" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1704,14 +4062,29 @@ "os": "all", "sha1": "ac18f3bd717e02804eee585e029f5dbc1a2616bf", "size": 253807785, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-23_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-23_r07.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", - "revision": "23-default-arm64-v8a" + "revision": "23-default-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1719,14 +4092,36 @@ "os": "all", "sha1": "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d", "size": 238333358, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-23_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", - "revision": "23-default-armeabi-v7a" + "revision": "23-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1734,14 +4129,36 @@ "os": "all", "sha1": "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb", "size": 260804863, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-23_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", - "revision": "23-default-x86" + "revision": "23-default-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1749,14 +4166,36 @@ "os": "all", "sha1": "7cbc291483ca07dc67b71268c5f08a5755f50f51", "size": 365009313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-23_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", - "revision": "23-default-x86_64" + "revision": "23-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1773,7 +4212,25 @@ "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", - "revision": "23-google_apis-arm64-v8a" + "revision": "23-google_apis-arm64-v8a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1784,11 +4241,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", - "revision": "23-google_apis-armeabi-v7a" + "revision": "23-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1799,11 +4281,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", - "revision": "23-google_apis-x86" + "revision": "23-google_apis-x86", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1814,11 +4321,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", - "revision": "23-google_apis-x86_64" + "revision": "23-google_apis-x86_64", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1833,11 +4365,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r22.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", - "revision": "24-android-tv-x86" + "revision": "24-android-tv-x86", + "revision-details": { + "major:0": "22" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1847,14 +4400,29 @@ "os": "all", "sha1": "e88ebdf4533efa0370603ee4ab0e7834e0cc364f", "size": 305854153, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-24_r09.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r09.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", - "revision": "24-default-arm64-v8a" + "revision": "24-default-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1862,14 +4430,36 @@ "os": "all", "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568", "size": 782997866, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-24_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", - "revision": "24-default-armeabi-v7a" + "revision": "24-default-armeabi-v7a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1877,14 +4467,36 @@ "os": "all", "sha1": "c1cae7634b0216c0b5990f2c144eb8ca948e3511", "size": 313489224, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-24_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", - "revision": "24-default-x86" + "revision": "24-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1892,14 +4504,36 @@ "os": "all", "sha1": "f6559e1949a5879f31a9662f4f0e50ad60181684", "size": 419261998, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-24_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", - "revision": "24-default-x86_64" + "revision": "24-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1912,11 +4546,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r29.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", - "revision": "24-google_apis-arm64-v8a" + "revision": "24-google_apis-arm64-v8a", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1927,11 +4586,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r27.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", - "revision": "24-google_apis-x86" + "revision": "24-google_apis-x86", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1942,11 +4626,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r27.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", - "revision": "24-google_apis-x86_64" + "revision": "24-google_apis-x86_64", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -1959,11 +4668,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", - "revision": "24-google_apis_playstore-x86" + "revision": "24-google_apis_playstore-x86", + "revision-details": { + "major:0": "19" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1978,11 +4712,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", - "revision": "25-android-tv-x86" + "revision": "25-android-tv-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -1995,11 +4750,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", - "revision": "25-android-wear-armeabi-v7a" + "revision": "25-android-wear-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } }, "x86": { "archives": [ @@ -2010,11 +4786,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", - "revision": "25-android-wear-x86" + "revision": "25-android-wear-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } } }, "default": { @@ -2024,14 +4821,29 @@ "os": "all", "sha1": "b39d359623323a1b4906c071dec396040016ea73", "size": 308416103, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-25_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-25_r02.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", - "revision": "25-default-arm64-v8a" + "revision": "25-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2039,14 +4851,36 @@ "os": "all", "sha1": "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f", "size": 316695942, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-25_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", - "revision": "25-default-x86" + "revision": "25-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2054,14 +4888,36 @@ "os": "all", "sha1": "7093d7b39216020226ff430a3b7b81c94d31ad37", "size": 422702097, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-25_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", - "revision": "25-default-x86_64" + "revision": "25-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -2078,7 +4934,25 @@ "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", - "revision": "25-google_apis-arm64-v8a" + "revision": "25-google_apis-arm64-v8a", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -2089,11 +4963,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", - "revision": "25-google_apis-armeabi-v7a" + "revision": "25-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2104,11 +5003,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", - "revision": "25-google_apis-x86" + "revision": "25-google_apis-x86", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2119,11 +5043,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", - "revision": "25-google_apis-x86_64" + "revision": "25-google_apis-x86_64", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2136,11 +5085,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", - "revision": "25-google_apis_playstore-x86" + "revision": "25-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2155,11 +5129,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r14.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", - "revision": "26-android-tv-x86" + "revision": "26-android-tv-x86", + "revision-details": { + "major:0": "14" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2172,11 +5177,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", - "revision": "26-android-wear-x86" + "revision": "26-android-wear-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } } }, "default": { @@ -2186,14 +5212,40 @@ "os": "all", "sha1": "c3199baf49790fc65f90f7ce734435d5778f6a30", "size": 328910124, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", - "revision": "26-default-arm64-v8a" + "revision": "26-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2201,14 +5253,35 @@ "os": "all", "sha1": "e613d6e0da668e30daf547f3c6627a6352846f90", "size": 350195807, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", - "revision": "26-default-x86" + "revision": "26-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2216,14 +5289,35 @@ "os": "all", "sha1": "432f149c048bffce7f9de526ec65b336daf7a0a3", "size": 474178332, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", - "revision": "26-default-x86_64" + "revision": "26-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2236,11 +5330,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", - "revision": "26-google_apis-arm64-v8a" + "revision": "26-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2251,11 +5375,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", - "revision": "26-google_apis-x86" + "revision": "26-google_apis-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2266,11 +5425,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", - "revision": "26-google_apis-x86_64" + "revision": "26-google_apis-x86_64", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2283,11 +5477,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", - "revision": "26-google_apis_playstore-x86" + "revision": "26-google_apis_playstore-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2302,11 +5531,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", - "revision": "27-android-tv-x86" + "revision": "27-android-tv-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -2316,14 +5566,40 @@ "os": "all", "sha1": "cb01199edae33ce375c6d8e08aea08911ff0d583", "size": 331796092, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", - "revision": "27-default-arm64-v8a" + "revision": "27-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2331,14 +5607,35 @@ "os": "all", "sha1": "4ec990fac7b62958decd12e18a4cd389dfe7c582", "size": 360984187, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", - "revision": "27-default-x86" + "revision": "27-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2346,14 +5643,35 @@ "os": "all", "sha1": "2878261011a59ca3de29dc5b457a495fdb268d60", "size": 491675204, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", - "revision": "27-default-x86_64" + "revision": "27-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2366,11 +5684,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", - "revision": "27-google_apis-arm64-v8a" + "revision": "27-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2381,11 +5729,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", - "revision": "27-google_apis-x86" + "revision": "27-google_apis-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2398,11 +5781,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", - "revision": "27-google_apis_playstore-x86" + "revision": "27-google_apis_playstore-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2417,11 +5835,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", - "revision": "28-android-tv-x86" + "revision": "28-android-tv-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2434,11 +5873,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", - "revision": "28-android-wear-x86" + "revision": "28-android-wear-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS", + "id:0": "android-wear" + } + } } }, "default": { @@ -2448,14 +5908,40 @@ "os": "all", "sha1": "4de0491612ca12097be7deb76af835ebabadefca", "size": 425671679, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-28_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", - "revision": "28-default-arm64-v8a" + "revision": "28-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2463,14 +5949,28 @@ "os": "all", "sha1": "ce03c42d80c0fc6dc47f6455dbee7aa275d02780", "size": 437320152, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-28_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip" } ], "displayName": "Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", - "revision": "28-default-x86" + "revision": "28-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2478,14 +5978,28 @@ "os": "all", "sha1": "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0", "size": 564792723, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-28_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip" } ], "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", - "revision": "28-default-x86_64" + "revision": "28-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2498,11 +6012,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", - "revision": "28-google_apis-arm64-v8a" + "revision": "28-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2513,11 +6057,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r12.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", - "revision": "28-google_apis-x86" + "revision": "28-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2528,11 +6107,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", - "revision": "28-google_apis-x86_64" + "revision": "28-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2545,11 +6159,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", "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", - "revision": "28-google_apis_playstore-arm64-v8a" + "revision": "28-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google ARM64-V8a Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2560,11 +6204,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", - "revision": "28-google_apis_playstore-x86" + "revision": "28-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2575,11 +6254,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", - "revision": "28-google_apis_playstore-x86_64" + "revision": "28-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2594,11 +6308,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-29_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", - "revision": "29-android-tv-x86" + "revision": "29-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -2608,14 +6353,28 @@ "os": "all", "sha1": "fa0d67d7430fcc84b2fe2508ea81e92ac644e264", "size": 498049256, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-29_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-29_r08.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", - "revision": "29-default-arm64-v8a" + "revision": "29-default-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2623,26 +6382,52 @@ "os": "windows", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-windows.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-windows.zip" }, { "os": "macosx", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-darwin.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-darwin.zip" }, { "os": "linux", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-linux.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", - "revision": "29-default-x86" + "revision": "29-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2650,26 +6435,52 @@ "os": "windows", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-windows.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-windows.zip" }, { "os": "macosx", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-darwin.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-darwin.zip" }, { "os": "linux", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-linux.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", - "revision": "29-default-x86_64" + "revision": "29-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2682,11 +6493,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r12.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", "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", - "revision": "29-google_apis-arm64-v8a" + "revision": "29-google_apis-arm64-v8a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2697,11 +6538,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r12.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 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", - "revision": "29-google_apis-x86" + "revision": "29-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2712,11 +6583,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r12.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 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", - "revision": "29-google_apis-x86_64" + "revision": "29-google_apis-x86_64", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2735,11 +6636,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "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", - "revision": "29-google_apis_playstore-arm64-v8a" + "revision": "29-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2762,11 +6693,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", - "revision": "29-google_apis_playstore-x86" + "revision": "29-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2789,11 +6755,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", - "revision": "29-google_apis_playstore-x86_64" + "revision": "29-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2808,11 +6809,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-30_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", - "revision": "30-android-tv-x86" + "revision": "30-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2825,11 +6857,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS 3 ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", - "revision": "30-android-wear-arm64-v8a" + "revision": "30-android-wear-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } }, "x86": { "archives": [ @@ -2840,11 +6893,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS 3 Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", - "revision": "30-android-wear-x86" + "revision": "30-android-wear-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } } }, "default": { @@ -2854,14 +6928,28 @@ "os": "all", "sha1": "2462af138023fbbd1114421818890884d4ebceab", "size": 548363604, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-30_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-30_r01.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", - "revision": "30-default-arm64-v8a" + "revision": "30-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2869,14 +6957,40 @@ "os": "all", "sha1": "e08119b65d2c188ef69f127028eb4c8cc632cd8f", "size": 676379913, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-30_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-30_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", - "revision": "30-default-x86_64" + "revision": "30-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2889,11 +7003,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", - "revision": "30-google_apis-arm64-v8a" + "revision": "30-google_apis-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2904,11 +7048,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", - "revision": "30-google_apis-x86" + "revision": "30-google_apis-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2919,11 +7098,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", - "revision": "30-google_apis-x86_64" + "revision": "30-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2942,11 +7156,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "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", - "revision": "30-google_apis_playstore-arm64-v8a" + "revision": "30-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2969,11 +7213,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", - "revision": "30-google_apis_playstore-x86" + "revision": "30-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2996,11 +7275,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "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", - "revision": "30-google_apis_playstore-x86_64" + "revision": "30-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3015,11 +7329,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-31_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", - "revision": "31-android-tv-arm64-v8a" + "revision": "31-android-tv-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -3030,11 +7375,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-31_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", - "revision": "31-android-tv-x86" + "revision": "31-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -3044,14 +7420,40 @@ "os": "all", "sha1": "1052df2d0afc8fe57138db19d5ebd82d10c607da", "size": 635481190, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-31_r03.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-31_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", - "revision": "31-default-arm64-v8a" + "revision": "31-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -3059,14 +7461,40 @@ "os": "all", "sha1": "1200d6983af477fd6439f11cc5cabf9866bc4a16", "size": 657244568, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-31_r03.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-31_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", - "revision": "31-default-x86_64" + "revision": "31-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -3079,11 +7507,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-31_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", - "revision": "31-google_apis-arm64-v8a" + "revision": "31-google_apis-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3094,11 +7557,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-31_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", - "revision": "31-google_apis-x86_64" + "revision": "31-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3117,11 +7615,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "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", - "revision": "31-google_apis_playstore-arm64-v8a" + "revision": "31-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3132,11 +7665,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "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", - "revision": "31-google_apis_playstore-x86_64" + "revision": "31-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3151,11 +7719,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-32_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", - "revision": "32-google_apis-x86_64" + "revision": "32-google_apis-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3174,11 +7777,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "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", - "revision": "32-google_apis_playstore-arm64-v8a" + "revision": "32-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3201,11 +7839,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", - "revision": "32-google_apis_playstore-x86_64" + "revision": "32-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3220,11 +7893,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", - "revision": "33-android-tv-arm64-v8a" + "revision": "33-android-tv-arm64-v8a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -3235,11 +7939,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", - "revision": "33-android-tv-x86" + "revision": "33-android-tv-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "google_apis": { @@ -3252,11 +7987,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", - "revision": "33-google_apis-arm64-v8a" + "revision": "33-google_apis-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3267,11 +8037,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", - "revision": "33-google_apis-x86_64" + "revision": "33-google_apis-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3290,11 +8095,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r07-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", - "revision": "33-google_apis_playstore-arm64-v8a" + "revision": "33-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3305,11 +8145,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", - "revision": "33-google_apis_playstore-x86_64" + "revision": "33-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3330,11 +8205,47 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "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": [ @@ -3345,11 +8256,47 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "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" + } + } } } } @@ -3403,11 +8350,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r17-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 17", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/17.0.0", - "revision": "17.0.0" + "revision": "17.0.0", + "revision-details": { + "major:0": "17", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.0.1": { "archives": [ @@ -3430,11 +8395,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.0.1", - "revision": "18.0.1" + "revision": "18.0.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.0": { "archives": [ @@ -3457,11 +8440,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.0", - "revision": "18.1.0" + "revision": "18.1.0", + "revision-details": { + "major:0": "18", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.1": { "archives": [ @@ -3484,11 +8485,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.1", - "revision": "18.1.1" + "revision": "18.1.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.0": { "archives": [ @@ -3511,11 +8530,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.0", - "revision": "19.0.0" + "revision": "19.0.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.1": { "archives": [ @@ -3538,11 +8575,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.1", - "revision": "19.0.1" + "revision": "19.0.1", + "revision-details": { + "major:0": "19", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.2": { "archives": [ @@ -3565,11 +8620,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.2", - "revision": "19.0.2" + "revision": "19.0.2", + "revision-details": { + "major:0": "19", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.3": { "archives": [ @@ -3592,11 +8665,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.3", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.3", - "revision": "19.0.3" + "revision": "19.0.3", + "revision-details": { + "major:0": "19", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.1.0": { "archives": [ @@ -3619,11 +8710,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", - "revision": "19.1.0" + "revision": "19.1.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.0": { "archives": [ @@ -3646,11 +8754,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r20-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 20", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", - "revision": "20.0.0" + "revision": "20.0.0", + "revision-details": { + "major:0": "20", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.0": { "archives": [ @@ -3673,11 +8798,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.0", - "revision": "21.0.0" + "revision": "21.0.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.1": { "archives": [ @@ -3700,11 +8843,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.1", - "revision": "21.0.1" + "revision": "21.0.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.2": { "archives": [ @@ -3727,11 +8888,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.2", - "revision": "21.0.2" + "revision": "21.0.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.0": { "archives": [ @@ -3754,11 +8933,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.0", - "revision": "21.1.0" + "revision": "21.1.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.1": { "archives": [ @@ -3781,11 +8978,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.1", - "revision": "21.1.1" + "revision": "21.1.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.2": { "archives": [ @@ -3808,11 +9023,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", - "revision": "21.1.2" + "revision": "21.1.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.0": { "archives": [ @@ -3835,11 +9067,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r22-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/22.0.0", - "revision": "22.0.0" + "revision": "22.0.0", + "revision-details": { + "major:0": "22", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.1": { "archives": [ @@ -3862,11 +9112,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", - "revision": "22.0.1" + "revision": "22.0.1", + "revision-details": { + "major:0": "22", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.0": { "archives": [ @@ -3889,11 +9156,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/23.0.0", - "revision": "23.0.0" + "revision": "23.0.0", + "revision-details": { + "major:0": "23", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.1": { "archives": [ @@ -3916,11 +9201,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", - "revision": "23.0.1" + "revision": "23.0.1", + "revision-details": { + "major:0": "23", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.2": { "archives": [ @@ -3943,11 +9245,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", - "revision": "23.0.2" + "revision": "23.0.2", + "revision-details": { + "major:0": "23", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.3": { "archives": [ @@ -3970,11 +9289,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", - "revision": "23.0.3" + "revision": "23.0.3", + "revision-details": { + "major:0": "23", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.0": { "archives": [ @@ -3997,11 +9333,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", - "revision": "24.0.0" + "revision": "24.0.0", + "revision-details": { + "major:0": "24", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.1": { "archives": [ @@ -4024,11 +9377,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", - "revision": "24.0.1" + "revision": "24.0.1", + "revision-details": { + "major:0": "24", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.2": { "archives": [ @@ -4051,11 +9421,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", - "revision": "24.0.2" + "revision": "24.0.2", + "revision-details": { + "major:0": "24", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.3": { "archives": [ @@ -4078,11 +9465,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", - "revision": "24.0.3" + "revision": "24.0.3", + "revision-details": { + "major:0": "24", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.0": { "archives": [ @@ -4105,11 +9509,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", - "revision": "25.0.0" + "revision": "25.0.0", + "revision-details": { + "major:0": "25", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.1": { "archives": [ @@ -4132,11 +9553,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", - "revision": "25.0.1" + "revision": "25.0.1", + "revision-details": { + "major:0": "25", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.2": { "archives": [ @@ -4159,11 +9597,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", - "revision": "25.0.2" + "revision": "25.0.2", + "revision-details": { + "major:0": "25", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.3": { "archives": [ @@ -4186,11 +9641,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", - "revision": "25.0.3" + "revision": "25.0.3", + "revision-details": { + "major:0": "25", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.0": { "archives": [ @@ -4213,11 +9685,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", - "revision": "26.0.0" + "revision": "26.0.0", + "revision-details": { + "major:0": "26", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.1": { "archives": [ @@ -4240,11 +9729,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", - "revision": "26.0.1" + "revision": "26.0.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.2": { "archives": [ @@ -4267,11 +9773,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", - "revision": "26.0.2" + "revision": "26.0.2", + "revision-details": { + "major:0": "26", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.3": { "archives": [ @@ -4294,11 +9817,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", - "revision": "26.0.3" + "revision": "26.0.3", + "revision-details": { + "major:0": "26", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.0": { "archives": [ @@ -4321,11 +9861,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", - "revision": "27.0.0" + "revision": "27.0.0", + "revision-details": { + "major:0": "27", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.1": { "archives": [ @@ -4348,11 +9905,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", - "revision": "27.0.1" + "revision": "27.0.1", + "revision-details": { + "major:0": "27", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.2": { "archives": [ @@ -4375,11 +9949,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", - "revision": "27.0.2" + "revision": "27.0.2", + "revision-details": { + "major:0": "27", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.3": { "archives": [ @@ -4402,11 +9993,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", - "revision": "27.0.3" + "revision": "27.0.3", + "revision-details": { + "major:0": "27", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0": { "archives": [ @@ -4429,11 +10037,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", - "revision": "28.0.0" + "revision": "28.0.0", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc1": { "archives": [ @@ -4456,11 +10081,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc1", - "revision": "28.0.0-rc1" + "revision": "28.0.0-rc1", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc2": { "archives": [ @@ -4483,11 +10127,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc2", - "revision": "28.0.0-rc2" + "revision": "28.0.0-rc2", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.1": { "archives": [ @@ -4510,11 +10173,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", - "revision": "28.0.1" + "revision": "28.0.1", + "revision-details": { + "major:0": "28", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.2": { "archives": [ @@ -4537,11 +10217,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", - "revision": "28.0.2" + "revision": "28.0.2", + "revision-details": { + "major:0": "28", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.3": { "archives": [ @@ -4564,11 +10261,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", - "revision": "28.0.3" + "revision": "28.0.3", + "revision-details": { + "major:0": "28", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0": { "archives": [ @@ -4591,11 +10305,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", - "revision": "29.0.0" + "revision": "29.0.0", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc1": { "archives": [ @@ -4618,11 +10349,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc1", - "revision": "29.0.0-rc1" + "revision": "29.0.0-rc1", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc2": { "archives": [ @@ -4645,11 +10395,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc2", - "revision": "29.0.0-rc2" + "revision": "29.0.0-rc2", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc3": { "archives": [ @@ -4672,11 +10441,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc3", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc3", - "revision": "29.0.0-rc3" + "revision": "29.0.0-rc3", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.1": { "archives": [ @@ -4699,11 +10487,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", - "revision": "29.0.1" + "revision": "29.0.1", + "revision-details": { + "major:0": "29", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.2": { "archives": [ @@ -4726,11 +10531,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", - "revision": "29.0.2" + "revision": "29.0.2", + "revision-details": { + "major:0": "29", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.3": { "archives": [ @@ -4753,11 +10575,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", - "revision": "29.0.3" + "revision": "29.0.3", + "revision-details": { + "major:0": "29", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.0": { "archives": [ @@ -4780,11 +10619,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", - "revision": "30.0.0" + "revision": "30.0.0", + "revision-details": { + "major:0": "30", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.1": { "archives": [ @@ -4807,11 +10663,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", - "revision": "30.0.1" + "revision": "30.0.1", + "revision-details": { + "major:0": "30", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.2": { "archives": [ @@ -4834,11 +10707,28 @@ "url": "https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", - "revision": "30.0.2" + "revision": "30.0.2", + "revision-details": { + "major:0": "30", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.3": { "archives": [ @@ -4861,11 +10751,28 @@ "url": "https://dl.google.com/android/repository/f6d24b187cc6bd534c6c37604205171784ac5621.build-tools_r30.0.3-macosx.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", - "revision": "30.0.3" + "revision": "30.0.3", + "revision-details": { + "major:0": "30", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "31.0.0": { "archives": [ @@ -4892,7 +10799,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", - "revision": "31.0.0" + "revision": "31.0.0", + "revision-details": { + "major:0": "31", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.0.0": { "archives": [ @@ -4919,7 +10836,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", - "revision": "32.0.0" + "revision": "32.0.0", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.1.0-rc1": { "archives": [ @@ -4946,7 +10873,18 @@ "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", - "revision": "32.1.0-rc1" + "revision": "32.1.0-rc1", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "33.0.0": { "archives": [ @@ -4973,7 +10911,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", - "revision": "33.0.0" + "revision": "33.0.0", + "revision-details": { + "major:0": "33", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "33.0.1": { "archives": [ @@ -5000,7 +10948,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", - "revision": "33.0.1" + "revision": "33.0.1", + "revision-details": { + "major:0": "33", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -5029,7 +10987,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", - "revision": "3.10.2" + "revision": "3.10.2", + "revision-details": { + "major:0": "3", + "micro:2": "2", + "minor:1": "10" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.18.1": { "archives": [ @@ -5056,7 +11024,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", - "revision": "3.18.1" + "revision": "3.18.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "18" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.22.1": { "archives": [ @@ -5083,7 +11061,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", - "revision": "3.22.1" + "revision": "3.22.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "22" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.6.4111459": { "archives": [ @@ -5110,7 +11098,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", - "revision": "3.6.4111459" + "revision": "3.6.4111459", + "revision-details": { + "major:0": "3", + "micro:2": "4111459", + "minor:1": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmdline-tools": { @@ -5139,7 +11137,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", - "revision": "1.0" + "revision": "1.0", + "revision-details": { + "major:0": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.0": { "archives": [ @@ -5165,8 +11172,18 @@ "displayName": "Android SDK Command-line Tools", "license": "android-sdk-license", "name": "cmdline-tools", + "obsolete": "true", "path": "cmdline-tools/2.0", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.1": { "archives": [ @@ -5193,7 +11210,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.0": { "archives": [ @@ -5220,7 +11246,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", - "revision": "3.0" + "revision": "3.0", + "revision-details": { + "major:0": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "4.0": { "archives": [ @@ -5247,7 +11282,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", - "revision": "4.0" + "revision": "4.0", + "revision-details": { + "major:0": "4", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "5.0": { "archives": [ @@ -5274,7 +11318,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", - "revision": "5.0" + "revision": "5.0", + "revision-details": { + "major:0": "5", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6.0": { "archives": [ @@ -5301,7 +11354,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", - "revision": "6.0" + "revision": "6.0", + "revision-details": { + "major:0": "6", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "7.0": { "archives": [ @@ -5328,7 +11390,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", - "revision": "7.0" + "revision": "7.0", + "revision-details": { + "major:0": "7", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "8.0": { "archives": [ @@ -5355,7 +11426,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", - "revision": "8.0" + "revision": "8.0", + "revision-details": { + "major:0": "8", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "emulator": { @@ -5380,11 +11460,28 @@ "url": "https://dl.google.com/android/repository/emulator-windows_x64-8807927.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.3.10" + "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": [ @@ -5407,11 +11504,28 @@ "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9322596.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.3.14" + "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.8": { "archives": [ @@ -5434,11 +11548,28 @@ "url": "https://dl.google.com/android/repository/emulator-windows_x64-9310560.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "32.1.8" + "revision": "32.1.8", + "revision-details": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -5467,7 +11598,16 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.1": { "archives": [ @@ -5494,7 +11634,16 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk": { @@ -5519,11 +11668,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 16.1.4479499", "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -5546,11 +11712,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 17.2.4988734", "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -5573,11 +11756,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 18.1.5063045", "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -5600,11 +11800,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.0.5232133", "license": "android-sdk-license", "name": "ndk", + "obsolete": "true", "path": "ndk/19.0.5232133", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -5627,11 +11845,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.2.5345600", "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -5654,11 +11889,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5392854", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5392854", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -5681,11 +11935,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5471264", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5471264", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -5708,11 +11981,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5594570", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -5735,11 +12025,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.1.5948944", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -5762,11 +12069,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6011959", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -5789,11 +12114,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6113669", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -5816,11 +12158,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6210238", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -5843,11 +12203,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6273396", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -5870,11 +12248,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6352462", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -5897,11 +12292,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6363665", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -5924,11 +12337,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.2.6472646", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -5951,11 +12381,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.3.6528147", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -5978,11 +12425,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.4.7075529", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -6005,11 +12469,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.6917172", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -6032,11 +12514,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.7026061", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -6059,11 +12558,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.1.7171670", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -6086,11 +12602,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7123448", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -6113,11 +12647,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7196353", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -6140,11 +12692,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7272597", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -6167,11 +12737,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7344513", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7421159-rc5": { "archives": [ @@ -6194,11 +12782,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7421159", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", - "revision": "23.0.7421159-rc5" + "revision": "23.0.7421159-rc5", + "revision-details": { + "major:0": "23", + "micro:2": "7421159", + "minor:1": "0", + "preview:3": "5" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7530507-rc6": { "archives": [ @@ -6221,11 +12827,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7530507", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", - "revision": "23.0.7530507-rc6" + "revision": "23.0.7530507-rc6", + "revision-details": { + "major:0": "23", + "micro:2": "7530507", + "minor:1": "0", + "preview:3": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7599858": { "archives": [ @@ -6248,11 +12872,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7599858", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", - "revision": "23.0.7599858" + "revision": "23.0.7599858", + "revision-details": { + "major:0": "23", + "micro:2": "7599858", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.1.7779620": { "archives": [ @@ -6275,11 +12916,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23b-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.1.7779620", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", - "revision": "23.1.7779620" + "revision": "23.1.7779620", + "revision-details": { + "major:0": "23", + "micro:2": "7779620", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.2.8568313": { "archives": [ @@ -6302,11 +12960,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.2.8568313", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", - "revision": "23.2.8568313" + "revision": "23.2.8568313", + "revision-details": { + "major:0": "23", + "micro:2": "8568313", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7856742-rc1": { "archives": [ @@ -6329,11 +13004,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7856742", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", - "revision": "24.0.7856742-rc1" + "revision": "24.0.7856742-rc1", + "revision-details": { + "major:0": "24", + "micro:2": "7856742", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7956693-rc2": { "archives": [ @@ -6356,11 +13049,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7956693", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", - "revision": "24.0.7956693-rc2" + "revision": "24.0.7956693-rc2", + "revision-details": { + "major:0": "24", + "micro:2": "7956693", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8079956-rc3": { "archives": [ @@ -6383,11 +13094,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8079956", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", - "revision": "24.0.8079956-rc3" + "revision": "24.0.8079956-rc3", + "revision-details": { + "major:0": "24", + "micro:2": "8079956", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8215888": { "archives": [ @@ -6410,11 +13139,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8215888", "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", - "revision": "24.0.8215888" + "revision": "24.0.8215888", + "revision-details": { + "major:0": "24", + "micro:2": "8215888", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8151533-rc1": { "archives": [ @@ -6437,11 +13183,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8151533", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", - "revision": "25.0.8151533-rc1" + "revision": "25.0.8151533-rc1", + "revision-details": { + "major:0": "25", + "micro:2": "8151533", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8221429-rc2": { "archives": [ @@ -6464,11 +13228,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8221429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", - "revision": "25.0.8221429-rc2" + "revision": "25.0.8221429-rc2", + "revision-details": { + "major:0": "25", + "micro:2": "8221429", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8355429-rc3": { "archives": [ @@ -6491,11 +13273,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8355429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", - "revision": "25.0.8355429-rc3" + "revision": "25.0.8355429-rc3", + "revision-details": { + "major:0": "25", + "micro:2": "8355429", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8528842-rc4": { "archives": [ @@ -6518,11 +13318,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8528842", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", - "revision": "25.0.8528842-rc4" + "revision": "25.0.8528842-rc4", + "revision-details": { + "major:0": "25", + "micro:2": "8528842", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8775105": { "archives": [ @@ -6545,11 +13363,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8775105", "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", - "revision": "25.0.8775105" + "revision": "25.0.8775105", + "revision-details": { + "major:0": "25", + "micro:2": "8775105", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.1.8937393": { "archives": [ @@ -6572,11 +13407,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25b-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.1.8937393", "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", - "revision": "25.1.8937393" + "revision": "25.1.8937393", + "revision-details": { + "major:0": "25", + "micro:2": "8937393", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -6601,11 +13453,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -6628,11 +13497,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -6655,11 +13541,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -6682,11 +13585,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -6709,11 +13630,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -6736,11 +13674,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -6763,11 +13720,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -6790,11 +13766,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -6817,11 +13810,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -6844,11 +13854,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -6871,11 +13899,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -6898,11 +13943,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -6925,11 +13988,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -6952,11 +14033,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -6979,11 +14077,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -7006,11 +14122,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -7033,11 +14166,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -7060,11 +14210,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -7087,11 +14254,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -7114,11 +14299,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -7141,11 +14343,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -7168,11 +14387,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -7195,11 +14432,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -7222,11 +14477,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -7249,11 +14522,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "patcher": { @@ -7270,7 +14561,15 @@ "license": "android-sdk-license", "name": "patcher", "path": "patcher/v4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platform-tools": { @@ -7299,7 +14598,17 @@ "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "33.0.3" + "revision": "33.0.3", + "revision-details": { + "major:0": "33", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -7316,7 +14625,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "11": { "archives": [ @@ -7331,7 +14656,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "12": { "archives": [ @@ -7346,7 +14687,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "13": { "archives": [ @@ -7361,7 +14718,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "14": { "archives": [ @@ -7376,7 +14749,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "15": { "archives": [ @@ -7391,7 +14780,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "16": { "archives": [ @@ -7406,7 +14811,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "17": { "archives": [ @@ -7421,7 +14842,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "18": { "archives": [ @@ -7436,7 +14873,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "19": { "archives": [ @@ -7451,7 +14904,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "2": { "archives": [ @@ -7477,8 +14946,25 @@ "displayName": "Android SDK Platform 2", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-2", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "2", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "20": { "archives": [ @@ -7493,7 +14979,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "21": { "archives": [ @@ -7508,7 +15010,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "22": { "archives": [ @@ -7523,7 +15041,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "14" + } + } + } }, "23": { "archives": [ @@ -7538,7 +15072,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "24": { "archives": [ @@ -7553,7 +15103,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "25": { "archives": [ @@ -7568,7 +15134,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "26": { "archives": [ @@ -7583,7 +15165,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "27": { "archives": [ @@ -7598,7 +15196,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "28": { "archives": [ @@ -7613,7 +15227,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "29": { "archives": [ @@ -7628,7 +15258,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "3": { "archives": [ @@ -7654,8 +15300,25 @@ "displayName": "Android SDK Platform 3", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "30": { "archives": [ @@ -7670,7 +15333,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "31": { "archives": [ @@ -7685,7 +15364,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "32": { "archives": [ @@ -7700,7 +15395,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "33": { "archives": [ @@ -7715,7 +15426,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "4": { "archives": [ @@ -7741,8 +15468,25 @@ "displayName": "Android SDK Platform 4", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "5": { "archives": [ @@ -7768,8 +15512,25 @@ "displayName": "Android SDK Platform 5", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "6": { "archives": [ @@ -7795,8 +15556,25 @@ "displayName": "Android SDK Platform 6", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "7": { "archives": [ @@ -7811,7 +15589,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "8": { "archives": [ @@ -7826,7 +15620,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "9": { "archives": [ @@ -7841,7 +15651,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "TiramisuPrivacySandbox": { "archives": [ @@ -7856,7 +15682,22 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", - "revision": "TiramisuPrivacySandbox" + "revision": "TiramisuPrivacySandbox", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } } }, "skiaparser": { @@ -7885,7 +15726,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3": { "archives": [ @@ -7912,7 +15761,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6": { "archives": [ @@ -7939,7 +15796,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "sources": { @@ -7955,8 +15820,20 @@ "displayName": "Sources for Android 14", "license": "android-sdk-license", "name": "sources", + "obsolete": "true", "path": "sources/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "15": { "archives": [ @@ -7971,7 +15848,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "16": { "archives": [ @@ -7986,7 +15874,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "17": { "archives": [ @@ -8001,7 +15900,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "18": { "archives": [ @@ -8016,7 +15926,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "19": { "archives": [ @@ -8031,7 +15952,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "20": { "archives": [ @@ -8046,7 +15978,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "21": { "archives": [ @@ -8061,7 +16004,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "22": { "archives": [ @@ -8076,7 +16030,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "23": { "archives": [ @@ -8091,7 +16056,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "24": { "archives": [ @@ -8106,7 +16082,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "25": { "archives": [ @@ -8121,7 +16108,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "26": { "archives": [ @@ -8136,7 +16134,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "27": { "archives": [ @@ -8151,7 +16160,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "28": { "archives": [ @@ -8166,7 +16186,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "29": { "archives": [ @@ -8181,7 +16212,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "30": { "archives": [ @@ -8196,7 +16238,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "31": { "archives": [ @@ -8211,7 +16264,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "32": { "archives": [ @@ -8226,7 +16290,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "33": { "archives": [ @@ -8241,7 +16316,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -8266,11 +16352,42 @@ "url": "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + } + }, + "dependency:2": { + "element-attributes": { + "path": "platform-tools" + }, + "min-revision:0": { + "major:0": "20" + } + } + }, "displayName": "Android SDK Tools", "license": "android-sdk-license", "name": "tools", + "obsolete": "true", "path": "tools", - "revision": "26.1.1" + "revision": "26.1.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } } } From cc3b636db3186a0fedaded60218aa8aeb81f8fe8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Jan 2023 09:37:56 +0100 Subject: [PATCH 02/45] python3Packages.pscript: 0.7.6 -> 0.7.7 Signed-off-by: Matthias Beyer --- pkgs/development/python-modules/pscript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index fae2c8a4281..221e9979711 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pscript"; - version = "0.7.6"; + version = "0.7.7"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; rev = "v${version}"; - sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; + sha256 = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; checkInputs = [ From 42eaaafa63c963161f3210fa6c873d80886af254 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Jan 2023 10:19:58 +0100 Subject: [PATCH 03/45] python3Packages.pscript: add changelog to meta - add pythonImportsCheck - disable on unsupported Python releases - remove blank lines --- .../python-modules/pscript/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index 221e9979711..0acafc40ad9 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , nodejs +, pythonOlder }: buildPythonPackage rec { pname = "pscript"; version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; + rev = "refs/tags/v${version}"; + hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; checkInputs = [ @@ -27,13 +30,15 @@ buildPythonPackage rec { rm -rf pscript_legacy ''; + pythonImportsCheck = [ + "pscript" + ]; + meta = with lib; { description = "Python to JavaScript compiler"; - license = licenses.bsd2; homepage = "https://pscript.readthedocs.io"; - maintainers = [ maintainers.matthiasbeyer ]; + changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthiasbeyer ]; }; } - - - From d5efe89452bceea4b4470ccad423db052548a15c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 15 Jan 2023 01:16:14 +0100 Subject: [PATCH 04/45] vkdt: separate buildInputs and add wayland package --- pkgs/applications/graphics/vkdt/default.nix | 32 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 757bf7cb7b5..0be17708f41 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -30,25 +30,31 @@ stdenv.mkDerivation rec { sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; }; - buildInputs = [ - vulkan-headers - vulkan-tools - vulkan-loader - glslang - glfw - libjpeg - pkg-config - rsync - cmake + strictDeps = true; + + nativeBuildInputs = [ clang + cmake + glslang llvm llvmPackages.openmp - pugixml - freetype + pkg-config + rsync + ]; + + buildInputs = [ exiv2 ffmpeg - libvorbis + freetype + glfw + libjpeg libmad + libvorbis + llvmPackages.openmp + pugixml + vulkan-headers + vulkan-loader + vulkan-tools ]; dontUseCmakeConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d260b44f76a..00840ddb620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23353,6 +23353,8 @@ with pkgs; vkdt = callPackage ../applications/graphics/vkdt { }; + vkdt-wayland = callPackage ../applications/graphics/vkdt { glfw = glfw-wayland; }; + vlock = callPackage ../misc/screensavers/vlock { }; virtualpg = callPackage ../development/libraries/virtualpg { }; From cfb307f15fa373eb99cc49a37d2753f0dabd3015 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:25:40 +0100 Subject: [PATCH 05/45] vscode-extensions.streetsidesoftware.code-spell-checker: 2.14.0 -> 2.15.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 61988c9741b..312af4efe14 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2580,8 +2580,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.14.0"; - sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; + version = "2.15.0"; + sha256 = "sha256-YfcO/01nO+92xZEJgYyLYAkqXMqfV/QDkcN9Dnjp5ZA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 845fd5eaec5fb27878caa6179bf304c8d8833ff7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 14:19:48 +0100 Subject: [PATCH 06/45] davfs2: 1.6.1 -> 1.7.0 --- ...the-setuid-wrapped-umount-is-invoked.patch | 46 ++++++------------ pkgs/tools/filesystems/davfs2/default.nix | 15 +++--- .../filesystems/davfs2/disable-suid.patch | 9 ++++ .../filesystems/davfs2/fix-sysconfdir.patch | 48 ++++--------------- 4 files changed, 41 insertions(+), 77 deletions(-) create mode 100644 pkgs/tools/filesystems/davfs2/disable-suid.patch diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch index 0e31725936f..0f8741ca28f 100644 --- a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch +++ b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch @@ -1,42 +1,26 @@ -From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Wed, 11 Nov 2020 11:58:25 +0100 -Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked - ---- - src/dav_fuse.c | 2 +- - src/umount_davfs.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - diff --git a/src/dav_fuse.c b/src/dav_fuse.c -index 734bc1f..4501433 100644 +index 6311428..1b1698d 100644 --- a/src/dav_fuse.c +++ b/src/dav_fuse.c -@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, - unmounting = 1; +@@ -189,7 +189,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, pid_t pid = fork(); if (pid == 0) { + #if defined(__linux__) - execl("/bin/umount", "umount", "-il", mountpoint, NULL); + execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL); - _exit(EXIT_FAILURE); - } - } + #elif defined(__FreeBSD__) + execl("/sbin/umount", "umount", "-v", mountpoint, NULL); + #endif diff --git a/src/umount_davfs.c b/src/umount_davfs.c -index b7019c3..75e3b4b 100644 +index 6a82fd2..93958be 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c -@@ -122,9 +122,9 @@ main(int argc, char *argv[]) +@@ -50,7 +50,7 @@ + #endif - char *umount_command = NULL; - if (mpoint) { -- umount_command = ne_concat("umount -i '", mpoint, "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL); - } else { -- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL); - error(0, 0, - _("\n" - " can't evaluate PID file name;\n" --- -2.28.0 - + #if defined(__linux__) +-#define UMOUNT_CMD "umount -i" ++#define UMOUNT_CMD "@wrapperDir@/umount -i" + #elif defined(__FreeBSD__) + #define UMOUNT_CMD "umount" + #endif diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index ab9609635c5..2e80dfc267f 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -10,17 +11,22 @@ stdenv.mkDerivation rec { pname = "davfs2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; - sha256 = "sha256-zj65SOzlgqUck0zLDMcOZZg5FycXyv8XP2ml4q+QxcA="; + sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ neon zlib ]; patches = [ ./fix-sysconfdir.patch + ./disable-suid.patch (substituteAll { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; @@ -33,11 +39,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ - "sbindir=$(out)/sbin" - "ssbindir=$(out)/sbin" - ]; - meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; diff --git a/pkgs/tools/filesystems/davfs2/disable-suid.patch b/pkgs/tools/filesystems/davfs2/disable-suid.patch new file mode 100644 index 00000000000..074e08d157c --- /dev/null +++ b/pkgs/tools/filesystems/davfs2/disable-suid.patch @@ -0,0 +1,9 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index bbde353..bcbed04 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -54,4 +54,3 @@ LIBS += @LIBICONV@ + endif + + install-exec-hook: +- chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch index f71248a28f4..7094a93a9f1 100644 --- a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch +++ b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch @@ -1,19 +1,20 @@ -diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am ---- davfs2-1.4.7-orig/etc/Makefile.am 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.am 2013-02-21 11:53:05.423197775 +0100 -@@ -24,17 +24,17 @@ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index 5a01282..6a40921 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -24,17 +24,17 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@ install-data-local: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets +- $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf +- $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(DESTDIR)$(pkgsysconfdir)/secrets - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private - chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private + $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets ++ $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf ++ $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(out)$(pkgsysconfdir)/secrets + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private + chmod 700 $(out)$(pkgsysconfdir)/certs/private @@ -27,34 +28,3 @@ diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am + echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ + rm -f $(out)$(pkgsysconfdir)/$$f; \ done -diff -ubr davfs2-1.4.7-orig/etc/Makefile.in davfs2-1.4.7/etc/Makefile.in ---- davfs2-1.4.7-orig/etc/Makefile.in 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.in 2013-02-21 11:53:27.241207128 +0100 -@@ -408,19 +408,19 @@ - - install-data-local: $(dist_pkgdata_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private -- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private -+ $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private -+ chmod 700 $(out)$(pkgsysconfdir)/certs/private - - uninstall-local: - @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \ -- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \ -+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ -+ rm -f $(out)$(pkgsysconfdir)/$$f; \ - done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. From b2fc2c93c8bd28cdd3d992c8f50d1b49a8ab5340 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 14:20:35 +0100 Subject: [PATCH 07/45] davfs2: add fgaz to maintainers --- pkgs/tools/filesystems/davfs2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 2e80dfc267f..1efef2d9b53 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fgaz ]; }; } From 9c4e43ab70c506875684619f30d6d16f093e87d5 Mon Sep 17 00:00:00 2001 From: Hadi Date: Tue, 27 Dec 2022 18:26:10 -0500 Subject: [PATCH 08/45] androidenv: Implement cmdline-tools and patcher - Replace cmdline-tools with tools because tools is obsolete now. - Depend emulator package to systemImages androidenv: fix issues on the PR androidenv: reformat androidenv: support excluding of `tools` package androidenv: provide `tools`, and `build-tools`, dependencies androidenv: replace includeTools with toolsVersion androidenv: fix a typo androidenv: add tests to check licenses and installed packages androidenv: check if tests are running! this commit should fail! androidenv: fix problems in the review https://github.com/NixOS/nixpkgs/pull/208793 androidenv: add test-suite to handle more tests around androidenv: fix the test after couldn't running them with ofborg Update pkgs/development/mobile/androidenv/build-tools.nix Co-authored-by: Sandro androidenv: Resolving https://github.com/NixOS/nixpkgs/pull/208793#discussion_r1065851539 Update pkgs/development/mobile/androidenv/cmdline-tools.nix Co-authored-by: Sandro Update pkgs/development/mobile/androidenv/tools.nix Co-authored-by: Sandro androidenv: fix a typo --- doc/languages-frameworks/android.section.md | 6 +- pkgs/development/mobile/androidenv/README.md | 9 +++ .../mobile/androidenv/build-tools.nix | 6 +- .../mobile/androidenv/cmdline-tools.nix | 39 ++++++++++ .../androidenv/compose-android-packages.nix | 75 ++++++++++++------- .../development/mobile/androidenv/default.nix | 2 + .../mobile/androidenv/emulator.nix | 11 ++- .../mobile/androidenv/examples/shell.nix | 58 ++++++++++++-- .../development/mobile/androidenv/patcher.nix | 9 +++ .../mobile/androidenv/platform-tools.nix | 1 + .../mobile/androidenv/test-suite.nix | 16 ++++ pkgs/development/mobile/androidenv/tools.nix | 64 ++++++++++------ .../mobile/androidenv/tools/25.nix | 62 --------------- .../mobile/androidenv/tools/26.nix | 45 ----------- 14 files changed, 234 insertions(+), 169 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/cmdline-tools.nix create mode 100644 pkgs/development/mobile/androidenv/patcher.nix create mode 100644 pkgs/development/mobile/androidenv/test-suite.nix delete mode 100644 pkgs/development/mobile/androidenv/tools/25.nix delete mode 100644 pkgs/development/mobile/androidenv/tools/26.nix diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 15b8d3839b1..6f9717ca09c 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import {}; let androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "30.0.5"; buildToolsVersions = [ "30.0.3" ]; @@ -42,7 +43,10 @@ exceptions are the tools, platform-tools and build-tools sub packages. The following parameters are supported: -* `toolsVersion`, specifies the version of the tools package to use +* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use +* `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is + obsolete, and currently only `26.1.1` is available, so there's not a lot of + options here, however, you can set it as `null` if you don't want it. * `platformsToolsVersion` specifies the version of the `platform-tools` plugin * `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. diff --git a/pkgs/development/mobile/androidenv/README.md b/pkgs/development/mobile/androidenv/README.md index 159265abb48..04cb157dba5 100644 --- a/pkgs/development/mobile/androidenv/README.md +++ b/pkgs/development/mobile/androidenv/README.md @@ -4,3 +4,12 @@ 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` + +# How to run tests +You may need to make yourself familiar with [tests](https://nixos.org/manual/nixpkgs/stable/#var-meta-tests), and [Writing larger package tests](https://nixos.org/manual/nixpkgs/stable/#ssec-package-tests-writing) in the Manual, then run tests locally with: + +```shell +$ export NIXPKGS_ALLOW_UNFREE=1 +$ cd path/to/nixpkgs +$ nix-build -A androidenv.test-suite.tests +``` diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 2b094df0345..018298d322e 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { inherit package os; @@ -19,6 +19,8 @@ deployAndroidPackage { wrapProgram $PWD/mainDexClasses \ --prefix PATH : ${pkgs.jdk8}/bin ''} - ''; + + cd $out/libexec/android-sdk + '' + postInstall; noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix new file mode 100644 index 00000000000..b3ca1c171b6 --- /dev/null +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -0,0 +1,39 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}: + +deployAndroidPackage { + name = "androidsdk"; + inherit package os; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Strip double dots from the root path + export ANDROID_SDK_ROOT="$out/libexec/android-sdk" + + # Wrap all scripts that require JAVA_HOME + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \ + --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT + fi + done + + # Wrap sdkmanager script + wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \ + --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \ + --add-flags "--sdk_root=$ANDROID_SDK_ROOT" + + # Patch all script shebangs + patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin + + cd $ANDROID_SDK_ROOT + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index a862aef1f3c..75f393b3f9e 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -2,7 +2,8 @@ , licenseAccepted ? false }: -{ toolsVersion ? "26.1.1" +{ cmdLineToolsVersion ? "8.0" +, toolsVersion ? "26.1.1" , platformToolsVersion ? "33.0.3" , buildToolsVersions ? [ "33.0.1" ] , includeEmulator ? false @@ -132,16 +133,40 @@ rec { package = packages.platform-tools.${platformToolsVersion}; }; + tools = callPackage ./tools.nix { + inherit deployAndroidPackage os; + package = packages.tools.${toolsVersion}; + + postInstall = '' + ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} + ${linkPlugin { name = "emulator"; plugin = emulator; }} + ''; + }; + + patcher = callPackage ./patcher.nix { + inherit deployAndroidPackage os; + package = packages.patcher."1"; + }; + build-tools = map (version: callPackage ./build-tools.nix { inherit deployAndroidPackage os; package = packages.build-tools.${version}; + + postInstall = '' + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ''; } ) buildToolsVersions; emulator = callPackage ./emulator.nix { inherit deployAndroidPackage os; package = packages.emulator.${emulatorVersion}; + + postInstall = '' + ${linkSystemImages { images = system-images; check = includeSystemImages; }} + ''; }; platforms = map (version: @@ -238,9 +263,19 @@ rec { # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check '' - ln -s ${plugin}/libexec/android-sdk/* ${name} + ln -s ${plugin}/libexec/android-sdk/${name} ${name} ''; + linkSystemImages = { images, check }: lib.optionalString check '' + mkdir -p system-images + ${lib.concatMapStrings (system-image: '' + apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) + type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) + mkdir -p system-images/$apiVersion/$type + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + '') images} + ''; + # Links all plugins related to a requested platform linkPlatformPlugins = {name, plugins, check}: lib.optionalString check '' @@ -260,12 +295,16 @@ rec { ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} by setting nixpkgs config option 'android_sdk.accept_license = true;'. - '' else callPackage ./tools.nix { - inherit deployAndroidPackage packages toolsVersion os; + '' else callPackage ./cmdline-tools.nix { + inherit deployAndroidPackage os cmdLineToolsVersion; + + package = packages.cmdline-tools.${cmdLineToolsVersion}; postInstall = '' # Symlink all requested plugins ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} ${linkPlugins { name = "build-tools"; plugins = build-tools; }} ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} ${linkPlugins { name = "platforms"; plugins = platforms; }} @@ -273,17 +312,7 @@ rec { ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} - - ${lib.optionalString includeSystemImages '' - mkdir -p system-images - ${lib.concatMapStrings (system-image: '' - apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) - type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) - mkdir -p system-images/$apiVersion/$type - ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type - '') system-images} - ''} - + ${linkSystemImages { images = system-images; check = includeSystemImages; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} @@ -304,27 +333,19 @@ rec { # Expose common executables in bin/ mkdir -p $out/bin - find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + + for i in ${platform-tools}/bin/*; do ln -s $i $out/bin done - find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + for i in ${emulator}/bin/*; do ln -s $i $out/bin done - for i in ${platform-tools}/bin/* - do + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -type f -executable | while read i; do ln -s $i $out/bin done - # the emulator auto-linked from platform-tools does not find its local qemu, while this one does - ${lib.optionalString includeEmulator '' - rm $out/bin/emulator - ln -s $out/libexec/android-sdk/emulator/emulator $out/bin - ''} - # Write licenses mkdir -p licenses ${lib.concatMapStrings (licenseName: diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 90064becfb5..9bd9fb9a543 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -19,4 +19,6 @@ rec { platformVersions = [ "28" ]; abiVersions = [ "x86" "x86_64"]; }; + + test-suite = pkgs.callPackage ./test-suite.nix {}; } diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 0a680fd360f..273cc3d8a8a 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -1,4 +1,4 @@ -{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux }: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: deployAndroidPackage { inherit package os; @@ -47,6 +47,15 @@ deployAndroidPackage { ]} \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + + mkdir -p $out/bin + cd $out/bin + find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do + ln -s $i + done + + cd $out/libexec/android-sdk + ${postInstall} ''; dontMoveLib64 = true; } diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 36c3d4da0c8..8c51ba09e53 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -25,7 +25,7 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - tools = "26.1.1"; + cmdLineToolsVersion = "8.0"; platformTools = "33.0.3"; buildTools = "30.0.3"; ndk = [ @@ -60,7 +60,7 @@ let }; androidComposition = androidEnv.composeAndroidPackages { - toolsVersion = android.versions.tools; + cmdLineToolsVersion = android.versions.cmdLineToolsVersion; platformToolsVersion = android.versions.platformTools; buildToolsVersions = [android.versions.buildTools]; platformVersions = android.platforms; @@ -138,11 +138,55 @@ pkgs.mkShell rec { # Write out local.properties for Android Studio. cat < local.properties -# This file was automatically generated by nix-shell. -sdk.dir=$ANDROID_SDK_ROOT -ndk.dir=$ANDROID_NDK_ROOT -cmake.dir=$cmake_root -EOF + # This file was automatically generated by nix-shell. + sdk.dir=$ANDROID_SDK_ROOT + ndk.dir=$ANDROID_NDK_ROOT + cmake.dir=$cmake_root + EOF ''; + + passthru.tests = { + sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" { + buildInputs = [ androidSdk jdk ]; + } '' + if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then + echo "At least one of SDK package licenses are not accepted." + exit 1 + fi + touch $out + ''; + + sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" { + buildInputs = [ androidSdk jdk ]; + } '' + output="$(sdkmanager --list)" + installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + + packages=( + "build-tools;30.0.3" "ndk-bundle" "platform-tools" \ + "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ + "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ + "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ + "sources;android-31" "sources;android-32" "sources;android-33" \ + "system-images;android-28;google_apis_playstore;arm64-v8a" \ + "system-images;android-29;google_apis_playstore;arm64-v8a" \ + "system-images;android-30;google_apis_playstore;arm64-v8a" \ + "system-images;android-31;google_apis_playstore;arm64-v8a" \ + "system-images;android-32;google_apis_playstore;arm64-v8a" \ + "system-images;android-33;google_apis_playstore;arm64-v8a" + ) + + for package in "''${packages[@]}"; do + if [[ ! $installed_packages_section =~ "$package" ]]; then + echo "$package package was not installed." + exit 1 + fi + done + + touch "$out" + ''; + }; } diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix new file mode 100644 index 00000000000..9fd112063cb --- /dev/null +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -0,0 +1,9 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: + +deployAndroidPackage { + inherit package os; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + patchInstructions = lib.optionalString (os == "linux") '' + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 49bc8da92a8..eed3b896bfc 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -4,6 +4,7 @@ deployAndroidPackage { inherit package os; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix new file mode 100644 index 00000000000..d063b73ccb4 --- /dev/null +++ b/pkgs/development/mobile/androidenv/test-suite.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +let + examples-shell = callPackage ./examples/shell.nix {}; +in +stdenv.mkDerivation { + name = "androidenv-test-suite"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + + passthru.tests = { } // examples-shell.passthru.tests; + + meta.timeout = 60; +} diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 36e7e52b80a..091b9448947 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -1,26 +1,42 @@ -{deployAndroidPackage, requireFile, lib, packages, toolsVersion, os, callPackage, postInstall ? ""}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: -if toolsVersion == "26.0.1" then callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os postInstall; - package = { - name = "tools"; - path = "tools"; - revision = "26.0.1"; - archives = { - linux = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip"; - sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; - }; - macosx = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip"; - sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; - }; - }; - }; -} else if toolsVersion == "26.1.1" then callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os postInstall; - package = packages.tools.${toolsVersion}; -} else callPackage ./tools/25.nix { - inherit deployAndroidPackage lib os postInstall; - package = packages.tools.${toolsVersion}; +deployAndroidPackage { + name = "androidsdk"; + inherit os package; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") ( + (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) + ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ); + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin; do + find $i -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap monitor script + wrapProgram $PWD/monitor \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ xorg.libX11 xorg.libXtst ])} + + # Patch all script shebangs + patchShebangs . + + cd $out/libexec/android-sdk + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; } diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix deleted file mode 100644 index 85a114fbc29..00000000000 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ /dev/null @@ -1,62 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgsi686Linux.glibc pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig pkgsi686Linux.freetype pkgsi686Linux.zlib ]; - inherit package os; - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - addAutoPatchelfSearchPath $PWD/lib64 - addAutoPatchelfSearchPath $PWD/lib64/libstdc++ - addAutoPatchelfSearchPath $PWD/lib64/qt/lib - addAutoPatchelfSearchPath $PWD/lib - addAutoPatchelfSearchPath $PWD/lib/libstdc++ - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap programs that require java - for i in draw9patch jobb lint screenshot2 - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin - done - - # Wrap programs that require java and SWT - for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - done - - ${lib.optionalString (os == "linux") '' - wrapProgram $PWD/emulator \ - --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \ - --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale - ''} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix deleted file mode 100644 index 527d3602718..00000000000 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ /dev/null @@ -1,45 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - inherit os package; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optional (os == "linux") ( - (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) - ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) - ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) - ); - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap monitor script - wrapProgram $PWD/monitor \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} From d28f3a66fcbe895849afb4a07ed3fadf38ebad8f Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 27 Jan 2023 21:21:11 +0800 Subject: [PATCH 09/45] python3Packages.dasbus: 1.7 -> unstable-11-10-2022 change format to pyproject add hatchling as a build time dep test with pytestCheckHook --- .../python-modules/dasbus/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index c34d402de5e..a7e0b754273 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -1,16 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: +{ lib, buildPythonPackage, fetchFromGitHub, pygobject3, dbus, hatchling, pytestCheckHook }: buildPythonPackage rec { pname = "dasbus"; - version = "1.7"; + version = "unstable-11-10-2022"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; + src = fetchFromGitHub { + owner = "rhinstaller"; + repo = pname; + rev = "64b6b4d9e37cd7e0cbf4a7bf75faa7cdbd01086d"; + hash = "sha256-TmhhDrfpP+nUErAd7dUb+RtGBRtWwn3bYOoIqa0VRoc="; }; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ pygobject3 ]; - nativeCheckInputs = [ dbus ]; + nativeCheckInputs = [ dbus pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/rhinstaller/dasbus"; From 193ef2e3a0ded1b74b701209189c9dd50ee1bfbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 02:07:29 +0000 Subject: [PATCH 10/45] wlr-randr: 0.2.0 -> 0.3.0 --- pkgs/tools/wayland/wlr-randr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index 4551f3d5f4a..637876e0a3d 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; + sha256 = "sha256-iJSHCQbom+V0TrtEYrjMrMkdc6PoZrjhtcgebZYjQjI="; }; strictDeps = true; From e28154dccd325b424ca7a164fb9a1360636216ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 04:03:45 +0000 Subject: [PATCH 11/45] k3s: 1.26.0+k3s2 -> 1.26.1+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 02a65328cfd..74c3e1ccdf5 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -45,10 +45,10 @@ # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.0+k3s2"; # k3s git tag - k3sCommit = "f0ec6a4c127b2c671b271974a2f21783f0e3c525"; # k3s git commit at the above version - k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm"; - k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU="; + k3sVersion = "1.26.1+k3s1"; # k3s git tag + k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version + k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; + k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 @@ -65,8 +65,8 @@ let k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.14-k3s1"; - containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p"; + containerdVersion = "1.6.15-k3s1"; + containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.26.0-rc.0-k3s1"; From be5a659a1a2cb321228cf75774d23c679a747668 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 27 Jan 2023 11:51:59 +0100 Subject: [PATCH 12/45] python3Packages.uptime-kuma-api: init at 0.9.0 --- .../uptime-kuma-api/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/uptime-kuma-api/default.nix diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix new file mode 100644 index 00000000000..e9af904e9cd --- /dev/null +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-socketio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "uptime-kuma-api"; + version = "0.9.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "uptime_kuma_api"; + inherit version; + hash = "sha256-nbRBsG4Mietd6kcrvpbTbWUP0SMRXbW4mWme1G5n3ks="; + }; + + propagatedBuildInputs = [ + python-socketio + python-socketio.optional-dependencies.client + ]; + + pythonImportsCheck = [ + "uptime_kuma_api" + ]; + + # Tests need an uptime-kuma instance to run + doCheck = false; + + meta = with lib; { + description = "A Python wrapper for the Uptime Kuma Socket.IO API"; + homepage = "https://github.com/lucasheld/uptime-kuma-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ julienmalka ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 384948d13b8..836c2c87a6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11868,6 +11868,8 @@ self: super: with self; { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-api = callPackage ../development/python-modules/uptime-kuma-api { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; uranium = callPackage ../development/python-modules/uranium { }; From a1208eba7762e31515f5ad42220723d2b7fb859c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 28 Jan 2023 18:43:40 +0100 Subject: [PATCH 13/45] perlPackages.libapreq2: 2.16 -> 2.17 Fixes CVE-2022-22728. https://httpd.apache.org/apreq/docs/libapreq2/apreq_changes.html --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a25ff5f986d..525d737b826 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12911,12 +12911,12 @@ let }; }; - libapreq2 = buildPerlPackage { + libapreq2 = buildPerlPackage rec { pname = "libapreq2"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz"; - hash = "sha256-4EyFWj6gcLiGNWn7rgL+go9TSsiHVbI+JNOGPMlZg0k="; + url = "mirror://apache/httpd/libapreq/${pname}-${version}.tar.gz"; + hash = "sha256-BGSH8ITBL6HIIq/8X33lbv7ZtIkFpCbmMaa5ScEU2Gw="; }; outputs = [ "out" ]; buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; From 4888f60568b8a992523077d19be6f68723679a3a Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 29 Nov 2022 22:00:52 -0800 Subject: [PATCH 14/45] rust-bindgen: 0.61.0 -> 0.63.0 --- pkgs/development/tools/rust/bindgen/default.nix | 6 +++--- pkgs/development/tools/rust/bindgen/unwrapped.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 444db117322..cc2cb444a5d 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -17,19 +17,19 @@ let passthru.tests = { simple-c = runCommandCC "simple-c-bindgen-tests" { } '' echo '#include ' > a.c - ${self}/bin/bindgen a.c --whitelist-function atoi | tee output + ${self}/bin/bindgen a.c --allowlist-function atoi | tee output grep atoi output touch $out ''; simple-cpp = runCommandCC "simple-cpp-bindgen-tests" { } '' echo '#include ' > a.cpp - ${self}/bin/bindgen a.cpp --whitelist-function erf -- -xc++ | tee output + ${self}/bin/bindgen a.cpp --allowlist-function erf -- -xc++ | tee output grep erf output touch $out ''; with-lib = runCommandCC "zlib-bindgen-tests" { buildInputs = [ zlib ]; } '' echo '#include ' > a.c - ${self}/bin/bindgen a.c --whitelist-function compress | tee output + ${self}/bin/bindgen a.c --allowlist-function compress | tee output grep compress output touch $out ''; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 95754d16502..f9e8038b6b3 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -7,15 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.61.0"; + version = "0.63.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-sKcKIAkUC2GfAZ4tJBNweXhoFzqO95iCpHgekpOyHzc="; + sha256 = "sha256-qynsHbcljbJyi4wq9AxEE7KIclnDqNTMFAW366JhBSo="; }; - cargoSha256 = "sha256-P246tw5Kznpxav0LashIkLlmQGVB+aKbFUQQdmcASPw="; + cargoSha256 = "sha256-nOPJo6vWMAcG9VG03uceYyLiJfomFERViDCZ0vFnenY="; buildInputs = [ clang.cc.lib ]; From 5ada4a7e902e35a446d99cedad191440d59bb758 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 28 Jan 2023 12:26:05 -0800 Subject: [PATCH 15/45] svdtools: 0.2.7 -> 0.2.8 --- pkgs/development/embedded/svdtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index e902d837c9d..0da71d1de10 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.2.7"; + version = "0.2.8"; src = fetchCrate { inherit version pname; - sha256 = "sha256-pRY9lL04BcZDYeFcdArIp2PcWiCZBurCYpYtYhPqFsg="; + sha256 = "sha256-x0C+1Ld4RImmS6x9l9jQaZ/sEd3iLFmmwOWNfA+xYsk="; }; - cargoSha256 = "sha256-9XymDE9ON11VfZObrMiARmpJay2g2mKEf0l2eojbjL8="; + cargoSha256 = "sha256-U1YiQdfk/SgRicAND0X8KdHKgX7wHnYspWNF270WDrE="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From f761feb05817a13d9db2863b88707ea0289fbbf3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 28 Jan 2023 23:08:51 +0100 Subject: [PATCH 16/45] vkdt: add meta.platforms & meta.broken --- pkgs/applications/graphics/vkdt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 0be17708f41..38b4bdee2a1 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -66,5 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanatos/vkdt"; license = licenses.bsd2; maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; }; } From e08e34d0fd70208566b13de9e22f5e44bb57e795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 23:22:39 +0000 Subject: [PATCH 17/45] infra: 0.20.0 -> 0.21.0 --- pkgs/tools/admin/infra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index 7c852ac35ec..be2c8401efc 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4sExRKq4J94cQYqjxaXCKa2aEeptCG+TTvrDOrJfBUg="; + sha256 = "sha256-uz4wimhOfeHSL949m+biIhjfDwwEGnTiJWaz/r3Rsko="; }; - vendorSha256 = "sha256-afbQQsluZjgliNxSOGcTS1DJwj7en5NpxtuzCDAyv98="; + vendorHash = "sha256-qbmaebQcD3cN+tbmzzJbry0AXz2LZFMoqbcBwGGrRo4="; subPackages = [ "." ]; From 069a26169edd33b921dfbce9fc1c2f2d88a450ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 23:46:00 +0000 Subject: [PATCH 18/45] libsolv: 0.7.22 -> 0.7.23 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 6ae972b51d9..99e1a35a80e 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.22"; + version = "0.7.23"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; + sha256 = "sha256-i1g4arr8rII9SzdyITD6xS9CAVN6zP73gFwnZdkc5os="; }; cmakeFlags = [ From 50e537dea9797ff1cf13ac76d633f3ae732ea7f8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 29 Jan 2023 04:05:22 +0000 Subject: [PATCH 19/45] =?UTF-8?q?gtksourceview5:=205.6.1=20=E2=86=92=205.6?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.6.1...5.6.2 --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 506dcefcff3..849c3caf267 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.6.1"; + version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; + sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; patches = [ From 477d7886fbefc263a0dced965cd6c11f548b15ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Jan 2023 21:09:23 -0800 Subject: [PATCH 20/45] electron_20: 20.1.3 -> 20.3.11 https://github.com/electron/electron/releases/tag/v20.3.11 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 5c0838fce73..57a0bc859ef 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -133,13 +133,13 @@ rec { headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; - electron_20 = mkElectron "20.1.3" { - armv7l-linux = "99710a57c55d95b540f4c3568da2a7caccb7f91da23b530c8c40db5ac861ab24"; - aarch64-linux = "8f39562f20210d7cdedbb063683d632df442c8553f62104c7d676121f3d9a357"; - x86_64-linux = "219fb6f01305669f78cf1881d257e3cc48e5563330338516f8b6592d85fdb4a3"; - x86_64-darwin = "134714291dcbecbf10cbc27c490a6501e2810bd4147a74f3b2671503445f2ce8"; - aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0"; - headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii"; + electron_20 = mkElectron "20.3.11" { + armv7l-linux = "709b9eb958e9488f6375811041179556b9cd0b8fc1eab6b899ef4a89423f98b2"; + aarch64-linux = "0f488ac9eeda2baa4c4e571fd75ac8e055dac9dcdf83051164232b1005a29224"; + x86_64-linux = "7899bf391ae35e10d78a5da622e506dd4ae859cd8c18953cd2dc54f1a5e5225e"; + x86_64-darwin = "751204887aa553c2a7811d3cb04d71e85359ccce2cf21d38e43eda24575ef4db"; + aarch64-darwin = "8ea1a446b41413b97d83d2955a4800c5f7c9061662f78c3e8d96827741f8e211"; + headers = "06s4z2hs9sbri4jsjrgybq0sn7rrx7zf3iwfg8da1wb6ahwqcd7w"; }; electron_21 = mkElectron "21.2.1" { From 1f805208f48953a8f087305ade9d7c081fe8faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Jan 2023 21:09:54 -0800 Subject: [PATCH 21/45] electron_21: 21.2.1 -> 21.4.0 https://github.com/electron/electron/releases/tag/v21.4.0 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 57a0bc859ef..99f0059ab36 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -142,13 +142,13 @@ rec { headers = "06s4z2hs9sbri4jsjrgybq0sn7rrx7zf3iwfg8da1wb6ahwqcd7w"; }; - electron_21 = mkElectron "21.2.1" { - armv7l-linux = "1f68ffacbcd0086c5bcbc726e3a0bd707b03acdf5c82d5cc44666b6e9a0d8a78"; - aarch64-linux = "78c1c6ecf5959e67fa6c67d82dc7deb170bc10d34d45265d6e972dd5b996bcb9"; - x86_64-linux = "d8aa2ea7b1a1421ca245ced1a9bdd77408bf7aee6f75c19d5e0e73dc120442b7"; - x86_64-darwin = "f20c0be6cb51bad1bb591ec1116be622e631cbc89876b2258c55579bbe52de30"; - aarch64-darwin = "2ac1bde2bbb4a265422e00eb5e1d81302b0c349b2db6e7bf1ee6f236a68b3d53"; - headers = "1c1g6jc0p678d5sr2w4irhfkj02vm4kb92b7cvimz8an0jwy58x7"; + electron_21 = mkElectron "21.4.0" { + armv7l-linux = "20ed4fab8b2046e10c999592ea06cd6ef13bc5826bcd7e8874c6e5e3b3cdb5b7"; + aarch64-linux = "5841060f67c23371f2739e043b51f56d04125fe781cc50e298590247477eacf2"; + x86_64-linux = "1c0da48b2b9d1fb320577429298397d67d94fbf5864d6a4f3c6eeadee3114f2e"; + x86_64-darwin = "3eea42022d21b6bb0416da8da787740b908febd2552e74cbac63bf403df0745a"; + aarch64-darwin = "aee691fd7da0343e09c4574d09e0d9962d2d1071f845ae57acf1fd9c76adbd3c"; + headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; electron_22 = mkElectron "22.0.0" { From af36d78a9b3f37f80bcc0682b7df58e535508d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Jan 2023 21:08:09 -0800 Subject: [PATCH 22/45] electron_22: 22.0.0 -> 22.1.0 https://github.com/electron/electron/releases/tag/v22.1.0 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 99f0059ab36..717f66b4ccf 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -151,12 +151,12 @@ rec { headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; - electron_22 = mkElectron "22.0.0" { - armv7l-linux = "f2b9c870c12d4cfd6a4ac23bf937d4a89cd34381aedc2c9a64f00f22ff984985"; - aarch64-linux = "7c031d1d907953399126e9ed072db66ab7c82e3aff29c8268c8c3a83f825f5de"; - x86_64-linux = "ea0f4ad9a91bef4d5918d73c27b2731a5a93fe8917ad13d9eca83f39c5acbf05"; - x86_64-darwin = "b072e64ae563997abed9b76e30b617dfc23a33d6bba6b85fdf30c0877a6215c2"; - aarch64-darwin = "79b700953a20f4055bf94f11d7a6be9d39a7545774b45ca487cf33482828ebfd"; - headers = "06fi1m6g0g81a1lkx11ryxbic0srp4iq2z2lf2449sjnaw1sh2hr"; + electron_22 = mkElectron "22.1.0" { + armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; + aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; + x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; + x86_64-darwin = "969cad3fad6a03cbbc1658722cbf87547a8465c90dd4287fd5c03bd15bbf8a5b"; + aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2"; + headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; }; } From 55046981cc33a2f9a72e421ab3f2e3cfbd27bc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Jan 2023 21:15:17 -0800 Subject: [PATCH 23/45] electron_19: mark insecure Its support ended on November 30, 2022. --- pkgs/development/tools/electron/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 76f2bc42759..eee95386289 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -32,7 +32,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "18.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "20.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { From 400949d5de7b055b8a0030a1b4fbccaf6070d8c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 09:14:33 +0000 Subject: [PATCH 24/45] cmark: 0.30.2 -> 0.30.3 --- pkgs/development/libraries/cmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index f2945116e7e..065d3bc411b 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.2"; + version = "0.30.3"; src = fetchFromGitHub { owner = "jgm"; repo = pname; rev = version; - sha256 = "sha256-IkNybUe/XYwAvPowym3aqfVyvNdw2t/brRjhOrjVRpA="; + sha256 = "sha256-/7TzaZYP8lndkfRPgCpBbazUBytVLXxqWHYktIsGox0="; }; nativeBuildInputs = [ cmake ]; From 0d95c09a0002018f967955bc46c0b7cde20d2dc5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 29 Jan 2023 09:15:00 +0000 Subject: [PATCH 25/45] cmark: update meta --- pkgs/development/libraries/cmark/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 065d3bc411b..830791f6fb3 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.30.3"; src = fetchFromGitHub { - owner = "jgm"; + owner = "commonmark"; repo = pname; rev = version; sha256 = "sha256-/7TzaZYP8lndkfRPgCpBbazUBytVLXxqWHYktIsGox0="; @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; - homepage = "https://github.com/jgm/cmark"; + homepage = "https://github.com/commonmark/cmark"; + changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt"; maintainers = [ maintainers.michelk ]; - platforms = platforms.unix; + platforms = platforms.all; license = licenses.bsd2; }; } From 4439e602bbe9d6c82688abd9ea096726c8faede6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 10:09:10 +0000 Subject: [PATCH 26/45] pmix: 3.2.3 -> 3.2.4 --- pkgs/development/libraries/pmix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 7791973bb12..1f16ba86b3b 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc="; + sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; }; postPatch = '' From deaa6e44c6f5224c6870bbb3ae8a2b766def5eb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 10:59:09 +0000 Subject: [PATCH 27/45] tbls: 1.58.0 -> 1.60.0 --- pkgs/tools/misc/tbls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 737752660a9..6b41e80ae9c 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.58.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-uHTE4x8cCM2O4dtqqV7zm7Eqi8xsqqxSUbcFvV2Vgv8="; + hash = "sha256-5/YAJl01ARralsBEV6ZJqcYfMMudCmcQcdQD1jn1I+M="; }; - vendorHash = "sha256-qMkAmtt9ERYcZEdxqFAI9P99niP3l13iQ6M4cDCz5Kw="; + vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; CGO_CFLAGS = [ "-Wno-format-security" ]; From b51b67fdc5a1ef06322dd2affbcd6c2aa3f5624f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 11:11:21 +0000 Subject: [PATCH 28/45] cargo-tarpaulin: 0.23.1 -> 0.24.0 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 17e8458e7dc..559ab478d86 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-UDUbndsuXZDu7j+JhkS6kkFP6ju88+hXffy42XQY8gQ="; + sha256 = "sha256-5ZezJT1oxns6ZURj41UWLpfGs5dMUi8Vdv7OtwgVTF4="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-iLqxixUEZhz3Kv7D84RqVyvtoZx69dhdLKTnVnsO0k0="; + cargoHash = "sha256-vuwpaFUzN66jNj4lrDv2idMAm24o5ftYG40N56xeoqk="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 1bb4aa4ccc9bead8f9497ee29ad5a4fb1911e973 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 29 Jan 2023 11:19:50 +0000 Subject: [PATCH 29/45] clash: 1.12.0 -> 1.13.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index e5594d2e0c4..74156366730 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SE+nZIatvwyc6JubMb7YUlNiJv+LYtJjFMlKEoJzEn8="; + hash = "sha256-f/iSnSaRr1dqMRKb7GDZdc2WuykO42XMSNKwMOwuagc="; }; - vendorSha256 = "sha256-ikcGZ1Gfxb4zBkav8MDi3+xNbvhqHIk6NhLfI2ne3ns="; + vendorHash = "sha256-fDn6UlijI2TJPF4FS50u1MMDxnd8eDTbqHLnGso/FoU="; # Do not build testing suit excludedPackages = [ "./test" ]; From 3f8d52bf1e102a22382c4354bb49c9ee5077d682 Mon Sep 17 00:00:00 2001 From: Stefan Tatschner Date: Sun, 29 Jan 2023 12:27:35 +0100 Subject: [PATCH 30/45] oscclip: Add rumpelsepp as maintainer --- pkgs/tools/misc/oscclip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/tools/misc/oscclip/default.nix index a22490633d8..ea715fe934e 100644 --- a/pkgs/tools/misc/oscclip/default.nix +++ b/pkgs/tools/misc/oscclip/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/rumpelsepp/oscclip"; license = licenses.gpl3Only; - maintainers = [ maintainers.traxys ]; + maintainers = with maintainers; [ rumpelsepp traxys ]; }; } From 8ce04c0637695d6f9c3914a0d463963ad20dd9cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 11:36:03 +0000 Subject: [PATCH 31/45] s2n-tls: 1.3.33 -> 1.3.34 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 20ad2b81ee1..f9a12322c47 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.33"; + version = "1.3.34"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MfVRAv5Ss+QMjY3IhFJakUO05w6j5WaAM0cCdtLIgAk="; + sha256 = "sha256-CaVo2OxfB7ImMOgPuyvKQFbTeEm3PqD8CV96jUEZ8U0="; }; nativeBuildInputs = [ cmake ]; From 13352dbafcc81f3024719f66bd62c390bdb7438e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 29 Jan 2023 12:19:04 +0100 Subject: [PATCH 32/45] grafana: 9.3.1 -> 9.3.6 fixes CVE-2022-23552, CVE-2022-41912, and CVE-2022-39324 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 02f0ed567b9..71377d55b7a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.3.1"; + version = "9.3.6"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-XZsR6h7qG2EYKv0Zr/ZjDf4WqF16khqFzYIF3ekQ08c="; + sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-7LIcSPxvueQYxeofzmtvvlnSboeo+TOF6xVA+g+oHqE="; + sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM="; }; - vendorSha256 = "sha256-oV440W9r6b74JaY8Ej2OEIPpxhdUmjq77RJOoJb6Upw="; + vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4="; nativeBuildInputs = [ wire ]; From b7cf10b43316e53cd8ecb8e19df8a07d41ee805e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 13:13:19 +0000 Subject: [PATCH 33/45] mpd: 0.23.11 -> 0.23.12 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 2792cb1dcb7..d1d94b3a82c 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.11"; + version = "0.23.12"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-vgLH4kOluK9cOmTrvpBfR87Iunn0EzH9GmiUvsjsG4I="; + sha256 = "sha256-BnEtSkZjUBK0flVttOrjkT4RCQh9F7+MDZGm2+MMrX8="; }; buildInputs = [ From 3539dd698870c8054eb487bff62e4cfa8fd41bcf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jan 2023 14:58:23 +0000 Subject: [PATCH 34/45] socat: add musl test A couple of recent upgrades have broken socat on Musl, so it would be nice to catch these in advance. --- pkgs/tools/networking/socat/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index edd5b0603e6..00c0ad7bd13 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -5,6 +5,7 @@ , readline , stdenv , which +, buildPackages }: stdenv.mkDerivation rec { @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs + passthru.tests = lib.optionalAttrs stdenv.buildPlatform.isLinux { + musl = buildPackages.pkgsMusl.socat; + }; + meta = with lib; { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; From d1b0bcc047dbcd75ffd5c49a0c40e84da54a0793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Jan 2023 13:32:47 +0100 Subject: [PATCH 35/45] jetbrains.clion: correct patchelf searchpath --- pkgs/applications/editors/jetbrains/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 913ef7570ee..c04e215b990 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -62,7 +62,7 @@ let rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so From 7440f74ac7d3050acec37dcc513169ba81612054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 28 Jan 2023 18:38:05 -0600 Subject: [PATCH 36/45] =?UTF-8?q?jetbrains.jdk:=2017.0.5-b653.14=20?= =?UTF-8?q?=E2=86=92=2017.0.5-b653.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 2d42d69775e..5702ba2a2e6 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -30,7 +30,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; javaVersion = "17.0.5"; - build = "653.14"; + build = "653.25"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-7Nx7Y12oMfs4zeQMSfnUaDCW1xJYMEkcoTapSpmVCfU="; + hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; }; BOOT_JDK = openjdk17-bootstrap.home; From 40ef3bb63d4b6cf66aeb8468a0e8349cbc5aa5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 28 Jan 2023 18:38:45 -0600 Subject: [PATCH 37/45] jetbrains: update --- .../editors/jetbrains/versions.json | 192 +++++++++--------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 5d54b1150bc..b6d4e39f9fc 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,26 +3,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -35,18 +35,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -68,26 +68,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -110,26 +110,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.1", - "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.3.2", - "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3.1", - "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -142,18 +142,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.1", - "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.1", - "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -175,26 +175,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.1", - "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.1", - "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.3.1", - "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -217,26 +217,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -249,18 +249,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -282,26 +282,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", From 7aed90a969c11388268cf3fdb1042cb64de9e6fc Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Sun, 29 Jan 2023 14:27:58 +0100 Subject: [PATCH 38/45] nixos/tests/networking: fix evaluation Fixes commands such as `nix-build -A nixosTests.networking.scripted`. Currently this fails: "error: The option `nodes' is used but not defined." --- nixos/tests/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5d6f204ee83..c720c8068c8 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -952,6 +952,7 @@ let ''; } else { name = "RenameInterface"; + nodes = { }; testScript = ""; }; # even with disabled networkd, systemd.network.links should work From 9305d64c73b52676a752ae0e8c4889f87e43c15f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 13:46:28 +0000 Subject: [PATCH 39/45] libnats-c: 3.5.0 -> 3.6.0 --- pkgs/development/libraries/libnats-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 86e8932c04d..f2bc1619987 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-mdOvJkCdJ2QEsVUdxVCpIDLn4+6JM6OeJfasJxqqID8="; + sha256 = "sha256-L/RS/M0TQJEMXRvdwo03st1VAlIlJ/fCmTvx+0+gCGE="; }; nativeBuildInputs = [ cmake ]; From 17706cbaa27d75f80e49ccfbedf1fd085648e362 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 13:50:09 +0000 Subject: [PATCH 40/45] sentry-native: 0.5.3 -> 0.5.4 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index a2be472cc3a..263060f7676 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-zeJGgtqEITK1fQtqFXwh+kpaS9Ky+RSY/uxZ2as8YyM="; + hash = "sha256-qRtr+Og75eowKJjezRSGlRp9Ps2A75zY80IqZMRa4Sw="; }; nativeBuildInputs = [ From 2799ad1f1063c690801f66002c790ab146fa4c53 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 29 Jan 2023 16:50:43 +0300 Subject: [PATCH 41/45] werf: 1.2.197 -> 1.2.198 --- pkgs/applications/networking/cluster/werf/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index cad2c936a33..ae56b05bd96 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.197"; + version = "1.2.198"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cRpXdV/aHxVxMd54nmf9bMogiC9V8ryvCtSe+6Vx/Hk="; + hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; @@ -64,6 +64,10 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # Remove failing tests. + rm -rf \ + cmd/werf/docs/replacers/kubectl/kubectl_test.go '' + lib.optionalString (CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld From d768241cf38df550b1e0c2371c1e212708ae500f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 13:53:45 +0000 Subject: [PATCH 42/45] chezmoi: 2.29.3 -> 2.29.4 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 3d2214cc0bc..84ed3aaa6fe 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.29.3"; + version = "2.29.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-WrGbCyAjrwZHBMXxqrw7vC5J8b7xn7FUeoZ9IANRf0g="; + hash = "sha256-pvSKLWek/nCVjlfvYQIefvTt+VMmNYs58/4bPQQdfNU="; }; - vendorHash = "sha256-0heLEQFKxKxeNZGBd3GcTsOfhmDyxZRynVrAkF6vHvk="; + vendorHash = "sha256-hGYcfERYxSEg+j9EDDGYVar69HoApSqxWH8IWwHaOKs="; doCheck = false; From b3a8c128ce245ce1fe611ae984388adad42fad19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 14:04:27 +0000 Subject: [PATCH 43/45] minio: 2023-01-20T02-05-44Z -> 2023-01-25T00-19-54Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index f433b219f34..46167ebc9ab 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-01-20T02-05-44Z"; + version = "2023-01-25T00-19-54Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-svy+rmc7RPxKaoF8VbJUpmcYTShqhX7NpPOqzSZdrt4="; + sha256 = "sha256-1vXi9BnjTCH7B/I7tkfvm2AZtLK7a0GcMsW9gud8U/4="; }; - vendorHash = "sha256-5s70UG9N6A2PklOYpvIU4Ot2vMVCEjOtue4DBaU+ryU="; + vendorHash = "sha256-NGuslbHh0tDPQp+zvKnylLkssMglhgesLX5VT2BjDo8="; doCheck = false; From 1eae946f3733985e7779b37a40388476f2ddcf84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 14:54:32 +0000 Subject: [PATCH 44/45] python310Packages.google-cloud-automl: 2.10.0 -> 2.10.1 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 2370af8adc3..dddde1a3093 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BiXbDc1nX2y1ru8+t1rrhIzFg9wLAYMj3WJhIUb6VJ8="; + hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; }; propagatedBuildInputs = [ From 9c37eee7855b9af132ad5e7492b63b9ae250c677 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 16:07:32 +0000 Subject: [PATCH 45/45] python310Packages.funcy: 1.17 -> 1.18 --- pkgs/development/python-modules/funcy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 2a41d9955f3..5abacb6a79d 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.17"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968"; + sha256 = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; }; # No tests