pythonPackages.qpid-python: refactor move to python-modules

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

@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "qpid-python";
+  version = "0.32";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "http://www.us.apache.org/dist/qpid/${version}/${pname}-${version}.tar.gz";
+    sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4";
+  };
+
+  # needs a broker running and then ./qpid-python-test
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://qpid.apache.org/;
+    description = "Python client implementation and AMQP conformance tests for Apache Qpid";
+    license = licenses.asl20;
+  };
+
+}

pkgs/top-level/python-packages.nix

@@ -3674,20 +3674,7 @@ in {
 
   pysendfile = callPackage ../development/python-modules/pysendfile { };
 
-  qpid-python = buildPythonPackage rec {
+  qpid-python = callPackage ../development/python-modules/qpid-python { };
-    name = "qpid-python-${version}";
-    version = "0.32";
-    disabled = isPy3k;  # not supported
-
-    src = pkgs.fetchurl {
-      url = "http://www.us.apache.org/dist/qpid/${version}/${name}.tar.gz";
-      sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4";
-    };
-
-    # needs a broker running and then ./qpid-python-test
-    doCheck = false;
-
-  };
 
   xattr = buildPythonPackage rec {
     name = "xattr-0.7.8";