From 8e1a2250e1d343fb8bf4e37f19be2f0b074876b0 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 13:25:36 +0700
Subject: [PATCH] python.pkgs.amqplib: move to separate expression

---
 .../python-modules/amqplib/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +---------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/amqplib/default.nix

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
new file mode 100644
index 000000000000..7c4ef99b0a2c
--- /dev/null
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "amqplib";
+  version = "0.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/py-amqplib/;
+    description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcc81d806638..3fc7871fbe6b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -543,22 +543,7 @@ in {
   };
 
 
-  amqplib = buildPythonPackage rec {
-    name = "amqplib-0.6.1";
-
-    src = pkgs.fetchurl {
-      url = "http://py-amqplib.googlecode.com/files/${name}.tgz";
-      sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/py-amqplib/;
-      description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
-    };
-  };
+  amqplib = callPackage ../development/python-modules/amqplib {};
 
   ansible  = self.ansible2;
   ansible2 = self.ansible_2_3;