Merge pull request #93558 from galagora/update-android-studio

androidStudioPackages.beta: 4.0.0.16 -> 4.1.0.14
This commit is contained in:
Michael Weiss 2020-07-21 20:08:44 +02:00 committed by GitHub
commit 9a47c3b504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions

View File

@ -2928,6 +2928,12 @@
githubId = 7047019; githubId = 7047019;
name = "Florent Becker"; name = "Florent Becker";
}; };
galagora = {
email = "lightningstrikeiv@gmail.com";
github = "galagora";
githubId = 45048741;
name = "Alwanga Oyango";
};
gamb = { gamb = {
email = "adam.gamble@pm.me"; email = "adam.gamble@pm.me";
github = "gamb"; github = "gamb";
@ -5197,6 +5203,12 @@
github = "metadark"; github = "metadark";
githubId = 382041; githubId = 382041;
}; };
meutraa = {
email = "paul+nixpkgs@lost.host";
name = "Paul Meredith";
github = "meutraa";
githubId = 68550871;
};
mfossen = { mfossen = {
email = "msfossen@gmail.com"; email = "msfossen@gmail.com";
github = "mfossen"; github = "mfossen";

View File

@ -198,8 +198,12 @@ in runCommand
# binaries are also distributed as proprietary software (unlike the # binaries are also distributed as proprietary software (unlike the
# source-code itself). # source-code itself).
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; ([ ] maintainers = with maintainers; rec {
++ optional (channel == "stable") primeos); stable = [ meutraa ];
beta = [ galagora ];
canary = [ meutraa ];
dev = canary;
}."${channel}";
}; };
} }
'' ''

View File

@ -13,9 +13,9 @@ let
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
}; };
betaVersion = { betaVersion = {
version = "4.0.0.16"; # "Android Studio 4.0" version = "4.1.0.14"; # "Android Studio 4.1 Beta 4"
build = "193.6514223"; build = "201.6667167";
sha256Hash = "1sqj64vddwfrr9821habfz7dms9csvbp7b8gf1d027188b2lvh3h"; sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
}; };
latestVersion = { # canary & dev latestVersion = { # canary & dev
version = "4.2.0.4"; # "Android Studio 4.2 Canary 4" version = "4.2.0.4"; # "Android Studio 4.2 Canary 4"