4 files changed, 20 insertions, 21 deletions
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";
   };