Bump Android packages to newest versions, add androidsdk_5_0_1 to env

Detailed changes:
- android-sdk: update 23.0.2 -> 24.0.1
- android-platforms: add 5.0.1
- android-platform-tools: update 19 -> 21
- android-build-tools: update 20 -> 21.1.2
- android-support: update 18 -> 21
- android-support-repository: update 5 -> 9

This commit was authored by ewemoa, reviewed by me

8 files changed, 59 insertions, 27 deletions

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 533c605cf24a..9018f94b8b15 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -9,19 +9,19 @@
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "23.0.2";
-  
+  version = "24.0.1";
+
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
-      md5 = "94a8c62086a7398cc0e73e1c8e65f71e";
+      sha1 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
-      md5 = "322787b0e6c629d926c28690c79ac0d8";
+      sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54";
     }
     else throw "platform not ${stdenv.system} supported!";
-  
+
   buildCommand = ''
     mkdir -p $out/libexec
     cd $out/libexec
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 11beb29f3cea..dab1b92d1e42 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,18 +1,18 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
 
 stdenv.mkDerivation {
-  name = "android-build-tools-r20";
+  name = "android-build-tools-r21.1.2";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r20-linux.zip;
-      sha1 = "b688905526a5584d1327a662d871a635ff502758";
+      url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
+      sha1 = "5e35259843bf2926113a38368b08458735479658";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/build-tools_r20-macosx.zip;
-      sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
+      url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
+      sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
     }
     else throw "System ${stdenv.system} not supported!";
-  
+
   buildCommand = ''
     mkdir -p $out/build-tools
     cd $out/build-tools
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 37e4db458220..513b0763446d 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -128,6 +128,12 @@ rec {
     useGoogleAPIs = true;
   };
 
+  androidsdk_5_0_1 = androidsdk {
+    platformVersions = [ "21" ];
+    abiVersions = [ "armeabi-v7a" "x86" ];
+    useGoogleAPIs = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index a7a2661bd376..ee65951c8c0b 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,18 +1,23 @@
 {stdenv, stdenv_32bit, fetchurl, unzip}:
 
+let
+  version = "21";
+
+in
+
 stdenv.mkDerivation {
-  name = "android-platform-tools-r19";
+  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_r19-linux.zip;
-      sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b";
+      url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip";
+      sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip;
-      sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681";
+      url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
+      sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb";
     }
     else throw "System ${stdenv.system} not supported!";
-  
+
   buildCommand = ''
     mkdir -p $out
     cd $out
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index feb967d01082..4ce1e421478a 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -229,6 +229,16 @@ in
       
     };
   };
-    
+
+  platform_21 = buildPlatform {
+    name = "android-platform-5.0.1";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-21_r02.zip;
+      sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
+    };
+    meta = {
+      description = "Android SDK Platform 5.0.1";
+    };
+  };
+
 }
-  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 0e93ed9412be..1f41d8dda9e2 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -229,6 +229,17 @@ in
       
     };
   };
+
+  platform_21 = buildPlatform {
+    name = "android-platform-5.0.1";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-21_r02.zip;
+      sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
+    };
+    meta = {
+      description = "Android SDK Platform 5.0.1";
+    };
+  };
+
     
 }
-  
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index 66a532328b1b..6905cb24993f 100644
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "android-support-repository-r5";
+  name = "android-support-repository-r9";
   src = fetchurl {
-    url = http://dl-ssl.google.com/android/repository/android_m2repository_r05.zip;
-    sha1 = "2ee9723da079ba0d4fe2a185e00ded842de96f13";
+    url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip;
+    sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
index ca1988527e2c..d9d24f9bf9f4 100644
--- a/pkgs/development/mobile/androidenv/support.nix
+++ b/pkgs/development/mobile/androidenv/support.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "android-support-r18";
+  name = "android-support-r21";
   src = fetchurl {
-    url = https://dl-ssl.google.com/android/repository/support_r18.zip;
-    sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568";
+    url = https://dl-ssl.google.com/android/repository/support_r21.zip;
+    sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be";
   };
   
   buildCommand = ''
@@ -14,4 +14,4 @@ stdenv.mkDerivation {
   '';
   
   buildInputs = [ unzip ];
-}
\ No newline at end of file
+}