diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
new file mode 100644
index 00000000000..4265a7488f6
--- /dev/null
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }:
+
+buildPythonPackage rec {
+  pname = "aiodns";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+  };
+
+  propagatedBuildInputs = with stdenv.lib; [ pycares ] 
+    ++ optional isPy33 asyncio 
+    ++ optional (isPy26 || isPy27 || isPyPy) trollius;
+
+  checkPhase = ''
+    ${python.interpreter} tests.py
+  '';
+
+  # 'Could not contact DNS servers'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/saghul/aiodns;
+    license = licenses.mit;
+    description = "Simple DNS resolver for asyncio";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a21ac792ae..667d747582c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -278,30 +278,7 @@ in {
 
   afew = callPackage ../development/python-modules/afew { };
 
-  aiodns = buildPythonPackage rec {
-    name = "aiodns-${version}";
-    version = "1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/aiodns/${name}.tar.gz";
-      sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
-    };
-
-    propagatedBuildInputs = with self; [ pycares ] ++ optional isPy33 asyncio ++ optional (isPy26 || isPy27 || isPyPy) trollius;
-
-    checkPhase = ''
-      ${python.interpreter} tests.py
-    '';
-
-    # 'Could not contact DNS servers'
-    doCheck = false;
-
-    meta = {
-      homepage = http://github.com/saghul/aiodns;
-      license = licenses.mit;
-      description = "Simple DNS resolver for asyncio";
-    };
-  };
+  aiodns = callPackage ../development/python-modules/aiodns { };
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };