From f542b496004b3cb107d948ea6bf97a732b8e59cf Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 20:48:22 -0400
Subject: [PATCH] pythonPackages.pamqp: refactor move to python-modules

---
 .../python-modules/pamqp/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-----------
 2 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/pamqp/default.nix

diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
new file mode 100644
index 00000000000..89e88476e37
--- /dev/null
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, nose
+, pep8
+, pylint
+, mccabe
+}:
+
+buildPythonPackage rec {
+  version = "1.6.1";
+  pname = "pamqp";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
+  };
+
+  buildInputs = [ mock nose pep8 pylint mccabe ];
+
+  meta = with stdenv.lib; {
+    description = "RabbitMQ Focused AMQP low-level library";
+    homepage = https://pypi.python.org/pypi/pamqp;
+    license = licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71eae76ae1c..0a1114ae6d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3079,23 +3079,7 @@ in {
 
   paho-mqtt = callPackage ../development/python-modules/paho-mqtt { };
 
-  pamqp = buildPythonPackage rec {
-    version = "1.6.1";
-    name = "pamqp-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pamqp/${name}.tar.gz";
-      sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
-    };
-
-    buildInputs = with self; [ mock nose pep8 pylint mccabe ];
-
-    meta = {
-      description = "RabbitMQ Focused AMQP low-level library";
-      homepage = https://pypi.python.org/pypi/pamqp;
-      license = licenses.bsd3;
-    };
-  };
+  pamqp = callPackage ../development/python-modules/pamqp { };
 
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";