alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #16324 from taku0/android_sdk_24.4.1

Browse source 
android-platform-tools: 23.0.1 -> 24, etc.
This commit is contained in:
Sander van der Burg 2016-07-21 22:27:26 +02:00 committed by GitHub
parent 8f4dcd19f6 c643c86035
commit 659a3bc89b
16 changed files with 3816 additions and 3508 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2139
pkgs/development/mobile/androidenv/addon.xml
View file

File diff suppressed because it is too large Load diff

32
pkgs/development/mobile/androidenv/addons.nix
View file

@ -35,7 +35,7 @@ in
sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
};
meta = {
description = "Android + Google APIs, revision 2";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -47,7 +47,7 @@ in
sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
};
meta = {
description = "Android + Google APIs, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -59,7 +59,7 @@ in
sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
};
meta = {
description = "Android + Google APIs, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -71,7 +71,7 @@ in
sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
};
meta = {
description = "Android + Google APIs, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -83,7 +83,7 @@ in
sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
};
meta = {
description = "Android + Google APIs, API 8, revision 2";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -95,7 +95,7 @@ in
sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
};
meta = {
description = "Android + Google APIs, API 9, revision 2";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -107,7 +107,7 @@ in
sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
};
meta = {
description = "Android + Google APIs, API 10, revision 2";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -119,7 +119,7 @@ in
sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
};
meta = {
description = "Android + Google APIs, API 11, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -131,7 +131,7 @@ in
sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
};
meta = {
description = "Android + Google APIs, API 12, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -143,7 +143,7 @@ in
sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
};
meta = {
description = "Android + Google APIs, API 13, revision 1";
description = "Android + Google APIs";
url = http://developer.android.com/;
};
};
@ -211,8 +211,8 @@ in
google_apis_19 = buildGoogleApis {
name = "google_apis-19";
src = fetchurl {
url = https://dl.google.com/android/repository/google_apis-19_r16.zip;
sha1 = "d92f2a2fe219e578633c6445397e1f675edc6a28";
url = https://dl.google.com/android/repository/google_apis-19_r20.zip;
sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
};
meta = {
description = "Android + Google APIs";
@ -259,8 +259,8 @@ in
android_support_extra = buildGoogleApis {
name = "android_support_extra";
src = fetchurl {
url = https://dl.google.com/android/repository/support_r23.1.zip;
sha1 = "c43a56fcd1c2aa620f6178a0ef529623ed77b3c7";
url = https://dl.google.com/android/repository/support_r23.2.1.zip;
sha1 = "41121bbc412c2fce0be170d589d20cfa3e78e857";
};
meta = {
description = "Android Support Library";
@ -271,8 +271,8 @@ in
google_play_services = buildGoogleApis {
name = "google_play_services";
src = fetchurl {
url = https://dl.google.com/android/repository/google_play_services_8115000_r27.zip;
sha1 = "cdb13f826ca82d3c3730cf1df9f3bf58565fd4bb";
url = https://dl.google.com/android/repository/google_play_services_9256000_r31.zip;
sha1 = "3f1b502d0f6361c036cb332b8c15249a1168e08b";
};
meta = {
description = "Google Play services client library and sample code";

8
pkgs/development/mobile/androidenv/androidsdk.nix
View file

@ -11,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; };
stdenv.mkDerivation rec {
name = "android-sdk-${version}";
version = "24.4";
version = "24.4.1";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
sha1 = "eec87cdb9778718e4073b4ca326a46cdd084f901";
sha1 = "dlr6346lpmxdb8pmryn4xl7py1hb6nvj";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
sha1 = "a9b6f025a9691aef430b19b52e01844dbbcbf6b4";
sha1 = "rm03hm87f7qcadb3c4gnz7hz1g5wrac5";
}
else throw "platform not ${stdenv.system} supported!";
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
do
wrapProgram `pwd`/$i \
--prefix PATH : ${file}/bin \
--suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11 libxcb libXau libXdmcp libXext mesa alsaLib]}
--suffix LD_LIBRARY_PATH : `pwd`/lib64:${makeLibraryPath [ libX11 libxcb libXau libXdmcp libXext mesa alsaLib ]}
done
''}
''}

12
pkgs/development/mobile/androidenv/build-tools.nix
View file

@ -33,35 +33,35 @@ stdenv.mkDerivation rec {
# These binaries need to find libstdc++ and libgcc_s
for i in aidl lib/libLLVM.so
do
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i
done
# These binaries need to find libstdc++, libgcc_s and libraries in the current folder
for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so aidl
do
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:`pwd`/lib $i
done
# Create link to make libtinfo.so.5 work
ln -s ${ncurses_32bit}/lib/libncurses.so.5 `pwd`/lib/libtinfo.so.5
ln -s ${ncurses_32bit.out}/lib/libncurses.so.5 `pwd`/lib/libtinfo.so.5
# These binaries need to find libstdc++, libgcc_s, ncurses, and libraries in the current folder
for i in bcc_compat llvm-rs-cc
do
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${ncurses_32bit}/lib:`pwd`/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${ncurses_32bit.out}/lib:`pwd`/lib $i
done
# These binaries also need zlib in addition to libstdc++
for i in arm-linux-androideabi-ld i686-linux-android-ld mipsel-linux-android-ld split-select aapt zipalign
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
done
# These binaries need to find libstdc++, libgcc_s, and zlib
for i in aapt dexdump
do
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
done
''}

18
pkgs/development/mobile/androidenv/default.nix
View file

@ -2,9 +2,7 @@
rec {
platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip;
stdenv_32bit = pkgs_i686.stdenv;
zlib_32bit = pkgs_i686.zlib;
inherit (pkgs) stdenv fetchurl unzip zlib;
};
buildTools = import ./build-tools.nix {
@ -172,6 +170,20 @@ rec {
useGooglePlayServices = true;
};
androidsdk_7_0 = androidsdk {
platformVersions = [ "24" ];
abiVersions = [ "x86" "x86_64"];
useGoogleAPIs = true;
};
androidsdk_7_0_extras = androidsdk {
platformVersions = [ "24" ];
abiVersions = [ "x86" "x86_64"];
useGoogleAPIs = true;
useExtraSupportLibs = true;
useGooglePlayServices = true;
};
androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;

2
pkgs/development/mobile/androidenv/generate-addons.xsl
View file

@ -21,7 +21,7 @@ let
});
in
{
<xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']">
<xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:revision" data-type="number"/>
google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis {
name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />";
src = fetchurl {

2
pkgs/development/mobile/androidenv/generate-platforms.xsl
View file

@ -36,7 +36,7 @@ let
});
in
{
<xsl:for-each select="sdk:platform">
<xsl:for-each select="sdk:platform"><xsl:sort select="sdk:api-level" data-type="number"/>
platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform {
name = "android-platform-<xsl:value-of select="sdk:version" />";
src = fetchurl {

2
pkgs/development/mobile/androidenv/generate-sysimages.xsl
View file

@ -7,7 +7,7 @@
<xsl:output omit-xml-declaration="yes" indent="no" />
<xsl:template match="/sdk:sdk-sys-img">
<xsl:for-each select="sdk:system-image">
<xsl:for-each select="sdk:system-image"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:abi"/>
sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
name = "sysimg-<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
src = fetchurl {

16
pkgs/development/mobile/androidenv/platform-tools.nix
View file

@ -1,16 +1,16 @@
{stdenv, stdenv_32bit, zlib_32bit, fetchurl, unzip}:
{stdenv, zlib, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "23.0.1";
version = "24";
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";
sha1 = "94dcc5072b3d0d74cc69e4101958b6c2e227e738";
sha1 = "qabpsfhm7shvyjy6amdl7b3d41n64zsr";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
sha1 = "c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f";
sha1 = "5s808wby36xxkfmrj4va9dnc0rwsz2gh";
}
else throw "System ${stdenv.system} not supported!";
@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
''
for i in adb dmtracedump fastboot hprof-conv sqlite3
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $i
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i
done
for i in etc1tool
do
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:${zlib.out}/lib:`pwd`/lib64 $i
done
''}

112
pkgs/development/mobile/androidenv/platforms-linux.nix
View file

@ -19,71 +19,71 @@ in
platform_2 = buildPlatform {
name = "android-platform-1.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip;
url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip;
sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
};
meta = {
description = "Android SDK Platform 1.1_r1";
url = http://developer.android.com/sdk/android-1.1.html;
description = "Android SDK Platform 2";
url = http://developer.android.com/sdk/;
};
};
platform_3 = buildPlatform {
name = "android-platform-1.5";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip;
url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip;
sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
};
meta = {
description = "Android SDK Platform 1.5_r3";
url = http://developer.android.com/sdk/android-1.5.html;
description = "Android SDK Platform 3";
url = http://developer.android.com/sdk/;
};
};
platform_4 = buildPlatform {
name = "android-platform-1.6";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip;
url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip;
sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
};
meta = {
description = "Android SDK Platform 1.6_r2";
url = http://developer.android.com/sdk/android-1.6.html;
description = "Android SDK Platform 4";
url = http://developer.android.com/sdk/;
};
};
platform_5 = buildPlatform {
name = "android-platform-2.0";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip;
url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip;
sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
};
meta = {
description = "Android SDK Platform 2.0, revision 1";
url = http://developer.android.com/sdk/android-2.0.html;
description = "Android SDK Platform 5";
url = http://developer.android.com/sdk/;
};
};
platform_6 = buildPlatform {
name = "android-platform-2.0.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip;
url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip;
sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
};
meta = {
description = "Android SDK Platform 2.0.1_r1";
url = http://developer.android.com/sdk/android-2.0.1.html;
description = "Android SDK Platform 6";
url = http://developer.android.com/sdk/;
};
};
platform_7 = buildPlatform {
name = "android-platform-2.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip;
url = https://dl.google.com/android/repository/android-2.1_r03.zip;
sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
};
meta = {
description = "Android SDK Platform 2.1_r3";
description = "Android SDK Platform 7";
url = http://developer.android.com/sdk/;
};
};
@ -91,11 +91,11 @@ in
platform_8 = buildPlatform {
name = "android-platform-2.2";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip;
url = https://dl.google.com/android/repository/android-2.2_r03.zip;
sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
};
meta = {
description = "Android SDK Platform 2.2_r3";
description = "Android SDK Platform 8";
url = http://developer.android.com/sdk/;
};
};
@ -103,11 +103,11 @@ in
platform_9 = buildPlatform {
name = "android-platform-2.3.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip;
url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
};
meta = {
description = "Android SDK Platform 2.3.1_r2";
description = "Android SDK Platform 9";
url = http://developer.android.com/sdk/;
};
};
@ -115,11 +115,11 @@ in
platform_10 = buildPlatform {
name = "android-platform-2.3.3";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip;
url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
};
meta = {
description = "Android SDK Platform 2.3.3._r2";
description = "Android SDK Platform 10";
url = http://developer.android.com/sdk/;
};
};
@ -127,11 +127,11 @@ in
platform_11 = buildPlatform {
name = "android-platform-3.0";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip;
url = https://dl.google.com/android/repository/android-3.0_r02.zip;
sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
};
meta = {
description = "Android SDK Platform 3.0, revision 2";
description = "Android SDK Platform 11";
url = http://developer.android.com/sdk/;
};
};
@ -139,11 +139,11 @@ in
platform_12 = buildPlatform {
name = "android-platform-3.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip;
url = https://dl.google.com/android/repository/android-3.1_r03.zip;
sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
};
meta = {
description = "Android SDK Platform 3.1, revision 3";
description = "Android SDK Platform 12";
url = http://developer.android.com/sdk/;
};
};
@ -151,11 +151,11 @@ in
platform_13 = buildPlatform {
name = "android-platform-3.2";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip;
url = https://dl.google.com/android/repository/android-3.2_r01.zip;
sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
};
meta = {
description = "Android SDK Platform 3.2, revision 1";
description = "Android SDK Platform 13";
url = http://developer.android.com/sdk/;
};
};
@ -167,8 +167,8 @@ in
sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
};
meta = {
description = "Android SDK Platform 4.0";
description = "Android SDK Platform 14";
url = http://developer.android.com/sdk/;
};
};
@ -179,8 +179,8 @@ in
sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
};
meta = {
description = "Android SDK Platform 4.0.3";
description = "Android SDK Platform 15";
url = http://developer.android.com/sdk/;
};
};
@ -191,8 +191,8 @@ in
sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
};
meta = {
description = "Android SDK Platform 4.1.2";
description = "Android SDK Platform 16";
url = http://developer.android.com/sdk/;
};
};
@ -203,8 +203,8 @@ in
sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
};
meta = {
description = "Android SDK Platform 4.2.2";
description = "Android SDK Platform 17";
url = http://developer.android.com/sdk/;
};
};
@ -215,8 +215,8 @@ in
sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
};
meta = {
description = "Android SDK Platform 4.3.1";
description = "Android SDK Platform 18";
url = http://developer.android.com/sdk/;
};
};
@ -227,8 +227,8 @@ in
sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
};
meta = {
description = "Android SDK Platform 4.4.2";
description = "Android SDK Platform 19";
url = http://developer.android.com/sdk/;
};
};
@ -239,8 +239,8 @@ in
sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
};
meta = {
description = "Android SDK Platform 4.4W.2";
description = "Android SDK Platform 20";
url = http://developer.android.com/sdk/;
};
};
@ -251,8 +251,8 @@ in
sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
};
meta = {
description = "Android SDK Platform 5.0.1";
description = "Android SDK Platform 21";
url = http://developer.android.com/sdk/;
};
};
@ -263,20 +263,32 @@ in
sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
};
meta = {
description = "Android SDK Platform 5.1.1";
description = "Android SDK Platform 22";
url = http://developer.android.com/sdk/;
};
};
platform_23 = buildPlatform {
name = "android-platform-6.0";
src = fetchurl {
url = https://dl.google.com/android/repository/android-23_r01.zip;
sha1 = "cbccca8d3127e894845556ce999b28281de541bd";
url = https://dl.google.com/android/repository/platform-23_r03.zip;
sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
};
meta = {
description = "Android SDK Platform 6.0";
description = "Android SDK Platform 23";
url = http://developer.android.com/sdk/;
};
};
platform_24 = buildPlatform {
name = "android-platform-7.0";
src = fetchurl {
url = https://dl.google.com/android/repository/platform-24_r01.zip;
sha1 = "27516dab4848f55896e16f7089038c62bbbffea7";
};
meta = {
description = "Android SDK Platform 24";
url = http://developer.android.com/sdk/;
};
};

