* 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

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";
+  };
+}

pkgs/development/python-modules/flup/r2311.nix

@@ -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";
-  };
-}