* X.org 7.7 RC1. Note that xorg-server doesn't build yet.

svn path=/nixpkgs/branches/x-updates/; revision=34147
author: Eelco Dolstra <eelco.dolstra@logicblox.com> 2012-05-16 22:06:27 +0000
committer: Eelco Dolstra <eelco.dolstra@logicblox.com> 2012-05-16 22:06:27 +0000
commit: 932d5bee544e39b0e06ba2e850fe2d7fa89b030f (patch)
tree: 0eb4f12fc7e9726bc1d606af24a6add517d7ba4b
parent: 277bd69fa9391824482b17fba65eddc9ad7a4b64 (diff)
download: nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.gz
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.bz2
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.lz
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.xz
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.zst
nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.zip
7 files changed, 680 insertions, 845 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4fbc6fbdfda..17e2bff8a9f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -8,11 +8,11 @@ let
   xorg = rec {
 
   applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
-    name = "applewmproto-1.4.1";
+    name = "applewmproto-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2;
-      sha256 = "06fyixmx36qac2qqwmra3l9xr570rankm9kzmk0mgqyhgldrw1h8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2;
+      sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -21,18 +21,18 @@ let
     name = "bdftopcf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2;
       sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w";
     };
     buildInputs = [pkgconfig libXfont ];
   })) // {inherit libXfont ;};
     
   bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
-    name = "bigreqsproto-1.1.1";
+    name = "bigreqsproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2;
-      sha256 = "16phzxa55lr749rghpaa699h1lcpndmw7izxzgl1bljq5f3qafqw";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2;
+      sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -41,7 +41,7 @@ let
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2;
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
@@ -51,7 +51,7 @@ let
     name = "damageproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2;
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
@@ -61,7 +61,7 @@ let
     name = "dmxproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2;
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
@@ -71,7 +71,7 @@ let
     name = "dri2proto-2.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2;
       sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md";
     };
     buildInputs = [pkgconfig ];
@@ -81,18 +81,18 @@ let
     name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2;
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
-    name = "fixesproto-4.1.2";
+    name = "fixesproto-5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2;
-      sha256 = "0mzq8kh1v1w2mrl4y82qzgv8jzlr3n4jmss56h3r1h9knp6byk6y";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2;
+      sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
   })) // {inherit xextproto ;};
@@ -101,7 +101,7 @@ let
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2;
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -111,7 +111,7 @@ let
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2;
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -121,7 +121,7 @@ let
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -131,7 +131,7 @@ let
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -141,7 +141,7 @@ let
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -151,7 +151,7 @@ let
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2;
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
@@ -161,7 +161,7 @@ let
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2;
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -171,7 +171,7 @@ let
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2;
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -181,7 +181,7 @@ let
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2;
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -191,7 +191,7 @@ let
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -201,7 +201,7 @@ let
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -211,7 +211,7 @@ let
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2;
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -221,7 +221,7 @@ let
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2;
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -231,7 +231,7 @@ let
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2;
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -241,7 +241,7 @@ let
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2;
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -251,7 +251,7 @@ let
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2;
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -261,7 +261,7 @@ let
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2;
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -271,7 +271,7 @@ let
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2;
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -281,7 +281,7 @@ let
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2;
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -291,7 +291,7 @@ let
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2;
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -301,7 +301,7 @@ let
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2;
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -311,7 +311,7 @@ let
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2;
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -321,7 +321,7 @@ let
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2;
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -331,7 +331,7 @@ let
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2;
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -341,7 +341,7 @@ let
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2;
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -351,7 +351,7 @@ let
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2;
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -361,7 +361,7 @@ let
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2;
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -371,7 +371,7 @@ let
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2;
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -381,7 +381,7 @@ let
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2;
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -391,7 +391,7 @@ let
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2;
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -401,7 +401,7 @@ let
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -411,18 +411,18 @@ let
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2;
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
   })) // {inherit bdftopcf mkfontdir ;};
     
   fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
-    name = "fontsproto-2.1.1";
+    name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2;
-      sha256 = "1g1rsvj0lb7744x6fj18d989ymf7zgry3v3fzipnnzljwa0vr6lw";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2;
+      sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -431,18 +431,18 @@ let
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2;
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
   })) // {inherit bdftopcf mkfontdir ;};
     
   fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
-    name = "font-util-1.2.0";
+    name = "font-util-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2;
-      sha256 = "04lp7xlrcqfyrsnvdgyqbanlnzr13lhn28v0kr2nzpvcmqbwdfnv";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2;
+      sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -451,7 +451,7 @@ let
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2;
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -461,7 +461,7 @@ let
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
@@ -478,91 +478,91 @@ let
   })) // {inherit ;};
     
   glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
-    name = "glproto-1.4.12";
+    name = "glproto-1.4.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2;
-      sha256 = "1pjpnj78hski4krvsbf55pkhhsrahvlb825dwl804q0b36fpmgj8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2;
+      sha256 = "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
-    name = "iceauth-1.0.4";
+    name = "iceauth-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2;
-      sha256 = "13ck97rz53l490aba3xpgv4psgk4rywh1vi6slg1n4zhai2zvrhf";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2;
+      sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl";
     };
     buildInputs = [pkgconfig libICE xproto ];
   })) // {inherit libICE xproto ;};
     
   imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
-    name = "imake-1.0.4";
+    name = "imake-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/imake-1.0.4.tar.bz2;
-      sha256 = "1zj6y59yip40hrdvvljjmnsfqddzxpxmbmd8842010rhkvq7zcmc";
+      url = mirror://xorg/individual/util/imake-1.0.5.tar.bz2;
+      sha256 = "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
-    name = "inputproto-2.0.1";
+    name = "inputproto-2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2;
-      sha256 = "0i2a28bnvv68i6z8qx09iw95c1wchqc2migx1s7764pqipc3srk3";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2;
+      sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
-    name = "kbproto-1.0.5";
+    name = "kbproto-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2;
-      sha256 = "17glym611bbkca371ihpcnx9ydp4asay4psqq267j00pbr94zfhf";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2;
+      sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
-    name = "libAppleWM-1.4.0";
+    name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2;
-      sha256 = "10hw7rvwc2b0v3v6mc6vaq8xs6vim4bg43rnhspf4p26mlb2dsf8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2;
+      sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
   })) // {inherit applewmproto libX11 libXext xextproto ;};
     
   libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
-    name = "libFS-1.0.3";
+    name = "libFS-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2;
-      sha256 = "0694iyc1rdz0fqnalgzpgzmxfaklrdk0jz769fsn1bv88mszjymb";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2;
+      sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
   })) // {inherit fontsproto xproto xtrans ;};
     
   libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
