diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f6a56e5a0163..7351369842d5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -6,7 +6,7 @@
 rec {
 
   applewmproto = stdenv.mkDerivation {
-    name = "applewmproto.0-1.0.3";
+    name = "applewmproto-1.0.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/applewmproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "2acf46c814a27c40acd3e448ed17fee3";
@@ -15,7 +15,7 @@ rec {
   };
     
   appres = stdenv.mkDerivation {
-    name = "appres.0-1.0.0";
+    name = "appres-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/appres-X11R7.0-1.0.0.tar.bz2;
       md5 = "3327357fc851a49e8e5dc44405e7b862";
@@ -24,7 +24,7 @@ rec {
   };
     
   bdftopcf = stdenv.mkDerivation {
-    name = "bdftopcf.0-1.0.0";
+    name = "bdftopcf-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bdftopcf-X11R7.0-1.0.0.tar.bz2;
       md5 = "f43667fcf613054cae0679f5dc5a1e7a";
@@ -33,7 +33,7 @@ rec {
   };
     
   beforelight = stdenv.mkDerivation {
-    name = "beforelight.0-1.0.1";
+    name = "beforelight-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/beforelight-X11R7.0-1.0.1.tar.bz2;
       md5 = "e0326eff9d1bd4e3a1af9e615a0048b3";
@@ -42,7 +42,7 @@ rec {
   };
     
   bigreqsproto = stdenv.mkDerivation {
-    name = "bigreqsproto.0-1.0.2";
+    name = "bigreqsproto-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bigreqsproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "ec15d17e3f04ddb5870ef7239b4ab367";
@@ -51,7 +51,7 @@ rec {
   };
     
   bitmap = stdenv.mkDerivation {
-    name = "bitmap.0-1.0.1";
+    name = "bitmap-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/bitmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "bbb3df097821d3edb4d5a4b2ae731de6";
@@ -60,7 +60,7 @@ rec {
   };
     
   compositeproto = stdenv.mkDerivation {
-    name = "compositeproto.0-0.2.2";
+    name = "compositeproto-0.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/compositeproto-X11R7.0-0.2.2.tar.bz2;
       md5 = "4de13ee64fdfd409134dfee9b184e6a9";
@@ -69,7 +69,7 @@ rec {
   };
     
   damageproto = stdenv.mkDerivation {
-    name = "damageproto.0-1.0.3";
+    name = "damageproto-1.0.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/damageproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "b906344d68e09a5639deb0097bd74224";
@@ -78,7 +78,7 @@ rec {
   };
     
   dmxproto = stdenv.mkDerivation {
-    name = "dmxproto.0-2.2.2";
+    name = "dmxproto-2.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/dmxproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "21c79302beb868a078490549f558cdcf";
@@ -87,7 +87,7 @@ rec {
   };
     
   editres = stdenv.mkDerivation {
-    name = "editres.0-1.0.1";
+    name = "editres-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/editres-X11R7.0-1.0.1.tar.bz2;
       md5 = "a9dc7f3b0cb59f08ab1e6554a5e60721";
@@ -96,7 +96,7 @@ rec {
   };
     
   encodings = stdenv.mkDerivation {
-    name = "encodings.0-1.0.0";
+    name = "encodings-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/encodings-X11R7.0-1.0.0.tar.bz2;
       md5 = "385cbd4093b610610ca54c06cbb0f497";
@@ -105,7 +105,7 @@ rec {
   };
     
   evieext = stdenv.mkDerivation {
-    name = "evieext.0-1.0.2";
+    name = "evieext-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/evieext-X11R7.0-1.0.2.tar.bz2;
       md5 = "411c0d4f9eaa7d220a8d13edc790e3de";
@@ -114,7 +114,7 @@ rec {
   };
     
   fixesproto = stdenv.mkDerivation {
-    name = "fixesproto.0-3.0.2";
+    name = "fixesproto-3.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fixesproto-X11R7.0-3.0.2.tar.bz2;
       md5 = "ff8899d2325ed8a5787cde372ca8f80f";
@@ -123,7 +123,7 @@ rec {
   };
     
   fontadobe100dpi = stdenv.mkDerivation {
-    name = "font-adobe-100dpi.0-1.0.0";
+    name = "font-adobe-100dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "f5de34fa63976de9263f032453348f6c";
@@ -132,7 +132,7 @@ rec {
   };
     
   fontadobe75dpi = stdenv.mkDerivation {
-    name = "font-adobe-75dpi.0-1.0.0";
+    name = "font-adobe-75dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "361fc4c9da3c34c5105df4f4688029d0";
@@ -141,7 +141,7 @@ rec {
   };
     
   fontadobeutopia100dpi = stdenv.mkDerivation {
-    name = "font-adobe-utopia-100dpi.0-1.0.1";
+    name = "font-adobe-utopia-100dpi-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2;
       md5 = "b720eed8eba0e4c5bcb9fdf6c2003355";
@@ -150,7 +150,7 @@ rec {
   };
     
   fontadobeutopia75dpi = stdenv.mkDerivation {
-    name = "font-adobe-utopia-75dpi.0-1.0.1";
+    name = "font-adobe-utopia-75dpi-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2;
       md5 = "a6d5d355b92a7e640698c934b0b79b53";
@@ -159,7 +159,7 @@ rec {
   };
     
   fontadobeutopiatype1 = stdenv.mkDerivation {
-    name = "font-adobe-utopia-type1.0-1.0.1";
+    name = "font-adobe-utopia-type1-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2;
       md5 = "db1cc2f707cffd08a461f093b55ced5e";
@@ -168,7 +168,7 @@ rec {
   };
     
   fontalias = stdenv.mkDerivation {
-    name = "font-alias.0-1.0.1";
+    name = "font-alias-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-alias-X11R7.0-1.0.1.tar.bz2;
       md5 = "de7035b15ba7edc36f8685ab3c17a9cf";
@@ -177,7 +177,7 @@ rec {
   };
     
   fontarabicmisc = stdenv.mkDerivation {
-    name = "font-arabic-misc.0-1.0.0";
+    name = "font-arabic-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-arabic-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "b95dc750ddc7d511e1f570034d9e1b27";
@@ -186,7 +186,7 @@ rec {
   };
     
   fontbh100dpi = stdenv.mkDerivation {
-    name = "font-bh-100dpi.0-1.0.0";
+    name = "font-bh-100dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "29eeed0ad42653f27b929119581deb3e";
@@ -195,7 +195,7 @@ rec {
   };
     
   fontbh75dpi = stdenv.mkDerivation {
-    name = "font-bh-75dpi.0-1.0.0";
+    name = "font-bh-75dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "7546c97560eb325400365adbc426308b";
@@ -204,7 +204,7 @@ rec {
   };
     
   fontbhlucidatypewriter100dpi = stdenv.mkDerivation {
-    name = "font-bh-lucidatypewriter-100dpi.0-1.0.0";
+    name = "font-bh-lucidatypewriter-100dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "8a56f4cbea74f4dbbf9bdac95686dca8";
@@ -213,7 +213,7 @@ rec {
   };
     
   fontbhlucidatypewriter75dpi = stdenv.mkDerivation {
-    name = "font-bh-lucidatypewriter-75dpi.0-1.0.0";
+    name = "font-bh-lucidatypewriter-75dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "e5cccf93f4f1f793cd32adfa81cc1b40";
@@ -222,7 +222,7 @@ rec {
   };
     
   fontbhttf = stdenv.mkDerivation {
-    name = "font-bh-ttf.0-1.0.0";
+    name = "font-bh-ttf-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-ttf-X11R7.0-1.0.0.tar.bz2;
       md5 = "53b984889aec3c0c2eb07f8aaa49dba9";
@@ -231,7 +231,7 @@ rec {
   };
     
   fontbhtype1 = stdenv.mkDerivation {
-    name = "font-bh-type1.0-1.0.0";
+    name = "font-bh-type1-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bh-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "302111513d1e94303c0ec0139d5ae681";
@@ -240,7 +240,7 @@ rec {
   };
     
   fontbitstream100dpi = stdenv.mkDerivation {
-    name = "font-bitstream-100dpi.0-1.0.0";
+    name = "font-bitstream-100dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "dc595e77074de890974726769f25e123";
@@ -249,7 +249,7 @@ rec {
   };
     
   fontbitstream75dpi = stdenv.mkDerivation {
-    name = "font-bitstream-75dpi.0-1.0.0";
+    name = "font-bitstream-75dpi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2;
       md5 = "408515646743d14e1e2e240da4fffdc2";
@@ -258,7 +258,7 @@ rec {
   };
     
   fontbitstreamspeedo = stdenv.mkDerivation {
-    name = "font-bitstream-speedo.0-1.0.0";
+    name = "font-bitstream-speedo-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2;
       md5 = "068c78ce48e5e6c4f25e0bba839a6b7a";
@@ -267,7 +267,7 @@ rec {
   };
     
   fontbitstreamtype1 = stdenv.mkDerivation {
-    name = "font-bitstream-type1.0-1.0.0";
+    name = "font-bitstream-type1-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "f4881a7e28eaeb7580d5eaf0f09239da";
@@ -276,7 +276,7 @@ rec {
   };
     
   fontcacheproto = stdenv.mkDerivation {
-    name = "fontcacheproto.0-0.1.2";
+    name = "fontcacheproto-0.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fontcacheproto-X11R7.0-0.1.2.tar.bz2;
       md5 = "116997d63cf6f65b75593ff5ae7afecb";
@@ -285,7 +285,7 @@ rec {
   };
     
   fontcronyxcyrillic = stdenv.mkDerivation {
-    name = "font-cronyx-cyrillic.0-1.0.0";
+    name = "font-cronyx-cyrillic-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "447163fff74b57968fc5139d8b2ad988";
@@ -294,7 +294,7 @@ rec {
   };
     
   fontcursormisc = stdenv.mkDerivation {
-    name = "font-cursor-misc.0-1.0.0";
+    name = "font-cursor-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-cursor-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "82e89de0e1b9c95f32b0fc12f5131d2c";
@@ -303,7 +303,7 @@ rec {
   };
     
   fontdaewoomisc = stdenv.mkDerivation {
-    name = "font-daewoo-misc.0-1.0.0";
+    name = "font-daewoo-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-daewoo-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "2fd7e6c8c21990ad906872efd02f3873";
@@ -312,7 +312,7 @@ rec {
   };
     
   fontdecmisc = stdenv.mkDerivation {
-    name = "font-dec-misc.0-1.0.0";
+    name = "font-dec-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-dec-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "7ff9aba4c65aa226bda7528294c7998c";
@@ -321,7 +321,7 @@ rec {
   };
     
   fontibmtype1 = stdenv.mkDerivation {
-    name = "font-ibm-type1.0-1.0.0";
+    name = "font-ibm-type1-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-ibm-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "fab2c49cb0f9fcee0bc0ac77e510d4e5";
@@ -330,7 +330,7 @@ rec {
   };
     
   fontisasmisc = stdenv.mkDerivation {
-    name = "font-isas-misc.0-1.0.0";
+    name = "font-isas-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-isas-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "c0981507c9276c22956c7bfe932223d9";
@@ -339,7 +339,7 @@ rec {
   };
     
   fontjismisc = stdenv.mkDerivation {
-    name = "font-jis-misc.0-1.0.0";
+    name = "font-jis-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-jis-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "3732ca6c34d03e44c73f0c103512ef26";
@@ -348,7 +348,7 @@ rec {
   };
     
   fontmicromisc = stdenv.mkDerivation {
-    name = "font-micro-misc.0-1.0.0";
+    name = "font-micro-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-micro-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "eb0050d73145c5b9fb6b9035305edeb6";
@@ -357,7 +357,7 @@ rec {
   };
     
   fontmisccyrillic = stdenv.mkDerivation {
-    name = "font-misc-cyrillic.0-1.0.0";
+    name = "font-misc-cyrillic-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "58d31311e8e51efbe16517adaf1a239d";
@@ -366,7 +366,7 @@ rec {
   };
     
   fontmiscethiopic = stdenv.mkDerivation {
-    name = "font-misc-ethiopic.0-1.0.0";
+    name = "font-misc-ethiopic-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2;
       md5 = "190738980705826a27fbf4685650d3b9";
@@ -375,7 +375,7 @@ rec {
   };
     
   fontmiscmeltho = stdenv.mkDerivation {
-    name = "font-misc-meltho.0-1.0.0";
+    name = "font-misc-meltho-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-meltho-X11R7.0-1.0.0.tar.bz2;
       md5 = "8812c57220bcd139b4ba6266eafbd712";
@@ -384,7 +384,7 @@ rec {
   };
     
   fontmiscmisc = stdenv.mkDerivation {
-    name = "font-misc-misc.0-1.0.0";
+    name = "font-misc-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-misc-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "4a5a7987183a9e1ea232c8391ae4c244";
@@ -393,7 +393,7 @@ rec {
   };
     
   fontmuttmisc = stdenv.mkDerivation {
-    name = "font-mutt-misc.0-1.0.0";
+    name = "font-mutt-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-mutt-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "139b368edecf8185d16a33b4a7c09657";
@@ -402,7 +402,7 @@ rec {
   };
     
   fontschumachermisc = stdenv.mkDerivation {
-    name = "font-schumacher-misc.0-1.0.0";
+    name = "font-schumacher-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-schumacher-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "d51808138ef63b84363f7d82ed8bb681";
@@ -411,7 +411,7 @@ rec {
   };
     
   fontscreencyrillic = stdenv.mkDerivation {
-    name = "font-screen-cyrillic.0-1.0.0";
+    name = "font-screen-cyrillic-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "c08da585feb173e1b27c3fbf8f90ba45";
@@ -420,7 +420,7 @@ rec {
   };
     
   fontsonymisc = stdenv.mkDerivation {
-    name = "font-sony-misc.0-1.0.0";
+    name = "font-sony-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-sony-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "014725f97635da9e5e9b303ab796817e";
@@ -429,7 +429,7 @@ rec {
   };
     
   fontsproto = stdenv.mkDerivation {
-    name = "fontsproto.0-2.0.2";
+    name = "fontsproto-2.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fontsproto-X11R7.0-2.0.2.tar.bz2;
       md5 = "e2ca22df3a20177f060f04f15b8ce19b";
@@ -438,7 +438,7 @@ rec {
   };
     
   fontsunmisc = stdenv.mkDerivation {
-    name = "font-sun-misc.0-1.0.0";
+    name = "font-sun-misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-sun-misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "0259436c430034f24f3b239113c9630e";
@@ -447,7 +447,7 @@ rec {
   };
     
   fonttosfnt = stdenv.mkDerivation {
-    name = "fonttosfnt.0-1.0.1";
+    name = "fonttosfnt-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fonttosfnt-X11R7.0-1.0.1.tar.bz2;
       md5 = "89b65e010acaa3c5d370e1cc0ea9fce9";
@@ -456,7 +456,7 @@ rec {
   };
     
   fontutil = stdenv.mkDerivation {
-    name = "font-util.0-1.0.0";
+    name = "font-util-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-util-X11R7.0-1.0.0.tar.bz2;
       md5 = "73cc445cb20a658037ad3a7ac571f525";
@@ -465,7 +465,7 @@ rec {
   };
     
   fontwinitzkicyrillic = stdenv.mkDerivation {
-    name = "font-winitzki-cyrillic.0-1.0.0";
+    name = "font-winitzki-cyrillic-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2;
       md5 = "6dc447609609e4e2454ad7da29873501";
@@ -474,7 +474,7 @@ rec {
   };
     
   fontxfree86type1 = stdenv.mkDerivation {
-    name = "font-xfree86-type1.0-1.0.0";
+    name = "font-xfree86-type1-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2;
       md5 = "27a6bbf5c8bbe998ff7e8537929ccbc8";
@@ -483,7 +483,7 @@ rec {
   };
     
   fslsfonts = stdenv.mkDerivation {
-    name = "fslsfonts.0-1.0.1";
+    name = "fslsfonts-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fslsfonts-X11R7.0-1.0.1.tar.bz2;
       md5 = "c500b96cfec485e362204a8fc0bdfd44";
@@ -492,7 +492,7 @@ rec {
   };
     
   fstobdf = stdenv.mkDerivation {
-    name = "fstobdf.0-1.0.1";
+    name = "fstobdf-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/fstobdf-X11R7.0-1.0.1.tar.bz2;
       md5 = "233615dca862b64c69bc212090a22b4c";
@@ -501,7 +501,7 @@ rec {
   };
     
   gccmakedep = stdenv.mkDerivation {
-    name = "gccmakedep.0-1.0.1";
+    name = "gccmakedep-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/gccmakedep-X11R7.0-1.0.1.tar.bz2;
       md5 = "328eea864d27b2d3a88ceb2fa66eca6d";
@@ -510,7 +510,7 @@ rec {
   };
     
   glproto = stdenv.mkDerivation {
-    name = "glproto.0-1.4.3";
+    name = "glproto-1.4.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/glproto-X11R7.0-1.4.3.tar.bz2;
       md5 = "0ecb98487d7457f0592298fe9b8688f0";
@@ -519,7 +519,7 @@ rec {
   };
     
   iceauth = stdenv.mkDerivation {
-    name = "iceauth.0-1.0.1";
+    name = "iceauth-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/iceauth-X11R7.0-1.0.1.tar.bz2;
       md5 = "92035bd69b4c9aba47607ba0efcc8530";
@@ -528,7 +528,7 @@ rec {
   };
     
   ico = stdenv.mkDerivation {
-    name = "ico.0-1.0.1";
+    name = "ico-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/ico-X11R7.0-1.0.1.tar.bz2;
       md5 = "9c63d68a779819ba79e45d9b15d26b1f";
@@ -537,7 +537,7 @@ rec {
   };
     
   imake = stdenv.mkDerivation {
-    name = "imake.0-1.0.1";
+    name = "imake-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/imake-X11R7.0-1.0.1.tar.bz2;
       md5 = "487b4b86b2bd0c09e6d220a85d94efae";
@@ -546,7 +546,7 @@ rec {
   };
     
   inputproto = stdenv.mkDerivation {
-    name = "inputproto.0-1.3.2";
+    name = "inputproto-1.3.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/inputproto-X11R7.0-1.3.2.tar.bz2;
       md5 = "0da271f396bede5b8d09a61f6d1c4484";
@@ -555,7 +555,7 @@ rec {
   };
     
   kbproto = stdenv.mkDerivation {
-    name = "kbproto.0-1.0.2";
+    name = "kbproto-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/kbproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "403f56d717b3fefe465ddd03d9c7bc81";
@@ -564,7 +564,7 @@ rec {
   };
     
   lbxproxy = stdenv.mkDerivation {
-    name = "lbxproxy.0-1.0.1";
+    name = "lbxproxy-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lbxproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "d9c05283660eae742a77dcbc0091841a";
@@ -573,7 +573,7 @@ rec {
   };
     
   libAppleWM = stdenv.mkDerivation {
-    name = "libAppleWM.0-1.0.0";
+    name = "libAppleWM-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libAppleWM-X11R7.0-1.0.0.tar.bz2;
       md5 = "8af30932ebc278835375fca34a2790f5";
@@ -582,7 +582,7 @@ rec {
   };
     
   libFS = stdenv.mkDerivation {
-    name = "libFS.0-1.0.0";
+    name = "libFS-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libFS-X11R7.0-1.0.0.tar.bz2;
       md5 = "12d2d89e7eb6ab0eb5823c3296f4e7a5";
@@ -591,7 +591,7 @@ rec {
   };
     
   libICE = stdenv.mkDerivation {
-    name = "libICE.0-1.0.0";
+    name = "libICE-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libICE-X11R7.0-1.0.0.tar.bz2;
       md5 = "c778084b135311726da8dc74a16b3555";
@@ -600,7 +600,7 @@ rec {
   };
     
   libSM = stdenv.mkDerivation {
-    name = "libSM.0-1.0.0";
+    name = "libSM-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libSM-X11R7.0-1.0.0.tar.bz2;
       md5 = "8a4eec299e8f14e26200718af7b2dcfc";
@@ -609,7 +609,7 @@ rec {
   };
     
   libWindowsWM = stdenv.mkDerivation {
-    name = "libWindowsWM.0-1.0.0";
+    name = "libWindowsWM-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libWindowsWM-X11R7.0-1.0.0.tar.bz2;
       md5 = "d94f0389cd655b50e2987d5b988b82a5";
@@ -618,16 +618,16 @@ rec {
   };
     
   libX11 = stdenv.mkDerivation {
-    name = "libX11.0-1.0.0";
+    name = "libX11-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libX11-X11R7.0-1.0.0.tar.bz2;
       md5 = "dcf59f148c978816ebbe3fbc5c9ef0e1";
     };
-    buildInputs = [pkgconfig bigreqsproto xproto xextproto xtrans libXau xcmiscproto libXdmcp xf86bigfontproto ];
+    buildInputs = [pkgconfig bigreqsproto xproto xextproto xtrans libXau xcmiscproto libXdmcp xf86bigfontproto kbproto inputproto ];
   };
     
   libXScrnSaver = stdenv.mkDerivation {
-    name = "libXScrnSaver.0-1.0.1";
+    name = "libXScrnSaver-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXScrnSaver-X11R7.0-1.0.1.tar.bz2;
       md5 = "b9deb6ac3194aeab15d8f6220481af6d";
@@ -636,7 +636,7 @@ rec {
   };
     
   libXTrap = stdenv.mkDerivation {
-    name = "libXTrap.0-1.0.0";
+    name = "libXTrap-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXTrap-X11R7.0-1.0.0.tar.bz2;
       md5 = "8f2f1cc3b35f005e9030e162d89e2bdd";
@@ -645,7 +645,7 @@ rec {
   };
     
   libXau = stdenv.mkDerivation {
-    name = "libXau.0-1.0.0";
+    name = "libXau-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXau-X11R7.0-1.0.0.tar.bz2;
       md5 = "51ceac78ae0eaf40ffb77b3cccc028cc";
@@ -654,7 +654,7 @@ rec {
   };
     
   libXaw = stdenv.mkDerivation {
-    name = "libXaw.0-1.0.1";
+    name = "libXaw-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXaw-X11R7.0-1.0.1.tar.bz2;
       md5 = "ded3c7ed6d6ca2c5e257f60079a1a824";
@@ -663,7 +663,7 @@ rec {
   };
     
   libXcomposite = stdenv.mkDerivation {
-    name = "libXcomposite.0-0.2.2.2";
+    name = "libXcomposite-0.2.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXcomposite-X11R7.0-0.2.2.2.tar.bz2;
       md5 = "5773fe74d0f44b7264bd37c874efc7b1";
@@ -672,7 +672,7 @@ rec {
   };
     
   libXcursor = stdenv.mkDerivation {
-    name = "libXcursor.0-1.1.5.2";
+    name = "libXcursor-1.1.5.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXcursor-X11R7.0-1.1.5.2.tar.bz2;
       md5 = "048e15b725d8e081ac520e021af9a62c";
@@ -681,7 +681,7 @@ rec {
   };
     
   libXdamage = stdenv.mkDerivation {
-    name = "libXdamage.0-1.0.2.2";
+    name = "libXdamage-1.0.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXdamage-X11R7.0-1.0.2.2.tar.bz2;
       md5 = "e98c6cc1075db5f6e7e6c8aef303c562";
@@ -690,7 +690,7 @@ rec {
   };
     
   libXdmcp = stdenv.mkDerivation {
-    name = "libXdmcp.0-1.0.0";
+    name = "libXdmcp-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXdmcp-X11R7.0-1.0.0.tar.bz2;
       md5 = "509390dc46af61e3a6d07656fc5ad0ec";
@@ -699,7 +699,7 @@ rec {
   };
     
   libXevie = stdenv.mkDerivation {
-    name = "libXevie.0-1.0.0";
+    name = "libXevie-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXevie-X11R7.0-1.0.0.tar.bz2;
       md5 = "70b1787315d8d5f961edac05fef95fd6";
@@ -708,7 +708,7 @@ rec {
   };
     
   libXext = stdenv.mkDerivation {
-    name = "libXext.0-1.0.0";
+    name = "libXext-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXext-X11R7.0-1.0.0.tar.bz2;
       md5 = "9e47f574ac747446ac58ff9f6f402ceb";
@@ -717,7 +717,7 @@ rec {
   };
     
   libXfixes = stdenv.mkDerivation {
-    name = "libXfixes.0-3.0.1.2";
+    name = "libXfixes-3.0.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfixes-X11R7.0-3.0.1.2.tar.bz2;
       md5 = "5a027e5959dae32b69dce42118938544";
@@ -726,7 +726,7 @@ rec {
   };
     
   libXfont = stdenv.mkDerivation {
-    name = "libXfont.0-1.0.0";
+    name = "libXfont-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfont-X11R7.0-1.0.0.tar.bz2;
       md5 = "955c41694772c9fd214e3e206f5d2178";
@@ -735,7 +735,7 @@ rec {
   };
     
   libXfontcache = stdenv.mkDerivation {
-    name = "libXfontcache.0-1.0.1";
+    name = "libXfontcache-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfontcache-X11R7.0-1.0.1.tar.bz2;
       md5 = "1e3c7718ffaf4f617d3f67ada5a7601e";
@@ -744,7 +744,7 @@ rec {
   };
     
   libXft = stdenv.mkDerivation {
-    name = "libXft.0-2.1.8.2";
+    name = "libXft-2.1.8.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXft-X11R7.0-2.1.8.2.tar.bz2;
       md5 = "c42292b35325a9eeb24eb0f8d3a6ec52";
@@ -753,7 +753,7 @@ rec {
   };
     
   libXi = stdenv.mkDerivation {
-    name = "libXi.0-1.0.0";
+    name = "libXi-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXi-X11R7.0-1.0.0.tar.bz2;
       md5 = "99503799b4d52ec0cac8e203341bb7b3";
@@ -762,7 +762,7 @@ rec {
   };
     
   libXinerama = stdenv.mkDerivation {
-    name = "libXinerama.0-1.0.1";
+    name = "libXinerama-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXinerama-X11R7.0-1.0.1.tar.bz2;
       md5 = "1a1be870bb106193a4acc73c8c584dbc";
@@ -771,7 +771,7 @@ rec {
   };
     
   libXmu = stdenv.mkDerivation {
-    name = "libXmu.0-1.0.0";
+    name = "libXmu-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXmu-X11R7.0-1.0.0.tar.bz2;
       md5 = "df62f44da82c6780f07dc475a68dd9fa";
@@ -780,7 +780,7 @@ rec {
   };
     
   libXp = stdenv.mkDerivation {
-    name = "libXp.0-1.0.0";
+    name = "libXp-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXp-X11R7.0-1.0.0.tar.bz2;
       md5 = "63c3048e06da4f6a033c5ce25217b0c3";
@@ -789,7 +789,7 @@ rec {
   };
     
   libXpm = stdenv.mkDerivation {
-    name = "libXpm.0-3.5.4.2";
+    name = "libXpm-3.5.4.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXpm-X11R7.0-3.5.4.2.tar.bz2;
       md5 = "f3b3b6e687f567bbff7688d60edc81ba";
@@ -798,7 +798,7 @@ rec {
   };
     
   libXprintAppUtil = stdenv.mkDerivation {
-    name = "libXprintAppUtil.0-1.0.1";
+    name = "libXprintAppUtil-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXprintAppUtil-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d3f5d8d1f6c2c380bfc739128f41909";
@@ -807,7 +807,7 @@ rec {
   };
     
   libXprintUtil = stdenv.mkDerivation {
-    name = "libXprintUtil.0-1.0.1";
+    name = "libXprintUtil-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXprintUtil-X11R7.0-1.0.1.tar.bz2;
       md5 = "47f1863042a53a48b40c2fb0aa55a8f7";
@@ -816,7 +816,7 @@ rec {
   };
     
   libXrandr = stdenv.mkDerivation {
-    name = "libXrandr.0-1.1.0.2";
+    name = "libXrandr-1.1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXrandr-X11R7.0-1.1.0.2.tar.bz2;
       md5 = "e10aed44c2e1e5d9e6848a62ff2c90c7";
@@ -825,7 +825,7 @@ rec {
   };
     
   libXrender = stdenv.mkDerivation {
-    name = "libXrender.0-0.9.0.2";
+    name = "libXrender-0.9.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXrender-X11R7.0-0.9.0.2.tar.bz2;
       md5 = "3f0fa590dd84df07568631c91fbe68ab";
@@ -834,7 +834,7 @@ rec {
   };
     
   libXres = stdenv.mkDerivation {
-    name = "libXres.0-1.0.0";
+    name = "libXres-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXres-X11R7.0-1.0.0.tar.bz2;
       md5 = "cc5c4f130c9305e5bd973fbb7c56a254";
@@ -843,7 +843,7 @@ rec {
   };
     
   libXt = stdenv.mkDerivation {
-    name = "libXt.0-1.0.0";
+    name = "libXt-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXt-X11R7.0-1.0.0.tar.bz2;
       md5 = "d9c1c161f086a4d6c7510a924ee35c94";
@@ -852,7 +852,7 @@ rec {
   };
     
   libXtst = stdenv.mkDerivation {
-    name = "libXtst.0-1.0.1";
+    name = "libXtst-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXtst-X11R7.0-1.0.1.tar.bz2;
       md5 = "3a3a3b88b4bc2a82f0b6de8ff526cc8c";
@@ -861,7 +861,7 @@ rec {
   };
     
   libXv = stdenv.mkDerivation {
-    name = "libXv.0-1.0.1";
+    name = "libXv-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXv-X11R7.0-1.0.1.tar.bz2;
       md5 = "9f0075619fc8d8df460be8aaa9d9ab5d";
@@ -870,7 +870,7 @@ rec {
   };
     
   libXvMC = stdenv.mkDerivation {
-    name = "libXvMC.0-1.0.1";
+    name = "libXvMC-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXvMC-X11R7.0-1.0.1.tar.bz2;
       md5 = "c3eb4f526f08862489355a99e3eda1bd";
@@ -879,7 +879,7 @@ rec {
   };
     
   libXxf86dga = stdenv.mkDerivation {
-    name = "libXxf86dga.0-1.0.0";
+    name = "libXxf86dga-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86dga-X11R7.0-1.0.0.tar.bz2;
       md5 = "d2154a588953d8db4ae6252ebc7db439";
@@ -888,7 +888,7 @@ rec {
   };
     
   libXxf86misc = stdenv.mkDerivation {
-    name = "libXxf86misc.0-1.0.0";
+    name = "libXxf86misc-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86misc-X11R7.0-1.0.0.tar.bz2;
       md5 = "338568c9ca48b801f314c89c97327397";
@@ -897,7 +897,7 @@ rec {
   };
     
   libXxf86vm = stdenv.mkDerivation {
-    name = "libXxf86vm.0-1.0.0";
+    name = "libXxf86vm-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXxf86vm-X11R7.0-1.0.0.tar.bz2;
       md5 = "ed59db622581b33ec2a62e12b2f9c274";
@@ -906,7 +906,7 @@ rec {
   };
     
   libdmx = stdenv.mkDerivation {
-    name = "libdmx.0-1.0.1";
+    name = "libdmx-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libdmx-X11R7.0-1.0.1.tar.bz2;
       md5 = "ae6b3c48f1349fc5dfa7d7c4b9cf4718";
@@ -915,7 +915,7 @@ rec {
   };
     
   libfontenc = stdenv.mkDerivation {
-    name = "libfontenc.0-1.0.1";
+    name = "libfontenc-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libfontenc-X11R7.0-1.0.1.tar.bz2;
       md5 = "d7971cbb2d1000737bba86a4bd70b900";
@@ -924,7 +924,7 @@ rec {
   };
     
   liblbxutil = stdenv.mkDerivation {
-    name = "liblbxutil.0-1.0.0";
+    name = "liblbxutil-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liblbxutil-X11R7.0-1.0.0.tar.bz2;
       md5 = "1bcffde85723f78243d1ba60e1ebaef6";
@@ -933,7 +933,7 @@ rec {
   };
     
   liboldX = stdenv.mkDerivation {
-    name = "liboldX.0-1.0.1";
+    name = "liboldX-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liboldX-X11R7.0-1.0.1.tar.bz2;
       md5 = "a443a2dc15aa96a3d18340a1617d1bae";
@@ -942,7 +942,7 @@ rec {
   };
     
   libxkbfile = stdenv.mkDerivation {
-    name = "libxkbfile.0-1.0.1";
+    name = "libxkbfile-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libxkbfile-X11R7.0-1.0.1.tar.bz2;
       md5 = "0b1bb70a1df474c26dd83feab52e733d";
@@ -951,7 +951,7 @@ rec {
   };
     
   libxkbui = stdenv.mkDerivation {
-    name = "libxkbui.0-1.0.1";
+    name = "libxkbui-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libxkbui-X11R7.0-1.0.1.tar.bz2;
       md5 = "1992547d377b510517fc7681207eead5";
@@ -960,7 +960,7 @@ rec {
   };
     
   listres = stdenv.mkDerivation {
-    name = "listres.0-1.0.1";
+    name = "listres-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/listres-X11R7.0-1.0.1.tar.bz2;
       md5 = "2eeb802272a7910bb8a52b308bf0d5f6";
@@ -969,7 +969,7 @@ rec {
   };
     
   lndir = stdenv.mkDerivation {
-    name = "lndir.0-1.0.1";
+    name = "lndir-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lndir-X11R7.0-1.0.1.tar.bz2;
       md5 = "aa3616b9795e2445c85b2c79b0f94f7b";
@@ -978,7 +978,7 @@ rec {
   };
     
   luit = stdenv.mkDerivation {
-    name = "luit.0-1.0.1";
+    name = "luit-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/luit-X11R7.0-1.0.1.tar.bz2;
       md5 = "30428b8ff783a0cfd61dab05a17cfaa7";
@@ -987,7 +987,7 @@ rec {
   };
     
   makedepend = stdenv.mkDerivation {
-    name = "makedepend.0-1.0.0";
+    name = "makedepend-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/makedepend-X11R7.0-1.0.0.tar.bz2;
       md5 = "7494c7ff65d8c31ef8db13661487b54c";
@@ -996,7 +996,7 @@ rec {
   };
     
   mkcfm = stdenv.mkDerivation {
-    name = "mkcfm.0-1.0.1";
+    name = "mkcfm-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkcfm-X11R7.0-1.0.1.tar.bz2;
       md5 = "912e6305998441c26852309403742bec";
@@ -1005,7 +1005,7 @@ rec {
   };
     
   mkfontdir = stdenv.mkDerivation {
-    name = "mkfontdir.0-1.0.1";
+    name = "mkfontdir-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontdir-X11R7.0-1.0.1.tar.bz2;
       md5 = "29e6e5e8e7a29ed49abf33af192693cb";
@@ -1014,7 +1014,7 @@ rec {
   };
     
   mkfontscale = stdenv.mkDerivation {
-    name = "mkfontscale.0-1.0.1";
+    name = "mkfontscale-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontscale-X11R7.0-1.0.1.tar.bz2;
       md5 = "75bbd1dc425849e415a60afd9e74d2ff";
@@ -1023,7 +1023,7 @@ rec {
   };
     
   oclock = stdenv.mkDerivation {
-    name = "oclock.0-1.0.1";
+    name = "oclock-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/oclock-X11R7.0-1.0.1.tar.bz2;
       md5 = "e35af9699c49f0b77fad45a3b942c3b1";
@@ -1032,7 +1032,7 @@ rec {
   };
     
   printproto = stdenv.mkDerivation {
-    name = "printproto.0-1.0.3";
+    name = "printproto-1.0.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/printproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "15c629a109b074d669886b1c6b7b319e";
@@ -1041,7 +1041,7 @@ rec {
   };
     
   proxymngr = stdenv.mkDerivation {
-    name = "proxymngr.0-1.0.1";
+    name = "proxymngr-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/proxymngr-X11R7.0-1.0.1.tar.bz2;
       md5 = "0d2ca6876d84302f966fd105a3b69a8e";
@@ -1050,7 +1050,7 @@ rec {
   };
     
   randrproto = stdenv.mkDerivation {
-    name = "randrproto.0-1.1.2";
+    name = "randrproto-1.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/randrproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "bcf36d524f6f50aa16ee8e183350f7b8";
@@ -1059,7 +1059,7 @@ rec {
   };
     
   recordproto = stdenv.mkDerivation {
-    name = "recordproto.0-1.13.2";
+    name = "recordproto-1.13.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/recordproto-X11R7.0-1.13.2.tar.bz2;
       md5 = "6f41a40e8cf4452f1c1725d46b08eb2e";
@@ -1068,7 +1068,7 @@ rec {
   };
     
   renderproto = stdenv.mkDerivation {
-    name = "renderproto.0-0.9.2";
+    name = "renderproto-0.9.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/renderproto-X11R7.0-0.9.2.tar.bz2;
       md5 = "a7f3be0960c92ecb6a06a1022fe957df";
@@ -1077,7 +1077,7 @@ rec {
   };
     
   resourceproto = stdenv.mkDerivation {
-    name = "resourceproto.0-1.0.2";
+    name = "resourceproto-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/resourceproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "e13d7b0aa5c591224f073bbbd9d1b038";
@@ -1086,7 +1086,7 @@ rec {
   };
     
   rgb = stdenv.mkDerivation {
-    name = "rgb.0-1.0.0";
+    name = "rgb-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/rgb-X11R7.0-1.0.0.tar.bz2;
       md5 = "675e72f221714c3db8730daf0b50f69f";
@@ -1095,7 +1095,7 @@ rec {
   };
     
   rstart = stdenv.mkDerivation {
-    name = "rstart.0-1.0.1";
+    name = "rstart-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/rstart-X11R7.0-1.0.1.tar.bz2;
       md5 = "6f33a1bd8e99372b7544ddfcad456369";
@@ -1104,7 +1104,7 @@ rec {
   };
     
   scripts = stdenv.mkDerivation {
-    name = "scripts.0-1.0.1";
+    name = "scripts-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/scripts-X11R7.0-1.0.1.tar.bz2;
       md5 = "b5b43aa53372b78f1d67c86301e3dc02";
@@ -1113,7 +1113,7 @@ rec {
   };
     
   scrnsaverproto = stdenv.mkDerivation {
-    name = "scrnsaverproto.0-1.0.2";
+    name = "scrnsaverproto-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/scrnsaverproto-X11R7.0-1.0.2.tar.bz2;
       md5 = "3185971597710d8843d986da3271b83f";
@@ -1122,7 +1122,7 @@ rec {
   };
     
   sessreg = stdenv.mkDerivation {
-    name = "sessreg.0-1.0.0";
+    name = "sessreg-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/sessreg-X11R7.0-1.0.0.tar.bz2;
       md5 = "8289a5b947165449c23bdfad9af02b4c";
@@ -1131,7 +1131,7 @@ rec {
   };
     
   setxkbmap = stdenv.mkDerivation {
-    name = "setxkbmap.0-1.0.1";
+    name = "setxkbmap-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/setxkbmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "28b141ab0b1c44a5e90d31ad73bd1078";
@@ -1140,7 +1140,7 @@ rec {
   };
     
   showfont = stdenv.mkDerivation {
-    name = "showfont.0-1.0.1";
+    name = "showfont-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/showfont-X11R7.0-1.0.1.tar.bz2;
       md5 = "334cb5133960108ac2c24ee27e16bb8e";
@@ -1149,7 +1149,7 @@ rec {
   };
     
   smproxy = stdenv.mkDerivation {
-    name = "smproxy.0-1.0.1";
+    name = "smproxy-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/smproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "60f54881b6fb27a8ba238629e4097c4d";
@@ -1158,7 +1158,7 @@ rec {
   };
     
   trapproto = stdenv.mkDerivation {
-    name = "trapproto.0-3.4.3";
+    name = "trapproto-3.4.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/trapproto-X11R7.0-3.4.3.tar.bz2;
       md5 = "84ab290758d2c177df5924e10bff4835";
@@ -1167,7 +1167,7 @@ rec {
   };
     
   twm = stdenv.mkDerivation {
-    name = "twm.0-1.0.1";
+    name = "twm-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/twm-X11R7.0-1.0.1.tar.bz2;
       md5 = "cd525ca3ac5e29d21a61deebc1e0c376";
@@ -1176,7 +1176,7 @@ rec {
   };
     
   utilmacros = stdenv.mkDerivation {
-    name = "util-macros.0-1.0.1";
+    name = "util-macros-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/util-macros-X11R7.0-1.0.1.tar.bz2;
       md5 = "bc6be634532d4936eb753de54e1663d3";
@@ -1185,7 +1185,7 @@ rec {
   };
     
   videoproto = stdenv.mkDerivation {
-    name = "videoproto.0-2.2.2";
+    name = "videoproto-2.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/videoproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "de9e16a8a464531a54a36211d2f983bd";
@@ -1194,7 +1194,7 @@ rec {
   };
     
   viewres = stdenv.mkDerivation {
-    name = "viewres.0-1.0.1";
+    name = "viewres-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/viewres-X11R7.0-1.0.1.tar.bz2;
       md5 = "004bf8dd4646aca86faf5aa22b0c3f2f";
@@ -1203,7 +1203,7 @@ rec {
   };
     
   windowswmproto = stdenv.mkDerivation {
-    name = "windowswmproto.0-1.0.3";
+    name = "windowswmproto-1.0.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/windowswmproto-X11R7.0-1.0.3.tar.bz2;
       md5 = "ea2f71075f68371fec22eb98a6af8074";
@@ -1212,7 +1212,7 @@ rec {
   };
     
   x11perf = stdenv.mkDerivation {
-    name = "x11perf.0-1.0.1";
+    name = "x11perf-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/x11perf-X11R7.0-1.0.1.tar.bz2;
       md5 = "9986b20301c6a37bb144cb9733bf35a0";
@@ -1221,7 +1221,7 @@ rec {
   };
     
   xauth = stdenv.mkDerivation {
-    name = "xauth.0-1.0.1";
+    name = "xauth-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xauth-X11R7.0-1.0.1.tar.bz2;
       md5 = "ef2359ddaaea6ffaf9072fa342d6eb09";
@@ -1230,7 +1230,7 @@ rec {
   };
     
   xbiff = stdenv.mkDerivation {
-    name = "xbiff.0-1.0.1";
+    name = "xbiff-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xbiff-X11R7.0-1.0.1.tar.bz2;
       md5 = "c4eb71a3187586d02365a67fc1445e54";
@@ -1239,7 +1239,7 @@ rec {
   };
     
   xbitmaps = stdenv.mkDerivation {
-    name = "xbitmaps.0-1.0.1";
+    name = "xbitmaps-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xbitmaps-X11R7.0-1.0.1.tar.bz2;
       md5 = "22c6f4a17220cd6b41d9799905f8e357";
@@ -1248,7 +1248,7 @@ rec {
   };
     
   xcalc = stdenv.mkDerivation {
-    name = "xcalc.0-1.0.1";
+    name = "xcalc-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcalc-X11R7.0-1.0.1.tar.bz2;
       md5 = "c1ecea85be15f746a59931e288768bdb";
@@ -1257,7 +1257,7 @@ rec {
   };
     
   xclipboard = stdenv.mkDerivation {
-    name = "xclipboard.0-1.0.1";
+    name = "xclipboard-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xclipboard-X11R7.0-1.0.1.tar.bz2;
       md5 = "a661b0f922cbdc62514bfd3e700d00fd";
@@ -1266,7 +1266,7 @@ rec {
   };
     
   xclock = stdenv.mkDerivation {
-    name = "xclock.0-1.0.1";
+    name = "xclock-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xclock-X11R7.0-1.0.1.tar.bz2;
       md5 = "00444fed4bf5cd51624476ee11dd1fab";
@@ -1275,7 +1275,7 @@ rec {
   };
     
   xcmiscproto = stdenv.mkDerivation {
-    name = "xcmiscproto.0-1.1.2";
+    name = "xcmiscproto-1.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcmiscproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "77f3ba0cbef119e0230d235507a1d916";
@@ -1284,7 +1284,7 @@ rec {
   };
     
   xcmsdb = stdenv.mkDerivation {
-    name = "xcmsdb.0-1.0.1";
+    name = "xcmsdb-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcmsdb-X11R7.0-1.0.1.tar.bz2;
       md5 = "1c8396ed5c416e3a6658394ff6c415ad";
@@ -1293,7 +1293,7 @@ rec {
   };
     
   xconsole = stdenv.mkDerivation {
-    name = "xconsole.0-1.0.1";
+    name = "xconsole-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xconsole-X11R7.0-1.0.1.tar.bz2;
       md5 = "f983b589ba9de198d90abee220a80f81";
@@ -1302,7 +1302,7 @@ rec {
   };
     
   xcursorgen = stdenv.mkDerivation {
-    name = "xcursorgen.0-1.0.0";
+    name = "xcursorgen-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcursorgen-X11R7.0-1.0.0.tar.bz2;
       md5 = "4d7b26dbb4442e89ec65c4147b31a5f7";
@@ -1311,7 +1311,7 @@ rec {
   };
     
   xcursorthemes = stdenv.mkDerivation {
-    name = "xcursor-themes.0-1.0.1";
+    name = "xcursor-themes-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xcursor-themes-X11R7.0-1.0.1.tar.bz2;
       md5 = "c39afeae55a7d330297b2fec3d113634";
@@ -1320,7 +1320,7 @@ rec {
   };
     
   xdbedizzy = stdenv.mkDerivation {
-    name = "xdbedizzy.0-1.0.1";
+    name = "xdbedizzy-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdbedizzy-X11R7.0-1.0.1.tar.bz2;
       md5 = "ceaccde801650ffbffc1e5b0657960d2";
@@ -1329,7 +1329,7 @@ rec {
   };
     
   xditview = stdenv.mkDerivation {
-    name = "xditview.0-1.0.1";
+    name = "xditview-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xditview-X11R7.0-1.0.1.tar.bz2;
       md5 = "21887fe4ec1965d637e82b7840650a6f";
@@ -1338,7 +1338,7 @@ rec {
   };
     
   xdm = stdenv.mkDerivation {
-    name = "xdm.0-1.0.1";
+    name = "xdm-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdm-X11R7.0-1.0.1.tar.bz2;
       md5 = "9ac363721dbb8cd39aa1064b260624a6";
@@ -1347,7 +1347,7 @@ rec {
   };
     
   xdpyinfo = stdenv.mkDerivation {
-    name = "xdpyinfo.0-1.0.1";
+    name = "xdpyinfo-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdpyinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "2b08e9ca783e3aa91d7fb84fdd716e93";
@@ -1356,7 +1356,7 @@ rec {
   };
     
   xdriinfo = stdenv.mkDerivation {
-    name = "xdriinfo.0-1.0.0";
+    name = "xdriinfo-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xdriinfo-X11R7.0-1.0.0.tar.bz2;
       md5 = "75b8b53e29bb295f7fbae7909e0e9770";
@@ -1365,7 +1365,7 @@ rec {
   };
     
   xedit = stdenv.mkDerivation {
-    name = "xedit.0-1.0.1";
+    name = "xedit-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xedit-X11R7.0-1.0.1.tar.bz2;
       md5 = "19f607d033f62fb1ee5965f4236b19d4";
@@ -1374,7 +1374,7 @@ rec {
   };
     
   xev = stdenv.mkDerivation {
-    name = "xev.0-1.0.1";
+    name = "xev-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xev-X11R7.0-1.0.1.tar.bz2;
       md5 = "5d0d3c13b03e9516eafe536e6bd756c7";
@@ -1383,7 +1383,7 @@ rec {
   };
     
   xextproto = stdenv.mkDerivation {
-    name = "xextproto.0-7.0.2";
+    name = "xextproto-7.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xextproto-X11R7.0-7.0.2.tar.bz2;
       md5 = "c0e88fc3483d90a7fea6a399298d90ea";
@@ -1392,7 +1392,7 @@ rec {
   };
     
   xeyes = stdenv.mkDerivation {
-    name = "xeyes.0-1.0.1";
+    name = "xeyes-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xeyes-X11R7.0-1.0.1.tar.bz2;
       md5 = "3ffafa7f222ea799bcd9fcd85c60ab98";
@@ -1401,7 +1401,7 @@ rec {
   };
     
   xf86bigfontproto = stdenv.mkDerivation {
-    name = "xf86bigfontproto.0-1.1.2";
+    name = "xf86bigfontproto-1.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "5509d420a2bc898ca7d817cd8bf1b2a7";
@@ -1410,7 +1410,7 @@ rec {
   };
     
   xf86dga = stdenv.mkDerivation {
-    name = "xf86dga.0-1.0.1";
+    name = "xf86dga-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86dga-X11R7.0-1.0.1.tar.bz2;
       md5 = "f518fd7ebef3d9e8dbaa57e50a3e2631";
@@ -1419,7 +1419,7 @@ rec {
   };
     
   xf86dgaproto = stdenv.mkDerivation {
-    name = "xf86dgaproto.0-2.0.2";
+    name = "xf86dgaproto-2.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86dgaproto-X11R7.0-2.0.2.tar.bz2;
       md5 = "48ddcc6b764dba7e711f8e25596abdb0";
@@ -1428,7 +1428,7 @@ rec {
   };
     
   xf86driproto = stdenv.mkDerivation {
-    name = "xf86driproto.0-2.0.3";
+    name = "xf86driproto-2.0.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86driproto-X11R7.0-2.0.3.tar.bz2;
       md5 = "839a70dfb8d5b02bcfc24996ab99a618";
@@ -1437,7 +1437,7 @@ rec {
   };
     
   xf86inputacecad = stdenv.mkDerivation {
-    name = "xf86-input-acecad.0-1.0.0.5";
+    name = "xf86-input-acecad-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "b35b1756579ebe296801622bdf063ab1";
@@ -1446,7 +1446,7 @@ rec {
   };
     
   xf86inputaiptek = stdenv.mkDerivation {
-    name = "xf86-input-aiptek.0-1.0.0.5";
+    name = "xf86-input-aiptek-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9ee5109ef33e281ce0784ad077f26cee";
@@ -1455,7 +1455,7 @@ rec {
   };
     
   xf86inputcalcomp = stdenv.mkDerivation {
-    name = "xf86-input-calcomp.0-1.0.0.5";
+    name = "xf86-input-calcomp-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-calcomp-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "f4199b5df063701462d5a8c84aadd190";
@@ -1464,7 +1464,7 @@ rec {
   };
     
   xf86inputcitron = stdenv.mkDerivation {
-    name = "xf86-input-citron.0-2.1.1.5";
+    name = "xf86-input-citron-2.1.1.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2;
       md5 = "62b5405d337bc055bc9345565cc0da8c";
@@ -1473,7 +1473,7 @@ rec {
   };
     
   xf86inputdigitaledge = stdenv.mkDerivation {
-    name = "xf86-input-digitaledge.0-1.0.1.3";
+    name = "xf86-input-digitaledge-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-digitaledge-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "8342f3a0dcdaa1120af01dd25dabf0d7";
@@ -1482,7 +1482,7 @@ rec {
   };
     
   xf86inputdmc = stdenv.mkDerivation {
-    name = "xf86-input-dmc.0-1.0.0.5";
+    name = "xf86-input-dmc-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-dmc-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fdf127a2d419f7c2e02bec27273091d3";
@@ -1491,7 +1491,7 @@ rec {
   };
     
   xf86inputdynapro = stdenv.mkDerivation {
-    name = "xf86-input-dynapro.0-1.0.0.5";
+    name = "xf86-input-dynapro-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-dynapro-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "89dbb839ab4c5fca3dbc3c2805a7efb9";
@@ -1500,7 +1500,7 @@ rec {
   };
     
   xf86inputelo2300 = stdenv.mkDerivation {
-    name = "xf86-input-elo2300.0-1.0.0.5";
+    name = "xf86-input-elo2300-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-elo2300-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "6009a17f13a37bfde8b60c2fba5b0e5b";
@@ -1509,7 +1509,7 @@ rec {
   };
     
   xf86inputelographics = stdenv.mkDerivation {
-    name = "xf86-input-elographics.0-1.0.0.5";
+    name = "xf86-input-elographics-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "24c33f833bb2db72a07c3d28bfc0aae9";
@@ -1518,7 +1518,7 @@ rec {
   };
     
   xf86inputevdev = stdenv.mkDerivation {
-    name = "xf86-input-evdev.0-1.0.0.5";
+    name = "xf86-input-evdev-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "d982c6f185f4c75a4b65703ceed7be06";
@@ -1527,7 +1527,7 @@ rec {
   };
     
   xf86inputfpit = stdenv.mkDerivation {
-    name = "xf86-input-fpit.0-1.0.0.5";
+    name = "xf86-input-fpit-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fc0e11fefc322623914a2d819d5b6d51";
@@ -1536,7 +1536,7 @@ rec {
   };
     
   xf86inputhyperpen = stdenv.mkDerivation {
-    name = "xf86-input-hyperpen.0-1.0.0.5";
+    name = "xf86-input-hyperpen-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0c4f2a6390e3045e4c48a48b47b6332c";
@@ -1545,7 +1545,7 @@ rec {
   };
     
   xf86inputjamstudio = stdenv.mkDerivation {
-    name = "xf86-input-jamstudio.0-1.0.0.5";
+    name = "xf86-input-jamstudio-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-jamstudio-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "49de35ca024be2cb785832ae37ec30d0";
@@ -1554,7 +1554,7 @@ rec {
   };
     
   xf86inputjoystick = stdenv.mkDerivation {
-    name = "xf86-input-joystick.0-1.0.0.5";
+    name = "xf86-input-joystick-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9e3ba60836f4c1d2e4cebc63a28321b4";
@@ -1563,7 +1563,7 @@ rec {
   };
     
   xf86inputkeyboard = stdenv.mkDerivation {
-    name = "xf86-input-keyboard.0-1.0.1.3";
+    name = "xf86-input-keyboard-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "8fb8a30fd9d7f152a1aef4eb8ef32b3f";
@@ -1572,7 +1572,7 @@ rec {
   };
     
   xf86inputmagellan = stdenv.mkDerivation {
-    name = "xf86-input-magellan.0-1.0.0.5";
+    name = "xf86-input-magellan-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-magellan-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fd7367f467dc3302604274cee59a7c7b";
@@ -1581,7 +1581,7 @@ rec {
   };
     
   xf86inputmagictouch = stdenv.mkDerivation {
-    name = "xf86-input-magictouch.0-1.0.0.5";
+    name = "xf86-input-magictouch-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-magictouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "a51d84792b8c0079d7c8d13eb17acf31";
@@ -1590,7 +1590,7 @@ rec {
   };
     
   xf86inputmicrotouch = stdenv.mkDerivation {
-    name = "xf86-input-microtouch.0-1.0.0.5";
+    name = "xf86-input-microtouch-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-microtouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0c25e0340b6483fb2a600b0e885724a2";
@@ -1599,7 +1599,7 @@ rec {
   };
     
   xf86inputmouse = stdenv.mkDerivation {
-    name = "xf86-input-mouse.0-1.0.3.1";
+    name = "xf86-input-mouse-1.0.3.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2;
       md5 = "12a908e5a97b1b03e8717abf167f4f27";
@@ -1608,7 +1608,7 @@ rec {
   };
     
   xf86inputmutouch = stdenv.mkDerivation {
-    name = "xf86-input-mutouch.0-1.0.0.5";
+    name = "xf86-input-mutouch-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "4758e667bfbba517df2a58d51270cfe2";
@@ -1617,7 +1617,7 @@ rec {
   };
     
   xf86inputpalmax = stdenv.mkDerivation {
-    name = "xf86-input-palmax.0-1.0.0.5";
+    name = "xf86-input-palmax-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-palmax-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "d138024a20298304af883631d23c5338";
@@ -1626,7 +1626,7 @@ rec {
   };
     
   xf86inputpenmount = stdenv.mkDerivation {
-    name = "xf86-input-penmount.0-1.0.0.5";
+    name = "xf86-input-penmount-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "065b1cf862864741aebcfefcc7c09539";
@@ -1635,7 +1635,7 @@ rec {
   };
     
   xf86inputspaceorb = stdenv.mkDerivation {
-    name = "xf86-input-spaceorb.0-1.0.0.5";
+    name = "xf86-input-spaceorb-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-spaceorb-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "193ca7b1e87c3995b86f15a01b63b297";
@@ -1644,7 +1644,7 @@ rec {
   };
     
   xf86inputsumma = stdenv.mkDerivation {
-    name = "xf86-input-summa.0-1.0.0.5";
+    name = "xf86-input-summa-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-summa-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "61d780857e5dc139081718c075e74a01";
@@ -1653,7 +1653,7 @@ rec {
   };
     
   xf86inputtek4957 = stdenv.mkDerivation {
-    name = "xf86-input-tek4957.0-1.0.0.5";
+    name = "xf86-input-tek4957-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "df633403c91a48c6a316c6a5f48e53e2";
@@ -1662,7 +1662,7 @@ rec {
   };
     
   xf86inputur98 = stdenv.mkDerivation {
-    name = "xf86-input-ur98.0-1.0.0.5";
+    name = "xf86-input-ur98-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-ur98-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "9b1530b3dcbb77690ad0e61f60489899";
@@ -1671,7 +1671,7 @@ rec {
   };
     
   xf86inputvoid = stdenv.mkDerivation {
-    name = "xf86-input-void.0-1.0.0.5";
+    name = "xf86-input-void-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "c7ae53dee1f3e95fa5ce9659b34d8446";
@@ -1680,7 +1680,7 @@ rec {
   };
     
   xf86miscproto = stdenv.mkDerivation {
-    name = "xf86miscproto.0-0.9.2";
+    name = "xf86miscproto-0.9.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86miscproto-X11R7.0-0.9.2.tar.bz2;
       md5 = "1cc082d8a6da5177ede354bedbacd4ed";
@@ -1689,7 +1689,7 @@ rec {
   };
     
   xf86rushproto = stdenv.mkDerivation {
-    name = "xf86rushproto.0-1.1.2";
+    name = "xf86rushproto-1.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86rushproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "1a6b258d72c3c3baccfd695d278e847c";
@@ -1698,7 +1698,7 @@ rec {
   };
     
   xf86videoapm = stdenv.mkDerivation {
-    name = "xf86-video-apm.0-1.0.1.5";
+    name = "xf86-video-apm-1.0.1.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2;
       md5 = "323911ab16a6147d3cabceff9336a3d2";
@@ -1707,7 +1707,7 @@ rec {
   };
     
   xf86videoark = stdenv.mkDerivation {
-    name = "xf86-video-ark.0-0.5.0.5";
+    name = "xf86-video-ark-0.5.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2;
       md5 = "342937e275dbc92f437417a3186a8222";
@@ -1716,7 +1716,7 @@ rec {
   };
     
   xf86videoati = stdenv.mkDerivation {
-    name = "xf86-video-ati.0-6.5.7.3";
+    name = "xf86-video-ati-6.5.7.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2;
       md5 = "92525195a7a36f5ffbffcb4e6a564e50";
@@ -1725,7 +1725,7 @@ rec {
   };
     
   xf86videochips = stdenv.mkDerivation {
-    name = "xf86-video-chips.0-1.0.1.3";
+    name = "xf86-video-chips-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "90f23505faceac30d3f46ab94f7293e1";
@@ -1734,7 +1734,7 @@ rec {
   };
     
   xf86videocirrus = stdenv.mkDerivation {
-    name = "xf86-video-cirrus.0-1.0.0.5";
+    name = "xf86-video-cirrus-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "7708693ad9d73cd76d4caef7c644a46f";
@@ -1743,7 +1743,7 @@ rec {
   };
     
   xf86videocyrix = stdenv.mkDerivation {
-    name = "xf86-video-cyrix.0-1.0.0.5";
+    name = "xf86-video-cyrix-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-cyrix-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "14f868d16554b19fef4f30398a7b9cf1";
@@ -1752,7 +1752,7 @@ rec {
   };
     
   xf86videodummy = stdenv.mkDerivation {
-    name = "xf86-video-dummy.0-0.1.0.5";
+    name = "xf86-video-dummy-0.1.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2;
       md5 = "462654f9be7e3022f97147e3390db97a";
@@ -1761,7 +1761,7 @@ rec {
   };
     
   xf86videofbdev = stdenv.mkDerivation {
-    name = "xf86-video-fbdev.0-0.1.0.5";
+    name = "xf86-video-fbdev-0.1.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-fbdev-X11R7.0-0.1.0.5.tar.bz2;
       md5 = "1cf374eeb9151ac16a7ec2cd38048737";
@@ -1770,7 +1770,7 @@ rec {
   };
     
   xf86videoglint = stdenv.mkDerivation {
-    name = "xf86-video-glint.0-1.0.1.3";
+    name = "xf86-video-glint-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "f14c2f1696c05760207adcaac856e5e5";
@@ -1779,7 +1779,7 @@ rec {
   };
     
   xf86videoi128 = stdenv.mkDerivation {
-    name = "xf86-video-i128.0-1.1.0.5";
+    name = "xf86-video-i128-1.1.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2;
       md5 = "078eed8c3673488ee618dfc7a3ef101b";
@@ -1788,7 +1788,7 @@ rec {
   };
     
   xf86videoi740 = stdenv.mkDerivation {
-    name = "xf86-video-i740.0-1.0.0.5";
+    name = "xf86-video-i740-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "625448b13ebe2a13b7defad1efec05c4";
@@ -1797,7 +1797,7 @@ rec {
   };
     
   xf86videoi810 = stdenv.mkDerivation {
-    name = "xf86-video-i810.0-1.4.1.3";
+    name = "xf86-video-i810-1.4.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i810-X11R7.0-1.4.1.3.tar.bz2;
       md5 = "fe6bec726fc1657b537508bbe8c2005b";
@@ -1806,7 +1806,7 @@ rec {
   };
     
   xf86videoimstt = stdenv.mkDerivation {
-    name = "xf86-video-imstt.0-1.0.0.5";
+    name = "xf86-video-imstt-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-imstt-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "cc949688918b78f830d78a9613e6896b";
@@ -1815,7 +1815,7 @@ rec {
   };
     
   xf86videomga = stdenv.mkDerivation {
-    name = "xf86-video-mga.0-1.2.1.3";
+    name = "xf86-video-mga-1.2.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-mga-X11R7.0-1.2.1.3.tar.bz2;
       md5 = "cb0409782020b5cc7edc273624ffdd17";
@@ -1824,7 +1824,7 @@ rec {
   };
     
   xf86videoneomagic = stdenv.mkDerivation {
-    name = "xf86-video-neomagic.0-1.0.0.5";
+    name = "xf86-video-neomagic-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "ffe9015678a41e97bdbd2825066bb47b";
@@ -1833,7 +1833,7 @@ rec {
   };
     
   xf86videonewport = stdenv.mkDerivation {
-    name = "xf86-video-newport.0-0.1.4.1";
+    name = "xf86-video-newport-0.1.4.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2;
       md5 = "d74d9896d57c3caf224ba3472630d874";
@@ -1842,7 +1842,7 @@ rec {
   };
     
   xf86videonsc = stdenv.mkDerivation {
-    name = "xf86-video-nsc.0-2.7.6.5";
+    name = "xf86-video-nsc-2.7.6.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2;
       md5 = "ab16611b3ec7d21503b16b0a31addae0";
@@ -1851,7 +1851,7 @@ rec {
   };
     
   xf86videonv = stdenv.mkDerivation {
-    name = "xf86-video-nv.0-1.0.1.5";
+    name = "xf86-video-nv-1.0.1.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-nv-X11R7.0-1.0.1.5.tar.bz2;
       md5 = "9a88547fe550e20edcc5a938d31e22b1";
@@ -1860,7 +1860,7 @@ rec {
   };
     
   xf86videorendition = stdenv.mkDerivation {
-    name = "xf86-video-rendition.0-4.0.1.3";
+    name = "xf86-video-rendition-4.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2;
       md5 = "f1a25db74a148dea45115e813027b932";
@@ -1869,7 +1869,7 @@ rec {
   };
     
   xf86videos3 = stdenv.mkDerivation {
-    name = "xf86-video-s3.0-0.3.5.5";
+    name = "xf86-video-s3-0.3.5.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2;
       md5 = "83b9e8a9b8fc1c49bda2811358e5007c";
@@ -1878,7 +1878,7 @@ rec {
   };
     
   xf86videos3virge = stdenv.mkDerivation {
-    name = "xf86-video-s3virge.0-1.8.6.5";
+    name = "xf86-video-s3virge-1.8.6.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-s3virge-X11R7.0-1.8.6.5.tar.bz2;
       md5 = "d0164c37749ab5f565db9813487e1900";
@@ -1887,7 +1887,7 @@ rec {
   };
     
   xf86videosavage = stdenv.mkDerivation {
-    name = "xf86-video-savage.0-2.0.2.3";
+    name = "xf86-video-savage-2.0.2.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2;
       md5 = "6b638dd500d10dba1822d3ea5061fc65";
@@ -1896,7 +1896,7 @@ rec {
   };
     
   xf86videosiliconmotion = stdenv.mkDerivation {
-    name = "xf86-video-siliconmotion.0-1.3.1.5";
+    name = "xf86-video-siliconmotion-1.3.1.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2;
       md5 = "957de4e2a3c687dbb2e9e18582397804";
@@ -1905,7 +1905,7 @@ rec {
   };
     
   xf86videosis = stdenv.mkDerivation {
-    name = "xf86-video-sis.0-0.8.1.3";
+    name = "xf86-video-sis-0.8.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sis-X11R7.0-0.8.1.3.tar.bz2;
       md5 = "e3bac5a208b8bacfbec236b5a5b0ef40";
@@ -1914,7 +1914,7 @@ rec {
   };
     
   xf86videosisusb = stdenv.mkDerivation {
-    name = "xf86-video-sisusb.0-0.7.1.3";
+    name = "xf86-video-sisusb-0.7.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2;
       md5 = "781d726a0ca54b65521e383ab99043c8";
@@ -1923,7 +1923,7 @@ rec {
   };
     
   xf86videosunbw2 = stdenv.mkDerivation {
-    name = "xf86-video-sunbw2.0-1.0.0.5";
+    name = "xf86-video-sunbw2-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunbw2-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "0cdda1ab939ea1190c142aa8aabfaf83";
@@ -1932,7 +1932,7 @@ rec {
   };
     
   xf86videosuncg14 = stdenv.mkDerivation {
-    name = "xf86-video-suncg14.0-1.0.0.5";
+    name = "xf86-video-suncg14-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "8f3a734d02ae716415f9c6344fa661bd";
@@ -1941,7 +1941,7 @@ rec {
   };
     
   xf86videosuncg3 = stdenv.mkDerivation {
-    name = "xf86-video-suncg3.0-1.0.0.5";
+    name = "xf86-video-suncg3-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "799a54cef1f4435e00fa94a1d97d056f";
@@ -1950,7 +1950,7 @@ rec {
   };
     
   xf86videosuncg6 = stdenv.mkDerivation {
-    name = "xf86-video-suncg6.0-1.0.0.5";
+    name = "xf86-video-suncg6-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "2227f3fb86b02148f347e002662e53c8";
@@ -1959,7 +1959,7 @@ rec {
   };
     
   xf86videosunffb = stdenv.mkDerivation {
-    name = "xf86-video-sunffb.0-1.0.1.3";
+    name = "xf86-video-sunffb-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "bb5182e3b74b3baa6fee245ac8bbf09a";
@@ -1968,7 +1968,7 @@ rec {
   };
     
   xf86videosunleo = stdenv.mkDerivation {
-    name = "xf86-video-sunleo.0-1.0.0.5";
+    name = "xf86-video-sunleo-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-sunleo-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "deb17a74ba68ee9593ac774206bd3612";
@@ -1977,7 +1977,7 @@ rec {
   };
     
   xf86videosuntcx = stdenv.mkDerivation {
-    name = "xf86-video-suntcx.0-1.0.0.5";
+    name = "xf86-video-suntcx-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "74d6ba5e55afdfebff84db08b6589e26";
@@ -1986,7 +1986,7 @@ rec {
   };
     
   xf86videotdfx = stdenv.mkDerivation {
-    name = "xf86-video-tdfx.0-1.1.1.3";
+    name = "xf86-video-tdfx-1.1.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2;
       md5 = "0201415230bf0454384c3bad099520d2";
@@ -1995,7 +1995,7 @@ rec {
   };
     
   xf86videotga = stdenv.mkDerivation {
-    name = "xf86-video-tga.0-1.0.0.5";
+    name = "xf86-video-tga-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "fa67bf34454888d38e15708395cfed87";
@@ -2004,7 +2004,7 @@ rec {
   };
     
   xf86videotrident = stdenv.mkDerivation {
-    name = "xf86-video-trident.0-1.0.1.2";
+    name = "xf86-video-trident-1.0.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2;
       md5 = "69f28afc7b585d01bb06b1e2f872f8ea";
@@ -2013,7 +2013,7 @@ rec {
   };
     
   xf86videotseng = stdenv.mkDerivation {
-    name = "xf86-video-tseng.0-1.0.0.5";
+    name = "xf86-video-tseng-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "981f46914c1e54742418f0444ea2e092";
@@ -2022,7 +2022,7 @@ rec {
   };
     
   xf86videov4l = stdenv.mkDerivation {
-    name = "xf86-video-v4l.0-0.0.1.5";
+    name = "xf86-video-v4l-0.0.1.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-v4l-X11R7.0-0.0.1.5.tar.bz2;
       md5 = "e422c63bc83717ecd0686aef2036802b";
@@ -2031,7 +2031,7 @@ rec {
   };
     
   xf86videovesa = stdenv.mkDerivation {
-    name = "xf86-video-vesa.0-1.0.1.3";
+    name = "xf86-video-vesa-1.0.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2;
       md5 = "049ada4df1abb5aa2b6633ba90353e78";
@@ -2040,7 +2040,7 @@ rec {
   };
     
   xf86videovga = stdenv.mkDerivation {
-    name = "xf86-video-vga.0-4.0.0.5";
+    name = "xf86-video-vga-4.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vga-X11R7.0-4.0.0.5.tar.bz2;
       md5 = "24437857707acc337cab331cc56f64e2";
@@ -2049,7 +2049,7 @@ rec {
   };
     
   xf86videovia = stdenv.mkDerivation {
-    name = "xf86-video-via.0-0.1.33.2";
+    name = "xf86-video-via-0.1.33.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-via-X11R7.0-0.1.33.2.tar.bz2;
       md5 = "4d3268d226a40f580ab105796bfed1f5";
@@ -2058,7 +2058,7 @@ rec {
   };
     
   xf86videovmware = stdenv.mkDerivation {
-    name = "xf86-video-vmware.0-10.11.1.3";
+    name = "xf86-video-vmware-10.11.1.3";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2;
       md5 = "4df79349e26add4c23f6be8bec347ad4";
@@ -2067,7 +2067,7 @@ rec {
   };
     
   xf86videovoodoo = stdenv.mkDerivation {
-    name = "xf86-video-voodoo.0-1.0.0.5";
+    name = "xf86-video-voodoo-1.0.0.5";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2;
       md5 = "e00cc814ebdb3f3067e075bc93b26199";
@@ -2076,7 +2076,7 @@ rec {
   };
     
   xf86vidmodeproto = stdenv.mkDerivation {
-    name = "xf86vidmodeproto.0-2.2.2";
+    name = "xf86vidmodeproto-2.2.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2;
       md5 = "475f19a2ffbfab9a0886791c5f89c978";
@@ -2085,7 +2085,7 @@ rec {
   };
     
   xfd = stdenv.mkDerivation {
-    name = "xfd.0-1.0.1";
+    name = "xfd-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfd-X11R7.0-1.0.1.tar.bz2;
       md5 = "26c83a6fe245906cc05055abf877d0f2";
@@ -2094,7 +2094,7 @@ rec {
   };
     
   xfindproxy = stdenv.mkDerivation {
-    name = "xfindproxy.0-1.0.1";
+    name = "xfindproxy-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfindproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "5ef22b8876bb452f670e0fc425a12504";
@@ -2103,7 +2103,7 @@ rec {
   };
     
   xfontsel = stdenv.mkDerivation {
-    name = "xfontsel.0-1.0.1";
+    name = "xfontsel-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfontsel-X11R7.0-1.0.1.tar.bz2;
       md5 = "d1df7b8622b7f8ebca4b2463118d7073";
@@ -2112,7 +2112,7 @@ rec {
   };
     
   xfs = stdenv.mkDerivation {
-    name = "xfs.0-1.0.1";
+    name = "xfs-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfs-X11R7.0-1.0.1.tar.bz2;
       md5 = "a297da3d906110e9c29ec56c5ea578a8";
@@ -2121,7 +2121,7 @@ rec {
   };
     
   xfsinfo = stdenv.mkDerivation {
-    name = "xfsinfo.0-1.0.1";
+    name = "xfsinfo-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfsinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "55ca0cfd09b1c1555d492d6961d9af46";
@@ -2130,7 +2130,7 @@ rec {
   };
     
   xfwp = stdenv.mkDerivation {
-    name = "xfwp.0-1.0.1";
+    name = "xfwp-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xfwp-X11R7.0-1.0.1.tar.bz2;
       md5 = "e1ef3fef10d1f7fbd936794982a8f0be";
@@ -2139,7 +2139,7 @@ rec {
   };
     
   xgamma = stdenv.mkDerivation {
-    name = "xgamma.0-1.0.1";
+    name = "xgamma-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xgamma-X11R7.0-1.0.1.tar.bz2;
       md5 = "07167da3f6b21985e27174ec70f213c0";
@@ -2148,7 +2148,7 @@ rec {
   };
     
   xgc = stdenv.mkDerivation {
-    name = "xgc.0-1.0.1";
+    name = "xgc-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xgc-X11R7.0-1.0.1.tar.bz2;
       md5 = "8cd01cf558c3eed738115abcf720277d";
@@ -2157,7 +2157,7 @@ rec {
   };
     
   xhost = stdenv.mkDerivation {
-    name = "xhost.0-1.0.0";
+    name = "xhost-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xhost-X11R7.0-1.0.0.tar.bz2;
       md5 = "76c44e84aaf4ad8e97cf15f4dbe4a24a";
@@ -2166,7 +2166,7 @@ rec {
   };
     
   xineramaproto = stdenv.mkDerivation {
-    name = "xineramaproto.0-1.1.2";
+    name = "xineramaproto-1.1.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xineramaproto-X11R7.0-1.1.2.tar.bz2;
       md5 = "80516ad305063f4e6c6c3ccf42ea2142";
@@ -2175,7 +2175,7 @@ rec {
   };
     
   xinit = stdenv.mkDerivation {
-    name = "xinit.0-1.0.1";
+    name = "xinit-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xinit-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d2df59fa328cbc99c0de98bc2e14597";
@@ -2184,7 +2184,7 @@ rec {
   };
     
   xkbcomp = stdenv.mkDerivation {
-    name = "xkbcomp.0-1.0.1";
+    name = "xkbcomp-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbcomp-X11R7.0-1.0.1.tar.bz2;
       md5 = "46d1e015897200d4dfed64990abaa8b9";
@@ -2193,7 +2193,7 @@ rec {
   };
     
   xkbdata = stdenv.mkDerivation {
-    name = "xkbdata.0-1.0.1";
+    name = "xkbdata-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbdata-X11R7.0-1.0.1.tar.bz2;
       md5 = "1f706f92334ee65818512b3b45d7be65";
@@ -2202,7 +2202,7 @@ rec {
   };
     
   xkbevd = stdenv.mkDerivation {
-    name = "xkbevd.0-1.0.1";
+    name = "xkbevd-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbevd-X11R7.0-1.0.1.tar.bz2;
       md5 = "7ba0496f079552d1918d73bd09bde9b2";
@@ -2211,7 +2211,7 @@ rec {
   };
     
   xkbprint = stdenv.mkDerivation {
-    name = "xkbprint.0-1.0.1";
+    name = "xkbprint-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbprint-X11R7.0-1.0.1.tar.bz2;
       md5 = "6235c39690968d0a9a4c1b1c16c8905a";
@@ -2220,7 +2220,7 @@ rec {
   };
     
   xkbutils = stdenv.mkDerivation {
-    name = "xkbutils.0-1.0.1";
+    name = "xkbutils-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkbutils-X11R7.0-1.0.1.tar.bz2;
       md5 = "798502eca0c6c3e8c02d76fabb910532";
@@ -2229,7 +2229,7 @@ rec {
   };
     
   xkill = stdenv.mkDerivation {
-    name = "xkill.0-1.0.1";
+    name = "xkill-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xkill-X11R7.0-1.0.1.tar.bz2;
       md5 = "35f47fd58d75c1ea5f414b21a10bdbf3";
@@ -2238,7 +2238,7 @@ rec {
   };
     
   xload = stdenv.mkDerivation {
-    name = "xload.0-1.0.1";
+    name = "xload-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xload-X11R7.0-1.0.1.tar.bz2;
       md5 = "11080456822146ebc0118b15f4b911d9";
@@ -2247,7 +2247,7 @@ rec {
   };
     
   xlogo = stdenv.mkDerivation {
-    name = "xlogo.0-1.0.1";
+    name = "xlogo-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlogo-X11R7.0-1.0.1.tar.bz2;
       md5 = "0314b2f5173da64957031400638fa5f8";
@@ -2256,7 +2256,7 @@ rec {
   };
     
   xlsatoms = stdenv.mkDerivation {
-    name = "xlsatoms.0-1.0.1";
+    name = "xlsatoms-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsatoms-X11R7.0-1.0.1.tar.bz2;
       md5 = "737b4d7893aa886e8e4181c94380a421";
@@ -2265,7 +2265,7 @@ rec {
   };
     
   xlsclients = stdenv.mkDerivation {
-    name = "xlsclients.0-1.0.1";
+    name = "xlsclients-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsclients-X11R7.0-1.0.1.tar.bz2;
       md5 = "cc0d64e90eab0b90b38355e841824588";
@@ -2274,7 +2274,7 @@ rec {
   };
     
   xlsfonts = stdenv.mkDerivation {
-    name = "xlsfonts.0-1.0.1";
+    name = "xlsfonts-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xlsfonts-X11R7.0-1.0.1.tar.bz2;
       md5 = "e8681e5671e7f01922ce6c8f2327e602";
@@ -2283,7 +2283,7 @@ rec {
   };
     
   xmag = stdenv.mkDerivation {
-    name = "xmag.0-1.0.1";
+    name = "xmag-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmag-X11R7.0-1.0.1.tar.bz2;
       md5 = "38ac487ac1b75be0253fe7f973947386";
@@ -2292,7 +2292,7 @@ rec {
   };
     
   xman = stdenv.mkDerivation {
-    name = "xman.0-1.0.1";
+    name = "xman-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xman-X11R7.0-1.0.1.tar.bz2;
       md5 = "a4f21547120952aeb8e5663ebd72e843";
@@ -2301,7 +2301,7 @@ rec {
   };
     
   xmessage = stdenv.mkDerivation {
-    name = "xmessage.0-1.0.1";
+    name = "xmessage-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmessage-X11R7.0-1.0.1.tar.bz2;
       md5 = "5a17607184fd348c2b36b5499ae9d2e6";
@@ -2310,7 +2310,7 @@ rec {
   };
     
   xmh = stdenv.mkDerivation {
-    name = "xmh.0-1.0.1";
+    name = "xmh-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmh-X11R7.0-1.0.1.tar.bz2;
       md5 = "53af2f87dc096d84f11ca6fbd6748b34";
@@ -2319,7 +2319,7 @@ rec {
   };
     
   xmodmap = stdenv.mkDerivation {
-    name = "xmodmap.0-1.0.0";
+    name = "xmodmap-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmodmap-X11R7.0-1.0.0.tar.bz2;
       md5 = "240ed53111925e005d2f138ea98ef5e1";
@@ -2328,7 +2328,7 @@ rec {
   };
     
   xmore = stdenv.mkDerivation {
-    name = "xmore.0-1.0.1";
+    name = "xmore-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xmore-X11R7.0-1.0.1.tar.bz2;
       md5 = "99a48c50d486b7c9098b4f5598782cac";
@@ -2337,7 +2337,7 @@ rec {
   };
     
   xorgcffiles = stdenv.mkDerivation {
-    name = "xorg-cf-files.0-1.0.1";
+    name = "xorg-cf-files-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-cf-files-X11R7.0-1.0.1.tar.bz2;
       md5 = "f2dd453c37386293fb207431b4a073dd";
@@ -2346,7 +2346,7 @@ rec {
   };
     
   xorgdocs = stdenv.mkDerivation {
-    name = "xorg-docs.0-1.0.1";
+    name = "xorg-docs-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-docs-X11R7.0-1.0.1.tar.bz2;
       md5 = "ac0d76afa46ef5da9e1cf33558f4b303";
@@ -2355,16 +2355,16 @@ rec {
   };
     
   xorgserver = stdenv.mkDerivation {
-    name = "xorg-server.0-1.0.1";
+    name = "xorg-server-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-server-X11R7.0-1.0.1.tar.bz2;
       md5 = "0e7527480fb845a3c2e333bd0f47ff50";
     };
-    buildInputs = [pkgconfig libX11 liblbxutil xf86driproto libdrm glproto printproto libXdmcp libXmu libXext libXrender libXfont libXi dmxproto libXau libXaw libXmu libXt libXpm libdmx libXtst libXres libxkbfile ];
+    buildInputs = [pkgconfig randrproto renderproto fixesproto damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontsproto inputproto xf86dgaproto libXfont libXau libfontenc videoproto compositeproto trapproto recordproto libX11 liblbxutil xf86driproto libdrm glproto xineramaproto evieext fontcacheproto printproto libxkbfile libXdmcp libXmu libXext libXrender libXi dmxproto libXaw libXmu libXt libXpm libdmx libXtst libXres ];
   };
     
   xorgsgmldoctools = stdenv.mkDerivation {
-    name = "xorg-sgml-doctools.0-1.0.1";
+    name = "xorg-sgml-doctools-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xorg-sgml-doctools-X11R7.0-1.0.1.tar.bz2;
       md5 = "d08d4fd10ac46d8b4636efe4d8c0de74";
@@ -2373,7 +2373,7 @@ rec {
   };
     
   xphelloworld = stdenv.mkDerivation {
-    name = "xphelloworld.0-1.0.1";
+    name = "xphelloworld-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xphelloworld-X11R7.0-1.0.1.tar.bz2;
       md5 = "80c9a23c7efb72b9674d7af6b7346992";
@@ -2382,7 +2382,7 @@ rec {
   };
     
   xplsprinters = stdenv.mkDerivation {
-    name = "xplsprinters.0-1.0.1";
+    name = "xplsprinters-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xplsprinters-X11R7.0-1.0.1.tar.bz2;
       md5 = "1d0a68dada5e14ab07d7660abd4d03e3";
@@ -2391,7 +2391,7 @@ rec {
   };
     
   xpr = stdenv.mkDerivation {
-    name = "xpr.0-1.0.1";
+    name = "xpr-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xpr-X11R7.0-1.0.1.tar.bz2;
       md5 = "487b5ab96b373acb80808758ce23eb49";
@@ -2400,7 +2400,7 @@ rec {
   };
     
   xprehashprinterlist = stdenv.mkDerivation {
-    name = "xprehashprinterlist.0-1.0.1";
+    name = "xprehashprinterlist-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xprehashprinterlist-X11R7.0-1.0.1.tar.bz2;
       md5 = "3907bce78d304dedb2a5dd6944bd2ed5";
@@ -2409,7 +2409,7 @@ rec {
   };
     
   xprop = stdenv.mkDerivation {
-    name = "xprop.0-1.0.1";
+    name = "xprop-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xprop-X11R7.0-1.0.1.tar.bz2;
       md5 = "6730f0fbad6969825580de46e66b44dd";
@@ -2418,7 +2418,7 @@ rec {
   };
     
   xproto = stdenv.mkDerivation {
-    name = "xproto.0-7.0.4";
+    name = "xproto-7.0.4";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xproto-X11R7.0-7.0.4.tar.bz2;
       md5 = "643259d00e02db8e9a6f4c047281b5d9";
@@ -2427,7 +2427,7 @@ rec {
   };
     
   xproxymanagementprotocol = stdenv.mkDerivation {
-    name = "xproxymanagementprotocol.0-1.0.2";
+    name = "xproxymanagementprotocol-1.0.2";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2;
       md5 = "977ee3fd1525418aaa8bfc55ffbf6fc9";
@@ -2436,7 +2436,7 @@ rec {
   };
     
   xrandr = stdenv.mkDerivation {
-    name = "xrandr.0-1.0.1";
+    name = "xrandr-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrandr-X11R7.0-1.0.1.tar.bz2;
       md5 = "e433ccca3c4f9ab8609dfd1c9c8e36ea";
@@ -2445,7 +2445,7 @@ rec {
   };
     
   xrdb = stdenv.mkDerivation {
-    name = "xrdb.0-1.0.1";
+    name = "xrdb-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrdb-X11R7.0-1.0.1.tar.bz2;
       md5 = "a3c1fd6f5391de7f810239a912d39fa5";
@@ -2454,7 +2454,7 @@ rec {
   };
     
   xrefresh = stdenv.mkDerivation {
-    name = "xrefresh.0-1.0.1";
+    name = "xrefresh-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrefresh-X11R7.0-1.0.1.tar.bz2;
       md5 = "5a46d5fb82aeeb4d6aac58c9cc367439";
@@ -2463,7 +2463,7 @@ rec {
   };
     
   xrx = stdenv.mkDerivation {
-    name = "xrx.0-1.0.1";
+    name = "xrx-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xrx-X11R7.0-1.0.1.tar.bz2;
       md5 = "9de3b04392c98df59c79a34fd51c385f";
@@ -2472,7 +2472,7 @@ rec {
   };
     
   xset = stdenv.mkDerivation {
-    name = "xset.0-1.0.1";
+    name = "xset-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xset-X11R7.0-1.0.1.tar.bz2;
       md5 = "a0350e334a215829166266e2ce504b1c";
@@ -2481,7 +2481,7 @@ rec {
   };
     
   xsetmode = stdenv.mkDerivation {
-    name = "xsetmode.0-1.0.0";
+    name = "xsetmode-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetmode-X11R7.0-1.0.0.tar.bz2;
       md5 = "d83d6ef0b73762feab724aab95d9a4a2";
@@ -2490,7 +2490,7 @@ rec {
   };
     
   xsetpointer = stdenv.mkDerivation {
-    name = "xsetpointer.0-1.0.0";
+    name = "xsetpointer-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetpointer-X11R7.0-1.0.0.tar.bz2;
       md5 = "195614431e2431508e07a42a3b6d4568";
@@ -2499,7 +2499,7 @@ rec {
   };
     
   xsetroot = stdenv.mkDerivation {
-    name = "xsetroot.0-1.0.1";
+    name = "xsetroot-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsetroot-X11R7.0-1.0.1.tar.bz2;
       md5 = "e2831b39cd395d6f6f4824b0e25f55ed";
@@ -2508,7 +2508,7 @@ rec {
   };
     
   xsm = stdenv.mkDerivation {
-    name = "xsm.0-1.0.1";
+    name = "xsm-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xsm-X11R7.0-1.0.1.tar.bz2;
       md5 = "e3588272ce3b7dc21d42ead683135a8a";
@@ -2517,7 +2517,7 @@ rec {
   };
     
   xstdcmap = stdenv.mkDerivation {
-    name = "xstdcmap.0-1.0.1";
+    name = "xstdcmap-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xstdcmap-X11R7.0-1.0.1.tar.bz2;
       md5 = "e276aa02d44dcacf5ac13aa0cabd404d";
@@ -2526,7 +2526,7 @@ rec {
   };
     
   xtrans = stdenv.mkDerivation {
-    name = "xtrans.0-1.0.0";
+    name = "xtrans-1.0.0";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xtrans-X11R7.0-1.0.0.tar.bz2;
       md5 = "153642136a003871a9093c8103d6ac5a";
@@ -2535,7 +2535,7 @@ rec {
   };
     
   xtrap = stdenv.mkDerivation {
-    name = "xtrap.0-1.0.1";
+    name = "xtrap-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xtrap-X11R7.0-1.0.1.tar.bz2;
       md5 = "6d56946322d2875eb33f25f5e5f621a3";
@@ -2544,7 +2544,7 @@ rec {
   };
     
   xvidtune = stdenv.mkDerivation {
-    name = "xvidtune.0-1.0.1";
+    name = "xvidtune-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xvidtune-X11R7.0-1.0.1.tar.bz2;
       md5 = "a12e27fb732cb115b6adc4c724c44c5d";
@@ -2553,7 +2553,7 @@ rec {
   };
     
   xvinfo = stdenv.mkDerivation {
-    name = "xvinfo.0-1.0.1";
+    name = "xvinfo-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xvinfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "39d79590345bed51da6df838f6490cbf";
@@ -2562,7 +2562,7 @@ rec {
   };
     
   xwd = stdenv.mkDerivation {
-    name = "xwd.0-1.0.1";
+    name = "xwd-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwd-X11R7.0-1.0.1.tar.bz2;
       md5 = "596c443465ab9ab67c59c794261d4571";
@@ -2571,7 +2571,7 @@ rec {
   };
     
   xwininfo = stdenv.mkDerivation {
-    name = "xwininfo.0-1.0.1";
+    name = "xwininfo-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwininfo-X11R7.0-1.0.1.tar.bz2;
       md5 = "3ec67e4e1b9f5a1fe7e56b56ab931893";
@@ -2580,7 +2580,7 @@ rec {
   };
     
   xwud = stdenv.mkDerivation {
-    name = "xwud.0-1.0.1";
+    name = "xwud-1.0.1";
     src = fetchurl {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xwud-X11R7.0-1.0.1.tar.bz2;
       md5 = "e08d2ee04abb89a6348f47c84a1ff3ed";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 36f98b91c401..89a4c785b744 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -10,6 +10,7 @@ my $baseURL = "http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything
 my $tmpDir = "/tmp/xorg-unpack";
 
 my $version = "X11R7"; # will be removed from package names
+my $version2 = "X11R7.0"; # will be removed from package names
 
 
 my %pkgURLs;
@@ -46,9 +47,9 @@ while (<>) {
     die unless defined $1;
     my $pkg = $1;
     $pkg =~ s/-//g;
+    print "$pkg\n";
     $pkg =~ s/$version//g if $version ne "";
     $pkgURLs{$pkg} = $tarball;
-#    print "$pkg\n";
 
     my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball' $pkgHashes{$pkg}`;
     chomp $hash;
@@ -62,7 +63,7 @@ while (<>) {
 
     $tarball =~ /\/([^\/]*)\.tar\.bz2$/;
     my $pkgName = $1;
-    $pkgName =~ s/-$version//g if $version ne "";
+    $pkgName =~ s/-$version2//g if $version2 ne "";
     $pkgNames{$pkg} = $pkgName;
 
     print "\nunpacking $path\n";
@@ -83,9 +84,14 @@ while (<>) {
 
     my @requires = ();
     my %requires = ();
-    open FOO, "cd '$tmpDir'/* && grep PKG_CHECK_MODULES configure.ac |";
+    open FOO, "cd '$tmpDir'/* && cat configure.ac |";
     while (<FOO>) {
-        if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/) {
+        if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ ||
+            /MODULES=\"(.*)\"/ ||
+            /REQUIRED_LIBS=\"(.*)\"/ ||
+            /REQUIRES=\"(.*)\"/)
+        {
+            print "MATCH: $_\n";
             foreach my $req (split / /, $1) {
                 next if $req eq ">=";
                 next if $req =~ /^\$/;