From aeabfbe846252b30eb34f5ddae8e84186a4358d5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 6 Oct 2015 12:27:49 +0000
Subject: [PATCH] androidsdk: bump to version 24.3.4 and update associated sub
 packages

---
 pkgs/development/mobile/androidenv/addon.xml  | 143 +++++++---
 pkgs/development/mobile/androidenv/addons.nix |  68 +++--
 .../mobile/androidenv/androidsdk.nix          |   8 +-
 .../mobile/androidenv/build-tools.nix         |  20 +-
 .../development/mobile/androidenv/default.nix |   1 -
 pkgs/development/mobile/androidenv/fetch.sh   |   6 +-
 .../mobile/androidenv/generate-addons.xsl     |   6 +-
 .../mobile/androidenv/generate-platforms.sh   |   4 +-
 .../mobile/androidenv/generate-platforms.xsl  |   4 +-
 .../mobile/androidenv/generate-sysimages.xsl  |   2 +-
 .../mobile/androidenv/platform-tools.nix      |  16 +-
 .../mobile/androidenv/platforms-linux.nix     |  30 +-
 .../mobile/androidenv/platforms-macosx.nix    |  30 +-
 .../{repository-10.xml => repository-11.xml}  | 257 +++++++++++++++---
 .../mobile/androidenv/support-repository.nix  |   6 +-
 .../development/mobile/androidenv/support.nix |   6 +-
 .../development/mobile/androidenv/sys-img.xml | 201 +++++++++-----
 .../mobile/androidenv/sysimages.nix           | 102 ++++---
 18 files changed, 629 insertions(+), 281 deletions(-)
 rename pkgs/development/mobile/androidenv/{repository-10.xml => repository-11.xml} (90%)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 334626b93ac0..9892b386d004 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -763,14 +763,14 @@ August 15, 2011
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Fri Mar 30 10:45:40 2012 from ics-mr1 @ 302030 -->
+        <!-- Generated at Tue Mar 10 10:46:23 2015 from git_ics-mr1 @ 1741834 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>15</sdk:api-level>
-        <sdk:revision>2</sdk:revision>
+        <sdk:revision>3</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -784,23 +784,23 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>106612472</sdk:size>
-                <sdk:checksum type="sha1">6757c12788da0ea00c2ab58e54cb438b9f2bcf66</sdk:checksum>
-                <sdk:url>google_apis-15_r02.zip</sdk:url>
+                <sdk:size>106624396</sdk:size>
+                <sdk:checksum type="sha1">d0d2bf26805eb271693570a1aaec33e7dc3f45e9</sdk:checksum>
+                <sdk:url>google_apis-15_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Tue Oct  9 14:06:38 2012 from git_jb-dev @ 495790 -->
+        <!-- Generated at Tue Mar 10 10:30:21 2015 from git_jb-dev @ 1747107 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>16</sdk:api-level>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>4</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -814,23 +814,23 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>127278413</sdk:size>
-                <sdk:checksum type="sha1">63467dd32f471e3e81e33e9772c22f33235aa3b3</sdk:checksum>
-                <sdk:url>google_apis-16_r03.zip</sdk:url>
+                <sdk:size>127341982</sdk:size>
+                <sdk:checksum type="sha1">ee6acf1b01020bfa8a8e24725dbc4478bee5e792</sdk:checksum>
+                <sdk:url>google_apis-16_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Tue May 14 08:07:47 2013 from git_jb-mr1.1-dev @ 673949 -->
+        <!-- Generated at Mon Mar  9 18:24:34 2015 from git_jb-mr1.1-dev @ 1742939 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>17</sdk:api-level>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>4</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -844,23 +844,23 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>137156978</sdk:size>
-                <sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum>
-                <sdk:url>google_apis-17_r03.zip</sdk:url>
+                <sdk:size>137231243</sdk:size>
+                <sdk:checksum type="sha1">a076be0677f38df8ca5536b44dfb411a0c808c4f</sdk:checksum>
+                <sdk:url>google_apis-17_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Thu Sep 19 12:49:30 2013 from git_jb-mr2-dev @ 836888 -->
+        <!-- Generated at Mon Mar  9 17:39:57 2015 from git_jb-mr2-dev @ 1743067 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>18</sdk:api-level>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>4</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -874,23 +874,23 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>143149689</sdk:size>
-                <sdk:checksum type="sha1">147bce09c1163edc17194f3db496ec1086fcf965</sdk:checksum>
-                <sdk:url>google_apis-18_r03.zip</sdk:url>
+                <sdk:size>143195183</sdk:size>
+                <sdk:checksum type="sha1">6109603409debdd40854d4d4a92eaf8481462c8b</sdk:checksum>
+                <sdk:url>google_apis-18_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Wed Apr 22 12:31:26 2015 from git_klp-sdk-release @ 1873184 -->
+        <!-- Generated at Mon Sep 21 17:01:24 2015 from git_klp-sdk-release @ 2258983 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs (ARM System Image)</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>19</sdk:api-level>
-        <sdk:revision>13</sdk:revision>
+        <sdk:revision>16</sdk:revision>
         <sdk:libs>
             <sdk:lib>
                 <sdk:name>com.google.android.maps</sdk:name>
@@ -904,9 +904,9 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>181034400</sdk:size>
-                <sdk:checksum type="sha1">75c8af27f1fdf83dc28057537b5bd62b794365cc</sdk:checksum>
-                <sdk:url>google_apis-19_r13.zip</sdk:url>
+                <sdk:size>182452246</sdk:size>
+                <sdk:checksum type="sha1">d92f2a2fe219e578633c6445397e1f675edc6a28</sdk:checksum>
+                <sdk:url>google_apis-19_r16.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -997,13 +997,32 @@ August 15, 2011
         <sdk:libs/>
     </sdk:add-on>
 
+    <sdk:add-on>
+        <!-- Generated at Fri Aug 14 15:29:54 2015 from git_mnc-dev @ 2166657 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-id>google_apis</sdk:name-id>
+        <sdk:name-display>Google APIs</sdk:name-display>
+        <sdk:description>Android + Google APIs</sdk:description>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:revision>1</sdk:revision>
+        <sdk:libs/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>179900</sdk:size>
+                <sdk:checksum type="sha1">04c5cc1a7c88967250ebba9561d81e24104167db</sdk:checksum>
+                <sdk:url>google_apis-23_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:add-on>
     <!-- EXTRAS VENDOR=ANDROID ........................ -->
 
     <sdk:extra>
-        <!-- Generated at Fri Apr 24 09:30:00 2015 from git_lmp-mr1-supportlib-release @ 1877331 -->
+        <!-- Generated at Thu Sep  3 11:26:43 2015 from git_mnc-sdk-release @ 2221987 -->
         <sdk:revision>
-            <sdk:major>22</sdk:major>
-            <sdk:minor>1</sdk:minor>
+            <sdk:major>23</sdk:major>
+            <sdk:minor>0</sdk:minor>
             <sdk:micro>1</sdk:micro>
         </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
@@ -1013,18 +1032,18 @@ August 15, 2011
         <sdk:old-paths>compatibility</sdk:old-paths>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>8475991</sdk:size>
