diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/applications/editors/android-studio | |
parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/android-studio')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/common.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/default.nix | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index a1465766f8bf..fdba9f7be774 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -39,11 +39,12 @@ 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.zip"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.${archiveFormat}"; sha256 = sha256Hash; }; @@ -141,6 +142,9 @@ in runCommand ''; preferLocalBuild = true; allowSubstitutes = false; + passthru = { + unwrapped = androidStudio; + }; meta = with stdenv.lib; { description = "The Official IDE for Android (${channel} channel)"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index f3e5602a7996..e5e5e179b890 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2"; }; betaVersion = { - version = "3.4.0.16"; # "Android Studio 3.4 RC 2" - build = "183.5370308"; - sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9"; + version = "3.4.0.17"; # "Android Studio 3.4 RC 3" + build = "183.5400832"; + sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1"; }; latestVersion = { # canary & dev - version = "3.5.0.6"; # "Android Studio 3.5 Canary 7" - build = "183.5346365"; - sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0"; + version = "3.5.0.9"; # "Android Studio 3.5 Canary 10" + build = "191.5416148"; + sha256Hash = "03d2x6bqasw417dxc7b8y65rral73xm2ci512gprmsvwy42k3mqi"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): |