about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-06-17 18:30:39 -0400
committerGitHub <noreply@github.com>2020-06-17 18:30:39 -0400
commit3b2cd55070a97db38b80001d64036c1ad25d6d35 (patch)
treefc1fd87302817fcbd12dc178ad596a622f2c0a60
parent0510cbe849e71a6cbe50656fd82e136a618cd404 (diff)
parent52f1332cbad1f83f81ff96637feb5f093e8adb31 (diff)
downloadnixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar.gz
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar.bz2
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar.lz
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar.xz
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.tar.zst
nixlib-3b2cd55070a97db38b80001d64036c1ad25d6d35.zip
Merge pull request #90565 from chkno/atom-1.48-for-python3
atom: 1.42.0 -> 1.48.0
-rw-r--r--pkgs/applications/editors/atom/default.nix8
-rw-r--r--pkgs/applications/editors/atom/env.nix3
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index fbe08dbfe7b7..dec3c7955011 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -3,14 +3,14 @@
 let
   versions = {
     atom = {
-      version = "1.42.0";
-      sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy";
+      version = "1.48.0";
+      sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1";
     };
 
     atom-beta = {
-      version = "1.43.0";
+      version = "1.49.0";
       beta = 0;
-      sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95";
+      sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33";
     };
   };
 
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index cf783053679a..5e3c1070ad2b 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
 , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
+, at-spi2-core
 }:
 
 let
@@ -10,7 +11,7 @@ let
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
     xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
-    xorg.libxcb libsecret libuuid at-spi2-atk
+    xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core
   ];
 
   libPathNative = lib.makeLibraryPath packages;