Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 01f5e794913a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 305f13d3d733
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Sep 12, 2018

  1. nvidia-x11: Fix vulkan VK_KHR_xcb_surface 

    Fixes the issue: NixOS/nixpkgs#39149

Problem was that the Nvidia driver did not find the libxcb-glx at runtime.
    @danme
    danme committed Sep 12, 2018
    Copy the full SHA
    bda072c View commit details

Commits on Sep 16, 2018

  1. Merge pull request #46555 from danme/release-18.03 

    nvidia-x11: Fix vulkan VK_KHR_xcb_surface
    @infinisil
    infinisil authored Sep 16, 2018
    Copy the full SHA
    9214a3e View commit details

Commits on Sep 17, 2018

  1. skypeforlinux: 8.24.0.2 -> 8.28.0.41 

    (cherry picked from commit 81d5061)
    @srhb
    Emmanuel Rosa authored and srhb committed Sep 17, 2018
    Copy the full SHA
    5188928 View commit details

Commits on Sep 18, 2018

  1. Merge pull request #46772 from srhb/backport-skype-bump 

    Backport 18.03: skypeforlinux: 8.24.0.2 -> 8.28.0.41
    @Mic92
    Mic92 authored Sep 18, 2018
    Copy the full SHA
    305f13d View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  2. +1 −1 pkgs/os-specific/linux/nvidia-x11/generic.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ 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.24.0.2";
version = "8.28.0.41";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -56,7 +56,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww";
sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ let
dontStrip = true;
dontPatchELF = true;

libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ];

nativeBuildInputs = [ perl nukeReferences ]
++ optionals (!libsOnly) kernel.moduleBuildDependencies;