-    name = "libICE-1.0.7";
+    name = "libICE-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2;
-      sha256 = "00drapw7n793nqy23m76vxj5yzlgx7prmprkhzp3qiqs2lpnkcd8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2;
+      sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94";
     };
     buildInputs = [pkgconfig xproto xtrans ];
   })) // {inherit xproto xtrans ;};
     
   libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
-    name = "libSM-1.2.0";
+    name = "libSM-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2;
-      sha256 = "1jspgbd9g1d20kl18nnbzv37f1kpfybjff2xn08dmgv7f0dxzn0c";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2;
+      sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
   })) // {inherit libICE libuuid xproto xtrans ;};
@@ -571,48 +571,48 @@ let
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2;
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
     
   libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
-    name = "libX11-1.4.1";
+    name = "libX11-1.4.99.901";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2;
-      sha256 = "1qiwyqaf9vfn52nwp7nxlbixld3r9jyzsarnkwk0ynk4k3vy1x3h";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2;
+      sha256 = "1nr6vgcs9asmxgcml9h79n74f8ik229y0dap4r8rcibyw1lqa8xz";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
     
   libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
-    name = "libXScrnSaver-1.2.1";
+    name = "libXScrnSaver-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2;
-      sha256 = "16i59gac2sixgi692w4lvq5cp8hkl6rc375bh0ib51gsyvi6cfnf";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2;
+      sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
   })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
     
   libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
-    name = "libXau-1.0.6";
+    name = "libXau-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2;
-      sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2;
+      sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
-    name = "libXaw-1.0.9";
+    name = "libXaw-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2;
-      sha256 = "0dxh5ldcmzl6afq0a9172ryah1341g0zysm8vk2lmqkqdda7ffd8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2;
+      sha256 = "1p8vxqwk5gs8dl325fmjvqx165bv5vngayfkj5ffrf1q4vwvr5id";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
   })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
@@ -621,18 +621,18 @@ let
     name = "libXcomposite-0.4.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2;
       sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
     
   libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
-    name = "libXcursor-1.1.11";
+    name = "libXcursor-1.1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2;
-      sha256 = "1zpn5dx66l5ql9qv0yz41qlbap4imkkvi0p6j2a6zh72g52zfvm0";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2;
+      sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
@@ -641,88 +641,88 @@ let
     name = "libXdamage-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2;
       sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
     
   libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
-    name = "libXdmcp-1.1.0";
+    name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2;
-      sha256 = "0wh0q4ih9p3nsxsjjj9a3d03nhiyjggpl7gbavdzsfia36iyk85q";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2;
+      sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
-    name = "libXext-1.2.0";
+    name = "libXext-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2;
-      sha256 = "1xvgvrbg9lc812zi44hsyr461hiiwy05alckq847ki213qhkxvaa";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2;
+      sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
     
   libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
-    name = "libXfixes-4.0.5";
+    name = "libXfixes-5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2;
-      sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2;
+      sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
   })) // {inherit fixesproto libX11 xextproto xproto ;};
     
   libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
-    name = "libXfont-1.4.3";
+    name = "libXfont-1.4.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2;
-      sha256 = "1k79f8vcibd114ydndvna8axx39bsdaj351f16901lh155jlb4pp";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2;
+      sha256 = "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
     
   libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
-    name = "libXft-2.2.0";
+    name = "libXft-2.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2;
-      sha256 = "1cprbz7xnxkb7axblw8sdaw9ibkngmz60d0ypk1drhd0dpjmls68";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2;
+      sha256 = "0i5hb1c5mq3qam4qzchv2crir8n7jvip9m1ncl04fp1aswx3j9il";
     };
-    buildInputs = [pkgconfig fontconfig freetype xproto libXrender ];
-  })) // {inherit fontconfig freetype xproto libXrender ;};
+    buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
+  })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
     
   libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
-    name = "libXi-1.4.1";
+    name = "libXi-1.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2;
-      sha256 = "19i92if8anv5pg2mwyy93jcllk1mgxx5gchi8zkjlk7r604ir7sr";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2;
+      sha256 = "1bx7qi1rak3fazkxgf98lxy9iiflgvlm4wg2pg2hb5169ai6bz5j";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
   })) // {inherit inputproto libX11 libXext xextproto xproto ;};
     
   libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
-    name = "libXinerama-1.1.1";
+    name = "libXinerama-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2;
-      sha256 = "17vpsscracg1hza0avrczm9fc7xx3229qhicy101mw6cx2hb9qmv";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2;
+      sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
   })) // {inherit libX11 libXext xextproto xineramaproto ;};
     
   libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
-    name = "libXmu-1.1.0";
+    name = "libXmu-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2;
-      sha256 = "1b9nkml1mk8yi76bv23cikbfrd7hlp48h710yqgcrpkh7cq1za8g";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2;
+      sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
@@ -738,91 +738,91 @@ let
   })) // {inherit printproto libX11 libXau libXext xextproto ;};
     
   libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
-    name = "libXpm-3.5.9";
+    name = "libXpm-3.5.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2;
-      sha256 = "07k2zpiadck1p986pgksfm5zfdm6h5vjy6p0hv59h1dbkh103pca";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2;
+      sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
     
   libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
-    name = "libXrandr-1.3.1";
+    name = "libXrandr-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2;
-      sha256 = "0qf6aywqk2mgd5hw0nr24xxp5k015aa11sax5yycn14wch4agfv2";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2;
+      sha256 = "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
     
   libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
-    name = "libXrender-0.9.6";
+    name = "libXrender-0.9.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2;
-      sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2;
+      sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
   })) // {inherit renderproto libX11 xproto ;};
     
   libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
-    name = "libXres-1.0.5";
+    name = "libXres-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2;
-      sha256 = "0nd032jn3im6ar71xm1wgcmb4pa76c73nl8lavdkih609d30y2x0";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2;
+      sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
   })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
     
   libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
-    name = "libXt-1.0.9";
+    name = "libXt-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2;
-      sha256 = "00bbms32fkzrxhdm9kybb2404ad6f3d6v4qgl83py7w09dcipfga";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2;
+      sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
   })) // {inherit libICE kbproto libSM libX11 xproto ;};
     
   libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
-    name = "libXtst-1.2.0";
+    name = "libXtst-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2;
-      sha256 = "022lx3c57pkkw11j2k5s1f5idf53li5qg291766bvxi1nl90jbks";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2;
+      sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
   })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
     
   libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
