From 9e52a735277dcae6ccf4166831eaa778cee6c9db Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 29 Oct 2018 11:23:09 -0400
Subject: [PATCH] pythonPackages.ttystatus: refactor move to python-modules

---
 .../python-modules/tracing/default.nix        |  2 +-
 .../python-modules/ttystatus/default.nix      | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +-------------
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/ttystatus/default.nix

diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix
index da9683e187e..843f26508ae 100644
--- a/pkgs/development/python-modules/tracing/default.nix
+++ b/pkgs/development/python-modules/tracing/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = http://liw.fi/tracing/;
     description = "Python debug logging helper";
-    license = licenses.gpl30;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ rickynils ];
   };
 
diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix
new file mode 100644
index 00000000000..042b4a19642
--- /dev/null
+++ b/pkgs/development/python-modules/ttystatus/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, sphinx
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "ttystatus";
+  version = "0.23";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz";
+    sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y";
+  };
+
+  buildInputs = [ sphinx ];
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://liw.fi/ttystatus/;
+    description = "Progress and status updates on terminals for Python";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rickynils ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1bde981011f..c5fd09aa8b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4262,27 +4262,7 @@ in {
 
   translationstring = callPackage ../development/python-modules/translationstring { };
 
-  ttystatus = buildPythonPackage rec {
-    name = "ttystatus-${version}";
-    version = "0.23";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl rec {
-      url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz";
-      sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y";
-    };
-
-    buildInputs = with self; [ sphinx ];
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://liw.fi/ttystatus/;
-      description = "Progress and status updates on terminals for Python";
-      maintainers = with maintainers; [ rickynils ];
-    };
-  };
+  ttystatus = callPackage ../development/python-modules/ttystatus { };
 
   larch = buildPythonPackage rec {
     name = "larch-${version}";