diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e6c4c1e6a39..0aa6c4a2044c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31,23 +31,21 @@
 
 rec {
 
+
   ### Symbolic names.
 
+
+  x11 = xlibsWrapper;
+
   # `xlibs' is the set of X library components.  This used to be the
   # old modular X libraries project (called `xlibs') but now it's just
   # the set of packages in the modular X.org tree (which also includes
   # non-library components like the server, drivers, fonts, etc.).
   xlibs = xorg // {xlibs = xlibsWrapper;};
 
-  x11 = xlibsWrapper;
-
 
   ### Helper functions.
-  useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
 
-  # Applying this to an attribute set will cause nix-env to look
-  # inside the set for derivations.
-  recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
 
   # Override the compiler in stdenv for specific packages.
   overrideGCC = stdenv: gcc: stdenv //
@@ -73,10 +71,15 @@ rec {
   #   };
   overrideSetup = stdenv: setup: stdenv.regenerate setup;
 
+  # Applying this to an attribute set will cause nix-env to look
+  # inside the set for derivations.
+  recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
+
+  useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
+
 
   ### STANDARD ENVIRONMENT
 
-  stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
 
   defaultStdenv =
     (import ../stdenv {
@@ -84,20 +87,11 @@ rec {
       allPackages = import ./all-packages.nix;
     }).stdenv;
 
+  stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
+
 
   ### BUILD SUPPORT
 
-  # Allow the stdenv to determine fetchurl, to cater for strange
-  # requirements.
-  fetchurl = useFromStdenv (stdenv ? fetchurl) stdenv.fetchurl
-    (import ../build-support/fetchurl {
-      inherit stdenv curl;
-    });
-
-  fetchsvn = (import ../build-support/fetchsvn) {
-    inherit stdenv subversion nix openssh;
-    sshSupport = true;
-  };
 
   fetchcvs = (import ../build-support/fetchcvs) {
     inherit stdenv cvs nix;
@@ -107,17 +101,59 @@ rec {
     inherit stdenv darcs nix;
   };
 
-  substituter = ../build-support/substitute/substitute.sh;
+  fetchsvn = (import ../build-support/fetchsvn) {
+    inherit stdenv subversion nix openssh;
+    sshSupport = true;
+  };
+
+  # Allow the stdenv to determine fetchurl, to cater for strange
+  # requirements.
+  fetchurl = useFromStdenv (stdenv ? fetchurl) stdenv.fetchurl
+    (import ../build-support/fetchurl {
+      inherit stdenv curl;
+    });
 
   makeWrapper = ../build-support/make-wrapper/make-wrapper.sh;
 
+  substituter = ../build-support/substitute/substitute.sh;
+
 
   ### TOOLS
 
+
+  azureus = import ../tools/networking/p2p/azureus {
+    inherit fetchurl stdenv jdk swt;
+  };
+
   bc = (import ../tools/misc/bc) {
     inherit fetchurl stdenv flex;
   };
 
+  bittorrent = (import ../tools/networking/p2p/bittorrent) {
+    inherit fetchurl stdenv python pygtk makeWrapper;
+  };
+
+  bsdiff = (import ../tools/compression/bsdiff) {
+    inherit fetchurl stdenv;
+  };
+
+  bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
+    (import ../tools/compression/bzip2 {
+      inherit fetchurl stdenv;
+    });
+
+  bzip2Static = (import ../tools/compression/bzip2-static) {
+    inherit fetchurl stdenv;
+  };
+
+  cabextract = import ../tools/archivers/cabextract {
+    inherit fetchurl stdenv;
+  };
+
+  cksfv = (import ../tools/networking/cksfv) {
+    inherit fetchurl stdenv;
+  };
+
   coreutils = useFromStdenv (stdenv ? coreutils) stdenv.coreutils
     (import ../tools/misc/coreutils {
       inherit fetchurl stdenv;
@@ -127,23 +163,108 @@ rec {
     inherit fetchurl stdenv dietgcc perl;
   };
 
+  cpio = (import ../tools/archivers/cpio) {
+    inherit fetchurl stdenv;
+  };
+
+  curl = if stdenv ? curl then stdenv.curl else (assert false; null);
+
+  curlDiet = (import ../tools/networking/curl-diet) {
+    inherit fetchurl stdenv zlib dietgcc;
+  };
+
+  dhcp = (import ../tools/networking/dhcp) {
+    inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
+  };
+
+  dhcpWrapper = (import ../tools/networking/dhcp-wrapper) {
+    inherit stdenv dhcp;
+  };
+
+  diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
+    (import ../tools/text/diffutils {
+      inherit fetchurl stdenv coreutils;
+    });
+
+  ed = (import ../tools/text/ed) {
+    inherit fetchurl stdenv;
+  };
+
+  enscript = (import ../tools/text/enscript) {
+    inherit fetchurl stdenv;
+  };
+
+  exif = (import ../tools/graphics/exif) {
+    inherit fetchurl stdenv pkgconfig libexif popt;
+  };
+
+  file = (import ../tools/misc/file) {
+    inherit fetchurl stdenv;
+  };
+
   findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils
     (import ../tools/misc/findutils {
       inherit fetchurl stdenv coreutils;
     });
 
-  findutilsWrapper = (import ../tools/misc/findutils-wrapper) {
-    inherit stdenv findutils;
-  };
-
   findutilsStatic = (import ../tools/misc/findutils-static) {
     inherit stdenv fetchurl coreutils;
   };
 
+  findutilsWrapper = (import ../tools/misc/findutils-wrapper) {
+    inherit stdenv findutils;
+  };
+
+  gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
+    (import ../tools/text/gawk {
+      inherit fetchurl stdenv;
+    });
+
   getopt = (import ../tools/misc/getopt) {
     inherit fetchurl stdenv;
   };
 
+  gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
+    (import ../tools/text/gnugrep {
+      inherit fetchurl stdenv pcre;
+    });
+
+  gnupatch = (import ../tools/text/gnupatch) {
+    inherit fetchurl stdenv;
+  };
+
+  gnupg = import ../tools/security/gnupg {
+    inherit fetchurl stdenv readline;
+    ideaSupport = true; # enable for IDEA crypto support
+  };
+
+  gnuplot = (import ../tools/graphics/gnuplot) {
+    inherit fetchurl stdenv zlib libpng texinfo;
+  };
+
+  gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
+    (import ../tools/text/gnused {
+      inherit fetchurl stdenv;
+    });
+
+  gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
+    (import ../tools/archivers/gnutar {
+      inherit fetchurl stdenv;
+    });
+
+  gnutarDiet = (import ../tools/archivers/gnutar-diet) {
+    inherit fetchurl stdenv dietgcc;
+  };
+
+  graphviz = (import ../tools/graphics/graphviz) {
+    inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
+    inherit (xlibs) libXaw;
+  };
+
+  groff = (import ../tools/text/groff) {
+    inherit fetchurl stdenv;
+  };
+
   grub = (import ../tools/misc/grub) {
     inherit fetchurl stdenv;
   };
@@ -152,79 +273,24 @@ rec {
      inherit stdenv grub diffutils gnused gnugrep coreutils;
   };
 
-  man = (import ../tools/misc/man) {
-     inherit fetchurl stdenv db4 groff;
+  gtkgnutella = (import ../tools/networking/p2p/gtk-gnutella) {
+    inherit fetchurl stdenv pkgconfig libxml2;
+    inherit (gtkLibs) glib gtk;
   };
 
-  manpages = (import ../development/misc/man-pages) {
-     inherit fetchurl stdenv;
-  };
+  gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
+    (import ../tools/compression/gzip {
+      inherit fetchurl stdenv;
+    });
 
-  parted = (import ../tools/misc/parted) {
-    inherit fetchurl stdenv e2fsprogs ncurses readline;
-  };
-
-  qtparted = (import ../tools/misc/qtparted) {
-    inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib;
-    inherit (xlibs) libX11 libXext;
-    qt3 = qt3NoMySQL;
+  hevea = (import ../tools/typesetting/hevea) {
+    inherit fetchurl stdenv ocaml;
   };
 
   jdiskreport = (import ../tools/misc/jdiskreport) {
     inherit fetchurl stdenv unzip jdk;
   };
 
-  diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
-    (import ../tools/text/diffutils {
-      inherit fetchurl stdenv coreutils;
-    });
-
-  gnupatch = (import ../tools/text/gnupatch) {
-    inherit fetchurl stdenv;
-  };
-
-  patch = useFromStdenv (stdenv ? patch) stdenv.patch gnupatch;
-
-  gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
-    (import ../tools/text/gnused {
-      inherit fetchurl stdenv;
-    });
-
-  gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
-    (import ../tools/text/gnugrep {
-      inherit fetchurl stdenv pcre;
-    });
-
-  gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
-    (import ../tools/text/gawk {
-      inherit fetchurl stdenv;
-    });
-
-  groff = (import ../tools/text/groff) {
-    inherit fetchurl stdenv;
-  };
-
-  enscript = (import ../tools/text/enscript) {
-    inherit fetchurl stdenv;
-  };
-
-  ed = (import ../tools/text/ed) {
-    inherit fetchurl stdenv;
-  };
-
-  xpf = (import ../tools/text/xml/xpf) {
-    inherit fetchurl stdenv python;
-
-    libxml2 = (import ../development/libraries/libxml2) {
-      inherit fetchurl stdenv zlib python;
-      pythonSupport = true;
-    };
-  };
-
-  sablotron = (import ../tools/text/xml/sablotron) {
-    inherit fetchurl stdenv expat;
-  };
-
   jing = (import ../tools/text/xml/jing) {
     inherit fetchurl stdenv unzip;
   };
@@ -234,62 +300,98 @@ rec {
     jre = blackdown;
   };
 
+  less = (import ../tools/misc/less) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  lhs2tex = (import ../tools/typesetting/lhs2tex) {
+    inherit fetchurl stdenv ghc tetex polytable;
+  };
+
+  man = (import ../tools/misc/man) {
+     inherit fetchurl stdenv db4 groff;
+  };
+
+  manpages = (import ../development/misc/man-pages) {
+     inherit fetchurl stdenv;
+  };
+
+  mjpegtools = (import ../tools/video/mjpegtools) {
+    inherit fetchurl stdenv libjpeg;
+    inherit (xlibs) libX11;
+  };
+
+  mktemp = (import ../tools/security/mktemp) {
+    inherit fetchurl stdenv;
+  };
+
+  netcat = (import ../tools/networking/netcat) {
+    inherit fetchurl stdenv;
+  };
+
+  nmap = (import ../tools/security/nmap) {
+    inherit fetchurl stdenv;
+  };
+
+  openssh = (import ../tools/networking/openssh) {
+    inherit fetchurl stdenv zlib openssl;
+    inherit (xlibs) xauth;
+    xforwarding = true;
+  };
+
+  par2cmdline = (import ../tools/networking/par2cmdline) {
+    inherit fetchurl;
+    stdenv = overrideGCC stdenv gcc34;
+  };
+
+  parted = (import ../tools/misc/parted) {
+    inherit fetchurl stdenv e2fsprogs ncurses readline;
+  };
+
+  patch = useFromStdenv (stdenv ? patch) stdenv.patch gnupatch;
+
+  ploticus = (import ../tools/graphics/ploticus) {
+    inherit fetchurl stdenv zlib libpng;
+    inherit (xlibs) libX11;
+  };
+
+  qtparted = (import ../tools/misc/qtparted) {
+    inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib;
+    inherit (xlibs) libX11 libXext;
+    qt3 = qt3NoMySQL;
+  };
+
+  realCurl = (import ../tools/networking/curl) {
+    inherit fetchurl stdenv zlib;
+  };
+
+  sablotron = (import ../tools/text/xml/sablotron) {
+    inherit fetchurl stdenv expat;
+  };
+
+  screen = (import ../tools/misc/screen) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  tightvnc = import ../tools/admin/tightvnc {
+    inherit fetchurl stdenv x11 zlib libjpeg;
+    inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp;
+  };
+
   trang = import ../tools/text/xml/trang {
     inherit fetchurl stdenv unzip;
     jre = blackdown;
   };
 
-  cpio = (import ../tools/archivers/cpio) {
-    inherit fetchurl stdenv;
-  };
-
-  gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
-    (import ../tools/archivers/gnutar {
-      inherit fetchurl stdenv;
-    });
-
-  cabextract = import ../tools/archivers/cabextract {
-    inherit fetchurl stdenv;
-  };
-
-  gnutarDiet = (import ../tools/archivers/gnutar-diet) {
-    inherit fetchurl stdenv dietgcc;
-  };
-
-  zip = (import ../tools/archivers/zip) {
-    inherit fetchurl stdenv;
+  transfig = (import ../tools/graphics/transfig) {
+    inherit fetchurl stdenv libpng libjpeg zlib;
+    inherit (xlibs) imake;
   };
 
   unzip = import ../tools/archivers/unzip {
     inherit fetchurl stdenv;
   };
 
-  gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
-    (import ../tools/compression/gzip {
-      inherit fetchurl stdenv;
-    });
-
-  bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
-    (import ../tools/compression/bzip2 {
-      inherit fetchurl stdenv;
-    });
-
-  bzip2Static = (import ../tools/compression/bzip2-static) {
-    inherit fetchurl stdenv;
-  };
-
-  zdelta = (import ../tools/compression/zdelta) {
-    inherit fetchurl stdenv;
-  };
-
-  bsdiff = (import ../tools/compression/bsdiff) {
-    inherit fetchurl stdenv;
-  };
-
-  which = (import ../tools/system/which) {
-    inherit fetchurl stdenv;
-  };
-
   wget = (import ../tools/networking/wget) {
     inherit fetchurl stdenv gettext;
   };
@@ -299,82 +401,10 @@ rec {
     stdenv = overrideGCC stdenv dietgcc;
   };
 
-  curl = if stdenv ? curl then stdenv.curl else (assert false; null);
-
-  realCurl = (import ../tools/networking/curl) {
-    inherit fetchurl stdenv zlib;
-  };
-
-  curlDiet = (import ../tools/networking/curl-diet) {
-    inherit fetchurl stdenv zlib dietgcc;
-  };
-
-  par2cmdline = (import ../tools/networking/par2cmdline) {
-    inherit fetchurl;
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
-  cksfv = (import ../tools/networking/cksfv) {
+  which = (import ../tools/system/which) {
     inherit fetchurl stdenv;
   };
 
-  bittorrent = (import ../tools/networking/p2p/bittorrent) {
-    inherit fetchurl stdenv python pygtk makeWrapper;
-  };
-
-  azureus = import ../tools/networking/p2p/azureus {
-    inherit fetchurl stdenv jdk swt;
-  };
-
-  gtkgnutella = (import ../tools/networking/p2p/gtk-gnutella) {
-    inherit fetchurl stdenv pkgconfig libxml2;
-    inherit (gtkLibs) glib gtk;
-  };
-
-  dhcp = (import ../tools/networking/dhcp) {
-    inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
-  };
-
-  dhcpWrapper = (import ../tools/networking/dhcp-wrapper) {
-    inherit stdenv dhcp;
-  };
-
-  netcat = (import ../tools/networking/netcat) {
-    inherit fetchurl stdenv;
-  };
-  
-
-  graphviz = (import ../tools/graphics/graphviz) {
-    inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
-    inherit (xlibs) libXaw;
-  };
-
-  gnuplot = (import ../tools/graphics/gnuplot) {
-    inherit fetchurl stdenv zlib libpng texinfo;
-  };
-
-  ploticus = (import ../tools/graphics/ploticus) {
-    inherit fetchurl stdenv zlib libpng;
-    inherit (xlibs) libX11;
-  };
-
-  exif = (import ../tools/graphics/exif) {
-    inherit fetchurl stdenv pkgconfig libexif popt;
-  };
-
-  transfig = (import ../tools/graphics/transfig) {
-    inherit fetchurl stdenv libpng libjpeg zlib;
-    inherit (xlibs) imake;
-  };
-
-  hevea = (import ../tools/typesetting/hevea) {
-    inherit fetchurl stdenv ocaml;
-  };
-
-  lhs2tex = (import ../tools/typesetting/lhs2tex) {
-    inherit fetchurl stdenv ghc tetex polytable;
-  };
-
   xmlroff = (import ../tools/typesetting/xmlroff) {
     inherit fetchurl stdenv pkgconfig libxml2 libxslt popt;
     inherit (gtkLibs) glib pango gtk;
@@ -382,112 +412,85 @@ rec {
     inherit pangoxsl;
   };
 
-  less = (import ../tools/misc/less) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  file = (import ../tools/misc/file) {
-    inherit fetchurl stdenv;
-  };
-
-  screen = (import ../tools/misc/screen) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  xsel = (import ../tools/misc/xsel) {
-    inherit fetchurl stdenv x11;
-  };
-
   xmltv = import ../tools/misc/xmltv {
     inherit fetchurl perl perlTermReadKey perlXMLTwig perlXMLWriter
       perlDateManip perlHTMLTree perlHTMLParser perlHTMLTagset
       perlURI perlLWP;
   };
 
-  openssh = (import ../tools/networking/openssh) {
-    inherit fetchurl stdenv zlib openssl;
-    inherit (xlibs) xauth;
-    xforwarding = true;
+  xpf = (import ../tools/text/xml/xpf) {
+    inherit fetchurl stdenv python;
+
+    libxml2 = (import ../development/libraries/libxml2) {
+      inherit fetchurl stdenv zlib python;
+      pythonSupport = true;
+    };
   };
 
-  mktemp = (import ../tools/security/mktemp) {
+  xsel = (import ../tools/misc/xsel) {
+    inherit fetchurl stdenv x11;
+  };
+
+  zdelta = (import ../tools/compression/zdelta) {
     inherit fetchurl stdenv;
   };
 
-  nmap = (import ../tools/security/nmap) {
+  zip = (import ../tools/archivers/zip) {
     inherit fetchurl stdenv;
   };
 
-  gnupg = import ../tools/security/gnupg {
-    inherit fetchurl stdenv readline;
-    ideaSupport = true; # enable for IDEA crypto support
-  };
 
-  mjpegtools = (import ../tools/video/mjpegtools) {
-    inherit fetchurl stdenv libjpeg;
-    inherit (xlibs) libX11;
-  };
-
-  tightvnc = import ../tools/admin/tightvnc {
-    inherit fetchurl stdenv x11 zlib libjpeg;
-    inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp;
-  };
-
-   
   ### SHELLS
 
+
   bash = useFromStdenv (stdenv ? bash) stdenv.bash
     (import ../shells/bash {
       inherit fetchurl stdenv;
     });
 
-  tcsh = (import ../shells/tcsh) {
-    inherit fetchurl stdenv ncurses;
-  };
-
   bashStatic = (import ../shells/bash-static) {
     inherit fetchurl stdenv;
   };
 
+  tcsh = (import ../shells/tcsh) {
+    inherit fetchurl stdenv ncurses;
+  };
+
 
   ### DEVELOPMENT
 
-  binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils
-    (import ../development/tools/misc/binutils {
-      inherit fetchurl stdenv noSysDirs;
-    });
 
-  binutilsStatic = (import ../development/tools/misc/binutils-static) {
-    inherit fetchurl stdenv noSysDirs;
+  abc =
+    abcPatchable [];
+
+  abcPatchable = patches : 
+    (import ../development/compilers/abc/default.nix) {
+      inherit stdenv fetchurl patches jre apacheAnt;
+      # apacheAnt = apacheAntBlackdown14;
+      javaCup = import ../development/libraries/java/cup {
+        inherit stdenv fetchurl;
+        jdk = blackdown;
+      };
+    };
+
+  antlr = (import ../development/tools/parsing/antlr/antlr-2.7.6.nix) {
+    inherit fetchurl stdenv jre;
   };
 
-  binutilsMips = (import ../development/tools/misc/binutils-cross) {
-    inherit fetchurl stdenv noSysDirs;
-    cross = "mips-linux";
+  antlr3 = (import ../development/tools/parsing/antlr) {
+    inherit fetchurl stdenv jre;
   };
 
-  binutilsArm = (import ../development/tools/misc/binutils-cross) {
-    inherit fetchurl stdenv noSysDirs;
-    cross = "arm-linux";
-  };
+  aspectj =
+    (import ../development/compilers/aspectj) {
+      inherit stdenv fetchurl jre;
+    };
 
-  binutilsSparc = (import ../development/tools/misc/binutils-cross) {
-    inherit fetchurl stdenv noSysDirs;
-    cross = "sparc-linux";
-  };
-
-  patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
-    (import ../development/tools/misc/patchelf {
-      inherit fetchurl stdenv;
-    });
-
-  patchelfNew = (import ../development/tools/misc/patchelf/new.nix) {
+  aterm23x = (import ../development/libraries/aterm/aterm-2.3.1.nix) {
     inherit fetchurl stdenv;
   };
 
-  gnum4 = (import ../development/tools/misc/gnum4) {
-    inherit fetchurl stdenv;
-  };
+  autoconf = autoconf259;
 
   autoconf259 = (import ../development/tools/misc/autoconf) {
     inherit fetchurl stdenv perl;
@@ -499,7 +502,7 @@ rec {
     m4 = gnum4;
   };
 
-  autoconf = autoconf259;
+  automake = automake19x;
 
   automake17x = (import ../development/tools/misc/automake/automake-1.7.x.nix) {
     inherit fetchurl stdenv perl autoconf;
@@ -509,102 +512,32 @@ rec {
     inherit fetchurl stdenv perl autoconf;
   };
 
-  automake = automake19x;
-
-  libtool = (import ../development/tools/misc/libtool) {
-    inherit fetchurl stdenv perl;
-    m4 = gnum4;
+  bibtextools = (import ../tools/typesetting/bibtex-tools) {
+    inherit fetchurl stdenv aterm tetex hevea sdf strategoxt;
   };
 
-  /**
-   * pkgconfig is optionally taken from the stdenv to allow bootstrapping
-   * of glib and pkgconfig itself on MinGW.
-   */
-  pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
-    (import ../development/tools/misc/pkgconfig {
-      inherit fetchurl stdenv;
+  binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils
+    (import ../development/tools/misc/binutils {
+      inherit fetchurl stdenv noSysDirs;
     });
 
-  pkgconfig017x = (import ../development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix) {
-    inherit fetchurl stdenv;
+  binutilsArm = (import ../development/tools/misc/binutils-cross) {
+    inherit fetchurl stdenv noSysDirs;
+    cross = "arm-linux";
   };
 
-  pkgconfig_latest = (import ../development/tools/misc/pkgconfig/pkgconfig-0.21.nix) {
-    inherit fetchurl stdenv;
+  binutilsMips = (import ../development/tools/misc/binutils-cross) {
+    inherit fetchurl stdenv noSysDirs;
+    cross = "mips-linux";
   };
 
-  strace = (import ../development/tools/misc/strace) {
-    inherit fetchurl stdenv;
+  binutilsSparc = (import ../development/tools/misc/binutils-cross) {
+    inherit fetchurl stdenv noSysDirs;
+    cross = "sparc-linux";
   };
 
-  swig = (import ../development/tools/misc/swig) {
-    inherit fetchurl stdenv perl python;
-    perlSupport = true;
-    pythonSupport = true;
-    javaSupport = false;
-  };
-  
-  swigWithJava = (import ../development/tools/misc/swig) {
-    inherit fetchurl stdenv;
-    jdk = blackdown;
-    perlSupport = false;
-    pythonSupport = false;
-    javaSupport = true;
-  };
-
-  valgrind = (import ../development/tools/misc/valgrind) {
-    inherit fetchurl stdenv;
-  };
-
-  kcachegrind = (import ../development/tools/misc/kcachegrind) {
-    inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg;
-    inherit (xlibs) libX11 libXext libSM;
-    qt = qt3;
-  };
-
-  texinfo = (import ../development/tools/misc/texinfo) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  gperf = (import ../development/tools/misc/gperf) {
-    inherit fetchurl stdenv;
-  };
-
-  ctags = (import ../development/tools/misc/ctags) {
-    inherit fetchurl stdenv;
-  };
-
-  lcov = (import ../development/tools/misc/lcov) {
-    inherit fetchurl stdenv perl;
-  };
-
-  help2man = (import ../development/tools/misc/help2man) {
-    inherit fetchurl stdenv perl gettext perlLocaleGettext;
-  };
-
-  octave = (import ../development/interpreters/octave) {
-    inherit fetchurl stdenv readline ncurses g77 perl flex;
-  };
-
-  gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake
-    (import ../development/tools/build-managers/gnumake {
-      inherit fetchurl stdenv;
-    });
-
-  gnumake380 = import ../development/tools/build-managers/gnumake-3.80 {
-    inherit fetchurl stdenv;
-  };
-
-  mk = (import ../development/tools/build-managers/mk) {
-    inherit fetchurl stdenv;
-  };
-
-  noweb = (import ../development/tools/literate-programming/noweb) {
-    inherit fetchurl stdenv;
-  };
-
-  scons = (import ../development/tools/build-managers/scons) {
-    inherit fetchurl stdenv python;
+  binutilsStatic = (import ../development/tools/misc/binutils-static) {
+    inherit fetchurl stdenv noSysDirs;
   };
 
   bison = (import ../development/tools/parsing/bison) {
@@ -612,43 +545,17 @@ rec {
     m4 = gnum4;
   };
 
-  yacc = bison;
-
   bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) {
     inherit fetchurl stdenv;
     m4 = gnum4;
   };
 
-  flex = (import ../development/tools/parsing/flex) {
-    inherit fetchurl stdenv yacc;
-  };
-
-  #flexWrapper = (import ../development/tools/parsing/flex-wrapper) {
-  #  inherit stdenv flex ;
-  #};
-
-  flexnew = (import ../development/tools/parsing/flex/flex-new.nix) {
-    inherit fetchurl stdenv yacc;
-    m4 = gnum4;
-  };
-
-  antlr3 = (import ../development/tools/parsing/antlr) {
-    inherit fetchurl stdenv jre;
-  };
-
-  antlr = (import ../development/tools/parsing/antlr/antlr-2.7.6.nix) {
-    inherit fetchurl stdenv jre;
-  };
-
-  gcc = useFromStdenv (stdenv ? gcc) stdenv.gcc gcc41;
-
-  gccStatic = (import ../development/compilers/gcc-static-3.4) {
-    inherit fetchurl stdenv noSysDirs;
-  };
-
-  gccStaticBootstrap = (import ../development/compilers/gcc-static-3.4) {
+  blackdown = (import ../development/compilers/blackdown) {
+    inherit fetchurl stdenv;
+  };
+
+  ctags = (import ../development/tools/misc/ctags) {
     inherit fetchurl stdenv;
-    noSysDirs = false;
   };
 
   dietgcc = (import ../build-support/gcc-wrapper) {
@@ -665,13 +572,39 @@ rec {
     inherit stdenv;
   };
 
-  wrapGCC = baseGCC: (import ../build-support/gcc-wrapper) {
+  ecj = (import ../development/eclipse/ecj) {
+    inherit fetchurl stdenv unzip jre;
+    ant = apacheAntBlackdown14;
+  };
+
+  flex = (import ../development/tools/parsing/flex) {
+    inherit fetchurl stdenv yacc;
+  };
+
+  #flexWrapper = (import ../development/tools/parsing/flex-wrapper) {
+  #  inherit stdenv flex ;
+  #};
+
+  flexnew = (import ../development/tools/parsing/flex/flex-new.nix) {
+    inherit fetchurl stdenv yacc;
+    m4 = gnum4;
+  };
+
+  g77 = (import ../build-support/gcc-wrapper) {
+    name = "g77";
     nativeTools = false;
     nativeGlibc = false;
-    gcc = baseGCC;
-    inherit stdenv binutils glibc;
+    gcc = (import ../development/compilers/gcc-3.3) {
+      inherit fetchurl stdenv noSysDirs;
+      langF77 = true;
+      langCC = false;
+    };
+    inherit (stdenv.gcc) binutils glibc;
+    inherit stdenv;
   };
 
+  gcc = useFromStdenv (stdenv ? gcc) stdenv.gcc gcc41;
+
   gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
     inherit fetchurl stdenv noSysDirs;
   });
@@ -689,15 +622,42 @@ rec {
     profiledCompiler = true;
   });
 
-  gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 {
-    inherit fetchurl stdenv noSysDirs;
-    profiledCompiler = true;
-  });
+  gcc40arm = (import ../build-support/gcc-cross-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    cross = "arm-linux";
+    gcc = (import ../development/compilers/gcc-4.0-cross) {
+      inherit fetchurl stdenv noSysDirs;
+      langF77 = false;
+      langCC = false;
+      binutilsCross = binutilsArm;
+      kernelHeadersCross = kernelHeadersArm;
+      cross = "arm-linux";
+    };
+    inherit (stdenv.gcc) glibc;
+    binutils = binutilsArm;
+    inherit stdenv;
+  };
 
-  gccApple = wrapGCC (import ../development/compilers/gcc-apple {
+  gcc40mips = (import ../build-support/gcc-cross-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    cross = "mips-linux";
+    gcc = gcc40mipsboot;
+    #inherit (stdenv.gcc) glibc;
+    glibc = uclibcMips;
+    binutils = binutilsMips;
+    inherit stdenv;
+  };
+
+  gcc40mipsboot = (import ../development/compilers/gcc-4.0-cross) {
     inherit fetchurl stdenv noSysDirs;
-    profiledCompiler = true;
-  });
+    langF77 = false;
+    langCC = false;
+    binutilsCross = binutilsMips;
+    kernelHeadersCross = kernelHeadersMips;
+    cross = "mips-linux";
+  };
 
   gcc40sparc = (import ../build-support/gcc-cross-wrapper) {
     nativeTools = false;
@@ -716,54 +676,140 @@ rec {
     inherit stdenv;
   };
 
-  gcc40mipsboot = (import ../development/compilers/gcc-4.0-cross) {
+  gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 {
+    inherit fetchurl stdenv noSysDirs;
+    profiledCompiler = true;
+  });
+
+  gccApple = wrapGCC (import ../development/compilers/gcc-apple {
+    inherit fetchurl stdenv noSysDirs;
+    profiledCompiler = true;
+  });
+
+  gccStatic = (import ../development/compilers/gcc-static-3.4) {
     inherit fetchurl stdenv noSysDirs;
-    langF77 = false;
-    langCC = false;
-    binutilsCross = binutilsMips;
-    kernelHeadersCross = kernelHeadersMips;
-    cross = "mips-linux";
   };
 
-  gcc40mips = (import ../build-support/gcc-cross-wrapper) {
-    nativeTools = false;
-    nativeGlibc = false;
-    cross = "mips-linux";
-    gcc = gcc40mipsboot;
-    #inherit (stdenv.gcc) glibc;
-    glibc = uclibcMips;
-    binutils = binutilsMips;
-    inherit stdenv;
+  gccStaticBootstrap = (import ../development/compilers/gcc-static-3.4) {
+    inherit fetchurl stdenv;
+    noSysDirs = false;
   };
 
-  gcc40arm = (import ../build-support/gcc-cross-wrapper) {
-    nativeTools = false;
-    nativeGlibc = false;
-    cross = "arm-linux";
-    gcc = (import ../development/compilers/gcc-4.0-cross) {
-      inherit fetchurl stdenv noSysDirs;
-      langF77 = false;
-      langCC = false;
-      binutilsCross = binutilsArm;
-      kernelHeadersCross = kernelHeadersArm;
-      cross = "arm-linux";
+  ghc = (import ../development/compilers/ghc) {
+    inherit fetchurl stdenv perl ncurses readline;
+    gcc = stdenv.gcc;
+    ghc = ghcboot;
+    m4 = gnum4;
+  };
+
+  ghcboot = (import ../development/compilers/ghc/boot.nix) {
+    inherit fetchurl stdenv perl ncurses;
+    readline = readline4;
+  };
+
+  ghcWrapper = assert uulib.ghc == ghc;
+    (import ../development/compilers/ghc-wrapper) {
+      inherit stdenv ghc;
+      libraries = [ uulib ];
     };
-    inherit (stdenv.gcc) glibc;
-    binutils = binutilsArm;
-    inherit stdenv;
+
+  gnum4 = (import ../development/tools/misc/gnum4) {
+    inherit fetchurl stdenv;
   };
 
-  g77 = (import ../build-support/gcc-wrapper) {
-    name = "g77";
-    nativeTools = false;
-    nativeGlibc = false;
-    gcc = (import ../development/compilers/gcc-3.3) {
-      inherit fetchurl stdenv noSysDirs;
-      langF77 = true;
-      langCC = false;
-    };
-    inherit (stdenv.gcc) binutils glibc;
-    inherit stdenv;
+  gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake
+    (import ../development/tools/build-managers/gnumake {
+      inherit fetchurl stdenv;
+    });
+
+  gnumake380 = import ../development/tools/build-managers/gnumake-3.80 {
+    inherit fetchurl stdenv;
+  };
+
+  gperf = (import ../development/tools/misc/gperf) {
+    inherit fetchurl stdenv;
+  };
+
+  harp = (import ../development/compilers/harp) {
+    inherit fetchurl stdenv unzip ghc happy;
+  };
+
+  helium = (import ../development/compilers/helium) {
+    inherit fetchurl stdenv ghc;
+  };
+
+  help2man = (import ../development/tools/misc/help2man) {
+    inherit fetchurl stdenv perl gettext perlLocaleGettext;
+  };
+
+  j2sdk14x = (import ../development/compilers/jdk/default-1.4.nix) {
+    inherit fetchurl stdenv;
+  };
+
+  jdk = 
+    if stdenv.isDarwin then 
+      "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
+    else
+      (import ../development/compilers/jdk) {
+        inherit fetchurl stdenv unzip;
+        inherit (xlibs) libX11 libXext;
+      };
+
+  jdtsdk = (import ../development/eclipse/jdt-sdk) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  jikes = (import ../development/compilers/jikes) {
+    inherit fetchurl stdenv;
+  };
+
+  kcachegrind = (import ../development/tools/misc/kcachegrind) {
+    inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg;
+    inherit (xlibs) libX11 libXext libSM;
+    qt = qt3;
+  };
+
+  lcov = (import ../development/tools/misc/lcov) {
+    inherit fetchurl stdenv perl;
+  };
+
+  libtool = (import ../development/tools/misc/libtool) {
+    inherit fetchurl stdenv perl;
+    m4 = gnum4;
+  };
+
+  mk = (import ../development/tools/build-managers/mk) {
+    inherit fetchurl stdenv;
+  };
+
+  mono = (import ../development/compilers/mono) {
+    inherit fetchurl stdenv bison pkgconfig;
+    inherit (gtkLibs) glib;
+  };
+
+  monoDLLFixer = import ../build-support/mono-dll-fixer {
+    inherit stdenv perl;
+  };
+
+  nasm = (import ../development/compilers/nasm) {
+    inherit fetchurl stdenv;
+  };
+
+  noweb = (import ../development/tools/literate-programming/noweb) {
+    inherit fetchurl stdenv;
+  };
+
+  ocaml = (import ../development/compilers/ocaml) {
+    inherit fetchurl stdenv x11;
+  };
+
+  ocaml3080 = (import ../development/compilers/ocaml/ocaml-3.08.0.nix) {
+    inherit fetchurl x11;
+    stdenv = overrideGCC stdenv gcc34;
+  };
+
+  octave = (import ../development/interpreters/octave) {
+    inherit fetchurl stdenv readline ncurses g77 perl flex;
   };
 
 /*
@@ -788,76 +834,48 @@ rec {
     gcc = gcc33;
   };
 
-  jikes = (import ../development/compilers/jikes) {
+  patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
+    (import ../development/tools/misc/patchelf {
+      inherit fetchurl stdenv;
+    });
+
+  patchelfNew = (import ../development/tools/misc/patchelf/new.nix) {
     inherit fetchurl stdenv;
   };
 
-  ecj = (import ../development/eclipse/ecj) {
-    inherit fetchurl stdenv unzip jre;
-    ant = apacheAntBlackdown14;
-  };
+  /**
+   * pkgconfig is optionally taken from the stdenv to allow bootstrapping
+   * of glib and pkgconfig itself on MinGW.
+   */
+  pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
+    (import ../development/tools/misc/pkgconfig {
+      inherit fetchurl stdenv;
+    });
 
-  jdtsdk = (import ../development/eclipse/jdt-sdk) {
-    inherit fetchurl stdenv unzip;
-  };
-
-  blackdown = (import ../development/compilers/blackdown) {
+  pkgconfig017x = (import ../development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix) {
     inherit fetchurl stdenv;
   };
 
-  jdk = 
-    if stdenv.isDarwin then 
-      "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
-    else
-      (import ../development/compilers/jdk) {
-        inherit fetchurl stdenv unzip;
-        inherit (xlibs) libX11 libXext;
-      };
-
-  j2sdk14x = (import ../development/compilers/jdk/default-1.4.nix) {
+  pkgconfig_latest = (import ../development/tools/misc/pkgconfig/pkgconfig-0.21.nix) {
     inherit fetchurl stdenv;
   };
 
-  aspectj =
-    (import ../development/compilers/aspectj) {
-      inherit stdenv fetchurl jre;
-    };
-
-  abc =
-    abcPatchable [];
-
-  abcPatchable = patches : 
-    (import ../development/compilers/abc/default.nix) {
-      inherit stdenv fetchurl patches jre apacheAnt;
-      # apacheAnt = apacheAntBlackdown14;
-      javaCup = import ../development/libraries/java/cup {
-        inherit stdenv fetchurl;
-        jdk = blackdown;
-      };
-    };
-
-  ocaml = (import ../development/compilers/ocaml) {
-    inherit fetchurl stdenv x11;
-  };
-
-  ocaml3080 = (import ../development/compilers/ocaml/ocaml-3.08.0.nix) {
-    inherit fetchurl x11;
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
   qcmm = (import ../development/compilers/qcmm) {
     lua   = lua4;
     ocaml = ocaml3080;
     inherit fetchurl stdenv mk noweb groff;
   };
 
-  mono = (import ../development/compilers/mono) {
-    inherit fetchurl stdenv bison pkgconfig;
-    inherit (gtkLibs) glib;
+  scons = (import ../development/tools/build-managers/scons) {
+    inherit fetchurl stdenv python;
   };
 
-  monoDLLFixer = import ../build-support/mono-dll-fixer {
-    inherit stdenv perl;
+  strace = (import ../development/tools/misc/strace) {
+    inherit fetchurl stdenv;
+  };
+
+  strategoLibraries = (import ../development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix) {
+    inherit stdenv fetchurl pkgconfig aterm;
   };
 
   strategoxt = (import ../development/compilers/strategoxt) {
@@ -865,16 +883,27 @@ rec {
     stdenv = overrideInStdenv stdenv [gnumake380];
   };
 
-  strategoLibraries = (import ../development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix) {
-    inherit stdenv fetchurl pkgconfig aterm;
-  };
-
   strategoxtUtils = (import ../development/compilers/strategoxt/utils) {
     inherit fetchurl pkgconfig stdenv aterm sdf strategoxt;
   };
 
-  bibtextools = (import ../tools/typesetting/bibtex-tools) {
-    inherit fetchurl stdenv aterm tetex hevea sdf strategoxt;
+  swig = (import ../development/tools/misc/swig) {
+    inherit fetchurl stdenv perl python;
+    perlSupport = true;
+    pythonSupport = true;
+    javaSupport = false;
+  };
+
+  swigWithJava = (import ../development/tools/misc/swig) {
+    inherit fetchurl stdenv;
+    jdk = blackdown;
+    perlSupport = false;
+    pythonSupport = false;
+    javaSupport = true;
+  };
+
+  texinfo = (import ../development/tools/misc/texinfo) {
+    inherit fetchurl stdenv ncurses;
   };
 
   transformers = (import ../development/compilers/transformers) {
@@ -894,41 +923,11 @@ rec {
     };
   };
 
-  aterm23x = (import ../development/libraries/aterm/aterm-2.3.1.nix) {
-    inherit fetchurl stdenv;
-  };
-
-  ghcboot = (import ../development/compilers/ghc/boot.nix) {
-    inherit fetchurl stdenv perl ncurses;
-    readline = readline4;
-  };
-
-  ghc = (import ../development/compilers/ghc) {
-    inherit fetchurl stdenv perl ncurses readline;
-    gcc = stdenv.gcc;
-    ghc = ghcboot;
-    m4 = gnum4;
-  };
-
-  ghcWrapper = assert uulib.ghc == ghc;
-    (import ../development/compilers/ghc-wrapper) {
-      inherit stdenv ghc;
-      libraries = [ uulib ];
-    };
-
   uuagc = (import ../development/tools/haskell/uuagc) {
     inherit fetchurl stdenv ghc uulib;
   };
 
-  helium = (import ../development/compilers/helium) {
-    inherit fetchurl stdenv ghc;
-  };
-
-  harp = (import ../development/compilers/harp) {
-    inherit fetchurl stdenv unzip ghc happy;
-  };
-
-  nasm = (import ../development/compilers/nasm) {
+  valgrind = (import ../development/tools/misc/valgrind) {
     inherit fetchurl stdenv;
   };
 
@@ -936,93 +935,34 @@ rec {
     inherit fetchurl stdenv cabextract;
   };
 
-  windowssdk = import ../development/misc/windows-sdk {
-    inherit fetchurl stdenv cabextract;
-  };
-
   win32hello = import ../development/compilers/visual-c++/test {
     inherit fetchurl stdenv visualcpp windowssdk;
   };
 
+  windowssdk = import ../development/misc/windows-sdk {
+    inherit fetchurl stdenv cabextract;
+  };
+
+  wrapGCC = baseGCC: (import ../build-support/gcc-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    gcc = baseGCC;
+    inherit stdenv binutils glibc;
+  };
+
+  yacc = bison;
+
 
   ### DEVELOPMENT / DEBUGGERS
-
-  #ltrace = (import ../development/debuggers/ltrace) {
-  #  inherit fetchurl stdenv;
-  #};
-
-
   ### DEVELOPMENT / INTERPRETERS
 
-  happy = (import ../development/tools/parsing/happy) {
-    inherit fetchurl stdenv perl ghc;
-  };
 
-  realPerl = (import ../development/interpreters/perl) {
+  a52dec = (import ../development/libraries/a52dec) {
     inherit fetchurl stdenv;
   };
 
-  sysPerl = (import ../development/interpreters/sys-perl) {
-    inherit stdenv;
-  };
-
-  perl = if stdenv.system != "i686-linux" then sysPerl else realPerl;
-
-  python = (import ../development/interpreters/python) {
-    inherit fetchurl stdenv zlib;
-  };
-
-  ruby = (import ../development/interpreters/ruby) {
-    inherit fetchurl stdenv readline ncurses;
-  };
-
-  spidermonkey = import ../development/interpreters/spidermonkey {
-    inherit fetchurl;
-    # remove when the "internal compiler error" in gcc 4.1.x is fixed
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
-  lua4 = (import ../development/interpreters/lua-4) {
-    inherit fetchurl stdenv;
-  };
-
-  lua5 = (import ../development/interpreters/lua-5) {
-    inherit fetchurl stdenv;
-  };
-
-  tcl = (import ../development/interpreters/tcl) {
-    inherit fetchurl stdenv;
-  };
-
-  dylan = (import ../development/compilers/gwydion-dylan) {
-    inherit fetchurl stdenv perl boehmgc yacc flex readline;
-    dylan =
-      (import ../development/compilers/gwydion-dylan/binary.nix) {
-        inherit fetchurl stdenv;
-      };
-  };
-
-  clisp = (import ../development/interpreters/clisp) {
-    inherit fetchurl stdenv libsigsegv gettext;
-  };
-
-  # FIXME: unixODBC needs patching on Darwin (see darwinports)
-  php = (import ../development/interpreters/php) {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
-    unixODBC =
-      if stdenv.isDarwin then null else unixODBC;
-  };
-
-  guile = (import ../development/interpreters/guile) {
-    inherit fetchurl stdenv ncurses readline;
-  };
-
-  jre = (import ../development/interpreters/jre) {
-    inherit fetchurl stdenv;
-  };
-
-  kaffe =  (import ../development/interpreters/kaffe) {
-    inherit fetchurl stdenv jikes alsaLib xlibs;
+  aalib = (import ../development/libraries/aalib) {
+    inherit fetchurl stdenv ncurses;
   };
 
   apacheAnt = (import ../development/tools/build-managers/apache-ant) {
@@ -1042,17 +982,33 @@ rec {
     name = "ant-blackdown-1.4.2";
   };
 
-  dovecot = (import ../servers/mail/dovecot) {
-    inherit fetchurl stdenv ;
+  apr = import ../development/libraries/apr {
+    inherit fetchurl stdenv;
   };
-  
-  vsftpd = (import ../servers/ftp/vsftpd) {
-    inherit fetchurl stdenv openssl ;
+
+  aprutil = import ../development/libraries/apr-util {
+    inherit fetchurl stdenv apr expat db4;
+    bdbSupport = true;
   };
- 
-  tomcat5 = (import ../servers/http/tomcat) {
-    inherit fetchurl stdenv ;
-    jdk = blackdown;
+
+  arts = import ../development/libraries/kde/arts {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (xlibs) libX11 libXext;
+    inherit kdelibs zlib libjpeg libpng perl;
+    qt = qt3;
+    inherit (gnome) glib;
+  };
+
+  aterm = (import ../development/libraries/aterm) {
+    inherit fetchurl stdenv;
+  };
+
+  audiofile = (import ../development/libraries/audiofile) {
+    inherit fetchurl stdenv;
+  };
+
+  axis = (import ../development/libraries/axis) {
+    inherit fetchurl stdenv;
   };
 
   beecrypt = (import ../development/libraries/beecrypt) {
@@ -1060,6 +1016,14 @@ rec {
     m4 = gnum4;
   };
 
+  cairo = (import ../development/libraries/cairo) {
+    inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
+  };
+
+  chmlib = (import ../development/libraries/chmlib) {
+    inherit fetchurl stdenv;
+  };
+
   cil = (import ../development/libraries/cil) {
     inherit stdenv fetchurl ocaml perl;
   };
@@ -1069,84 +1033,19 @@ rec {
     inherit fetchurl perl ocaml;
   };
 
-  pcre = (import ../development/libraries/pcre) {
-    inherit fetchurl stdenv;
+  clearsilver = import ../development/libraries/clearsilver {
+    inherit fetchurl stdenv python;
+  };
+
+  clisp = (import ../development/interpreters/clisp) {
+    inherit fetchurl stdenv libsigsegv gettext;
   };
 
   coredumper = (import ../development/libraries/coredumper) {
     inherit fetchurl stdenv;
   };
 
-  glibc = useFromStdenv (stdenv ? glibc) stdenv.glibc
-    (import ../development/libraries/glibc {
-      inherit fetchurl stdenv kernelHeaders;
-      installLocales = true;
-    });
-
-  aterm = (import ../development/libraries/aterm) {
-    inherit fetchurl stdenv;
-  };
-
-  sdf = (import ../development/tools/parsing/sdf) {
-    inherit fetchurl aterm getopt pkgconfig;
-    # Note: sdf2-bundle currently requires GNU make 3.80; remove
-    # explicit dependency when this is fixed.
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  jikespg = (import ../development/tools/parsing/jikespg) {
-    inherit fetchurl stdenv;
-  };
-
-  expat = (import ../development/libraries/expat) {
-    inherit fetchurl stdenv;
-  };
-
-  libcdaudio = (import ../development/libraries/libcdaudio) {
-    inherit fetchurl stdenv;
-  };
-
-  libogg = (import ../development/libraries/libogg) {
-    inherit fetchurl stdenv;
-  };
-
-  libvorbis = (import ../development/libraries/libvorbis) {
-    inherit fetchurl stdenv libogg;
-  };
-
-  libusb = (import ../development/libraries/libusb) {
-    inherit fetchurl stdenv;
-  };
-
-  speex = (import ../development/libraries/speex) {
-    inherit fetchurl stdenv;
-  };
-
-  libtheora = (import ../development/libraries/libtheora) {
-    inherit fetchurl stdenv libogg libvorbis;
-  };
-
-  libwpd = (import ../development/libraries/libwpd) {
-    inherit fetchurl stdenv pkgconfig libgsf libxml2;
-    inherit (gnome) glib;
-  };
-
-  libgsf = (import ../development/libraries/libgsf) {
-    inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2;
-    inherit (gnome) glib;
-  };
-
-  libxml2 = (import ../development/libraries/libxml2) {
-    inherit fetchurl stdenv zlib python;
-#    pythonSupport = stdenv.system == "i686-linux";
-    pythonSupport = false;
-  };
-
-  libxslt = (import ../development/libraries/libxslt) {
-    inherit fetchurl stdenv libxml2;
-  };
-
-  gettext = (import ../development/libraries/gettext) {
+  cracklib = (import ../development/libraries/cracklib) {
     inherit fetchurl stdenv;
   };
 
@@ -1154,26 +1053,32 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  openssl = (import ../development/libraries/openssl) {
-    inherit fetchurl stdenv perl;
+  dclib = (import ../development/libraries/dclib) {
+    inherit fetchurl stdenv libxml2 openssl bzip2;
   };
 
-  libmspack = (import ../development/libraries/libmspack) {
+  dovecot = (import ../servers/mail/dovecot) {
+    inherit fetchurl stdenv ;
+  };
+
+  dylan = (import ../development/compilers/gwydion-dylan) {
+    inherit fetchurl stdenv perl boehmgc yacc flex readline;
+    dylan =
+      (import ../development/compilers/gwydion-dylan/binary.nix) {
+        inherit fetchurl stdenv;
+      };
+  };
+
+  expat = (import ../development/libraries/expat) {
     inherit fetchurl stdenv;
   };
 
-  libsndfile = (import ../development/libraries/libsndfile) {
+  ffmpeg = import ../development/libraries/ffmpeg {
     inherit fetchurl stdenv;
   };
 
-  neon = (import ../development/libraries/neon) {
-    inherit fetchurl stdenv libxml2 zlib openssl;
-    compressionSupport = true;
-    sslSupport = true;
-  };
-
-  nss = (import ../development/libraries/nss) {
-    inherit fetchurl stdenv perl zip;
+  fontconfig = import ../development/libraries/fontconfig {
+    inherit fetchurl stdenv freetype expat;
   };
 
   freetype = (import ../development/libraries/freetype) {
@@ -1184,90 +1089,45 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  zlib = (import ../development/libraries/zlib) {
+  gettext = (import ../development/libraries/gettext) {
     inherit fetchurl stdenv;
   };
 
-  zlibStatic = (import ../development/libraries/zlib) {
-    inherit fetchurl stdenv;
-    static = true;
+  glibc = useFromStdenv (stdenv ? glibc) stdenv.glibc
+    (import ../development/libraries/glibc {
+      inherit fetchurl stdenv kernelHeaders;
+      installLocales = true;
+    });
+
+  glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
+    inherit fetchurl stdenv pkgconfig libsigcxx;
+    inherit (gtkLibs26) glib;
   };
 
-  libjpeg = (import ../development/libraries/libjpeg) {
-    inherit fetchurl stdenv libtool;
+  gnet = (import ../development/libraries/gnet) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) glib;
   };
 
-  libtiff = (import ../development/libraries/libtiff) {
-    inherit fetchurl stdenv zlib libjpeg;
+  gnome = recurseIntoAttrs (import ../development/libraries/gnome {
+    inherit fetchurl stdenv pkgconfig audiofile
+            flex bison popt zlib libxml2 libxslt
+            perl perlXMLParser docbook_xml_dtd_42 gettext x11
+            libtiff libjpeg libpng bzip2;
+    gtkLibs = gtkLibs28;
+    inherit (xlibs) libXmu;
+  });
+
+  gpgme = (import ../development/libraries/gpgme) {
+    inherit fetchurl stdenv libgpgerror gnupg;
   };
 
-  libpng = (import ../development/libraries/libpng) {
-    inherit fetchurl stdenv zlib;
-  };
+  gtkLibs = recurseIntoAttrs gtkLibs28 /* !!! -> gtkLibs10 */;
 
-  libungif = (import ../development/libraries/libungif) {
-    inherit fetchurl stdenv;
+  gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
+    inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
 
-  imlib = (import ../development/libraries/gnome/imlib) {
-    inherit fetchurl stdenv libjpeg libtiff libungif libpng;
-    inherit (xlibs) libX11 libXext xextproto;
-  };
-
-  aalib = (import ../development/libraries/aalib) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  axis = (import ../development/libraries/axis) {
-    inherit fetchurl stdenv;
-  };
-
-  libcaca = (import ../development/libraries/libcaca) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  libsigsegv = (import ../development/libraries/libsigsegv) {
-    inherit fetchurl stdenv;
-  };
-
-  libexif = (import ../development/libraries/libexif) {
-    inherit fetchurl stdenv;
-  };
-
-  sqlite = (import ../development/libraries/sqlite) {
-    inherit fetchurl stdenv;
-  };
-
-  sqlite3 = (import ../development/libraries/sqlite-3.3) {
-      inherit stdenv fetchurl;
-  };
-
-  lcms = (import ../development/libraries/lcms) {
-    inherit fetchurl stdenv;
-  };
-
-  libgphoto2 = (import ../development/libraries/libgphoto2) {
-    inherit fetchurl stdenv pkgconfig libusb;
-  };
-
-  popt = (import ../development/libraries/popt) {
-    inherit fetchurl stdenv gettext;
-  };
-
-  popt110 = (import ../development/libraries/popt/popt-1.10.6.nix) {
-    inherit fetchurl stdenv gettext libtool autoconf automake;
-  };
-
-  slang = (import ../development/libraries/slang) {
-    inherit fetchurl stdenv pcre libpng;
-  };
-
-  cairo = (import ../development/libraries/cairo) {
-    inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
-  };
-
-  gtkLibs = recurseIntoAttrs gtkLibs28; # !!! -> gtkLibs10
-
   gtkLibs210 = import ../development/libraries/gtk-libs-2.10 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng cairo;
@@ -1275,6 +1135,21 @@ rec {
     xineramaSupport = true;
   };
 
+  gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng;
+  };
+
+  gtkLibs24 = import ../development/libraries/gtk-libs-2.4 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng;
+  };
+
+  gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng;
+  };
+
   gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng cairo;
@@ -1282,73 +1157,16 @@ rec {
     xineramaSupport = true;
   };
 
-  gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11
-            libtiff libjpeg libpng;
-  };
-
-  gtkLibs24 = import ../development/libraries/gtk-libs-2.4 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11
-            libtiff libjpeg libpng;
-  };
-  
-  gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11
-            libtiff libjpeg libpng;
-  };
-
-  gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
-    inherit fetchurl stdenv x11 libtiff libjpeg libpng;
-  };
-
   gtkmm = import ../development/libraries/gtk-libs-2.6/gtkmm {
     inherit fetchurl stdenv pkgconfig libsigcxx;
     inherit (gtkLibs26) gtk atk;
     inherit glibmm;
   };
 
-  glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
-    inherit fetchurl stdenv pkgconfig libsigcxx;
-    inherit (gtkLibs26) glib;
-  };
-
-  libsigcxx = import ../development/libraries/libsigcxx {
-    inherit fetchurl stdenv pkgconfig;
-  };
-
-  pangoxsl = (import ../development/libraries/pangoxsl) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) glib pango;
-  };
-
-  qt3NoMySQL = import ../development/libraries/qt-3 {
-    inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql;
-    inherit (xlibs) libXft libXrender;
-    mysqlSupport = false;
-  };
-
-  qt3 = import ../development/libraries/qt-3 {
-    inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
-    inherit (xlibs) libXft libXrender libXrandr randrproto
-      libXmu libXinerama xineramaproto;
-    openglSupport = true;
-  };
-
-  kdelibs = import ../development/libraries/kde/kdelibs {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype bzip2;
-    inherit (xlibs) libX11 libXt libXext;
-    qt = qt3;
-  };
-
-  arts = import ../development/libraries/kde/arts {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xlibs) libX11 libXext;
-    inherit kdelibs zlib libjpeg libpng perl;
-    qt = qt3;
-    inherit (gnome) glib;
+  gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
+    inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
+    inherit (gnome) gtk;
+    gtksharp = gtksharp2;
   };
 
   gtksharp1 = (import ../development/libraries/gtk-sharp-1) {
@@ -1371,89 +1189,179 @@ rec {
     gtksharp = gtksharp2;
   };
 
-  gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
-    inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
-    inherit (gnome) gtk;
-    gtksharp = gtksharp2;
+  guile = (import ../development/interpreters/guile) {
+    inherit fetchurl stdenv ncurses readline;
   };
 
-  audiofile = (import ../development/libraries/audiofile) {
+  #ltrace = (import ../development/debuggers/ltrace) {
+  #  inherit fetchurl stdenv;
+  #};
+
+  happy = (import ../development/tools/parsing/happy) {
+    inherit fetchurl stdenv perl ghc;
+  };
+
+  imlib = (import ../development/libraries/gnome/imlib) {
+    inherit fetchurl stdenv libjpeg libtiff libungif libpng;
+    inherit (xlibs) libX11 libXext xextproto;
+  };
+
+  jikespg = (import ../development/tools/parsing/jikespg) {
     inherit fetchurl stdenv;
   };
 
-  gnome = recurseIntoAttrs (import ../development/libraries/gnome {
-    inherit fetchurl stdenv pkgconfig audiofile
-            flex bison popt zlib libxml2 libxslt
-            perl perlXMLParser docbook_xml_dtd_42 gettext x11
-            libtiff libjpeg libpng bzip2;
-    gtkLibs = gtkLibs28;
-    inherit (xlibs) libXmu;
-  });
-
-  wxGTK = wxGTK26;
-
-  wxGTK26 = (import ../development/libraries/wxGTK-2.6) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) gtk;
-    inherit (xlibs) libXinerama;
+  jre = (import ../development/interpreters/jre) {
+    inherit fetchurl stdenv;
   };
 
-  wxGTK25 = (import ../development/libraries/wxGTK-2.5) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) gtk;
-    inherit (xlibs) libXinerama;
+  kaffe =  (import ../development/interpreters/kaffe) {
+    inherit fetchurl stdenv jikes alsaLib xlibs;
   };
 
-  wxGTK24 = (import ../development/libraries/wxGTK) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs22) gtk;
+  kdelibs = import ../development/libraries/kde/kdelibs {
+    inherit
+      fetchurl stdenv zlib perl openssl pcre pkgconfig
+      libjpeg libpng libtiff libxml2 libxslt libtool
+      expat freetype bzip2;
+    inherit (xlibs) libX11 libXt libXext;
+    qt = qt3;
   };
 
-  gnet = (import ../development/libraries/gnet) {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) glib;
+  lcms = (import ../development/libraries/lcms) {
+    inherit fetchurl stdenv;
+  };
+
+  libcaca = (import ../development/libraries/libcaca) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  libcdaudio = (import ../development/libraries/libcdaudio) {
+    inherit fetchurl stdenv;
+  };
+
+  libdrm = import ../development/libraries/libdrm {
+    inherit fetchurl stdenv;
   };
 
   libdvdcss = (import ../development/libraries/libdvdcss) {
     inherit fetchurl stdenv;
   };
 
+  libdvdnav = import ../development/libraries/libdvdnav {
+    inherit fetchurl stdenv;
+  };
+
   libdvdread = (import ../development/libraries/libdvdread) {
     inherit fetchurl stdenv libdvdcss;
   };
 
-  libdvdnav = import ../development/libraries/libdvdnav {
+  libexif = (import ../development/libraries/libexif) {
     inherit fetchurl stdenv;
   };
 
-  mpeg2dec = (import ../development/libraries/mpeg2dec) {
+  libgpgerror = (import ../development/libraries/libgpg-error) {
     inherit fetchurl stdenv;
   };
 
-  a52dec = (import ../development/libraries/a52dec) {
-    inherit fetchurl stdenv;
+  libgphoto2 = (import ../development/libraries/libgphoto2) {
+    inherit fetchurl stdenv pkgconfig libusb;
+  };
+
+  libgsf = (import ../development/libraries/libgsf) {
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2;
+    inherit (gnome) glib;
+  };
+
+  libjpeg = (import ../development/libraries/libjpeg) {
+    inherit fetchurl stdenv libtool;
   };
 
   libmad = (import ../development/libraries/libmad) {
     inherit fetchurl stdenv;
   };
 
-  ffmpeg = import ../development/libraries/ffmpeg {
+  libmspack = (import ../development/libraries/libmspack) {
     inherit fetchurl stdenv;
   };
 
-  zvbi = (import ../development/libraries/zvbi) {
-    inherit fetchurl stdenv libpng x11;
-    pngSupport = true;
-  };
-
-  rte = (import ../development/libraries/rte) {
+  libogg = (import ../development/libraries/libogg) {
     inherit fetchurl stdenv;
   };
 
-  xineLib = (import ../development/libraries/xine-lib) {
-    inherit fetchurl stdenv zlib x11 libdvdcss alsaLib;
-    inherit (xlibs) libXv libXinerama;
+  libpcap = (import ../development/libraries/libpcap) {
+    inherit fetchurl stdenv flex bison;
+  };
+
+  libpng = (import ../development/libraries/libpng) {
+    inherit fetchurl stdenv zlib;
+  };
+
+  libsigcxx = import ../development/libraries/libsigcxx {
+    inherit fetchurl stdenv pkgconfig;
+  };
+
+  libsigsegv = (import ../development/libraries/libsigsegv) {
+    inherit fetchurl stdenv;
+  };
+
+  libsndfile = (import ../development/libraries/libsndfile) {
+    inherit fetchurl stdenv;
+  };
+
+  libtheora = (import ../development/libraries/libtheora) {
+    inherit fetchurl stdenv libogg libvorbis;
+  };
+
+  libtiff = (import ../development/libraries/libtiff) {
+    inherit fetchurl stdenv zlib libjpeg;
+  };
+
+  libungif = (import ../development/libraries/libungif) {
+    inherit fetchurl stdenv;
+  };
+
+  libusb = (import ../development/libraries/libusb) {
+    inherit fetchurl stdenv;
+  };
+
+  libvorbis = (import ../development/libraries/libvorbis) {
+    inherit fetchurl stdenv libogg;
+  };
+
+  libwpd = (import ../development/libraries/libwpd) {
+    inherit fetchurl stdenv pkgconfig libgsf libxml2;
+    inherit (gnome) glib;
+  };
+
+  libxml2 = (import ../development/libraries/libxml2) {
+    inherit fetchurl stdenv zlib python;
+#    pythonSupport = stdenv.system == "i686-linux";
+    pythonSupport = false;
+  };
+
+  libxslt = (import ../development/libraries/libxslt) {
+    inherit fetchurl stdenv libxml2;
+  };
+
+  lua4 = (import ../development/interpreters/lua-4) {
+    inherit fetchurl stdenv;
+  };
+
+  lua5 = (import ../development/interpreters/lua-5) {
+    inherit fetchurl stdenv;
+  };
+
+  mesa = (import ../development/libraries/mesa) {
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXmu libXi;
+  };
+
+  mpeg2dec = (import ../development/libraries/mpeg2dec) {
+    inherit fetchurl stdenv;
+  };
+
+  mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
+    inherit fetchurl stdenv mysql libtool zlib unixODBC;
   };
 
   ncurses = (import ../development/libraries/ncurses) {
@@ -1465,8 +1373,157 @@ rec {
     stdenv = overrideGCC stdenv dietgcc;
   };
 
-  fontconfig = import ../development/libraries/fontconfig {
-    inherit fetchurl stdenv freetype expat;
+  neon = (import ../development/libraries/neon) {
+    inherit fetchurl stdenv libxml2 zlib openssl;
+    compressionSupport = true;
+    sslSupport = true;
+  };
+
+  nss = (import ../development/libraries/nss) {
+    inherit fetchurl stdenv perl zip;
+  };
+
+  openal = import ../development/libraries/openal {
+    inherit fetchurl stdenv alsaLib autoconf automake libtool;
+  };
+
+  openssl = (import ../development/libraries/openssl) {
+    inherit fetchurl stdenv perl;
+  };
+
+  pangoxsl = (import ../development/libraries/pangoxsl) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) glib pango;
+  };
+
+  pcre = (import ../development/libraries/pcre) {
+    inherit fetchurl stdenv;
+  };
+
+  perl = if stdenv.system != "i686-linux" then sysPerl else realPerl;
+
+  # FIXME: unixODBC needs patching on Darwin (see darwinports)
+  php = (import ../development/interpreters/php) {
+    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
+    unixODBC =
+      if stdenv.isDarwin then null else unixODBC;
+  };
+
+  popt = (import ../development/libraries/popt) {
+    inherit fetchurl stdenv gettext;
+  };
+
+  popt110 = (import ../development/libraries/popt/popt-1.10.6.nix) {
+    inherit fetchurl stdenv gettext libtool autoconf automake;
+  };
+
+  python = (import ../development/interpreters/python) {
+    inherit fetchurl stdenv zlib;
+  };
+
+  qt3 = import ../development/libraries/qt-3 {
+    inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
+    inherit (xlibs) libXft libXrender libXrandr randrproto
+      libXmu libXinerama xineramaproto;
+    openglSupport = true;
+  };
+
+  qt3NoMySQL = import ../development/libraries/qt-3 {
+    inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql;
+    inherit (xlibs) libXft libXrender;
+    mysqlSupport = false;
+  };
+
+  realPerl = (import ../development/interpreters/perl) {
+    inherit fetchurl stdenv;
+  };
+
+  rte = (import ../development/libraries/rte) {
+    inherit fetchurl stdenv;
+  };
+
+  ruby = (import ../development/interpreters/ruby) {
+    inherit fetchurl stdenv readline ncurses;
+  };
+
+  sdf = (import ../development/tools/parsing/sdf) {
+    inherit fetchurl aterm getopt pkgconfig;
+    # Note: sdf2-bundle currently requires GNU make 3.80; remove
+    # explicit dependency when this is fixed.
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  slang = (import ../development/libraries/slang) {
+    inherit fetchurl stdenv pcre libpng;
+  };
+
+  speex = (import ../development/libraries/speex) {
+    inherit fetchurl stdenv;
+  };
+
+  spidermonkey = import ../development/interpreters/spidermonkey {
+    inherit fetchurl;
+    # remove when the "internal compiler error" in gcc 4.1.x is fixed
+    stdenv = overrideGCC stdenv gcc34;
+  };
+
+  sqlite = (import ../development/libraries/sqlite) {
+    inherit fetchurl stdenv;
+  };
+
+  sqlite3 = (import ../development/libraries/sqlite-3.3) {
+      inherit stdenv fetchurl;
+  };
+
+  sysPerl = (import ../development/interpreters/sys-perl) {
+    inherit stdenv;
+  };
+
+  tcl = (import ../development/interpreters/tcl) {
+    inherit fetchurl stdenv;
+  };
+
+  tomcat5 = (import ../servers/http/tomcat) {
+    inherit fetchurl stdenv ;
+    jdk = blackdown;
+  };
+
+  unixODBC = import ../development/libraries/unixODBC {
+    inherit fetchurl stdenv;
+  };
+
+  vsftpd = (import ../servers/ftp/vsftpd) {
+    inherit fetchurl stdenv openssl ;
+  };
+
+  wxGTK = wxGTK26;
+
+  wxGTK24 = (import ../development/libraries/wxGTK) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs22) gtk;
+  };
+
+  wxGTK25 = (import ../development/libraries/wxGTK-2.5) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libXinerama;
+  };
+
+  wxGTK26 = (import ../development/libraries/wxGTK-2.6) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libXinerama;
+  };
+
+  Xaw3d = import ../development/libraries/Xaw3d {
+    inherit fetchurl stdenv x11 bison;
+    flex = flexnew;
+    inherit (xlibs) imake gccmakedep libXmu libXpm libXp;
+  };
+
+  xineLib = (import ../development/libraries/xine-lib) {
+    inherit fetchurl stdenv zlib x11 libdvdcss alsaLib;
+    inherit (xlibs) libXv libXinerama;
   };
 
   xlibsWrapper = import ../development/libraries/xlibs-wrapper {
@@ -1478,72 +1535,84 @@ rec {
     ];
   };
 
-  Xaw3d = import ../development/libraries/Xaw3d {
-    inherit fetchurl stdenv x11 bison;
-    flex = flexnew;
-    inherit (xlibs) imake gccmakedep libXmu libXpm libXp;
-  };
-
-  libdrm = import ../development/libraries/libdrm {
+  zlib = (import ../development/libraries/zlib) {
     inherit fetchurl stdenv;
   };
 
-  libpcap = (import ../development/libraries/libpcap) {
-    inherit fetchurl stdenv flex bison;
-  };
-
-  mesa = (import ../development/libraries/mesa) {
-    inherit fetchurl stdenv x11;
-    inherit (xlibs) libXmu libXi;
-  };
-
-  chmlib = (import ../development/libraries/chmlib) {
+  zlibStatic = (import ../development/libraries/zlib) {
     inherit fetchurl stdenv;
+    static = true;
   };
 
-  dclib = (import ../development/libraries/dclib) {
-    inherit fetchurl stdenv libxml2 openssl bzip2;
+  zvbi = (import ../development/libraries/zvbi) {
+    inherit fetchurl stdenv libpng x11;
+    pngSupport = true;
   };
 
-  cracklib = (import ../development/libraries/cracklib) {
-    inherit fetchurl stdenv;
-  };
-
-  libgpgerror = (import ../development/libraries/libgpg-error) {
-    inherit fetchurl stdenv;
-  };
-
-  gpgme = (import ../development/libraries/gpgme) {
-    inherit fetchurl stdenv libgpgerror gnupg;
-  };
-
-  openal = import ../development/libraries/openal {
-    inherit fetchurl stdenv alsaLib autoconf automake libtool;
-  };
-
-  unixODBC = import ../development/libraries/unixODBC {
-    inherit fetchurl stdenv;
-  };
-
-  mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
-    inherit fetchurl stdenv mysql libtool zlib unixODBC;
-  };
-
-  clearsilver = import ../development/libraries/clearsilver {
-    inherit fetchurl stdenv python;
-  };
-
-  apr = import ../development/libraries/apr {
-    inherit fetchurl stdenv;
-  };
-
-  aprutil = import ../development/libraries/apr-util {
-    inherit fetchurl stdenv apr expat db4;
-    bdbSupport = true;
-  };
 
   ### DEVELOPMENT / LIBRARIES / JAVA
 
+
+  atermjava = (import ../development/libraries/java/aterm) {
+    inherit fetchurl sharedobjects jjtraveler jdk;
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload {
+    inherit stdenv fetchurl;
+  };
+
+  httpunit = import ../development/libraries/java/httpunit {
+    inherit stdenv fetchurl unzip;
+  };
+
+  jakartabcel = (import ../development/libraries/java/jakarta-bcel) {
+    regexp = jakartaregexp;
+    inherit fetchurl stdenv;
+  };
+
+  jakartaregexp = (import ../development/libraries/java/jakarta-regexp) {
+    inherit fetchurl stdenv;
+  };
+
+  javaCup = import ../development/libraries/java/cup {
+    inherit stdenv fetchurl jdk;
+  };
+
+  javasvn = import ../development/libraries/java/javasvn {
+    inherit stdenv fetchurl unzip;
+  };
+
+  jclasslib = (import ../development/tools/java/jclasslib) {
+    inherit fetchurl stdenv xpf jre;
+    ant = apacheAnt14;
+  };
+
+  jdom = import ../development/libraries/java/jdom {
+    inherit stdenv fetchurl;
+  };
+
+  jflex = import ../development/libraries/java/jflex {
+    inherit stdenv fetchurl;
+  };
+
+  jjtraveler = (import ../development/libraries/java/jjtraveler) {
+    inherit fetchurl jdk;
+    stdenv = overrideInStdenv stdenv [gnumake380];
+  };
+
+  junit = import ../development/libraries/java/junit {
+    inherit stdenv fetchurl unzip;
+  };
+
+  lucene = import ../development/libraries/java/lucene {
+    inherit stdenv fetchurl;
+  };
+
+  mockobjects = import ../development/libraries/java/mockobjects {
+    inherit stdenv fetchurl;
+  };
+
   saxon = (import ../development/libraries/java/saxon) {
     inherit fetchurl stdenv unzip;
   };
@@ -1557,66 +1626,6 @@ rec {
     stdenv = overrideInStdenv stdenv [gnumake380];
   };
 
-  jjtraveler = (import ../development/libraries/java/jjtraveler) {
-    inherit fetchurl jdk;
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  atermjava = (import ../development/libraries/java/aterm) {
-    inherit fetchurl sharedobjects jjtraveler jdk;
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
-  jakartaregexp = (import ../development/libraries/java/jakarta-regexp) {
-    inherit fetchurl stdenv;
-  };
-
-  jakartabcel = (import ../development/libraries/java/jakarta-bcel) {
-    regexp = jakartaregexp;
-    inherit fetchurl stdenv;
-  };
-
-  jclasslib = (import ../development/tools/java/jclasslib) {
-    inherit fetchurl stdenv xpf jre;
-    ant = apacheAnt14;
-  };
-
-  lucene = import ../development/libraries/java/lucene {
-    inherit stdenv fetchurl;
-  };
-
-  jdom = import ../development/libraries/java/jdom {
-    inherit stdenv fetchurl;
-  };
-
-  javaCup = import ../development/libraries/java/cup {
-    inherit stdenv fetchurl jdk;
-  };
-
-  jflex = import ../development/libraries/java/jflex {
-    inherit stdenv fetchurl;
-  };
-
-  junit = import ../development/libraries/java/junit {
-    inherit stdenv fetchurl unzip;
-  };
-
-  javasvn = import ../development/libraries/java/javasvn {
-    inherit stdenv fetchurl unzip;
-  };
-
-  httpunit = import ../development/libraries/java/httpunit {
-    inherit stdenv fetchurl unzip;
-  };
-
-  mockobjects = import ../development/libraries/java/mockobjects {
-    inherit stdenv fetchurl;
-  };
-
-  commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload {
-    inherit stdenv fetchurl;
-  };
-
   swt = import ../development/libraries/java/swt {
     inherit stdenv fetchurl unzip jdk pkgconfig;
     inherit (gtkLibs) gtk;
@@ -1627,30 +1636,133 @@ rec {
     inherit stdenv fetchurl;
   };
 
+
   ### DEVELOPMENT / LIBRARIES / HASKELL
 
+
   uulib = import ../development/libraries/haskell/uulib {
     inherit stdenv fetchurl ghc;
   };
 
+
   ### DEVELOPMENT / PERL MODULES
 
-  perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
-    inherit fetchurl perl db4;
+
+  boehmgc = (import ../development/libraries/boehm-gc) {
+    inherit fetchurl stdenv;
   };
 
-  perlXMLParser = import ../development/perl-modules/XML-Parser {
-    inherit fetchurl perl expat;
+  gmime = import ../development/libraries/gmime {
+    inherit fetchurl stdenv pkgconfig zlib;
+    inherit (gtkLibs) glib;
+  };
+
+  id3lib = import ../development/libraries/id3lib {
+    inherit fetchurl stdenv;
+  };
+
+  lesstif = (import ../development/libraries/lesstif) {
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXp libXau;
+  };
+
+  libmpcdec = import ../development/libraries/libmpcdec {
+    inherit fetchurl stdenv;
   };
 
   perlArchiveZip = import ../development/perl-modules/Archive-Zip {
     inherit fetchurl perl;
   };
 
+  perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
+    inherit fetchurl perl db4;
+  };
+
+  perlCGISession = import ../development/perl-modules/generic perl {
+    name = "CGI-Session-3.95";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
+      md5 = "fe9e46496c7c711c54ca13209ded500b";
+    };
+  };
+
   perlCompressZlib = import ../development/perl-modules/Compress-Zlib {
     inherit fetchurl perl;
   };
 
+  perlDateManip = import ../development/perl-modules/generic perl {
+    name = "DateManip-5.42a";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
+      md5 = "648386bbf46d021ae283811f75b07bdf";
+    };
+  };
+
+  perlDigestSHA1 = import ../development/perl-modules/generic perl {
+    name = "Digest-SHA1-2.11";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
+      md5 = "2449bfe21d6589c96eebf94dae24df6b";
+    };
+  };
+
+  perlHTMLParser = import ../development/perl-modules/generic perl {
+    name = "HTML-Parser-3.45";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Parser-3.45.tar.gz;
+      md5 = "c2ac1379ac5848dd32e24347cd679391";
+    };
+  };
+
+  perlHTMLTagset = import ../development/perl-modules/generic perl {
+    name = "HTML-Tagset-3.04";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tagset-3.04.tar.gz;
+      md5 = "b82e0f08c1ececefe98b891f30dd56a6";
+    };
+  };
+
+  perlHTMLTree = import ../development/perl-modules/generic perl {
+    name = "HTML-Tree-3.18";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
+      md5 = "6a9e4e565648c9772e7d8ec6d4392497";
+    };
+  };
+
+  perlLocaleGettext = import ../development/perl-modules/generic perl {
+    name = "LocaleGettext-1.04";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/gettext-1.04.tar.gz;
+      md5 = "578dd0c76f8673943be043435b0fbde4";
+    };
+  };
+
+  perlLWP = import ../development/perl-modules/generic perl {
+    name = "libwww-perl-5.803";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/libwww-perl-5.803.tar.gz;
+      md5 = "3345d5f15a4f42350847254141725c8f";
+    };
+    propagatedBuildInputs = [perlURI perlHTMLParser];
+  };
+
+  perlTermReadKey = import ../development/perl-modules/generic perl {
+    name = "TermReadKey-2.30";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
+      md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
+    };
+  };
+
+  perlURI = import ../development/perl-modules/generic perl {
+    name = "URI-1.35";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/URI-1.35.tar.gz;
+      md5 = "1a933b1114c41a25587ee59ba8376f7c";
+    };
+  };
+
   perlXMLLibXML = import ../development/perl-modules/generic perl {
     name = "XML-LibXML-1.58";
     src = fetchurl {
@@ -1670,6 +1782,19 @@ rec {
     buildInputs = [libxml2];
   };
 
+  perlXMLNamespaceSupport = import ../development/perl-modules/generic perl {
+    name = "XML-NamespaceSupport-1.08";
+    src = fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
+      md5 = "81bd5ae772906d0579c10061ed735dc8";
+    };
+    buildInputs = [];
+  };
+
+  perlXMLParser = import ../development/perl-modules/XML-Parser {
+    inherit fetchurl perl expat;
+  };
+
   perlXMLSAX = import ../development/perl-modules/generic perl {
     name = "XML-SAX-0.12";
     src = fetchurl {
@@ -1679,13 +1804,13 @@ rec {
     propagatedBuildInputs = [perlXMLNamespaceSupport];
   };
 
-  perlXMLNamespaceSupport = import ../development/perl-modules/generic perl {
-    name = "XML-NamespaceSupport-1.08";
+  perlXMLSimple = import ../development/perl-modules/generic perl {
+    name = "XML-Simple-2.14";
     src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
-      md5 = "81bd5ae772906d0579c10061ed735dc8";
+      url = http://nix.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
+      md5 = "f321058271815de28d214c8efb9091f9";
     };
-    buildInputs = [];
+    propagatedBuildInputs = [perlXMLParser];
   };
 
   perlXMLTwig = import ../development/perl-modules/generic perl {
@@ -1705,110 +1830,13 @@ rec {
     };
   };
 
-  perlXMLSimple = import ../development/perl-modules/generic perl {
-    name = "XML-Simple-2.14";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
-      md5 = "f321058271815de28d214c8efb9091f9";
-    };
-    propagatedBuildInputs = [perlXMLParser];
-  };
-
-  perlTermReadKey = import ../development/perl-modules/generic perl {
-    name = "TermReadKey-2.30";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
-      md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
-    };
-  };
-
-  perlDateManip = import ../development/perl-modules/generic perl {
-    name = "DateManip-5.42a";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
-      md5 = "648386bbf46d021ae283811f75b07bdf";
-    };
-  };
-
-  perlHTMLTree = import ../development/perl-modules/generic perl {
-    name = "HTML-Tree-3.18";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
-      md5 = "6a9e4e565648c9772e7d8ec6d4392497";
-    };
-  };
-
-  perlHTMLParser = import ../development/perl-modules/generic perl {
-    name = "HTML-Parser-3.45";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Parser-3.45.tar.gz;
-      md5 = "c2ac1379ac5848dd32e24347cd679391";
-    };
-  };
-
-  perlHTMLTagset = import ../development/perl-modules/generic perl {
-    name = "HTML-Tagset-3.04";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tagset-3.04.tar.gz;
-      md5 = "b82e0f08c1ececefe98b891f30dd56a6";
-    };
-  };
-
-  perlURI = import ../development/perl-modules/generic perl {
-    name = "URI-1.35";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/URI-1.35.tar.gz;
-      md5 = "1a933b1114c41a25587ee59ba8376f7c";
-    };
-  };
-
-  perlLWP = import ../development/perl-modules/generic perl {
-    name = "libwww-perl-5.803";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libwww-perl-5.803.tar.gz;
-      md5 = "3345d5f15a4f42350847254141725c8f";
-    };
-    propagatedBuildInputs = [perlURI perlHTMLParser];
-  };
-
-  perlLocaleGettext = import ../development/perl-modules/generic perl {
-    name = "LocaleGettext-1.04";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gettext-1.04.tar.gz;
-      md5 = "578dd0c76f8673943be043435b0fbde4";
-    };
-  };
-
-  perlDigestSHA1 = import ../development/perl-modules/generic perl {
-    name = "Digest-SHA1-2.11";
-    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
-      md5 = "2449bfe21d6589c96eebf94dae24df6b";
-    };
-  };
-
-  perlCGISession = import ../development/perl-modules/generic perl {
-    name = "CGI-Session-3.95";
-    src = fetchurl {
-      url = http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
-      md5 = "fe9e46496c7c711c54ca13209ded500b";
-    };
-  };
-
-  wxPython = (import ../development/python-modules/wxPython-2.5) {
-    inherit fetchurl stdenv pkgconfig wxGTK python;
-  };
-
-  wxPython24 = (import ../development/python-modules/wxPython) {
-    inherit fetchurl stdenv pkgconfig python;
-    wxGTK = wxGTK24;
-  };
-
   pygtk = (import ../development/python-modules/pygtk) {
     inherit fetchurl stdenv python pkgconfig;
     inherit (gtkLibs) glib gtk;
   };
-  
+
+  readline = readline5;
+
   readline4 = (import ../development/libraries/readline/readline4.nix) {
     inherit fetchurl stdenv ncurses;
   };
@@ -1817,8 +1845,6 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  readline = readline5;
-
   SDL = (import ../development/libraries/SDL) {
     inherit fetchurl stdenv x11 mesa alsaLib;
     inherit (xlibs) libXrandr;
@@ -1830,68 +1856,46 @@ rec {
     inherit fetchurl stdenv SDL libogg libvorbis;
   };
 
-  boehmgc = (import ../development/libraries/boehm-gc) {
-    inherit fetchurl stdenv;
-  };
-
-  lesstif = (import ../development/libraries/lesstif) {
-    inherit fetchurl stdenv x11;
-    inherit (xlibs) libXp libXau;
-  };
-
   t1lib = (import ../development/libraries/t1lib) {
     inherit fetchurl stdenv x11;
     inherit (xlibs) libXaw;
   };
 
-  tk = import ../development/libraries/tk {
-    inherit fetchurl stdenv tcl x11;
-  };
-
-  id3lib = import ../development/libraries/id3lib {
-    inherit fetchurl stdenv;
-  };
-
   taglib = import ../development/libraries/taglib {
     inherit fetchurl stdenv zlib;
   };
 
-  libmpcdec = import ../development/libraries/libmpcdec {
-    inherit fetchurl stdenv;
+  tk = import ../development/libraries/tk {
+    inherit fetchurl stdenv tcl x11;
   };
 
-  gmime = import ../development/libraries/gmime {
-    inherit fetchurl stdenv pkgconfig zlib;
-    inherit (gtkLibs) glib;
+  wxPython = (import ../development/python-modules/wxPython-2.5) {
+    inherit fetchurl stdenv pkgconfig wxGTK python;
   };
 
-  
+  wxPython24 = (import ../development/python-modules/wxPython) {
+    inherit fetchurl stdenv pkgconfig python;
+    wxGTK = wxGTK24;
+  };
+
+
   ### SERVERS
 
+
   apacheHttpd = (import ../servers/http/apache-httpd) {
     inherit fetchurl stdenv perl openssl db4 expat zlib;
     sslSupport = true;
     db4Support = true;
   };
 
+  jetty = (import ../servers/http/jetty) {
+    inherit fetchurl stdenv unzip;
+  };
+
   mod_python = import ../servers/http/apache-modules/mod_python {
     inherit fetchurl stdenv apacheHttpd python;
   };
 
-  xorg = recurseIntoAttrs (import ../servers/x11/xorg {
-    inherit fetchurl stdenv pkgconfig freetype fontconfig
-      expat libdrm libpng zlib perl mesa;
-  });
-
-  postgresql = (import ../servers/sql/postgresql) {
-    inherit fetchurl stdenv readline ncurses zlib;
-  };
-
-  postgresql_jdbc = (import ../servers/sql/postgresql/jdbc) {
-    inherit fetchurl stdenv;
-    ant = apacheAntBlackdown14;
-  };
-
   mysql = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;
     ps = procps; /* !!! Linux only */
@@ -1902,27 +1906,34 @@ rec {
     ant = apacheAntBlackdown14;
   };
 
-  jetty = (import ../servers/http/jetty) {
-    inherit fetchurl stdenv unzip;
+  postgresql = (import ../servers/sql/postgresql) {
+    inherit fetchurl stdenv readline ncurses zlib;
   };
 
-  
+  postgresql_jdbc = (import ../servers/sql/postgresql/jdbc) {
+    inherit fetchurl stdenv;
+    ant = apacheAntBlackdown14;
+  };
+
+  xorg = recurseIntoAttrs (import ../servers/x11/xorg {
+    inherit fetchurl stdenv pkgconfig freetype fontconfig
+      expat libdrm libpng zlib perl mesa;
+  });
+
+
   ### OS-SPECIFIC
 
-  uclibcArm = (import ../development/uclibc) {
-    inherit fetchurl stdenv mktemp;
-    kernelHeadersCross = kernelHeadersArm;
-    binutilsCross = binutilsArm;
-    gccCross = gcc40arm;
-    cross = "arm-linux";
+
+  #nfsUtils = (import ../os-specific/linux/nfs-utils) {
+  #  inherit fetchurl stdenv;
+  #};
+
+  alsaLib = (import ../os-specific/linux/alsa/library) {
+    inherit fetchurl stdenv;
   };
 
-  uclibcMips = (import ../development/uclibc) {
-    inherit fetchurl stdenv mktemp;
-    kernelHeadersCross = kernelHeadersMips;
-    binutilsCross = binutilsMips;
-    gccCross = gcc40mipsboot;
-    cross = "mips-linux";
+  alsaUtils = (import ../os-specific/linux/alsa/utils) {
+    inherit fetchurl stdenv alsaLib ncurses gettext;
   };
 
   #uclibcSparc = (import ../development/uclibc) {
@@ -1949,38 +1960,44 @@ rec {
     gcc = stdenv.gcc;
   };
 
-  libselinux = (import ../os-specific/linux/libselinux) {
-    inherit fetchurl stdenv libsepol;
+  e2fsprogs = (import ../os-specific/linux/e2fsprogs) {
+    inherit fetchurl stdenv gettext;
   };
 
-  libsepol = (import ../os-specific/linux/libsepol) {
-    inherit fetchurl stdenv;
-  };
-
-  MAKEDEV = (import ../os-specific/linux/MAKEDEV) {
-    inherit fetchurl stdenv;
-  };
-
-  MAKEDEVwrapper = (import ../os-specific/linux/MAKEDEV-wrapper) {
-    inherit stdenv MAKEDEV;
-  };
-
-  mkinitrd = (import ../os-specific/linux/mkinitrd) {
-    inherit fetchurl stdenv;
-    popt = popt110;
+  e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) {
+    inherit fetchurl gettext;
+    stdenv = overrideGCC stdenv dietgcc;
   };
 
   eject = (import ../os-specific/linux/eject) {
     inherit fetchurl stdenv gettext;
   };
 
+  fuse = import ../os-specific/linux/fuse {
+    inherit fetchurl stdenv;
+  };
+
+  hotplug = import ../os-specific/linux/hotplug {
+    inherit fetchurl stdenv bash gnused coreutils utillinux gnugrep module_init_tools;
+  };
+
+  hwdata = (import ../os-specific/linux/hwdata) {
+    inherit fetchurl stdenv;
+  };
+
   initscripts = (import ../os-specific/linux/initscripts) {
     inherit fetchurl stdenv popt pkgconfig;
     inherit (gtkLibs) glib;
   };
 
-  hwdata = (import ../os-specific/linux/hwdata) {
-    inherit fetchurl stdenv;
+  iputils = (import ../os-specific/linux/iputils) {
+    inherit fetchurl stdenv kernelHeaders;
+    glibc = stdenv.gcc.glibc;
+  };
+
+  kernel = (import ../os-specific/linux/kernel) {
+    inherit fetchurl perl mktemp;
+    stdenv = overrideGCC stdenv gcc34;
   };
 
   kernelHeaders = (import ../os-specific/linux/kernel-headers) {
@@ -2002,16 +2019,27 @@ rec {
     cross = "sparc-linux";
   };
 
-  kernel = (import ../os-specific/linux/kernel) {
-    inherit fetchurl perl mktemp;
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
   kernelscripts = (import ../os-specific/linux/kernelscripts) {
     inherit stdenv module_init_tools kernel;
     modules = [ov511];
   };
 
+  libselinux = (import ../os-specific/linux/libselinux) {
+    inherit fetchurl stdenv libsepol;
+  };
+
+  libsepol = (import ../os-specific/linux/libsepol) {
+    inherit fetchurl stdenv;
+  };
+
+  MAKEDEV = (import ../os-specific/linux/MAKEDEV) {
+    inherit fetchurl stdenv;
+  };
+
+  MAKEDEVwrapper = (import ../os-specific/linux/MAKEDEV-wrapper) {
+    inherit stdenv MAKEDEV;
+  };
+
   #klibc = (import ../os-specific/linux/klibc) {
   #  inherit fetchurl stdenv kernel perl bison flexWrapper;
   #};
@@ -2024,58 +2052,9 @@ rec {
     inherit stdenv mingetty shadowutils;
   };
 
-  ov511 = (import ../os-specific/linux/ov511) {
-    inherit fetchurl kernel;
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
-  pam = (import ../os-specific/linux/pam) {
-    inherit stdenv fetchurl cracklib;
-  };
-
-  #nfsUtils = (import ../os-specific/linux/nfs-utils) {
-  #  inherit fetchurl stdenv;
-  #};
-
-  alsaLib = (import ../os-specific/linux/alsa/library) {
+  mkinitrd = (import ../os-specific/linux/mkinitrd) {
     inherit fetchurl stdenv;
-  };
-
-  alsaUtils = (import ../os-specific/linux/alsa/utils) {
-    inherit fetchurl stdenv alsaLib ncurses gettext;
-  };
-
-  utillinux = (import ../os-specific/linux/util-linux) {
-    inherit fetchurl stdenv;
-  };
-
-  utillinuxStatic = (import ../os-specific/linux/util-linux-static) {
-    inherit fetchurl stdenv;
-  };
-
-  sysklogd = (import ../os-specific/linux/sysklogd) {
-    inherit fetchurl stdenv;
-  };
-
-  sysvinit = (import ../os-specific/linux/sysvinit) {
-    inherit fetchurl stdenv;
-  };
-
-  e2fsprogs = (import ../os-specific/linux/e2fsprogs) {
-    inherit fetchurl stdenv gettext;
-  };
-
-  e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) {
-    inherit fetchurl gettext;
-    stdenv = overrideGCC stdenv dietgcc;
-  };
-
-  nettools = (import ../os-specific/linux/net-tools) {
-    inherit fetchurl stdenv;
-  };
-
-  modutils = (import ../os-specific/linux/modutils) {
-    inherit fetchurl stdenv bison flex;
+    popt = popt110;
   };
 
   module_init_tools = (import ../os-specific/linux/module-init-tools) {
@@ -2086,40 +2065,76 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  shadowutils = (import ../os-specific/linux/shadow) {
+  modutils = (import ../os-specific/linux/modutils) {
+    inherit fetchurl stdenv bison flex;
+  };
+
+  nettools = (import ../os-specific/linux/net-tools) {
     inherit fetchurl stdenv;
   };
 
-  iputils = (import ../os-specific/linux/iputils) {
-    inherit fetchurl stdenv kernelHeaders;
-    glibc = stdenv.gcc.glibc;
+  ov511 = (import ../os-specific/linux/ov511) {
+    inherit fetchurl kernel;
+    stdenv = overrideGCC stdenv gcc34;
+  };
+
+  pam = (import ../os-specific/linux/pam) {
+    inherit stdenv fetchurl cracklib;
   };
 
   procps = import ../os-specific/linux/procps {
     inherit fetchurl stdenv ncurses;
   };
 
-  syslinux = import ../os-specific/linux/syslinux {
-    inherit fetchurl stdenv nasm perl;
-  };
-
-  hotplug = import ../os-specific/linux/hotplug {
-    inherit fetchurl stdenv bash gnused coreutils utillinux gnugrep module_init_tools;
+  shadowutils = (import ../os-specific/linux/shadow) {
+    inherit fetchurl stdenv;
   };
 
   squashfsTools = import ../os-specific/linux/squashfs {
     inherit fetchurl stdenv zlib;
   };
 
-  usbutils = import ../os-specific/linux/usbutils {
-    inherit fetchurl stdenv libusb;
+  sysklogd = (import ../os-specific/linux/sysklogd) {
+    inherit fetchurl stdenv;
+  };
+
+  syslinux = import ../os-specific/linux/syslinux {
+    inherit fetchurl stdenv nasm perl;
+  };
+
+  sysvinit = (import ../os-specific/linux/sysvinit) {
+    inherit fetchurl stdenv;
+  };
+
+  uclibcArm = (import ../development/uclibc) {
+    inherit fetchurl stdenv mktemp;
+    kernelHeadersCross = kernelHeadersArm;
+    binutilsCross = binutilsArm;
+    gccCross = gcc40arm;
+    cross = "arm-linux";
+  };
+
+  uclibcMips = (import ../development/uclibc) {
+    inherit fetchurl stdenv mktemp;
+    kernelHeadersCross = kernelHeadersMips;
+    binutilsCross = binutilsMips;
+    gccCross = gcc40mipsboot;
+    cross = "mips-linux";
   };
 
   udev = import ../os-specific/linux/udev {
     inherit fetchurl stdenv;
   };
 
-  fuse = import ../os-specific/linux/fuse {
+  usbutils = import ../os-specific/linux/usbutils {
+    inherit fetchurl stdenv libusb;
+  };
+
+  utillinux = (import ../os-specific/linux/util-linux) {
+    inherit fetchurl stdenv;
+  };
+
+  utillinuxStatic = (import ../os-specific/linux/util-linux-static) {
     inherit fetchurl stdenv;
   };
 
@@ -2127,9 +2142,14 @@ rec {
     inherit stdenv xlibs expat;
   };
 
-  
+
   ### DATA
 
+
+  docbook5 = (import ../data/sgml+xml/schemas/docbook-5.0) {
+    inherit fetchurl stdenv;
+  };
+
   docbook_xml_dtd_42 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2) {
     inherit fetchurl stdenv unzip;
   };
@@ -2138,10 +2158,6 @@ rec {
     inherit fetchurl stdenv unzip;
   };
 
-  docbook5 = (import ../data/sgml+xml/schemas/docbook-5.0) {
-    inherit fetchurl stdenv;
-  };
-
   docbook_xml_ebnf_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf) {
     inherit fetchurl stdenv unzip;
   };
@@ -2153,12 +2169,254 @@ rec {
 
   ### APPLICATIONS
 
+
   abiword = (import ../applications/office/abiword) {
     inherit fetchurl stdenv pkgconfig fribidi libpng popt;
     inherit (gtkLibs) glib gtk pango;
     inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
+  acroread = (import ../applications/misc/acrobat-reader) {
+    inherit fetchurl stdenv zlib;
+    inherit (xlibs) libXt libXp libXext libX11 libXinerama;
+    inherit (gtkLibs) glib pango atk gtk;
+    libstdcpp5 = gcc33.gcc;
+    xineramaSupport = true;
+    fastStart = true;
+  };
+
+  amsn = (import ../applications/networking/instant-messengers/amsn) {
+    inherit fetchurl stdenv which tcl tk x11;
+  };
+
+  batik = (import ../applications/graphics/batik) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  bmp = import ../applications/audio/bmp {
+    inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;
+    inherit (gnome) esound libglade;
+    inherit (gtkLibs) glib gtk;
+  };
+
+  bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack {
+    inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib;
+    inherit (gtkLibs) glib gtk;
+  };
+
+  cdparanoiaIII = (import ../applications/audio/cdparanoia) {
+    inherit fetchurl stdenv;
+  };
+
+  cdrtools = (import ../applications/misc/cdrtools) {
+    inherit fetchurl stdenv;
+  };
+
+  chatzilla = 
+    xulrunnerWrapper {
+      launcher = "chatzilla";
+      application = (import ../applications/networking/irc/chatzilla) {
+          inherit fetchurl stdenv unzip;
+        };
+    };
+
+  cua = (import ../applications/editors/emacs/modes/cua) {
+    inherit fetchurl stdenv;
+  };
+
+  #rpm = (import ../applications/package-management/rpm) {
+  #  inherit fetchurl stdenv python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl;
+  #};
+
+  cvs = (import ../applications/version-management/cvs) {
+    inherit fetchurl stdenv vim;
+  };
+
+  darcs = import ../applications/version-management/darcs {
+    inherit fetchurl stdenv ghc zlib ncurses curl;
+  };
+
+  eclipse = plugins :
+    (import ../applications/editors/eclipse) {
+      inherit fetchurl stdenv makeWrapper jdk;
+      inherit (gtkLibs) gtk glib;
+      inherit (xlibs) libXtst;
+      inherit plugins;
+    };
+
+  eclipseSpoofax =
+    eclipse [spoofax];
+
+  emacs = (import ../applications/editors/emacs) {
+    inherit fetchurl stdenv x11 Xaw3d;
+    inherit (xlibs) libXaw libXpm;
+    xaw3dSupport = true;
+  };
+
+  emacs22 = (import ../applications/editors/emacs-22) {
+    inherit fetchurl stdenv pkgconfig x11 Xaw3d;
+    inherit (xlibs) libXaw libXpm;
+    inherit (gtkLibs) gtk;
+    xaw3dSupport = false;
+    gtkGUI = true;
+  };
+
+  emacs22aa = (import ../applications/editors/emacs-22-aa) {
+    inherit fetchurl stdenv pkgconfig x11 Xaw3d libpng;
+    inherit (xlibs) libXaw libXpm libXft;
+    inherit (gtkLibs) gtk;
+    xaw3dSupport = false;
+    gtkGUI = true;
+    xftSupport = true;
+  };
+
+  ethereal = (import ../applications/networking/sniffers/ethereal) {
+    inherit fetchurl stdenv perl pkgconfig libpcap;
+    inherit (gtkLibs) glib;
+  };
+
+  firefox = (import ../applications/networking/browsers/firefox) {
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) libIDL;
+    inherit (xlibs) libXi;
+    #enableOfficialBranding = true;
+  };
+
+  firefoxWrapper = wrapFirefox firefox;
+
+  flac = (import ../applications/audio/flac) {
+    inherit fetchurl stdenv libogg;
+  };
+
+  flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
+    inherit fetchurl stdenv zlib;
+    inherit (xlibs) libXmu;
+  };
+
+  fspot = (import ../applications/graphics/f-spot) {
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig mono
+            libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;
+    inherit (gnome) libgnome libgnomeui;
+    gtksharp = gtksharp1;
+  };
+
+  gaim = (import ../applications/networking/instant-messengers/gaim) {
+    inherit fetchurl stdenv pkgconfig perl libxml2 openssl nss;
+    inherit (gtkLibs) glib gtk;
+  };
+
+  gimp = (import ../applications/graphics/gimp) {
+    inherit fetchurl stdenv pkgconfig freetype fontconfig
+      libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext;
+    inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
+  };
+
+  gphoto2 = (import ../applications/misc/gphoto2) {
+    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
+  };
+
+  gqview = (import ../applications/graphics/gqview) {
+    inherit fetchurl stdenv pkgconfig libpng;
+    inherit (gtkLibs) gtk;
+  };
+
+  haskellMode = (import ../applications/editors/emacs/modes/haskell) {
+    inherit fetchurl stdenv;
+  };
+
+  hello = (import ../applications/misc/hello/ex-1) {
+    inherit fetchurl stdenv perl;
+  };
+
+  inkscape = (import ../applications/graphics/inkscape) {
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
+      popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
+      glibmm libsigcxx;
+    inherit (gtkLibs) gtk glib;
+    inherit (xlibs) libXft;
+  };
+
+  kuickshow = (import ../applications/graphics/kuickshow) {
+    inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl;
+    inherit (xlibs) libX11 libXext libSM;
+    qt = qt3;
+  };
+
+  lame = (import ../applications/audio/lame) {
+    inherit fetchurl stdenv ;
+  };
+
+  links = (import ../applications/networking/browsers/links) {
+    inherit fetchurl stdenv;
+  };
+
+  lynx = (import ../applications/networking/browsers/lynx) {
+    inherit fetchurl stdenv ncurses openssl;
+  };
+
+  monodevelop = (import ../applications/editors/monodevelop) {
+    inherit fetchurl stdenv file mono gtksourceviewsharp
+            gtkmozembedsharp monodoc perl perlXMLParser pkgconfig;
+    inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk;
+    mozilla = firefox;
+    gtksharp = gtksharp2;
+  };
+
+  monodoc = (import ../applications/editors/monodoc) {
+    inherit fetchurl stdenv mono pkgconfig;
+    gtksharp = gtksharp1;
+  };
+
+  mozilla = (import ../applications/networking/browsers/mozilla) {
+    inherit fetchurl pkgconfig stdenv perl zip;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) libIDL;
+    inherit (xlibs) libXi;
+  };
+
+  MPlayer = (import ../applications/video/MPlayer) {
+    inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
+    inherit (xlibs) libXv libXinerama libXrandr;
+    alsaSupport = true;
+    alsa = alsaLib;
+    theoraSupport = true;
+    cacaSupport = true;
+    xineramaSupport = true;
+    randrSupport = true;
+  };
+
+  MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {
+    inherit fetchurl stdenv pkgconfig firefox;
+    inherit (xlibs) libXpm;
+    # !!! should depend on MPlayer
+  };
+
+  mythtv = (import ../applications/video/mythtv) {
+    inherit fetchurl stdenv which qt3 x11 lame zlib mesa;
+    inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu;
+  };
+
+  nano = (import ../applications/editors/nano) {
+    inherit fetchurl stdenv ncurses gettext;
+  };
+
+  nanoDiet = (import ../applications/editors/nano) {
+    inherit fetchurl gettext;
+    ncurses = ncursesDiet;
+    stdenv = overrideGCC stdenv dietgcc;
+  };
+
+  nedit = import ../applications/editors/nedit {
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXpm;
+    motif = lesstif;
+  };
+
+  nxml = (import ../applications/editors/emacs/modes/nxml) {
+    inherit fetchurl stdenv;
+  };
+
   openoffice = (import ../applications/office/openoffice) {
     inherit fetchurl stdenv pam python tcsh libxslt
       perl perlArchiveZip perlCompressZlib zlib libjpeg
@@ -2178,12 +2436,41 @@ rec {
     };
   };
 
-  #rpm = (import ../applications/package-management/rpm) {
-  #  inherit fetchurl stdenv python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl;
-  #};
+  opera = import ../applications/networking/browsers/opera {
+    inherit fetchurl stdenv zlib;
+    inherit (xlibs) libX11 libXt libXext;
+    qt = qt3;
+    motif = lesstif;
+  };
 
-  cvs = (import ../applications/version-management/cvs) {
-    inherit fetchurl stdenv vim;
+  pan = (import ../applications/networking/newsreaders/pan) {
+    inherit fetchurl stdenv pkgconfig gnet perl
+            pcre gmime gettext;
+    inherit (gtkLibs) gtk;
+    spellChecking = false;
+  };
+
+  pinfo = (import ../applications/misc/pinfo) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  rcs = (import ../applications/version-management/rcs) {
+    inherit fetchurl stdenv;
+  };
+
+  RealPlayer = import ../applications/video/RealPlayer {
+    inherit fetchurl stdenv;
+    inherit (gtkLibs) glib pango atk gtk;
+    inherit (xlibs) libX11;
+    libstdcpp5 = gcc33.gcc;
+  };
+
+  rsync = (import ../applications/networking/sync/rsync) {
+    inherit fetchurl stdenv;
+  };
+
+  spoofax = (import ../applications/editors/eclipse/plugins/spoofax) {
+    inherit fetchurl stdenv;
   };
 
   subversion = subversion14;
@@ -2216,21 +2503,6 @@ rec {
     javahlBindings = true;
   };
 
-  rcs = (import ../applications/version-management/rcs) {
-    inherit fetchurl stdenv;
-  };
-
-  darcs = import ../applications/version-management/darcs {
-    inherit fetchurl stdenv ghc zlib ncurses curl;
-  };
-
-  pan = (import ../applications/networking/newsreaders/pan) {
-    inherit fetchurl stdenv pkgconfig gnet perl
-            pcre gmime gettext;
-    inherit (gtkLibs) gtk;
-    spellChecking = false;
-  };
-
   sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
     inherit fetchurl stdenv pkgconfig openssl gpgme;
     inherit (gtkLibs) glib gtk;
@@ -2238,19 +2510,7 @@ rec {
     gpgSupport = true;
   };
 
-  valknut = (import ../applications/networking/p2p/valknut) {
-    inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib;
-    qt = qt3;
-  };
-
-  mozilla = (import ../applications/networking/browsers/mozilla) {
-    inherit fetchurl pkgconfig stdenv perl zip;
-    inherit (gtkLibs) gtk;
-    inherit (gnome) libIDL;
-    inherit (xlibs) libXi;
-  };
-
-  firefox = (import ../applications/networking/browsers/firefox) {
+  thunderbird = import ../applications/networking/mailreaders/thunderbird {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
@@ -2258,6 +2518,85 @@ rec {
     #enableOfficialBranding = true;
   };
 
+  valknut = (import ../applications/networking/p2p/valknut) {
+    inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib;
+    qt = qt3;
+  };
+
+  vim = (import ../applications/editors/vim) {
+    inherit fetchurl stdenv ncurses;
+  };
+
+  vimDiet = (import ../applications/editors/vim-diet) {
+    inherit fetchurl;
+    ncurses = ncursesDiet;
+    stdenv = overrideGCC stdenv dietgcc;
+  };
+
+  vlc = (import ../applications/video/vlc) {
+    inherit fetchurl stdenv perl x11 wxGTK
+            zlib mpeg2dec a52dec libmad ffmpeg
+            libdvdread libdvdnav libdvdcss;
+    inherit (xlibs) libXv;
+    alsa = alsaLib;
+  };
+
+  w3m = (import ../applications/networking/browsers/w3m) {
+    inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
+    graphicsSupport = false;
+    inherit (gtkLibs1x) gdkpixbuf;
+  };
+
+  wrapFirefox = firefox: (import ../applications/networking/browsers/firefox-wrapper) {
+    inherit stdenv firefox;
+    plugins = [
+      MPlayerPlugin
+      flashplayer
+#      RealPlayer  # disabled by default for legal reasons
+    ] ++ (if blackdown != null then [blackdown] else []);
+  };
+
+  xara = (import ../applications/graphics/xara) {
+    inherit fetchurl stdenv autoconf automake libtool gettext cvs wxGTK
+      pkgconfig libxml2 zip libpng libjpeg;
+    inherit (gtkLibs) gtk;
+  };
+
+  xawtv = (import ../applications/video/xawtv) {
+    inherit fetchurl stdenv ncurses libjpeg perl;
+    inherit (xlibs) libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE xextproto;
+  };
+
+  xchat = (import ../applications/networking/irc/xchat) {
+    inherit fetchurl stdenv pkgconfig tcl;
+    inherit (gtkLibs) glib gtk;
+  };
+
+  xchm = (import ../applications/misc/xchm) {
+    inherit fetchurl stdenv wxGTK chmlib;
+  };
+
+  xineUI = (import ../applications/video/xine-ui) {
+    inherit fetchurl stdenv x11 xineLib libpng;
+  };
+
+  xmms = (import ../applications/audio/xmms) {
+    inherit fetchurl libogg libvorbis alsaLib;
+    inherit (gnome) esound;
+    inherit (gtkLibs1x) glib gtk;
+    stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
+  };
+
+  xpdf = (import ../applications/misc/xpdf) {
+    inherit fetchurl stdenv x11 freetype t1lib;
+    motif = lesstif;
+  };
+
+  xterm = (import ../applications/misc/xterm) {
+    inherit fetchurl stdenv ncurses;
+    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
+  };
+
   xulrunner = (import ../development/interpreters/xulrunner) {
     inherit fetchurl stdenv pkgconfig perl zip;
     inherit (gtkLibs) gtk;
@@ -2270,153 +2609,6 @@ rec {
       inherit stdenv xulrunner application launcher;
     };
 
-  wrapFirefox = firefox: (import ../applications/networking/browsers/firefox-wrapper) {
-    inherit stdenv firefox;
-    plugins = [
-      MPlayerPlugin
-      flashplayer
-#      RealPlayer  # disabled by default for legal reasons
-    ] ++ (if blackdown != null then [blackdown] else []);
-  };
-
-  firefoxWrapper = wrapFirefox firefox;
-
-  flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
-    inherit fetchurl stdenv zlib;
-    inherit (xlibs) libXmu;
-  };
-
-  thunderbird = import ../applications/networking/mailreaders/thunderbird {
-    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
-    inherit (gtkLibs) gtk;
-    inherit (gnome) libIDL;
-    inherit (xlibs) libXi;
-    #enableOfficialBranding = true;
-  };
-
-  lynx = (import ../applications/networking/browsers/lynx) {
-    inherit fetchurl stdenv ncurses openssl;
-  };
-
-  links = (import ../applications/networking/browsers/links) {
-    inherit fetchurl stdenv;
-  };
-
-  w3m = (import ../applications/networking/browsers/w3m) {
-    inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
-    graphicsSupport = false;
-    inherit (gtkLibs1x) gdkpixbuf;
-  };
-
-  opera = import ../applications/networking/browsers/opera {
-    inherit fetchurl stdenv zlib;
-    inherit (xlibs) libX11 libXt libXext;
-    qt = qt3;
-    motif = lesstif;
-  };
-
-  ethereal = (import ../applications/networking/sniffers/ethereal) {
-    inherit fetchurl stdenv perl pkgconfig libpcap;
-    inherit (gtkLibs) glib;
-  };
-
-  gaim = (import ../applications/networking/instant-messengers/gaim) {
-    inherit fetchurl stdenv pkgconfig perl libxml2 openssl nss;
-    inherit (gtkLibs) glib gtk;
-  };
-
-  amsn = (import ../applications/networking/instant-messengers/amsn) {
-    inherit fetchurl stdenv which tcl tk x11;
-  };
-
-  xchat = (import ../applications/networking/irc/xchat) {
-    inherit fetchurl stdenv pkgconfig tcl;
-    inherit (gtkLibs) glib gtk;
-  };
-
-  chatzilla = 
-    xulrunnerWrapper {
-      launcher = "chatzilla";
-      application = (import ../applications/networking/irc/chatzilla) {
-          inherit fetchurl stdenv unzip;
-        };
-    };
-
-  rsync = (import ../applications/networking/sync/rsync) {
-    inherit fetchurl stdenv;
-  };
-
-  cdparanoiaIII = (import ../applications/audio/cdparanoia) {
-    inherit fetchurl stdenv;
-  };
-  
-  flac = (import ../applications/audio/flac) {
-    inherit fetchurl stdenv libogg;
-  };
-
-  lame = (import ../applications/audio/lame) {
-    inherit fetchurl stdenv ;
-  };
-
-  xmms = (import ../applications/audio/xmms) {
-    inherit fetchurl libogg libvorbis alsaLib;
-    inherit (gnome) esound;
-    inherit (gtkLibs1x) glib gtk;
-    stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
-  };
-
-  bmp = import ../applications/audio/bmp {
-    inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;
-    inherit (gnome) esound libglade;
-    inherit (gtkLibs) glib gtk;
-  };
-
-  bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack {
-    inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib;
-    inherit (gtkLibs) glib gtk;
-  };
-
-  MPlayer = (import ../applications/video/MPlayer) {
-    inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
-    inherit (xlibs) libXv libXinerama libXrandr;
-    alsaSupport = true;
-    alsa = alsaLib;
-    theoraSupport = true;
-    cacaSupport = true;
-    xineramaSupport = true;
-    randrSupport = true;
-  };
-
-  MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {
-    inherit fetchurl stdenv pkgconfig firefox;
-    inherit (xlibs) libXpm;
-    # !!! should depend on MPlayer
-  };
-
-  vlc = (import ../applications/video/vlc) {
-    inherit fetchurl stdenv perl x11 wxGTK
-            zlib mpeg2dec a52dec libmad ffmpeg
-            libdvdread libdvdnav libdvdcss;
-    inherit (xlibs) libXv;
-    alsa = alsaLib;
-  };
-
-  xineUI = (import ../applications/video/xine-ui) {
-    inherit fetchurl stdenv x11 xineLib libpng;
-  };
-
-  xawtv = (import ../applications/video/xawtv) {
-    inherit fetchurl stdenv ncurses libjpeg perl;
-    inherit (xlibs) libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE xextproto;
-  };
-
-  RealPlayer = import ../applications/video/RealPlayer {
-    inherit fetchurl stdenv;
-    inherit (gtkLibs) glib pango atk gtk;
-    inherit (xlibs) libX11;
-    libstdcpp5 = gcc33.gcc;
-  };
-
   zapping = (import ../applications/video/zapping) {
     inherit fetchurl stdenv pkgconfig perl python 
             gettext zvbi libjpeg libpng x11
@@ -2429,198 +2621,13 @@ rec {
     recordingSupport = true;
   };
 
-  mythtv = (import ../applications/video/mythtv) {
-    inherit fetchurl stdenv which qt3 x11 lame zlib mesa;
-    inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu;
-  };
-
-  gqview = (import ../applications/graphics/gqview) {
-    inherit fetchurl stdenv pkgconfig libpng;
-    inherit (gtkLibs) gtk;
-  };
-
-  kuickshow = (import ../applications/graphics/kuickshow) {
-    inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl;
-    inherit (xlibs) libX11 libXext libSM;
-    qt = qt3;
-  };
-
-  batik = (import ../applications/graphics/batik) {
-    inherit fetchurl stdenv unzip;
-  };
-
-  inkscape = (import ../applications/graphics/inkscape) {
-    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
-      popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
-      glibmm libsigcxx;
-    inherit (gtkLibs) gtk glib;
-    inherit (xlibs) libXft;
-  };
-
-  fspot = (import ../applications/graphics/f-spot) {
-    inherit fetchurl stdenv perl perlXMLParser pkgconfig mono
-            libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;
-    inherit (gnome) libgnome libgnomeui;
-    gtksharp = gtksharp1;
-  };
-
-  gimp = (import ../applications/graphics/gimp) {
-    inherit fetchurl stdenv pkgconfig freetype fontconfig
-      libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext;
-    inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
-  };
-
-  xara = (import ../applications/graphics/xara) {
-    inherit fetchurl stdenv autoconf automake libtool gettext cvs wxGTK
-      pkgconfig libxml2 zip libpng libjpeg;
-    inherit (gtkLibs) gtk;
-  };
-  cdrtools = (import ../applications/misc/cdrtools) {
-    inherit fetchurl stdenv;
-  };
-
-  hello = (import ../applications/misc/hello/ex-1) {
-    inherit fetchurl stdenv perl;
-  };
-
-  pinfo = (import ../applications/misc/pinfo) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  gphoto2 = (import ../applications/misc/gphoto2) {
-    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
-  };
-
-  xchm = (import ../applications/misc/xchm) {
-    inherit fetchurl stdenv wxGTK chmlib;
-  };
-
-  xpdf = (import ../applications/misc/xpdf) {
-    inherit fetchurl stdenv x11 freetype t1lib;
-    motif = lesstif;
-  };
-
-  xterm = (import ../applications/misc/xterm) {
-    inherit fetchurl stdenv ncurses;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
-  };
-
-  acroread = (import ../applications/misc/acrobat-reader) {
-    inherit fetchurl stdenv zlib;
-    inherit (xlibs) libXt libXp libXext libX11 libXinerama;
-    inherit (gtkLibs) glib pango atk gtk;
-    libstdcpp5 = gcc33.gcc;
-    xineramaSupport = true;
-    fastStart = true;
-  };
-
-  eclipseSpoofax =
-    eclipse [spoofax];
-
-  eclipse = plugins :
-    (import ../applications/editors/eclipse) {
-      inherit fetchurl stdenv makeWrapper jdk;
-      inherit (gtkLibs) gtk glib;
-      inherit (xlibs) libXtst;
-      inherit plugins;
-    };
-
-  spoofax = (import ../applications/editors/eclipse/plugins/spoofax) {
-    inherit fetchurl stdenv;
-  };
-
-  monodevelop = (import ../applications/editors/monodevelop) {
-    inherit fetchurl stdenv file mono gtksourceviewsharp
-            gtkmozembedsharp monodoc perl perlXMLParser pkgconfig;
-    inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk;
-    mozilla = firefox;
-    gtksharp = gtksharp2;
-  };
-
-  monodoc = (import ../applications/editors/monodoc) {
-    inherit fetchurl stdenv mono pkgconfig;
-    gtksharp = gtksharp1;
-  };
-
-  emacs = (import ../applications/editors/emacs) {
-    inherit fetchurl stdenv x11 Xaw3d;
-    inherit (xlibs) libXaw libXpm;
-    xaw3dSupport = true;
-  };
-
-  emacs22 = (import ../applications/editors/emacs-22) {
-    inherit fetchurl stdenv pkgconfig x11 Xaw3d;
-    inherit (xlibs) libXaw libXpm;
-    inherit (gtkLibs) gtk;
-    xaw3dSupport = false;
-    gtkGUI = true;
-  };
-
-  emacs22aa = (import ../applications/editors/emacs-22-aa) {
-    inherit fetchurl stdenv pkgconfig x11 Xaw3d libpng;
-    inherit (xlibs) libXaw libXpm libXft;
-    inherit (gtkLibs) gtk;
-    xaw3dSupport = false;
-    gtkGUI = true;
-    xftSupport = true;
-  };
-
-  nxml = (import ../applications/editors/emacs/modes/nxml) {
-    inherit fetchurl stdenv;
-  };
-
-  cua = (import ../applications/editors/emacs/modes/cua) {
-    inherit fetchurl stdenv;
-  };
-
-  haskellMode = (import ../applications/editors/emacs/modes/haskell) {
-    inherit fetchurl stdenv;
-  };
-
-  nano = (import ../applications/editors/nano) {
-    inherit fetchurl stdenv ncurses gettext;
-  };
-
-  nanoDiet = (import ../applications/editors/nano) {
-    inherit fetchurl gettext;
-    ncurses = ncursesDiet;
-    stdenv = overrideGCC stdenv dietgcc;
-  };
-
-  vim = (import ../applications/editors/vim) {
-    inherit fetchurl stdenv ncurses;
-  };
-
-  vimDiet = (import ../applications/editors/vim-diet) {
-    inherit fetchurl;
-    ncurses = ncursesDiet;
-    stdenv = overrideGCC stdenv dietgcc;
-  };
-
-  nedit = import ../applications/editors/nedit {
-    inherit fetchurl stdenv x11;
-    inherit (xlibs) libXpm;
-    motif = lesstif;
-  };
-
 
   ### GAMES
 
-  zoom = (import ../games/zoom) {
-    inherit fetchurl stdenv perl expat freetype;
-    inherit (xlibs) xlibs;
-  };
 
-  scummvm = (import ../games/scummvm) {
-    inherit fetchurl stdenv SDL;
-  };
-
-  quake3game = import ../games/quake3/game {
-    inherit fetchurl stdenv x11 SDL mesa openal;
-  };
-
-  quake3demodata = import ../games/quake3/demo {
-    inherit fetchurl stdenv;
+  exult = import ../games/exult {
+    inherit fetchurl SDL SDL_mixer zlib libpng unzip;
+    stdenv = overrideGCC stdenv gcc34;
   };
 
   quake3demo = import ../games/quake3/wrapper {
@@ -2630,26 +2637,35 @@ rec {
     paks = [quake3demodata];
   };
 
+  quake3demodata = import ../games/quake3/demo {
+    inherit fetchurl stdenv;
+  };
+
+  quake3game = import ../games/quake3/game {
+    inherit fetchurl stdenv x11 SDL mesa openal;
+  };
+
+  scummvm = (import ../games/scummvm) {
+    inherit fetchurl stdenv SDL;
+  };
+
   ut2004demo = import ../games/ut2004demo {
     inherit fetchurl stdenv xlibs mesa;
   };
 
-  exult = import ../games/exult {
-    inherit fetchurl SDL SDL_mixer zlib libpng unzip;
-    stdenv = overrideGCC stdenv gcc34;
+  zoom = (import ../games/zoom) {
+    inherit fetchurl stdenv perl expat freetype;
+    inherit (xlibs) xlibs;
   };
 
 
   ### MISC
 
-  uml = (import ../misc/uml) {
-    inherit fetchurl stdenv perl;
-    m4 = gnum4;
-    gcc = gcc33;
-  };
 
-  umlutilities = (import ../misc/uml-utilities) {
-    inherit fetchurl stdenv;
+  aangifte2005 = import ../evil/belastingdienst {
+    inherit stdenv fetchurl;
+    inherit (xlibs) libX11 libXext;
+    patchelf = patchelfNew;
   };
 
   atari800 = (import ../misc/emulators/atari800) {
@@ -2660,75 +2676,26 @@ rec {
     inherit fetchurl stdenv x11 SDL;
   };
 
-  generator = (import ../misc/emulators/generator) {
-    inherit fetchurl stdenv SDL nasm;
-    inherit (gtkLibs1x) gtk;
-  };
-
-  dosbox = (import ../misc/emulators/dosbox) {
-    inherit fetchurl stdenv SDL;
-  };
-
-  texFunctions = (import ../misc/tex/nix) {
-    inherit stdenv perl tetex graphviz ghostscript;
-  };
-
-  tetex = (import ../misc/tex/tetex) {
-    inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
-  };
-
-  lazylist = (import ../misc/tex/lazylist) {
-    inherit fetchurl stdenv tetex;
-  };
-
-  polytable = (import ../misc/tex/polytable) {
-    inherit fetchurl stdenv tetex lazylist;
-  };
-
-  ghostscript = (import ../misc/ghostscript) {
-    inherit fetchurl stdenv libjpeg libpng zlib x11;
-    x11Support = false;
-  };
-
-  nix = (import ../misc/nix) {
-    inherit fetchurl aterm perl curl;
-    bdb = db4;
-    stdenv = overrideGCC stdenv gcc34;
-  };
-
-  nixUnstable = (import ../misc/nix-unstable) {
-    inherit fetchurl stdenv aterm perl curl;
-    bdb = db4;
-  };
-
-  nixStatic = (import ../misc/nix-static) {
-    inherit fetchurl stdenv aterm perl curl autoconf automake libtool;
-    bdb = db4;
+  busybox = (import ../misc/busybox) {
+    inherit fetchurl stdenv;
   };
 
   cups = (import ../misc/cups) {
     inherit fetchurl stdenv;
   };
 
-  busybox = (import ../misc/busybox) {
-    inherit fetchurl stdenv;
+  dosbox = (import ../misc/emulators/dosbox) {
+    inherit fetchurl stdenv SDL;
   };
 
-  saneBackends = (import ../misc/sane-backends) {
-    inherit fetchurl stdenv;
+  generator = (import ../misc/emulators/generator) {
+    inherit fetchurl stdenv SDL nasm;
+    inherit (gtkLibs1x) gtk;
   };
 
-  linuxwacom = (import ../misc/linuxwacom) {
-    inherit fetchurl stdenv;
-    inherit (xlibs) libX11 libXi;
-  };
-
-  rssglx = (import ../misc/screensavers/rss-glx) {
-    inherit fetchurl stdenv x11 mesa;
-  };
-
-  toolbuslib = (import ../development/libraries/toolbuslib) {
-    inherit stdenv fetchurl aterm;
+  ghostscript = (import ../misc/ghostscript) {
+    inherit fetchurl stdenv libjpeg libpng zlib x11;
+    x11Support = false;
   };
 
   /*
@@ -2741,18 +2708,61 @@ rec {
     inherit stdenv fetchurl;
   };
 
-  aangifte2005 = import ../evil/belastingdienst {
-    inherit stdenv fetchurl;
-    inherit (xlibs) libX11 libXext;
-    patchelf = patchelfNew;
+  lazylist = (import ../misc/tex/lazylist) {
+    inherit fetchurl stdenv tetex;
+  };
+
+  linuxwacom = (import ../misc/linuxwacom) {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libX11 libXi;
+  };
+
+  martyr = (import ../development/libraries/martyr) {
+    inherit stdenv fetchurl apacheAnt;
   };
 
   maven = (import ../misc/maven/maven-1.0.nix) {
     inherit stdenv fetchurl jdk;
   };
 
-  martyr = (import ../development/libraries/martyr) {
-    inherit stdenv fetchurl apacheAnt;
+  nix = (import ../misc/nix) {
+    inherit fetchurl aterm perl curl;
+    bdb = db4;
+    stdenv = overrideGCC stdenv gcc34;
+  };
+
+  nixStatic = (import ../misc/nix-static) {
+    inherit fetchurl stdenv aterm perl curl autoconf automake libtool;
+    bdb = db4;
+  };
+
+  nixUnstable = (import ../misc/nix-unstable) {
+    inherit fetchurl stdenv aterm perl curl;
+    bdb = db4;
+  };
+
+  polytable = (import ../misc/tex/polytable) {
+    inherit fetchurl stdenv tetex lazylist;
+  };
+
+  rssglx = (import ../misc/screensavers/rss-glx) {
+    inherit fetchurl stdenv x11 mesa;
+  };
+
+  saneBackends = (import ../misc/sane-backends) {
+    inherit fetchurl stdenv;
+  };
+
+  tetex = (import ../misc/tex/tetex) {
+    inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
+  };
+
+  texFunctions = (import ../misc/tex/nix) {
+    inherit stdenv perl tetex graphviz ghostscript;
+  };
+
+  toolbuslib = (import ../development/libraries/toolbuslib) {
+    inherit stdenv fetchurl aterm;
   };
 
   trac = (import ../misc/trac) {
@@ -2776,4 +2786,14 @@ rec {
     };
   };
 
+  uml = (import ../misc/uml) {
+    inherit fetchurl stdenv perl;
+    m4 = gnum4;
+    gcc = gcc33;
+  };
+
+  umlutilities = (import ../misc/uml-utilities) {
+    inherit fetchurl stdenv;
+  };
+
 }