diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
| commit | 98640fd48212f8e6552517f667bba1901f5936d4 (patch) | |
| tree | 0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /pkgs/servers/x11 | |
| parent | 70c1c856d4c96fb37b6e507db4acb125656f992d (diff) | |
| parent | b40ee8268515d78b419f53fb22a9fad49b985de8 (diff) | |
| download | nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.gz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.bz2 nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.lz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.xz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.zst nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3be672c29f1..66d4643de39 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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 ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 426b848a138..beeffc21e56 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 |