From 58cc22577941fb63958856347e39e6ac034aa5ad Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:27:23 -0700
Subject: [PATCH 01/21] python3.pkgs.flask-reverse-proxy: fix invalid version
 number when building

---
 .../python-modules/flask-reverse-proxy-fix/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index 18e483292885b..6d079b66f149d 100644
--- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , flask
 , werkzeug
 }:
@@ -9,6 +8,7 @@
 buildPythonPackage rec {
   pname = "flask-reverse-proxy-fix";
   version = "0.2.1";
+  format = "setuptools";
 
   # master fixes flask import syntax and has no major changes
   # new release requested: https://github.com/sublee/flask-silk/pull/6
@@ -16,15 +16,17 @@ buildPythonPackage rec {
     owner = "antarctica";
     repo = "flask-reverse-proxy-fix";
     rev = "v${version}";
-    sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5";
+    hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck=";
   };
 
-  disabled = !isPy3k;
-
   postPatch = ''
     sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py
   '';
 
+  # This is needed so that setup.py does not add "devNone" to the version,
+  # after which setuptools throws an error for an invalid version.
+  env.CI_COMMIT_TAG = "v${version}";
+
   propagatedBuildInputs = [
     flask
     werkzeug

From 137c45359b0080443acb04038c25e649c1e01788 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:28:09 -0700
Subject: [PATCH 02/21] python3.pkgs.flask-security-too: fix tests with
 setuptools 67.5.0+

---
 .../python-modules/flask-security-too/default.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix
index c63b99161a989..32a396babd70c 100644
--- a/pkgs/development/python-modules/flask-security-too/default.nix
+++ b/pkgs/development/python-modules/flask-security-too/default.nix
@@ -57,6 +57,11 @@ buildPythonPackage rec {
     hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc=";
   };
 
+  postPatch = ''
+    # This should be removed after updating to version 5.3.0.
+    sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini
+  '';
+
   propagatedBuildInputs = [
     blinker
     email-validator

From 480508616dbbbf803b5e2ae02bd30d72bb48b4f1 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:29:09 -0700
Subject: [PATCH 03/21] python3.pkgs.pyinsteon: relax setuptools dependency

---
 .../development/python-modules/pyinsteon/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index 1747fc677398c..948c3fd29bb00 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -4,6 +4,7 @@
 , async-generator
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pypubsub
 , pyserial
 , pyserial-asyncio
@@ -11,6 +12,7 @@
 , pythonOlder
 , setuptools
 , voluptuous
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -27,8 +29,18 @@ buildPythonPackage rec {
     hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo=";
   };
 
+  patches = [
+    # https://github.com/pyinsteon/pyinsteon/pull/361
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch";
+      hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   propagatedBuildInputs = [

From a25d553044e1b8de35b3eb706a57ac266e8ff0a0 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:29:34 -0700
Subject: [PATCH 04/21] python3.pkgs.pypck: relax setuptools dependency

---
 pkgs/development/python-modules/pypck/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index 3cdd7fa4acebb..3eef4a86ce8f9 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -2,11 +2,13 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pytest-asyncio
 , pytest-timeout
 , pytestCheckHook
 , pythonOlder
 , setuptools
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -23,8 +25,18 @@ buildPythonPackage rec {
     hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE=";
   };
 
+  patches = [
+    # https://github.com/alengwenus/pypck/pull/109
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/alengwenus/pypck/commit/17023ebe8082120b1eec086842ca809ec6e9df2b.patch";
+      hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   nativeCheckInputs = [

From 333c180f4a4a88cd7ccdb92a62822cebd1ad8e1a Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:29:52 -0700
Subject: [PATCH 05/21] python3.pkgs.python-creole: replace poetry with
 poetry-core

---
 .../python-modules/python-creole/default.nix        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-creole/default.nix b/pkgs/development/python-modules/python-creole/default.nix
index a02a08e2b44b2..52d13d452affc 100644
--- a/pkgs/development/python-modules/python-creole/default.nix
+++ b/pkgs/development/python-modules/python-creole/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , runtimeShell
 
 # build
@@ -27,14 +28,20 @@ buildPythonPackage rec {
     hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ=";
   };
 
+  patches = [
+    # https://github.com/jedie/python-creole/pull/77
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core.patch";
+      url = "https://github.com/jedie/python-creole/commit/bfc46730ab4a189f3142246cead8d26005a28671.patch";
+      hash = "sha256-WtoEQyu/154Cfj6eSnNA+t37+o7Ij328QGMKxwcLg5k=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api"
-
     substituteInPlace Makefile \
       --replace "/bin/bash" "${runtimeShell}"
 

From f851b3a62a96ac58690b4c8c6c422676e65fd6c6 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:30:18 -0700
Subject: [PATCH 06/21] python3.pkgs.python-homewizard-energy: remove
 setuptools dependency

---
 .../python-homewizard-energy/default.nix             | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix
index bfb53c92df414..c6b5f1ec4539a 100644
--- a/pkgs/development/python-modules/python-homewizard-energy/default.nix
+++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix
@@ -4,6 +4,7 @@
 , awesomeversion
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , poetry-core
 , protobuf
 , pytest-asyncio
@@ -25,6 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA=";
   };
 
+  patches = [
+    # https://github.com/DCSBL/python-homewizard-energy/pull/235
+    (fetchpatch {
+      name = "remove-setuptools-dependency.patch";
+      url = "https://github.com/DCSBL/python-homewizard-energy/commit/b006b0bc1f3d0b4a7569654a1afa90dd4cffaf18.patch";
+      hash = "sha256-WQeepxiYnBfFcQAmrc3pavBz5j1Qo0HmUcOxsK/pr50=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -34,6 +44,8 @@ buildPythonPackage rec {
     aiohttp
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   nativeCheckInputs = [
     aresponses
     pytest-asyncio

From b7df9ed8df3b3e67098b4911ccc00a611bf4d9be Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:30:53 -0700
Subject: [PATCH 07/21] python3.pkgs.python-otbr-api: relax setuptools
 dependency

---
 .../python-modules/python-otbr-api/default.nix     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index f11bb76057f55..d6137cf191e2e 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -4,10 +4,13 @@
 , buildPythonPackage
 , cryptography
 , fetchFromGitHub
+, fetchpatch
+, pytest-asyncio
 , pytestCheckHook
 , pythonOlder
 , setuptools
 , voluptuous
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -24,8 +27,18 @@ buildPythonPackage rec {
     hash = "sha256-bPN2h60ypjlKpXs1xDS7bZcGRXvatA3EdlAX/HLxxTM=";
   };
 
+  patches = [
+    # https://github.com/home-assistant-libs/python-otbr-api/pull/68
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/home-assistant-libs/python-otbr-api/commit/37eb19c12d17ac7d040ded035d8401def872fbda.patch";
+      hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   propagatedBuildInputs = [
@@ -36,6 +49,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytestCheckHook
   ];
 

From 5f00ddcf0bcb324c66b0680b7ba9a37d57b283f5 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:31:53 -0700
Subject: [PATCH 08/21] python3.pkgs.python-vagrant: 1.0.0 -> 1.1.0

---
 .../python-modules/python-vagrant/default.nix  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix
index a9d585c777da1..61d780809db5e 100644
--- a/pkgs/development/python-modules/python-vagrant/default.nix
+++ b/pkgs/development/python-modules/python-vagrant/default.nix
@@ -1,21 +1,29 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "1.1.0";
   pname = "python-vagrant";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU=";
+  src = fetchFromGitHub {
+    owner = "pycontribs";
+    repo = "python-vagrant";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww=";
   };
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   # The tests try to connect to qemu

From 95197fe03b0be4891a4ab06368ed381ce00057cd Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:32:14 -0700
Subject: [PATCH 09/21] python3.pkgs.pyvisa-sim: add missing build dependencies

---
 .../development/python-modules/pyvisa-sim/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix
index 56fef67a1f9fb..55d6ff6b5db61 100644
--- a/pkgs/development/python-modules/pyvisa-sim/default.nix
+++ b/pkgs/development/python-modules/pyvisa-sim/default.nix
@@ -7,6 +7,9 @@
 , stringparser
 , typing-extensions
 , pytestCheckHook
+, setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -19,9 +22,15 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyVISA-sim";
     inherit version;
-    sha256 = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY=";
+    hash = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
   propagatedBuildInputs = [
     pyvisa
     pyyaml

From f7d1a9709cca3ba8ecf761f1fd51438c6f42abfe Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:32:35 -0700
Subject: [PATCH 10/21] python3.pkgs.repoze_sphinx_autointerface: add missing
 test dependencies

---
 .../repoze_sphinx_autointerface/default.nix         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
index e98159128247a..073977d1252e3 100644
--- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
+++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
@@ -1,20 +1,31 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pytestCheckHook
 , zope_interface
+, zope_testrunner
 , sphinx
 }:
 
 buildPythonPackage rec {
   pname = "repoze.sphinx.autointerface";
   version = "1.0.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE=";
   };
 
-  propagatedBuildInputs = [ zope_interface sphinx ];
+  propagatedBuildInputs = [
+    zope_interface
+    sphinx
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    zope_testrunner
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/repoze/repoze.sphinx.autointerface";

From f0ed49fd5089c60c98b77bcc878e54ad9061c0c4 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:32:55 -0700
Subject: [PATCH 11/21] python3.pkgs.riscv-config: removing dangling pip import

---
 .../python-modules/riscv-config/default.nix           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix
index 75dd855af33fb..409c3a0d7ed1f 100644
--- a/pkgs/development/python-modules/riscv-config/default.nix
+++ b/pkgs/development/python-modules/riscv-config/default.nix
@@ -1,5 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 , cerberus
 , pyyaml
@@ -9,6 +10,7 @@
 buildPythonPackage rec {
   pname = "riscv-config";
   version = "3.5.2";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
@@ -17,6 +19,15 @@ buildPythonPackage rec {
     hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw=";
   };
 
+  patches = [
+    # Remove when updating to v3.8.0+
+    (fetchpatch {
+      name = "remove-dangling-pip-import.patch";
+      url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch";
+      hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E=";
+    })
+  ];
+
   propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ];
 
   meta = with lib; {

From 8a79c8e839987dfcb5ca882b092ad518c50980dc Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:33:17 -0700
Subject: [PATCH 12/21] python3.pkgs.rst2pdf: add missing build dependencies

---
 pkgs/development/python-modules/rst2pdf/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix
index 6d6a484255743..6fb44840f5b2f 100644
--- a/pkgs/development/python-modules/rst2pdf/default.nix
+++ b/pkgs/development/python-modules/rst2pdf/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
+, setuptools-scm
+, wheel
 , docutils
 , importlib-metadata
 , jinja2
@@ -19,18 +21,19 @@
 buildPythonPackage rec {
   pname = "rst2pdf";
   version = "0.101";
-
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg=";
+    hash = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg=";
   };
 
   outputs = [ "out" "man" ];
 
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [

From 87239a023bf86c282a9ac3766afbc2dd54afb9be Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:33:42 -0700
Subject: [PATCH 13/21] python3.pkgs.scikit-misc: add and relax build
 dependencies

---
 pkgs/development/python-modules/scikit-misc/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix
index fa35fbd9ed937..2cb24d76b2b9a 100644
--- a/pkgs/development/python-modules/scikit-misc/default.nix
+++ b/pkgs/development/python-modules/scikit-misc/default.nix
@@ -8,6 +8,8 @@
 , pkg-config
 , numpy
 , openblas
+, setuptools
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -23,6 +25,9 @@ buildPythonPackage rec {
 
   postPatch = ''
     patchShebangs .
+
+    substituteInPlace pyproject.toml \
+      --replace 'numpy==' 'numpy>='
   '';
 
   nativeBuildInputs = [
@@ -30,7 +35,10 @@ buildPythonPackage rec {
     gfortran
     git
     meson-python
+    numpy
     pkg-config
+    setuptools
+    wheel
   ];
 
   buildInputs = [

From 24fcb50419c0c42ae84863106ac3365d93671d23 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:34:06 -0700
Subject: [PATCH 14/21] python3.pkgs.scim2-filter-parser: replace poetry with
 poetry-core

---
 .../python-modules/scim2-filter-parser/default.nix     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix
index 9b140ae6fed5e..f3d37df7735cd 100644
--- a/pkgs/development/python-modules/scim2-filter-parser/default.nix
+++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , poetry-core
 , django
 , sly
@@ -20,6 +21,15 @@ buildPythonPackage rec {
     hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI=";
   };
 
+  patches = [
+    # https://github.com/15five/scim2-filter-parser/pull/43
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core.patch";
+      url = "https://github.com/15five/scim2-filter-parser/commit/675d85f3a3ff338e96a408827d64d9e893fa5255.patch";
+      hash = "sha256-PjJH1S5CDe/BMI0+mB34KdpNNcHfexBFYBmHolsWH4o=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];

From 286e3eb1c5235c2fc61dc08cf1378d96919c6321 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:34:22 -0700
Subject: [PATCH 15/21] python3.pkgs.setupmeta: add missing dependencies

---
 pkgs/development/python-modules/setupmeta/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index ef031de983472..258f958ce03f3 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -4,10 +4,12 @@
 , git
 , mock
 , pep440
+, pip
 , pytestCheckHook
 , pythonOlder
 , setuptools-scm
 , six
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -30,12 +32,14 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools-scm
+    wheel
   ];
 
   nativeCheckInputs = [
     git
     mock
     pep440
+    pip
     pytestCheckHook
     six
   ];

From 68d5e2e06e47fe6cb9e024f1ad787da7b1dd1d80 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:34:41 -0700
Subject: [PATCH 16/21] python3.pkgs.sphinxcontrib-spelling: add missing build
 dependencies

---
 .../python-modules/sphinxcontrib-spelling/default.nix     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index e5e92b8b038e0..2a8085de7c236 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -5,7 +5,9 @@
 , importlib-metadata
 , sphinx
 , pyenchant
-, pbr
+, setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -21,7 +23,9 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    pbr
+    setuptools
+    setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [

From 3c734d8c47a9b51c3d9e8745ffe3b72510dd841c Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:34:58 -0700
Subject: [PATCH 17/21] python3.pkgs.stravalib: add missing build dependencies

---
 pkgs/development/python-modules/stravalib/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix
index d41dcda8aba10..b05e147dcaa98 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/pkgs/development/python-modules/stravalib/default.nix
@@ -3,6 +3,8 @@
 , fetchPypi
 , nose
 , setuptools
+, setuptools-scm
+, wheel
 , arrow
 , requests
 , units
@@ -22,6 +24,12 @@ buildPythonPackage rec {
     hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
   nativeCheckInputs = [
     nose
   ];
@@ -33,7 +41,6 @@ buildPythonPackage rec {
     pint
     pydantic
     pytz
-    setuptools
     six
   ];
 

From e80053513f11b259d9aa54fc97ce755949896d60 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:35:13 -0700
Subject: [PATCH 18/21] python3.pkgs.tweedledum: fix broken pyproject.toml

---
 pkgs/development/python-modules/tweedledum/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix
index af5a65a080379..bc4808a268cb6 100644
--- a/pkgs/development/python-modules/tweedledum/default.nix
+++ b/pkgs/development/python-modules/tweedledum/default.nix
@@ -21,6 +21,11 @@ buildPythonPackage rec {
     hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM=";
   };
 
+  postPatch = ''
+    sed -i '/\[project\]/a version = "${version}"' pyproject.toml
+    sed -i '/\[project\]/a name = "tweedledum"' pyproject.toml
+  '';
+
   nativeBuildInputs = [ cmake ninja scikit-build ];
   dontUseCmakeConfigure = true;
 

From db4ba9acad658206fd250b22b45bc508a3921f56 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:35:32 -0700
Subject: [PATCH 19/21] python3.pkgs.xlsx2csv: add missing build dependencies

---
 pkgs/development/python-modules/xlsx2csv/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix
index 57d1549ee8674..156fbb9d387a5 100644
--- a/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -16,6 +18,8 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   meta = with lib; {

From a81ac2a830d50e180b2c3df340ba93fcbe3af4f0 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:35:49 -0700
Subject: [PATCH 20/21] python3.pkgs.xpath-expressions: replace poetry with
 poetry-core

---
 .../xpath-expressions/default.nix             | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index eebd30364e475..97e5e62b01aaf 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , lxml
 , poetry-core
 , pythonOlder
@@ -10,16 +11,25 @@
 buildPythonPackage rec {
   pname = "xpath-expressions";
   version = "1.1.0";
-  disabled = pythonOlder "3.5";
   format = "pyproject";
+  disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l289iw2zmzxyfi3g2z7b917vmsaz47h5jp871zvykpmpigc632h";
+    hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA=";
   };
 
+  patches = [
+    # https://github.com/orf/xpath-expressions/pull/4
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core.patch";
+      url = "https://github.com/orf/xpath-expressions/commit/3c5900fd6b2d08dd9468707f35ab42072cf75bd3.patch";
+      hash = "sha256-IeV6ncJyt/w2s5TPpbM5a3pljNT6Bp5PIiqgTg2iTRA=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -29,12 +39,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    # Was fixed upstream but not released
-    substituteInPlace pyproject.toml \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api"
-  '';
-
   pythonImportsCheck = [ "xpath" ];
 
   meta = with lib; {

From 01578d595acc35de1aad2c5fdc4c649c789a84ef Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:36:07 -0700
Subject: [PATCH 21/21] tesh: replace poetry with poetry-core

---
 pkgs/tools/text/tesh/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix
index 7961b120d2135..0b702ae0052a4 100644
--- a/pkgs/tools/text/tesh/default.nix
+++ b/pkgs/tools/text/tesh/default.nix
@@ -1,4 +1,4 @@
-{ python3Packages, fetchFromGitHub }:
+{ python3Packages, fetchFromGitHub, fetchpatch }:
 
 let
   version = "0.3.0";
@@ -12,13 +12,23 @@ in python3Packages.buildPythonPackage rec {
     owner = "OceanSprint";
     repo = "tesh";
     rev = version;
-    sha256 = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4=";
+    hash = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4=";
   };
 
-  prePatch = ''
-      substituteInPlace pyproject.toml \
-      --replace "poetry.masonry" "poetry.core.masonry"
-  '';
+  patches = [
+    # https://github.com/OceanSprint/tesh/pull/49
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core-1.patch";
+      url = "https://github.com/OceanSprint/tesh/commit/49b90f5a3c9cf111931393248943b1da966dc3ec.patch";
+      hash = "sha256-s+eGO4NXTGbyXcLP37kCg4GDrjAsYIlOwNDR1Q7+1Uc=";
+    })
+    # https://github.com/OceanSprint/tesh/pull/50
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core-2.patch";
+      url = "https://github.com/OceanSprint/tesh/commit/66798b54f28dc0b72159ee3a2144895cf945eaf0.patch";
+      hash = "sha256-f3uL7TZlkrTOWYihwWNfhrY5/xlBrclAMnbxRNXCGJw=";
+    })
+  ];
 
   checkInputs = [ python3Packages.pytest ];
   nativeBuildInputs = [ python3Packages.poetry-core ];