Merge pull request #107669 from meutraa/update/android-studio

Update Android Studio
This commit is contained in:
Michael Weiss 2020-12-27 11:58:15 +01:00 committed by GitHub
commit 669e4df42a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View file

@ -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;
};

View file

@ -14,14 +14,13 @@ 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"
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