1 files changed, 40 insertions, 28 deletions

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";