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: 56a850701bff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c323869eb5de
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 3, 2017

  1. slack: 2.5.2 -> 2.6.2

    @winniequinn
    winniequinn committed Jun 3, 2017
    Copy the full SHA
    7123cad View commit details

Commits on Jun 4, 2017

  1. Merge pull request #26366 from winniequinn/slack-2.6.2 

    slack: 2.5.2 -> 2.6.2
    @Mic92
    Mic92 authored Jun 4, 2017
    Copy the full SHA
    c323869 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/networking/instant-messengers/slack/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/networking/instant-messengers/slack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
, libnotify, nspr, nss, systemd, xorg }:
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:

let

version = "2.5.2";
version = "2.6.2";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -22,6 +22,7 @@ let
gnome2.gtk
gnome2.pango
libnotify
libxcb
nspr
nss
stdenv.cc.cc
@@ -45,7 +46,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi";
sha256 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8";
}
else
throw "Slack is not supported on ${stdenv.system}";