-    name = "libXv-1.0.6";
+    name = "libXv-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2;
-      sha256 = "1vpmr9wnbz990ivarsp5rcmdg483fd2nk695plzlzx5h9dcqw3z2";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2;
+      sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
   })) // {inherit videoproto libX11 libXext xextproto xproto ;};
     
   libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
-    name = "libXvMC-1.0.6";
+    name = "libXvMC-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2;
-      sha256 = "14ik1kgpnds213dsa16i8cf5qg3hc7vccy9jz4a4ml8zqzlq1nix";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2;
+      sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
   })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
     
   libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
-    name = "libXxf86dga-1.1.2";
+    name = "libXxf86dga-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2;
-      sha256 = "01jsc0jg7mjngfbh3j942595pwbyxf2m9kljy3zb6gyfcbsm59hv";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2;
+      sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
@@ -838,41 +838,41 @@ let
   })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
     
   libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
-    name = "libXxf86vm-1.1.1";
+    name = "libXxf86vm-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2;
-      sha256 = "17i342h7a2nqfz4lpk8cay0vc0h4i7nxdc6xli9r7mggk8iykji1";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2;
+      sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
     
   libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
-    name = "libdmx-1.1.1";
+    name = "libdmx-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2;
-      sha256 = "066yndshwq2nzkd0z0w96wq37rnhb23s6vq50bg4kiqb8y3nxpm6";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2;
+      sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
   })) // {inherit dmxproto libX11 libXext xextproto ;};
     
   libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
-    name = "libfontenc-1.1.0";
+    name = "libfontenc-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2;
-      sha256 = "1gww1cbi17q15lh2ws6qzspp807issbyk5wlzjmgw6pn880ip2il";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2;
+      sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny";
     };
     buildInputs = [pkgconfig xproto zlib ];
   })) // {inherit xproto zlib ;};
     
   libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
-    name = "libpciaccess-0.12.1";
+    name = "libpciaccess-0.13.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2;
-      sha256 = "0i3kdmvl1mcjrkhklpli45sqsy4pvipm6swifbcyxx4cwkqdfiyc";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2;
+      sha256 = "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7";
     };
     buildInputs = [pkgconfig zlib ];
   })) // {inherit zlib ;};
@@ -881,91 +881,91 @@ let
     name = "libpthread-stubs-0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2;
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
-    name = "libxcb-1.7";
+    name = "libxcb-1.8.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2;
-      sha256 = "1pr40wa3i1f0iwx83c8alcycy9sfzd2y1qlc63kr8q56w8sxqxp7";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2;
+      sha256 = "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
     
   libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
-    name = "libxkbfile-1.0.7";
+    name = "libxkbfile-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2;
-      sha256 = "1r9a1xnn57431hfp1am2r5h23pa1zh646482li3vd5ivfc53fzk6";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2;
+      sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
   })) // {inherit kbproto libX11 ;};
     
   lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
-    name = "lndir-1.0.2";
+    name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/lndir-1.0.2.tar.bz2;
-      sha256 = "1d988z0ywy2k53s7i43ff0j5qac1cpy9j0gjwmiprq66w8rh24z5";
+      url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2;
+      sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
-    name = "luit-1.1.0";
+    name = "luit-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2;
-      sha256 = "1l83b5yknh4svqzwsppvmm2q9l0mvsfwm16ik7q3yss8m5zgvypi";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2;
+      sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
-    buildInputs = [pkgconfig libfontenc zlib ];
-  })) // {inherit libfontenc zlib ;};
+    buildInputs = [pkgconfig libfontenc ];
+  })) // {inherit libfontenc ;};
     
   makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
-    name = "makedepend-1.0.3";
+    name = "makedepend-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2;
-      sha256 = "0dxpz376bvphjg8q0nqrcf4y0dbni0c6jj5y16qymr37wlq1s99s";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2;
+      sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
-    name = "mkfontdir-1.0.6";
+    name = "mkfontdir-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2;
-      sha256 = "0nf8p0zsndd9qmrw70h2wdq7sz6j066q73lpp262dlpq21inrmam";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2;
+      sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
-    name = "mkfontscale-1.0.8";
+    name = "mkfontscale-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2;
-      sha256 = "1yah41gr5hlihbjm5l1kykdqj1p5rx6y4vrqraxbzvkrrn37gdbf";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2;
+      sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
   })) // {inherit libfontenc freetype xproto zlib ;};
     
   pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) {
-    name = "pixman-0.20.2";
+    name = "pixman-0.24.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2;
-      sha256 = "1agl6f63y2wiqr6n9slzhisnilcg8byafp2l8wmw713bk8k6yc9h";
+      url = mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2;
+      sha256 = "1d9vl8kd10nn6bzzgl8xhpdpd0djh4p5x0y8pn1ab0lyld53hjsz";
     };
-    buildInputs = [pkgconfig perl ];
-  })) // {inherit perl ;};
+    buildInputs = [pkgconfig libpng perl ];
+  })) // {inherit libpng perl ;};
     
   printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
     name = "printproto-1.0.5";
@@ -981,18 +981,18 @@ let
     name = "randrproto-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2;
       sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
-    name = "recordproto-1.14.1";
+    name = "recordproto-1.14.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2;
-      sha256 = "1389fc3r8h8xqix11y9ngw7a13i1mvw68jkhicgvq676sd1v0zmj";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2;
+      sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1001,78 +1001,78 @@ let
     name = "renderproto-0.11.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2;
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
-    name = "resourceproto-1.1.1";
+    name = "resourceproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2;
-      sha256 = "1imqlkvn4mfjsflwvqx8dj0n7i7frdpzkdafq001r25ak6782yc5";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2;
+      sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
-    name = "scrnsaverproto-1.2.1";
+    name = "scrnsaverproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2;
-      sha256 = "1w94c1an7cy9v68289xbqszaj6g5qx5a29qx67fwsvqkmhygglps";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2;
+      sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
-    name = "sessreg-1.0.6";
+    name = "sessreg-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2;
-      sha256 = "143ivrs2pbkid4wr1hri9221z4gi9dlkq7x60jarcz9bhiq1dwvk";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2;
+      sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
   setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
-    name = "setxkbmap-1.2.0";
+    name = "setxkbmap-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2;
-      sha256 = "0fdfvc0fqdp11ly5iywrsi4w7rln4dq02b0b91yjmjm83fzr35cr";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2;
+      sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   })) // {inherit libX11 libxkbfile ;};
     
   smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
