diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-10 12:05:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 12:05:05 +0000 |
| commit | 51dce04dde9ae1d586ee35fad8258d4e85f703c8 (patch) | |
| tree | 1fb8c298d6b658d9e05a30041bc09c184e3c383e /pkgs/applications/editors | |
| parent | da8d931c824ff457c06167c2017b60ef54229e39 (diff) | |
| parent | 3f7c764f0eef19e3c850ce2e96a40ef1bbef62af (diff) | |
| download | nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.gz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.bz2 nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.lz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.xz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.zst nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/atom/env.nix | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 875f8612fde..03a46479871 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.54.0"; - sha256 = "sha256-21AURgomEjuiTzeJ4MIx0mkyVi0b0mVdmFsFGNLXRP4"; + version = "1.57.0"; + sha256 = "1jzxjvaljk8p3gzjvs5bn3d128x37pcgn6by7srhs9qclc5j2664"; }; atom-beta = { - version = "1.55.0"; + version = "1.58.0"; beta = 0; - sha256 = "sha256-PICkTt54cPkDJVnXBTtSHUQVbmosOpZfVAiD5A3/n+Q="; + sha256 = "0amhilmpiwn2jfn0nrcrhzminqdp3xm5p3w3ldc3qk761pn3lbpd"; broken = true; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1ff8ea3f416..253518b276b 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,7 +1,7 @@ { stdenv, lib, zlib, glib, alsa-lib, 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, libdbusmenu, mesa +, at-spi2-core, libdbusmenu, libdrm, mesa }: let @@ -12,6 +12,7 @@ let xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu + libdrm mesa # required for libgbm ]; |