From 9e73f92769cf7dd167da76adac2e03056e791ba5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 12 Apr 2018 00:09:03 +0200 Subject: [PATCH] android-studio,android-studio-preview: 3.1.0.16 -> 3.1.1.0 --- .../editors/android-studio/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d7baa7f7c71c..41f0e9914327 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -7,6 +7,11 @@ let }; inherit (gnome2) GConf gnome_vfs; }; + stableVersion = { + version = "3.1.1.0"; # "Android Studio 3.1.1" + build = "173.4697961"; + sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; + }; latestVersion = { version = "3.2.0.9"; # "Android Studio 3.2 Canary 10" build = "181.4705630"; @@ -18,12 +23,9 @@ in rec { # Attributes are named by the corresponding release channels - stable = mkStudio { + stable = mkStudio (stableVersion // { pname = "android-studio"; #pname = "android-studio-stable"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable channel)"; @@ -36,20 +38,17 @@ in rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; - }; + }); - beta = mkStudio { + beta = mkStudio (stableVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; homepage = https://developer.android.com/studio/preview/index.html; }; - }; + }); dev = mkStudio (latestVersion // { pname = "android-studio-dev";