From 9ee775dacaaa40df0f10a1a095f1397fa69d4b97 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:23 +0200
Subject: [PATCH 01/39] python312Packages.pygmt: modernize

---
 pkgs/development/python-modules/pygmt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 90b00d9cd344..77d2669ee0ac 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -20,7 +20,7 @@
 buildPythonPackage rec {
   pname = "pygmt";
   version = "0.11.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 

From 0f502f437ebe7fa69593da7f0708f97f8f54e5ea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:23 +0200
Subject: [PATCH 02/39] python312Packages.pyisbn: modernize

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

diff --git a/pkgs/development/python-modules/pyisbn/default.nix b/pkgs/development/python-modules/pyisbn/default.nix
index b8df8ad15a78..fc4b9973c2dd 100644
--- a/pkgs/development/python-modules/pyisbn/default.nix
+++ b/pkgs/development/python-modules/pyisbn/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   hypothesis,
   pythonOlder,
   pytestCheckHook,
@@ -11,15 +12,17 @@
 buildPythonPackage rec {
   pname = "pyisbn";
   version = "1.3.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06fm9rn31cb4b61hzy63cnwfjpppgyy517k8a04gzcv9g60n7xbh";
+    hash = "sha256-cPVjgXlps/8IUGieULx/917puGXD+A+DWWSxMGxO1Rk=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook

From d8d377ecbb7270d9c3dfb273c2b6d40a0679110e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:23 +0200
Subject: [PATCH 03/39] python312Packages.py-libzfs: modernize

---
 pkgs/development/python-modules/py-libzfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix
index ce976862ea25..b66839c0722f 100644
--- a/pkgs/development/python-modules/py-libzfs/default.nix
+++ b/pkgs/development/python-modules/py-libzfs/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch2,
+  setuptools,
   cython_0,
   zfs,
 }:
@@ -27,16 +28,16 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ cython_0 ];
+  build-system = [ cython_0 ];
   buildInputs = [ zfs ];
 
   # Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107
   postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace configure \
-      --replace \
+      --replace-fail \
         'CFLAGS="-DCYTHON_FALLTHROUGH"' \
         'CFLAGS="-DCYTHON_FALLTHROUGH -I${zfs.dev}/include/libzfs -I${zfs.dev}/include/libspl"' \
-      --replace 'zof=false' 'zof=true'
+      --replace-fail 'zof=false' 'zof=true'
   '';
 
   pythonImportsCheck = [ "libzfs" ];

From 276d83321a379ff6b612ca18e0c204902d94c1f7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:23 +0200
Subject: [PATCH 04/39] python312Packages.pymarshal: modernize

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

diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix
index 63022ed6c41a..44bd1c815614 100644
--- a/pkgs/development/python-modules/pymarshal/default.nix
+++ b/pkgs/development/python-modules/pymarshal/default.nix
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
   pname = "pymarshal";
   version = "2.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stargateaudio";
@@ -23,12 +23,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner'" ""
+      --replace-fail "'pytest-runner'" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ bson ];
+  dependencies = [ bson ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 03ccee2fa430e7f8e73f32643b85054f7c520bc1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:23 +0200
Subject: [PATCH 05/39] python312Packages.pymetar: modernize

---
 pkgs/development/python-modules/pymetar/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index 3d4ba5a05089..f8657ddfcbf2 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -4,26 +4,29 @@
   buildPythonPackage,
   isPy3k,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pymetar";
   version = "1.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54";
+    hash = "sha256-SNvmxJKZYQIcth5Ju54GBbVMS2G5+5reUQdnBaCOzVQ=";
   };
 
+  build-system = [ setuptools ];
+
   checkPhase = ''
     cd testing/smoketest
     tar xzf reports.tgz
     mkdir logs
     patchShebangs runtests.sh
-    substituteInPlace runtests.sh --replace "break" "exit 1"  # fail properly
+    substituteInPlace runtests.sh --replace-fail "break" "exit 1"  # fail properly
     export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
     ./runtests.sh
   '';

From 764a640e45f65477118896fbb3ba029b0f509f5e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:24 +0200
Subject: [PATCH 06/39] python312Packages.pymoo: modernize

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

diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index b6476c9fe45e..fc044a935812 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
+  setuptools,
   pytestCheckHook,
   writeText,
   autograd,