-                <sdk:checksum type='sha1'>88bdc7b4074065ed28681f39e6b32c4f7ab45d94</sdk:checksum>
-                <sdk:url>support_r22.1.1.zip</sdk:url>
+                <sdk:size>9553739</sdk:size>
+                <sdk:checksum type="sha1">fbe529716943053d0ce0d7f058d79f1a848cdff9</sdk:checksum>
+                <sdk:url>support_r23.0.1.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:extra>
 
     <sdk:extra>
-        <!-- Generated at Fri Apr 24 09:30:00 2015 from git_lmp-mr1-supportlib-release @ 1877331 -->
+        <!-- Manually picked up at Fri Oct  2 13:50:00 2015 from ub-support-test-release @ 2304053 -->
         <sdk:revision>
-            <sdk:major>14</sdk:major>
+            <sdk:major>21</sdk:major>
         </sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
@@ -1033,9 +1052,9 @@ August 15, 2011
         <sdk:path>m2repository</sdk:path>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>68533453</sdk:size>
-                <sdk:checksum type="sha1">0011dfe1473ccdfb1a533a19cad152c59dcd6b45</sdk:checksum>
-                <sdk:url>android_m2repository_r14.zip</sdk:url>
+                <sdk:size>142136028</sdk:size>
+                <sdk:checksum type="sha1">acb915c5d2c730bf98303c0cd0122bedb2954cb3</sdk:checksum>
+                <sdk:url>android_m2repository_r21.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -1049,15 +1068,15 @@ August 15, 2011
         <sdk:name-display>Google Repository</sdk:name-display>
         <sdk:path>m2repository</sdk:path>
         <sdk:revision>
-            <sdk:major>17</sdk:major>
+            <sdk:major>22</sdk:major>
         </sdk:revision>
         <sdk:description>Local Maven repository for Google Libraries</sdk:description>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>43508126</sdk:size>
-                <sdk:checksum type="sha1">a91a809149b69fab1efb4652c21b439e8b9e7150</sdk:checksum>
-                <sdk:url>google_m2repository_r17.zip</sdk:url>
+                <sdk:size>59491846</sdk:size>
+                <sdk:checksum type="sha1">4c114ac217f4b2f066d731ce906eeb635ee2a5b4</sdk:checksum>
+                <sdk:url>google_m2repository_r22.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -1131,16 +1150,16 @@ August 15, 2011
         <sdk:name-display>Google Play services</sdk:name-display>
         <sdk:path>google_play_services</sdk:path>
         <sdk:revision>
-            <sdk:major>24</sdk:major>
+            <sdk:major>27</sdk:major>
         </sdk:revision>
         <sdk:description>Google Play services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>17636517</sdk:size>