-    name = "smproxy-1.0.4";
+    name = "smproxy-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2;
-      sha256 = "0wj4z4ars9j4k5pysl42jpx4zclrz3ifwgqxrcdlmb3l5xvyb4ip";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2;
+      sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
     };
-    buildInputs = [pkgconfig libSM libXmu libXt ];
-  })) // {inherit libSM libXmu libXt ;};
+    buildInputs = [pkgconfig libICE libSM libXmu libXt ];
+  })) // {inherit libICE libSM libXmu libXt ;};
     
   twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
-    name = "twm-1.0.6";
+    name = "twm-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/twm-1.0.6.tar.bz2;
-      sha256 = "1scly9kv3kx8zh8bfljsdd32dsb4j05xzn8c5x270xcshzbwmp77";
+      url = mirror://xorg/individual/app/twm-1.0.7.tar.bz2;
+      sha256 = "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g";
     };
-    buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu libXt ];
-  })) // {inherit libICE libSM libX11 libXext libXmu libXt ;};
+    buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
+  })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
     
   utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
-    name = "util-macros-1.11.0";
+    name = "util-macros-1.17";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2;
-      sha256 = "1kya7z5rad93zmc0ij7jhl3shh1k37szmjg1rv75lizqlib4slz8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2;
+      sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1081,7 +1081,7 @@ let
     name = "videoproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2;
       sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry";
     };
     buildInputs = [pkgconfig ];
@@ -1091,28 +1091,28 @@ let
     name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2;
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
-    name = "x11perf-1.5.3";
+    name = "x11perf-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2;
-      sha256 = "1g91ksfrvj59hvxvfj1xb730aqscg5wdnc3grrab1wz7mxap6k9r";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2;
+      sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
   })) // {inherit libX11 libXext libXft libXmu libXrender ;};
     
   xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
-    name = "xauth-1.0.5";
+    name = "xauth-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2;
-      sha256 = "0v3lmm3qil8shgm7731pl0wd32kpq7w73w5d4mjq1bqxzw09a4vd";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2;
+      sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu ];
   })) // {inherit libX11 libXau libXext libXmu ;};
@@ -1121,7 +1121,7 @@ let
     name = "xbacklight-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2;
       sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg";
     };
     buildInputs = [pkgconfig libX11 libXrandr ];
@@ -1131,18 +1131,18 @@ let
     name = "xbitmaps-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2;
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
-    name = "xcb-proto-1.6";
+    name = "xcb-proto-1.7.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2;
-      sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2;
+      sha256 = "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd";
     };
     buildInputs = [pkgconfig python ];
   })) // {inherit python ;};
@@ -1198,41 +1198,41 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
     
   xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
-    name = "xclock-1.0.5";
+    name = "xclock-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xclock-1.0.5.tar.bz2;
-      sha256 = "16jcmsmhz503mqv7wz7daqqhm11phsws0g7fryzlz0gk4jg1daak";
+      url = mirror://xorg/individual/app/xclock-1.0.6.tar.bz2;
+      sha256 = "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ];
   })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;};
     
   xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
-    name = "xcmiscproto-1.2.1";
+    name = "xcmiscproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2;
-      sha256 = "05acy1axzkrq6z9xlbmz1kg66lbgfqzky8v4qfdl16gv5gi2f3kk";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2;
+      sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
-    name = "xcmsdb-1.0.3";
+    name = "xcmsdb-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2;
-      sha256 = "102s9lsghdp5n3bsg4chlkhrk0jh0kxvg2g0pyi1zmzfy5hd0dxj";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2;
+      sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
     };
     buildInputs = [pkgconfig libX11 ];
   })) // {inherit libX11 ;};
     
   xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
-    name = "xcursorgen-1.0.4";
+    name = "xcursorgen-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2;
-      sha256 = "07azdw6w18hdgrd6z3nawrhn1m18nyp24cz54ih91vpz8hpxnany";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2;
+      sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
   })) // {inherit libpng libX11 libXcursor ;};
@@ -1241,58 +1241,58 @@ let
     name = "xcursor-themes-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2;
       sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr";
     };
     buildInputs = [pkgconfig libXcursor ];
   })) // {inherit libXcursor ;};
     
   xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
-    name = "xdm-1.1.10";
+    name = "xdm-1.1.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdm-1.1.10.tar.bz2;
-      sha256 = "0zzrlkmppy6mma49db2x1il47rhjqkg9rs91ryl7xyv5iqbgg1ql";
+      url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2;
+      sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
   })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
     
   xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
-    name = "xdpyinfo-1.2.0";
+    name = "xdpyinfo-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2;
-      sha256 = "1kmmfawcjxgmp06jb3w7d0pxbrcxrrgfx3m1lbwj3gygir4ssnzy";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2;
+      sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3";
     };
-    buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+    buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
     
   xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
     name = "xdriinfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2;
       sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
     };
     buildInputs = [pkgconfig glproto libX11 ];
   })) // {inherit glproto libX11 ;};
     
   xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
-    name = "xev-1.1.0";
+    name = "xev-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2;
-      sha256 = "1ih1rxf2b6bpsggvbx4ibyx70bzgcyjl98l1894d0smjxmlc4n9q";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2;
+      sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto libXrandr ];
+  })) // {inherit libX11 xproto libXrandr ;};
     
   xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
-    name = "xextproto-7.1.2";
+    name = "xextproto-7.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2;
-      sha256 = "16ci2mc9g85fsb7lgml349rbgf97v7l9688by71agv682bhjky7n";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2;
+      sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1311,7 +1311,7 @@ let
     name = "xf86bigfontproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2;
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
@@ -1321,7 +1321,7 @@ let
     name = "xf86dgaproto-2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2;
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
@@ -1331,98 +1331,78 @@ let
     name = "xf86driproto-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2;
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
-  xf86inputacecad = (stdenv.mkDerivation ((if overrides ? xf86inputacecad then overrides.xf86inputacecad else x: x) {
-    name = "xf86-input-acecad-1.4.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2;
-      sha256 = "0mnmvffxwgcvsa208vffsqlai7lldjc46rdk6j0j4q00df5isd28";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  })) // {inherit inputproto randrproto xorgserver xproto ;};
-    
-  xf86inputaiptek = (stdenv.mkDerivation ((if overrides ? xf86inputaiptek then overrides.xf86inputaiptek else x: x) {
-    name = "xf86-input-aiptek-1.3.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2;
-      sha256 = "16pby473s65lfd2v60fwayzfhf1n6x696lrx720zwb2p22rlsna3";
-    };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  })) // {inherit inputproto randrproto xorgserver xproto ;};
-    
   xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
