1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 382066d1dbd1..4583066842af 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,5 @@
 { stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
     fontsConf = makeFontsConf {
@@ -6,16 +7,20 @@ let
     };
     inherit (gnome2) GConf gnome_vfs;
   };
+  latestVersion = {
+    version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
+    build = "173.4658582";
+    sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
+  };
 in rec {
   # Old alias
   preview = beta;
 
-  # Attributes are named by the channels
+  # Attributes are named by the corresponding release channels
 
-  # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
-    #pname = "android-studio-stable"; # TODO: Rename
+    #pname = "android-studio-stable"; # TODO: Rename and provide symlink
     version = "3.0.1.0"; # "Android Studio 3.0.1"
     build = "171.4443003";
     sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
@@ -33,13 +38,12 @@ in rec {
     };
   };
 
-  # linux-beta-bundle
   beta = mkStudio {
     pname = "android-studio-preview";
-    #pname = "android-studio-beta"; # TODO: Rename
-    version = "3.1.0.14"; # "Android Studio 3.1 RC 2"
-    build = "173.4640767";
-    sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8";
+    #pname = "android-studio-beta"; # TODO: Rename and provide symlink
+    version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
+    build = "173.4658569";
+    sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";
@@ -47,25 +51,19 @@ in rec {
     };
   };
 
-  dev = mkStudio {
+  dev = mkStudio (latestVersion // {
     pname = "android-studio-dev";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (dev channel)";
     };
-  };
+  });
 
-  canary = mkStudio {
+  canary = mkStudio (latestVersion // {
     pname = "android-studio-canary";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (canary channel)";
     };
-  };
+  });
 }