* 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

2 files changed, 18 insertions, 20 deletions

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 675a996445f4..000000000000
--- 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 000000000000..dc4c0647f41f
--- /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";
+  };
+}