Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9737353940c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d39a231901b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 31, 2019

  1. atom, atom-beta: 1.36.1 -> 1.42.0, 1.37.0-beta0 -> 1.43.0-beta0 

    Add shared libraries libuuid and libatk-bridge
    @ysndr
    ysndr committed Dec 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    GPG key ID: D865C8A91D7025EB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9922a54 View commit details

Commits on Jan 1, 2020

  1. Merge pull request #76716 from ysndr/review/atom140 

    atom, atom-beta: 1.36.1 -> 1.42.0, 1.37.0-beta0 -> 1.43.0-beta0
    @NeQuissimus
    NeQuissimus authored Jan 1, 2020
    Copy the full SHA
    8d39a23 View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/applications/editors/atom/default.nix
  2. +2 −2 pkgs/applications/editors/atom/env.nix
8 changes: 4 additions & 4 deletions pkgs/applications/editors/atom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
let
versions = {
atom = {
version = "1.36.1";
sha256 = "1m7q2r3zx463k7kpqb364piqrr69wrhs033ibzxdx9y7r4204qp4";
version = "1.42.0";
sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy";
};

atom-beta = {
version = "1.37.0";
version = "1.43.0";
beta = 0;
sha256 = "0aq8r5vfgq7r31qajjgcg4n5a57a2m8fvq6fzy9vq5gawkvmaxxx";
sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95";
};
};

4 changes: 2 additions & 2 deletions pkgs/applications/editors/atom/env.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ 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
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
}:

let
@@ -10,7 +10,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
xorg.libxcb libsecret libuuid at-spi2-atk
];

libPathNative = lib.makeLibraryPath packages;