-    name = "xf86-input-evdev-2.6.0";
+    name = "xf86-input-evdev-2.7.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2;
-      sha256 = "1b2kcxm7bc255ym56dpl1fw3km44f5ny3hwn65sa90w13acz7rxh";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2;
+      sha256 = "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y";
     };
-    buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  })) // {inherit inputproto xorgserver xproto ;};
+    buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
+  })) // {inherit inputproto udev xorgserver xproto ;};
     
   xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
-    name = "xf86-input-joystick-1.5.0";
+    name = "xf86-input-joystick-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2;
-      sha256 = "1ac2lap4npylyzg0pi0zy0n48wvicgz9kw0z9ih9ylk9sz2ii0bi";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2;
+      sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
   })) // {inherit inputproto kbproto xorgserver xproto ;};
     
   xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
-    name = "xf86-input-keyboard-1.5.0";
+    name = "xf86-input-keyboard-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2;
-      sha256 = "1c4ww4yj23shqwhc52r512qsy5baf1sxsb7jj7pfnralj07520r3";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2;
+      sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   })) // {inherit inputproto xorgserver xproto ;};
     
   xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
-    name = "xf86-input-mouse-1.6.0";
+    name = "xf86-input-mouse-1.7.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2;
-      sha256 = "1nzvlbhvdyki3h1s4x2i3ps1immf3wfns6az2i3669v8a5g29bn7";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2;
+      sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   })) // {inherit inputproto xorgserver xproto ;};
     
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.5.0";
+    name = "xf86-input-synaptics-1.5.99.902";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2;
-      sha256 = "0khwda8lrrvrdb37i4i1kdhg8f44kgcjq9y209ds7ja9zjcm7k4m";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2;
+      sha256 = "0sz3ipjpm6iwqd2g8kx0nwymxwg2plys7lk38ks5py4cd49gj0vc";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
     
   xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
-    name = "xf86-input-vmmouse-12.6.10";
+    name = "xf86-input-vmmouse-12.8.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2;
-      sha256 = "0409lkwk1ws8vw4axxilwmcs8qxj8lq5dma2i2iz49q6hrd9sdm6";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2;
+      sha256 = "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
   })) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
-    name = "xf86-input-void-1.3.1";
+    name = "xf86-input-void-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2;
-      sha256 = "0x662i756p0nqmfv76ppm28ir2sbvcm32r71ycd9bxc3mj29g9mb";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2;
+      sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
   })) // {inherit xorgserver xproto ;};
@@ -1437,72 +1417,52 @@ let
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
-  xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) {
-    name = "xf86-video-apm-1.2.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2;
-      sha256 = "1nih9ayiw13aa1s8j6gr99b207215if055c6yvsrssnpvccflij0";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
   xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
-    name = "xf86-video-ark-0.7.3";
+    name = "xf86-video-ark-0.7.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2;
-      sha256 = "164gyaaddjjma0xqys0knid2rsd0c7jlab02c8wh3bk4bib9l51r";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2;
+      sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
-    name = "xf86-video-ast-0.91.10";
+    name = "xf86-video-ast-0.93.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2;
-      sha256 = "05fcp0svdd4skkfgag1rrram6v3xzgasf582dihpyrwlz28186vy";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2;
+      sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {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.3";
+    name = "xf86-video-ati-6.14.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2;
-      sha256 = "1d1ph7xvgcr7rdf5sgibhas625aghvm3f61yzwmfk8znxx4jcjl4";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2;
+      sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg";
     };
     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 ;};
     
-  xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) {
-    name = "xf86-video-chips-1.2.3";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2;
-      sha256 = "07fb03cxdlis2rjphz2pl59cjhldrhqric8p0gi4wkgq0s72fq85";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
   xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
-    name = "xf86-video-cirrus-1.3.2";
+    name = "xf86-video-cirrus-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2;
-      sha256 = "06na525xy5d6xf5g13bjsk9cyxly5arzgrk9j8dmxfll5jj9i6jj";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2;
+      sha256 = "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
-    name = "xf86-video-dummy-0.3.4";
+    name = "xf86-video-dummy-0.3.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2;
-      sha256 = "1p0vhxvx25d8fp59i72664smhd0z5zw0i2kipk0879xk1vsxz13y";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2;
+      sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
   })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
@@ -1511,71 +1471,61 @@ let
     name = "xf86-video-fbdev-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2;
       sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
     
   xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
-    name = "xf86-video-geode-2.11.10";
+    name = "xf86-video-geode-2.11.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2;
-      sha256 = "1zdb3y5df1dcqlvijg8hxcd6520a5c69jk52yz7ww194ka2c8icf";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2;
+      sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
-    name = "xf86-video-glide-1.1.0";
+    name = "xf86-video-glide-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2;
-      sha256 = "1wf35ai8z3qqk2a97rp72jzvm28ylw2wj2hllrsn29p7jpznh5aw";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2;
+      sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
   })) // {inherit xextproto xorgserver xproto ;};
     
   xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
-    name = "xf86-video-glint-1.2.5";
+    name = "xf86-video-glint-1.2.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2;
-      sha256 = "0jw1kkyja8hvvhrr3ldl1r5vpqfhn1xmqkpgd2jrkc5p59rz4xan";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2;
+      sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs";
     };
-    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
+  })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
-    name = "xf86-video-i128-1.3.4";
+    name = "xf86-video-i128-1.3.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2;
-      sha256 = "1kwb4ifxwm77s1ks19csmq2ymgs36bxqwvwv24ssvxb9znki76xn";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
-  xf86videoi740 = (stdenv.mkDerivation ((if overrides ? xf86videoi740 then overrides.xf86videoi740 else x: x) {
-    name = "xf86-video-i740-1.3.2";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2;
-      sha256 = "0hzr5fz6d5jk9jxh9plfgvgias3w7xzyg1n4gx0hs2lc7mm9qm28";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2;
+      sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
-    name = "xf86-video-intel-2.15.0";
+    name = "xf86-video-intel-2.18.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2;
-      sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2;
+      sha256 = "1z4z0dq9abrbqk8mdzhdcwjwbm7dv3gnhrqy3vpkknpsrhrkxrnw";
     };
-    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
-  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
     
   xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
     name = "xf86-video-intel-2.14.901";
@@ -1598,31 +1548,31 @@ let
   })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
     
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
-    name = "xf86-video-mach64-6.8.2";
+    name = "xf86-video-mach64-6.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2;
-      sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2;
+      sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz";
     };
