From da55381e2a07f58c325f14704e3328ad3a3a0d61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 14 Oct 2022 20:00:13 +0200
Subject: [PATCH 1/3] python310Packages.aiocsv: init at 1.2.2

---
 .../python-modules/aiocsv/default.nix         | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiocsv/default.nix

diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix
new file mode 100644
index 000000000000..6a4340e5c541
--- /dev/null
+++ b/pkgs/development/python-modules/aiocsv/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, aiofiles
+, buildPythonPackage
+, cython
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aiocsv";
+  version = "1.2.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "MKuranowski";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-lh+yHyHU+XrK4nk1xxrxgF5zGH7lP9jHdJ+m9ncfprw=";
+  };
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  checkInputs = [
+    aiofiles
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  preBuild = ''
+    export CYTHONIZE=1
+  '';
+
+  pythonImportsCheck = [
+    "aiocsv"
+  ];
+
+  disabledTestPaths = [
+    # Import issue
+    "tests/test_parser.py"
+  ];
+
+  meta = with lib; {
+    description = "Library for for asynchronous CSV reading/writing";
+    homepage = "https://github.com/MKuranowski/aiocsv";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b49f7e43e1b0..a5cfd9d77305 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -291,6 +291,8 @@ in {
 
   aiocontextvars = callPackage ../development/python-modules/aiocontextvars { };
 
+  aiocsv = callPackage ../development/python-modules/aiocsv { };
+
   aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { };
 
   aiodiscover = callPackage ../development/python-modules/aiodiscover { };

From 2e27be3a0edb8e91e55c198a66152621c8d365b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 14 Oct 2022 21:39:29 +0200
Subject: [PATCH 2/3] python310Packages.reactivex: init at 4.0.4

---
 .../python-modules/reactivex/default.nix      | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/reactivex/default.nix

diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix
new file mode 100644
index 000000000000..4d95605a09b5
--- /dev/null
+++ b/pkgs/development/python-modules/reactivex/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "reactivex";
+  version = "4.0.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "ReactiveX";
+    repo = "RxPY";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-W1qYNbYV6Roz1GJtP/vpoPD6KigWaaQOWe1R5DZHlUw=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    typing-extensions
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    # Upstream doesn't set a version for their GitHub releases
+    substituteInPlace pyproject.toml \
+      --replace 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
+  pythonImportsCheck = [
+    "reactivex"
+  ];
+
+  meta = with lib; {
+    description = "Library for composing asynchronous and event-based programs";
+    homepage = "https://github.com/ReactiveX/RxPY";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5cfd9d77305..5823cd11d4ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9634,6 +9634,8 @@ in {
 
   readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { };
 
+  reactivex = callPackage ../development/python-modules/reactivex { };
+
   rebulk = callPackage ../development/python-modules/rebulk { };
 
   recaptcha_client = callPackage ../development/python-modules/recaptcha_client { };

From 7b88ba8aae9ffd4524893cbe88fa16c3c94af5a0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 14 Oct 2022 21:41:39 +0200
Subject: [PATCH 3/3] python310Packages.influxdb-client: 1.31.0 -> 1.33.0

---
 .../influxdb-client/default.nix               | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 0d9a38019cc9..2eb1015dba70 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -1,21 +1,22 @@
 { lib
 , aiohttp
+, aiocsv
 , buildPythonPackage
-, fetchFromGitHub
-, rx
 , certifi
-, six
+, ciso8601
+, fetchFromGitHub
+, numpy
+, pandas
 , python-dateutil
+, pythonOlder
+, reactivex
 , setuptools
 , urllib3
-, ciso8601
-, pytz
-, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "influxdb-client";
-  version = "1.31.0";
+  version = "1.33.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,29 +25,32 @@ buildPythonPackage rec {
     owner = "influxdata";
     repo = "influxdb-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gTJgY4vFgmFDn2WYUKEbvbu7hjxcw2QGI+blensS5BI=";
+    hash = "sha256-RhUIdIwLYJwlpLtyrXO9GCvKY6OLDJl7Aop5acgTHN0=";
   };
 
   propagatedBuildInputs = [
-    rx
     certifi
-    six
     python-dateutil
+    reactivex
     setuptools
     urllib3
-    pytz
   ];
 
   passthru.optional-dependencies = {
     async = [
+      aiocsv
       aiohttp
     ];
     ciso = [
       ciso8601
     ];
+    extra = [
+      numpy
+      pandas
+    ];
   };
 
-  # requires influxdb server
+  # Requires influxdb server
   doCheck = false;
 
   pythonImportsCheck = [
@@ -54,7 +58,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "InfluxDB 2.0 Python client library";
+    description = "InfluxDB client library";
     homepage = "https://github.com/influxdata/influxdb-client-python";
     license = licenses.mit;
     maintainers = with maintainers; [ mic92 ];