From bf5cc9ff7c5a6681915820f72affc09dea27ec54 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 5 May 2021 08:44:35 +0300 Subject: [PATCH 1/2] androidStudioPackages.stable: 4.1.3.0 -> 4.2.1.0 --- pkgs/applications/editors/android-studio/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 466dfb2516e..eab0a7a6f7f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,14 +9,14 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.3.0"; # "Android Studio 4.1.3" - build = "201.7199119"; - sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm"; + version = "4.2.1.0"; # "Android Studio 4.2.1" + build = "202.7351085"; + sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; }; betaVersion = { - version = "4.2.0.22"; # "Android Studio 4.2 Beta 6" - build = "202.7188722"; - sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb"; + version = "4.2.0.24"; # "Android Studio 4.2.0" + build = "202.7322048"; + sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" From 9a025431e95067146f7d1393887ac7107629285e Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 5 May 2021 08:45:26 +0300 Subject: [PATCH 2/2] androidStudioPackages.{canary,dev}: 2020.3.1.10 -> 2020.3.1.15 --- pkgs/applications/editors/android-studio/common.nix | 2 +- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 678d6a0a353..6d9182b9d61 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -145,7 +145,7 @@ let ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH - wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ncurses5 zlib ]}" diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index eab0a7a6f7f..e68e95ba542 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,8 +19,8 @@ let sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev - version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" - sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj"; + version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" + sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv"; }; in { # Attributes are named by their corresponding release channels