From 3ef39ecdb0a90f4938ef5556e58ed279c73369e1 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 29 Oct 2018 10:58:01 -0400
Subject: [PATCH] pythonPackages.cmdtest: refactor move to python-modules

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

diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
new file mode 100644
index 000000000000..605529b17470
--- /dev/null
+++ b/pkgs/development/python-modules/cmdtest/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, cliapp
+, ttystatus
+, markdown
+, isPy3k
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  name = "cmdtest-${version}";
+  version = "0.18";
+  disabled = isPy3k || isPyPy;
+
+  src = fetchurl {
+    url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz";
+    sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn";
+  };
+
+  propagatedBuildInputs = [ cliapp ttystatus markdown ];
+
+  # TODO: cmdtest tests must be run before the buildPhase
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://liw.fi/cmdtest/;
+    description = "Black box tests Unix command line tools";
+    license = licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe2ffeb3f87a..37498f4a44a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4225,26 +4225,7 @@ in {
 
   cliapp = callPackage ../development/python-modules/cliapp { };
 
-  cmdtest = buildPythonPackage rec {
-    name = "cmdtest-${version}";
-    version = "0.18";
-    disabled = isPy3k || isPyPy;
-
-    propagatedBuildInputs = with self; [ cliapp ttystatus markdown ];
-
-    # TODO: cmdtest tests must be run before the buildPhase
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.18.orig.tar.xz";
-      sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn";
-    };
-
-    meta = {
-      homepage = http://liw.fi/cmdtest/;
-      description = "Black box tests Unix command line tools";
-    };
-  };
+  cmdtest = callPackage ../development/python-modules/cmdtest { };
 
   tornado = callPackage ../development/python-modules/tornado { };
   tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; };