112
pkgs/development/mobile/androidenv/platforms-macosx.nix
View file

@ -19,71 +19,71 @@ in
platform_2 = buildPlatform {
name = "android-platform-1.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip;
url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip;
sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
};
meta = {
description = "Android SDK Platform 1.1_r1";
url = http://developer.android.com/sdk/android-1.1.html;
description = "Android SDK Platform 2";
url = http://developer.android.com/sdk/;
};
};
platform_3 = buildPlatform {
name = "android-platform-1.5";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip;
url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip;
sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
};
meta = {
description = "Android SDK Platform 1.5_r3";
url = http://developer.android.com/sdk/android-1.5.html;
description = "Android SDK Platform 3";
url = http://developer.android.com/sdk/;
};
};
platform_4 = buildPlatform {
name = "android-platform-1.6";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip;
url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip;
sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
};
meta = {
description = "Android SDK Platform 1.6_r2";
url = http://developer.android.com/sdk/android-1.6.html;
description = "Android SDK Platform 4";
url = http://developer.android.com/sdk/;
};
};
platform_5 = buildPlatform {
name = "android-platform-2.0";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip;
url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip;
sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
};
meta = {
description = "Android SDK Platform 2.0, revision 1";
url = http://developer.android.com/sdk/android-2.0.html;
description = "Android SDK Platform 5";
url = http://developer.android.com/sdk/;
};
};
platform_6 = buildPlatform {
name = "android-platform-2.0.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
};
meta = {
description = "Android SDK Platform 2.0.1_r1";
url = http://developer.android.com/sdk/android-2.0.1.html;
description = "Android SDK Platform 6";
url = http://developer.android.com/sdk/;
};
};
platform_7 = buildPlatform {
name = "android-platform-2.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip;
url = https://dl.google.com/android/repository/android-2.1_r03.zip;
sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
};
meta = {
description = "Android SDK Platform 2.1_r3";
description = "Android SDK Platform 7";
url = http://developer.android.com/sdk/;
};
};
@ -91,11 +91,11 @@ in
platform_8 = buildPlatform {
name = "android-platform-2.2";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip;
url = https://dl.google.com/android/repository/android-2.2_r03.zip;
sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
};
meta = {
description = "Android SDK Platform 2.2_r3";
description = "Android SDK Platform 8";
url = http://developer.android.com/sdk/;
};
};
@ -103,11 +103,11 @@ in
platform_9 = buildPlatform {
name = "android-platform-2.3.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip;
url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
};
meta = {
description = "Android SDK Platform 2.3.1_r2";
description = "Android SDK Platform 9";
url = http://developer.android.com/sdk/;
};
};
@ -115,11 +115,11 @@ in
platform_10 = buildPlatform {
name = "android-platform-2.3.3";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip;
url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
};
meta = {
description = "Android SDK Platform 2.3.3._r2";
description = "Android SDK Platform 10";
url = http://developer.android.com/sdk/;
};
};
@ -127,11 +127,11 @@ in
platform_11 = buildPlatform {
name = "android-platform-3.0";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip;
url = https://dl.google.com/android/repository/android-3.0_r02.zip;
sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
};
meta = {
description = "Android SDK Platform 3.0, revision 2";
description = "Android SDK Platform 11";
url = http://developer.android.com/sdk/;
};
};
@ -139,11 +139,11 @@ in
platform_12 = buildPlatform {
name = "android-platform-3.1";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip;
url = https://dl.google.com/android/repository/android-3.1_r03.zip;
sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
};
meta = {
description = "Android SDK Platform 3.1, revision 3";
description = "Android SDK Platform 12";
url = http://developer.android.com/sdk/;
};
};
@ -151,11 +151,11 @@ in
platform_13 = buildPlatform {
name = "android-platform-3.2";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip;
url = https://dl.google.com/android/repository/android-3.2_r01.zip;
sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
};
meta = {
description = "Android SDK Platform 3.2, revision 1";
description = "Android SDK Platform 13";
url = http://developer.android.com/sdk/;
};
};
@ -167,8 +167,8 @@ in
sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
};
meta = {
description = "Android SDK Platform 4.0";
description = "Android SDK Platform 14";
url = http://developer.android.com/sdk/;
};
};
@ -179,8 +179,8 @@ in
sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
};
meta = {
description = "Android SDK Platform 4.0.3";
description = "Android SDK Platform 15";
url = http://developer.android.com/sdk/;
};
};
@ -191,8 +191,8 @@ in
sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
};
meta = {
description = "Android SDK Platform 4.1.2";
description = "Android SDK Platform 16";
url = http://developer.android.com/sdk/;
};
};
@ -203,8 +203,8 @@ in
sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
};
meta = {
description = "Android SDK Platform 4.2.2";
description = "Android SDK Platform 17";
url = http://developer.android.com/sdk/;
};
};
@ -215,8 +215,8 @@ in
sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
};
meta = {
description = "Android SDK Platform 4.3.1";
description = "Android SDK Platform 18";
url = http://developer.android.com/sdk/;
};
};
@ -227,8 +227,8 @@ in
sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
};
meta = {
description = "Android SDK Platform 4.4.2";
description = "Android SDK Platform 19";
url = http://developer.android.com/sdk/;
};
};
@ -239,8 +239,8 @@ in
sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
};
meta = {
description = "Android SDK Platform 4.4W.2";
description = "Android SDK Platform 20";
url = http://developer.android.com/sdk/;
};
};
@ -251,8 +251,8 @@ in
sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
};
meta = {
description = "Android SDK Platform 5.0.1";
description = "Android SDK Platform 21";
url = http://developer.android.com/sdk/;
};
};
@ -263,20 +263,32 @@ in
sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
};
meta = {
description = "Android SDK Platform 5.1.1";
description = "Android SDK Platform 22";
url = http://developer.android.com/sdk/;
};
};
platform_23 = buildPlatform {
name = "android-platform-6.0";
src = fetchurl {
url = https://dl.google.com/android/repository/android-23_r01.zip;
sha1 = "cbccca8d3127e894845556ce999b28281de541bd";
url = https://dl.google.com/android/repository/platform-23_r03.zip;
sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
};
meta = {
description = "Android SDK Platform 6.0";
description = "Android SDK Platform 23";
url = http://developer.android.com/sdk/;
};
};
platform_24 = buildPlatform {
name = "android-platform-7.0";
src = fetchurl {
url = https://dl.google.com/android/repository/platform-24_r01.zip;
sha1 = "27516dab4848f55896e16f7089038c62bbbffea7";
};
meta = {
description = "Android SDK Platform 24";
url = http://developer.android.com/sdk/;
};
};