@@ -21,7 +22,7 @@
 buildPythonPackage rec {
   pname = "pymoo";
   version = "0.6.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anyoptimization";
@@ -45,19 +46,21 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "cma==3.2.2" "cma" \
-      --replace "'alive-progress'," ""
+  pythonRelaxDeps = [ "cma" ];
+  pythonRemoveDeps = [ "alive-progress" ];
 
+  postPatch = ''
     substituteInPlace pymoo/util/display/display.py \
-      --replace "from pymoo.util.display.progress import ProgressBar" "" \
-      --replace "ProgressBar() if progress else None" \
+      --replace-fail "from pymoo.util.display.progress import ProgressBar" "" \
+      --replace-fail "ProgressBar() if progress else None" \
                 "print('Missing alive_progress needed for progress=True!') if progress else None"
   '';
 
-  nativeBuildInputs = [ cython ];
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    cython
+  ];
+  dependencies = [
     autograd
     cma
     deprecated
@@ -70,7 +73,7 @@ buildPythonPackage rec {
   doCheck = true;
   preCheck = ''
     substituteInPlace pymoo/config.py \
-      --replace "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
+      --replace-fail "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
                 "file://$pymoo_data/"
   '';
   nativeCheckInputs = [

From 50fd60c9f54dfc7d68b6b20ed9a5cb2470ac566a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:24 +0200
Subject: [PATCH 07/39] python312Packages.pyosf: modernize

---
 pkgs/development/python-modules/pyosf/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix
index 17cb05240118..be9f9d10153b 100644
--- a/pkgs/development/python-modules/pyosf/default.nix
+++ b/pkgs/development/python-modules/pyosf/default.nix
@@ -3,13 +3,14 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "pyosf";
   version = "1.0.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -22,12 +23,14 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner', " ""
+      --replace-fail "'pytest-runner', " ""
   '';
 
   preBuild = "export HOME=$TMP";
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # Tests require network access
   doCheck = false;

From e61286763b58b97a15c5ee6d13fb0e4205434bde Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:24 +0200
Subject: [PATCH 08/39] python312Packages.pyosohotwaterapi: modernize

---
 .../python-modules/pyosohotwaterapi/default.nix       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyosohotwaterapi/default.nix b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
index 137c587b6cbb..f2af54a279bc 100644
--- a/pkgs/development/python-modules/pyosohotwaterapi/default.nix
+++ b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
@@ -25,18 +25,15 @@ buildPythonPackage rec {
     hash = "sha256-7FLGmmndrFqSl4oC8QFIYNlFJPr+xbiZG5ZRt4vx8+s=";
   };
 
-  postPatch = ''
-    # https://github.com/osohotwateriot/apyosohotwaterapi/pull/3
-    substituteInPlace requirements.txt \
-      --replace "pre-commit" ""
-  '';
+  # https://github.com/osohotwateriot/apyosohotwaterapi/pull/3
+  pythonRemoveDeps = [ "pre-commit" ];
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     unasync
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     loguru
     numpy

From 0645f76d9b6370a9e91a51b35a012624688aaa67 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:24 +0200
Subject: [PATCH 09/39] python312Packages.pysrim: modernize

---
 pkgs/development/python-modules/pysrim/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix
index f9f4e9c59def..1c13452b0e55 100644
--- a/pkgs/development/python-modules/pysrim/default.nix
+++ b/pkgs/development/python-modules/pysrim/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   numpy,
   pythonOlder,
   pyyaml,
@@ -10,7 +11,7 @@
 buildPythonPackage rec {
   pname = "pysrim";
   version = "0.5.10";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -21,10 +22,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner', " ""
+      --replace-fail "'pytest-runner', " ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numpy
     pyyaml
   ];

From 6bd192cfd166f70acabfcb125f811b41434a86fc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:24 +0200
Subject: [PATCH 10/39] python312Packages.pysychonaut: modernize

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

diff --git a/pkgs/development/python-modules/pysychonaut/default.nix b/pkgs/development/python-modules/pysychonaut/default.nix
index eaae70a25730..408338cb4ef5 100644
--- a/pkgs/development/python-modules/pysychonaut/default.nix
+++ b/pkgs/development/python-modules/pysychonaut/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   requests,
   requests-cache,
   beautifulsoup4,
@@ -10,6 +11,7 @@
 buildPythonPackage rec {
   pname = "pysychonaut";
   version = "0.6.0";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "PySychonaut";
@@ -18,10 +20,12 @@ buildPythonPackage rec {
   };
 
   preConfigure = ''
-    substituteInPlace setup.py --replace "bs4" "beautifulsoup4"
+    substituteInPlace setup.py --replace-fail "bs4" "beautifulsoup4"
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     requests-cache
     beautifulsoup4

From c4b51e02bb8d40ead6c3993ca8ff46aadfdf434d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:25 +0200
Subject: [PATCH 11/39] python312Packages.pytest-ansible: modernize

---
 .../development/python-modules/pytest-ansible/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 12e9d62c9549..b59b781419af 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -29,18 +29,18 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace tests/conftest.py inventory \
-      --replace '/usr/bin/env' '${coreutils}/bin/env'
+    substituteInPlace inventory \
+      --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     ansible-core
     ansible-compat
     packaging

From 5f4c4aa31b1ca57fb84dbfdbb7aa73578a4967b5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:25 +0200
Subject: [PATCH 12/39] python312Packages.pytest-pylint: modernize

---
 .../development/python-modules/pytest-pylint/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix
index 7a9903def54c..5df06f4dbc35 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pylint,
   pytest,
   pytestCheckHook,
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "pytest-pylint";
   version = "0.21.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,12 +24,14 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "pytest-runner" ""
+      --replace-fail "pytest-runner" ""
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [ pytest ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pylint
     toml
   ];

From faf46faec377f420bc0fefb7a5c8fbe0b74c2806 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:25 +0200
Subject: [PATCH 13/39] python312Packages.pytest-raisesregexp: modernize

---
 .../python-modules/pytest-raisesregexp/default.nix  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index d9f2a8f4c07e..e6ce1e3a96e2 100644
--- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   py,
   pytest,
 }:
@@ -9,24 +10,20 @@
 buildPythonPackage rec {
   pname = "pytest-raisesregexp";
   version = "2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b54372494fc1f11388b1b9348aeb36b69609699eb8f46e0e010afc733d78236a";
+    hash = "sha256-tUNySU/B8ROIsbk0ius2tpYJaZ649G4OAQr8cz14I2o=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     py
     pytest
   ];
 
-  # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3
-  prePatch = ''
-    sed -i '3i\import io' setup.py
-    substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read(),"
-  '';
-
   meta = with lib; {
     description = "Simple pytest plugin to look for regex in Exceptions";
     homepage = "https://github.com/Walkman/pytest_raisesregexp";

From 1fe9dc27f34d214aeec51e9e9c7c8cb187b16429 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:25 +0200
Subject: [PATCH 14/39] python312Packages.python-redis-lock: modernize

---
 pkgs/development/python-modules/python-redis-lock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index bca7ec7225d3..e50bbeff87ce 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # Fix django tests
   postPatch = ''
     substituteInPlace tests/test_project/settings.py \
-      --replace "USE_L10N = True" ""
+      --replace-fail "USE_L10N = True" ""
   '';
 
   patches = [

From d3bfca5b7b44c7a01361371e1fa53391cefdd1e4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:25 +0200
Subject: [PATCH 15/39] python312Packages.python-tds: modernize

---
 pkgs/development/python-modules/python-tds/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix
index 5a2e8e70da6c..f4775b8e1798 100644
--- a/pkgs/development/python-modules/python-tds/default.nix
+++ b/pkgs/development/python-modules/python-tds/default.nix
@@ -26,12 +26,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "version.get_git_version()" '"${version}"'
+      --replace-fail "version.get_git_version()" '"${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ six ];
+  dependencies = [ six ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 27bffab2b792265df4df6c530cac30f99e970571 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:26 +0200
Subject: [PATCH 16/39] python312Packages.python-twitter: modernize

---
 pkgs/development/python-modules/python-twitter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix
index c61d726b7161..1811ba176a1e 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/pkgs/development/python-modules/python-twitter/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner'" ""
+      --replace-fail "'pytest-runner'" ""
   '';
 
   disabledTests = [

From 132c353362278710783c00d940fcb6376527c7bb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:26 +0200
Subject: [PATCH 17/39] python312Packages.pyverilog: modernize

---
 .../python-modules/pyverilog/default.nix            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix
index 0868f7eadde5..9e7077a60f57 100644
--- a/pkgs/development/python-modules/pyverilog/default.nix
+++ b/pkgs/development/python-modules/pyverilog/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  setuptools,
   jinja2,
   ply,
   iverilog,
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "pyverilog";
   version = "1.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -24,10 +25,14 @@ buildPythonPackage rec {
   patchPhase = ''
     # The path to Icarus can still be overridden via an environment variable at runtime.
     substituteInPlace pyverilog/vparser/preprocessor.py \
-      --replace "iverilog = 'iverilog'" "iverilog = '${iverilog}/bin/iverilog'"
+      --replace-fail \
+        "iverilog = 'iverilog'" \
+        "iverilog = '${lib.getExe' iverilog "iverilog"}'"
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     jinja2
     ply
     iverilog
@@ -35,7 +40,7 @@ buildPythonPackage rec {
 
   preCheck = ''
     substituteInPlace pytest.ini \
-      --replace "python_paths" "pythonpath"
+      --replace-fail "python_paths" "pythonpath"
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];

From 0bf7908b1dbc2df66cbb4b6c7bb7001d0356f7a7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:26 +0200
Subject: [PATCH 18/39] python312Packages.pyweatherflowrest: modernize

---
 .../python-modules/pyweatherflowrest/default.nix      | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index 3ae2b78132ef..44d0ab267280 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -10,7 +10,7 @@
 buildPythonPackage rec {
   pname = "pyweatherflowrest";
   version = "1.0.11";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -21,14 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-l1V3HgzqnnoY6sWHwfgBtcIR782RwKhekY2qOLrUMNY=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ aiohttp ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "--cov=pyweatherflowrest --cov-append" ""
-  '';
+  dependencies = [ aiohttp ];
 
   # Module has no tests. test.py is a demo script
   doCheck = false;

From 7675651982806ef5f7fa1b61efb91c3d5659f2df Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:26 +0200
Subject: [PATCH 19/39] python312Packages.qualysclient: modernize

---
 pkgs/development/python-modules/qualysclient/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix
index 39c3c47e67be..e8ada185d51a 100644
--- a/pkgs/development/python-modules/qualysclient/default.nix
+++ b/pkgs/development/python-modules/qualysclient/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  setuptools,
   certifi,
   charset-normalizer,
   fetchFromGitHub,
@@ -17,7 +18,7 @@
 buildPythonPackage rec {
   pname = "qualysclient";
   version = "0.0.4.8.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -30,10 +31,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "version=__version__," 'version="${version}",'
+      --replace-fail "version=__version__," 'version="${version}",'
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     certifi
     charset-normalizer
     idna

From 052bab367d26afb939043e5b290822110f57b729 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:26 +0200
Subject: [PATCH 20/39] python312Packages.quart-cors: modernize

---
 pkgs/development/python-modules/quart-cors/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix
index a9b92612366f..9299487aa732 100644
--- a/pkgs/development/python-modules/quart-cors/default.nix
+++ b/pkgs/development/python-modules/quart-cors/default.nix
@@ -20,7 +20,7 @@
 buildPythonPackage rec {
   pname = "quart-cors";
   version = "0.7.0";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pgjones";
@@ -29,9 +29,9 @@ buildPythonPackage rec {
     hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  dependencies = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
 
   pythonImportsCheck = [ "quart_cors" ];
 

From 617806be1521f1e799e01ebe4bd005ad19c44cfd Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:27 +0200
Subject: [PATCH 21/39] python312Packages.rouge-score: modernize

---
 .../python-modules/rouge-score/default.nix            | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix
index a63d958bdafe..adc543b1d907 100644
--- a/pkgs/development/python-modules/rouge-score/default.nix
+++ b/pkgs/development/python-modules/rouge-score/default.nix
@@ -3,6 +3,7 @@
   fetchPypi,
   fetchFromGitHub,
   buildPythonPackage,
+  setuptools,
   absl-py,
   nltk,
   numpy,
@@ -22,7 +23,7 @@ in
 buildPythonPackage rec {
   pname = "rouge-score";
   version = "0.1.2";
-  format = "setuptools";
+  pyproject = true;
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
@@ -35,10 +36,14 @@ buildPythonPackage rec {
   # the tar file from pypi doesn't come with the test data
   postPatch = ''
     substituteInPlace rouge_score/test_util.py \
-      --replace 'os.path.join(os.path.dirname(__file__), "testdata")' '"${testdata}/rouge/testdata/"'
+      --replace-fail \
+        'os.path.join(os.path.dirname(__file__), "testdata")' \
+        '"${testdata}/rouge/testdata/"'
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     absl-py
     nltk
     numpy

From 9fb43bd1250f114d2eca12b746c3072380e487cc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:27 +0200
Subject: [PATCH 22/39] python312Packages.sanic-auth: modernize

---
 .../development/python-modules/sanic-auth/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix
index b2e25cd82c8a..27555052af9c 100644
--- a/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/pkgs/development/python-modules/sanic-auth/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   sanic,
   sanic-testing,
   pytestCheckHook,
@@ -10,15 +11,17 @@
 buildPythonPackage rec {
   pname = "sanic-auth";
   version = "0.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "Sanic-Auth";
     inherit version;
-    sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
+    hash = "sha256-KAU066S70GO1hURQrW0n+L5/kFzpgen341hlia0ngjU=";
   };
 
-  propagatedBuildInputs = [ sanic ];
+  build-system = [ setuptools ];
+
+  dependencies = [ sanic ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -33,7 +36,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Support for httpx>=0.20.0
     substituteInPlace tests/test_auth.py \
-      --replace "allow_redirects=False" "follow_redirects=False"
+      --replace-fail "allow_redirects=False" "follow_redirects=False"
   '';
 
   pythonImportsCheck = [ "sanic_auth" ];

From 156a6031d92a526b38f1565148b96bf0168a3d7f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:27 +0200
Subject: [PATCH 23/39] python312Packages.schemdraw: modernize

---
 pkgs/development/python-modules/schemdraw/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix
index 7dc5c1771372..0bf09e59751c 100644
--- a/pkgs/development/python-modules/schemdraw/default.nix
+++ b/pkgs/development/python-modules/schemdraw/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
 
   # Strip out references to unfree fonts from the test suite
   postPatch = ''
-    substituteInPlace test/test_styles.ipynb --replace "font='Times', " ""
+    substituteInPlace test/test_backend.ipynb --replace-fail "(font='Times')" "()"
   '';
 
   preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files

From 1373e907d5351e7e9637948cbb999ef4bf52edad Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:27 +0200
Subject: [PATCH 24/39] python312Packages.scrapy-fake-useragent: modernize

---
 .../python-modules/scrapy-fake-useragent/default.nix  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index ddb8416598b2..36163e8a0c91 100644
--- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -1,9 +1,11 @@
 {
   lib,
   buildPythonPackage,
+  setuptools,
   fake-useragent,
   faker,
   fetchFromGitHub,
+  pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -13,7 +15,7 @@
 buildPythonPackage rec {
   pname = "scrapy-fake-useragent";
   version = "1.4.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -27,15 +29,18 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pytest.ini \
-      --replace " --cov=scrapy_fake_useragent --cov-report=term --cov-report=html --fulltrace" ""
+      --replace-fail " --fulltrace" ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     fake-useragent
     faker
   ];
 
   nativeCheckInputs = [
+    pytest-cov-stub
     pytest-mock
     pytestCheckHook
     scrapy

From 9a435661ae65aa067767c8c20e9bb7d819f7369e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:27 +0200
Subject: [PATCH 25/39] python312Packages.semaphore-bot: modernize

---
 .../python-modules/semaphore-bot/default.nix      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/semaphore-bot/default.nix b/pkgs/development/python-modules/semaphore-bot/default.nix
index e16714bcab37..e69a920bc8ea 100644
--- a/pkgs/development/python-modules/semaphore-bot/default.nix
+++ b/pkgs/development/python-modules/semaphore-bot/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   python-dateutil,
   attrs,
   anyio,
@@ -10,18 +11,22 @@
 buildPythonPackage rec {
   pname = "semaphore-bot";
   version = "0.17.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
     hash = "sha256-3zb6+HdOB6+YrVRcmIHsokFKUOlFmKCoVNllvM+aOXQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio"
-  '';
+  pythonRelaxDeps = [
+    "anyio"
+    "attrs"
+    "python-dateutil"
+  ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     anyio
     attrs
     python-dateutil

From ff0052fbb0fa8567a57f48af2383073fa2ff2317 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:28 +0200
Subject: [PATCH 26/39] python312Packages.skyfield: modernize

---
 pkgs/development/python-modules/skyfield/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix
index c55422a969b5..d4d6fa3f1b96 100644
--- a/pkgs/development/python-modules/skyfield/default.nix
+++ b/pkgs/development/python-modules/skyfield/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  setuptools,
   certifi,
   numpy,
   sgp4,
@@ -16,7 +17,7 @@
 buildPythonPackage rec {
   pname = "skyfield";
   version = "1.45";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "skyfielders";
@@ -29,10 +30,12 @@ buildPythonPackage rec {
   # https://github.com/skyfielders/python-skyfield/issues/582#issuecomment-822033858
   postPatch = ''
     substituteInPlace skyfield/tests/test_planetarylib.py \
-      --replace "if IS_32_BIT" "if True"
+      --replace-fail "if IS_32_BIT" "if True"
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     certifi
     numpy
     sgp4

From 9ec9772051c372bf09702f399217865cb44531a3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:28 +0200
Subject: [PATCH 27/39] python312Packages.snakebite: modernize

---
 pkgs/development/python-modules/snakebite/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix
index c07ac11055e6..26fffc755933 100644
--- a/pkgs/development/python-modules/snakebite/default.nix
+++ b/pkgs/development/python-modules/snakebite/default.nix
@@ -2,24 +2,27 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   protobuf,
 }:
 
 buildPythonPackage rec {
   pname = "snakebite";
   version = "2.11.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "085238b4944cb9c658ee62d5794de936ac3d0c337c504b2cc86424a205ae978a";
+    hash = "sha256-CFI4tJRMucZY7mLVeU3pNqw9DDN8UEssyGQkogWul4o=";
   };
 
-  propagatedBuildInputs = [ protobuf ];
+  build-system = [ setuptools ];
+
+  dependencies = [ protobuf ];
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'argparse'" ""
+      --replace-fail "'argparse'" ""
   '';
 
   # Tests require hadoop hdfs

From 8fbf1d339553501c5aac6c0db3d20ffbf47393f0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:28 +0200
Subject: [PATCH 28/39] python312Packages.snakemake-storage-plugin-s3:
 modernize

---
 .../snakemake-storage-plugin-s3/default.nix           | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
index 2b7ce3562466..358aca0d82ab 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
@@ -14,7 +14,7 @@
 buildPythonPackage rec {
   pname = "snakemake-storage-plugin-s3";
   version = "0.2.12";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
@@ -23,14 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-TKv/7b3+uhY18v7p1ZSya5KJEMUv4M1NkObP9vPzMxU=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace ">=2.0,<2.2" "*"
-  '';
+  build-system = [ poetry-core ];
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     boto3
     botocore
     snakemake-interface-storage-plugins

From 9ab933e191fe422e2748db6840fdf9ab00cf86cf Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:28 +0200
Subject: [PATCH 29/39] python312Packages.snakemake-storage-plugin-xrootd:
 modernize

---
 .../snakemake-storage-plugin-xrootd/default.nix       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
index 264dcf516d17..3f67ce74218f 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
   pname = "snakemake-storage-plugin-xrootd";
   version = "unstable-2023-12-16";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
@@ -22,14 +22,11 @@ buildPythonPackage rec {
   };
 
   # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'xrootd = "^5.6.4"' ""
-  '';
+  pythonRelaxDeps = [ "xrootd" ];
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     snakemake-interface-storage-plugins
     snakemake-interface-common
     xrootd

From 79ffa9e18d2f40f414284227e81bf199794f42c7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:28 +0200
Subject: [PATCH 30/39] python312Packages.spyse-python: modernize

---
 .../python-modules/spyse-python/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix
index 0a37e99b02a2..fc96952be47a 100644
--- a/pkgs/development/python-modules/spyse-python/default.nix
+++ b/pkgs/development/python-modules/spyse-python/default.nix
@@ -34,18 +34,19 @@ buildPythonPackage rec {
     })
   ];
 
+  pythonRemoveDeps = [ "dataclasses" ];
+
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'dataclasses~=0.6'," "" \
-      --replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \
-      --replace "responses~=0.13.3" "responses>=0.13.3" \
-      --replace "limiter~=0.1.2" "limiter>=0.1.2" \
-      --replace "requests~=2.26.0" "requests>=2.26.0"
+      --replace-fail "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \
+      --replace-fail "responses~=0.13.3" "responses>=0.13.3" \
+      --replace-fail "limiter~=0.1.2" "limiter>=0.1.2" \
+      --replace-fail "requests~=2.26.0" "requests>=2.26.0"
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     dataclasses-json
     responses

From 42c5dd113b39a5aaf6a54ca5ee01ea421e87ea49 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:29 +0200
Subject: [PATCH 31/39] python312Packages.testing-common-database: modernize

---
 .../python-modules/testing-common-database/default.nix      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/testing-common-database/default.nix b/pkgs/development/python-modules/testing-common-database/default.nix
index 021b3e7ef7e2..0555bd8ee025 100644
--- a/pkgs/development/python-modules/testing-common-database/default.nix
+++ b/pkgs/development/python-modules/testing-common-database/default.nix
@@ -2,11 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "testing.common.database";
   version = "2.0.3";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -15,9 +17,11 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace src/testing/common/database.py \
-      --replace "collections.Callable" "collections.abc.Callable"
+      --replace-fail "collections.Callable" "collections.abc.Callable"
   '';
 
+  build-system = [ setuptools ];
+
   # There are no unit tests
   doCheck = false;
 

From 9990671fa4fc58bf9c54b1bc2461923e75c216ed Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:29 +0200
Subject: [PATCH 32/39] python312Packages.testing-postgresql: modernize

---
 .../python-modules/testing-postgresql/default.nix   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix
index c2b85fe8f9d7..1b16def31580 100644
--- a/pkgs/development/python-modules/testing-postgresql/default.nix
+++ b/pkgs/development/python-modules/testing-postgresql/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pg8000,
   postgresql,
   psycopg2,
@@ -15,7 +16,7 @@ buildPythonPackage rec {
   pname = "testing-postgresql";
   # Version 1.3.0 isn't working so let's use the latest commit from GitHub
   version = "unstable-2017-10-31";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -26,7 +27,9 @@ buildPythonPackage rec {
     hash = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     testing-common-database
     pg8000
   ];
@@ -40,12 +43,14 @@ buildPythonPackage rec {
   # Add PostgreSQL to search path
   prePatch = ''
     substituteInPlace src/testing/postgresql.py \
-      --replace "/usr/local/pgsql" "${postgresql}"
+      --replace-fail "/usr/local/pgsql" "${postgresql}"
   '';
 
+  pythonRelaxDeps = [ "pg8000" ];
+
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "pg8000 >= 1.10" "pg8000"
+      --replace-fail "pg8000 >= 1.10" "pg8000"
     substituteInPlace tests/test_postgresql.py \
       --replace-fail "self.assertRegexpMatches" "self.assertRegex"
   '';

From 227ac2a7eb2e92e229a28401b879f9879417d8df Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:29 +0200
Subject: [PATCH 33/39] python312Packages.toggl-cli: modernize

---
 pkgs/development/python-modules/toggl-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 81b90b520552..5c0cd5a17b1c 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     substituteInPlace requirements.txt \
       --replace-fail "==" ">="
     substituteInPlace pytest.ini \
-      --replace ' -m "not premium"' ""
+      --replace-fail ' -m "not premium"' ""
   '';
 
   build-system = [

From 83026ffde6e1d15fb22644e635bca6b40aa865b4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:29 +0200
Subject: [PATCH 34/39] python312Packages.twitch-python: modernize

---
 .../development/python-modules/twitch-python/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/twitch-python/default.nix b/pkgs/development/python-modules/twitch-python/default.nix
index 9cf268fc0b64..0f5cfad85ac4 100644
--- a/pkgs/development/python-modules/twitch-python/default.nix
+++ b/pkgs/development/python-modules/twitch-python/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   requests,
   rx,
   pytestCheckHook,
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "twitch-python";
   version = "0.0.20";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -22,10 +23,12 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   postPatch = ''
-    substituteInPlace setup.py --replace "'pipenv'," ""
+    substituteInPlace setup.py --replace-fail "'pipenv'," ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     rx
   ];

From dda86a4a7b6c58cde006c3eee1354c85b90ce9d8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:29 +0200
Subject: [PATCH 35/39] python312Packages.versiontag: modernize

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

diff --git a/pkgs/development/python-modules/versiontag/default.nix b/pkgs/development/python-modules/versiontag/default.nix
index 6a50c7996dd8..4dbb69bd781f 100644
--- a/pkgs/development/python-modules/versiontag/default.nix
+++ b/pkgs/development/python-modules/versiontag/default.nix
@@ -2,13 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   git,
 }:
 
 buildPythonPackage rec {
   pname = "versiontag";
   version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thelabnyc";
@@ -19,9 +20,11 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "get_version(pypi=True)" '"${version}"'
+      --replace-fail "get_version(pypi=True)" '"${version}"'
   '';
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ git ];
 
   pythonImportsCheck = [ "versiontag" ];

From 7b602b5456989ac8223c4f1e15fd0a0357d63635 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:30 +0200
Subject: [PATCH 36/39] python312Packages.videocr: modernize

---
 .../python-modules/videocr/default.nix          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix
index cb388dd66d00..262c109325d9 100644
--- a/pkgs/development/python-modules/videocr/default.nix
+++ b/pkgs/development/python-modules/videocr/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   levenshtein,
   pytesseract,
   opencv4,
@@ -11,14 +12,16 @@
 buildPythonPackage rec {
   pname = "videocr";
   version = "0.1.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1clifwczvhvbaw2spgxkkyqsbqh21vyfw3rh094pxfmq89ylyj63";
+    hash = "sha256-w0hPfUK4un5JAjAP7vwOAuKlsZ+zv6sFV2vD/Rl3kbI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     levenshtein
     pytesseract
     opencv4
@@ -27,12 +30,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "python-Levenshtein" "Levenshtein" \
-      --replace "opencv-python" "opencv"
+      --replace-fail "python-Levenshtein" "Levenshtein" \
+      --replace-fail "opencv-python" "opencv"
     substituteInPlace videocr/constants.py \
-      --replace "master" "main"
+      --replace-fail "master" "main"
     substituteInPlace videocr/video.py \
-      --replace '--tessdata-dir "{}"' '--tessdata-dir="{}"'
+      --replace-fail '--tessdata-dir "{}"' '--tessdata-dir="{}"'
   '';
 
   # Project has no tests

From 292a9bce10f59a46378d99eefbdb079bd92e4159 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:30 +0200
Subject: [PATCH 37/39] python312Packages.webdav4: modernize

---
 pkgs/development/python-modules/webdav4/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix
index 8083b080e44d..9a6459fa375e 100644
--- a/pkgs/development/python-modules/webdav4/default.nix
+++ b/pkgs/development/python-modules/webdav4/default.nix
@@ -10,6 +10,7 @@
   httpx,
   pytest-xdist,
   pytestCheckHook,
+  pytest-cov-stub,
   python-dateutil,
   pythonOlder,
   wsgidav,
@@ -29,17 +30,12 @@ buildPythonPackage rec {
     hash = "sha256-LgWYgERRuUODFzUnC08kDJTVRx9vanJ+OU8sREEMVwM=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov" ""
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     httpx
     python-dateutil
   ];
@@ -49,6 +45,7 @@ buildPythonPackage rec {
     colorama
     pytest-xdist
     pytestCheckHook
+    pytest-cov-stub
     wsgidav
   ] ++ passthru.optional-dependencies.fsspec;
 

From 17ee29bd65f66b1c4cf4005094910d8f6b16da88 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:30 +0200
Subject: [PATCH 38/39] python312Packages.yowsup: modernize

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

diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index b95a996f7683..06612b963230 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -4,6 +4,7 @@
   pythonOlder,
   isPy3k,
   fetchFromGitHub,
+  setuptools,
   appdirs,
   consonance,
   protobuf,
@@ -16,7 +17,7 @@
 buildPythonPackage rec {
   pname = "yowsup";
   version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   # The Python 2.x support of this package is incompatible with `six==1.11`:
   # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
@@ -29,15 +30,14 @@ buildPythonPackage rec {
     sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "argparse" "" \
-      --replace "==" ">=" \
-  '';
+  pythonRelaxDeps = true;
+  pythonRemoveDeps = [ "argparse" ];
+
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     appdirs
     consonance
     protobuf

From ef99fd7d50668be0a35f09dd955b3c66075a83a4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 Aug 2024 18:50:30 +0200
Subject: [PATCH 39/39] python312Packages.zeversolarlocal: modernize

---
 .../python-modules/zeversolarlocal/default.nix    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix
index 58b756108a2f..b4c5db9ec61a 100644
--- a/pkgs/development/python-modules/zeversolarlocal/default.nix
+++ b/pkgs/development/python-modules/zeversolarlocal/default.nix
@@ -7,6 +7,7 @@
   dos2unix,
   httpx,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -15,24 +16,25 @@
 buildPythonPackage rec {
   pname = "zeversolarlocal";
   version = "1.1.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ExZy5k5RE7k+D0lGmuIkGWrWQ+m24K2oqbUEg4BAVuY=";
+    hash = "sha256-ExZy5k5RE7k+D0lGmuIkGWrWQ+m24K2oqbUEg4BAVuY=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     flit-core
     dos2unix
   ];
 
-  propagatedBuildInputs = [ httpx ];
+  dependencies = [ httpx ];
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytest-mock
     pytestCheckHook
   ];
@@ -51,11 +53,6 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" ""
-  '';
-
   disabledTests = [
     # Test requires network access
     "test_httpx_timeout"