-                <sdk:checksum type="sha1">9dc5092c1043d6d9c162d481e668b95fc2f36782</sdk:checksum>
-                <sdk:url>google_play_services_7327000_r24.zip</sdk:url>
+                <sdk:size>21163425</sdk:size>
+                <sdk:checksum type="sha1">cdb13f826ca82d3c3730cf1df9f3bf58565fd4bb</sdk:checksum>
+                <sdk:url>google_play_services_8115000_r27.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -1290,4 +1309,40 @@ August 15, 2011
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:extra>
+
+    <sdk:extra>
+      <sdk:vendor-id>google</sdk:vendor-id>
+      <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+      <sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display>
+      <sdk:path>auto</sdk:path>
+      <sdk:revision>
+        <sdk:major>1</sdk:major>
+        <sdk:minor>0</sdk:minor>
+      </sdk:revision>
+      <sdk:description>
+        Head unit emulator for developers targeting the Android Auto platform.
+      </sdk:description>
+      <sdk:desc-url>http://developer.android.com/tools/help/desktop-head-unit.html</sdk:desc-url>
+      <sdk:archives>
+        <sdk:archive>
+          <sdk:size>1346136</sdk:size>
+          <sdk:checksum type="sha1">e054563f9efdc2f6089693566bce5b8fba2cd1c6</sdk:checksum>
+          <sdk:url>extras/auto/desktop-head-unit-linux_r01.zip</sdk:url>
+          <sdk:host-os>linux</sdk:host-os>
+        </sdk:archive>
+        <sdk:archive>
+          <sdk:size>2691813</sdk:size>
+          <sdk:checksum type="sha1">499bb4520f95e708585947c9fc72efeeb610685f</sdk:checksum>
+          <sdk:url>extras/auto/desktop-head-unit-windows_r01.zip</sdk:url>
+          <sdk:host-os>windows</sdk:host-os>
+        </sdk:archive>
+        <sdk:archive>
+          <sdk:size>2389261</sdk:size>
+          <sdk:checksum type="sha1">64510b97c3c2c6dccab7932a816a20b84d9a5dc3</sdk:checksum>
+          <sdk:url>extras/auto/desktop-head-unit-macosx_r01.zip</sdk:url>
+          <sdk:host-os>macosx</sdk:host-os>
+        </sdk:archive>
+      </sdk:archives>
+      <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:extra>
 </sdk:sdk-addon>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index ca4870cf4c8e..d397cd766fb4 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -19,7 +19,7 @@ in
   google_apis_3 = buildGoogleApis {
     name = "google_apis-3";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-3-r03.zip;
+        url = https://dl.google.com/android/repository/google_apis-3-r03.zip;
         sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
       };
       meta = {
@@ -31,7 +31,7 @@ in
   google_apis_4 = buildGoogleApis {
     name = "google_apis-4";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-4_r02.zip;
+        url = https://dl.google.com/android/repository/google_apis-4_r02.zip;
         sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
       };
       meta = {
@@ -43,7 +43,7 @@ in
   google_apis_5 = buildGoogleApis {
     name = "google_apis-5";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-5_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-5_r01.zip;
         sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
       };
       meta = {
@@ -55,7 +55,7 @@ in
   google_apis_6 = buildGoogleApis {
     name = "google_apis-6";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-6_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-6_r01.zip;
         sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
       };
       meta = {
@@ -67,7 +67,7 @@ in
   google_apis_7 = buildGoogleApis {
     name = "google_apis-7";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-7_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-7_r01.zip;
         sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
       };
       meta = {
@@ -79,7 +79,7 @@ in
   google_apis_8 = buildGoogleApis {
     name = "google_apis-8";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-8_r02.zip;
+        url = https://dl.google.com/android/repository/google_apis-8_r02.zip;
         sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
       };
       meta = {
@@ -91,7 +91,7 @@ in
   google_apis_9 = buildGoogleApis {
     name = "google_apis-9";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-9_r02.zip;
+        url = https://dl.google.com/android/repository/google_apis-9_r02.zip;
         sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
       };
       meta = {
@@ -103,7 +103,7 @@ in
   google_apis_10 = buildGoogleApis {
     name = "google_apis-10";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-10_r02.zip;
+        url = https://dl.google.com/android/repository/google_apis-10_r02.zip;
         sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
       };
       meta = {
@@ -115,7 +115,7 @@ in
   google_apis_11 = buildGoogleApis {
     name = "google_apis-11";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-11_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-11_r01.zip;
         sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
       };
       meta = {
@@ -127,7 +127,7 @@ in
   google_apis_12 = buildGoogleApis {
     name = "google_apis-12";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-12_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-12_r01.zip;
         sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
       };
       meta = {
@@ -139,7 +139,7 @@ in
   google_apis_13 = buildGoogleApis {
     name = "google_apis-13";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-13_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-13_r01.zip;
         sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
       };
       meta = {
@@ -151,7 +151,7 @@ in
   google_apis_14 = buildGoogleApis {
     name = "google_apis-14";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-14_r02.zip;
+        url = https://dl.google.com/android/repository/google_apis-14_r02.zip;
         sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
       };
       meta = {
@@ -163,8 +163,8 @@ in
   google_apis_15 = buildGoogleApis {
     name = "google_apis-15";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-15_r02.zip;
-        sha1 = "6757c12788da0ea00c2ab58e54cb438b9f2bcf66";
+        url = https://dl.google.com/android/repository/google_apis-15_r03.zip;
+        sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
       };
       meta = {
         description = "Android + Google APIs";
@@ -175,8 +175,8 @@ in
   google_apis_16 = buildGoogleApis {
     name = "google_apis-16";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-16_r03.zip;
-        sha1 = "63467dd32f471e3e81e33e9772c22f33235aa3b3";
+        url = https://dl.google.com/android/repository/google_apis-16_r04.zip;
+        sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
       };
       meta = {
         description = "Android + Google APIs";
@@ -187,8 +187,8 @@ in
   google_apis_17 = buildGoogleApis {
     name = "google_apis-17";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip;
-        sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba";
+        url = https://dl.google.com/android/repository/google_apis-17_r04.zip;
+        sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
       };
       meta = {
         description = "Android + Google APIs";
@@ -199,8 +199,8 @@ in
   google_apis_18 = buildGoogleApis {
     name = "google_apis-18";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-18_r03.zip;
-        sha1 = "147bce09c1163edc17194f3db496ec1086fcf965";
+        url = https://dl.google.com/android/repository/google_apis-18_r04.zip;
+        sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
       };
       meta = {
         description = "Android + Google APIs";
@@ -211,8 +211,8 @@ in
   google_apis_19 = buildGoogleApis {
     name = "google_apis-19";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-19_r13.zip;
-        sha1 = "75c8af27f1fdf83dc28057537b5bd62b794365cc";
+        url = https://dl.google.com/android/repository/google_apis-19_r16.zip;
+        sha1 = "d92f2a2fe219e578633c6445397e1f675edc6a28";
       };
       meta = {
         description = "Android + Google APIs";
@@ -223,7 +223,7 @@ in
   google_apis_21 = buildGoogleApis {
     name = "google_apis-21";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-21_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-21_r01.zip;
         sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
       };
       meta = {
@@ -235,7 +235,7 @@ in
   google_apis_22 = buildGoogleApis {
     name = "google_apis-22";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-22_r01.zip;
+        url = https://dl.google.com/android/repository/google_apis-22_r01.zip;
         sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
       };
       meta = {
@@ -244,11 +244,23 @@ in
       };
     };
 
+  google_apis_23 = buildGoogleApis {
+    name = "google_apis-23";
+      src = fetchurl {
+        url = https://dl.google.com/android/repository/google_apis-23_r01.zip;
+        sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
+      };
+      meta = {
+        description = "Android + Google APIs";
+
+      };
+    };
+
   android_support_extra = buildGoogleApis {
     name = "android_support_extra";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/support_r22.1.1.zip;
-      sha1 = "88bdc7b4074065ed28681f39e6b32c4f7ab45d94";
+      url = https://dl.google.com/android/repository/support_r23.0.1.zip;
+      sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9";
     };
     meta = {
       description = "Android Support Library";
@@ -259,8 +271,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/google_play_services_7327000_r24.zip;
-      sha1 = "9dc5092c1043d6d9c162d481e668b95fc2f36782";
+      url = https://dl.google.com/android/repository/google_play_services_8115000_r27.zip;
+      sha1 = "cdb13f826ca82d3c3730cf1df9f3bf58565fd4bb";
     };
     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 52b146b87f4b..bc994603ab46 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -5,20 +5,20 @@
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
 , freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils
 }:
-{platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}:
+{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "24.1.2";
+  version = "24.3.4";
 
   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 = "a46298bjpgzsnchhpcm1i86c4r50x638";
+      sha1 = "fb293d7bca42e05580be56b1adc22055d46603dd";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
-      sha1 = "as109624lgrn8krylmyvm33yapqkzr00";
+      sha1 = "128f10fba668ea490cc94a08e505a48a608879b9";
     }
     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 3a7df3ce1afd..a73eae3f50c3 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}:
 
 stdenv.mkDerivation rec {
-  version="22.0.1";
+  version = "23.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_r${version}-linux.zip";
-      sha1 = "8sb05s9f1h03qa7hdj72jffy7rf9r2ys";
+      url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
+      sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha1 = "pxdwrz6bb8b13fknf6qm67g013vdgnjk";
+      url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
+      sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
     }
     else throw "System ${stdenv.system} not supported!";
 
@@ -30,28 +30,28 @@ stdenv.mkDerivation rec {
         done
         
         # These binaries need to find libstdc++ and libgcc_s
-        for i in aidl libLLVM.so
+        for i in aidl lib/libLLVM.so
         do
             patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
         done
         
         # These binaries need to find libstdc++, libgcc_s and libraries in the current folder
-        for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc
+        for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so llvm-rs-cc
         do
-            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd` $i
+            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $i
         done
 
         # These binaries also need zlib in addition to libstdc++
         for i in zipalign
         do
             patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
-            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i
+            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/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}/lib $i
+            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib:`pwd`/lib $i
         done
       ''}
       
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 693a53cf428c..691c301ebc20 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -167,7 +167,6 @@ rec {
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
   };
-
   
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv jdk ant gnumake gawk file which;
diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh
index 92abb18f25f3..c14c060fc677 100755
--- a/pkgs/development/mobile/androidenv/fetch.sh
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -5,9 +5,9 @@ android list sdk | grep 'Parse XML:' | cut -f8- -d\  # | xargs -n 1 curl -O
 
 # we skip the intel addons, as they are Windows+osX only
 # we skip the default sys-img (arm?) because it is empty
-curl -o repository-10.xml https://dl-ssl.google.com/android/repository/repository-10.xml
-curl -o addon.xml        https://dl-ssl.google.com/android/repository/addon.xml
-curl -o sys-img.xml https://dl-ssl.google.com/android/repository/sys-img/android/sys-img.xml
+curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml
+curl -o addon.xml         https://dl.google.com/android/repository/addon.xml
+curl -o sys-img.xml       https://dl.google.com/android/repository/sys-img/android/sys-img.xml
 
 ./generate-addons.sh
 ./generate-platforms.sh
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
index a43731fdd08c..9658088c7fb6 100644
--- a/pkgs/development/mobile/androidenv/generate-addons.xsl
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -25,7 +25,7 @@ in
   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 {
-        url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
+        url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
         sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
       };
       meta = {
@@ -39,7 +39,7 @@ in
   android_support_extra = buildGoogleApis {
     name = "android_support_extra";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
+      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
       sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
     };
     meta = {
@@ -51,7 +51,7 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
+      url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
       sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
     };
     meta = {
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
index 58d3ba58d379..ce89f6a8036e 100755
--- a/pkgs/development/mobile/androidenv/generate-platforms.sh
+++ b/pkgs/development/mobile/androidenv/generate-platforms.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-xsltproc --stringparam os linux generate-platforms.xsl repository-10.xml > platforms-linux.nix
-xsltproc --stringparam os macosx generate-platforms.xsl repository-10.xml > platforms-macosx.nix
+xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix
+xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index 7851f4899bf1..1c80cde5bb34 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/10">
+  xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
 
   <xsl:param name="os" />
   <xsl:output omit-xml-declaration="yes" indent="no" />
@@ -13,7 +13,7 @@
         <xsl:value-of select="$raw-url"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>https://dl-ssl.google.com/android/repository/</xsl:text>
+        <xsl:text>https://dl.google.com/android/repository/</xsl:text>
         <xsl:value-of select="$raw-url"/>
       </xsl:otherwise>
     </xsl:choose>
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index aa1e05e85a0e..c31e81f4bf8f 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -11,7 +11,7 @@
   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 {
-      url = <xsl:if test="not(starts-with(sdk:archives/sdk:archive/sdk:url, 'https://'))">https://dl-ssl.google.com/android/repository/sys-img/android/</xsl:if><xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
+      url = <xsl:if test="not(starts-with(sdk:archives/sdk:archive/sdk:url, 'https://'))">https://dl.google.com/android/repository/sys-img/android/</xsl:if><xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
       sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
     };
   };
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 1be54adaaed7..d217d57643dc 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,20 +1,16 @@
 {stdenv, stdenv_32bit, fetchurl, unzip}:
 
-let
-  version = "22";
-
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  version = "23.0.1";
   name = "android-platform-tools-r${version}";
   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 = "1kbp5fzfdas6c431n53a9w0z0182ihhadd1h8a64m1alkw0swr41";
+      url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
+      sha1 = "94dcc5072b3d0d74cc69e4101958b6c2e227e738";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
-      sha256 = "0r359xxicn7zw9z0jbrmsppx1372fijg09ck907gg8x1cvzj2ry0";
+      url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
+      sha1 = "c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f";
     }
     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 cf509cdff97f..cc21ce2dbeb4 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -163,7 +163,7 @@ in
   platform_14 = buildPlatform {
     name = "android-platform-4.0";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-14_r04.zip;
+      url = https://dl.google.com/android/repository/android-14_r04.zip;
       sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
     };
     meta = {
@@ -175,7 +175,7 @@ in
   platform_15 = buildPlatform {
     name = "android-platform-4.0.3";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-15_r05.zip;
+      url = https://dl.google.com/android/repository/android-15_r05.zip;
       sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
     };
     meta = {
@@ -187,7 +187,7 @@ in
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r05.zip;
+      url = https://dl.google.com/android/repository/android-16_r05.zip;
       sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
     };
     meta = {
@@ -199,7 +199,7 @@ in
   platform_17 = buildPlatform {
     name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r03.zip;
+      url = https://dl.google.com/android/repository/android-17_r03.zip;
       sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
     };
     meta = {
@@ -211,7 +211,7 @@ in
   platform_18 = buildPlatform {
     name = "android-platform-4.3.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-18_r03.zip;
+      url = https://dl.google.com/android/repository/android-18_r03.zip;
       sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
     };
     meta = {
@@ -223,7 +223,7 @@ in
   platform_19 = buildPlatform {
     name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r04.zip;
+      url = https://dl.google.com/android/repository/android-19_r04.zip;
       sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
     };
     meta = {
@@ -235,7 +235,7 @@ in
   platform_20 = buildPlatform {
     name = "android-platform-4.4W.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-20_r02.zip;
+      url = https://dl.google.com/android/repository/android-20_r02.zip;
       sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
     };
     meta = {
@@ -247,7 +247,7 @@ in
   platform_21 = buildPlatform {
     name = "android-platform-5.0.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-21_r02.zip;
+      url = https://dl.google.com/android/repository/android-21_r02.zip;
       sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
     };
     meta = {
@@ -259,7 +259,7 @@ in
   platform_22 = buildPlatform {
     name = "android-platform-5.1.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-22_r02.zip;
+      url = https://dl.google.com/android/repository/android-22_r02.zip;
       sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
     };
     meta = {
@@ -268,4 +268,16 @@ in
     };
   };
 
+  platform_23 = buildPlatform {
+    name = "android-platform-6.0";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/android-23_r01.zip;
+      sha1 = "cbccca8d3127e894845556ce999b28281de541bd";
+    };
+    meta = {
+      description = "Android SDK Platform 6.0";
+
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index c9ec3dd6e840..c6d83f711084 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -163,7 +163,7 @@ in
   platform_14 = buildPlatform {
     name = "android-platform-4.0";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-14_r04.zip;
+      url = https://dl.google.com/android/repository/android-14_r04.zip;
       sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
     };
     meta = {
@@ -175,7 +175,7 @@ in
   platform_15 = buildPlatform {
     name = "android-platform-4.0.3";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-15_r05.zip;
+      url = https://dl.google.com/android/repository/android-15_r05.zip;
       sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
     };
     meta = {
@@ -187,7 +187,7 @@ in
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r05.zip;
+      url = https://dl.google.com/android/repository/android-16_r05.zip;
       sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
     };
     meta = {
@@ -199,7 +199,7 @@ in
   platform_17 = buildPlatform {
     name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r03.zip;
+      url = https://dl.google.com/android/repository/android-17_r03.zip;
       sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
     };
     meta = {
@@ -211,7 +211,7 @@ in
   platform_18 = buildPlatform {
     name = "android-platform-4.3.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-18_r03.zip;
+      url = https://dl.google.com/android/repository/android-18_r03.zip;
       sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
     };
     meta = {
@@ -223,7 +223,7 @@ in
   platform_19 = buildPlatform {
     name = "android-platform-4.4.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-19_r04.zip;
+      url = https://dl.google.com/android/repository/android-19_r04.zip;
       sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
     };
     meta = {
@@ -235,7 +235,7 @@ in
   platform_20 = buildPlatform {
     name = "android-platform-4.4W.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-20_r02.zip;
+      url = https://dl.google.com/android/repository/android-20_r02.zip;
       sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
     };
     meta = {
@@ -247,7 +247,7 @@ in
   platform_21 = buildPlatform {
     name = "android-platform-5.0.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-21_r02.zip;
+      url = https://dl.google.com/android/repository/android-21_r02.zip;
       sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
     };
     meta = {
@@ -259,7 +259,7 @@ in
   platform_22 = buildPlatform {
     name = "android-platform-5.1.1";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-22_r02.zip;
+      url = https://dl.google.com/android/repository/android-22_r02.zip;
       sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
     };
     meta = {
@@ -268,4 +268,16 @@ in
     };
   };
 
+  platform_23 = buildPlatform {
+    name = "android-platform-6.0";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/android-23_r01.zip;
+      sha1 = "cbccca8d3127e894845556ce999b28281de541bd";
+    };
+    meta = {
+      description = "Android SDK Platform 6.0";
+
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-11.xml
similarity index 90%
rename from pkgs/development/mobile/androidenv/repository-10.xml
rename to pkgs/development/mobile/androidenv/repository-11.xml
index fa07307e01e1..1495aae4286d 100644
--- a/pkgs/development/mobile/androidenv/repository-10.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <sdk:license id="android-sdk-license" type="text">To get started with the Android SDK, you must agree to the following terms and conditions.
 
@@ -285,6 +285,49 @@ June 2014.
 
     <!-- PLATFORMS ........................ -->
 
+    <sdk:ndk>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android NDK</sdk:description>
+        <sdk:archives>
+            <sdk:archive>
+            <sdk:size>1083342126</sdk:size>
+            <sdk:checksum type="sha1">6be8598e4ed3d9dd42998c8cb666f0ee502b1294</sdk:checksum>
+            <sdk:url>https://dl-ssl.google.com/android/repository/android-ndk-r10e-darwin-x86_64.zip</sdk:url>
+            <sdk:host-os>macosx</sdk:host-os>
+            <sdk:host-bits>64</sdk:host-bits>
+        </sdk:archive>
+            <sdk:archive>
+            <sdk:size>1110915721</sdk:size>
+            <sdk:checksum type="sha1">f692681b007071103277f6edc6f91cb5c5494a32</sdk:checksum>
+            <sdk:url>https://dl-ssl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip</sdk:url>
+            <sdk:host-os>linux</sdk:host-os>
+            <sdk:host-bits>64</sdk:host-bits>
+        </sdk:archive>
+            <sdk:archive>
+            <sdk:size>1113873239</sdk:size>
+            <sdk:checksum type="sha1">d3510a0e298f6d3b13dc0283bfd92951ccd3a281</sdk:checksum>
+            <sdk:url>https://dl-ssl.google.com/android/repository/android-ndk-r10e-linux-x86.zip</sdk:url>
+            <sdk:host-os>linux</sdk:host-os>
+            <sdk:host-bits>32</sdk:host-bits>
+        </sdk:archive>
+            <sdk:archive>
+            <sdk:size>1066110352</sdk:size>
+            <sdk:checksum type="sha1">a29f3ae41fb02b64ca8ad2b0903f74356f953d9f</sdk:checksum>
+            <sdk:url>https://dl-ssl.google.com/android/repository/android-ndk-r10e-windows-x86_64.zip</sdk:url>
+            <sdk:host-os>windows</sdk:host-os>
+            <sdk:host-bits>64</sdk:host-bits>
+        </sdk:archive>
+            <sdk:archive>
+            <sdk:size>1029711228</sdk:size>
+            <sdk:checksum type="sha1">1d0b8f2835be741f3048fb03c0a3e9f71ab7f357</sdk:checksum>
+            <sdk:url>https://dl-ssl.google.com/android/repository/android-ndk-r10e-windows-x86.zip</sdk:url>
+            <sdk:host-os>windows</sdk:host-os>
+            <sdk:host-bits>32</sdk:host-bits>
+        </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:ndk>
+
     <sdk:platform>
         <sdk:version>1.1</sdk:version>
         <sdk:api-level>2</sdk:api-level>
@@ -858,6 +901,29 @@ June 2014.
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
+    <sdk:platform>
+        <!-- Generated at Fri Aug 14 15:30:35 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 6.0</sdk:description>
+        <sdk:version>6.0</sdk:version>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>22</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>15</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>70408061</sdk:size>
+                <sdk:checksum type="sha1">cbccca8d3127e894845556ce999b28281de541bd</sdk:checksum>
+                <sdk:url>android-23_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
     <!-- SAMPLES ........................ -->
 
     <!-- Generated on Mon Feb 22 13:39:38 PST 2010 using eclair 25887: Samples. -->
@@ -1105,14 +1171,28 @@ June 2014.
     </sdk:sample>
 
     <sdk:sample>
-        <!-- Generated at Mon Mar  2 16:26:21 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
-        <sdk:revision>5</sdk:revision>
+        <!-- Generated at Tue May 28 14:48:43 2015 from git_lmp-mr1-ub-dev @ 1966220 -->
+        <sdk:revision>6</sdk:revision>
         <sdk:api-level>22</sdk:api-level>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>107981157</sdk:size>
-                <sdk:checksum type="sha1">dbc5cc27b5d15acc25cd6b94b8c2971806b70bb0</sdk:checksum>
-                <sdk:url>samples-22_r05.zip</sdk:url>
+                <sdk:size>124512215</sdk:size>
+                <sdk:checksum type="sha1">1f6f4a81a8f19a9b9c9bf4adb64a91330a861c7f</sdk:checksum>
+                <sdk:url>samples-22_r06.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
+    <sdk:sample>
+        <!-- Generated at Fri Aug 14 15:30:59 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>127582326</sdk:size>
+                <sdk:checksum type="sha1">94d2857476987cfb7b18c8be61755c21b0a6e599</sdk:checksum>
+                <sdk:url>samples-23_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -1121,35 +1201,66 @@ June 2014.
     <!-- PLATFORM-TOOLS ........................ -->
 
     <sdk:platform-tool>
-        <!-- Generated at Mon Mar  2 16:26:07 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <!-- Generated at Wed Sep  9 14:16:45 2015 from git_mnc-sdk-release @ 2240729 -->
         <sdk:revision>
-            <sdk:major>22</sdk:major>
+            <sdk:major>23</sdk:major>
             <sdk:minor>0</sdk:minor>
-            <sdk:micro>0</sdk:micro>
+            <sdk:micro>1</sdk:micro>
         </sdk:revision>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>1848028</sdk:size>
-                <sdk:checksum type="sha1">720214bd29d08eb82673cd81a8159b083eef19d7</sdk:checksum>
-                <sdk:url>platform-tools_r22-windows.zip</sdk:url>
+                <sdk:size>2402978</sdk:size>
+                <sdk:checksum type="sha1">8f32d5f724618ad58e71909cc963ae006d0867b0</sdk:checksum>
+                <sdk:url>platform-tools_r23.0.1-windows.zip</sdk:url>
                 <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>1751911</sdk:size>
-                <sdk:checksum type="sha1">b78be9cc31cf9f9fe0609e29a6a133beacf03b52</sdk:checksum>
-                <sdk:url>platform-tools_r22-linux.zip</sdk:url>
+                <sdk:size>2520021</sdk:size>
+                <sdk:checksum type="sha1">94dcc5072b3d0d74cc69e4101958b6c2e227e738</sdk:checksum>
+                <sdk:url>platform-tools_r23.0.1-linux.zip</sdk:url>
                 <sdk:host-os>linux</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>1743025</sdk:size>
-                <sdk:checksum type="sha1">ddc96385bccf8a15d4f8a11eb1cb9d2a08a531c8</sdk:checksum>
-                <sdk:url>platform-tools_r22-macosx.zip</sdk:url>
+                <sdk:size>2489850</sdk:size>
+                <sdk:checksum type="sha1">c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f</sdk:checksum>
+                <sdk:url>platform-tools_r23.0.1-macosx.zip</sdk:url>
                 <sdk:host-os>macosx</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform-tool>
 
+    <sdk:platform-tool>
+        <!-- Generated at Thu Sep 17 09:08:50 2015 from git_stage-aosp-master @ 2261113 -->
+        <sdk:revision>
+            <sdk:major>23</sdk:major>
+            <sdk:minor>1</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+            <sdk:preview>1</sdk:preview>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>2594786</sdk:size>
+                <sdk:checksum type="sha1">0467934bfbbb8bd72959f7365e1a3ce2683b68f6</sdk:checksum>
+                <sdk:url>platform-tools_r23.1_rc1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>2873688</sdk:size>
+                <sdk:checksum type="sha1">b04d1dbdfd734b0263fb04182e76ff565447f498</sdk:checksum>
+                <sdk:url>platform-tools_r23.1_rc1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>2752137</sdk:size>
+                <sdk:checksum type="sha1">c92d9fdfdf79e04a69412492d6480d4f937d1bcc</sdk:checksum>
+                <sdk:url>platform-tools_r23.1_rc1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-preview-license"/>
+    </sdk:platform-tool>
+
     <!-- BUILD-TOOLS ........................ -->
 
     <sdk:build-tool>
@@ -1708,35 +1819,97 @@ June 2014.
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:build-tool>
 
+
+    <sdk:build-tool>
+        <!-- Generated at Fri Aug 14 15:30:27 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>
+            <sdk:major>23</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
+        </sdk:revision>
+        <sdk:obsolete/>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>38570715</sdk:size>
+                <sdk:checksum type="sha1">3874948f35f2f8946597679cc6e9151449f23b5d</sdk:checksum>
+                <sdk:url>build-tools_r23-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>39080519</sdk:size>
+                <sdk:checksum type="sha1">c1d6209212b01469f80fa804e0c1d39a06bc9060</sdk:checksum>
+                <sdk:url>build-tools_r23-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>38070540</sdk:size>
+                <sdk:checksum type="sha1">90ba6e716f7703a236cd44b2e71c5ff430855a03</sdk:checksum>
+                <sdk:url>build-tools_r23-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <sdk:build-tool>
+        <!-- Generated at Tue Aug 25 11:51:16 2015 from git_mnc-sdk-release @ 2201634 -->
+        <sdk:revision>
+            <sdk:major>23</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>38558889</sdk:size>
+                <sdk:checksum type="sha1">cc1d37231d228f7a6f130e1f8d8c940052f0f8ab</sdk:checksum>
+                <sdk:url>build-tools_r23.0.1-windows.zip</sdk:url>
+                <sdk:host-os>windows</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>39069295</sdk:size>
+                <sdk:checksum type="sha1">b6ba7c399d5fa487d95289d8832e4ad943aed556</sdk:checksum>
+                <sdk:url>build-tools_r23.0.1-linux.zip</sdk:url>
+                <sdk:host-os>linux</sdk:host-os>
+            </sdk:archive>
+            <sdk:archive>
+                <sdk:size>38059328</sdk:size>
+                <sdk:checksum type="sha1">d96ec1522721e9a179ae2c591c99f75d31d39718</sdk:checksum>
+                <sdk:url>build-tools_r23.0.1-macosx.zip</sdk:url>
+                <sdk:host-os>macosx</sdk:host-os>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
     <!-- TOOLS ........................ -->
 
     <sdk:tool>
-        <!-- Generated at Fri Feb 27 14:06:48 2015 from aosp-studio-1.1-release @ 1758498 -->
+        <!-- Generated at Fri Sep 18 12:00:58 2015 from aosp-emu-1.4-release @ 2265294 -->
         <sdk:revision>
             <sdk:major>24</sdk:major>
-            <sdk:minor>1</sdk:minor>
-            <sdk:micro>2</sdk:micro>
+            <sdk:minor>4</sdk:minor>
+            <sdk:micro>0</sdk:micro>
         </sdk:revision>
         <sdk:min-platform-tools-rev>
             <sdk:major>20</sdk:major>
         </sdk:min-platform-tools-rev>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>159505060</sdk:size>
-                <sdk:checksum type="sha1">c20ffa023618c5cb6953131d6dbb0c628a3a1a14</sdk:checksum>
-                <sdk:url>tools_r24.1.2-windows.zip</sdk:url>
+                <sdk:size>197016004</sdk:size>
+                <sdk:checksum type="sha1">c3b5d466a8f75d86db79d3c9b8724a4b1d287f5a</sdk:checksum>
+                <sdk:url>tools_r24.4-windows.zip</sdk:url>
                 <sdk:host-os>windows</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>169061591</sdk:size>
-                <sdk:checksum type="sha1">c7c30f6da6eff6323260f0353ccaacc984ea6b3e</sdk:checksum>
-                <sdk:url>tools_r24.1.2-linux.zip</sdk:url>
+                <sdk:size>320385195</sdk:size>
+                <sdk:checksum type="sha1">f120858b1f7eedb573608d4ebf16a046d8833024</sdk:checksum>
+                <sdk:url>tools_r24.4-linux.zip</sdk:url>
                 <sdk:host-os>linux</sdk:host-os>
             </sdk:archive>
             <sdk:archive>
-                <sdk:size>89081357</sdk:size>
-                <sdk:checksum type="sha1">e32ba2fb21cc92ec4f1f01b5cb9a06f666eee460</sdk:checksum>
-                <sdk:url>tools_r24.1.2-macosx.zip</sdk:url>
+                <sdk:size>101816531</sdk:size>
+                <sdk:checksum type="sha1">b83ba3875b4e701b978a11d6506e8997907efca1</sdk:checksum>
+                <sdk:url>tools_r24.4-macosx.zip</sdk:url>
                 <sdk:host-os>macosx</sdk:host-os>
             </sdk:archive>
         </sdk:archives>
@@ -1746,14 +1919,14 @@ June 2014.
     <!-- DOCS ........................ -->
 
     <sdk:doc>
-        <!-- Generated at Mon Mar  2 16:25:22 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <!-- Manually added entry on Fri Aug  14 17:05:00 2015  -->
         <sdk:revision>1</sdk:revision>
-        <sdk:api-level>22</sdk:api-level>
+        <sdk:api-level>23</sdk:api-level>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>296467484</sdk:size>
-                <sdk:checksum type="sha1">419791c49fa0a305a06966fd1734cf5b0498ea1a</sdk:checksum>
-                <sdk:url>docs-22_r01.zip</sdk:url>
+                <sdk:size>332171437</sdk:size>
+                <sdk:checksum type="sha1">060ebab2f74861e1ddd9136df26b837312bc087f</sdk:checksum>
+                <sdk:url>docs-23_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -1888,5 +2061,17 @@ June 2014.
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:source>
 
+    <sdk:source>
+        <!-- Generated at Fri Aug 14 15:31:06 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>31771965</sdk:size>
+                <sdk:checksum type="sha1">b0f15da2762b42f543c5e364c2b15b198cc99cc2</sdk:checksum>
+                <sdk:url>sources-23_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
 </sdk:sdk-repository>
-
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index c0c2fb47fcdd..436936f7c422 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 = "14";
+  version = "21";
   name = "android-support-repository-r${version}";
   src = fetchurl {
-    url = "http://dl-ssl.google.com/android/repository/android_m2repository_r${version}.zip";
-    sha256 = "027mmfzvs07nbp28vn6c6cgszqdrmmgwdfzda87936lpi5dwg34p";
+    url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
+    sha1 = "acb915c5d2c730bf98303c0cd0122bedb2954cb3";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
index 772ecad8f8a0..17125c60dd2e 100644
--- a/pkgs/development/mobile/androidenv/support.nix
+++ b/pkgs/development/mobile/androidenv/support.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "22.1.1";
+  version = "23.0.1";
   name = "android-support-r${version}";
   src = fetchurl {
-    url = "https://dl-ssl.google.com/android/repository/support_r${version}.zip";
-    sha1 = "jifv8yjg5jrycf8zd0lfsra00yscggc8";
+    url = "https://dl.google.com/android/repository/support_r${version}.zip";
+    sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9";
   };
   
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index ef6507035f3b..66a674042bd6 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -436,16 +436,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Fri Mar 30 10:43:23 2012 from ics-mr1 @ 302030 -->
-        <sdk:revision>2</sdk:revision>
+        <!-- Generated at Tue Mar 10 10:46:44 2015 from git_ics-mr1 @ 1741834 -->
+        <sdk:revision>3</sdk:revision>
         <sdk:description>Android SDK Platform 4.0.3</sdk:description>
         <sdk:api-level>15</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>96227377</sdk:size>
-                <sdk:checksum type="sha1">1bf977d6cb4e0ad38dceac0c4863d1caa21f326e</sdk:checksum>
-                <sdk:url>sysimg_armv7a-15_r02.zip</sdk:url>
+                <sdk:size>96240395</sdk:size>
+                <sdk:checksum type="sha1">0a47f586e172b1cf3db2ada857a70c2bdec24ef8</sdk:checksum>
+                <sdk:url>sysimg_armv7a-15_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -453,16 +453,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Tue Oct  9 13:43:08 2012 from git_jb-dev @ 495790 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform 4.1</sdk:description>
+        <!-- Generated at Tue Mar 10 10:30:46 2015 from git_jb-dev @ 1741836 -->
+        <sdk:revision>4</sdk:revision>
+        <sdk:description>Android SDK Platform 4.1.2</sdk:description>
         <sdk:api-level>16</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>112528368</sdk:size>
-                <sdk:checksum type="sha1">d1cddb23f17aad5821a089c403d4cddad2cf9ef7</sdk:checksum>
-                <sdk:url>sysimg_armv7a-16_r03.zip</sdk:url>
+                <sdk:size>112608076</sdk:size>
+                <sdk:checksum type="sha1">39c093ea755098f0ee79f607be7df9e54ba4943f</sdk:checksum>
+                <sdk:url>sysimg_armv7a-16_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -470,16 +470,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Wed Feb 13 11:29:12 2013 from git_jb-mr1.1-dev @ 576024 -->
-        <sdk:revision>2</sdk:revision>
+        <!-- Generated at Mon Mar  9 18:24:53 2015 from git_jb-mr1.1-dev @ 1742939 -->
+        <sdk:revision>3</sdk:revision>
         <sdk:description>Android SDK Platform 4.2.2</sdk:description>
         <sdk:api-level>17</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>116553808</sdk:size>
-                <sdk:checksum type="sha1">1c321cda1af793b84d47d1a8d15f85444d265e3c</sdk:checksum>
-                <sdk:url>sysimg_armv7a-17_r02.zip</sdk:url>
+                <sdk:size>118663847</sdk:size>
+                <sdk:checksum type="sha1">97cfad22b51c8475e228b207dd36dbef1c18fa38</sdk:checksum>
+                <sdk:url>sysimg_armv7a-17_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -487,16 +487,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Mon Aug 12 12:43:28 2013 from git_jb-mr2-dev @ 774058 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <!-- Generated at Mon Mar  9 17:40:24 2015 from git_jb-mr2-dev @ 1743067 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3.1</sdk:description>
         <sdk:api-level>18</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>125457135</sdk:size>
-                <sdk:checksum type="sha1">4a1a93200210d8c42793324362868846f67401ab</sdk:checksum>
-                <sdk:url>sysimg_armv7a-18_r02.zip</sdk:url>
+                <sdk:size>125503391</sdk:size>
+                <sdk:checksum type="sha1">2d7d51f4d2742744766511e5d6b491bd49161c51</sdk:checksum>
+                <sdk:url>sysimg_armv7a-18_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -504,16 +504,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Thu Dec  5 14:04:05 2013 from git_klp-dev @ 938007 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.4.2</sdk:description>
+        <!-- Generated at Mon Mar  9 16:57:24 2015 from git_klp-dev @ 1743154 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4.4</sdk:description>
         <sdk:api-level>19</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>158478012</sdk:size>
-                <sdk:checksum type="sha1">e0d375397e28e3d5d9577a00132463a4696248e5</sdk:checksum>
-                <sdk:url>sysimg_armv7a-19_r02.zip</sdk:url>
+                <sdk:size>159399028</sdk:size>
+                <sdk:checksum type="sha1">5daf7718e3ab03d9bd8792b492dd305f386ef12f</sdk:checksum>
+                <sdk:url>sysimg_armv7a-19_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -537,19 +537,36 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:system-image>
 
+    <sdk:system-image>
+        <!-- Generated at Mon Mar  2 11:01:02 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 5.1</sdk:description>
+        <sdk:api-level>22</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>193687339</sdk:size>
+                <sdk:checksum type="sha1">2aa6a887ee75dcf3ac34627853d561997792fcb8</sdk:checksum>
+                <sdk:url>sysimg_arm-22_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
     <!-- X86 SYSTEM IMAGES ........................ -->
 
     <sdk:system-image>
         <sdk:description>Android SDK Platform 2.3.7</sdk:description>
-        <sdk:revision>2</sdk:revision>
+        <sdk:revision>3</sdk:revision>
         <sdk:api-level>10</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
         <sdk:uses-license ref="intel-android-sysimage-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>55463895</sdk:size>
-                <sdk:checksum type="sha1">34e2436f69606cdfe35d3ef9112f0c64e3ff021d</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip</sdk:url>
+                <sdk:size>66997702</sdk:size>
+                <sdk:checksum type="sha1">6b8539eaca9685d2d3289bf8e6d21d366d791326</sdk:checksum>
+                <sdk:url>sysimg_x86-10_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:tag-id>default</sdk:tag-id>
@@ -557,15 +574,15 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 
     <sdk:system-image>
         <sdk:description>Android SDK Platform 4.0.4</sdk:description>
-        <sdk:revision>1</sdk:revision>
+        <sdk:revision>2</sdk:revision>
         <sdk:api-level>15</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
         <sdk:uses-license ref="intel-android-sysimage-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>112619605</sdk:size>
-                <sdk:checksum type="sha1">d540325952e0f097509622b9e685737584b83e40</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip</sdk:url>
+                <sdk:size>109019058</sdk:size>
+                <sdk:checksum type="sha1">56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f</sdk:checksum>
+                <sdk:url>sysimg_x86-15_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:tag-id>default</sdk:tag-id>
@@ -573,63 +590,65 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 
     <sdk:system-image>
         <sdk:description>Android SDK Platform 4.1.1</sdk:description>
-        <sdk:revision>1</sdk:revision>
+        <sdk:revision>2</sdk:revision>
         <sdk:api-level>16</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
         <sdk:uses-license ref="intel-android-sysimage-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>131840348</sdk:size>
-                <sdk:checksum type="sha1">9d35bcaa4f9b40443941f32b8a50337f413c021a</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip</sdk:url>
+                <sdk:size>135252264</sdk:size>
+                <sdk:checksum type="sha1">36c2a2e394bcb3290583ce09815eae7711d0b2c2</sdk:checksum>
+                <sdk:url>sysimg_x86-16_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:tag-id>default</sdk:tag-id>
     </sdk:system-image>
 
     <sdk:system-image>
-        <sdk:description>Android SDK Platform 4.2</sdk:description>
-        <sdk:revision>1</sdk:revision>
+        <!-- Generated at Mon Mar  9 18:25:14 2015 from git_jb-mr1.1-dev @ 1742939 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
         <sdk:api-level>17</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
-        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>138799122</sdk:size>
-                <sdk:checksum type="sha1">ddb3313e8dcd07926003f7b828eafea1115ea35b</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip</sdk:url>
+                <sdk:size>136075512</sdk:size>
+                <sdk:checksum type="sha1">bd8c7c5411431af7e051cbe961be430fc31e773d</sdk:checksum>
+                <sdk:url>sysimg_x86-17_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:tag-id>default</sdk:tag-id>
     </sdk:system-image>
 
     <sdk:system-image>
-        <sdk:description>Android SDK Platform 4.3</sdk:description>
-        <sdk:revision>1</sdk:revision>
+        <!-- Generated at Mon Mar  9 17:40:48 2015 from git_jb-mr2-dev @ 1743067 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3.1</sdk:description>
         <sdk:api-level>18</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
-        <sdk:uses-license ref="intel-android-sysimage-license"/>
+        <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>155656419</sdk:size>
-                <sdk:checksum type="sha1">f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip</sdk:url>
+                <sdk:size>143899902</sdk:size>
+                <sdk:checksum type="sha1">ab3de121a44fca43ac3aa83f7d68cc47fc643ee8</sdk:checksum>
+                <sdk:url>sysimg_x86-18_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:tag-id>default</sdk:tag-id>
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Thu Feb 20 15:52:49 2014 from git_klp-sdk-release @ 999428 -->
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Android SDK Platform 4.4.2</sdk:description>
+        <!-- Generated at Mon Mar  9 16:57:47 2015 from git_klp-dev @ 1743154 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 4.4.4</sdk:description>
         <sdk:api-level>19</sdk:api-level>
         <sdk:abi>x86</sdk:abi>
         <sdk:archives>
             <sdk:archive>
-                <sdk:size>178922720</sdk:size>
-                <sdk:checksum type="sha1">8889cb418984a2a7916a359da7c429d2431ed060</sdk:checksum>
-                <sdk:url>sysimg_x86-19_r02.zip</sdk:url>
+                <sdk:size>180245668</sdk:size>
+                <sdk:checksum type="sha1">3782f3ebac5e54b3de454570add401989515ffca</sdk:checksum>
+                <sdk:url>sysimg_x86-19_r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -704,22 +723,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:system-image>
 
-    <sdk:system-image>
-        <!-- Generated at Mon Mar  2 11:01:02 2015 from git_lmp-mr1-sdk-release @ 1737576 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 5.1</sdk:description>
-        <sdk:api-level>22</sdk:api-level>
-        <sdk:abi>armeabi-v7a</sdk:abi>
-        <sdk:tag-id>default</sdk:tag-id>
-        <sdk:archives>
-            <sdk:archive>
-                <sdk:size>193687339</sdk:size>
-                <sdk:checksum type="sha1">2aa6a887ee75dcf3ac34627853d561997792fcb8</sdk:checksum>
-                <sdk:url>sysimg_arm-22_r01.zip</sdk:url>
-            </sdk:archive>
-        </sdk:archives>
-        <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:system-image>
     <!-- MIPS SYSTEM IMAGES ........................ -->
 
     <sdk:system-image>
@@ -776,4 +779,54 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
         <sdk:tag-id>default</sdk:tag-id>
     </sdk:system-image>
 
+    <sdk:system-image>
+        <!-- Generated at Fri Aug 14 15:40:56 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 6.0</sdk:description>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:abi>x86</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>240896796</sdk:size>
+                <sdk:checksum type="sha1">3cb2e8efb575c35a558b091eac7e1bc5843f5f12</sdk:checksum>
+                <sdk:url>sysimg_x86-23_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Fri Aug 14 15:41:23 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 6.0</sdk:description>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:abi>x86_64</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>337897181</sdk:size>
+                <sdk:checksum type="sha1">226510856431bc4a73690540a8d7cbad974bedd3</sdk:checksum>
+                <sdk:url>sysimg_x86_64-23_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Fri Aug 14 15:41:43 2015 from git_mnc-release @ 2166767 -->
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Android SDK Platform 6.0</sdk:description>
+        <sdk:api-level>23</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:tag-id>default</sdk:tag-id>
+        <sdk:archives>
+            <sdk:archive>
+                <sdk:size>226879660</sdk:size>
+                <sdk:checksum type="sha1">7bb8768ec4333500192fd9627d4234f505fa98dc</sdk:checksum>
+                <sdk:url>sysimg_arm-23_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
 </sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 83ca0d498309..82bfce7a62fa 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -18,7 +18,7 @@ in
   sysimg_armeabi-v7a_14 = buildSystemImage {
     name = "sysimg-armeabi-v7a-14";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
       sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
     };
   };
@@ -26,103 +26,111 @@ in
   sysimg_armeabi-v7a_15 = buildSystemImage {
     name = "sysimg-armeabi-v7a-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r02.zip;
-      sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip;
+      sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8";
     };
   };
 
   sysimg_armeabi-v7a_16 = buildSystemImage {
     name = "sysimg-armeabi-v7a-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r03.zip;
-      sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r02.zip;
-      sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r02.zip;
-      sha1 = "4a1a93200210d8c42793324362868846f67401ab";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r02.zip;
-      sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip;
-      sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip;
+      sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326";
     };
   };
 
   sysimg_x86_15 = buildSystemImage {
     name = "sysimg-x86-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip;
-      sha1 = "d540325952e0f097509622b9e685737584b83e40";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip;
+      sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f";
     };
   };
 
   sysimg_x86_16 = buildSystemImage {
     name = "sysimg-x86-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip;
-      sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip;
-      sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip;
-      sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_x86-19_r02.zip;
-      sha1 = "8889cb418984a2a7916a359da7c429d2431ed060";
+      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-ssl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
       sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f";
     };
   };
@@ -130,7 +138,7 @@ in
   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;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip;
       sha1 = "2f205b728695d84488156f4846beb83a353ea64b";
     };
   };
@@ -138,7 +146,7 @@ in
   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;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip;
       sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15";
     };
   };
@@ -146,23 +154,15 @@ in
   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;
+      url = https://dl.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 {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
       sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
     };
   };
@@ -170,7 +170,7 @@ in
   sysimg_mips_16 = buildSystemImage {
     name = "sysimg-mips-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
       sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
     };
   };
@@ -178,8 +178,32 @@ in
   sysimg_mips_17 = buildSystemImage {
     name = "sysimg-mips-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
       sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
     };
   };
+
+  sysimg_x86_23 = buildSystemImage {
+    name = "sysimg-x86-23";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r03.zip;
+      sha1 = "3cb2e8efb575c35a558b091eac7e1bc5843f5f12";
+    };
+  };
+
+  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_r03.zip;
+      sha1 = "226510856431bc4a73690540a8d7cbad974bedd3";
+    };
+  };
+
+  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";
+    };
+  };
 }