3571
pkgs/development/mobile/androidenv/repository-11.xml
View file

File diff suppressed because it is too large Load diff

4
pkgs/development/mobile/androidenv/support-repository.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "24";
version = "33";
name = "android-support-repository-r${version}";
src = fetchurl {
url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
sha1 = "5b6d328a572172ec51dc25c3514392760e49bb81";
sha1 = "pdg5s78wypnc27fs5n62c8rrjl8gwyv4";
};
buildCommand = ''

4
pkgs/development/mobile/androidenv/support.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "23.1";
version = "23.2.1";
name = "android-support-r${version}";
src = fetchurl {
url = "https://dl.google.com/android/repository/support_r${version}.zip";
sha1 = "c43a56fcd1c2aa620f6178a0ef529623ed77b3c7";
sha1 = "azl7hgps1k98kmbhw45wwbrc86y1n4j1";
};
buildCommand = ''

1010
pkgs/development/mobile/androidenv/sys-img.xml
View file

File diff suppressed because it is too large Load diff

280
pkgs/development/mobile/androidenv/sysimages.nix
View file

@ -15,6 +15,14 @@ let
in
{
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";
};
};
sysimg_armeabi-v7a_14 = buildSystemImage {
name = "sysimg-armeabi-v7a-14";
src = fetchurl {
@ -31,59 +39,11 @@ in
};
};
sysimg_armeabi-v7a_16 = buildSystemImage {
name = "sysimg-armeabi-v7a-16";
sysimg_mips_15 = buildSystemImage {
name = "sysimg-mips-15";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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/sysimg_mips-15_r01.zip;
sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
};
};
@ -95,75 +55,11 @@ in
};
};
sysimg_x86_16 = buildSystemImage {
name = "sysimg-x86-16";
sysimg_armeabi-v7a_16 = buildSystemImage {
name = "sysimg-armeabi-v7a-16";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip;
sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2";
};
};
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";
};
};
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";
};
};
sysimg_x86_19 = buildSystemImage {
name = "sysimg-x86-19";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r03.zip;
sha1 = "3782f3ebac5e54b3de454570add401989515ffca";
};
};
sysimg_x86_21 = buildSystemImage {
name = "sysimg-x86-21";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f";
};
};
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_r03.zip;
sha1 = "2f205b728695d84488156f4846beb83a353ea64b";
};
};
sysimg_x86_22 = buildSystemImage {
name = "sysimg-x86-22";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip;
sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15";
};
};
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_r01.zip;
sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae";
};
};
sysimg_mips_15 = buildSystemImage {
name = "sysimg-mips-15";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
};
};
@ -175,6 +71,22 @@ 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";
};
};
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";
};
};
sysimg_mips_17 = buildSystemImage {
name = "sysimg-mips-17";
src = fetchurl {
@ -183,19 +95,91 @@ in
};
};
sysimg_x86_23 = buildSystemImage {
name = "sysimg-x86-23";
sysimg_x86_17 = buildSystemImage {
name = "sysimg-x86-17";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r03.zip;
sha1 = "3cb2e8efb575c35a558b091eac7e1bc5843f5f12";
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip;
sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d";
};
};
sysimg_x86_64_23 = buildSystemImage {
name = "sysimg-x86_64-23";
sysimg_armeabi-v7a_18 = buildSystemImage {
name = "sysimg-armeabi-v7a-18";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r03.zip;
sha1 = "226510856431bc4a73690540a8d7cbad974bedd3";
url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip;
sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
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";
};
};
@ -206,4 +190,44 @@ in
sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc";
};
};
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";
};
};
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";
};
};
sysimg_armeabi-v7a_24 = buildSystemImage {
name = "sysimg-armeabi-v7a-24";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_armeabi-v7a-24_r05.zip;
sha1 = "2eb8fb86f7312614a2a0b033d669d67206a618ff";
};
};
sysimg_x86_24 = buildSystemImage {
name = "sysimg-x86-24";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-24_r05.zip;
sha1 = "ce6441c4cadaecd28b364c59b36c31ef0904dae0";
};
};
sysimg_x86_64_24 = buildSystemImage {
name = "sysimg-x86_64-24";
src = fetchurl {
url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-24_r05.zip;
sha1 = "e1869b32b1dcb2f4d4d18c912166b3e2bee8a841";
};
};
}