* Removed selectVersion. There's no good reason to write

  `selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403

73 files changed, 375 insertions, 551 deletions

diff --git a/pkgs/applications/misc/qgis/1.0.1-2.nix b/pkgs/applications/misc/qgis/1.0.1-2.nix
index 142e3b65013..af28a381fba 100644
--- a/pkgs/applications/misc/qgis/1.0.1-2.nix
+++ b/pkgs/applications/misc/qgis/1.0.1-2.nix
@@ -12,12 +12,12 @@ composableDerivation.composableDerivation {} {
                   "-DWITH_INTERNAL_SQLITE3=TRUE"
                 ];
 
-  name = "qgis-${version}";
+  name = "qgis-1.0.1-2";
 
   # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
   #                md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
   src = fetchurl {
-    url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz";
+    url = "http://download.osgeo.org/qgis/src/qgis_1.0.1-2.tar.gz";
     sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 257d3d09f71..0428ccdc7f3 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -39,7 +39,7 @@ rec {
     ++ (lib.optional externalPurple2 "postInstall")
   ;
       
-  name = "carrier-" + version;
+  name = "carrier-2.5.0";
   meta = {
     description = "Carrier - PidginIM GUI fork with user-friendly development model";
     homepage = http://funpidgin.sf.net; 
diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 110189598f6..0db1af883cb 100644
--- a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,19 +1,24 @@
-args : with args;
+{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }:
+
 stdenv.mkDerivation rec {
+  name = "psi-0.12.1";
+  
   src = fetchurl {
-    url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2;
+    url = "mirror://sourceforge/psi/${name}.tar.bz2";
     sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8";
   };
 
   buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+  
   NIX_LDFLAGS="-lqca";
 
-  configureFlags = [ " --with-zlib-inc=${zlib}/include "
-    " --disable-bundled-qca" ];
+  configureFlags =
+    [ " --with-zlib-inc=${zlib}/include "
+      " --disable-bundled-qca"
+    ];
 
-  name = "psi-" + version;
   meta = {
     description = "Psi, an XMPP (Jabber) client";
   };
diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix
index 57552bac2fc..d72f753a26e 100644
--- a/pkgs/applications/version-management/codeville/0.8.0.nix
+++ b/pkgs/applications/version-management/codeville/0.8.0.nix
@@ -16,7 +16,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
       
-  name = "codeville-" + version;
+  name = "codeville-0.8.0";
   meta = {
     description = "Codeville - RCS with powerful merge.";
   };
diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
index 6693795edd9..eb5228e09fd 100644
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
@@ -20,7 +20,7 @@ rec {
     autoconf -I .
   '') ["minInit" "addInputs" "doUnpack"];
       
-  name = "monotone-viz-" + version;
+  name = "monotone-viz-mtn-head";
   meta = {
     description = "Monotone commit tree visualizer";
     maintainers = [args.lib.maintainers.raskin];
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
index 08351ffa91d..169bd407b7d 100644
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -38,7 +38,7 @@ rec {
     ln -s $fullOut/static $out/share/viewmtn/
   '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
 
-  name = "viewmtn-" + version;
+  name = "viewmtn-0.10";
   meta = {
     description = "Monotone web interface";
   };
diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
index 0d5e94ded95..748f67c7448 100644
--- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
+++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
@@ -13,11 +13,11 @@ args : with args;
 let 
 doCopy = fullDepEntry ("
   ensureDir \$out/share/qemu-images
-  cp linux-${version}.img  \$out/share/qemu-images/
+  cp linux-0.2.img \$out/share/qemu-images/
 ") [minInit doUnpack defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "QEmu-Linux-Image-"+version;
+	name = "QEmu-Linux-Image-0.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doCopy doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix
index 6d2b9ffb812..69296a45c24 100644
--- a/pkgs/data/fonts/clearlyU/1.9.nix
+++ b/pkgs/data/fonts/clearlyU/1.9.nix
@@ -18,7 +18,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "clearlyU-12-"+version;
+	name = "clearlyU-12-1.9";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix
index 1a8497bebb7..f991a387976 100644
--- a/pkgs/data/fonts/junicode/0.6.15.nix
+++ b/pkgs/data/fonts/junicode/0.6.15.nix
@@ -16,7 +16,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "junicode-"+version;
+	name = "junicode-0.6.15";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
diff --git a/pkgs/data/fonts/libertine/2.7.bin.nix b/pkgs/data/fonts/libertine/2.7.bin.nix
index c88659e4371..b4e8bb9b6d1 100644
--- a/pkgs/data/fonts/libertine/2.7.bin.nix
+++ b/pkgs/data/fonts/libertine/2.7.bin.nix
@@ -8,7 +8,7 @@ rec{
   buildInputs = [];
   phaseNames = ["doUnpack" "installFonts"];
 
-  name = "linux-libertine-" + version;
+  name = "linux-libertine-2.7";
   meta = {
     description = "Linux Libertine Fonts";
     homepage = http://linuxlibertine.sf.net;
diff --git a/pkgs/data/fonts/libertine/2.7.nix b/pkgs/data/fonts/libertine/2.7.nix
index 546a4bdacec..a5c212aff86 100644
--- a/pkgs/data/fonts/libertine/2.7.nix
+++ b/pkgs/data/fonts/libertine/2.7.nix
@@ -15,7 +15,7 @@ rec {
     ScaleToEm(1000);
   '';
 
-  name = "linux-libertine-" + version;
+  name = "linux-libertine-2.7";
   meta = {
     description = "Linux Libertine Fonts";
     homepage = http://linuxlibertine.sf.net;
diff --git a/pkgs/data/fonts/lmodern/0.92.nix b/pkgs/data/fonts/lmodern/0.92.nix
deleted file mode 100644
index 556b9f99876..00000000000
--- a/pkgs/data/fonts/lmodern/0.92.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_0.92.orig.tar.gz;
-    sha256 = "0ak3n7fsi2va94gsn0pfmyby2b4g7wz9h5a0prpbx24ax1xwinls";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
-    ensureDir $out/share/texmf/fonts/enc 
-    ensureDir $out/share/texmf/fonts/map 
-    ensureDir $out/share/texmf/fonts/type1/public/lm 
-    ensureDir $out/share/texmf/dvips/lm 
-    ensureDir $out/share/texmf/dvipdfm/config
-
-    cp -r ./* $out/share/texmf/
-
-    cp dvips/lm/*.enc $out/share/texmf/fonts/enc
-    cp dvips/lm/*.map $out/share/texmf/fonts/map
-    cp dvips/lm/*.map $out/share/texmf/dvipdfm/config
-  '') ["minInit" "defEnsureDir" "doUnpack"];
-
-  name = "lmodern-" + version;
-  meta = {
-    description = "Latin Modern font";
-  };
-}
diff --git a/pkgs/data/fonts/lmodern/1.010.nix b/pkgs/data/fonts/lmodern/default.nix
index 6948fa4cbbe..c95b409ed8e 100644
--- a/pkgs/data/fonts/lmodern/1.010.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -1,25 +1,21 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "lmodern-1.010x";
+  
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_1.010x.orig.tar.gz;
     sha256 = "0nwxj1ng7rvnp16jxcs25hbc5in65mdk4a3g3rlaq91i5qpq7mxj";
   };
 
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
+  installPhase = ''
     ensureDir $out/share/texmf/
     ensureDir $out/share/fonts/
 
     cp -r ./* $out/share/texmf/
     cp -r fonts/{opentype,type1} $out/share/fonts/
-  '') ["minInit" "defEnsureDir" "doUnpack"];
+  '';
 
-  name = "lmodern-" + version;
   meta = {
     description = "Latin Modern font";
   };
diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
index edf9f8c40ff..4b6120ad108 100644
--- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
+++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
@@ -15,7 +15,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "wqy-zenhei-"+version;
+	name = "wqy-zenhei-0.4.23-1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
diff --git a/pkgs/development/compilers/ikarus/0.0.3.nix b/pkgs/development/compilers/ikarus/0.0.3.nix
deleted file mode 100644
index 1976df7b742..00000000000
--- a/pkgs/development/compilers/ikarus/0.0.3.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.cs.indiana.edu/~aghuloum/ikarus/ikarus-0.0.3.tar.gz;
-    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
-  };
-
-  buildInputs = [gmp];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ikarus-" + version;
-  meta = {
-    description = "Ikarus - a Scheme compiler, aiming at R6RS";
-    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
-    license = "GPL3";
-  };
-}
diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix
new file mode 100644
index 00000000000..7e14d13b7df
--- /dev/null
+++ b/pkgs/development/compilers/ikarus/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, gmp }:
+        
+stdenv.mkDerivation rec {
+  name = "ikarus-0.0.3";
+  
+  src = fetchurl {
+    url = "http://www.cs.indiana.edu/~aghuloum/ikarus/${name}.tar.gz";
+    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
+  };
+
+  buildInputs = [ gmp ];
+      
+  meta = {
+    description = "Ikarus - a Scheme compiler, aiming at R6RS";
+    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix
index 8b218d499c5..8f094f9965a 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/9.1.nix
@@ -27,7 +27,7 @@ let
 	") [ addInputs minInit doUnpack defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "Qi-"+version;
+	name = "Qi-9.1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/development/compilers/swi-prolog/5.6.51.nix b/pkgs/development/compilers/swi-prolog/5.6.51.nix
deleted file mode 100644
index cd640e5f26b..00000000000
--- a/pkgs/development/compilers/swi-prolog/5.6.51.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-args: import ./default.nix {
-  args = args;
-  sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
-}
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 23682db364f..da61adb2299 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,16 +1,16 @@
-{args, sha256}: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "swi-prolog-${version}";
+  name = "swi-prolog-5.6.51";
 
   src = fetchurl {
-    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${version}.tar.gz";
-    inherit sha256;
+    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.51.tar.gz";
+    sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
   };
 
   meta = {
     homepage = http://www.swi-prolog.org/;
-    description = "A Prolog compiler and interpreter.";
+    description = "A Prolog compiler and interpreter";
     license = "LGPL";
   };
 }
diff --git a/pkgs/development/libraries/enchant/1.3.0.nix b/pkgs/development/libraries/enchant/default.nix
index 0e3f92881e9..388d042d3ac 100644
--- a/pkgs/development/libraries/enchant/1.3.0.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -1,10 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, aspell, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "enchant-" + version;
+  name = "enchant-1.3.0";
   
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz";
+    url = "http://www.abisource.com/downloads/enchant/1.3.0/${name}.tar.gz";
     sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
   };
   
diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
index add438d07f1..bb146a5cddf 100644
--- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
+++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
@@ -29,7 +29,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libdbi-"+version;
+	name = "libdbi-0.8.2-1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix
index dd0f2ec1c5f..b908c76fa78 100644
--- a/pkgs/development/libraries/libdbi/0.8.2.nix
+++ b/pkgs/development/libraries/libdbi/0.8.2.nix
@@ -11,7 +11,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libdbi-"+version;
+	name = "libdbi-0.8.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix
index ed56e5ce4fe..557369bd76c 100644
--- a/pkgs/development/libraries/libextractor/0.5.18.nix
+++ b/pkgs/development/libraries/libextractor/0.5.18.nix
@@ -11,7 +11,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libextractor-"+version;
+	name = "libextractor-0.5.18";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/development/libraries/libjingle/0.3.11.nix b/pkgs/development/libraries/libjingle/0.3.11.nix
index b9d0b82df5e..3fa8c99c430 100644
--- a/pkgs/development/libraries/libjingle/0.3.11.nix
+++ b/pkgs/development/libraries/libjingle/0.3.11.nix
@@ -1,10 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, mediastreamer }:
+
 stdenv.mkDerivation rec {
-	name = "libjingle-" + version;
-	src = fetchurl {
-		url = "mirror://sf/tapioca-voip/${name}.tar.gz";
-		sha256 = "1x5l2jwxpkyxvnq0cagq40p6x61v23vxngnnsxr15lyh1zwzk1yj";
-	};
+  name = "libjingle-0.3.11";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/tapioca-voip/${name}.tar.gz";
+    sha256 = "1x5l2jwxpkyxvnq0cagq40p6x61v23vxngnnsxr15lyh1zwzk1yj";
+  };
 
   propagatedBuildInputs = [ mediastreamer ];
 }
diff --git a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
index 0d2cefee200..2b4a6a35f83 100644
--- a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
+++ b/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake, libtool
+, pkgconfig, alsaLib, ffmpeg, speex, ortp }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer2-" + version;
+  name = "mediastreamer2-2.2.0-cvs20080207";
 
 # This url is not related to mediastreamer. fetchcvs doesn't work on my laptop,
 # so I've created cvs snapshot and put it to my server.
diff --git a/pkgs/development/libraries/msilbc/2.0.0.nix b/pkgs/development/libraries/msilbc/default.nix
index 8bc8f2a6c1d..2978f0808c1 100644
--- a/pkgs/development/libraries/msilbc/2.0.0.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -1,6 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }:
+
 stdenv.mkDerivation rec {
-  name = "msilbc-" + version;
+  name = "msilbc-2.0.0";
+  
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/linphone/plugins/sources/${name}.tar.gz";
     sha256 = "0ifydb7qmpync56l4hbrp36n5wrb7gadb76isp643s6wsg7l743j";
@@ -9,6 +11,7 @@ stdenv.mkDerivation rec {
   patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c";
 
   propagatedBuildInputs = [ilbc mediastreamer];
+  
   buildInputs = [pkgconfig];
 
   buildPhase = ''
@@ -17,8 +20,8 @@ stdenv.mkDerivation rec {
     cc `pkg-config --libs mediastreamer` -shared -pthread -o libilbc.so
   '';
 
-  installPhase = "
-    ensureDir \${out}/lib/mediastreamer/plugins
-    cp libilbc.so \${out}/lib/mediastreamer/plugins
-  ";
+  installPhase = ''
+    ensureDir $out/lib/mediastreamer/plugins
+    cp libilbc.so $out/lib/mediastreamer/plugins
+  '';
 }
diff --git a/pkgs/development/libraries/redland/1.0.9.nix b/pkgs/development/libraries/redland/1.0.9.nix
index 93606ad0eb5..dd67ae60f1d 100644
--- a/pkgs/development/libraries/redland/1.0.9.nix
+++ b/pkgs/development/libraries/redland/1.0.9.nix
@@ -1,10 +1,7 @@
 args: with args;
 
-let name = "redland-${version}";
-in
-
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "redland-1.0.9";  
 
   src = fetchurl {
     url = "mirror://sf/librdf/${name}.tar.gz";
diff --git a/pkgs/development/libraries/tk/8.4.16.nix b/pkgs/development/libraries/tk/8.4.16.nix
deleted file mode 100644
index 38b7ec85749..00000000000
--- a/pkgs/development/libraries/tk/8.4.16.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "tk-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
-    sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
-  };
-  postInstall = ''
-    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${builtins.substring 0 3 version}) ) "$@"' >$out/bin/wish
-    chmod a+x $out/bin/wish
-  ''; 
-  configureFlags="--with-tcl=${tcl}/lib";
-  preConfigure = "cd unix";
-
-  buildInputs = [tcl x11];
-  inherit tcl;
-}
diff --git a/pkgs/development/libraries/tk/8.4.18.nix b/pkgs/development/libraries/tk/8.4.18.nix
deleted file mode 100644
index f09303ade45..00000000000
--- a/pkgs/development/libraries/tk/8.4.18.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "tk-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
-    sha256 = "065cbs82a8nklmj4867744skb3l3mqv14s8jwribk2wazzdb0mqp";
-  };
-  postInstall = ''
-    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish
-    chmod a+x $out/bin/wish
-  '';
-  configureFlags="--with-tcl=${tcl}/lib";
-  preConfigure = "cd unix";
-
-  buildInputs = [tcl x11];
-  inherit tcl;
-}
diff --git a/pkgs/development/libraries/tk/8.5.7.nix b/pkgs/development/libraries/tk/8.5.7.nix
index 56a757c8c7c..bf6da7b6598 100644
--- a/pkgs/development/libraries/tk/8.5.7.nix
+++ b/pkgs/development/libraries/tk/8.5.7.nix
@@ -1,17 +1,22 @@
-args: with args;
+{ stdenv, fetchurl, tcl, x11 }:
 
 stdenv.mkDerivation {
-  name = "tk-${version}";
+  name = "tk-8.5.7";
+  
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
+    url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz";
     sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr";
   };
+  
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
   '';
-  configureFlags="--with-tcl=${tcl}/lib";
+  
+  configureFlags = "--with-tcl=${tcl}/lib";
+  
   preConfigure = "cd unix";
 
   buildInputs = [tcl x11];
+  
   inherit tcl;
 }
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.14.nix b/pkgs/development/libraries/xapian/bindings/1.0.14.nix
index 9761c683447..28eacd4e4e4 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.14.nix
+++ b/pkgs/development/libraries/xapian/bindings/1.0.14.nix
@@ -3,7 +3,7 @@ args: with args;
 let inherit (args.composableDerivation) composableDerivation wwf; in
 composableDerivation {} {
 
-    name = "xapian-bindings-${version}";
+    name = "xapian-bindings-1.0.14";
 
     src = fetchurl {
       url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
diff --git a/pkgs/development/libraries/xapian/1.0.14.nix b/pkgs/development/libraries/xapian/default.nix
index b4ce74640ea..6b2966ee7e2 100644
--- a/pkgs/development/libraries/xapian/1.0.14.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, zlib }:
+
 stdenv.mkDerivation {
-  name = "xapian-${version}";
+  name = "xapian-1.0.14";
 
   src = fetchurl {
     url = http://oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz;
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [zlib];
 
   meta = { 
-      description = "Xapian Probabilistic Information Retrieval library";
-      homepage = "http://xapian.org";
-      license = "GPLv2";
+    description = "Xapian Probabilistic Information Retrieval library";
+    homepage = "http://xapian.org";
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix
new file mode 100644
index 00000000000..be9fd84d1fd
--- /dev/null
+++ b/pkgs/development/python-modules/flup/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, python, setuptools }:
+
+stdenv.mkDerivation rec {
+  name = "flup-r2311";
+
+  src = fetchurl {
+    url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
+    sha256 = "15wyn6d6wla1ag91yxmlh9b4m0w1i0c2lm8ka4qfv4ijqcqakdx3";
+  };
+
+  buildInputs = [ python setuptools ];
+
+  meta = {
+    description = "FastCGI Python module set";
+  };
+}
diff --git a/pkgs/development/python-modules/flup/r2311.nix b/pkgs/development/python-modules/flup/r2311.nix
deleted file mode 100644
index 1334a7e7539..00000000000
--- a/pkgs/development/python-modules/flup/r2311.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.saddi.com/software/flup/dist/flup-r2311.tar.gz;
-    sha256 = "15wyn6d6wla1ag91yxmlh9b4m0w1i0c2lm8ka4qfv4ijqcqakdx3";
-  };
-
-  buildInputs = [python setuptools];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["addInputs" "createPythonInstallationTarget" (doDump "0") "installPythonPackage"];
-      
-  name = "flup-" + version;
-  meta = {
-    description = "FastCGI Python module set";
-  };
-}
diff --git a/pkgs/development/python-modules/pyqt/4.3.3.nix b/pkgs/development/python-modules/pyqt/4.3.3.nix
index 23bed9c9c0a..370366ba0e0 100644
--- a/pkgs/development/python-modules/pyqt/4.3.3.nix
+++ b/pkgs/development/python-modules/pyqt/4.3.3.nix
@@ -1,4 +1,5 @@
-args : with args; 
+args : with args;
+
 rec {
   src = fetchurl {
     url = mirror://debian/pool/main/p/python-qt4/python-qt4_4.3.3.orig.tar.gz;
@@ -12,7 +13,7 @@ rec {
   phaseNames = ["doPythonConfigure" "doMakeInstall"];
   extraPythonConfigureCommand = ''echo yes | \'';
 
-  name = "python-qt-" + version;
+  name = "python-qt-4.3.3";
   meta = {
     description = "Qt bindings for Python";
     license = "GPL";
diff --git a/pkgs/development/python-modules/python-sip/4.7.4.nix b/pkgs/development/python-modules/python-sip/4.7.4.nix
index bc4437a2795..759246ebf0d 100644
--- a/pkgs/development/python-modules/python-sip/4.7.4.nix
+++ b/pkgs/development/python-modules/python-sip/4.7.4.nix
@@ -11,7 +11,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doPythonConfigure" "doMakeInstall"];
       
-  name = "python-sip-" + version;
+  name = "python-sip-4.7.4";
   meta = {
     description = "Python/C++ bindings generator";
   };
diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix
index 8100972d6ea..44d869c107e 100644
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -34,7 +34,7 @@ rec {
     cd ..
   '') ["minInit" "doMake" "defEnsureDir" "addInputs"];
       
-  name = "xxdiff-" + version;
+  name = "xxdiff-3.2";
   meta = {
     description = "Interactive merge tool";
   };
diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
index 578e233cbd7..2b32020d8e9 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/0.2.2.nix
@@ -20,7 +20,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "construo-"+version;
+	name = "construo-0.2.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix
index a8cd48d99e6..84a699d1a14 100644
--- a/pkgs/games/orbit/1.01.nix
+++ b/pkgs/games/orbit/1.01.nix
@@ -30,7 +30,7 @@ EOF
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "space-orbit-"+version;
+	name = "space-orbit-1.01";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[ customBuild doForceShare doPropagate]);
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix
index c2d39072750..780e19757b2 100644
--- a/pkgs/os-specific/linux/atheros/0.9.4.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.4.nix
@@ -17,7 +17,7 @@ postInstall = fullDepEntry (''
 '') [minInit doMakeInstall];
 in
 stdenv.mkDerivation rec {
-	name = "atheros-"+version;
+	name = "atheros-0.9.4";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doMakeInstall 
 			postInstall doForceShare doPropagate]);
diff --git a/pkgs/os-specific/linux/jfsrec/default.nix b/pkgs/os-specific/linux/jfsrec/default.nix
new file mode 100644
index 00000000000..a805e86f0dd
--- /dev/null
+++ b/pkgs/os-specific/linux/jfsrec/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, boost }:
+
+stdenv.mkDerivation {
+  name = "jfsrec-pre-svn-7";
+  
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz;
+    sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
+  };
+
+  buildInputs = [ boost ];
+
+  preConfigure =
+    ''
+      sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
+      cat src/unicode_to_utf8.cpp
+    '';
+
+  meta = {
+    description = "JFS recovery tool";
+  };
+}
diff --git a/pkgs/os-specific/linux/jfsrec/svn-7.nix b/pkgs/os-specific/linux/jfsrec/svn-7.nix
deleted file mode 100644
index 2516a505848..00000000000
--- a/pkgs/os-specific/linux/jfsrec/svn-7.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz;
-    sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
-  };
-
-  buildInputs = [boost];
-  configureFlags = [];
-
-  doFixInc = fullDepEntry (''
-    sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
-    cat src/unicode_to_utf8.cpp
-  '') ["minInit" "doUnpack"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doFixInc" "doConfigure" "doMakeInstall"];
-      
-  name = "jfsrec-" + version;
-  meta = {
-    description = "JFS recovery tool";
-  };
-}
diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
index 75d7483e33b..ba5cf2e1d0f 100644
--- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
+++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
@@ -1,37 +1,28 @@
-args : with args;
-rec {
-  name = "kqemu-"+version;
+{ stdenv, fetchurl, kernel, perl }:
+
+stdenv.mkDerivation rec {
+  name = "kqemu-1.4.0pre1";
+  
   src = fetchurl {
-    url = http://www.nongnu.org/qemu/kqemu-1.4.0pre1.tar.gz;
+    url = "http://www.nongnu.org/qemu/${name}.tar.gz";
     sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
   };
 
   buildInputs = [perl];
+  
   configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
-  debugStep = fullDepEntry (''
-  	cat config-host.mak
-  '') ["minInit"];
-  preConfigure = fullDepEntry ('' 
+  
+  preConfigure = '' 
+    sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
+
+    sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kern        
     sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
     sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
     sed -e '/depmod/d' -i install.sh
     cat install.sh
-  '') ["minInit" "doUnpack"];
-  fixInc = {
-    text = ''
-      sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
-    '';
-    deps = ["minInit" "doUnpack"];
-  };
-  fixMemFunc = {
-    text=''
-      sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
-    '';
-    deps = ["minInit" "doUnpack"];
-  };
-  phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
-
+  ''; # */
+  
   meta = {
-    description = " Kernel module for Qemu acceleration ";
+    description = "Kernel module for Qemu acceleration";
   }; 
 }
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix
index 9eb0fe3dff9..de9c4f7eeae 100644
--- a/pkgs/servers/dict/1.9.15.nix
+++ b/pkgs/servers/dict/1.9.15.nix
@@ -11,7 +11,7 @@ args : with args; with builderDefs;
         }) // args);
         in with localDefs;
 stdenv.mkDerivation rec {
-        name = "dict-"+version;
+        name = "dict-1.9.15";
         builder = writeScript (name + "-builder")
                 (textClosure localDefs 
                         [doConfigure doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/servers/dns/bind/9.5.0.nix b/pkgs/servers/dns/bind/9.5.0.nix
index 9e73895d8d9..b6361864d10 100644
--- a/pkgs/servers/dns/bind/9.5.0.nix
+++ b/pkgs/servers/dns/bind/9.5.0.nix
@@ -12,7 +12,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" "doMakeInstall"];
       
-  name = "bind-" + version;
+  name = "bind-9.5.0";
   meta = {
     description = "ISC BIND: a domain name server";
   };
diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix
deleted file mode 100644
index 6e9e6e64d51..00000000000
--- a/pkgs/servers/gpm/1.20.6.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://linux.schottelius.org/gpm/archives/gpm-1.20.6.tar.lzma;
-    sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7";
-  };
-
-  buildInputs = [lzma flex bison ncurses];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-
-  preConfigure = fullDepEntry (''
-    sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
-  '') ["addInputs" "doUnpack" "minInit"];
-      
-  name = "gpm-" + version;
-  meta = {
-    description = "Mouse daemon";
-  };
-}
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
new file mode 100644
index 00000000000..9b6eb2d648b
--- /dev/null
+++ b/pkgs/servers/gpm/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, lzma, flex, bison, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "gpm-1.20.6";
+  
+  src = fetchurl {
+    url = "http://linux.schottelius.org/gpm/archives/${name}.tar.lzma";
+    sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7";
+  };
+
+  buildInputs = [lzma flex bison ncurses];
+
+  preConfigure =
+    ''
+      sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
+    '';
+      
+  meta = {
+    description = "Mouse daemon";
+  };
+}
diff --git a/pkgs/shells/zsh/4.3.4.nix b/pkgs/shells/zsh/4.3.4.nix
deleted file mode 100644
index ea9a82cf683..00000000000
--- a/pkgs/shells/zsh/4.3.4.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "zsh-4.3.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.4.tar.bz2;
-    sha256 = "1inypy60h7hir8hwidid85pbajrb5w09fl222p0h4fnsn0nf583g";
-  };
-
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/4.3.5.nix b/pkgs/shells/zsh/4.3.5.nix
deleted file mode 100644
index c626db49107..00000000000
--- a/pkgs/shells/zsh/4.3.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-let documentation = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5-doc.tar.bz2;
-    sha256 = "0jf35xibp8wfka7rdk9q8spkwprlhjx1sp7vp6img8wks12cvlkx";
-  };
-in
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5.tar.bz2;
-    sha256 = "0191j3liflkjrj39i2yrs3ab9jcx4zd93rirx3j17dymfgqlvrzb";
-  };
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  postInstall = ''
-    ensureDir $out/share/
-    tar xf ${documentation} -C $out/share
-  '';
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/cvs.nix b/pkgs/shells/zsh/cvs.nix
deleted file mode 100644
index db34f0666d5..00000000000
--- a/pkgs/shells/zsh/cvs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-args: with args;
-# cvs does include docs
-# the cvs snapshot is updated occasionally. see bleedingEdgeRepos
-
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = sourceByName "zsh";
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  preConfigure = "autoconf; autoheader";
-
-  postInstall = ''
-    ensureDir $out/share/
-    cp -R Doc $out/share
-  '';
-
-  buildInputs = [ncurses coreutils autoconf yodl ];
-}
diff --git a/pkgs/shells/zsh/4.3.9.nix b/pkgs/shells/zsh/default.nix
index 6a1d0d14dee..eacda19a8de 100644
--- a/pkgs/shells/zsh/4.3.9.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,9 +1,16 @@
-args: with args;
-let documentation = fetchurl {
+{ stdenv, fetchurl, ncurses, coreutils }:
+
+let
+
+  version = "4.3.9";
+
+  documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
     sha256 = "0rc19q5r8x2yln7synpqzxngm7g4g6idrpgc1i0jsawc48m7dbhm";
   };
+  
 in
+
 stdenv.mkDerivation {
   name = "zsh-${version}";
 
@@ -11,6 +18,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
     sha256 = "1aw28c5w83vl2ckbvf6ljj00s36icyrnxcm1r6q63863dmn6vpcg";
   };
+  
   configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
 
   postInstall = ''
diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix
index f37a98a43d4..b8587ed223f 100644
--- a/pkgs/tools/X11/x11vnc/0.9.3.nix
+++ b/pkgs/tools/X11/x11vnc/0.9.3.nix
@@ -14,7 +14,7 @@ args : with args; with builderDefs;
   });
   in with localDefs;
 stdenv.mkDerivation rec {
-  name = "x11vnc-"+version;
+  name = "x11vnc-0.9.3";
   builder = writeScript (name + "-builder")
     (textClosure localDefs 
       [doConfigure doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix
index 9c7e024551d..c65105e4796 100644
--- a/pkgs/tools/X11/x2vnc/1.7.2.nix
+++ b/pkgs/tools/X11/x2vnc/1.7.2.nix
@@ -15,7 +15,7 @@ args : with args; with builderDefs.passthru.function {src="";};
 	}) // args); /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "x2vnc-"+version;
+	name = "x2vnc-1.7.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/archivers/sharutils/4.6.3.nix b/pkgs/tools/archivers/sharutils/4.6.3.nix
index 830c2a072b6..cd70550117a 100644
--- a/pkgs/tools/archivers/sharutils/4.6.3.nix
+++ b/pkgs/tools/archivers/sharutils/4.6.3.nix
@@ -1,9 +1,10 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
-  name = "sharutils-" + version;
+  name = "sharutils-4.6.3";
 
   src = fetchurl {
-    url = "mirror://gnu/sharutils/REL-${version}/${name}.tar.bz2";
+    url = "mirror://gnu/sharutils/REL-4.6.3/${name}.tar.bz2";
     sha256 = "1sirrzas8llcsd8gnh56pns39wa1f803vff1kmy5islfi1p9vqk8";
   };
 
diff --git a/pkgs/tools/misc/mdbtools/0.6-pre1.nix b/pkgs/tools/misc/mdbtools/default.nix
index 9478ef1286b..9b1968c6fd1 100644
--- a/pkgs/tools/misc/mdbtools/0.6-pre1.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -1,21 +1,19 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "mdbtools-0.6pre1";
+
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
     sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
   };
 
   buildInputs = [glib readline bison flex pkgconfig];
-  configureFlags = [];
 
-  preConfigure = fullDepEntry (''
+  preConfigure = ''
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
-  '') ["doUnpack" "minInit"];
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
-  name = "mdbtools-" + version;
   meta = {
     description = ".mdb (MS Access) format tools";
   };
diff --git a/pkgs/tools/misc/minicom/2.3.nix b/pkgs/tools/misc/minicom/2.3.nix
deleted file mode 100644
index 9be249231c3..00000000000
--- a/pkgs/tools/misc/minicom/2.3.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz;
-    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
-  };
-
-  buildInputs = [ncurses];
-  configureFlags = [ "--sysconfdir=/etc" ];
-
-  /* doConfigure should be specified separately */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
-      
-  name = "minicom-" + version;
-  meta = {
-    description = "Serial console";
-  };
-}
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
new file mode 100644
index 00000000000..2cd383bd698
--- /dev/null
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "minicom-2.3";
+  
+  src = fetchurl {
+    url = "http://alioth.debian.org/frs/download.php/2332/${name}.tar.gz";
+    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
+  };
+
+  buildInputs = [ncurses];
+  
+  configureFlags = [ "--sysconfdir=/etc" ];
+
+  meta = {
+    description = "Serial console";
+  };
+}
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
index 640e46d54f1..178aa700fa5 100644
--- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -43,7 +43,7 @@ args : with args;
 assert args.libuuid != null;
         
 stdenv.mkDerivation rec {
-	name = "relfs-"+version;
+	name = "relfs-2008.03.05";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix
index 1bd45375510..1b9bbb995ac 100644
--- a/pkgs/tools/misc/rlwrap/0.28.nix
+++ b/pkgs/tools/misc/rlwrap/0.28.nix
@@ -11,7 +11,7 @@ args : with args; with builderDefs;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "rlwrap-"+version;
+	name = "rlwrap-0.28";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/misc/uucp/1.07.nix b/pkgs/tools/misc/uucp/default.nix
index 7ac48f39664..b0741311dff 100644
--- a/pkgs/tools/misc/uucp/1.07.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -1,17 +1,13 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "uucp-1.07";
+
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz;
     sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
   };
 
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "uucp-" + version;
   meta = {
     description = "Unix-unix cp over serial line, also includes cu program";
   };
diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix
index b6155c7a053..5cba3ae017c 100644
--- a/pkgs/tools/networking/nc6/1.0.nix
+++ b/pkgs/tools/networking/nc6/1.0.nix
@@ -11,7 +11,7 @@ let localDefs = builderDefs.passthru.function (rec {
     });
 in with localDefs;
 stdenv.mkDerivation rec {
-  name = "nc6-"+version;
+  name = "nc6-1.0";
   builder = writeScript (name + "-builder")
     (textClosure localDefs 
      [doConfigure doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
index dbd6bfc2c8c..4b656b70388 100644
--- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
+++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
@@ -17,7 +17,7 @@ args : with args; with builderDefs;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "smbfs-fuse-"+version;
+	name = "smbfs-fuse-0.8.7";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/networking/socat/1.6.0.1.nix b/pkgs/tools/networking/socat/1.6.0.1.nix
deleted file mode 100644
index 8840d134773..00000000000
--- a/pkgs/tools/networking/socat/1.6.0.1.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-args : with args; 
-rec {
-  src = /* Here a fetchurl expression goes */
-  fetchurl {
-    url = http://www.dest-unreach.org/socat/download/socat-1.6.0.1.tar.bz2;
-    sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
-  };
-
-  buildInputs = [openssl];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-      
-  name = "socat-" + version;
-  meta = {
-    description = "Socat - a different replacement for netcat";
-    longDesc = "
-        Socat, one more analogue of netcat, but not mimicking it.
-	'netcat++' (extended design, new implementation)
-";
-        homepage = "http://www.dest-unreach.org/socat/";
-	srcs = patches;
-  };
-}
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
new file mode 100644
index 00000000000..7669a9b2d32
--- /dev/null
+++ b/pkgs/tools/networking/socat/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "socat-1.6.0.1";
+  
+  src = fetchurl {
+    url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
+    sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
+  };
+
+  buildInputs = [openssl];
+      
+  meta = {
+    description = "Socat - a different replacement for netcat";
+    homepage = "http://www.dest-unreach.org/socat/";
+  };
+}
diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix
index db4dcf3a835..94bc009080d 100644
--- a/pkgs/tools/security/metasploit/3.1.nix
+++ b/pkgs/tools/security/metasploit/3.1.nix
@@ -22,7 +22,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
       
-  name = "metasploit-framework" + version;
+  name = "metasploit-framework-3.1";
   meta = {
     description = "Metasploit Framework - a collection of exploits";
     homepage = "http://framework.metasploit.org/";
diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix
index 9b460d0226c..15288361baf 100644
--- a/pkgs/tools/security/ssss/0.5.nix
+++ b/pkgs/tools/security/ssss/0.5.nix
@@ -18,7 +18,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "ssss-"+version;
+	name = "ssss-0.5";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			["doPatch" doMakeInstall doForceShare doPropagate]);
diff --git a/pkgs/tools/system/ddrescue/1.8.nix b/pkgs/tools/system/ddrescue/1.8.nix
deleted file mode 100644
index 01d1927573b..00000000000
--- a/pkgs/tools/system/ddrescue/1.8.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.8.tar.bz2;
-    sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ddrescue-" + version;
-  meta = {
-    description = "GNU ddrescue - advanced dd for corrupted media";
-  };
-}
-  
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
new file mode 100644
index 00000000000..4ab848ad6e9
--- /dev/null
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ddrescue-1.8";
+  
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/ddrescue/${name}.tar.bz2";
+    sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
+  };
+
+  meta = {
+    description = "GNU ddrescue - advanced dd for corrupted media";
+  };
+}
+  
diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix
index 982d5651f65..73d3ff92323 100644
--- a/pkgs/tools/system/gdmap/0.8.1.nix
+++ b/pkgs/tools/system/gdmap/0.8.1.nix
@@ -11,7 +11,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "gdmap-"+version;
+	name = "gdmap-0.8.1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix
index 117e0f88a8b..c20f5db9798 100644
--- a/pkgs/tools/text/cheetah-template/2.0.1.nix
+++ b/pkgs/tools/text/cheetah-template/2.0.1.nix
@@ -11,7 +11,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
       
-  name = "cheetah-template-" + version;
+  name = "cheetah-template-2.0.1";
   meta = {
     description = "Templating engine";
   };
diff --git a/pkgs/tools/text/highlight/2.6.10.nix b/pkgs/tools/text/highlight/2.6.10.nix
deleted file mode 100644
index 675a996445f..00000000000
--- a/pkgs/tools/text/highlight/2.6.10.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.andre-simon.de/zip/highlight-2.6.10.tar.bz2;
-    sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
-  };
-
-  buildInputs = [getopt];
-  configureFlags = [];
-  makeFlags = ["PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doMakeInstall"];
-      
-  name = "highlight-" + version;
-  meta = {
-    description = "Source code highlighting tool";
-  };
-}
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
new file mode 100644
index 00000000000..dc4c0647f41
--- /dev/null
+++ b/pkgs/tools/text/highlight/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, getopt }:
+        
+stdenv.mkDerivation rec {
+  name = "highlight-2.6.10";
+
+  src = fetchurl {
+    url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
+    sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
+  };
+
+  buildInputs = [getopt];
+
+  makeFlags = ["PREFIX=$out"];
+
+  meta = {
+    description = "Source code highlighting tool";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52ac49dc484..0fcf8ee8b4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -174,19 +174,6 @@ let
 
   stringsWithDeps = lib.stringsWithDeps;
 
-  # Call a specific version of a Nix expression, that is,
-  # `selectVersion ./foo {version = "0.1.2"; args...}' evaluates to
-  # `import ./foo/0.1.2.nix args'.
-  selectVersion = dir: defVersion: args:
-    let
-      pVersion =
-        if (args ? version && args.version != "") then
-          args.version
-        else
-          getConfig [ (baseNameOf (toString dir)) "version" ] defVersion;
-    in
-      import (dir + "/${pVersion}.nix") (args // { version = pVersion; });
-
   deepOverride = newArgs: name: x: if builtins.isAttrs x then (
     if x ? deepOverride then (x.deepOverride newArgs) else
     if x ? override then (x.override newArgs) else
@@ -523,7 +510,7 @@ let
     inherit fetchurl stdenv python wxPython26;
   };
 
-  bmrsa = builderDefsPackage (selectVersion ../tools/security/bmrsa "11") {
+  bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
     inherit unzip;
   };
 
@@ -565,7 +552,7 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") {
+  cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) {
     inherit makeWrapper python;
   };
 
