about summary refs log tree commit diff
path: root/pkgs/applications/editors/android-studio
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-08-19 00:22:31 +0200
committerGitHub <noreply@github.com>2021-08-19 00:22:31 +0200
commitcf8a4370cb10f98ebd481706120d1160bfd28fd3 (patch)
tree7dfb53e97625e64b96d6c7b6095609c04cb853df /pkgs/applications/editors/android-studio
parenta5295e17c888346e6439829dbd73ecdf18045b58 (diff)
parentd887fd1ac70c9048999a375c90fe666e590ad214 (diff)
downloadnixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar.gz
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar.bz2
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar.lz
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar.xz
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.tar.zst
nixlib-cf8a4370cb10f98ebd481706120d1160bfd28fd3.zip
Merge pull request #132203 from alapshin/android-studio
Diffstat (limited to 'pkgs/applications/editors/android-studio')
-rw-r--r--pkgs/applications/editors/android-studio/common.nix4
-rw-r--r--pkgs/applications/editors/android-studio/default.nix9
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index cc3f898a29bb..8062d26b2843 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,4 +1,4 @@
-{ channel, pname, version, build ? null, sha256Hash }:
+{ channel, pname, version, sha256Hash }:
 
 { alsa-lib
 , bash
@@ -55,7 +55,7 @@
 
 let
   drvName = "android-studio-${channel}-${version}";
-  filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz";
+  filename = "android-studio-${version}-linux.tar.gz";
 
   androidStudio = stdenv.mkDerivation {
     name = "${drvName}-unwrapped";
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 356eb4923b77..84e1c77603ed 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,17 +9,16 @@ let
     inherit buildFHSUserEnv;
   };
   stableVersion = {
-    version = "4.2.2.0"; # "Android Studio 4.2.2"
-    build = "202.7486908";
-    sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk";
+    version = "2020.3.1.22"; # "Android Studio Arctic Fox (2020.3.1)"
+    sha256Hash = "0xkjnhq1vvrglcbab90mx5xw1q82lkkvyp6y2ap5jypdfsc7pnsa";
   };
   betaVersion = {
     version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1"
     sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f";
   };
   latestVersion = { # canary & dev
-    version = "2021.1.1.4"; # "Android Studio Bumblebee (2021.1.1) Canary 4"
-    sha256Hash = "0s2py7xikzryqrfd9v3in9ia9qv71dd9aad1nzbda6ff61inzizb";
+    version = "2021.1.1.5"; # "Android Studio Bumblebee (2021.1.1) Canary 5"
+    sha256Hash = "0fx6nnazg4548rhb11wzaccm5c2si57mj8qwyl5j17x4k5r3m7nh";
   };
 in {
   # Attributes are named by their corresponding release channels