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: 67782bcb08f0
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: 9214a3e7dd69
Choose a head ref
  • 5 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 15, 2018

  1. php56: 5.6.37 -> 5.6.38 

    Changelog: http://php.net/ChangeLog-5.php#5.6.38
    @etu
    etu committed Sep 15, 2018
    Copy the full SHA
    df98b89 View commit details

  2. php70: 7.0.31 -> 7.0.32 

    Changelog: http://php.net/ChangeLog-7.php#7.0.32
    @etu
    etu committed Sep 15, 2018
    Copy the full SHA
    bcd2eda View commit details

  3. Merge pull request #46717 from etu/upgrade-1803-php 

    [18.03] php: 5.6.37 -> 5.6.38, 7.0.31 -> 7.0.32
    @xeji
    xeji authored Sep 15, 2018
    Copy the full SHA
    01f5e79 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
Showing with 5 additions and 5 deletions.
  1. +4 −4 pkgs/development/interpreters/php/default.nix
  2. +1 −1 pkgs/os-specific/linux/nvidia-x11/generic.nix
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -338,13 +338,13 @@ let

in {
php56 = generic {
version = "5.6.37";
sha256 = "08wbg1qbbr80wcpv0l24vfyd9w8cxanils928gjs6knr0lyxcsl8";
version = "5.6.38";
sha256 = "00xw7rcq36dlrzgx9nr96jc64gnnrxjxkkpmkr1y8fynpldj6nyn";
};

php70 = generic {
version = "7.0.31";
sha256 = "14bb230qip62cn7k6hvgr18kxj76zvl735fkg6hpkrnnrqzdg2vy";
version = "7.0.32";
sha256 = "1qcjch3293h3fwci767x9rih3nrvz02rhn33hvx8l5q8kk7xis2n";
};

php71 = generic {
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;