From b1fb08569f64fdd9bb3c9d801d96fb8d2dca58ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Feb 2010 13:34:30 +0000
Subject: [PATCH] * X.org server updated to 1.7.5.

svn path=/nixpkgs/trunk/; revision=20050
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.5.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 94f527ab8017..6f93151774b5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2008,11 +2008,11 @@ let
   })) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.7.4";
+    name = "xorg-server-1.7.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.7.4.tar.bz2;
-      sha256 = "1y1k7qjyl1bjjkfmhgci7vd7zqm65dkh966dx0hlry66yari3v5q";
+      url = mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2;
+      sha256 = "1ampdfdijwafzlpq9jwxaxwwq40j0ymvcd922bs70wiybk8g7rci";
     };
     buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
   })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list
index 4a0f4df11129..fd0ce8edb569 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.5.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.5.list
@@ -179,7 +179,7 @@ mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.7.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2