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: dc74568f65ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1343b617960e
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 31, 2019

  1. Copy the full SHA
    1343b61 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
Original file line number Diff line number Diff line change
@@ -1132,11 +1132,11 @@ lib.makeScope newScope (self: with self; {
}) {};

libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation {
name = "libpciaccess-0.14";
name = "libpciaccess-0.16";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2;
sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2