From 5e39aa231aac56af03d7f75e10573fdc517a1052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 16 Mar 2019 10:02:11 +0100
Subject: [PATCH] csvkit: move out of pythonPackages

From https://csvkit.readthedocs.io/en/1.0.3/index.html:
> csvkit is a suite of *command-line tools* for [...]
---
 .../python-modules/csvkit/default.nix         | 38 -------------------
 pkgs/tools/text/csvkit/default.nix            | 30 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 32 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/python-modules/csvkit/default.nix
 create mode 100644 pkgs/tools/text/csvkit/default.nix

diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix
deleted file mode 100644
index 48f932086cc..00000000000
--- a/pkgs/development/python-modules/csvkit/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
-, agate, agate-excel, agate-dbf, agate-sql, six
-, ordereddict, simplejson
-, glibcLocales, nose, mock, unittest2
-}:
-
-buildPythonPackage rec {
-  pname = "csvkit";
-  version = "1.0.3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c";
-  };
-
-  propagatedBuildInputs = [
-    agate agate-excel agate-dbf agate-sql six
-  ] ++ lib.optionals (!isPy3k) [
-    ordereddict simplejson
-  ];
-
-  checkInputs = [
-    glibcLocales nose
-  ] ++ lib.optionals (!isPy3k) [
-    mock unittest2
-  ];
-
-  checkPhase = ''
-    LC_ALL="en_US.UTF-8" nosetests -e test_csvsql
-  '';
-
-  meta = with lib; {
-    description = "A library of utilities for working with CSV, the king of tabular file formats";
-    maintainers = with maintainers; [ vrthra ];
-    license = with licenses; [ mit ];
-    homepage = https://github.com/wireservice/csvkit;
-  };
-}
diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix
new file mode 100644
index 00000000000..1ff9cee241c
--- /dev/null
+++ b/pkgs/tools/text/csvkit/default.nix
@@ -0,0 +1,30 @@
+{ lib, python3, glibcLocales }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "csvkit";
+  version = "1.0.3";
+
+  src = python3.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    agate agate-excel agate-dbf agate-sql six
+  ];
+
+  checkInputs = with python3.pkgs; [
+    glibcLocales nose
+  ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests -e test_csvsql
+  '';
+
+  meta = with lib; {
+    description = "A suite of command-line tools for converting to and working with CSV";
+    maintainers = with maintainers; [ vrthra ];
+    license = licenses.mit;
+    homepage = https://github.com/wireservice/csvkit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fe8f295a48..8f6c2bfbfa9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1250,6 +1250,8 @@ in
 
   crudini = callPackage ../tools/misc/crudini { };
 
+  csvkit = callPackage ../tools/text/csvkit { };
+
   cucumber = callPackage ../development/tools/cucumber {};
 
   daemontools = callPackage ../tools/admin/daemontools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2b9c35b532..90c97e1548e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1195,8 +1195,6 @@ in {
 
   csscompressor = callPackage ../development/python-modules/csscompressor {};
 
-  csvkit =  callPackage ../development/python-modules/csvkit { };
-
   cufflinks = callPackage ../development/python-modules/cufflinks { };
 
   cupy = callPackage ../development/python-modules/cupy {