From c12a3a31ffebff7d55f7cdddf50408c1b083cc7f Mon Sep 17 00:00:00 2001 From: meutraa Date: Sat, 26 Dec 2020 20:38:02 +0000 Subject: [PATCH 1/2] androidStudioPackages.beta: 4.2.0.17 -> 4.2.0.18 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d94ad070536..9694eba538c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { - version = "4.2.0.17"; # "Android Studio 4.2 Beta 1" - build = "202.6987402"; - sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7"; + version = "4.2.0.18"; # "Android Studio 4.2 Beta 2" + build = "202.7008469"; + sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh"; }; latestVersion = { # canary & dev version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" From e2530276177417509b3d8dd385742c8989a508c0 Mon Sep 17 00:00:00 2001 From: meutraa Date: Sat, 26 Dec 2020 21:32:05 +0000 Subject: [PATCH 2/2] androidStudioPackages.{canary,dev}: 20.3.1.2 -> 2020.3.1.3 --- pkgs/applications/editors/android-studio/common.nix | 6 ++++-- pkgs/applications/editors/android-studio/default.nix | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 605d810b3d9..cbd156d78e0 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build, sha256Hash }: +{ channel, pname, version, build ? null, sha256Hash }: { alsaLib , bash @@ -53,11 +53,13 @@ let drvName = "android-studio-${channel}-${version}"; + filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz"; + androidStudio = stdenv.mkDerivation { name = "${drvName}-unwrapped"; src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}"; sha256 = sha256Hash; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 9694eba538c..d1eb7e58ef8 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,8 @@ let sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh"; }; latestVersion = { # canary & dev - version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" - build = "202.7006259"; - sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5"; + version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3" + sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx"; }; in { # Attributes are named by their corresponding release channels