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

Commits on Jun 3, 2019

  1. skypeforlinux: 8.32.0.44 -> 8.34.0.78 

    (cherry picked from commit dc60b62)
    @Mic92
    Emmanuel Rosa authored and Mic92 committed Jun 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5cf3b2 View commit details

  2. skypeforlinux: 8.34.0.78 -> 8.42.76.54 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/skypeforlinux/versions

(cherry picked from commit 1a714f1)
    @r-ryantm @Mic92
    r-ryantm authored and Mic92 committed Jun 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6433d7b View commit details

  3. skypeforlinux: add missing dynamically linked library at-spi2-atk 

    The error message fixed was:

./result/bin/skypeforlinux: error while loading shared libraries:
libatk-bridge-2.0.so.0: cannot open shared object file: No such file
or directory

(cherry picked from commit 6cfb8cf)
    @ryantm @Mic92
    ryantm authored and Mic92 committed Jun 3, 2019
    Copy the full SHA
    3fa4c90 View commit details

  4. skypeforlinux: 8.42.76.54 -> 8.44.0.40 

    Note that the supplied .desktop file has changed, so `postFixup` has
been tweaked accordingly.

(cherry picked from commit b5770c0)
    @lightbulbjim @Mic92
    lightbulbjim authored and Mic92 committed Jun 3, 2019
    Copy the full SHA
    bcb7a67 View commit details

  5. skypeforlinux: 8.44.0.40 -> 8.45.0.41 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/skypeforlinux/versions

(cherry picked from commit dcbb041)
    @r-ryantm @Mic92
    r-ryantm authored and Mic92 committed Jun 3, 2019
    Copy the full SHA
    229c860 View commit details

  6. skypeforlinux: 8.32.0.44 -> 8.45.0.41 [backport 19.03] (#62604) 

    skypeforlinux: 8.32.0.44 -> 8.45.0.41 [backport 19.03]
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    1d5d94d View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
11 changes: 6 additions & 5 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }:
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
, at-spi2-atk }:

let

# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.32.0.44";
version = "8.45.0.41";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
at-spi2-atk
cairo
cups
curl
@@ -56,7 +58,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7";
sha256 = "1k54gpaphkjv5qhqlwm2vbxbbci7nra4a5l0bhylkkzhsip6cvcm";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
@@ -97,8 +99,7 @@ in stdenv.mkDerivation {
# Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/ $out/share/
--replace /usr/bin/ $out/bin/
'';

meta = with stdenv.lib; {