From 50cc2acd23b6f191950db4c50f6efef0a5d1253c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Apr 2007 18:36:01 +0000 Subject: [PATCH] * xorg-server 1.3.0, xf86-video-intel 2.0.0. svn path=/nixpkgs/trunk/; revision=8616 --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/tarballs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 00211fdd3fd5..629e2aea7728 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2067,11 +2067,11 @@ rec { }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation { - name = "xf86-video-intel-1.9.94"; + name = "xf86-video-intel-2.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-intel-1.9.94.tar.bz2; - sha256 = "0rjlwfad87mkf0c3wh3lnjz8004f3cslajll910q2mk16ih727j9"; + url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-intel-2.0.0.tar.bz2; + sha256 = "15g6090h31d8h346jzm5qzaicywpbaq3f8hjqp2b0447j1zf8qym"; }; buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; @@ -2667,11 +2667,11 @@ rec { }) // {inherit ;}; xorgserver = (stdenv.mkDerivation { - name = "xorg-server-1.2.99.905"; + name = "xorg-server-1.3.0.0"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.2.99.905.tar.bz2; - sha256 = "0lqldvmcsfmdd6gzynmd0ald5hf807v0k9c8r11svl79sbi0r66v"; + url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.3.0.0.tar.bz2; + sha256 = "0x99bhs8v4ja2x4h9mn5g76q5awyvv2j9pbjag0hfxpk8bqmdilk"; }; buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; }) // {inherit bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;}; diff --git a/pkgs/servers/x11/xorg/tarballs b/pkgs/servers/x11/xorg/tarballs index ef5918bca90f..0798e56b82bf 100644 --- a/pkgs/servers/x11/xorg/tarballs +++ b/pkgs/servers/x11/xorg/tarballs @@ -286,7 +286,7 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2 -http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-intel-1.9.94.tar.bz2 -http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.2.99.905.tar.bz2 +http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-intel-2.0.0.tar.bz2 +http://mirror.switch.ch/ftp/mirror/X11/pub/individual/xserver/xorg-server-1.3.0.0.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/individual/proto/randrproto-1.2.1.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/individual/proto/damageproto-1.1.0.tar.bz2