diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
| commit | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (patch) | |
| tree | 96bf2739244a52d15556e1207bdfaf93d6353bee /pkgs/servers/x11 | |
| parent | c9d3fc7cad4d243025f9a0e1b3eec9305863c06d (diff) | |
| parent | f7397f21ab841955eb277919f19035cbc336e88b (diff) | |
| download | nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.gz nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.bz2 nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.lz nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.xz nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.zst nixpkgs-809b0d26bd34fcf13a35025dacf731c0a3d13292.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8a9cd1c6dd4..92afb90c6c5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1868,11 +1868,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.9.0"; + name = "xf86-video-ati-18.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; - sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; + url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2; + sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -2264,11 +2264,11 @@ let }) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovesa = (mkDerivation "xf86videovesa" { - name = "xf86-video-vesa-2.3.4"; + name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2; - sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"; + url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2; + sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; @@ -2396,11 +2396,11 @@ let }) // {inherit ;}; xinit = (mkDerivation "xinit" { - name = "xinit-1.3.4"; + name = "xinit-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; - sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; + url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2; + sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; |