diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-20 00:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 00:01:37 +0000 |
| commit | 58084942717db80041787a1d3cacdc26e293c92c (patch) | |
| tree | 2eb842eaf4845898afe11668b8f0e48621545710 /pkgs/applications/editors | |
| parent | 01df3cd7dda0b22c056f15e22a690edb1040345a (diff) | |
| parent | 5b3ac7b07e2479df5c40320b1b218918800919ea (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 8062d26b2843f..1393ae943028c 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -214,9 +214,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ meutraa ]; - beta = [ meutraa ]; - canary = [ meutraa ]; + stable = [ meutraa fabianhjr ]; + beta = [ meutraa fabianhjr ]; + canary = [ meutraa fabianhjr ]; dev = canary; }."${channel}"; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 9cee6485500a0..af4fc5c997cc9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; + version = "2020.3.1.25"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg"; }; betaVersion = { version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" |