about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-02-16 09:30:46 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-02-16 09:30:46 +0100
commitfd48a94b62592c68e7d66329ba33930d3cfe3f37 (patch)
tree4230272708eb350a36c29c08cac98e159d5e65a9 /pkgs/applications/editors
parenta0eb6c1f81e1d294726c644ff47f1e851afb2f10 (diff)
parent6fe10d27799c284c72876f792c7b12d7fa54602b (diff)
downloadnixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.gz
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.bz2
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.lz
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.xz
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.zst
nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/android-studio/default.nix12
-rw-r--r--pkgs/applications/editors/atom/default.nix8
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 2d5028cf83bc..cb0aa393380f 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,14 +13,14 @@ let
     sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42";
   };
   betaVersion = {
-    version = "3.4.0.12"; # "Android Studio 3.4 Beta 3"
-    build = "183.5256591";
-    sha256Hash = "1yab2sgabgk3wa3wrzv9z1dc2k7x0079v0mlwrp32jwx8r9byvcw";
+    version = "3.4.0.13"; # "Android Studio 3.4 Beta 4"
+    build = "183.5304277";
+    sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f";
   };
   latestVersion = { # canary & dev
-    version = "3.5.0.2"; # "Android Studio 3.5 Canary 3"
-    build = "183.5256920";
-    sha256Hash = "09bd80ld21hq743xjacsq0nkxwl5xzr253p86n71n580yn4rgmlb";
+    version = "3.5.0.3"; # "Android Studio 3.5 Canary 4"
+    build = "183.5290690";
+    sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1";
   };
 in rec {
   # Old alias (TODO @primeos: Remove after 19.03 is branched off):
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 13dc9e1285b1..e5a71b134f1b 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -3,14 +3,14 @@
 let
   versions = {
     atom = {
-      version = "1.33.0";
-      sha256 = "0f6m6zwgz94m3q11ipyiliap3s5a3zlrg3ldjwkqnxjl6gwlxc2r";
+      version = "1.34.0";
+      sha256 = "16hrjymrc43izg7frcrk7cwjwwrclcxzcwb5iw2llzjc6iadzlkb";
     };
 
     atom-beta = {
-      version = "1.34.0";
+      version = "1.35.0";
       beta = 0;
-      sha256 = "1xnrr4z55sj46hqr0il26sfs6s3knv60m340cw3rzzic271b3ifw";
+      sha256 = "0gm5k573dq1hhnyw3719f5k1c6rsz872mhzg8q53n89y0g2r5xmw";
     };
   };