* 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

7 files changed, 12 insertions, 48 deletions

diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix
index 6d2b9ffb812b..69296a45c249 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 1a8497bebb73..f991a387976e 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 c88659e4371a..b4e8bb9b6d12 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 546a4bdacec0..a5c212aff864 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 556b9f998765..000000000000
--- 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 6948fa4cbbe5..c95b409ed8e4 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 edf9f8c40ffe..4b6120ad1083 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]);