From e7423d453bf984055fb688cadbf2de269967c5fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Mar 2023 11:36:38 +0100
Subject: [PATCH 1/2] csvkit: add chagnelog to meta

---
 pkgs/tools/text/csvkit/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix
index 922a66a9e1d4..1f21d1bbc64a 100644
--- a/pkgs/tools/text/csvkit/default.nix
+++ b/pkgs/tools/text/csvkit/default.nix
@@ -34,9 +34,10 @@ python3.pkgs.buildPythonApplication rec {
   pythonImportsCheck = [ "csvkit" ];
 
   meta = with lib; {
+    changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst";
     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";
+    license = licenses.mit;
+    maintainers = with maintainers; [ vrthra ];
   };
 }

From 9fb40a03a32fa75baf08e8a2ffcb2152cd397414 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Mar 2023 11:42:29 +0100
Subject: [PATCH 2/2] csvkit: 1.0.5 -> 1.1.1

Changelog: https://github.com/wireservice/csvkit/blob/1.1.1/CHANGELOG.rst
---
 pkgs/tools/text/csvkit/default.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix
index 1f21d1bbc64a..fdd3539b08e0 100644
--- a/pkgs/tools/text/csvkit/default.nix
+++ b/pkgs/tools/text/csvkit/default.nix
@@ -1,37 +1,36 @@
-{ lib, fetchpatch, python3 }:
+{ lib
+, python3
+}:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "csvkit";
-  version = "1.0.5";
+  version = "1.1.1";
+  format = "setuptools";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv";
+    hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM=";
   };
 
-  patches = [
-    # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later.
-    (fetchpatch {
-      url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch";
-      sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7";
-    })
-  ];
-
   propagatedBuildInputs = with python3.pkgs; [
     agate
     agate-excel
     agate-dbf
     agate-sql
-    six
-    setuptools
   ];
 
   nativeCheckInputs = with python3.pkgs; [
-    nose
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "csvkit" ];
+  pythonImportsCheck = [
+    "csvkit"
+  ];
+
+  disabledTests = [
+    # Test is comparing CLI output
+    "test_decimal_format"
+  ];
 
   meta = with lib; {
     changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst";