anchor.diff:        libXinerama libXrandr randrproto libXtst;
     };
   
  -  libviper = import ../development/libraries/libviper {
  -    inherit fetchurl stdenv pkgconfig ncurses gpm glib;
  -  };
  -
  -  libvpx = import ../development/libraries/libvpx {
  -    inherit fetchurl stdenv bash yasm;
  -  };
  -
  -  libvterm = import ../development/libraries/libvterm {
  -    inherit fetchurl stdenv pkgconfig ncurses glib;
  -  };
  -
  -  libvorbis = import ../development/libraries/libvorbis {
  -    inherit fetchurl stdenv libogg;
  -  };
  -
  -  libwmf = import ../development/libraries/libwmf {
  -    inherit fetchurl stdenv pkgconfig imagemagick
  -      zlib libpng freetype libjpeg libxml2 glib;
  -  };
  -
  -  libwpd = import ../development/libraries/libwpd {
  -    inherit fetchurl stdenv pkgconfig libgsf libxml2 bzip2;
  +  libviper = callPackage ../development/libraries/libviper { };
  +
  +  libvpx = callPackage ../development/libraries/libvpx { };
  +
  +  libvterm = callPackage ../development/libraries/libvterm { };
  +
  +  libvorbis = callPackage ../development/libraries/libvorbis { };
  +
  +  libwmf = callPackage ../development/libraries/libwmf { };
  +
  +  libwpd = callPackage ../development/libraries/libwpd { 
       inherit (gnome) glib;
     };
   
     libx86 = builderDefsPackage ../development/libraries/libx86 {};
   
  -  libxcrypt = import ../development/libraries/libxcrypt {
  -    inherit fetchurl stdenv;
  -  };
  -
  -  libxdg_basedir = import ../development/libraries/libxdg-basedir {
  -    inherit fetchurl stdenv;
  -  };
  -
  -  libxklavier = import ../development/libraries/libxklavier {
  -    inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2 isocodes glib;
  -    inherit (xorg) libX11 libICE libXi libxkbfile;
  -  };
  -
  -  libxmi = import ../development/libraries/libxmi {
  -    inherit fetchurl stdenv libtool;
  -  };
  -
  -  libxml2 = makeOverridable (import ../development/libraries/libxml2) {
  -    inherit fetchurl stdenv zlib python;
  +  libxcrypt = callPackage ../development/libraries/libxcrypt { };
  +
  +  libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
  +
  +  libxklavier = callPackage ../development/libraries/libxklavier { };
  +
  +  libxmi = callPackage ../development/libraries/libxmi { };
  +
  +  libxml2 = callPackage ../development/libraries/libxml2 { 
       pythonSupport = false;
     };
   
  
positive.code:       inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
      };
  
    disnix = import ../tools/package-management/disnix {
      inherit stdenv fetchurl pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable;
    };
  
    disnix_activation_scripts = import ../tools/package-management/disnix/activation-scripts {
      inherit stdenv fetchurl;
    };
  
    DisnixService = import ../tools/package-management/disnix/DisnixService {
      inherit stdenv fetchurl apacheAnt jdk axis2 dbus_java;
    };
  
    latex2html = import ../misc/tex/latex2html/default.nix {
      inherit fetchurl stdenv perl ghostscript netpbm;
      tex = tetex;
    };
  
    pgadmin = import ../applications/misc/pgadmin {
      inherit fetchurl stdenv postgresql libxml2 libxslt openssl;
      inherit wxGTK;
    };
  
    pgf = pgf2;
  
    # Keep the old PGF since some documents don't render properly with
    # the new one.
    pgf1 = import ../misc/tex/pgf/1.x.nix {
      inherit fetchurl stdenv;
    };
  
    pgf2 = import ../misc/tex/pgf/2.x.nix {
      inherit fetchurl stdenv;
    };
  
    polytable = import ../misc/tex/polytable {
      inherit fetchurl stdenv tetex lazylist;
    };
  
    psi = (import ../applications/networking/instant-messengers/psi) {
      inherit stdenv fetchurl zlib aspell sox pkgconfig qt4
      	liboil speex gst_all;
      inherit (xlibs) xproto libX11 libSM libICE;
      qca2 = kde4.qca2;
      qca2_ossl = kde4.qca2_ossl;
    };
  
    putty = import ../applications/networking/remote/putty {
      inherit stdenv fetchsvn ncurses pkgconfig autoconf automake perl halibut;
      inherit (gtkLibs) gtk;
    };
  
    rssglx = import ../misc/screensavers/rss-glx {
      inherit fetchurl stdenv x11 mesa pkgconfig imagemagick libtiff bzip2;
    };
  
    xlockmore = import ../misc/screensavers/xlockmore {
      inherit fetchurl stdenv x11 freetype;
      pam = if getPkgConfig "xlockmore" "pam" true then pam else null;
    };
  
    saneBackends = import ../misc/sane-backends {
      inherit fetchurl stdenv libusb;
      gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
    };
  
    saneFrontends = import ../misc/sane-front {
      inherit fetchurl stdenv pkgconfig libusb saneBackends;
      inherit (gtkLibs) gtk;
      inherit (xlibs) libX11;
    };
  
    sourceAndTags = import ../misc/source-and-tags {
  
negative.code:     inherit xmpppy python makeWrapper fetchcvs;
    };
  
    radius = callPackage ../servers/radius { };
  
    redstore = callPackage ../servers/http/redstore { };
  
    samba = callPackage ../servers/samba { };
  
    shishi = callPackage ../servers/shishi { };
  
    squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
      inherit fetchurl stdenv perl lib composableDerivation;
    });
    squid = squids.squid3Beta; # has ipv6 support
  
    tomcat5 = callPackage ../servers/http/tomcat { };
  
    tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
  
    tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
  
    axis2 = callPackage ../servers/http/tomcat/axis2 { };
  
    virtuoso = callPackage ../servers/sql/virtuoso { };
  
    vsftpd = callPackage ../servers/ftp/vsftpd { };
  
    xinetd = callPackage ../servers/xinetd { };
  
    xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
      inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
  