@@ -640,7 +627,9 @@ let
     inherit fetchurl buildPerlPackage perl;
   };
 
-  ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {};
+  ddrescue = import ../tools/system/ddrescue {
+    inherit fetchurl stdenv;
+  };
 
   desktop_file_utils = import ../tools/misc/desktop-file-utils {
     inherit stdenv fetchurl pkgconfig glib;
@@ -778,7 +767,7 @@ let
       inherit fetchurl stdenv;
     });
 
-  gdmap = composedArgsAndFun (selectVersion ../tools/system/gdmap "0.8.1") {
+  gdmap = composedArgsAndFun (import ../tools/system/gdmap/0.8.1.nix) {
     inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool
       gettext;
     inherit (gtkLibs) gtk;
@@ -930,8 +919,8 @@ let
     inherit fetchurl stdenv ocaml;
   };
 
-  highlight = builderDefsPackage (selectVersion ../tools/text/highlight "2.6.10") {
-    inherit getopt;
+  highlight = import ../tools/text/highlight {
+    inherit fetchurl stdenv getopt;
   };
 
   host = import ../tools/networking/host {
@@ -1073,8 +1062,8 @@ let
     inherit fetchurl stdenv guile which ed;
   };
 
-  mdbtools = builderDefsPackage (selectVersion ../tools/misc/mdbtools "0.6-pre1") {
-    inherit readline pkgconfig bison glib;
+  mdbtools = import ../tools/misc/mdbtools {
+    inherit fetchurl stdenv readline pkgconfig bison glib;
     flex = flex2535;
   };
 
@@ -1101,7 +1090,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  msf = builderDefsPackage (selectVersion ../tools/security/metasploit "3.1") {
+  msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
     inherit ruby makeWrapper;
   };
 
@@ -1149,7 +1138,7 @@ let
     inherit fetchurl stdenv pkgconfig glib;
   };
 
-  nc6 = composedArgsAndFun (selectVersion ../tools/networking/nc6 "1.0") {
+  nc6 = composedArgsAndFun (import ../tools/networking/nc6/1.0.nix) {
     inherit builderDefs;
   };
 
@@ -1372,7 +1361,7 @@ let
     inherit stdenv fetchurl;
   };
 
-  relfs = composedArgsAndFun (selectVersion ../tools/misc/relfs "cvs.2008.03.05") {
+  relfs = composedArgsAndFun (import ../tools/misc/relfs/cvs.2008.03.05.nix) {
     inherit fetchcvs stdenv ocaml postgresql fuse pcre
       builderDefs pkgconfig libuuid;
     inherit (gnome) gnomevfs GConf;
@@ -1401,7 +1390,7 @@ let
     logger = inetutils;
   };
 
-  rlwrap = composedArgsAndFun (selectVersion ../tools/misc/rlwrap "0.28") {
+  rlwrap = composedArgsAndFun (import ../tools/misc/rlwrap/0.28.nix) {
     inherit builderDefs readline;
   };
 
@@ -1454,7 +1443,7 @@ let
     inherit groff;
   };
 
-  sharutils = selectVersion ../tools/archivers/sharutils "4.6.3" {
+  sharutils = import ../tools/archivers/sharutils/4.6.3.nix {
     inherit fetchurl stdenv;
   };
 
@@ -1470,12 +1459,12 @@ let
     inherit fetchurl stdenv;
   };
 
-  smbfsFuse = composedArgsAndFun (selectVersion ../tools/networking/smbfs-fuse "0.8.7") {
+  smbfsFuse = composedArgsAndFun (import ../tools/networking/smbfs-fuse/0.8.7.nix) {
     inherit builderDefs samba fuse;
   };
 
-  socat = builderDefsPackage (selectVersion ../tools/networking/socat "1.6.0.1") {
-    inherit openssl;
+  socat = import ../tools/networking/socat {
+    inherit fetchurl stdenv openssl;
   };
 
   sudo = import ../tools/security/sudo {
@@ -1500,7 +1489,7 @@ let
     tlsSupport = true;
   };
 
-  ssss = composedArgsAndFun (selectVersion ../tools/security/ssss "0.5") {
+  ssss = composedArgsAndFun (import ../tools/security/ssss/0.5.nix) {
     inherit builderDefs gmp;
   };
 
@@ -1761,11 +1750,8 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
-  zsh = composedArgsAndFun (selectVersion ../shells/zsh "4.3.9") {
+  zsh = import ../shells/zsh {
     inherit fetchurl stdenv ncurses coreutils;
-    # for CVS:
-    inherit (bleedingEdgeRepos) sourceByName;
-    inherit autoconf yodl;
   };
 
 
@@ -2073,8 +2059,8 @@ let
     libstdcpp5 = gcc33.gcc;
   };
 
-  ikarus = builderDefsPackage (selectVersion ../development/compilers/ikarus "0.0.3") {
-    inherit gmp;
+  ikarus = import ../development/compilers/ikarus {
+    inherit stdenv fetchurl gmp;
   };
 
   #TODO add packages http://cvs.haskell.org/Hugs/downloads/2006-09/packages/ and test
@@ -2149,12 +2135,12 @@ let
     lua = lua5;
   };
 
-  monotoneViz = builderDefsPackage (selectVersion ../applications/version-management/monotone-viz "mtn-head") {
+  monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
     inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool;
     inherit (gnome) gtk libgnomecanvas glib;
   };
 
-  viewMtn = builderDefsPackage (selectVersion ../applications/version-management/viewmtn "0.10")
+  viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
     inherit monotone flup cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
@@ -2231,10 +2217,10 @@ let
   };
 
   metaBuildEnv = import ../development/compilers/meta-environment/meta-build-env {
-    inherit fetchurl stdenv ;
+    inherit fetchurl stdenv;
   };
 
-  swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") {
+  swiProlog = import ../development/compilers/swi-prolog {
     inherit fetchurl stdenv;
   };
 
@@ -2457,7 +2443,7 @@ let
     inherit fetchurl stdenv stringsWithDeps lib builderDefs python;
   };
 
-  Qi = composedArgsAndFun (selectVersion ../development/compilers/qi "9.1") {
+  Qi = composedArgsAndFun (import ../development/compilers/qi/9.1.nix) {
     inherit clisp stdenv fetchurl builderDefs unzip;
   };
 
@@ -2864,7 +2850,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") {
+  ltrace = composedArgsAndFun (import ../development/tools/misc/ltrace/0.5-3deb.nix) {
     inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils;
   };
 
@@ -2997,7 +2983,7 @@ let
     inherit fetchurl stdenv perl gdb;
   };
 
-  xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") {
+  xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) {
     flex = flex2535;
     qt = qt3;
     inherit pkgconfig makeWrapper bison python;
@@ -3027,7 +3013,7 @@ let
       inherit stdenv fetchurl gettext attr libtool;
     });
 
-  adns = selectVersion ../development/libraries/adns "1.4" {
+  adns = import ../development/libraries/adns/1.4.nix {
     inherit stdenv fetchurl;
     static = getPkgConfig "adns" "static" (stdenv ? isStatic || stdenv ? isDietLibC);
   };
@@ -3257,9 +3243,7 @@ let
       libXrender;
   };
 
-  enchant = makeOverridable
-      (selectVersion ../development/libraries/enchant "1.3.0")
-  {
+  enchant = makeOverridable (import ../development/libraries/enchant) {
     inherit fetchurl stdenv aspell pkgconfig;
     inherit (gnome) glib;
   };
@@ -3521,7 +3505,7 @@ let
   };
 
   gst_all = recurseIntoAttrs (import ../development/libraries/gstreamer {
-    inherit lib selectVersion stdenv fetchurl perl bison pkgconfig libxml2
+    inherit lib stdenv fetchurl perl bison pkgconfig libxml2
       python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
       libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
       dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which makeOverridable;
@@ -3819,15 +3803,13 @@ let
     inherit fetchurl stdenv;
   };
 
-  libdbi = composedArgsAndFun (selectVersion ../development/libraries/libdbi "0.8.2") {
+  libdbi = composedArgsAndFun (import ../development/libraries/libdbi/0.8.2.nix) {
     inherit stdenv fetchurl builderDefs;
   };
 
-  libdbiDriversBase = composedArgsAndFun
-    (selectVersion ../development/libraries/libdbi-drivers "0.8.2-1")
-    {
-      inherit stdenv fetchurl builderDefs libdbi;
-    };
+  libdbiDriversBase = composedArgsAndFun (import ../development/libraries/libdbi-drivers/0.8.2-1.nix) {
+    inherit stdenv fetchurl builderDefs libdbi;
+  };
 
   libdbiDrivers = libdbiDriversBase.passthru.function {
     inherit sqlite mysql;
@@ -3877,7 +3859,7 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  libextractor = composedArgsAndFun (selectVersion ../development/libraries/libextractor "0.5.18") {
+  libextractor = composedArgsAndFun (import ../development/libraries/libextractor/0.5.18.nix) {
     inherit fetchurl stdenv builderDefs zlib;
   };
 
@@ -3953,7 +3935,7 @@ let
     inherit fetchurl stdenv pkgconfig libraw1394;
   };
 
-  libjingle = selectVersion ../development/libraries/libjingle "0.3.11" {
+  libjingle = import ../development/libraries/libjingle/0.3.11.nix {
     inherit fetchurl stdenv mediastreamer;
   };
 
@@ -4182,8 +4164,7 @@ let
   };
 
   # failed to build
-  mediastreamer = composedArgsAndFun (selectVersion
-      ../development/libraries/mediastreamer "2.2.0-cvs20080207") {
+  mediastreamer = composedArgsAndFun (import ../development/libraries/mediastreamer/2.2.0-cvs20080207.nix) {
     inherit fetchurl stdenv automake libtool autoconf alsaLib pkgconfig speex
       ortp ffmpeg;
   };
@@ -4210,7 +4191,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  msilbc = selectVersion ../development/libraries/msilbc "2.0.0" {
+  msilbc = import ../development/libraries/msilbc {
     inherit fetchurl stdenv ilbc mediastreamer pkgconfig;
   };
 
@@ -4434,7 +4415,7 @@ let
   };
 
   # Also known as librdf, includes raptor and rasqal
-  redland = composedArgsAndFun (selectVersion ../development/libraries/redland "1.0.9") {
+  redland = composedArgsAndFun (import ../development/libraries/redland/1.0.9.nix) {
     inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
       mysql libxslt curl pcre librdf_rasqal librdf_raptor;
     bdb = db4;
@@ -4547,7 +4528,7 @@ let
     inherit stdenv fetchurl cmake qt4;
   };
 
-  tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.5.7") {
+  tk = import ../development/libraries/tk/8.5.7.nix {
     inherit fetchurl stdenv tcl x11;
   };
 
@@ -4608,12 +4589,11 @@ let
     inherit fetchurl stdenv;
   };
 
-
-  xapian = makeOverridable (selectVersion ../development/libraries/xapian "1.0.14") {
+  xapian = makeOverridable (import ../development/libraries/xapian) {
     inherit fetchurl stdenv zlib;
   };
 
-  xapianBindings = (selectVersion ../development/libraries/xapian/bindings "1.0.14") {
+  xapianBindings = (import ../development/libraries/xapian/bindings/1.0.14.nix) {
     inherit fetchurl stdenv xapian composableDerivation pkgconfig;
     inherit ruby perl php tcl python; # TODO perl php Java, tcl, C#, python
   };
@@ -4813,12 +4793,11 @@ let
     inherit fetchurl stdenv python db4;
   };
 
-  flup = builderDefsPackage (selectVersion ../development/python-modules/flup "r2311")
-  (let python=python25; in
-  {
-    inherit python;
-    setuptools = setuptools.passthru.function {inherit python;};
-  });
+  flup = import ../development/python-modules/flup {
+    inherit fetchurl stdenv;
+    python = python25;
+    setuptools = setuptools.passthru.function {python = python25;};
+  };
 
   numeric = import ../development/python-modules/numeric {
     inherit fetchurl stdenv python;
@@ -4872,7 +4851,7 @@ let
     inherit python openssl;
   };
 
-  pythonSip = builderDefsPackage (selectVersion ../development/python-modules/python-sip "4.7.4") {
+  pythonSip = builderDefsPackage (import ../development/python-modules/python-sip/4.7.4.nix) {
     inherit python;
   };
 
@@ -4884,7 +4863,7 @@ let
     inherit stdenv fetchurl lib python;
   };
 
-  pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") {
+  pyqt = builderDefsPackage (import ../development/python-modules/pyqt/4.3.3.nix) {
     inherit pkgconfig python pythonSip glib;
     inherit (xlibs) libX11 libXext;
     qt = qt4;
@@ -4942,7 +4921,7 @@ let
     inherit fetchurl stdenv python cheetahTemplate makeWrapper par2cmdline unzip unrar;
   };
 
-  bind = builderDefsPackage (selectVersion ../servers/dns/bind "9.5.0") {
+  bind = builderDefsPackage (import ../servers/dns/bind/9.5.0.nix) {
     inherit openssl libtool;
   };
 
@@ -4950,7 +4929,7 @@ let
     inherit fetchurl stdenv libtool gettext zlib readline guile python;
   };
 
-  dict = composedArgsAndFun (selectVersion ../servers/dict "1.9.15") {
+  dict = composedArgsAndFun (import ../servers/dict/1.9.15.nix) {
     inherit builderDefs which bison;
     flex=flex2534;
   };
@@ -5210,18 +5189,6 @@ let
     inherit stdenv fetchurl alsaLib gettext ncurses;
   };
 
-  /*
-  # Will maybe move to kernelPackages properly later.
-
-  blcr = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){
-    inherit perl;
-  };
-
-  blcrCurrent = kernel : (blcr.passthru.function {
-    inherit kernel;
-  });
-  */
-
   bluez = import ../os-specific/linux/bluez {
     inherit fetchurl stdenv pkgconfig dbus libusb alsaLib glib;
   };
@@ -5311,8 +5278,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  gpm = builderDefsPackage (selectVersion ../servers/gpm "1.20.6") {
-    inherit lzma ncurses bison;
+  gpm = import ../servers/gpm {
+    inherit fetchurl stdenv lzma ncurses bison;
     flex = flex2535;
   };
 
@@ -5390,8 +5357,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  jfsrec = builderDefsPackage (selectVersion ../os-specific/linux/jfsrec "svn-7"){
-    inherit boost;
+  jfsrec = import ../os-specific/linux/jfsrec {
+    inherit fetchurl stdenv boost;
   };
 
   jfsutils = import ../os-specific/linux/jfsutils/default.nix {
@@ -5618,7 +5585,7 @@ let
        then iwlwifi4965ucodeV2
        else iwlwifi4965ucodeV1);
 
-    atheros = composedArgsAndFun (selectVersion ../os-specific/linux/atheros "0.9.4") {
+    atheros = composedArgsAndFun (import ../os-specific/linux/atheros/0.9.4.nix) {
       inherit fetchurl stdenv builderDefs kernel lib;
     };
 
@@ -5634,8 +5601,8 @@ let
       inherit fetchurl stdenv kernel ncurses fxload;
     };
 
-    kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.4.0pre1") {
-      inherit kernel perl;
+    kqemu = import ../os-specific/linux/kqemu/1.4.0pre1.nix {
+      inherit fetchurl stdenv kernel perl;
     };
 
     splashutils =
@@ -6083,7 +6050,7 @@ let
     inherit (xorg) mkfontdir mkfontscale;
   });
 
-  clearlyU = composedArgsAndFun (selectVersion ../data/fonts/clearlyU "1.9") {
+  clearlyU = composedArgsAndFun (import ../data/fonts/clearlyU/1.9.nix) {
     inherit builderDefs;
     inherit (xorg) mkfontdir mkfontscale;
   };
@@ -6129,7 +6096,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  junicode = composedArgsAndFun (selectVersion ../data/fonts/junicode "0.6.15") {
+  junicode = composedArgsAndFun (import ../data/fonts/junicode/0.6.15.nix) {
     inherit builderDefs fontforge unzip;
     inherit (xorg) mkfontdir mkfontscale;
   };
@@ -6142,13 +6109,14 @@ let
     inherit fetchurl stdenv;
   };
 
-  libertine = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7") {
+  libertine = builderDefsPackage (import ../data/fonts/libertine/2.7.nix) {
     inherit fontforge;
   };
-  libertineBin = builderDefsPackage (selectVersion ../data/fonts/libertine "2.7.bin") {
+  libertineBin = builderDefsPackage (import ../data/fonts/libertine/2.7.bin.nix) {
   };
 
-  lmodern = builderDefsPackage (selectVersion ../data/fonts/lmodern "1.010") {
+  lmodern = import ../data/fonts/lmodern {
+    inherit fetchurl stdenv;
   };
 
   manpages = import ../data/documentation/man-pages {
@@ -6217,7 +6185,7 @@ let
     inherit fetchurl stdenv cabextract;
   };
 
-  wqy_zenhei = composedArgsAndFun (selectVersion ../data/fonts/wqy_zenhei "0.4.23-1") {
+  wqy_zenhei = composedArgsAndFun (import ../data/fonts/wqy_zenhei/0.4.23-1.nix) {
     inherit builderDefs;
   };
 
@@ -6387,7 +6355,7 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
-  carrier = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/carrier "2.5.0") {
+  carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
       gtkspell aspell gettext ncurses avahi dbus dbus_glib python
       libtool automake autoconf;
@@ -6504,7 +6472,7 @@ let
     fltk = fltk11;
   };
 
-  codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") {
+  codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
     inherit makeWrapper;
     python = pythonFull;
   };
@@ -6608,13 +6576,13 @@ let
   #      p.viPlugin # vim keybindings (see license)
   #   ];
   #};
-  eclipseNew = (selectVersion ../applications/editors/eclipse-new "3.3.1.1" {
+  eclipseNew = import ../applications/editors/eclipse-new/3.3.1.1.nix {
     # outdated, but 3.3.1.1 does already compile on nix, feel free to work 3.4
-    inherit fetchurl stdenv makeWrapper jdk unzip ant selectVersion buildEnv
+    inherit fetchurl stdenv makeWrapper jdk unzip ant buildEnv
     getConfig lib zip writeTextFile runCommand;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXtst;
-  });
+  };
 
 
   eclipse = plugins:
@@ -6783,7 +6751,7 @@ let
     openexr = openexr_1_6_1;
   };
 
-  fbpanel = composedArgsAndFun (selectVersion ../applications/window-managers/fbpanel "4.12") {
+  fbpanel = composedArgsAndFun (import ../applications/window-managers/fbpanel/4.12.nix) {
     inherit fetchurl stdenv builderDefs pkgconfig libpng libjpeg libtiff librsvg;
     inherit (gtkLibs) gtk;
     inherit (xlibs) libX11 libXmu libXpm;
@@ -6966,7 +6934,7 @@ let
     gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true;
   };
 
-  gocr = composedArgsAndFun (selectVersion ../applications/graphics/gocr "0.44") {
+  gocr = composedArgsAndFun (import ../applications/graphics/gocr/0.44.nix) {
     inherit builderDefs fetchurl stdenv;
   };
 
@@ -7262,8 +7230,8 @@ let
     inherit (gnome28) gtksourceview libsoup;
   };
 
-  minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
-    inherit ncurses;
+  minicom = import ../tools/misc/minicom {
+    inherit fetchurl stdenv ncurses;
   };
 
   monodevelop = import ../applications/editors/monodevelop {
@@ -7475,8 +7443,7 @@ let
     inherit fetchsvn SDL zlib which stdenv;
   };
 
-  qemuImage = composedArgsAndFun
-    (selectVersion ../applications/virtualization/qemu/linux-img "0.2") {
+  qemuImage = composedArgsAndFun (import ../applications/virtualization/qemu/linux-img/0.2.nix) {
     inherit builderDefs fetchurl stdenv;
   };
 
@@ -7699,7 +7666,8 @@ let
     inherit (xorg) xset fontschumachermisc;
   };
 
-  uucp = builderDefsPackage (selectVersion ../tools/misc/uucp "1.07") {
+  uucp = import ../tools/misc/uucp {
+    inherit fetchurl stdenv;
   };
 
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
@@ -7810,7 +7778,7 @@ let
        );
   };
 
-  x11vnc = composedArgsAndFun (selectVersion ../tools/X11/x11vnc "0.9.3") {
+  x11vnc = composedArgsAndFun (import ../tools/X11/x11vnc/0.9.3.nix) {
     inherit builderDefs openssl zlib libjpeg ;
     inherit (xlibs) libXfixes fixesproto libXdamage damageproto
       libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto
@@ -7818,7 +7786,7 @@ let
       libXrender;
   };
 
-  x2vnc = composedArgsAndFun (selectVersion ../tools/X11/x2vnc "1.7.2") {
+  x2vnc = composedArgsAndFun (import ../tools/X11/x2vnc/1.7.2.nix) {
     inherit builderDefs;
     inherit (xlibs) libX11 xproto xextproto libXext libXrandr randrproto;
   };
@@ -7966,7 +7934,7 @@ let
   };
 
   # doesn't compile yet - in case someone else want's to continue ..
-  qgis =  (selectVersion ../applications/misc/qgis "1.0.1-2") {
+  qgis = (import ../applications/misc/qgis/1.0.1-2.nix) {
     inherit composableDerivation fetchsvn stdenv flex lib
             ncurses fetchurl perl cmake gdal geos proj x11
             gsl libpng zlib bison
@@ -8006,7 +7974,7 @@ let
     inherit fetchurl stdenv python pygame twisted lib numeric makeWrapper;
   };
 
-  construoBase = composedArgsAndFun (selectVersion ../games/construo "0.2.2") {
+  construoBase = composedArgsAndFun (import ../games/construo/0.2.2.nix) {
     inherit stdenv fetchurl builderDefs
       zlib;
     inherit (xlibs) libX11 xproto;
@@ -8122,7 +8090,7 @@ let
   };
 
   # You still can override by passing more arguments.
-  spaceOrbit = composedArgsAndFun (selectVersion ../games/orbit "1.01") {
+  spaceOrbit = composedArgsAndFun (import ../games/orbit/1.01.nix) {
     inherit fetchurl stdenv builderDefs mesa freeglut;
     inherit (gnome) esound;
     inherit (xlibs) libXt libX11 libXmu libXi libXext;
@@ -8538,12 +8506,11 @@ let
     inherit fetchurl stdenv tetex lazylist;
   };
 
-  psi = (selectVersion ../applications/networking/instant-messengers/psi "0.12.1")
-    {
-      inherit stdenv fetchurl zlib aspell sox openssl qt4;
-      inherit (xlibs) xproto libX11 libSM libICE;
-      qca2 = kde4.qca2;
-    };
+  psi = (import ../applications/networking/instant-messengers/psi) {
+    inherit stdenv fetchurl zlib aspell sox qt4;
+    inherit (xlibs) xproto libX11 libSM libICE;
+    qca2 = kde4.qca2;
+  };
 
   putty = import ../applications/networking/remote/putty {
     inherit stdenv fetchurl ncurses;