From 167d5d8c3bb1ecd937d58dde5fa7fbe4dcb1c48f Mon Sep 17 00:00:00 2001 From: galagora Date: Mon, 20 Jul 2020 23:45:47 +0300 Subject: [PATCH 1/3] maintainers: add galagora --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/editors/android-studio/common.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e3cba91d33..ebbb8a633e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2928,6 +2928,12 @@ githubId = 7047019; name = "Florent Becker"; }; + galagora = { + email = "lightningstrikeiv@gmail.com"; + github = "galagora"; + githubId = 45048741; + name = "Alwanga Oyango"; + }; gamb = { email = "adam.gamble@pm.me"; github = "gamb"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 7e519af58e3..3c7de8aafbb 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -198,8 +198,12 @@ in runCommand # binaries are also distributed as proprietary software (unlike the # source-code itself). platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; ([ ] - ++ optional (channel == "stable") primeos); + maintainers = with maintainers; rec { + stable = [ primeos ]; + beta = [ galagora ]; + canary = [ ]; + dev = canary; + }."${channel}"; }; } '' From fb7752a597367de64f6afa171d89e91673f9c978 Mon Sep 17 00:00:00 2001 From: galagora Date: Tue, 21 Jul 2020 19:53:56 +0300 Subject: [PATCH 2/3] maintainers: add meutraa --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/editors/android-studio/common.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ebbb8a633e4..8d79b42d363 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5203,6 +5203,12 @@ github = "metadark"; githubId = 382041; }; + meutraa = { + email = "paul+nixpkgs@lost.host"; + name = "Paul Meredith"; + github = "meutraa"; + githubId = 68550871; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 3c7de8aafbb..f1e680f60e6 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -199,9 +199,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ primeos ]; + stable = [ meutraa ]; beta = [ galagora ]; - canary = [ ]; + canary = [ meutraa ]; dev = canary; }."${channel}"; }; From 7937ba3e8970c923510a95d0fba6401051491f67 Mon Sep 17 00:00:00 2001 From: galagora Date: Mon, 20 Jul 2020 23:49:53 +0300 Subject: [PATCH 3/3] androidStudioPackages.beta: 4.0.0.16 -> 4.1.0.14 --- 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 0d3157e30cf..e5fc527d729 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.0.0.16"; # "Android Studio 4.0" - build = "193.6514223"; - sha256Hash = "1sqj64vddwfrr9821habfz7dms9csvbp7b8gf1d027188b2lvh3h"; + version = "4.1.0.14"; # "Android Studio 4.1 Beta 4" + build = "201.6667167"; + sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; }; latestVersion = { # canary & dev version = "4.1.0.10"; # "Android Studio 4.1 Canary 10"