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

Commits on Aug 26, 2019

  1. xorg.xf86videosis: 0.10.9 -> 0.11.0 

    fixes build
    @globin
    globin committed Aug 26, 2019
    Copy the full SHA
    279bd6f 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
View file
Original file line number Diff line number Diff line change
@@ -2159,11 +2159,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
name = "xf86-video-sis-0.10.9";
name = "xf86-video-sis-0.11.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2;
sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2