diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 274ae734b6e..334626b93ac 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -440,6 +440,7 @@ August 15, 2011 Android + Google APIs http://developer.android.com/ + 34908058 @@ -467,6 +468,7 @@ August 15, 2011 Android + Google APIs, revision 2 http://developer.android.com/ + 42435735 @@ -550,6 +552,7 @@ August 15, 2011 Android + Google APIs, revision 1 http://developer.android.com/ + 53691339 @@ -659,6 +662,7 @@ August 15, 2011 Android + Google APIs, API 11, revision 1 http://developer.android.com/ + 83477179 @@ -686,6 +690,7 @@ August 15, 2011 Android + Google APIs, API 12, revision 1 http://developer.android.com/ + 86099835 @@ -713,6 +718,7 @@ August 15, 2011 Android + Google APIs, API 13, revision 1 http://developer.android.com/ + 88615525 @@ -738,6 +744,7 @@ August 15, 2011 14 2 + com.google.android.maps @@ -876,14 +883,14 @@ August 15, 2011 - + google Google Inc. google_apis Google APIs (ARM System Image) Android + Google APIs 19 - 7 + 13 com.google.android.maps @@ -897,9 +904,49 @@ August 15, 2011 - 160661775 - 150f5a3fec4f03313ca770b90126605619bd713c - google_apis-19_r07.zip + 181034400 + 75c8af27f1fdf83dc28057537b5bd62b794365cc + google_apis-19_r13.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 21 + 1 + + + + 179499 + 66a754efb24e9bb07cc51648426443c7586c9d4a + google_apis-21_r01.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 22 + 1 + + + + 179259 + 5def0f42160cba8acff51b9c0c7e8be313de84f5 + google_apis-22_r01.zip @@ -917,6 +964,7 @@ August 15, 2011 Android + Google TV, API 12, preview release http://developer.android.com/ + 78266751 @@ -938,6 +986,7 @@ August 15, 2011 Android + Google TV, API 13 http://developer.android.com/ + 87721879 @@ -951,11 +1000,11 @@ August 15, 2011 - + - 20 - 0 - 0 + 22 + 1 + 1 Android android @@ -964,18 +1013,18 @@ August 15, 2011 compatibility - 5508097 - 719c260dc3eb950712988f987daaf91afa9e36af - support_r20.zip + 8475991 + 88bdc7b4074065ed28681f39e6b32c4f7ab45d94 + support_r22.1.1.zip - + - 6 + 14 Android android @@ -984,12 +1033,12 @@ August 15, 2011 m2repository - 22271942 - d4874fd330f41a7c16de392ce917c2a3562dd620 - android_m2repository_r06.zip + 68533453 + 0011dfe1473ccdfb1a533a19cad152c59dcd6b45 + android_m2repository_r14.zip - + @@ -1000,15 +1049,15 @@ August 15, 2011 Google Repository m2repository - 11 + 17 Local Maven repository for Google Libraries - 18832133 - 08b5114037d187cf3d4b44a25570149ef4f8ab3d - google_m2repository_r11.zip + 43508126 + a91a809149b69fab1efb4652c21b439e8b9e7150 + google_m2repository_r17.zip @@ -1066,6 +1115,7 @@ August 15, 2011 Google Play services client library and sample code https://developers.google.com/android/google-play-services/index + 5265389 @@ -1081,57 +1131,37 @@ August 15, 2011 Google Play services google_play_services - 19 + 24 Google Play services client library and sample code https://developers.google.com/android/google-play-services/index - 13982276 - 847a8806dd3c43effc2afdd7b49fc6ba27f72d5d - google_play_services_5089000_r19.zip + 17636517 + 9dc5092c1043d6d9c162d481e668b95fc2f36782 + google_play_services_7327000_r24.zip - google - Google Inc. - Google Play services for Fit Preview - google_play_services_fit_preview - - 1 - - Google Play services client library and sample code - https://developers.google.com/android/google-play-services/index - - - - 15224769 - 34369ca796268ec7274bc49d659d9e8f042b55ae - google_play_services_fit_preview_5208000_r01.zip - - - - - - + google http://developer.android.com/ usb_driver - USB Driver for Windows, revision 10 + USB Driver for Windows, revision 11 Google USB Driver Google Inc. - 10 + 11 - usb_driver_r10-windows.zip - a5f8280829f07bb3144a8d657ec7aa0128443a2c - 8682752 + usb_driver_r11-windows.zip + dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc + 8682859 windows @@ -1240,4 +1270,24 @@ August 15, 2011 + + + google + Google Inc. + Android Auto API Simulators + simulators + + 1 + + Android Auto API testing simulators + http://developer.android.com/auto + + + 2167286 + 4fb5344e34e8faab4db18af07dace44c50db26a7 + simulator_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 241aaeb0e81..ca4870cf4c8 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-addons.sh. DO NOT EDIT. +# Execute generate-addons.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -13,7 +15,7 @@ let }); in { - + google_apis_3 = buildGoogleApis { name = "google_apis-3"; src = fetchurl { @@ -25,7 +27,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_4 = buildGoogleApis { name = "google_apis-4"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_5 = buildGoogleApis { name = "google_apis-5"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_6 = buildGoogleApis { name = "google_apis-6"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_7 = buildGoogleApis { name = "google_apis-7"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_8 = buildGoogleApis { name = "google_apis-8"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_9 = buildGoogleApis { name = "google_apis-9"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_10 = buildGoogleApis { name = "google_apis-10"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_11 = buildGoogleApis { name = "google_apis-11"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_12 = buildGoogleApis { name = "google_apis-12"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_13 = buildGoogleApis { name = "google_apis-13"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_14 = buildGoogleApis { name = "google_apis-14"; src = fetchurl { @@ -154,10 +156,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_15 = buildGoogleApis { name = "google_apis-15"; src = fetchurl { @@ -166,10 +168,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_16 = buildGoogleApis { name = "google_apis-16"; src = fetchurl { @@ -178,10 +180,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { @@ -190,10 +192,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_18 = buildGoogleApis { name = "google_apis-18"; src = fetchurl { @@ -202,38 +204,63 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_19 = buildGoogleApis { name = "google_apis-19"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-19_r07.zip; - sha1 = "150f5a3fec4f03313ca770b90126605619bd713c"; + url = https://dl-ssl.google.com/android/repository/google_apis-19_r13.zip; + sha1 = "75c8af27f1fdf83dc28057537b5bd62b794365cc"; }; meta = { description = "Android + Google APIs"; - + }; }; - + + google_apis_21 = buildGoogleApis { + name = "google_apis-21"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-21_r01.zip; + sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_22 = buildGoogleApis { + name = "google_apis-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-22_r01.zip; + sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r20.zip; - sha1 = "719c260dc3eb950712988f987daaf91afa9e36af"; + url = https://dl-ssl.google.com/android/repository/support_r22.1.1.zip; + sha1 = "88bdc7b4074065ed28681f39e6b32c4f7ab45d94"; }; meta = { description = "Android Support Library"; url = http://developer.android.com/; }; }; + google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_play_services_3265130_r12.zip; - sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; + url = https://dl-ssl.google.com/android/repository/google_play_services_7327000_r24.zip; + sha1 = "9dc5092c1043d6d9c162d481e668b95fc2f36782"; }; meta = { description = "Google Play services client library and sample code"; @@ -241,6 +268,4 @@ in }; }; - } - diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index f4c3448c921..ed7bd051a7a 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.0.1"; + version = "24.1.2"; 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 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523"; + sha1 = "a46298bjpgzsnchhpcm1i86c4r50x638"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54"; + sha1 = "as109624lgrn8krylmyvm33yapqkzr00"; } 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 158d886a5e7..3a7df3ce1af 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: -stdenv.mkDerivation { - name = "android-build-tools-r21.1.2"; +stdenv.mkDerivation rec { + version="22.0.1"; + name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip; - sha1 = "5e35259843bf2926113a38368b08458735479658"; + url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-linux.zip"; + sha1 = "8sb05s9f1h03qa7hdj72jffy7rf9r2ys"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; - sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; + url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-macosx.zip"; + sha1 = "pxdwrz6bb8b13fknf6qm67g013vdgnjk"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index e99ab93b7ae..5df4213d233 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -142,6 +142,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_5_1_1 = androidsdk { + platformVersions = [ "22" ]; + abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_5_1_1_extras = androidsdk { + platformVersions = [ "22" ]; + abiVersions = [ "armeabi-v7a" "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; diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl index 51d0c07c934..a43731fdd08 100644 --- a/pkgs/development/mobile/androidenv/generate-addons.xsl +++ b/pkgs/development/mobile/androidenv/generate-addons.xsl @@ -5,6 +5,8 @@ +# This file is generated from generate-addons.sh. DO NOT EDIT. +# Execute generate-addons.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -19,7 +21,7 @@ let }); in { - + google_apis_ = buildGoogleApis { name = "-"; src = fetchurl { @@ -28,11 +30,37 @@ in }; meta = { description = ""; - url = ; + url = ; }; }; - + + + + android_support_extra = buildGoogleApis { + name = "android_support_extra"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = "Android Support Library"; + url = http://developer.android.com/; + }; + }; + + google_play_services = buildGoogleApis { + name = "google_play_services"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = "Google Play services client library and sample code"; + url = http://developer.android.com/; + }; + }; + } - + diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index ba556f2baac..7851f4899bf 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -5,7 +5,23 @@ + + + + + + + + + https://dl-ssl.google.com/android/repository/ + + + + + +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -20,19 +36,19 @@ let }); in { - + platform_ = buildPlatform { name = "android-platform-"; src = fetchurl { - url = ; + url = ; sha1 = ""; }; meta = { description = ""; - url = ; + url = ; }; }; - + } - + diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index ef2f825642b..586381e8ba6 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,6 +1,8 @@ #!/bin/sh -e cat > sysimages.nix << "EOF" +# This file is generated from generate-sysimages.sh. DO NOT EDIT. +# Execute generate-sysimages.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 6de690622b5..aa1e05e85a0 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -15,6 +15,6 @@ sha1 = ""; }; }; - + diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 76e160fb0da..1be54adaaed 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,7 +1,7 @@ {stdenv, stdenv_32bit, fetchurl, unzip}: let - version = "21"; + version = "22"; in @@ -10,11 +10,11 @@ stdenv.mkDerivation { src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad"; + sha256 = "1kbp5fzfdas6c431n53a9w0z0182ihhadd1h8a64m1alkw0swr41"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb"; + sha256 = "0r359xxicn7zw9z0jbrmsppx1372fijg09ck907gg8x1cvzj2ry0"; } 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 4ce1e421478..cf509cdff97 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -25,7 +27,7 @@ in url = http://developer.android.com/sdk/android-1.1.html; }; }; - + platform_3 = buildPlatform { name = "android-platform-1.5"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/sdk/android-1.5.html; }; }; - + platform_4 = buildPlatform { name = "android-platform-1.6"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/sdk/android-1.6.html; }; }; - + platform_5 = buildPlatform { name = "android-platform-2.0"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/sdk/android-2.0.html; }; }; - + platform_6 = buildPlatform { name = "android-platform-2.0.1"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/sdk/android-2.0.1.html; }; }; - + platform_7 = buildPlatform { name = "android-platform-2.1"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_8 = buildPlatform { name = "android-platform-2.2"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_9 = buildPlatform { name = "android-platform-2.3.1"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_10 = buildPlatform { name = "android-platform-2.3.3"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_11 = buildPlatform { name = "android-platform-3.0"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_12 = buildPlatform { name = "android-platform-3.1"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_13 = buildPlatform { name = "android-platform-3.2"; src = fetchurl { @@ -157,76 +159,88 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { description = "Android SDK Platform 4.0"; - + }; }; - + platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { description = "Android SDK Platform 4.0.3"; - + }; }; - + platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; - sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; + url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { description = "Android SDK Platform 4.1.2"; - + }; }; - + platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; - sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; + url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { description = "Android SDK Platform 4.2.2"; - + }; }; - + platform_18 = buildPlatform { - name = "android-platform-4.3"; + name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; - sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; + url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { - description = "Android SDK Platform 4.3"; - + description = "Android SDK Platform 4.3.1"; + }; }; - + platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r03.zip; - sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95"; + url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { description = "Android SDK Platform 4.4.2"; - + + }; + }; + + platform_20 = buildPlatform { + name = "android-platform-4.4W.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + meta = { + description = "Android SDK Platform 4.4W.2"; + }; }; @@ -238,6 +252,19 @@ in }; meta = { description = "Android SDK Platform 5.0.1"; + + }; + }; + + platform_22 = buildPlatform { + name = "android-platform-5.1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + meta = { + description = "Android SDK Platform 5.1.1"; + }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 1f41d8dda9e..c9ec3dd6e84 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -25,7 +27,7 @@ in url = http://developer.android.com/sdk/android-1.1.html; }; }; - + platform_3 = buildPlatform { name = "android-platform-1.5"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/sdk/android-1.5.html; }; }; - + platform_4 = buildPlatform { name = "android-platform-1.6"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/sdk/android-1.6.html; }; }; - + platform_5 = buildPlatform { name = "android-platform-2.0"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/sdk/android-2.0.html; }; }; - + platform_6 = buildPlatform { name = "android-platform-2.0.1"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/sdk/android-2.0.1.html; }; }; - + platform_7 = buildPlatform { name = "android-platform-2.1"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_8 = buildPlatform { name = "android-platform-2.2"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_9 = buildPlatform { name = "android-platform-2.3.1"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_10 = buildPlatform { name = "android-platform-2.3.3"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_11 = buildPlatform { name = "android-platform-3.0"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_12 = buildPlatform { name = "android-platform-3.1"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_13 = buildPlatform { name = "android-platform-3.2"; src = fetchurl { @@ -157,76 +159,88 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { description = "Android SDK Platform 4.0"; - + }; }; - + platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { description = "Android SDK Platform 4.0.3"; - + }; }; - + platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; - sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; + url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { description = "Android SDK Platform 4.1.2"; - + }; }; - + platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; - sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; + url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { description = "Android SDK Platform 4.2.2"; - + }; }; - + platform_18 = buildPlatform { - name = "android-platform-4.3"; + name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; - sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; + url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { - description = "Android SDK Platform 4.3"; - + description = "Android SDK Platform 4.3.1"; + }; }; - + platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r03.zip; - sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95"; + url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { description = "Android SDK Platform 4.4.2"; - + + }; + }; + + platform_20 = buildPlatform { + name = "android-platform-4.4W.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + meta = { + description = "Android SDK Platform 4.4W.2"; + }; }; @@ -238,8 +252,20 @@ in }; meta = { description = "Android SDK Platform 5.0.1"; + + }; + }; + + platform_22 = buildPlatform { + name = "android-platform-5.1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + meta = { + description = "Android SDK Platform 5.1.1"; + }; }; - } diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-10.xml index 81023cae2ee..fa07307e01e 100644 --- a/pkgs/development/mobile/androidenv/repository-10.xml +++ b/pkgs/development/mobile/androidenv/repository-10.xml @@ -329,6 +329,7 @@ June 2014. Android SDK Platform 1.5_r3 http://developer.android.com/sdk/android-1.5.html + 54624370 @@ -365,6 +366,7 @@ June 2014. Android SDK Platform 1.6_r2 http://developer.android.com/sdk/android-1.6.html + 63454485 @@ -481,6 +483,7 @@ June 2014. Android SDK Platform 2.1_r3 http://developer.android.com/sdk/ + 70142829 @@ -582,6 +585,7 @@ June 2014. Android SDK Platform 3.0, revision 2 http://developer.android.com/sdk/ + 104513908 @@ -609,6 +613,7 @@ June 2014. Android SDK Platform 3.1, revision 3 http://developer.android.com/sdk/ + 106472351 @@ -634,6 +639,7 @@ June 2014. Android SDK Platform 3.2, revision 1 http://developer.android.com/sdk/ + 108426536 @@ -648,51 +654,52 @@ June 2014. - - 3 + + 4 Android SDK Platform 4.0 4.0 14 - 7 + 12 1 + - 45919570 - 41ba83b51e886461628c41b1b4d47762e0688ed5 - https://dl-ssl.google.com/android/repository/android-14_r03.zip + 46038082 + d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c + android-14_r04.zip - - 3 + + 5 Android SDK Platform 4.0.3 4.0.3 15 - 15 + 21 - 7 + 12 1 - 44414679 - 23da24610a8da51054c5391001c51ce43a778b97 - https://dl-ssl.google.com/android/repository/android-15_r03.zip + 44533475 + 69ab4c443b37184b2883af1fd38cc20cbeffd0f3 + android-15_r05.zip - - 4 + + 5 Android SDK Platform 4.1.2 4.1.2 16 @@ -700,22 +707,22 @@ June 2014. 21 - 9 + 12 1 - 48005140 - 90b9157b8b45f966be97e11a22fba4591b96c2ee - https://dl-ssl.google.com/android/repository/android-16_r04.zip + 48128695 + 12a5ce6235a76bc30f62c26bda1b680e336abd07 + android-16_r05.zip - - 2 + + 3 Android SDK Platform 4.2.2 4.2.2 17 @@ -723,45 +730,45 @@ June 2014. 21 - 9 + 12 1 - 48057484 - c442c32c1b702173ab0929a74486e4f86fe528ec - https://dl-ssl.google.com/android/repository/android-17_r02.zip + 57030216 + dbe14101c06e6cdb34e300393e64e64f8c92168a + android-17_r03.zip - - 2 - Android SDK Platform 4.3 - 4.3 + + 3 + Android SDK Platform 4.3.1 + 4.3.1 18 21 - 10 + 12 1 - 57319855 - 62a9438d4cf6692f4d6510c27a380be195db9534 - https://dl-ssl.google.com/android/repository/android-18_r02.zip + 57771739 + e6b09b3505754cbbeb4a5622008b907262ee91cb + android-18_r03.zip - - 3 + + 4 Android SDK Platform 4.4.2 4.4.2 19 @@ -769,64 +776,86 @@ June 2014. 22 - 10 + 12 1 - 63798840 - 5f33d8fd36a384fe2b170035e04a29c274a9ef95 - https://dl-ssl.google.com/android/repository/android-19_r03.zip + 63871092 + 2ff20d89e68f2f5390981342e009db5a2d456aaa + android-19_r04.zip - - 1 - Android SDK Platform 4.4W - 4.4W + + 2 + Android SDK Platform 4.4W.2 + 4.4W.2 20 22 - 10 + 12 1 - 63548914 - 928b1d181101a5bc06f739eb40501e1249dd4895 - android-20_r01.zip + 63567784 + a9251f8a3f313ab05834a07a963000927637e01d + android-20_r02.zip - - 3 - Android SDK Platform L - L - 20 - L + + 2 + Android SDK Platform 5.0.1 + 5.0.1 + 21 22 - 11 - 1 + 12 + 2 - 69421660 - 76b6da426db06b2e2901dbc5e02d210ba83753c4 - android-L_r03.zip + 65897960 + 53536556059bb29ae82f414fd2e14bc335a4eb4c + android-21_r02.zip - + + + + + + 2 + Android SDK Platform 5.1.1 + 5.1.1 + 22 + + 22 + + + 14 + 2 + + + + 66852371 + 5d1bd10fea962b216a0dece1247070164760a9fc + android-22_r02.zip + + + @@ -839,6 +868,7 @@ June 2014. 01 Android SDK Samples for Android API 7, revision 1 http://developer.android.com/sdk/ + 7677831 @@ -912,6 +942,7 @@ June 2014. 01 Android SDK Samples for Android API 11, revision 1 http://developer.android.com/sdk/ + 11976920 @@ -930,6 +961,7 @@ June 2014. 01 Android SDK Samples for Android API 12, revision 1 http://developer.android.com/sdk/ + 12150514 @@ -948,6 +980,7 @@ June 2014. 01 Android SDK Samples for Android API 13, revision 1 http://developer.android.com/sdk/ + 12193502 @@ -962,6 +995,7 @@ June 2014. 2 14 + 16253619 @@ -1043,60 +1077,73 @@ June 2014. - - 2 + + 3 20 - 49718791 - 4b906c46057ee8f502b4f27c23670fd87a49d6ff - samples-20_r02.zip + 50796850 + 8b1290b0b707827808392e8178094a68dfb51a14 + samples-20_r03.zip - - 2 - 20 - L + + 4 + 21 - 41182182 - 4afc36cf3f53051881729f733fe9bb571104c48f - samples-L_r02.zip + 95971939 + 3a08d37e97f567f5f629a06a9012f89b05c5ad8a + samples-21_r04.zip - + + + + + + 5 + 22 + + + 107981157 + dbc5cc27b5d15acc25cd6b94b8c2971806b70bb0 + samples-22_r05.zip + + + - + - 20 + 22 0 0 - 1741113 - 72c34cc6a991f53e2588f9d5487559f013bc30f9 - platform-tools_r20-windows.zip + 1848028 + 720214bd29d08eb82673cd81a8159b083eef19d7 + platform-tools_r22-windows.zip windows - 1753061 - fb120ce85b6698b801cb4788b204693c1d682b87 - platform-tools_r20-linux.zip + 1751911 + b78be9cc31cf9f9fe0609e29a6a133beacf03b52 + platform-tools_r22-linux.zip linux - 1666257 - f2c65c58caf76169d9bebf25eef5c69ff99670b5 - platform-tools_r20-macosx.zip + 1743025 + ddc96385bccf8a15d4f8a11eb1cb9d2a08a531c8 + platform-tools_r22-macosx.zip macosx @@ -1112,6 +1159,7 @@ June 2014. 0 0 + 11004914 @@ -1144,6 +1192,7 @@ June 2014. 0 1 + 15413527 @@ -1174,6 +1223,7 @@ June 2014. 1 0 + 19659547 @@ -1204,6 +1254,7 @@ June 2014. 1 1 + 19660000 @@ -1234,6 +1285,7 @@ June 2014. 0 0 + 20611447 @@ -1264,6 +1316,7 @@ June 2014. 0 1 + 20500648 @@ -1294,6 +1347,7 @@ June 2014. 0 2 + 20621117 @@ -1324,6 +1378,7 @@ June 2014. 0 3 + 20730715 @@ -1407,13 +1462,259 @@ June 2014. + + + + 21 + 0 + 0 + + + + + 22306371 + 5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32 + build-tools_r21-windows.zip + windows + + + 22153145 + 4933328fdeecbd554a29528f254f4993468e1cf4 + build-tools_r21-linux.zip + linux + + + 22668456 + 9bef7989b51436bd4e5114d8a0330359f077cbfa + build-tools_r21-macosx.zip + macosx + + + + + + + + + 21 + 0 + 1 + + + + + 22306243 + d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df + build-tools_r21.0.1-windows.zip + windows + + + 22153013 + e573069eea3e5255e7a65bedeb767f4fd0a5f49a + build-tools_r21.0.1-linux.zip + linux + + + 22668616 + b60c8f9b810c980abafa04896706f3911be1ade7 + build-tools_r21.0.1-macosx.zip + macosx + + + + + + + + + 21 + 0 + 2 + + + + + 22306371 + 37496141b23cbe633167927b7abe6e22d9f1a1c1 + build-tools_r21.0.2-windows.zip + windows + + + 22153122 + e1236ab8897b62b57414adcf04c132567b2612a5 + build-tools_r21.0.2-linux.zip + linux + + + 22668597 + f17471c154058f3734729ef3cc363399b1cd3de1 + build-tools_r21.0.2-macosx.zip + macosx + + + + + + + + + 21 + 1 + 0 + + + + + 32797810 + c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 + build-tools_r21.1-windows.zip + windows + + + 32642820 + b7455e543784d52a8925f960bc880493ed1478cb + build-tools_r21.1-linux.zip + linux + + + 33158159 + df619356c2359aa5eacdd48699d15b335d9bd246 + build-tools_r21.1-macosx.zip + macosx + + + + + + + + + 21 + 1 + 1 + + + + + 32797356 + 53fc4201237f899d5cd92f0b76ad41fb89da188b + build-tools_r21.1.1-windows.zip + windows + + + 32642454 + 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d + build-tools_r21.1.1-linux.zip + linux + + + 33157676 + 836a146eab0504aa9387a5132e986fe7c7381571 + build-tools_r21.1.1-macosx.zip + macosx + + + + + + + + + 21 + 1 + 2 + + + + 32792587 + 1d944759c47f60e634d2b8a1f3a4259be2f8d652 + build-tools_r21.1.2-windows.zip + windows + + + 32637678 + 5e35259843bf2926113a38368b08458735479658 + build-tools_r21.1.2-linux.zip + linux + + + 33152878 + e7c906b4ba0eea93b32ba36c610dbd6b204bff48 + build-tools_r21.1.2-macosx.zip + macosx + + + + + + + + + 22 + 0 + 0 + + + + + 33254114 + 08fcca41e81b172bd9f570963b90d3a84929e043 + build-tools_r22-windows.zip + windows + + + 33104280 + a8a1619dd090e44fac957bce6842e62abf87965b + build-tools_r22-linux.zip + linux + + + 33646090 + af95429b24088d704bc5db9bd606e34ac1b82c0d + build-tools_r22-macosx.zip + macosx + + + + + + + + + 22 + 0 + 1 + + + + 33254137 + 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf + build-tools_r22.0.1-windows.zip + windows + + + 33104577 + da8b9c5c3ede39298e6cf0283c000c2ee9029646 + build-tools_r22.0.1-linux.zip + linux + + + 33646102 + 53dad7f608e01d53b17176ba11165acbfccc5bbf + build-tools_r22.0.1-macosx.zip + macosx + + + + + - + - 23 - 0 + 24 + 1 2 @@ -1421,21 +1722,21 @@ June 2014. - 141154615 - 0a64ec9b7777bb00ff299c94c359163ef5e443ae - tools_r23.0.2-windows.zip + 159505060 + c20ffa023618c5cb6953131d6dbb0c628a3a1a14 + tools_r24.1.2-windows.zip windows - 141930870 - e8a2d55d750adeaded60a3daad48e62b09aa472a - tools_r23.0.2-linux.zip + 169061591 + c7c30f6da6eff6323260f0353ccaacc984ea6b3e + tools_r24.1.2-linux.zip linux - 90920343 - c46b1e173188ba82a56d6b9e349fdae4e8922bab - tools_r23.0.2-macosx.zip + 89081357 + e32ba2fb21cc92ec4f1f01b5cb9a06f666eee460 + tools_r24.1.2-macosx.zip macosx @@ -1445,18 +1746,17 @@ June 2014. - + 1 - 20 - L + 22 - 207889084 - 58a94248c7c960829db3d779c84534e5e783210f - docs-L_r01.zip + 296467484 + 419791c49fa0a305a06966fd1734cf5b0498ea1a + docs-22_r01.zip - + @@ -1465,6 +1765,7 @@ June 2014. 1 14 + 16152383 @@ -1558,5 +1859,34 @@ June 2014. + + + + 1 + 21 + + + 28274751 + 137a5044915d32bea297a8c1552684802bbc2e25 + sources-21_r01.zip + + + + + + + + 1 + 22 + + + 28861236 + 98320e13976d11597a4a730a8d203ac9a03ed5a6 + sources-22_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 6905cb24993..c0c2fb47fcd 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "android-support-repository-r9"; +stdenv.mkDerivation rec { + version = "14"; + name = "android-support-repository-r${version}"; src = fetchurl { - url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip; - sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c"; + url = "http://dl-ssl.google.com/android/repository/android_m2repository_r${version}.zip"; + sha256 = "027mmfzvs07nbp28vn6c6cgszqdrmmgwdfzda87936lpi5dwg34p"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index d9d24f9bf9f..772ecad8f8a 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "android-support-r21"; +stdenv.mkDerivation rec { + version = "22.1.1"; + name = "android-support-r${version}"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r21.zip; - sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be"; + url = "https://dl-ssl.google.com/android/repository/support_r${version}.zip"; + sha1 = "jifv8yjg5jrycf8zd0lfsra00yscggc8"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 5d2b0f7a883..ef6507035f3 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -423,6 +423,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS Android SDK Platform 4.0 14 armeabi-v7a + 99621822 @@ -520,40 +521,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 1 - Android SDK Platform L - 20 - L + + 3 + Android SDK Platform 5.0.2 + 21 armeabi-v7a default - 227716008 - 1d5d81a7078b5b2a685620d93e1e04a51d2e786a - sysimg_armv7a-L_r01.zip + 186521381 + 0b2e21421d29f48211b5289ca4addfa7f4c7ae5a + sysimg_arm-21_r03.zip - + - - - 1 - Android SDK Platform L - 20 - L - x86 - default - - - 245850484 - c2d32d6244821ff59f370469778525f6a5345010 - sysimg_x86-L_r01.zip - - - - @@ -653,6 +636,90 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default + + + 3 + Android SDK Platform 5.0.2 + 21 + x86 + default + + + 201601288 + a0b510c66769e84fa5e40515531be2d266a4247f + sysimg_x86-21_r03.zip + + + + + + + + 3 + Android SDK Platform 5.0.2 + 21 + x86_64 + default + + + 285253158 + 2f205b728695d84488156f4846beb83a353ea64b + sysimg_x86_64-21_r03.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + x86 + default + + + 207436768 + 6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15 + sysimg_x86-22_r01.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + x86_64 + default + + + 292511941 + 05752813603f9fa03a58dcf7f8f5e779be722aae + sysimg_x86_64-22_r01.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + armeabi-v7a + default + + + 193687339 + 2aa6a887ee75dcf3ac34627853d561997792fcb8 + sysimg_arm-22_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index ddc6dd99d39..83ca0d49830 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -1,3 +1,5 @@ +# This file is generated from generate-sysimages.sh. DO NOT EDIT. +# Execute generate-sysimages.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -20,7 +22,7 @@ in sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; }; }; - + sysimg_armeabi-v7a_15 = buildSystemImage { name = "sysimg-armeabi-v7a-15"; src = fetchurl { @@ -28,7 +30,7 @@ in sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e"; }; }; - + sysimg_armeabi-v7a_16 = buildSystemImage { name = "sysimg-armeabi-v7a-16"; src = fetchurl { @@ -36,7 +38,7 @@ in sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7"; }; }; - + sysimg_armeabi-v7a_17 = buildSystemImage { name = "sysimg-armeabi-v7a-17"; src = fetchurl { @@ -44,7 +46,7 @@ in sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; }; }; - + sysimg_armeabi-v7a_18 = buildSystemImage { name = "sysimg-armeabi-v7a-18"; src = fetchurl { @@ -52,7 +54,7 @@ in sha1 = "4a1a93200210d8c42793324362868846f67401ab"; }; }; - + sysimg_armeabi-v7a_19 = buildSystemImage { name = "sysimg-armeabi-v7a-19"; src = fetchurl { @@ -60,23 +62,15 @@ in sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5"; }; }; - - sysimg_armeabi-v7a_20 = buildSystemImage { - name = "sysimg-armeabi-v7a-20"; + + sysimg_armeabi-v7a_21 = buildSystemImage { + name = "sysimg-armeabi-v7a-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-L_r01.zip; - sha1 = "1d5d81a7078b5b2a685620d93e1e04a51d2e786a"; + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; + sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a"; }; }; - - sysimg_x86_20 = buildSystemImage { - name = "sysimg-x86-20"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-L_r01.zip; - sha1 = "c2d32d6244821ff59f370469778525f6a5345010"; - }; - }; - + sysimg_x86_10 = buildSystemImage { name = "sysimg-x86-10"; src = fetchurl { @@ -84,7 +78,7 @@ in sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; }; }; - + sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { @@ -92,7 +86,7 @@ in sha1 = "d540325952e0f097509622b9e685737584b83e40"; }; }; - + sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { @@ -100,7 +94,7 @@ in sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; }; }; - + sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { @@ -108,7 +102,7 @@ in sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; }; }; - + sysimg_x86_18 = buildSystemImage { name = "sysimg-x86-18"; src = fetchurl { @@ -116,7 +110,7 @@ in sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; }; }; - + sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { @@ -124,7 +118,47 @@ in sha1 = "8889cb418984a2a7916a359da7c429d2431ed060"; }; }; - + + sysimg_x86_21 = buildSystemImage { + name = "sysimg-x86-21"; + src = fetchurl { + url = https://dl-ssl.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-ssl.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-ssl.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-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip; + sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae"; + }; + }; + + sysimg_armeabi-v7a_22 = buildSystemImage { + name = "sysimg-armeabi-v7a-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; + sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; + }; + }; + sysimg_mips_15 = buildSystemImage { name = "sysimg-mips-15"; src = fetchurl { @@ -132,7 +166,7 @@ in sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; }; }; - + sysimg_mips_16 = buildSystemImage { name = "sysimg-mips-16"; src = fetchurl { @@ -140,7 +174,7 @@ in sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; }; }; - + sysimg_mips_17 = buildSystemImage { name = "sysimg-mips-17"; src = fetchurl { @@ -148,4 +182,4 @@ in sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; }; }; - } +}