From cbcdfdb576338081efff9c920428acc2b05fc5a3 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 10 Dec 2016 19:51:55 +0900 Subject: [PATCH] android-sdk: 25.2.2 -> 25.2.3 --- pkgs/development/mobile/androidenv/addon.xml | 38 +- pkgs/development/mobile/androidenv/addons.nix | 4 +- .../mobile/androidenv/androidsdk.nix | 6 +- .../mobile/androidenv/build-tools.nix | 6 +- .../mobile/androidenv/platform-tools.nix | 6 +- .../mobile/androidenv/platforms-linux.nix | 12 + .../mobile/androidenv/platforms-macosx.nix | 12 + .../mobile/androidenv/repository-11.xml | 248 ++++++++----- .../mobile/androidenv/support-repository.nix | 4 +- .../development/mobile/androidenv/sys-img.xml | 334 ++++++++++-------- .../mobile/androidenv/sysimages.nix | 101 ++++-- pkgs/top-level/all-packages.nix | 4 +- 12 files changed, 479 insertions(+), 296 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index aef61bb2fc2..538b7622df7 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1262,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + - 37 + 40 0 0 - - 281268000 - 2f862a5d66d5526cd5b7655c3e9678f493e485f7 - android_m2repository_r37.zip + + 305545706 + 782e7233f18c890463e8602571d304e680ce354c + android_m2repository_r40.zip @@ -1308,16 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& compatibility - + - 32 + 40 - - 113922721 - ae24bde9c8f732f4d13b72e70802be8c97dcfddf - google_m2repository_r32.zip + + 152633821 + 0f599f7f35fba49b9277ef9e1394c5c82d8bd369 + google_m2repository_gms_v8_rc42_wear_2a3.zip @@ -1392,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 32 + 38 - - 11820632 - bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f - google_play_services_945200_r32.zip + + 12351978 + 7a50dec81ba9c9b51d7778c19ca05002498209e8 + google_play_services_v8_rc41.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index f999f603b8f..7ddd203d4bf 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -283,8 +283,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip; - sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f"; + url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip; + sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a742386920b..52a2ab8f36a 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -11,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.2"; + version = "25.2.3"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h"; + sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl"; + sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 945cc0bedd5..c09d643146b 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "24.0.2"; + version = "25.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj"; + sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8"; + sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 517167b0d55..6205b98eee1 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "24.0.2"; + version = "25.0.1"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6"; + sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4"; + sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index e0c77ad294e..4f3f45f4cc9 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -292,4 +292,16 @@ in }; }; + platform_25 = buildPlatform { + name = "android-platform-7.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r02.zip; + sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + }; + meta = { + description = "Android SDK Platform 25"; + url = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 60fae208ae1..d8619b7c0f5 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -292,4 +292,16 @@ in }; }; + platform_25 = buildPlatform { + name = "android-platform-7.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r02.zip; + sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + }; + meta = { + description = "Android SDK Platform 25"; + url = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index a0ef9bc4485..e115f674790 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,85 +296,69 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014. - + NDK - 12 + 13 - - 734135279 - e257fe12f8947be9f79c10c3fffe87fb9406118a - android-ndk-r12b-darwin-x86_64.zip + + 665967997 + 71fe653a7bf5db08c3af154735b6ccbc12f0add5 + android-ndk-r13b-darwin-x86_64.zip macosx 64 - - 755551010 - 170a119bfa0f0ce5dc932405eaa3a7cc61b27694 - android-ndk-r12b-linux-x86_64.zip + + 687311866 + 0600157c4ddf50ec15b8a037cfc474143f718fd0 + android-ndk-r13b-linux-x86_64.zip linux 64 - - 706453972 - 8e6eef0091dac2f3c7a1ecbb7070d4fa22212c04 - android-ndk-r12b-windows-x86.zip + + 620461544 + 4eb1288b1d4134a9d6474eb247f0448808d52408 + android-ndk-r13b-windows-x86.zip windows 32 - - 749567353 - 337746d8579a1c65e8a69bf9cbdc9849bcacf7f5 - android-ndk-r12b-windows-x86_64.zip + + 681320123 + 649d306559435c244cec5881b880318bb3dee53a + android-ndk-r13b-windows-x86_64.zip windows 64 - - - NDK - 13 + + + 7.1.1 + 25 + Android SDK Platform 25 + 2 - - 665405792 - 0cbdb271b103a7e4237b34b73f0e56381e4632aa - android-ndk-r13-beta2-darwin-x86_64.zip - macosx - 64 - - - - 686843165 - ea1a76d9ebdc82fe742d32798aaee7c980afd2f6 - android-ndk-r13-beta2-linux-x86_64.zip - linux - 64 - - - - 619981813 - a5f6edceb3afa4ecd47071822ea32ba6bd6ac002 - android-ndk-r13-beta2-windows-x86.zip - windows - 32 - - - - 680836961 - a0b6a0ed271b0a99cdca28ce8fd405f89defc539 - android-ndk-r13-beta2-windows-x86_64.zip - windows - 64 + + 85434042 + 6057e54a04f1d141f36a2c8d20f2962b41a3183f + platform-25_r02.zip - - + + + 22 + + http://developer.android.com/sdk/ + + 16 + 2 + + 7.0 @@ -1147,6 +1131,102 @@ June 2014. + + + + 25 + 0 + 1 + + + + + 49880178 + ff063d252ab750d339f5947d06ff782836f22bac + build-tools_r25.0.1-linux.zip + linux + + + + 49667353 + 7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f + build-tools_r25.0.1-macosx.zip + macosx + + + + 50458759 + c6c61393565ccf46349e7f44511e5db7c1c6169d + build-tools_r25.0.1-windows.zip + windows + + + + + + + + 25 + 0 + 0 + + + + + 49872921 + f2bbda60403e75cabd0f238598c3b4dfca56ea44 + build-tools_r25-linux.zip + linux + + + + 49659466 + 273c5c29a65cbed00e44f3aa470bbd7dce556606 + build-tools_r25-macosx.zip + macosx + + + + 50451378 + f9258f2308ff8b62cfc4513d40cb961612d07b6a + build-tools_r25-windows.zip + windows + + + + + + + + 24 + 0 + 3 + + + + + 49779151 + 9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304 + build-tools_r24.0.3-linux.zip + linux + + + + 49568967 + a01c15f1b105c34595681075e1895d58b3fff48c + build-tools_r24.0.3-macosx.zip + macosx + + + + 50354788 + 8b960d693fd4163caeb8dc5f5f5f80b10987089c + build-tools_r24.0.3-windows.zip + windows + + + + @@ -1963,64 +2043,64 @@ June 2014. - + - 24 + 25 0 - 2 + 1 - - 3341647 - a268850d31973d32de5c1515853f81924a4068cf - platform-tools_r24.0.2-linux.zip + + 3916151 + 8e461a2c76717824d1d8e91af68216c9f230a373 + platform-tools_r25.0.1-linux.zip linux - - 3157182 - 16053da716cbc6ef31c32a0d2f1437b22089c88c - platform-tools_r24.0.2-macosx.zip + + 3732924 + 96abc8638bf9f65435bc0ab641cc4a3ff753eed5 + platform-tools_r25.0.1-macosx.zip macosx - - 2997417 - ce09a7351d5c50865691554ed56325f6e5cd733c - platform-tools_r24.0.2-windows.zip + + 3573485 + 75249224c12528329a151dfbc591509168ef6efd + platform-tools_r25.0.1-windows.zip windows - + 25 2 - 2 + 3 - - 273491448 - 99257925a3d8b46fee948a7520d7b7e3e3e1890e - tools_r25.2.2-linux.zip + + 277861433 + aafe7f28ac51549784efc2f3bdfc620be8a08213 + tools_r25.2.3-linux.zip linux - - 195856788 - bbaa3929696ce523ea62b58cc8032d7964a154c5 - tools_r25.2.2-macosx.zip + + 200496727 + 0e88c0bdb8f8ee85cce248580173e033a1bbc9cb + tools_r25.2.3-macosx.zip macosx - - 301642481 - ef898dff805c4b9e39f6e77fd9ec397fb1b1f809 - tools_r25.2.2-windows.zip + + 306745639 + b965decb234ed793eb9574bad8791c50ca574173 + tools_r25.2.3-windows.zip windows diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 182fdded2bd..84ebee5a75f 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "35"; + version = "40"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "2wi1b38n3dmnikpwbwcbyy2xfws1683s"; + sha1 = "782e7233f18c890463e8602571d304e680ce354c"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 237f1348232..807d4976296 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -404,6 +404,23 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. + + + 10 + ARM EABI v7a System Image + 4 + + + + 67918042 + 54680383118eb5c95a11e1cc2a14aa572c86ee69 + armv7-10_r04.zip + + + + armeabi-v7a + default + 14 @@ -422,16 +439,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 15 ARM EABI v7a System Image - 3 + 4 - - 96240395 - 0a47f586e172b1cf3db2ada857a70c2bdec24ef8 - sysimg_armv7a-15_r03.zip + + 102079727 + 363223bd62f5afc0b2bd760b54ce9d26b31eacf1 + armeabi-v7a-15_r04.zip @@ -456,16 +473,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 17 ARM EABI v7a System Image - 3 + 5 - - 118663847 - 97cfad22b51c8475e228b207dd36dbef1c18fa38 - sysimg_armv7a-17_r03.zip + + 124238679 + 7460e8110f4a87f9644f1bdb5511a66872d50fd9 + armeabi-v7a-17_r05.zip @@ -473,16 +490,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 18 ARM EABI v7a System Image - 3 + 4 - - 125503391 - 2d7d51f4d2742744766511e5d6b491bd49161c51 - sysimg_armv7a-18_r03.zip + + 130394401 + 0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642 + armeabi-v7a-18_r04.zip @@ -490,16 +507,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 19 ARM EABI v7a System Image - 3 + 5 - - 159399028 - 5daf7718e3ab03d9bd8792b492dd305f386ef12f - sysimg_armv7a-19_r03.zip + + 159871567 + d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa + armeabi-v7a-19_r05.zip @@ -507,16 +524,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 ARM EABI v7a System Image - 3 + 4 - - 186521381 - 0b2e21421d29f48211b5289ca4addfa7f4c7ae5a - sysimg_arm-21_r03.zip + + 187163871 + 8c606f81306564b65e41303d2603e4c42ded0d10 + armeabi-v7a-21_r04.zip @@ -524,16 +541,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 ARM EABI v7a System Image - 1 + 2 - - 193687339 - 2aa6a887ee75dcf3ac34627853d561997792fcb8 - sysimg_arm-22_r01.zip + + 194596267 + 2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1 + armeabi-v7a-22_r02.zip @@ -541,16 +558,17 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 ARM EABI v7a System Image - 3 + 6 - - 226879660 - 7bb8768ec4333500192fd9627d4234f505fa98dc - sysimg_arm-23_r03.zip + + 238333358 + 7cf2ad756e54a3acfd81064b63cb0cb9dff2798d + armeabi-v7a-23_r06.zip + windows @@ -643,16 +661,67 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 10 Intel x86 Atom System Image + 4 + + + + 75382637 + 655ffc5cc89dd45a3aca154b254009016e473aeb + x86-10_r04.zip + + + + x86 + default + + + + 15 + Intel x86 Atom System Image + 4 + + + + 115324561 + e45c728b64881c0e86529a8f7ea9c103a3cd14c1 + x86-15_r04.zip + + + + x86 + default + + + + 16 + Intel x86 Atom System Image + 5 + + + + 134339698 + 7ea16da3a8fdb880b1b290190fcc1bde2821c1e0 + x86-16_r05.zip + + + + x86 + default + + + + 17 + Intel x86 Atom System Image 3 - - 66997702 - 6b8539eaca9685d2d3289bf8e6d21d366d791326 - sysimg_x86-10_r03.zip + + 142951842 + eb30274460ff0d61f3ed37862b567811bebd8270 + x86-17_r03.zip @@ -660,67 +729,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - - 15 - Intel x86 Atom System Image - 2 - - - - 109019058 - 56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f - sysimg_x86-15_r02.zip - - - - x86 - default - - - - 16 - Intel x86 Atom System Image - 2 - - - - 135252264 - 36c2a2e394bcb3290583ce09815eae7711d0b2c2 - sysimg_x86-16_r02.zip - - - - x86 - default - - - - 17 - Intel x86 Atom System Image - 2 - - - - 136075512 - bd8c7c5411431af7e051cbe961be430fc31e773d - sysimg_x86-17_r02.zip - - - - x86 - default - - - + 18 Intel x86 Atom System Image - 2 + 3 - - 143899902 - ab3de121a44fca43ac3aa83f7d68cc47fc643ee8 - sysimg_x86-18_r02.zip + + 149657535 + 03a0cb23465c3de15215934a1dbc9715b56e9458 + x86-18_r03.zip @@ -728,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 19 Intel x86 Atom System Image 5 - - 183946064 - c9298a8eafceed3b8fa11071ba63a3d18e17fd8e - sysimg_x86-19_r05.zip + + 183968605 + 1d98426467580abfd03c724c5344450f5d0df379 + x86-19_r05.zip @@ -745,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 Intel x86 Atom System Image 4 - - 206323409 - 3b78ad294aa1cdefa4be663d4af6c80d920ec49e - sysimg_x86-21_r04.zip + + 206305926 + c7732f45c931c0eaa064e57e8c054bce86c30e54 + x86-21_r04.zip @@ -762,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 Intel x86 Atom System Image 5 - - 212301282 - 909e0ad91ed43381597e82f65ec93d41f049dd53 - sysimg_x86-22_r05.zip + + 212327460 + 7e2c93891ea9efec07dccccf6b9ab051a014dbdf + x86-22_r05.zip @@ -779,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 Intel x86 Atom System Image 9 - - 252059065 - 0ce9229974818179833899dce93f228a895ec6a2 - sysimg_x86-23_r09.zip + + 260241399 + d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1 + x86-23_r09.zip @@ -813,16 +831,34 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + + 25 + Google APIs Intel x86 Atom System Image + 3 + + + + 703131759 + 7dd19cfee4e43a1f60e0f5f058404d92d9544b33 + x86-25_r03.zip + + + + x86 + google_apis + Google APIs + + + 21 Intel x86 Atom_64 System Image 4 - - 290590059 - eb14ba9c14615d5e5a21c854be29aa903d9bb63d - sysimg_x86_64-21_r04.zip + + 290608820 + 9b2d64a69a72fa596c386899a742a404308f2c92 + x86_64-21_r04.zip @@ -830,16 +866,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 Intel x86 Atom_64 System Image 5 - - 297851141 - 8a04ff4fb30f70414e6ec7b3b06285f316e93d08 - sysimg_x86_64-22_r05.zip + + 297850561 + 99d1d6c77e92284b4210640edf6c81eceb28520d + x86_64-22_r05.zip @@ -847,16 +883,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 Intel x86 Atom_64 System Image 9 - - 349443901 - 571f5078a3d337a9144e2af13bd23ca46845a979 - sysimg_x86_64-23_r09.zip + + 363794271 + 84cc076eacec043c8e88382c6ab391b0cd5c0695 + x86_64-23_r09.zip @@ -880,4 +916,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86_64 default + + + 25 + Google APIs Intel x86 Atom_64 System Image + 3 + + + + 912938750 + 4593ee04811df21c339f3374fc5917843db06f8d + x86_64-25_r03.zip + + + + x86_64 + google_apis + Google APIs + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 2c8e1b33a46..89c48e5fb59 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -15,11 +15,19 @@ let in { + sysimg_armeabi-v7a_10 = buildSystemImage { + name = "sysimg-armeabi-v7a-10"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; + sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; + }; + }; + sysimg_x86_10 = buildSystemImage { name = "sysimg-x86-10"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip; - sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326"; + url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; + sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; }; }; @@ -34,8 +42,8 @@ in sysimg_armeabi-v7a_15 = buildSystemImage { name = "sysimg-armeabi-v7a-15"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip; - sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; + sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; }; }; @@ -50,8 +58,8 @@ in sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip; - sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f"; + url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; + sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; }; }; @@ -74,16 +82,16 @@ in sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip; - sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2"; + url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip; + sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0"; }; }; sysimg_armeabi-v7a_17 = buildSystemImage { name = "sysimg-armeabi-v7a-17"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip; - sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; + sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; }; }; @@ -98,112 +106,112 @@ in sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip; - sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d"; + url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip; + sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270"; }; }; sysimg_armeabi-v7a_18 = buildSystemImage { name = "sysimg-armeabi-v7a-18"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip; - sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; + sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; }; }; sysimg_x86_18 = buildSystemImage { name = "sysimg-x86-18"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip; - sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8"; + url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; + sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; }; }; sysimg_armeabi-v7a_19 = buildSystemImage { name = "sysimg-armeabi-v7a-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip; - sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; }; }; sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r05.zip; - sha1 = "c9298a8eafceed3b8fa11071ba63a3d18e17fd8e"; + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip; + sha1 = "1d98426467580abfd03c724c5344450f5d0df379"; }; }; sysimg_armeabi-v7a_21 = buildSystemImage { name = "sysimg-armeabi-v7a-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; - sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; }; }; sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r04.zip; - sha1 = "3b78ad294aa1cdefa4be663d4af6c80d920ec49e"; + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip; + sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54"; }; }; sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r04.zip; - sha1 = "eb14ba9c14615d5e5a21c854be29aa903d9bb63d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip; + sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92"; }; }; sysimg_armeabi-v7a_22 = buildSystemImage { name = "sysimg-armeabi-v7a-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; - sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; }; }; sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r05.zip; - sha1 = "909e0ad91ed43381597e82f65ec93d41f049dd53"; + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip; + sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf"; }; }; sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r05.zip; - sha1 = "8a04ff4fb30f70414e6ec7b3b06285f316e93d08"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip; + sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d"; }; }; sysimg_armeabi-v7a_23 = buildSystemImage { name = "sysimg-armeabi-v7a-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip; - sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; }; }; sysimg_x86_23 = buildSystemImage { name = "sysimg-x86-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r09.zip; - sha1 = "0ce9229974818179833899dce93f228a895ec6a2"; + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip; + sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1"; }; }; sysimg_x86_64_23 = buildSystemImage { name = "sysimg-x86_64-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r09.zip; - sha1 = "571f5078a3d337a9144e2af13bd23ca46845a979"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip; + sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695"; }; }; @@ -238,4 +246,21 @@ in sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; }; }; + + sysimg_x86_25 = buildSystemImage { + name = "sysimg-x86-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip; + sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33"; + }; + }; + + sysimg_x86_64_25 = buildSystemImage { + name = "sysimg-x86_64-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip; + sha1 = "4593ee04811df21c339f3374fc5917843db06f8d"; + }; + }; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3804014a1df..a5a4309ce77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -551,9 +551,9 @@ in inherit (androidenv) androidsdk_4_4 androidndk; - androidsdk = androidenv.androidsdk_6_0; + androidsdk = androidenv.androidsdk_7_0; - androidsdk_extras = self.androidenv.androidsdk_6_0_extras; + androidsdk_extras = self.androidenv.androidsdk_7_0_extras; arc-theme = callPackage ../misc/themes/arc { };