Moved "flup" from all-packages.nix into python-packages.nix.

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

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

@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, python, setuptools, ... }:
-
-rec {
-  name = "flup-1.0.2";
-
-  src = fetchurl {
-    url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
-    sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
-  };
-
-  buildInputs = [ python setuptools ];
-
-  phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"];
-
-  meta = {
-    description = "FastCGI Python module set";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -4046,10 +4046,6 @@ let
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
-  flup = builderDefsPackage ../development/python-modules/flup {
-    inherit fetchurl stdenv python setuptools;
-  };
-
   numeric = callPackage ../development/python-modules/numeric { };
 
   pil = callPackage ../development/python-modules/pil { };
@@ -6223,9 +6219,9 @@ let
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit
-      monotone flup cheetahTemplate highlight ctags
+    inherit monotone cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
+    flup = pythonPackages.flup;
   };
 
   vim = callPackage ../applications/editors/vim { };

pkgs/top-level/python-packages.nix

@@ -171,6 +171,20 @@ rec {
     };
   });
 
+  flup = buildPythonPackage (rec {
+    name = "flup-1.0.2";
+
+    src = fetchurl {
+      url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
+      sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
+    };
+
+    meta = {
+      homepage = "http://trac.saddi.com/flup";
+      description = "FastCGI Python module set";
+    };
+  });
+
   foolscap = buildPythonPackage (rec {
     name = "foolscap-0.5.1";