From 1b53d1f22d38d0430e449eed9e9cf4358e7b1008 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 12:22:49 +0000
Subject: [PATCH] xorg: updated xf86-video-ati to version 6.14.2

svn path=/nixpkgs/trunk/; revision=27776
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.6.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 ae56e00762b5..f25289a683a3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1428,11 +1428,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-6.14.0";
+    name = "xf86-video-ati-6.14.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2;
-      sha256 = "12q2b6wj53h23iy9bkm6x8zidan3xqfszhkzyr4qm043x21szjlx";
+      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2;
+      sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 5b6059cd575a..c8039d24671c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2