Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update/android studio #107669

Merged
merged 2 commits into from Dec 27, 2020
Merged

Update/android studio #107669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c12a3a3
androidStudioPackages.beta: 4.2.0.17 -> 4.2.0.18
meutraa Dec 26, 2020
e253027
androidStudioPackages.{canary,dev}: 20.3.1.2 -> 2020.3.1.3
meutraa Dec 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/applications/editors/android-studio/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ channel, pname, version, build, sha256Hash }:
{ channel, pname, version, build ? null, sha256Hash }:

{ alsaLib
, bash
Expand Down Expand Up @@ -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;
};

Expand Down
11 changes: 5 additions & 6 deletions pkgs/applications/editors/android-studio/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down