From 645c91708f2af9f36e1df36935d63d7e7dbebc5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Jun 2009 17:20:01 +0000 Subject: [PATCH] * Updated some drivers. svn path=/nixpkgs/trunk/; revision=16002 --- pkgs/servers/x11/xorg/default.nix | 24 ++++++++++++------------ pkgs/servers/x11/xorg/overrides.nix | 8 ++++---- pkgs/servers/x11/xorg/tarballs-7.4.list | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1c1d5e74cb29..74bfc27aae6c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1388,11 +1388,11 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.2.1"; + name = "xf86-input-evdev-2.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.1.tar.bz2; - sha256 = "19z27qikxc8dqxrfz3y6xiaf23hfaa1s79r0x0wvqjb2532bwmy3"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2; + sha256 = "156ragzgb67wpkc5vz2mczgiardp91h2njzcsxxv89vcx0cn2q33"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; @@ -1498,14 +1498,14 @@ 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.9.0"; + name = "xf86-video-ati-6.12.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2; - sha256 = "1hnp2da1asj6ql4a1i2j20mffix255sx08ixv0nijv1qdj8x2b38"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2; + sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) { name = "xf86-video-chips-1.2.0"; @@ -1608,11 +1608,11 @@ let })) // {inherit xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.7.0"; + name = "xf86-video-intel-2.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.7.0.tar.bz2; - sha256 = "152dd0y120sv6sh9a889isf71901ykansq7jjj7vc5j9a1dg3l0n"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2; + sha256 = "0hjziri3rkq7dbcqx70knbx9bips44ya8m1jfhpi7h4w4ia0sp15"; }; buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; @@ -1674,7 +1674,7 @@ let url = mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2; sha256 = "043lvcvdkhyb5jp2m0ggd0r0gxndjwh2qnj8wbx2hr2wdf6qbr5p"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC glproto mesa]; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4cfa6260063e..bb7464391452 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -47,10 +47,10 @@ xf86videoati = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; - src = args.fetchurl { - url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2; - sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; - }; + }; + + xf86videoopenchrome = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; xkbcomp = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.4.list b/pkgs/servers/x11/xorg/tarballs-7.4.list index 6dcd604a7284..f7a61b35095d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.4.list +++ b/pkgs/servers/x11/xorg/tarballs-7.4.list @@ -121,7 +121,7 @@ mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2 @@ -132,7 +132,7 @@ mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-ati-6.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2 @@ -143,7 +143,7 @@ mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2 mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2