From ae6c8be79176870969c9da19f71178b8fa567952 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Sep 2017 10:32:25 +0200
Subject: [PATCH] python.pkgs.testtools: move expression

---
 .../python-modules/testtools/default.nix      | 38 +++++++++++++++++++
 .../testtools_support_unittest2.patch         |  0
 pkgs/top-level/python-packages.nix            | 23 +----------
 3 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/testtools/default.nix
 rename pkgs/development/python-modules/{ => testtools}/testtools_support_unittest2.patch (100%)

diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix
new file mode 100644
index 00000000000..d1f3a5feeaa
--- /dev/null
+++ b/pkgs/development/python-modules/testtools/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, python_mimeparse
+, extras
+, lxml
+, unittest2
+, traceback2
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "testtools";
+  version = "1.8.0";
+  name = "${pname}-${version}";
+
+  # Python 2 only judging from SyntaxError
+#   disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca";
+  };
+
+  propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ];
+  buildInputs = [ traceback2 ];
+  patches = [ ./testtools_support_unittest2.patch ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "A set of extensions to the Python standard library's unit testing framework";
+    homepage = http://pypi.python.org/pypi/testtools;
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch
similarity index 100%
rename from pkgs/development/python-modules/testtools_support_unittest2.patch
rename to pkgs/development/python-modules/testtools/testtools_support_unittest2.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ce254acb51..f6d5ddf4c98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22312,28 +22312,7 @@ in {
     };
   };
 
-  testtools = buildPythonPackage rec {
-    name = "testtools-${version}";
-    version = "1.8.0";
-
-    # Python 2 only judging from SyntaxError
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/testtools/${name}.tar.gz";
-      sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca";
-    };
-
-    propagatedBuildInputs = with self; [ pbr python_mimeparse extras lxml unittest2 ];
-    buildInputs = with self; [ traceback2 ];
-    patches = [ ../development/python-modules/testtools_support_unittest2.patch ];
-
-    meta = {
-      description = "A set of extensions to the Python standard library's unit testing framework";
-      homepage = http://pypi.python.org/pypi/testtools;
-      license = licenses.mit;
-    };
-  };
+  testtools = callPackage ../development/python-modules/testtools { };
 
   traitlets = buildPythonPackage rec {
     pname = "traitlets";