-    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 xorgserver xproto ];
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
-    name = "xf86-video-mga-1.4.13";
+    name = "xf86-video-mga-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2;
-      sha256 = "1xnzxmp9cfpi6q7fx2r74iwyb33wkdrqcf38dhwydbaaxigvsmxn";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2;
+      sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
-    name = "xf86-video-neomagic-1.2.5";
+    name = "xf86-video-neomagic-1.2.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2;
-      sha256 = "0jshn5k1byq0msl1ymip3m2xycrd8jkk6nzm5dx2av5xlj1rxdn0";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2;
+      sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
@@ -1631,7 +1581,7 @@ let
     name = "xf86-video-newport-0.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2;
       sha256 = "0w02rz49gipnfl33vak3zgis8bh9i0v5ykyj8qh9vzddjm7ypjp6";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
@@ -1641,127 +1591,67 @@ let
     name = "xf86-video-nv-2.1.18";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2;
       sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
-    name = "xf86-video-openchrome-0.2.904";
+    name = "xf86-video-openchrome-0.2.905";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2;
-      sha256 = "1sksddn0pc3izvab5ppxhprs1xzk5ijwqz5ylivx1cb5hg2gggf7";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2;
+      sha256 = "1llbm020s0fck9chs0906xz7jr4h3whxan4s10ls9046g7xib3qc";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
     
   xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
-    name = "xf86-video-r128-6.8.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2;
-      sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji";
-    };
-    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 ;};
-    
-  xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) {
-    name = "xf86-video-rendition-4.2.4";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2;
-      sha256 = "1a9anxgqs7wc8d7jb5nw6dgmynw0sxiwp9p90h4w19y315kqx6rv";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
-    
-  xf86videos3 = (stdenv.mkDerivation ((if overrides ? xf86videos3 then overrides.xf86videos3 else x: x) {
-    name = "xf86-video-s3-0.6.3";
+    name = "xf86-video-r128-6.8.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2;
-      sha256 = "0i2i1080cw3pxy1pm43bskb80n7wql0cxpyd2s61v0didsm6b7zd";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2;
+      sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv";
     };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
-  xf86videos3virge = (stdenv.mkDerivation ((if overrides ? xf86videos3virge then overrides.xf86videos3virge else x: x) {
-    name = "xf86-video-s3virge-1.10.4";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2;
-      sha256 = "1f3zjs6a3j2a8lfdilijggpwbg9cs88qksrvzvd71ggxf5p0vl0w";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
     
   xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
-    name = "xf86-video-savage-2.3.1";
+    name = "xf86-video-savage-2.3.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2;
-      sha256 = "1ays1l4phyjcdikc9d1zwgswivcrb1grkh7klv5klvqahbfxqjib";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2;
+      sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
     
   xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
-    name = "xf86-video-siliconmotion-1.7.4";
+    name = "xf86-video-siliconmotion-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2;
-      sha256 = "1mq4dsg2f77wxl0n4fnm6a5p3lajyhra6rxx29z52p5b1x412xdl";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2;
+      sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5";
     };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
+  })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
     
   xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
-    name = "xf86-video-sis-0.10.3";
+    name = "xf86-video-sis-0.10.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2;
-      sha256 = "0dy7a7iil35nz1xlazrcq0sp474p6wy0f1pa5y0spbfj5zib6fcv";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2;
+      sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
     
-  xf86videosisusb = (stdenv.mkDerivation ((if overrides ? xf86videosisusb then overrides.xf86videosisusb else x: x) {
-    name = "xf86-video-sisusb-0.9.4";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2;
-      sha256 = "0b5afc1dqj8h34fldl35hzf7wphj1x76czkd461bfarnvyljgfrb";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
-    
-  xf86videosuncg14 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg14 then overrides.xf86videosuncg14 else x: x) {
-    name = "xf86-video-suncg14-1.1.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2;
-      sha256 = "1n108xbwg803v2sk51galx66ph8wdb0ym84fx45h0jrr41wh0hyb";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-    
-  xf86videosuncg3 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg3 then overrides.xf86videosuncg3 else x: x) {
-    name = "xf86-video-suncg3-1.1.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2;
-      sha256 = "06c4hzmd5cfzbw79yrv3knss80hllciamz734ij1pbzj6j6fjvym";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-    
   xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
     name = "xf86-video-suncg6-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2;
       sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -1771,38 +1661,18 @@ let
     name = "xf86-video-sunffb-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2;
       sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
     
-  xf86videosunleo = (stdenv.mkDerivation ((if overrides ? xf86videosunleo then overrides.xf86videosunleo else x: x) {
-    name = "xf86-video-sunleo-1.2.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2;
-      sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-    
-  xf86videosuntcx = (stdenv.mkDerivation ((if overrides ? xf86videosuntcx then overrides.xf86videosuntcx else x: x) {
-    name = "xf86-video-suntcx-1.1.1";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2;
-      sha256 = "07lqah5sizhwjpzr4vcpwgvbl86fwz4k0c3skp63sq58ng21acal";
-    };
-    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-    
   xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
-    name = "xf86-video-tdfx-1.4.3";
+    name = "xf86-video-tdfx-1.4.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2;
-      sha256 = "0cxz1rsc87cnf0ba1zfwhk0lhfas92ysc9b13q6x21m31b53bn9s";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2;
+      sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1811,58 +1681,48 @@ let
     name = "xf86-video-tga-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2;
       sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
-    name = "xf86-video-trident-1.3.4";
+    name = "xf86-video-trident-1.3.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2;
-      sha256 = "1a4wybqwd617mg8lzn1xvi5m0iibimxpvyqsr31mhb7gw0qidrjq";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2;
+      sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
     
-  xf86videotseng = (stdenv.mkDerivation ((if overrides ? xf86videotseng then overrides.xf86videotseng else x: x) {
-    name = "xf86-video-tseng-1.2.4";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2;
-      sha256 = "0gfiwx2p51k3k78qic8y9y0d3d6nhhbmzfvzmw5hx3ba9kxmvpfh";
-    };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-    
   xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
     name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
   })) // {inherit randrproto videoproto xorgserver xproto ;};
     
   xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
-    name = "xf86-video-vesa-2.3.0";
+    name = "xf86-video-vesa-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2;
-      sha256 = "0yhdj39d8rfv2n4i52dg7cg1rsrclagn7rjs3pc3jdajjh75mn4f";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2;
+      sha256 = "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
-    name = "xf86-video-vmware-11.0.3";
+    name = "xf86-video-vmware-12.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2;
-      sha256 = "18rqkzr1dvzgdr2khlhhpai69z28rnrfl8jiw9hnahbyv2r7qjmj";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
+      sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
@@ -1871,78 +1731,58 @@ let
     name = "xf86-video-voodoo-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2;
       sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
     
   xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
-    name = "xf86-video-wsfb-0.3.0";
+    name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2;
-      sha256 = "17lqhir0adcccfkrzz2sr8cpv5vkakk0w7xfc22vv7c6jz9vdgbq";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2;
+      sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
   })) // {inherit xorgserver xproto ;};
     
-  xf86videoxgi = (stdenv.mkDerivation ((if overrides ? xf86videoxgi then overrides.xf86videoxgi else x: x) {
-    name = "xf86-video-xgi-1.6.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2;
-      sha256 = "05wl9a51pik5swkzpyhh4y2gf6m3hd458r4142p5w39bbkmhcd78";
-    };
-    buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
-  })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
-    
-  xf86videoxgixp = (stdenv.mkDerivation ((if overrides ? xf86videoxgixp then overrides.xf86videoxgixp else x: x) {
-    name = "xf86-video-xgixp-1.8.0";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2;
-      sha256 = "06np5s3f3451vmjwpxbn8hb7d4dhsxff2af8qy8jlc24rinnv9is";
-    };
-    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
-    
   xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
     name = "xf86vidmodeproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2;
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
-    name = "xfs-1.1.1";
+    name = "xfs-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xfs-1.1.1.tar.bz2;
-      sha256 = "1yxm87az3xghngcsd50zz6mdgi9j6vm8pw90sjqzshwq7hx7d0qc";
+      url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2;
+      sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd";
     };
-    buildInputs = [pkgconfig libFS libXfont xtrans ];
-  })) // {inherit libFS libXfont xtrans ;};
+    buildInputs = [pkgconfig libXfont xproto xtrans ];
+  })) // {inherit libXfont xproto xtrans ;};
     
   xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
-    name = "xgamma-1.0.4";
+    name = "xgamma-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2;
-      sha256 = "05lfx9517why64b3n14drid7vn1d2g2ymg22034vqq50h9437j3x";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2;
+      sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
   })) // {inherit libX11 libXxf86vm ;};
     
   xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
-    name = "xhost-1.0.4";
+    name = "xhost-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2;
-      sha256 = "15558q9hgmw6vbwc2sgjkfpzw342lxci9w8vcbrmi8mpmrnc00jy";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2;
+      sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu ];
   })) // {inherit libX11 libXau libXmu ;};
@@ -1951,7 +1791,7 @@ let
     name = "xineramaproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2;
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
@@ -1968,31 +1808,31 @@ let
   })) // {inherit libX11 ;};
     
   xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
-    name = "xinput-1.5.3";
+    name = "xinput-1.5.99.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2;
-      sha256 = "0xjwi1sjmvmmzgcvzvz4q8wn0gs7x3aivknx77yfxnndrqqy3bba";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2;
+      sha256 = "0ldrhzrmphygsrdngv6ibxykvg85c55shyg7kywg86a1l0s5cijf";
     };
-    buildInputs = [pkgconfig inputproto libX11 libXext libXi ];
-  })) // {inherit inputproto libX11 libXext libXi ;};
+    buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
+  })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
     
   xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
-    name = "xkbcomp-1.2.1";
+    name = "xkbcomp-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2;
-      sha256 = "1sv51rliqs6wygrp2hc79a5pgn6ly0bbr4sa8a8x00j4j4kjaqdp";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2;
+      sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
     };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
-  })) // {inherit libX11 libxkbfile ;};
+    buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+  })) // {inherit libX11 libxkbfile xproto ;};
     
   xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
-    name = "xkbevd-1.1.2";
+    name = "xkbevd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2;
-      sha256 = "0qzbh1wb2fg0wsyfqr4j15443caa1xfcxwdf1gzb4gpbkxn98qnd";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2;
+      sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   })) // {inherit libX11 libxkbfile ;};
@@ -2001,28 +1841,38 @@ let
     name = "xkbutils-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2;
       sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
   })) // {inherit inputproto libX11 libXaw xproto libXt ;};
     
+  xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
+    name = "xkeyboard-config-2.5.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2;
+      sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b";
+    };
+    buildInputs = [pkgconfig ];
+  })) // {inherit ;};
+    
   xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
     name = "xkill-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2;
       sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   })) // {inherit libX11 libXmu ;};
     
   xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
-    name = "xlsatoms-1.1.0";
+    name = "xlsatoms-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2;
-      sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2;
+      sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
     };
     buildInputs = [pkgconfig libxcb ];
   })) // {inherit libxcb ;};
@@ -2031,7 +1881,7 @@ let
     name = "xlsclients-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2;
       sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w";
     };
     buildInputs = [pkgconfig libxcb ];
@@ -2048,14 +1898,14 @@ let
   })) // {inherit libXaw libXt ;};
     
   xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
-    name = "xmodmap-1.0.5";
+    name = "xmodmap-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2;
-      sha256 = "00il5y6q2m90f62cqzgc0ni5qg3y946gf98jj325kx8cgfhyf7j2";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2;
+      sha256 = "0p9skymavb0pi8jiylwwkdvp9r8say1hl903kcwpr1qiifagr2y5";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
     
   xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
     name = "xorg-cf-files-1.0.4";
@@ -2068,81 +1918,81 @@ let
   })) // {inherit ;};
     
   xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
-    name = "xorg-docs-1.6";
+    name = "xorg-docs-1.6.99.901";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2;
-      sha256 = "0clxy41642jx77mmw5j2fnwa88ms1a7z1z8xpzrgs45bhv21pcpn";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2;
+      sha256 = "0f0kk6za1k4nn1xycmd6hx85rf8mgzdk098f6phl3x2xfax6r43b";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.9.5";
+    name = "xorg-server-1.12.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2;
-      sha256 = "1p19w1s840jb1ah6na0c9k23gbh9wwz1il272irqy3jggh4pbirz";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2;
+      sha256 = "0nml86yvvik7a90wpyr08jkjiydzs26wg119hzwmr5v7qzdc27fj";
     };
