diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b825d86ac8df..285c4504280c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videochips = (mkDerivation "xf86videochips" { - name = "xf86-video-chips-1.2.6"; + name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2; - sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; + sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1736,11 +1736,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (mkDerivation "xf86videodummy" { - name = "xf86-video-dummy-0.3.7"; + name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2; - sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; + sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1780,11 +1780,11 @@ let }) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (mkDerivation "xf86videoglint" { - name = "xf86-video-glint-1.2.8"; + name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2; - sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"; + url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1802,11 +1802,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi740 = (mkDerivation "xf86videoi740" { - name = "xf86-video-i740-1.3.5"; + name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2; - sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w"; + url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; + sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1836,11 +1836,11 @@ let }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (mkDerivation "xf86videomga" { - name = "xf86-video-mga-1.6.4"; + name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2; - sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8"; + url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; + sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1880,11 +1880,11 @@ let }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videonv = (mkDerivation "xf86videonv" { - name = "xf86-video-nv-2.1.20"; + name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2; - sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3"; + url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; + sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1913,11 +1913,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videor128 = (mkDerivation "xf86videor128" { - name = "xf86-video-r128-6.10.0"; + name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2; - sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; + sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1946,33 +1946,33 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosavage = (mkDerivation "xf86videosavage" { - name = "xf86-video-savage-2.3.8"; + name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2; - sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; + sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { - name = "xf86-video-siliconmotion-1.7.8"; + name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2; - sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79"; + url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; + sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (mkDerivation "xf86videosis" { - name = "xf86-video-sis-0.10.8"; + name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2; - sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; + sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2001,11 +2001,11 @@ let }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videotdfx = (mkDerivation "xf86videotdfx" { - name = "xf86-video-tdfx-1.4.6"; + name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2; - sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; + sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2023,11 +2023,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (mkDerivation "xf86videotrident" { - name = "xf86-video-trident-1.3.7"; + name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2; - sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"; + url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; + sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3ae7b481978b..d706a0963214 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -338,7 +338,6 @@ in xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoglint = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; @@ -355,13 +354,6 @@ in NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg"; }; - xf86videonv = attrs: attrs // { - patches = [( args.fetchpatch { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; - sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw"; - })]; - }; - xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c0d2065a9ff3..143411304db1 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -132,34 +132,34 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2