From 25205afb353c3c79bd1aa25709a3f4fbae953d1f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Apr 2019 20:24:43 +0200 Subject: [PATCH] android-studio: 3.3.2.0 -> 3.4.0.18 androidStudioPackages.beta: 3.4.0.17 -> 3.4.0.18 --- pkgs/applications/editors/android-studio/common.nix | 3 +-- pkgs/applications/editors/android-studio/default.nix | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index fdba9f7be77..10d06635788 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -39,12 +39,11 @@ let drvName = "android-studio-${channel}-${version}"; - archiveFormat = if builtins.elem channel [ "dev" "canary" ] then "tar.gz" else "zip"; androidStudio = stdenv.mkDerivation { name = drvName; src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.${archiveFormat}"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; sha256 = sha256Hash; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 80d84bcd2fd..34f50387f05 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,15 +8,11 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.3.2.0"; # "Android Studio 3.3.2" - build = "182.5314842"; - sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2"; - }; - betaVersion = { - version = "3.4.0.17"; # "Android Studio 3.4 RC 3" - build = "183.5400832"; - sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1"; + version = "3.4.0.18"; # "Android Studio 3.4.0" + build = "183.5452501"; + sha256Hash = "0i8wz9v6nxzr27a07cv2330i84v94pcl13gjwvpglp55hyzd8axd"; }; + betaVersion = stableVersion; latestVersion = { # canary & dev version = "3.5.0.10"; # "Android Studio 3.5 Canary 11" build = "191.5455988";