-    buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
-  })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
+    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
-    name = "xorg-sgml-doctools-1.6";
+    name = "xorg-sgml-doctools-1.10.99.901";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2;
-      sha256 = "0smfsman09dqqw6h638w44lgp2kng2jwk53sb74i7r53x1v09llq";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2;
+      sha256 = "014ny4z5i69ang0yygvk7yiqb3m4bhmr05qvh2xmi0y0y61nlrjp";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
-    name = "xpr-1.0.3";
+    name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2;
-      sha256 = "0zckkd45lzbikmdn29r12faby8g5prjkacc1z8aw87pq9sqdcy18";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2;
+      sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  })) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libX11 libXmu xproto ];
+  })) // {inherit libX11 libXmu xproto ;};
     
   xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
-    name = "xprop-1.2.0";
+    name = "xprop-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2;
-      sha256 = "173bpq7x2amr77xy28f9m4nfdwr340wj3jw9hkbbznq35c48ql2k";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2;
+      sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
     
   xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
-    name = "xproto-7.0.20";
+    name = "xproto-7.0.23";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2;
-      sha256 = "0alyxrd8wmdvdqm1v3q4x5brv4prj0gxf59pp9h5wycvgpj7zs1z";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2;
+      sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
-    name = "xrandr-1.3.4";
+    name = "xrandr-1.3.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2;
-      sha256 = "1nsadgvn57b9way7v0s4yk2729rwqj1m5fbilmd38lfcws928jjy";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2;
+      sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h";
     };
-    buildInputs = [pkgconfig libX11 libXrandr libXrender ];
-  })) // {inherit libX11 libXrandr libXrender ;};
+    buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
+  })) // {inherit libX11 xproto libXrandr libXrender ;};
     
   xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
-    name = "xrdb-1.0.8";
+    name = "xrdb-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2;
-      sha256 = "1r2k50qnflj40iandhxhvnrvnhy4qliz5kymlh682455gjmlgn7z";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2;
+      sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934";
     };
     buildInputs = [pkgconfig libX11 libXmu ];
   })) // {inherit libX11 libXmu ;};
@@ -2151,38 +2001,38 @@ let
     name = "xrefresh-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2;
       sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586";
     };
     buildInputs = [pkgconfig libX11 ];
   })) // {inherit libX11 ;};
     
   xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
-    name = "xset-1.2.1";
+    name = "xset-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2;
-      sha256 = "18cja8b9xrilpshz0z8bkmpjm6pjb20w71xf41jgm70h4dymz6gc";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2;
+      sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1";
     };
-    buildInputs = [pkgconfig libX11 libXext libXmu libXxf86misc ];
-  })) // {inherit libX11 libXext libXmu libXxf86misc ;};
+    buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
+  })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
     
   xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
     name = "xsetroot-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2;
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
   })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
     
   xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
-    name = "xtrans-1.2.6";
+    name = "xtrans-1.2.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2;
-      sha256 = "1im5kj6y8j8m9i5lf1c33dkag6sb7g1zmi0niydqrfyx0lvsgyf5";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2;
+      sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -2191,40 +2041,40 @@ let
     name = "xvinfo-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2;
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2;
       sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0";
     };
     buildInputs = [pkgconfig libX11 libXv ];
   })) // {inherit libX11 libXv ;};
     
   xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
-    name = "xwd-1.0.4";
+    name = "xwd-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2;
-      sha256 = "07mh72j794hwq5rnqkmdd4wj27mqmdc3da4jkwpva2hsj64wi9mp";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2;
+      sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
     
   xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
-    name = "xwininfo-1.1.1";
+    name = "xwininfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2;
-      sha256 = "0g9ll8hv0k5cjz4l5kdv64xzmalf9mpwjzcy8nx6myvh92z5fnk4";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2;
+      sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
   })) // {inherit libX11 libxcb xproto ;};
     
   xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
-    name = "xwud-1.0.3";
+    name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2;
-      sha256 = "0hrc6gbipg7cximgkaxixlha9m2fph31dpzhzdfw7g63bkhfmzc8";
+      url = mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2;
+      sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
     
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 744eb66d84c..2763291d92f 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
 mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
-mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
+mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 5eacf46d1c3..67a1e710a1b 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -1,8 +1,8 @@
-mirror://xorg/individual/app/twm-1.0.6.tar.bz2
-mirror://xorg/individual/app/xclock-1.0.5.tar.bz2
-mirror://xorg/individual/app/xdm-1.1.10.tar.bz2
+mirror://xorg/individual/app/twm-1.0.7.tar.bz2
+mirror://xorg/individual/app/xclock-1.0.6.tar.bz2
+mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
-mirror://xorg/individual/app/xfs-1.1.1.tar.bz2
+mirror://xorg/individual/app/xfs-1.1.2.tar.bz2
 mirror://xorg/individual/app/xinit-1.3.0.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2
@@ -10,6 +10,6 @@ mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2
 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
-mirror://xorg/individual/util/imake-1.0.4.tar.bz2
-mirror://xorg/individual/util/lndir-1.0.2.tar.bz2
+mirror://xorg/individual/util/imake-1.0.5.tar.bz2
+mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 46903124568..c46c7c830ac 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -188,9 +188,11 @@ in
       '';
   };
 
-  libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
-    configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
-  };
+  libSM = attrs: attrs
+    // { propagatedBuildInputs = [ xorg.libICE ]; }
+    // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
+      configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
+    };
 
   lndir = attrs: attrs // {
     preConfigure = ''
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
deleted file mode 100644
index 613c3107c86..00000000000
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ /dev/null
@@ -1,199 +0,0 @@
-mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
-mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2
-mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2
-mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2
-mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2
-mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2
-mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2
-mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2
-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.3.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
-mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2
-mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
-mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
-mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2
-mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list b/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list
new file mode 100644
index 00000000000..e7ad33b2971
--- /dev/null
+++ b/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list
@@ -0,0 +1,184 @@
+mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2
+mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 36aae068438..de61d1e556b 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -6,8 +6,6 @@
 , libxkbfile, libXfont, libpciaccess
 }:
 
-
-
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
author	Eelco Dolstra <eelco.dolstra@logicblox.com>	2012-05-16 22:06:27 +0000
committer	Eelco Dolstra <eelco.dolstra@logicblox.com>	2012-05-16 22:06:27 +0000
commit	932d5bee544e39b0e06ba2e850fe2d7fa89b030f (patch)
tree	0eb4f12fc7e9726bc1d606af24a6add517d7ba4b
parent	277bd69fa9391824482b17fba65eddc9ad7a4b64 (diff)
download	nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.gz nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.bz2 nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.lz nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.xz nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.tar.zst nixpkgs-932d5bee544e39b0e06ba2e850fe2d7fa89b030f.zip