From 1660cdab1c4819a3b2fcc9a061c88147daead030 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sat, 31 May 2025 12:50:49 +0200
Subject: [PATCH 01/38] aliases: remove buildFHSUserEnv*

---
 pkgs/top-level/aliases.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a6cf0e2bdd4d..fb1cb4956e80 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -372,10 +372,10 @@ mapAliases {
 
   inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
   bwidget = tclPackages.bwidget; # Added 2024-10-02
-  # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16
-  buildFHSUserEnv = lib.warnOnInstantiate "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and will be removed in 25.11" buildFHSEnv;
-  buildFHSUserEnvChroot = lib.warnOnInstantiate "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and will be removed in 25.11" buildFHSEnvChroot;
-  buildFHSUserEnvBubblewrap = lib.warnOnInstantiate "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and will be removed in 25.11" buildFHSEnvBubblewrap;
+  # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16. Removed on 2025-05-31
+  buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11";
+  buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11";
+  buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11";
 
   # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
   bitwarden_rs = vaultwarden;

From 11f150163fc7c268b29b61b5a909fa530e4a12e2 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 3 Jul 2025 00:32:20 +0200
Subject: [PATCH 02/38] pkgs/by-name/{a,b,c,d}*: migrate to format =
 "pyproject"

---
 pkgs/by-name/ac/accelergy/package.nix         |  9 ++++---
 pkgs/by-name/ad/adafruit-ampy/package.nix     | 13 +++++-----
 pkgs/by-name/ad/addic7ed-cli/package.nix      |  8 ++++--
 pkgs/by-name/ai/aiodnsbrute/package.nix       |  8 ++++--
 pkgs/by-name/al/almonds/package.nix           | 15 ++++++-----
 pkgs/by-name/am/amoco/package.nix             |  7 ++---
 pkgs/by-name/am/amphetype/package.nix         |  8 ++++--
 pkgs/by-name/an/antfs-cli/package.nix         |  6 +++--
 pkgs/by-name/ap/apksigcopier/package.nix      | 10 ++++---
 pkgs/by-name/ap/apt-offline/package.nix       |  6 ++++-
 pkgs/by-name/ar/archivy/package.nix           | 14 +++++-----
 pkgs/by-name/ar/arsenal/package.nix           |  8 ++++--
 .../ar/arxiv-latex-cleaner/package.nix        |  8 ++++--
 pkgs/by-name/as/asn1editor/package.nix        |  8 ++++--
 pkgs/by-name/at/atomic-operator/package.nix   | 16 +++++++-----
 pkgs/by-name/au/autokey/package.nix           |  8 ++++--
 pkgs/by-name/ay/ayatana-webmail/package.nix   |  8 ++++--
 .../ba/base16-shell-preview/package.nix       |  6 ++++-
 pkgs/by-name/ba/bashplotlib/package.nix       |  6 ++++-
 pkgs/by-name/bk/bkyml/package.nix             | 26 ++++++++++---------
 pkgs/by-name/bl/blivet-gui/package.nix        |  6 ++++-
 pkgs/by-name/br/brotab/package.nix            | 14 ++++++----
 pkgs/by-name/bt/btlejack/package.nix          |  8 ++++--
 pkgs/by-name/bu/bubblemail/package.nix        |  6 ++++-
 pkgs/by-name/bu/bumblebee-status/package.nix  |  9 +++++--
 pkgs/by-name/bu/bumpver/package.nix           | 14 ++++++----
 pkgs/by-name/ca/canto-curses/package.nix      |  6 ++++-
 pkgs/by-name/ca/canto-daemon/package.nix      |  6 +++--
 pkgs/by-name/ca/cantoolz/package.nix          |  8 ++++--
 pkgs/by-name/ch/charge-lnd/package.nix        |  6 ++++-
 pkgs/by-name/ch/chatblade/package.nix         | 11 ++++++--
 pkgs/by-name/cl/clickable/package.nix         |  6 +++--
 pkgs/by-name/co/colorz/package.nix            |  8 ++++--
 pkgs/by-name/co/compdb/package.nix            |  6 ++++-
 pkgs/by-name/cp/cp210x-program/package.nix    |  8 ++++--
 pkgs/by-name/cp/cppclean/package.nix          | 10 ++++---
 pkgs/by-name/cp/cpuset/package.nix            |  6 ++++-
 pkgs/by-name/cr/creds/package.nix             | 10 ++++---
 pkgs/by-name/cr/crlfsuite/package.nix         |  8 ++++--
 pkgs/by-name/cr/crowbar/package.nix           |  6 +++--
 pkgs/by-name/cs/csv2odf/package.nix           |  7 ++++-
 pkgs/by-name/cs/csvs-to-sqlite/package.nix    | 12 ++++-----
 pkgs/by-name/cu/cum/package.nix               | 12 +++++----
 pkgs/by-name/cu/curseradio/package.nix        |  8 ++++--
 pkgs/by-name/cu/cursewords/package.nix        | 11 +++++---
 pkgs/by-name/cv/cvehound/package.nix          |  9 ++++---
 pkgs/by-name/di/dict-cc-py/package.nix        |  8 ++++--
 pkgs/by-name/dn/dnd-tools/package.nix         |  6 ++++-
 pkgs/by-name/dn/dnsviz/package.nix            |  6 ++++-
 pkgs/by-name/do/dockbarx/package.nix          |  8 ++++--
 pkgs/by-name/do/dotfiles/package.nix          |  7 +++--
 pkgs/by-name/dp/dpt-rp1-py/package.nix        |  9 ++++---
 pkgs/by-name/dt/dtrx/package.nix              |  6 +++--
 53 files changed, 325 insertions(+), 144 deletions(-)

diff --git a/pkgs/by-name/ac/accelergy/package.nix b/pkgs/by-name/ac/accelergy/package.nix
index 40948cab7158..ccd8dfadb186 100644
--- a/pkgs/by-name/ac/accelergy/package.nix
+++ b/pkgs/by-name/ac/accelergy/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "accelergy";
   version = "unstable-2022-05-03";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Accelergy-Project";
@@ -16,11 +16,14 @@ python3Packages.buildPythonApplication {
     hash = "sha256-SRtt1EocHy5fKszpoumC+mOK/qhreoA2/Ff1wcu5WKo=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pyyaml
     yamlordereddictloader
     pyfiglet
-    setuptools
   ];
 
   meta = {
diff --git a/pkgs/by-name/ad/adafruit-ampy/package.nix b/pkgs/by-name/ad/adafruit-ampy/package.nix
index 7c8ada704bc6..74e7d8239d18 100644
--- a/pkgs/by-name/ad/adafruit-ampy/package.nix
+++ b/pkgs/by-name/ad/adafruit-ampy/package.nix
@@ -4,20 +4,21 @@
   fetchPypi,
 }:
 
-with python3.pkgs;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "adafruit-ampy";
   version = "1.1.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "f4cba36f564096f2aafd173f7fbabb845365cc3bb3f41c37541edf98b58d3976";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     click
     python-dotenv
     pyserial
diff --git a/pkgs/by-name/ad/addic7ed-cli/package.nix b/pkgs/by-name/ad/addic7ed-cli/package.nix
index 8ef9ab342c82..01fadf492138 100644
--- a/pkgs/by-name/ad/addic7ed-cli/package.nix
+++ b/pkgs/by-name/ad/addic7ed-cli/package.nix
@@ -7,14 +7,18 @@
 python3Packages.buildPythonApplication rec {
   pname = "addic7ed-cli";
   version = "1.4.6";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "182cpwxpdybsgl1nps850ysvvjbqlnx149kri4hxhgm58nqq0qf5";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     requests
     pyquery
   ];
diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
index 12c1690b6231..b6acc1702c1a 100644
--- a/pkgs/by-name/ai/aiodnsbrute/package.nix
+++ b/pkgs/by-name/ai/aiodnsbrute/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "aiodnsbrute";
   version = "0.3.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "blark";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     aiodns
     click
     tqdm
diff --git a/pkgs/by-name/al/almonds/package.nix b/pkgs/by-name/al/almonds/package.nix
index fbc2d42b40ee..e4e17e58d948 100644
--- a/pkgs/by-name/al/almonds/package.nix
+++ b/pkgs/by-name/al/almonds/package.nix
@@ -5,11 +5,10 @@
   ncurses,
 }:
 
-with python3.pkgs;
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "almonds";
   version = "1.25b";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Tenchi2xh";
@@ -18,11 +17,13 @@ buildPythonApplication rec {
     sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws";
   };
 
-  nativeBuildInputs = [ pytest ];
-  buildInputs = [ ncurses ];
-  propagatedBuildInputs = [ pillow ];
+  build-system = with python3.pkgs; [ setuptools ];
 
-  checkPhase = "py.test";
+  dependencies = with python3.pkgs; [ pillow ];
+
+  buildInputs = [ ncurses ];
+
+  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Terminal Mandelbrot fractal viewer";
diff --git a/pkgs/by-name/am/amoco/package.nix b/pkgs/by-name/am/amoco/package.nix
index 406ed970facf..e66d63630dc1 100644
--- a/pkgs/by-name/am/amoco/package.nix
+++ b/pkgs/by-name/am/amoco/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "amoco";
   version = "2.9.8";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "bdcht";
@@ -16,10 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-3+1ssFyU7SKFJgDYBQY0kVjmTHOD71D2AjnH+4bfLXo=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     blessed
     click
     crysp
diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix
index 2b0de7c9dd1e..23d4c30edf8b 100644
--- a/pkgs/by-name/am/amphetype/package.nix
+++ b/pkgs/by-name/am/amphetype/package.nix
@@ -13,7 +13,7 @@ let
   description = "Advanced typing practice program";
 in
 python3Packages.buildPythonApplication {
-  format = "setuptools";
+  format = "pyproject";
   inherit pname version;
 
   src = fetchFromGitLab {
@@ -33,7 +33,11 @@ python3Packages.buildPythonApplication {
     qt5.qtwayland
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     editdistance
     pyqt5
     translitcodec
diff --git a/pkgs/by-name/an/antfs-cli/package.nix b/pkgs/by-name/an/antfs-cli/package.nix
index aa62577277d3..a5b11bc10bc8 100644
--- a/pkgs/by-name/an/antfs-cli/package.nix
+++ b/pkgs/by-name/an/antfs-cli/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "antfs-cli";
   version = "unstable-2017-02-11";
-  format = "setuptools";
+  format = "pyproject";
 
   meta = with lib; {
     homepage = "https://github.com/Tigge/antfs-cli";
@@ -24,5 +24,7 @@ python3Packages.buildPythonApplication {
     sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy";
   };
 
-  propagatedBuildInputs = [ python3Packages.openant ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.openant ];
 }
diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix
index f2b5e0333c23..58ee87f22228 100644
--- a/pkgs/by-name/ap/apksigcopier/package.nix
+++ b/pkgs/by-name/ap/apksigcopier/package.nix
@@ -11,7 +11,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "apksigcopier";
   version = "1.1.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "obfusk";
@@ -25,7 +25,11 @@ python3.pkgs.buildPythonApplication rec {
     pandoc
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     click
   ];
 
@@ -38,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace /bin/bash ${bash}/bin/bash
+      --replace-fail /bin/bash ${bash}/bin/bash
   '';
 
   postBuild = ''
diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix
index 8d107e2e5dfb..a230ddaffe32 100644
--- a/pkgs/by-name/ap/apt-offline/package.nix
+++ b/pkgs/by-name/ap/apt-offline/package.nix
@@ -18,11 +18,15 @@ let
   };
 in
 python3Packages.buildPythonApplication {
-  format = "setuptools";
+  format = "pyproject";
   inherit pname version src;
 
   nativeBuildInputs = [ installShellFiles ];
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   postPatch = ''
     substituteInPlace org.debian.apt.aptoffline.policy \
       --replace-fail /usr/bin/ "$out/bin"
diff --git a/pkgs/by-name/ar/archivy/package.nix b/pkgs/by-name/ar/archivy/package.nix
index a61d6e267526..d653960ed152 100644
--- a/pkgs/by-name/ar/archivy/package.nix
+++ b/pkgs/by-name/ar/archivy/package.nix
@@ -22,21 +22,23 @@ let
     };
   };
 in
-with py.pkgs;
-
-buildPythonApplication rec {
+py.pkgs.buildPythonApplication rec {
   pname = "archivy";
   version = "1.7.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns";
   };
 
+  build-system = with py.pkgs; [
+    setuptools
+  ];
+
   pythonRelaxDeps = true;
 
-  propagatedBuildInputs = [
+  dependencies = with py.pkgs; [
     appdirs
     attrs
     beautifulsoup4
@@ -50,7 +52,7 @@ buildPythonApplication rec {
     python-frontmatter
     readability-lxml
     requests
-    setuptools
+    setuptools # uses pkg_resources during runtime
     tinydb
     validators
     wtforms
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index a25e9aa232bc..1c15265cb443 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "arsenal";
   version = "1.1.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Orange-Cyberdefense";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     libtmux
     docutils
     pyfzf
diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
index b83f817089c0..83e7e96a662f 100644
--- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
+++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "arxiv-latex-cleaner";
   version = "1.0.8";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "google-research";
@@ -16,7 +16,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-CQb1u1j+/px+vNqA3iXZ2oe6/0ZWeMjWrUQL9elRDEI=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pillow
     pyyaml
     regex
diff --git a/pkgs/by-name/as/asn1editor/package.nix b/pkgs/by-name/as/asn1editor/package.nix
index fa6c1c6bee9b..b3232610614e 100644
--- a/pkgs/by-name/as/asn1editor/package.nix
+++ b/pkgs/by-name/as/asn1editor/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "asn1editor";
   version = "0.8.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Futsch1";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-mgluhC2DMS4OyS/BoWqBdVf7GcxquOtOKTHZ/hbiHQM=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     asn1tools
     coverage
     wxpython
diff --git a/pkgs/by-name/at/atomic-operator/package.nix b/pkgs/by-name/at/atomic-operator/package.nix
index 711bcdd7ce91..c289a06a56fb 100644
--- a/pkgs/by-name/at/atomic-operator/package.nix
+++ b/pkgs/by-name/at/atomic-operator/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "atomic-operator";
   version = "0.8.5";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "swimlane";
@@ -16,12 +16,16 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "charset_normalizer~=2.0.0" "charset_normalizer"
-  '';
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  pythonRelaxDeps = [
+    "charset_normalizer"
+    "urllib3"
+  ];
+
+  dependencies = with python3.pkgs; [
     attrs
     certifi
     chardet
diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix
index e6014bd53164..43779249f897 100644
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -14,7 +14,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "autokey";
   version = "0.96.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "autokey";
@@ -37,7 +37,11 @@ python3Packages.buildPythonApplication rec {
     libnotify
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     dbus-python
     pyinotify
     xlib
diff --git a/pkgs/by-name/ay/ayatana-webmail/package.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix
index 93871340e426..a433a3985801 100644
--- a/pkgs/by-name/ay/ayatana-webmail/package.nix
+++ b/pkgs/by-name/ay/ayatana-webmail/package.nix
@@ -20,7 +20,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "ayatana-webmail";
   version = "24.5.17";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
@@ -53,7 +53,11 @@ python3Packages.buildPythonApplication rec {
     glib # For compiling gsettings-schemas
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     urllib3
     babel
     psutil
diff --git a/pkgs/by-name/ba/base16-shell-preview/package.nix b/pkgs/by-name/ba/base16-shell-preview/package.nix
index a376a364c1e4..a7a6dfcb11d1 100644
--- a/pkgs/by-name/ba/base16-shell-preview/package.nix
+++ b/pkgs/by-name/ba/base16-shell-preview/package.nix
@@ -10,7 +10,7 @@ let
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit version;
@@ -18,6 +18,10 @@ python3Packages.buildPythonApplication {
     hash = "sha256-UWS1weiccSGqBU8grPAUKkuXb7qs5wliHVaPgdW4KtI=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   # If enabled, it will attempt to run '__init__.py, failing by trying to write
   # at "/homeless-shelter" as HOME
   doCheck = false;
diff --git a/pkgs/by-name/ba/bashplotlib/package.nix b/pkgs/by-name/ba/bashplotlib/package.nix
index cd5bd62e703d..afac32b49113 100644
--- a/pkgs/by-name/ba/bashplotlib/package.nix
+++ b/pkgs/by-name/ba/bashplotlib/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "bashplotlib";
   version = "2021-03-31";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "glamp";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication {
     sha256 = "sha256-0S6mgy6k7CcqsDR1kE5xcXGidF1t061e+M+ZuP2Gk3c=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   # No tests
   doCheck = false;
 
diff --git a/pkgs/by-name/bk/bkyml/package.nix b/pkgs/by-name/bk/bkyml/package.nix
index 9f7dc8005bc3..ba1d5bdb2b44 100644
--- a/pkgs/by-name/bk/bkyml/package.nix
+++ b/pkgs/by-name/bk/bkyml/package.nix
@@ -4,12 +4,10 @@
   fetchPypi,
 }:
 
-with python3.pkgs;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "bkyml";
   version = "1.4.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -21,24 +19,28 @@ buildPythonApplication rec {
   # of the package, that has been affected by the pyscaffold package dependency removal.
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "['pyscaffold>=3.0a0,<3.1a0'] + " "" \
-      --replace "use_pyscaffold=True"  ""
-    substituteInPlace src/bkyml/skeleton.py --replace \
+      --replace-fail "['pyscaffold>=3.0a0,<3.1a0'] + " "" \
+      --replace-fail "use_pyscaffold=True"  ""
+    substituteInPlace src/bkyml/skeleton.py --replace-fail \
         "from bkyml import __version__" \
         "__version__ = \"${version}\""
   '';
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    ruamel-yaml
+    setuptools
+  ];
+
   # Don't run tests because they are broken when run within
   # buildPythonApplication for reasons I don't quite understand.
   doCheck = false;
 
   pythonImportsCheck = [ "bkyml" ];
 
-  propagatedBuildInputs = [
-    ruamel-yaml
-    setuptools
-  ];
-
   meta = with lib; {
     homepage = "https://github.com/joscha/bkyml";
     description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly";
diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix
index fca867456073..33076a5c27fb 100644
--- a/pkgs/by-name/bl/blivet-gui/package.nix
+++ b/pkgs/by-name/bl/blivet-gui/package.nix
@@ -22,7 +22,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "blivet-gui";
   version = "2.6.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "storaged-project";
@@ -47,6 +47,10 @@ python3.pkgs.buildPythonApplication rec {
 
   buildInputs = [ gtk3 ];
 
+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
   dependencies = [
     python3.pkgs.blivet
     python3.pkgs.pyparted
diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix
index d91fafcaed13..3e86cba1efc2 100644
--- a/pkgs/by-name/br/brotab/package.nix
+++ b/pkgs/by-name/br/brotab/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "brotab";
   version = "1.4.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "balta2ar";
@@ -26,7 +26,11 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     flask
     psutil
     requests
@@ -35,9 +39,9 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace requirements/base.txt \
-      --replace "Flask==2.0.2" "Flask>=2.0.2" \
-      --replace "psutil==5.8.0" "psutil>=5.8.0" \
-      --replace "requests==2.24.0" "requests>=2.24.0"
+      --replace-fail "Flask==2.0.2" "Flask>=2.0.2" \
+      --replace-fail "psutil==5.8.0" "psutil>=5.8.0" \
+      --replace-fail "requests==2.24.0" "requests>=2.24.0"
   '';
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/bt/btlejack/package.nix b/pkgs/by-name/bt/btlejack/package.nix
index dd96ae1b641e..e52449efef83 100644
--- a/pkgs/by-name/bt/btlejack/package.nix
+++ b/pkgs/by-name/bt/btlejack/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "btlejack";
   version = "2.1.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "virtualabs";
@@ -20,7 +20,11 @@ python3Packages.buildPythonApplication rec {
     sed -i "s|^.*'argparse',$||" setup.py
   '';
 
-  propagatedBuildInputs = [
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
     python3Packages.pyserial
     python3Packages.halo
   ];
diff --git a/pkgs/by-name/bu/bubblemail/package.nix b/pkgs/by-name/bu/bubblemail/package.nix
index 5ceb16b116b0..cf05f04a0fb5 100644
--- a/pkgs/by-name/bu/bubblemail/package.nix
+++ b/pkgs/by-name/bu/bubblemail/package.nix
@@ -20,7 +20,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "bubblemail";
   version = "1.9";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
@@ -53,6 +53,10 @@ python3Packages.buildPythonApplication rec {
     gobject-introspection
   ];
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   propagatedBuildInputs = with python3Packages; [
     gsettings-desktop-schemas
     pygobject3
diff --git a/pkgs/by-name/bu/bumblebee-status/package.nix b/pkgs/by-name/bu/bumblebee-status/package.nix
index 83cca48c1a9b..0b900a17ad3c 100644
--- a/pkgs/by-name/bu/bumblebee-status/package.nix
+++ b/pkgs/by-name/bu/bumblebee-status/package.nix
@@ -22,7 +22,7 @@ in
 python3.pkgs.buildPythonPackage {
   pname = "bumblebee-status";
   inherit version;
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tobi-wan-kenobi";
@@ -40,10 +40,15 @@ python3.pkgs.buildPythonPackage {
     })
   ];
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins;
+
   propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins;
 
-  checkInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3.pkgs; [
     freezegun
     netifaces
     psutil
diff --git a/pkgs/by-name/bu/bumpver/package.nix b/pkgs/by-name/bu/bumpver/package.nix
index 41da92091a92..5d3c6b531fbb 100644
--- a/pkgs/by-name/bu/bumpver/package.nix
+++ b/pkgs/by-name/bu/bumpver/package.nix
@@ -9,7 +9,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "bumpver";
   version = "2021.1110";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -18,12 +18,16 @@ python3.pkgs.buildPythonApplication rec {
 
   prePatch = ''
     substituteInPlace setup.py \
-      --replace "if any(arg.startswith(\"bdist\") for arg in sys.argv):" ""\
-      --replace "import lib3to6" ""\
-      --replace "package_dir = lib3to6.fix(package_dir)" ""
+      --replace-fail "if any(arg.startswith(\"bdist\") for arg in sys.argv):" ""\
+      --replace-fail "import lib3to6" ""\
+      --replace-fail "package_dir = lib3to6.fix(package_dir)" ""
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pathlib2
     click
     toml
diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix
index e0a3d12cd011..06ba2e88c00c 100644
--- a/pkgs/by-name/ca/canto-curses/package.nix
+++ b/pkgs/by-name/ca/canto-curses/package.nix
@@ -10,7 +10,7 @@
 
 python3Packages.buildPythonApplication rec {
   version = "0.9.9";
-  format = "setuptools";
+  format = "pyproject";
   pname = "canto-curses";
 
   src = fetchFromGitHub {
@@ -28,6 +28,10 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   buildInputs = [
     readline
     ncurses
diff --git a/pkgs/by-name/ca/canto-daemon/package.nix b/pkgs/by-name/ca/canto-daemon/package.nix
index bd6cedb2c64e..d02fd492273f 100644
--- a/pkgs/by-name/ca/canto-daemon/package.nix
+++ b/pkgs/by-name/ca/canto-daemon/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication rec {
   version = "0.9.8";
-  format = "setuptools";
+  format = "pyproject";
   pname = "canto-daemon";
 
   src = fetchFromGitHub {
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
   };
 
-  propagatedBuildInputs = with python3Packages; [ feedparser ];
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ feedparser ];
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix
index 8269a91eb982..7f911f9001cd 100644
--- a/pkgs/by-name/ca/cantoolz/package.nix
+++ b/pkgs/by-name/ca/cantoolz/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "cantoolz";
   version = "3.7.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "CANToolz";
@@ -30,7 +30,11 @@ python3.pkgs.buildPythonApplication rec {
     })
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     flask
     pyserial
     mido
diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix
index 33b3cb5d0f06..bf32c78a05fd 100644
--- a/pkgs/by-name/ch/charge-lnd/package.nix
+++ b/pkgs/by-name/ch/charge-lnd/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "charge-lnd";
   version = "0.3.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "accumulator";
@@ -17,6 +17,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-a/zIEA2oF1+BoZXk4YDWx69eVFSnANUE/F+ARI/VsXU=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   propagatedBuildInputs = with python3Packages; [
     aiorpcx
     colorama
diff --git a/pkgs/by-name/ch/chatblade/package.nix b/pkgs/by-name/ch/chatblade/package.nix
index 3e360e95dca7..50cef1df9416 100644
--- a/pkgs/by-name/ch/chatblade/package.nix
+++ b/pkgs/by-name/ch/chatblade/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "chatblade";
   version = "0.7.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -17,7 +17,14 @@ python3Packages.buildPythonApplication rec {
   doCheck = false; # there are no tests
 
   pythonImportsCheck = [ "chatblade" ];
-  propagatedBuildInputs = with python3Packages; [
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  pythonRelaxDeps = true;
+
+  dependencies = with python3Packages; [
     openai
     platformdirs
     pylatexenc
diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 1b10ec53dee3..e0f088ccd88c 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "clickable";
   version = "8.3.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitLab {
     owner = "clickable";
@@ -18,7 +18,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-Vn2PyALaRrE+jJRdZzW+jjCm3f2GfpgrQcFGB7kr4EM=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = with python3Packages; [
     cookiecutter
     requests
     pyyaml
diff --git a/pkgs/by-name/co/colorz/package.nix b/pkgs/by-name/co/colorz/package.nix
index b93e88c76fde..9956ba8a782f 100644
--- a/pkgs/by-name/co/colorz/package.nix
+++ b/pkgs/by-name/co/colorz/package.nix
@@ -7,14 +7,18 @@
 python3Packages.buildPythonApplication rec {
   pname = "colorz";
   version = "1.0.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pillow
     scipy
   ];
diff --git a/pkgs/by-name/co/compdb/package.nix b/pkgs/by-name/co/compdb/package.nix
index 3fdb64236fc2..03ef026bb094 100644
--- a/pkgs/by-name/co/compdb/package.nix
+++ b/pkgs/by-name/co/compdb/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "compdb";
   version = "0.2.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Sarcasm";
@@ -16,6 +16,10 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg=";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "Command line tool to manipulate compilation databases";
     license = licenses.mit;
diff --git a/pkgs/by-name/cp/cp210x-program/package.nix b/pkgs/by-name/cp/cp210x-program/package.nix
index 3c61333b0c9a..2e41daf44f14 100644
--- a/pkgs/by-name/cp/cp210x-program/package.nix
+++ b/pkgs/by-name/cp/cp210x-program/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "cp210x-program";
   version = "0.4.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "VCTLabs";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-IjKshP12WfFly9cPm6svD4qZW6cT8C7lOVrGenSqbfY=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     hexdump
     pyusb
   ];
diff --git a/pkgs/by-name/cp/cppclean/package.nix b/pkgs/by-name/cp/cppclean/package.nix
index 7437e65a0848..561793b61463 100644
--- a/pkgs/by-name/cp/cppclean/package.nix
+++ b/pkgs/by-name/cp/cppclean/package.nix
@@ -4,12 +4,10 @@
   python3Packages,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cppclean";
   version = "0.13";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "myint";
@@ -22,6 +20,10 @@ buildPythonApplication rec {
     patchShebangs .
   '';
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   checkPhase = ''
     ./test.bash
   '';
diff --git a/pkgs/by-name/cp/cpuset/package.nix b/pkgs/by-name/cp/cpuset/package.nix
index 1aa016a8f6df..6dff3c9f53bd 100644
--- a/pkgs/by-name/cp/cpuset/package.nix
+++ b/pkgs/by-name/cp/cpuset/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "cpuset";
   version = "1.6.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "lpechacek";
@@ -16,6 +16,10 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY=";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   makeFlags = [ "prefix=$(out)" ];
 
   checkPhase = ''
diff --git a/pkgs/by-name/cr/creds/package.nix b/pkgs/by-name/cr/creds/package.nix
index 797f3737e133..68fb8fd0da0f 100644
--- a/pkgs/by-name/cr/creds/package.nix
+++ b/pkgs/by-name/cr/creds/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "creds";
   version = "0.5.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "ihebski";
@@ -21,10 +21,14 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace creds \
-      --replace "pathlib.Path(__file__).parent" "pathlib.Path.home()"
+      --replace-fail "pathlib.Path(__file__).parent" "pathlib.Path.home()"
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     fire
     prettytable
     requests
diff --git a/pkgs/by-name/cr/crlfsuite/package.nix b/pkgs/by-name/cr/crlfsuite/package.nix
index dadb9067590f..a4a493bc9c82 100644
--- a/pkgs/by-name/cr/crlfsuite/package.nix
+++ b/pkgs/by-name/cr/crlfsuite/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "crlfsuite";
   version = "2.5.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Nefcore";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     colorama
     requests
   ];
diff --git a/pkgs/by-name/cr/crowbar/package.nix b/pkgs/by-name/cr/crowbar/package.nix
index ed2911bb5b66..a70ad5032a5f 100644
--- a/pkgs/by-name/cr/crowbar/package.nix
+++ b/pkgs/by-name/cr/crowbar/package.nix
@@ -11,7 +11,7 @@
 python3Packages.buildPythonApplication {
   pname = "crowbar";
   version = "unstable-2020-04-23";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "galkan";
@@ -20,7 +20,9 @@ python3Packages.buildPythonApplication {
     sha256 = "05m9vywr9976pc7il0ak8nl26mklzxlcqx0p8rlfyx1q766myqzf";
   };
 
-  propagatedBuildInputs = [ python3Packages.paramiko ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.paramiko ];
 
   patchPhase = ''
     sed -i 's,/usr/bin/xfreerdp,${freerdp}/bin/xfreerdp,g' lib/main.py
diff --git a/pkgs/by-name/cs/csv2odf/package.nix b/pkgs/by-name/cs/csv2odf/package.nix
index 9119b697c30e..50643f2c2c17 100644
--- a/pkgs/by-name/cs/csv2odf/package.nix
+++ b/pkgs/by-name/cs/csv2odf/package.nix
@@ -7,12 +7,17 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "csv2odf";
   version = "2.09";
-  format = "setuptools";
+  format = "pyproject";
+
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "09l0yfay89grjdzap2h11f0hcyn49np5zizg2yyp2aqgjs8ki57p";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   meta = with lib; {
     homepage = "https://sourceforge.net/p/csv2odf/wiki/Main_Page/";
     description = "Convert csv files to OpenDocument Format";
diff --git a/pkgs/by-name/cs/csvs-to-sqlite/package.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
index c054aa2f2301..796b0a558f84 100644
--- a/pkgs/by-name/cs/csvs-to-sqlite/package.nix
+++ b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
@@ -5,11 +5,10 @@
   fetchpatch,
 }:
 
-with python3.pkgs;
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "csvs-to-sqlite";
   version = "1.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "simonw";
@@ -32,10 +31,11 @@ buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [
+  build-system = with python3.pkgs; [
+    setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3.pkgs; [
     click
     dateparser
     pandas
@@ -47,7 +47,7 @@ buildPythonApplication rec {
     "click"
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     cogapp
     pytestCheckHook
   ];
diff --git a/pkgs/by-name/cu/cum/package.nix b/pkgs/by-name/cu/cum/package.nix
index 98e055250f79..f14e48dc8a70 100644
--- a/pkgs/by-name/cu/cum/package.nix
+++ b/pkgs/by-name/cu/cum/package.nix
@@ -4,19 +4,21 @@
   fetchPypi,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cum";
   version = "0.9.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "15qc6agka2g3kcnpnz0hbjic1s3260cr9bda0rlcyninxs1vndq0";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     alembic
     beautifulsoup4
     click
diff --git a/pkgs/by-name/cu/curseradio/package.nix b/pkgs/by-name/cu/curseradio/package.nix
index 8c97d7620dd0..6449e00ed35b 100644
--- a/pkgs/by-name/cu/curseradio/package.nix
+++ b/pkgs/by-name/cu/curseradio/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication {
   version = "0.2";
-  format = "setuptools";
+  format = "pyproject";
   pname = "curseradio";
 
   src = fetchFromGitHub {
@@ -18,7 +18,11 @@ python3Packages.buildPythonApplication {
     sha256 = "11bf0jnj8h2fxhpdp498189r4s6b47vy4wripv0z4nx7lxajl88i";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     requests
     lxml
     pyxdg
diff --git a/pkgs/by-name/cu/cursewords/package.nix b/pkgs/by-name/cu/cursewords/package.nix
index e30b672901c9..dced1f5e345b 100644
--- a/pkgs/by-name/cu/cursewords/package.nix
+++ b/pkgs/by-name/cu/cursewords/package.nix
@@ -6,7 +6,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "cursewords";
   version = "1.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "thisisparker";
@@ -15,14 +15,17 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-Ssr15kSdWmyMFFG5uCregrpGQ3rI2cMXqY9+/a3gs84=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     python3Packages.setuptools
-    python3Packages.wheel
   ];
 
   doCheck = false; # no tests
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "blessed"
+  ];
+
+  dependencies = [
     python3Packages.blessed
   ];
 
diff --git a/pkgs/by-name/cv/cvehound/package.nix b/pkgs/by-name/cv/cvehound/package.nix
index 3103087c5c53..8a0a86da2244 100644
--- a/pkgs/by-name/cv/cvehound/package.nix
+++ b/pkgs/by-name/cv/cvehound/package.nix
@@ -9,7 +9,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "cvehound";
   version = "1.2.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "evdenis";
@@ -27,9 +27,12 @@ python3.pkgs.buildPythonApplication rec {
     }"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
-    lxml
+  build-system = with python3.pkgs; [
     setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    lxml
     sympy
   ];
 
diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix
index c13d23af1ef8..9c573b035e7a 100644
--- a/pkgs/by-name/di/dict-cc-py/package.nix
+++ b/pkgs/by-name/di/dict-cc-py/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonPackage {
   pname = "dict.cc.py";
   version = "3.1.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "rbaron";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonPackage {
     hash = "sha256-wc0WY1pETBdOT3QUaVGsX8YdcnhxLIHrZ2vt2t5LYKU=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     beautifulsoup4
     colorama
     requests
diff --git a/pkgs/by-name/dn/dnd-tools/package.nix b/pkgs/by-name/dn/dnd-tools/package.nix
index 80aa0a9c5856..419a5e81e3d2 100644
--- a/pkgs/by-name/dn/dnd-tools/package.nix
+++ b/pkgs/by-name/dn/dnd-tools/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "dnd-tools";
   version = "unstable-2021-02-18";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "savagezen";
@@ -25,6 +25,10 @@ python3.pkgs.buildPythonApplication {
     })
   ];
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/savagezen/dnd-tools";
     description = "Set of interactive command line tools for Dungeons and Dragons 5th Edition";
diff --git a/pkgs/by-name/dn/dnsviz/package.nix b/pkgs/by-name/dn/dnsviz/package.nix
index 81d3d42df88d..ffc23789d370 100644
--- a/pkgs/by-name/dn/dnsviz/package.nix
+++ b/pkgs/by-name/dn/dnsviz/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "dnsviz";
   version = "0.11.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dnsviz";
@@ -26,6 +26,10 @@ python3Packages.buildPythonApplication rec {
       --replace-fail '@out@' $out
   '';
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   dependencies = with python3Packages; [
     dnspython
     m2crypto
diff --git a/pkgs/by-name/do/dockbarx/package.nix b/pkgs/by-name/do/dockbarx/package.nix
index 19e56c3f4b10..66e87de70cf5 100644
--- a/pkgs/by-name/do/dockbarx/package.nix
+++ b/pkgs/by-name/do/dockbarx/package.nix
@@ -13,7 +13,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "dockbarx";
   version = "1.0-beta4";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "xuzhen";
@@ -35,7 +35,11 @@ python3Packages.buildPythonApplication rec {
     keybinder3
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     dbus-python
     pillow
     pygobject3
diff --git a/pkgs/by-name/do/dotfiles/package.nix b/pkgs/by-name/do/dotfiles/package.nix
index 9a4dda3a4952..2ff9168c131c 100644
--- a/pkgs/by-name/do/dotfiles/package.nix
+++ b/pkgs/by-name/do/dotfiles/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "dotfiles";
   version = "0.6.5";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit version pname;
@@ -17,8 +17,11 @@ python3Packages.buildPythonApplication rec {
   # No tests in archive
   doCheck = false;
 
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ click ];
+
   nativeCheckInputs = with python3Packages; [ pytest ];
-  propagatedBuildInputs = with python3Packages; [ click ];
 
   meta = with lib; {
     description = "Easily manage your dotfiles";
diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
index e8b0d2c255af..e3b1f84af9b0 100644
--- a/pkgs/by-name/dp/dpt-rp1-py/package.nix
+++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix
@@ -6,7 +6,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "dpt-rp1-py";
   version = "0.1.16";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "janten";
@@ -17,14 +17,17 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     anytree
     fusepy
     httpsig
     pbkdf2
     pyyaml
     requests
-    setuptools
     tqdm
     urllib3
     zeroconf
diff --git a/pkgs/by-name/dt/dtrx/package.nix b/pkgs/by-name/dt/dtrx/package.nix
index 7315e382ea32..d0c743357174 100644
--- a/pkgs/by-name/dt/dtrx/package.nix
+++ b/pkgs/by-name/dt/dtrx/package.nix
@@ -24,7 +24,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "dtrx";
   version = "8.5.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dtrx-py";
@@ -58,7 +58,9 @@ python3Packages.buildPythonApplication rec {
       ''--prefix PATH : "${archivers}"''
     ];
 
-  nativeBuildInputs = [ python3Packages.invoke ];
+  build-system = with python3Packages; [
+    setuptools
+  ];
 
   passthru.updateScript = gitUpdater { };
 

From 9aa1a0a1ededd2ea8b990bfc794dff0f900cd874 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 3 Jul 2025 09:53:51 +0200
Subject: [PATCH 03/38] opensnitch: 1.7.0.0 -> 1.7.1

Release notes: https://github.com/evilsocket/opensnitch/releases/tag/v1.7.1
---
 pkgs/by-name/op/opensnitch/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix
index 18964197f2d5..d670db042cae 100644
--- a/pkgs/by-name/op/opensnitch/package.nix
+++ b/pkgs/by-name/op/opensnitch/package.nix
@@ -1,7 +1,6 @@
 {
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
   protobuf,
   go-protobuf,
   pkg-config,
@@ -35,24 +34,15 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opensnitch";
-  version = "1.7.0.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZkXqocgxyJGo5uQq4Ct1wmUIQljtx5oPzj4JfWWAuSE=";
+    hash = "sha256-j73wbHm8hrfm+8YVwonzU+ddzwSk9+ecucsQ0Es715k=";
   };
 
-  patches = [
-    # https://github.com/evilsocket/opensnitch/issues/1357
-    # remove next release
-    (fetchpatch {
-      url = "https://github.com/dwongdev/opensnitch/commit/376b06ef97ef79e3afa699878af2e59918aa7ef0.patch?full_index=1";
-      hash = "sha256-QBhc4A2Dign5JY4fcQ2c3F02xFj3m3G2VwY9cFuWV3w=";
-    })
-  ];
-
   postPatch = ''
     # Allow configuring Version at build time
     substituteInPlace daemon/core/version.go --replace-fail "const " "var "

From 58f381e9f55871257030cf110c51f1bb0dfe1376 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 3 Jul 2025 14:58:08 +0200
Subject: [PATCH 04/38] bkyml: patch out setuptools runtime dependency

---
 pkgs/by-name/bk/bkyml/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bk/bkyml/package.nix b/pkgs/by-name/bk/bkyml/package.nix
index ba1d5bdb2b44..c0843b934511 100644
--- a/pkgs/by-name/bk/bkyml/package.nix
+++ b/pkgs/by-name/bk/bkyml/package.nix
@@ -21,9 +21,9 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace setup.py \
       --replace-fail "['pyscaffold>=3.0a0,<3.1a0'] + " "" \
       --replace-fail "use_pyscaffold=True"  ""
-    substituteInPlace src/bkyml/skeleton.py --replace-fail \
-        "from bkyml import __version__" \
-        "__version__ = \"${version}\""
+    substituteInPlace src/bkyml/__init__.py \
+      --replace-fail "from pkg_resources" "# from pkg_resources" \
+      --replace-fail "get_distribution(dist_name).version" '"${version}"'
   '';
 
   build-system = with python3.pkgs; [
@@ -32,7 +32,6 @@ python3.pkgs.buildPythonApplication rec {
 
   dependencies = with python3.pkgs; [
     ruamel-yaml
-    setuptools
   ];
 
   # Don't run tests because they are broken when run within

From 0c9906634901041ed1ac49c1e721ac969678bfd0 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 5 Jul 2025 13:08:55 +0900
Subject: [PATCH 05/38] dprint: 0.50.0 -> 0.50.1

Diff: https://github.com/dprint/dprint/compare/0.50.0...0.50.1
---
 pkgs/by-name/dp/dprint/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index b89a9515e2e0..d083a9ee80a1 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
-  version = "0.50.0";
+  version = "0.50.1";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -20,16 +20,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dprint";
     repo = "dprint";
     tag = finalAttrs.version;
-    hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o=";
+    hash = "sha256-Lt6CzSzppu5ULhzYN5FTCWtWK3AA4/8jRzXgQkU4Tco=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OnrsuVK1gEDweldq+P8lDkkrHjklsG8MRpM0wqWsdlM=";
+  cargoHash = "sha256-1opQaR3vbm/DpDY5oQ1VgA4nf0nCBknxfgOSPZQbtV4=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
   ];
 
+  # Avoiding "Undefined symbols" such as "___unw_remove_find_dynamic_unwind_sections" since dprint 0.50.1
+  # Adding "libunwind" in buildInputs did not resolve it.
+  env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-args=-Wl,-undefined,dynamic_lookup";
+
   cargoBuildFlags = [
     "--package=dprint"
     # Required only for dprint package tests; the binary is removed in postInstall.

From 5a5786702a6e97ce9efbcb0c60c83bd593a37404 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 18:36:53 +0000
Subject: [PATCH 06/38] olympus-unwrapped: 25.06.24.02 -> 25.06.28.03

---
 pkgs/by-name/ol/olympus-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index de1036b85677..8153c5cec67b 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -31,9 +31,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "25.06.24.02";
-  buildId = "4914"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "cc34c867daadaa5ee5c53ed951bc1f64f4dc6565";
+  version = "25.06.28.03";
+  buildId = "4925"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "1671a4e90da4f8cd565712ed5344bd4e01cf29a1";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-FypX89fdH+dr12iC/2CoM6BAvUS6bGcSp04IiJjZtc4=";
+    hash = "sha256-TgtokrUt15k7SxjPcIFIbv2QL+hgB0cIZYb3oG/l/GI=";
   };
 
   nativeBuildInputs = [

From 1bedbcb22e3e5201b743be7246b905ca47baec3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 22:01:18 +0000
Subject: [PATCH 07/38] wstunnel: 10.4.3 -> 10.4.4

---
 pkgs/by-name/ws/wstunnel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index 338b5d3d6115..1c2a5362d320 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wstunnel";
-  version = "10.4.3";
+  version = "10.4.4";
 
   src = fetchFromGitHub {
     owner = "erebe";
     repo = "wstunnel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qg+9ClYbb1+g3BPioCwDdJYyPrl2g+44LD5OCDjMBzI=";
+    hash = "sha256-byJli3L5/ZBLD6oIBK8yDiA70eWeN3tjiLDaw3QEN4U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LZkiSu9KRI7QYZrCakwR+VVvR6ZpwEGB7Z9jM1C8qvk=";
+  cargoHash = "sha256-K8ury524O27N27F0iOXDAAQnzFgeSX7ArkZOchsroLE=";
 
   cargoBuildFlags = [ "--package wstunnel-cli" ];
 

From 3a83c03af61e4400811fa77d6f8a678e04509b3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 22:31:14 +0000
Subject: [PATCH 08/38] python3Packages.ufomerge: 1.9.4 -> 1.9.5

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

diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix
index 057de641804a..6a21dd55e3ea 100644
--- a/pkgs/development/python-modules/ufomerge/default.nix
+++ b/pkgs/development/python-modules/ufomerge/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "ufomerge";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "ufomerge";
     tag = "v${version}";
-    hash = "sha256-kXwbdBqcPySboSBpGVevhQqrlE+/t+IFKTX03sh0nfw=";
+    hash = "sha256-djrgyPKuaBjVAs99NhthZBGV1d3ZQTtYrW2xpxlfwrM=";
   };
 
   build-system = [

From 7be567ff29fed286c9c3d7addda70b742818e772 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 08:35:49 +0200
Subject: [PATCH 09/38] python313Packages.aiolifx: 1.1.5 -> 1.2.0

Changelog: https://github.com/aiolifx/aiolifx/releases/tag/1.2.0
---
 pkgs/development/python-modules/aiolifx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 062fb683e1fa..266f9b072411 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "aiolifx";
-  version = "1.1.5";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KRUe8qn/3jYKxgKvqPeA6oXZF3IYfRBBftWxjLhe/ow=";
+    hash = "sha256-pAuQLeqLVkVEW/iByXk9brfEm79rR4ZL+ncUA0MxOnM=";
   };
 
   build-system = [ setuptools ];

From 6a34c8cfcb6a6f83400f376134cbbbae5ca0ad0d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 15:09:46 +0200
Subject: [PATCH 10/38] certmitm: init at 0-unstable-2025-05-14

Tool for testing for certificate validation vulnerabilities of
TLS connections

https://github.com/aapooksman/certmitm
---
 pkgs/by-name/ce/certmitm/package.nix | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/ce/certmitm/package.nix

diff --git a/pkgs/by-name/ce/certmitm/package.nix b/pkgs/by-name/ce/certmitm/package.nix
new file mode 100644
index 000000000000..0b754cc54c11
--- /dev/null
+++ b/pkgs/by-name/ce/certmitm/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "certmitm";
+  version = "0-unstable-2025-05-14";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "aapooksman";
+    repo = "certmitm";
+    rev = "f04c91a1ba231762ec126487f593f9b4d33f4ec2";
+    hash = "sha256-i4DnOyn56lA63hI40uxtXX8dzMa29BPQQHWKFdVjVlM=";
+  };
+
+  dependencies = with python3.pkgs; [
+    dpkt
+    pyopenssl
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -vD certmitm.py $out/bin/certmitm
+    install -vd $out/${python3.sitePackages}/
+    cp -R certmitm $out/${python3.sitePackages}
+
+    runHook postInstall
+  '';
+
+  # Project has not tests
+  doCheck = false;
+
+  meta = {
+    description = "Tool for testing for certificate validation vulnerabilities of TLS connections";
+    homepage = "https://github.com/aapooksman/certmitm";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "certmitm";
+    platforms = lib.platforms.all;
+  };
+}

From 5baddae1542f0926d83f67a3a2c2cfd2d9483e4e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 8 Jul 2025 15:31:11 +0200
Subject: [PATCH 11/38] milkytracker: 1.05.01 -> 1.06

---
 pkgs/by-name/mi/milkytracker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/milkytracker/package.nix b/pkgs/by-name/mi/milkytracker/package.nix
index 526756b31b8c..480415bcb57c 100644
--- a/pkgs/by-name/mi/milkytracker/package.nix
+++ b/pkgs/by-name/mi/milkytracker/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "milkytracker";
-  version = "1.05.01";
+  version = "1.06";
 
   src = fetchFromGitHub {
     owner = "milkytracker";
     repo = "MilkyTracker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-31Jy93bQj9wZ9vWJe5DVnBqFXfPSH1qmk8kcT/t+FY0=";
+    hash = "sha256-IMX1+gJUghBxnaSTWnfDYzQVbKFQzQIS70H+L6ogVro=";
   };
 
   strictDeps = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
     install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
-    install -Dm644 $src/resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml
+    install -Dm644 resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml
   '';
 
   passthru.updateScript = gitUpdater {

From 61b542e52dd60008efb4ace6bd7680b2b19f07b5 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 8 Jul 2025 17:03:29 +0200
Subject: [PATCH 12/38] libreswan: fix build after libxml 2.14 update

---
 pkgs/by-name/li/libreswan/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix
index 3c01d04146fe..33c7496907d2 100644
--- a/pkgs/by-name/li/libreswan/package.nix
+++ b/pkgs/by-name/li/libreswan/package.nix
@@ -103,6 +103,9 @@ stdenv.mkDerivation rec {
     "TMPFILESDIR=$(out)/lib/tmpfiles.d/"
     "LINUX_VARIANT=nixos"
     "DEFAULT_DNSSEC_ROOTKEY_FILE=${dns-root-data}/root.key"
+    # Fix invalid XML files with libxml 2.14
+    "XMLTO_FLAGS=--searchpath=$(abs_srcdir)/d.ipsec.conf:$(abs_srcdir)"
+    "XMLTO_FLAGS+=--skip-validation"
   ];
 
   # Hack to make install work

From c7a8ec1c44c4f7bbdab4a4f3c47c316ed8be51fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 20:52:24 +0200
Subject: [PATCH 13/38] python313Packages.pyexploitdb: 0.2.87 -> 0.2.88

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 3e599e629ccb..92222c73676e 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.87";
+  version = "0.2.88";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-xPhGj8pRuDZ6Mx6dTlw4vNS81p+HiH3S3x8H5ZXyaek=";
+    hash = "sha256-KHFzK9MIT3tHwFmdGx/i9OSzQTKIhGXgWEI+qtH1Dkk=";
   };
 
   build-system = [ setuptools ];

From bb8554b36a5a6d458794462cdcdb644a60675bc6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 20:53:15 +0200
Subject: [PATCH 14/38] python313Packages.powerfox: 1.2.1 -> 1.3.0

Diff: https://github.com/klaasnicolaas/python-powerfox/compare/refs/tags/v1.2.1...refs/tags/v1.3.0

Changelog: https://github.com/klaasnicolaas/python-powerfox/releases/tag/v1.3.0
---
 pkgs/development/python-modules/powerfox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/powerfox/default.nix b/pkgs/development/python-modules/powerfox/default.nix
index 919fec57f72e..ea7b05562f30 100644
--- a/pkgs/development/python-modules/powerfox/default.nix
+++ b/pkgs/development/python-modules/powerfox/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "powerfox";
-  version = "1.2.1";
+  version = "1.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-powerfox";
     tag = "v${version}";
-    hash = "sha256-eBadw++8mB/RUejIbMAnfBRmM+YC7oeeBWRaHCCyizo=";
+    hash = "sha256-oGOKh+/KCR7eFi4b8TrLiBiOfauhUhKkRvPMejwelJY=";
   };
 
   patches = [

From 95afb18e68567911e526e627aaed8ee46d8ffc39 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 21:12:45 +0200
Subject: [PATCH 15/38] cnspec: 11.61.0 -> 11.62.1

Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.61.0...refs/tags/v11.62.1

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.62.1
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 03a08bbc6e75..1e55f5cb5f7f 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.61.0";
+  version = "11.62.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-34dbAWpxQkvo4fwHAu9f5e8IQJ7wwgdnqI9NApkHi3A=";
+    hash = "sha256-j31vx0ciyursGB9Ty0AStCbgSCBTyRkPPhCOiF+aTxs=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-dK1j9RRW7AYGvaO0saz8ZS//p/EJvIixOy/j8vSTtrY=";
+  vendorHash = "sha256-qca0zdPkRQD+9QA6uz3Kl7UfVii+QOwlyz+SnORXd18=";
 
   subPackages = [ "apps/cnspec" ];
 

From ffac2bc535dca6c8136f06a9dd017278ac3dbe2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 21:13:53 +0200
Subject: [PATCH 16/38] python313Packages.dirigera: 1.2.3 -> 1.2.4

Diff: https://github.com/Leggin/dirigera/compare/refs/tags/v1.2.3...refs/tags/v1.2.4

Changelog: https://github.com/Leggin/dirigera/releases/tag/v1.2.4
---
 pkgs/development/python-modules/dirigera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix
index 3ea8caef7743..48b4896ecfbb 100644
--- a/pkgs/development/python-modules/dirigera/default.nix
+++ b/pkgs/development/python-modules/dirigera/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dirigera";
-  version = "1.2.3";
+  version = "1.2.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Leggin";
     repo = "dirigera";
     tag = "v${version}";
-    hash = "sha256-PnjVWfbus76t3s0m6Evvjz3bqVzbUj34ZveH8ABVD7w=";
+    hash = "sha256-xFiAhlNbl20MPFNkl8J4vx+KgvINYS3P5EAQxc620/k=";
   };
 
   build-system = [ setuptools ];

From 41836171607bab6a513792d233d9a0374252d934 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 21:14:39 +0200
Subject: [PATCH 17/38] python313Packages.gassist-text: 0.0.12 -> 0.0.14

Diff: https://github.com/tronikos/gassist_text/compare/refs/tags/0.0.12...refs/tags/0.0.14

Changelog: https://github.com/tronikos/gassist_text/releases/tag/0.0.14
---
 pkgs/development/python-modules/gassist-text/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix
index bb04045e58f5..a0590da1fc7f 100644
--- a/pkgs/development/python-modules/gassist-text/default.nix
+++ b/pkgs/development/python-modules/gassist-text/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "gassist-text";
-  version = "0.0.12";
+  version = "0.0.14";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "gassist_text";
     tag = version;
-    hash = "sha256-ToHkep+jcPcl5t05jmzRTX2QAhJRW2R+Qyhwt/zpIfc=";
+    hash = "sha256-Nk2GwqColX/d1nUL+YvolLH/1g1FTDZbExhBGot/EV0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From e9cf39d478582cbd09fda55e1946a4b085813d31 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Jul 2025 21:19:57 +0200
Subject: [PATCH 18/38] python313Packages.aiomisc: 17.7.7 -> 17.7.8

Changelog: https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md
---
 pkgs/development/python-modules/aiomisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index bf0a2a29d082..b515243e8d09 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.7.7";
+  version = "17.7.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zN3ryxjgbaJ4lcm3qwUY74h/kBjaWhHsxGJSM/tn3yU=";
+    hash = "sha256-Wfum+9M0Kx9GA9F2/fzhvETsQodNKnoRXSADFZl6Sf4=";
   };
 
   build-system = [ poetry-core ];

From f3001f9d5cd4e312e21abc5996e3734e5fa40a56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 11:36:29 +0000
Subject: [PATCH 19/38] lug-helper: 3.11 -> 4.0

---
 pkgs/by-name/lu/lug-helper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix
index b45a19310749..bd556831008a 100644
--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@@ -15,12 +15,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   name = "lug-helper";
-  version = "3.11";
+  version = "4.0";
   src = fetchFromGitHub {
     owner = "starcitizen-lug";
     repo = "lug-helper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RVjtAfabmBfEYUfgoXK4EZSyFC00qdo5CMkW2Op0P5A=";
+    hash = "sha256-WCmKr7dgjWr5DqnZow2RWLAdifUaF9Z6BE12o0tK59k=";
   };
 
   buildInputs = [

From f6c08860bea0b2c17de3952c69721200bb8732fb Mon Sep 17 00:00:00 2001
From: Cameron Yule <cameron@cameronyule.com>
Date: Fri, 23 May 2025 16:37:11 +0100
Subject: [PATCH 20/38] maintainers: add cameronyule

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a91395c7d540..869d0c291672 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4108,6 +4108,12 @@
     name = "Cameron Smith";
     keys = [ { fingerprint = "3F14 C258 856E 88AE E0F9  661E FF04 3B36 8811 DD1C"; } ];
   };
+  cameronyule = {
+    email = "cameron@cameronyule.com";
+    github = "cameronyule";
+    githubId = 5451;
+    name = "Cameron Yule";
+  };
   camillemndn = {
     email = "camillemondon@free.fr";
     github = "camillemndn";

From f3edfab1bcc136020889d01ca1bf1cce6212430e Mon Sep 17 00:00:00 2001
From: Cameron Yule <cameron@cameronyule.com>
Date: Fri, 23 May 2025 16:40:55 +0100
Subject: [PATCH 21/38] python313Packages.mlx: 0.21.1 -> 0.25.2

Fixes failing build, adds testing, upgrades to latest version.

Co-authored-by: Sarah Clark <seclark@nextquestion.net>
---
 .../mlx/darwin-build-fixes.patch              |  15 ++
 .../python-modules/mlx/default.nix            | 222 +++++++++++-------
 .../mlx/disable-accelerate.patch              |  13 -
 3 files changed, 156 insertions(+), 94 deletions(-)
 create mode 100644 pkgs/development/python-modules/mlx/darwin-build-fixes.patch
 delete mode 100644 pkgs/development/python-modules/mlx/disable-accelerate.patch

diff --git a/pkgs/development/python-modules/mlx/darwin-build-fixes.patch b/pkgs/development/python-modules/mlx/darwin-build-fixes.patch
new file mode 100644
index 000000000000..b7770a4538f5
--- /dev/null
+++ b/pkgs/development/python-modules/mlx/darwin-build-fixes.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ab8aea44..9e1b06f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,9 +100,7 @@ elseif(MLX_BUILD_METAL)
+   endif()
+ 
+   # Throw an error if xcrun not found
+-  execute_process(
+-    COMMAND zsh "-c" "/usr/bin/xcrun -sdk macosx --show-sdk-version"
+-    OUTPUT_VARIABLE MACOS_SDK_VERSION COMMAND_ERROR_IS_FATAL ANY)
++  set(MACOS_SDK_VERSION @sdkVersion@)
+ 
+   if(${MACOS_SDK_VERSION} LESS 14.0)
+     message(
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 75f9d7bea255..047352d8fe25 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -1,14 +1,28 @@
 {
-  lib,
-  fetchFromGitHub,
   buildPythonPackage,
-  pybind11,
-  cmake,
-  xcbuild,
-  zsh,
-  blas,
-  lapack,
+  fetchFromGitHub,
+  lib,
+  replaceVars,
+  stdenv,
+
+  # build-system
   setuptools,
+
+  # nativeBuildInputs
+  cmake,
+
+  # buildInputs
+  apple-sdk_14,
+  fmt_10,
+  nanobind,
+  nlohmann_json,
+  pybind11,
+
+  # tests
+  numpy,
+  pytestCheckHook,
+  python,
+  runCommand,
 }:
 
 let
@@ -16,79 +30,125 @@ let
   gguf-tools = fetchFromGitHub {
     owner = "antirez";
     repo = "gguf-tools";
-    rev = "af7d88d808a7608a33723fba067036202910acb3";
-    hash = "sha256-LqNvnUbmq0iziD9VP5OTJCSIy+y/hp5lKCUV7RtKTvM=";
+    rev = "8fa6eb65236618e28fd7710a0fba565f7faa1848";
+    hash = "sha256-15FvyPOFqTOr5vdWQoPnZz+mYH919++EtghjozDlnSA=";
   };
-  nlohmann_json = fetchFromGitHub {
-    owner = "nlohmann";
-    repo = "json";
-    rev = "v3.11.3";
-    hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg=";
+
+  mlx = buildPythonPackage rec {
+    pname = "mlx";
+    version = "0.25.2";
+    pyproject = true;
+
+    src = fetchFromGitHub {
+      owner = "ml-explore";
+      repo = "mlx";
+      tag = "v${version}";
+      hash = "sha256-fkf/kKATr384WduFG/X81c5InEAZq5u5+hwrAJIg7MI=";
+    };
+
+    patches = [
+      (replaceVars ./darwin-build-fixes.patch {
+        sdkVersion = apple-sdk_14.version;
+      })
+    ];
+
+    postPatch = ''
+      substituteInPlace pyproject.toml \
+        --replace-fail "nanobind==2.4.0" "nanobind>=2.4.0"
+
+      substituteInPlace mlx/backend/cpu/jit_compiler.cpp \
+        --replace-fail "g++" "$CXX"
+    '';
+
+    dontUseCmakeConfigure = true;
+
+    enableParallelBuilding = true;
+
+    # Allows multiple cores to be used in Python builds.
+    postUnpack = ''
+      export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
+    '';
+
+    # updates the wrong fetcher rev attribute
+    passthru.skipBulkUpdate = true;
+
+    env = {
+      PYPI_RELEASE = version;
+      CMAKE_ARGS = toString [
+        # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source.
+        # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape
+        # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper`
+        # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016).
+        (lib.cmakeBool "MLX_BUILD_METAL" false)
+        (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
+        (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}")
+        (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_FMT" "${fmt_10.src}")
+      ];
+    };
+
+    build-system = [
+      setuptools
+    ];
+
+    nativeBuildInputs = [
+      cmake
+    ];
+
+    buildInputs = [
+      apple-sdk_14
+      fmt_10
+      gguf-tools
+      nanobind
+      nlohmann_json
+      pybind11
+    ];
+
+    pythonImportsCheck = [ "mlx" ];
+
+    # Run the mlx Python test suite.
+    nativeCheckInputs = [
+      numpy
+      pytestCheckHook
+    ];
+
+    pytestFlagsArray = [
+      "python/tests/"
+    ];
+
+    # Additional testing by executing the example Python scripts supplied with mlx
+    # using the version of the library we've built.
+    passthru.tests = {
+      mlxTest =
+        runCommand "run-mlx-examples"
+          {
+            buildInputs = [ mlx ];
+            nativeBuildInputs = [ python ];
+          }
+          ''
+            cp ${src}/examples/python/logistic_regression.py .
+            ${python.interpreter} logistic_regression.py
+            rm logistic_regression.py
+
+            cp ${src}/examples/python/linear_regression.py .
+            ${python.interpreter} linear_regression.py
+            rm linear_regression.py
+
+            touch $out
+          '';
+    };
+
+    meta = {
+      homepage = "https://github.com/ml-explore/mlx";
+      description = "Array framework for Apple silicon";
+      changelog = "https://github.com/ml-explore/mlx/releases/tag/${src.tag}";
+      license = lib.licenses.mit;
+      platforms = [ "aarch64-darwin" ];
+      maintainers = with lib.maintainers; [
+        viraptor
+        Gabriella439
+        cameronyule
+      ];
+    };
   };
 in
-buildPythonPackage rec {
-  pname = "mlx";
-  version = "0.21.1";
-
-  src = fetchFromGitHub {
-    owner = "ml-explore";
-    repo = "mlx";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-wxv9bA9e8VyFv/FMh63sUTTNgkXHGQJNQhLuVynczZA=";
-  };
-
-  pyproject = true;
-
-  patches = [
-    # With Darwin SDK 11 we cannot include vecLib/cblas_new.h, this needs to wait for PR #229210
-    # In the meantime, pretend Accelerate is not available and use blas/lapack instead.
-    ./disable-accelerate.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" \
-  '';
-
-  dontUseCmakeConfigure = true;
-
-  # updates the wrong fetcher rev attribute
-  passthru.skipBulkUpdate = true;
-
-  env = {
-    PYPI_RELEASE = version;
-    # we can't use Metal compilation with Darwin SDK 11
-    CMAKE_ARGS = toString [
-      (lib.cmakeBool "MLX_BUILD_METAL" false)
-      (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
-      (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json}")
-    ];
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pybind11
-    xcbuild
-    zsh
-    gguf-tools
-    nlohmann_json
-    setuptools
-  ];
-
-  buildInputs = [
-    blas
-    lapack
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/ml-explore/mlx";
-    description = "Array framework for Apple silicon";
-    changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = [ "aarch64-darwin" ];
-    maintainers = with maintainers; [
-      viraptor
-      Gabriella439
-    ];
-  };
-}
+mlx
diff --git a/pkgs/development/python-modules/mlx/disable-accelerate.patch b/pkgs/development/python-modules/mlx/disable-accelerate.patch
deleted file mode 100644
index 693e7f41104d..000000000000
--- a/pkgs/development/python-modules/mlx/disable-accelerate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d6bef9..d099673 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,7 +104,7 @@ elseif (MLX_BUILD_METAL)
-     ${QUARTZ_LIB})
- endif()
- 
--find_library(ACCELERATE_LIBRARY Accelerate)
-+#find_library(ACCELERATE_LIBRARY Accelerate)
- if (MLX_BUILD_ARM AND ACCELERATE_LIBRARY)
-   message(STATUS "Accelerate found ${ACCELERATE_LIBRARY}")
-   set(MLX_BUILD_ACCELERATE ON)

From cfe1e8cfb87745d454a58a1f8a23fe4b9bd4f066 Mon Sep 17 00:00:00 2001
From: Cameron Yule <cameron@cameronyule.com>
Date: Wed, 9 Jul 2025 14:06:55 +0100
Subject: [PATCH 22/38] python313Packages.mlx: 0.25.2 -> 0.26.3

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

diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 047352d8fe25..b05c0224608b 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -36,14 +36,14 @@ let
 
   mlx = buildPythonPackage rec {
     pname = "mlx";
-    version = "0.25.2";
+    version = "0.26.3";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "ml-explore";
       repo = "mlx";
       tag = "v${version}";
-      hash = "sha256-fkf/kKATr384WduFG/X81c5InEAZq5u5+hwrAJIg7MI=";
+      hash = "sha256-hbqV/2KYGJ1gyExZd5bgaxTdhl5+Gext+U/+1KAztMU=";
     };
 
     patches = [

From 9a79c745f716f0d3e54a6c6240aeb8e8d822bf6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 13:17:07 +0000
Subject: [PATCH 23/38] picom-pijulius: 8.2-unstable-2025-03-01 ->
 8.2-unstable-2025-06-22

---
 pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix
index 85a599d2b31b..e83547c2aa2c 100644
--- a/pkgs/by-name/pi/picom-pijulius/package.nix
+++ b/pkgs/by-name/pi/picom-pijulius/package.nix
@@ -8,13 +8,13 @@
 
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2025-03-01";
+  version = "8.2-unstable-2025-06-22";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "e9834631b85da58d1f9cb258a0e020eedda58100";
-    hash = "sha256-HvQdFAmoROZpiqDgrbn3L2ozAmsPibEB4Wy/cTtjMHc=";
+    rev = "cd609d21fcc17d2935dc1c4e32bc77cd1ffe160f";
+    hash = "sha256-zh0oPyoM4phtZ2BedNVyPieIc6HWZrNS6DnEWzlTUy0=";
   };
 
   dontVersionCheck = true;

From 8a8ec917b47852eb0f0fd658544aa17104293603 Mon Sep 17 00:00:00 2001
From: Nathan Warner <nathan@frcv.net>
Date: Wed, 9 Jul 2025 08:10:26 -0600
Subject: [PATCH 24/38] Rename the binary to match upstream name

---
 pkgs/by-name/li/librespeed-cli/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix
index b2a64f0fdbcb..da6eac10f641 100644
--- a/pkgs/by-name/li/librespeed-cli/package.nix
+++ b/pkgs/by-name/li/librespeed-cli/package.nix
@@ -21,13 +21,17 @@ buildGoModule rec {
   # Tests have additional requirements
   doCheck = false;
 
+  postInstall = ''
+    mv $out/bin/speedtest-cli $out/bin/librespeed-cli
+  '';
+
   meta = with lib; {
     description = "Command line client for LibreSpeed";
     homepage = "https://github.com/librespeed/speedtest-cli";
     changelog = "https://github.com/librespeed/speedtest-cli/releases/tag/${src.tag}";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [ fab ];
-    mainProgram = "speedtest-cli";
+    mainProgram = "librespeed-cli";
     broken = stdenv.hostPlatform.isDarwin;
   };
 }

From e9c73c72fb1390abf440e3f1e7d2e1a9ede9311f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 15:22:14 +0000
Subject: [PATCH 25/38] python3Packages.powerfox: 1.2.1 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/powerfox/default.nix b/pkgs/development/python-modules/powerfox/default.nix
index 919fec57f72e..79bcfce0e371 100644
--- a/pkgs/development/python-modules/powerfox/default.nix
+++ b/pkgs/development/python-modules/powerfox/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "powerfox";
-  version = "1.2.1";
+  version = "1.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-powerfox";
     tag = "v${version}";
-    hash = "sha256-eBadw++8mB/RUejIbMAnfBRmM+YC7oeeBWRaHCCyizo=";
+    hash = "sha256-oGOKh+/KCR7eFi4b8TrLiBiOfauhUhKkRvPMejwelJY=";
   };
 
   patches = [
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asynchronous Python client for the Powerfox devices";
     homepage = "https://github.com/klaasnicolaas/python-powerfox";
-    changelog = "https://github.com/klaasnicolaas/python-powerfox/releases/tag/v${version}";
+    changelog = "https://github.com/klaasnicolaas/python-powerfox/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From 85a0954aa8c56734216d5401e44340ce22bb5c2e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 9 Jul 2025 18:10:51 +0200
Subject: [PATCH 26/38] pkgs/by-name/{i,j,k,l}*: migrate to format =
 "pyproject"

---
 pkgs/by-name/i3/i3a/package.nix               | 11 +++++--
 pkgs/by-name/i3/i3minator/package.nix         | 11 +++++--
 pkgs/by-name/ib/ibus-theme-tools/package.nix  |  8 +++--
 pkgs/by-name/im/imdshift/package.nix          |  8 +++--
 pkgs/by-name/im/imgp/package.nix              |  6 ++--
 pkgs/by-name/in/inkcut/package.nix            |  9 +++---
 pkgs/by-name/in/inql/package.nix              | 11 ++++---
 pkgs/by-name/in/invoice2data/package.nix      |  9 +++---
 pkgs/by-name/io/iotop/package.nix             |  6 +++-
 pkgs/by-name/ip/ipgrep/package.nix            | 14 +++++----
 pkgs/by-name/is/isolyzer/package.nix          |  9 ++++--
 pkgs/by-name/is/isrcsubmit/package.nix        |  8 ++++-
 pkgs/by-name/je/jelly/package.nix             |  6 ++--
 pkgs/by-name/jn/jnitrace/package.nix          | 10 +++++--
 pkgs/by-name/jo/joystickwake/package.nix      |  8 +++--
 pkgs/by-name/ka/kanjidraw/package.nix         | 11 ++++---
 pkgs/by-name/ka/kas/package.nix               | 10 +++++--
 pkgs/by-name/ka/kazam/package.nix             | 13 +++++++--
 pkgs/by-name/kb/kb/package.nix                | 12 ++++++--
 .../ke/kernel-hardening-checker/package.nix   |  6 +++-
 pkgs/by-name/ke/keymapviz/package.nix         |  8 +++--
 pkgs/by-name/kh/khard/package.nix             |  9 +++---
 pkgs/by-name/ko/konsave/package.nix           | 16 +++++-----
 pkgs/by-name/kr/krakenx/package.nix           |  8 +++--
 pkgs/by-name/la/labelImg/package.nix          | 12 ++++++--
 pkgs/by-name/le/legendary-heroic/package.nix  | 10 ++++---
 pkgs/by-name/le/legit/package.nix             | 16 +++++++---
 pkgs/by-name/le/lerpn/package.nix             |  8 +++--
 pkgs/by-name/le/lesscpy/package.nix           | 12 ++++----
 pkgs/by-name/le/lesspass-cli/package.nix      | 29 +++++++++++--------
 pkgs/by-name/li/lieer/package.nix             |  9 ++++--
 pkgs/by-name/li/lil-pwny/package.nix          |  4 ++-
 pkgs/by-name/ln/lndmanage/package.nix         | 17 +++++++----
 .../by-name/lo/log4shell-detector/package.nix |  8 +++--
 pkgs/by-name/lo/loxodo/package.nix            |  8 +++--
 pkgs/by-name/lx/lxd-image-server/package.nix  | 10 +++++--
 36 files changed, 257 insertions(+), 113 deletions(-)

diff --git a/pkgs/by-name/i3/i3a/package.nix b/pkgs/by-name/i3/i3a/package.nix
index 0ad7b8608219..525b990f0e8f 100644
--- a/pkgs/by-name/i3/i3a/package.nix
+++ b/pkgs/by-name/i3/i3a/package.nix
@@ -7,19 +7,24 @@
 python3Packages.buildPythonApplication rec {
   pname = "i3a";
   version = "2.1.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-b1bB7Gto4aL1rbQXIelBVhutjIvZY+K+Y66BGN7OcCs=";
   };
 
-  nativeBuildInputs = [ python3Packages.setuptools-scm ];
+  build-system = [
+    python3Packages.setuptools
+    python3Packages.setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ python3Packages.i3ipc ];
+  dependencies = [ python3Packages.i3ipc ];
 
   doCheck = false;
 
+  pythonImportsCheck = [ "i3a" ];
+
   meta = with lib; {
     changelog = "https://git.goral.net.pl/i3a.git/log/";
     description = "Set of scripts used for automation of i3 and sway window manager layouts";
diff --git a/pkgs/by-name/i3/i3minator/package.nix b/pkgs/by-name/i3/i3minator/package.nix
index 2d90a8c5d361..77b664cbf005 100644
--- a/pkgs/by-name/i3/i3minator/package.nix
+++ b/pkgs/by-name/i3/i3minator/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "i3minator";
   version = "0.0.4";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "carlesso";
@@ -19,7 +19,12 @@ python3Packages.buildPythonApplication rec {
 
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ glibcLocales ];
-  propagatedBuildInputs = [
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
     python3Packages.pyyaml
     python3Packages.i3-py
   ];
@@ -27,6 +32,8 @@ python3Packages.buildPythonApplication rec {
   # No tests
   doCheck = false;
 
+  pythonImportsCheck = [ "i3minator" ];
+
   meta = with lib; {
     description = "i3 project manager similar to tmuxinator";
     mainProgram = "i3minator";
diff --git a/pkgs/by-name/ib/ibus-theme-tools/package.nix b/pkgs/by-name/ib/ibus-theme-tools/package.nix
index cf2f06ab9c78..10ad9ee61834 100644
--- a/pkgs/by-name/ib/ibus-theme-tools/package.nix
+++ b/pkgs/by-name/ib/ibus-theme-tools/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "ibus-theme-tools";
   version = "4.2.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
@@ -19,7 +19,11 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = [ gettext ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     tinycss2
     pygobject3
   ];
diff --git a/pkgs/by-name/im/imdshift/package.nix b/pkgs/by-name/im/imdshift/package.nix
index 457e6294f3ef..5f4caa4c309d 100644
--- a/pkgs/by-name/im/imdshift/package.nix
+++ b/pkgs/by-name/im/imdshift/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "imdshift";
   version = "1.0.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "ayushpriya10";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     boto3
     click
     prettytable
diff --git a/pkgs/by-name/im/imgp/package.nix b/pkgs/by-name/im/imgp/package.nix
index 57d32eab2230..19dd6a232615 100644
--- a/pkgs/by-name/im/imgp/package.nix
+++ b/pkgs/by-name/im/imgp/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "imgp";
   version = "2.9";
-  format = "setuptools";
+  format = "pyproject";
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
@@ -17,7 +17,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA=";
   };
 
-  propagatedBuildInputs = [ python3Packages.pillow ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.pillow ];
 
   installFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix
index 6c4dee376f72..4510cbe1ee42 100644
--- a/pkgs/by-name/in/inkcut/package.nix
+++ b/pkgs/by-name/in/inkcut/package.nix
@@ -10,7 +10,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "inkcut";
   version = "2.1.6";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "inkcut";
@@ -21,12 +21,14 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace inkcut/device/transports/printer/plugin.py \
-      --replace ", 'lpr', " ", '${cups}/bin/lpr', "
+      --replace-fail ", 'lpr', " ", '${cups}/bin/lpr', "
   '';
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     enamlx
     twisted
     lxml
@@ -36,7 +38,6 @@ python3.pkgs.buildPythonApplication rec {
     pycups
     qtconsole
     pyqt5
-    setuptools
   ];
 
   # QtApplication.instance() does not work during tests?
diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix
index 4d4013dfbad5..292c38996b8f 100644
--- a/pkgs/by-name/in/inql/package.nix
+++ b/pkgs/by-name/in/inql/package.nix
@@ -7,8 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "inql";
   version = "4.0.6";
-  format = "setuptools";
-
+  format = "pyproject";
   src = fetchFromGitHub {
     owner = "doyensec";
     repo = "inql";
@@ -19,10 +18,14 @@ python3.pkgs.buildPythonApplication rec {
   postPatch = ''
     # To set the version a full git checkout would be needed
     substituteInPlace setup.py \
-      --replace "version=version()," "version='${version}',"
+      --replace-fail "version=version()," "version='${version}',"
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     stickytape
   ];
 
diff --git a/pkgs/by-name/in/invoice2data/package.nix b/pkgs/by-name/in/invoice2data/package.nix
index 5463d0abb1d7..cd86694a7fa1 100644
--- a/pkgs/by-name/in/invoice2data/package.nix
+++ b/pkgs/by-name/in/invoice2data/package.nix
@@ -12,7 +12,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "invoice2data";
   version = "0.4.4";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "invoice-x";
@@ -30,16 +30,17 @@ python3.pkgs.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
     setuptools-git
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     dateparser
     pdfminer-six
     pillow
     pyyaml
-    setuptools
+    setuptools # pkg_resources is imported during runtime
   ];
 
   makeWrapperArgs = [
diff --git a/pkgs/by-name/io/iotop/package.nix b/pkgs/by-name/io/iotop/package.nix
index d147f6df7f3a..e7bc757e1131 100644
--- a/pkgs/by-name/io/iotop/package.nix
+++ b/pkgs/by-name/io/iotop/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "iotop";
   version = "0.6";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchurl {
     url = "http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2";
@@ -22,8 +22,12 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
+  build-system = [ python3Packages.setuptools ];
+
   doCheck = false;
 
+  pythonImportsCheck = [ "iotop" ];
+
   meta = with lib; {
     description = "Tool to find out the processes doing the most IO";
     homepage = "http://guichaz.free.fr/iotop";
diff --git a/pkgs/by-name/ip/ipgrep/package.nix b/pkgs/by-name/ip/ipgrep/package.nix
index ede71394e81c..048f9de40d72 100644
--- a/pkgs/by-name/ip/ipgrep/package.nix
+++ b/pkgs/by-name/ip/ipgrep/package.nix
@@ -5,11 +5,9 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.0.1";
-  format = "setuptools";
   pname = "ipgrep";
-
-  disabled = python3Packages.isPy27;
+  version = "1.0.1";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
@@ -21,10 +19,14 @@ python3Packages.buildPythonApplication rec {
   patchPhase = ''
     mkdir -p ipgrep
     substituteInPlace setup.py \
-      --replace "'scripts': []" "'scripts': { 'ipgrep.py' }"
+      --replace-fail "'scripts': []" "'scripts': { 'ipgrep.py' }"
   '';
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pycares
     urllib3
     requests
diff --git a/pkgs/by-name/is/isolyzer/package.nix b/pkgs/by-name/is/isolyzer/package.nix
index e5413bd2dc80..e9f956c09e3b 100644
--- a/pkgs/by-name/is/isolyzer/package.nix
+++ b/pkgs/by-name/is/isolyzer/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "isolyzer";
   version = "1.4.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "KBNLresearch";
@@ -16,11 +16,16 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-NqkjnEwpaoyguG5GLscKS9UQGtF9N4jUL5JhrMtKCFE=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     six
   ];
 
+  pythonImportsCheck = [ "isolyzer" ];
+
   meta = with lib; {
     homepage = "https://github.com/KBNLresearch/isolyzer";
     description = "Verify size of ISO 9660 image against Volume Descriptor fields";
diff --git a/pkgs/by-name/is/isrcsubmit/package.nix b/pkgs/by-name/is/isrcsubmit/package.nix
index 1d3edf20e4e3..7baee361c3c8 100644
--- a/pkgs/by-name/is/isrcsubmit/package.nix
+++ b/pkgs/by-name/is/isrcsubmit/package.nix
@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication {
   pname = "isrcsubmit";
   version = "2.1.0-unstable-2023-08-10";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "JonnyJD";
@@ -25,6 +25,10 @@ python3Packages.buildPythonApplication {
     substituteInPlace isrcsubmit.py --replace-fail "main(argv):" "main(argv=sys.argv):"
   '';
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   dependencies =
     with python3Packages;
     [
@@ -35,6 +39,8 @@ python3Packages.buildPythonApplication {
       keyring
     ];
 
+  pythonImportsCheck = [ "isrcsubmit" ];
+
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version=branch" ];
   };
diff --git a/pkgs/by-name/je/jelly/package.nix b/pkgs/by-name/je/jelly/package.nix
index 0f71bbb3d5b0..7d0c111a9be0 100644
--- a/pkgs/by-name/je/jelly/package.nix
+++ b/pkgs/by-name/je/jelly/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "jelly";
   version = "0.1.31";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "DennisMitchell";
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication {
     sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6";
   };
 
-  propagatedBuildInputs = [ python3Packages.sympy ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.sympy ];
 
   # checks are disabled because jelly has no tests, and the default is to run
   # the output binary with no arguments, which exits with status 1 and causes
diff --git a/pkgs/by-name/jn/jnitrace/package.nix b/pkgs/by-name/jn/jnitrace/package.nix
index b6ad48bbda79..5fd297c72485 100644
--- a/pkgs/by-name/jn/jnitrace/package.nix
+++ b/pkgs/by-name/jn/jnitrace/package.nix
@@ -7,20 +7,26 @@
 python3Packages.buildPythonApplication rec {
   pname = "jnitrace";
   version = "3.3.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-b8azmlYbNEFSUN3MjqpUqNlBTKT0JTLpCVBkk9Rx7+0=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   dependencies = with python3Packages; [
     frida-python
     colorama
     hexdump
-    setuptools
+    setuptools # pkg_resources is imported during runtime
   ];
 
+  pythonImportsCheck = [ "jnitrace" ];
+
   meta = {
     description = "Frida based tool that traces usage of the JNI API in Android apps";
     homepage = "https://github.com/chame1eon/jnitrace";
diff --git a/pkgs/by-name/jo/joystickwake/package.nix b/pkgs/by-name/jo/joystickwake/package.nix
index 16aa51877aee..470902310baa 100644
--- a/pkgs/by-name/jo/joystickwake/package.nix
+++ b/pkgs/by-name/jo/joystickwake/package.nix
@@ -6,7 +6,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "joystickwake";
   version = "0.4.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "foresto";
@@ -15,7 +15,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-vSvIpbcDIbRyitVjx3wNSxt5vTIZ9/NPWokOJt0p6oQ=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     dbus-next
     pyudev
     xlib
diff --git a/pkgs/by-name/ka/kanjidraw/package.nix b/pkgs/by-name/ka/kanjidraw/package.nix
index 584506e6a19e..367e043e468e 100644
--- a/pkgs/by-name/ka/kanjidraw/package.nix
+++ b/pkgs/by-name/ka/kanjidraw/package.nix
@@ -2,13 +2,12 @@
   lib,
   fetchFromGitHub,
   python3,
-  bash,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kanjidraw";
   version = "0.2.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "obfusk";
@@ -17,16 +16,20 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ tkinter ];
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [ tkinter ];
 
   postPatch = ''
-    substituteInPlace Makefile --replace /bin/bash ${bash}/bin/bash
+    substituteInPlace Makefile --replace-fail /bin/bash bash
   '';
 
   checkPhase = ''
     make test
   '';
 
+  pythonImportsCheck = [ "kanjidraw" ];
+
   meta = with lib; {
     description = "Handwritten kanji recognition";
     mainProgram = "kanjidraw";
diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix
index 8deec4a0ff8b..cd05d888958f 100644
--- a/pkgs/by-name/ka/kas/package.nix
+++ b/pkgs/by-name/ka/kas/package.nix
@@ -9,7 +9,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "kas";
   version = "4.7";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "siemens";
@@ -20,8 +20,12 @@ python3.pkgs.buildPythonApplication rec {
 
   patches = [ ./pass-terminfo-env.patch ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    setuptools # pkg_resources is imported during runtime
     kconfiglib
     jsonschema
     distro
@@ -36,6 +40,8 @@ python3.pkgs.buildPythonApplication rec {
     command = "kas --version";
   };
 
+  pythonImportsCheck = [ "kas" ];
+
   meta = with lib; {
     homepage = "https://github.com/siemens/kas";
     description = "Setup tool for bitbake based projects";
diff --git a/pkgs/by-name/ka/kazam/package.nix b/pkgs/by-name/ka/kazam/package.nix
index 194c39890cfa..4936d8305a91 100644
--- a/pkgs/by-name/ka/kazam/package.nix
+++ b/pkgs/by-name/ka/kazam/package.nix
@@ -19,7 +19,7 @@
 python3Packages.buildPythonApplication {
   pname = "kazam";
   version = "unstable-2021-06-22";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "niknah";
@@ -30,10 +30,10 @@ python3Packages.buildPythonApplication {
 
   nativeBuildInputs = [
     gobject-introspection
-    python3Packages.distutils-extra
     intltool
     wrapGAppsHook3
   ];
+
   buildInputs = [
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
@@ -45,7 +45,12 @@ python3Packages.buildPythonApplication {
     libgudev
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+    distutils-extra
+  ];
+
+  dependencies = with python3Packages; [
     pygobject3
     pyxdg
     pycairo
@@ -64,6 +69,8 @@ python3Packages.buildPythonApplication {
   # no tests
   doCheck = false;
 
+  pythonImportsCheck = [ "kazam" ];
+
   meta = with lib; {
     description = "Screencasting program created with design in mind";
     homepage = "https://github.com/niknah/kazam";
diff --git a/pkgs/by-name/kb/kb/package.nix b/pkgs/by-name/kb/kb/package.nix
index 58c502af23a2..c5689c5c536a 100644
--- a/pkgs/by-name/kb/kb/package.nix
+++ b/pkgs/by-name/kb/kb/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "kb";
   version = "0.1.7";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "gnebbia";
@@ -20,12 +20,16 @@ python3.pkgs.buildPythonApplication rec {
     # `attr` module is not available. And `attrs` defines another `attr` package
     # that shadows it.
     substituteInPlace setup.py \
-      --replace \
+      --replace-fail \
         "install_requires=[\"colored\",\"toml\",\"attr\",\"attrs\",\"gitpython\"]," \
         "install_requires=[\"colored\",\"toml\",\"attrs\",\"gitpython\"],"
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     colored
     toml
     attrs
@@ -37,6 +41,8 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "kb" ];
+
   meta = {
     description = "Minimalist command line knowledge base manager";
     longDescription = ''
diff --git a/pkgs/by-name/ke/kernel-hardening-checker/package.nix b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
index 51dde18e0d1e..3a740ab73db7 100644
--- a/pkgs/by-name/ke/kernel-hardening-checker/package.nix
+++ b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "kernel-hardening-checker";
   version = "0.6.10";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "a13xp0p0v";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-gxDaOb14jFezxe/qHZF3e52o7obVL0WMIKxwIj3j5QY=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonImportsCheck = [ "kernel_hardening_checker" ];
+
   meta = with lib; {
     description = "Tool for checking the security hardening options of the Linux kernel";
     homepage = "https://github.com/a13xp0p0v/kernel-hardening-checker";
diff --git a/pkgs/by-name/ke/keymapviz/package.nix b/pkgs/by-name/ke/keymapviz/package.nix
index 4bd76dc78669..e0403aaf1e55 100644
--- a/pkgs/by-name/ke/keymapviz/package.nix
+++ b/pkgs/by-name/ke/keymapviz/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "keymapviz";
   version = "1.14.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "yskoht";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-eCvwgco22uPEDDsT8FfTRon1xCGy5p1PBp0pDfNprMs=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ regex ];
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [ regex ];
+
+  pythonImportsCheck = [ "keymapviz" ];
 
   meta = with lib; {
     description = "Qmk keymap.c visualizer";
diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index c726711b668a..3853b99e1a04 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -7,16 +7,17 @@
 }:
 
 python3.pkgs.buildPythonApplication rec {
-  version = "0.19.1";
-  format = "setuptools";
   pname = "khard";
+  version = "0.19.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
     setuptools-scm
     sphinxHook
     sphinx-autoapi
@@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
 
   sphinxBuilders = [ "man" ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     atomicwrites
     configobj
     ruamel-yaml
diff --git a/pkgs/by-name/ko/konsave/package.nix b/pkgs/by-name/ko/konsave/package.nix
index 9b6116b132de..065d61af530f 100644
--- a/pkgs/by-name/ko/konsave/package.nix
+++ b/pkgs/by-name/ko/konsave/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "konsave";
   version = "2.2.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit version;
@@ -15,15 +15,17 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M=";
   };
 
-  nativeBuildInputs = with python3Packages; [ setuptools-scm ];
-  propagatedBuildInputs = with python3Packages; [
-    pyyaml
+  build-system = with python3Packages; [
     setuptools
+    setuptools-scm
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  dependencies = with python3Packages; [
+    pyyaml
+    setuptools # pkg_resources is imported during runtime
+  ];
+
+  pythonImportsCheck = [ "konsave" ];
 
   meta = with lib; {
     description = "Save Linux Customization";
diff --git a/pkgs/by-name/kr/krakenx/package.nix b/pkgs/by-name/kr/krakenx/package.nix
index 509e1242d96c..a72ba9e4ac97 100644
--- a/pkgs/by-name/kr/krakenx/package.nix
+++ b/pkgs/by-name/kr/krakenx/package.nix
@@ -7,17 +7,21 @@
 python3Packages.buildPythonApplication rec {
   pname = "krakenx";
   version = "0.0.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000";
   };
 
-  propagatedBuildInputs = lib.singleton python3Packages.pyusb;
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.pyusb ];
 
   doCheck = false; # there are no tests
 
+  pythonImportsCheck = [ "krakenx" ];
+
   meta = with lib; {
     description = "Python script to control NZXT cooler Kraken X52/X62/X72";
     homepage = "https://github.com/KsenijaS/krakenx";
diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index 2f9ed526065b..89522a492092 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "labelImg";
   version = "1.8.6";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "HumanSignal";
@@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
   };
 
-  nativeBuildInputs = with python3Packages; [
-    pyqt5
+  nativeBuildInputs = [
     qt5.wrapQtAppsHook
   ];
 
@@ -31,6 +30,11 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
+  build-system = with python3Packages; [
+    setuptools
+    pyqt5
+  ];
+
   dependencies = with python3Packages; [
     distutils
     pyqt5
@@ -51,6 +55,8 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
+  pythonImportsCheck = [ "labelImg" ];
+
   meta = {
     description = "Graphical image annotation tool and label object bounding boxes in images";
     mainProgram = "labelImg";
diff --git a/pkgs/by-name/le/legendary-heroic/package.nix b/pkgs/by-name/le/legendary-heroic/package.nix
index de0de33ef06b..e917395009f0 100644
--- a/pkgs/by-name/le/legendary-heroic/package.nix
+++ b/pkgs/by-name/le/legendary-heroic/package.nix
@@ -10,7 +10,7 @@ in
 python3Packages.buildPythonApplication {
   pname = "legendary-heroic";
   inherit version;
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
@@ -19,13 +19,15 @@ python3Packages.buildPythonApplication {
     sha256 = "sha256-mOys7lOPrrzBUBMIM/JvKygFQ/qIGD68BDNigk5BCIo=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     requests
     filelock
   ];
 
-  disabled = python3Packages.pythonOlder "3.8";
-
   pythonImportsCheck = [ "legendary" ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/legit/package.nix b/pkgs/by-name/le/legit/package.nix
index 4873da60e4e9..f124496236d8 100644
--- a/pkgs/by-name/le/legit/package.nix
+++ b/pkgs/by-name/le/legit/package.nix
@@ -2,19 +2,24 @@
   lib,
   python3Packages,
   fetchPypi,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "legit";
   version = "1.2.0.post0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     click
     clint
     crayons
@@ -22,8 +27,11 @@ python3Packages.buildPythonApplication rec {
     six
   ];
 
-  # no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "legit" ];
 
   meta = with lib; {
     homepage = "https://github.com/frostming/legit";
diff --git a/pkgs/by-name/le/lerpn/package.nix b/pkgs/by-name/le/lerpn/package.nix
index 33f08c1315a7..d21c44e8c965 100644
--- a/pkgs/by-name/le/lerpn/package.nix
+++ b/pkgs/by-name/le/lerpn/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "lerpn";
   version = "unstable-2023-06-09";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitea {
     domain = "gitea.alexisvl.rocks";
@@ -17,15 +17,19 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-4xqBHcOWHAvQtXS9CJWTGTdE4SGHxjghZY+/KPUgX70=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   checkPhase = ''
     runHook preCheck
     patchShebangs test
 
-    substituteInPlace test --replace "#raise TestFailedException()" "sys.exit(1)"
+    substituteInPlace test --replace-fail "#raise TestFailedException()" "sys.exit(1)"
     ./test
     runHook postCheck
   '';
 
+  pythonImportsCheck = [ "LerpnApp" ];
+
   meta = with lib; {
     homepage = "https://gitea.alexisvl.rocks/alexisvl/lerpn";
     description = "Curses RPN calculator written in straight Python";
diff --git a/pkgs/by-name/le/lesscpy/package.nix b/pkgs/by-name/le/lesscpy/package.nix
index a60f1074af1b..d2df8f483c69 100644
--- a/pkgs/by-name/le/lesscpy/package.nix
+++ b/pkgs/by-name/le/lesscpy/package.nix
@@ -7,21 +7,23 @@
 python3Packages.buildPythonApplication rec {
   pname = "lesscpy";
   version = "0.15.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw=";
   };
 
-  checkInputs = with python3Packages; [ pytestCheckHook ];
-  pythonImportsCheck = [ "lesscpy" ];
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     ply
     six
   ];
 
-  doCheck = false; # Really weird test failures (`nix-build-python2.css not found`)
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lesscpy" ];
 
   meta = with lib; {
     description = "Python LESS Compiler";
diff --git a/pkgs/by-name/le/lesspass-cli/package.nix b/pkgs/by-name/le/lesspass-cli/package.nix
index 4c24e825dbe3..ae3092ba608b 100644
--- a/pkgs/by-name/le/lesspass-cli/package.nix
+++ b/pkgs/by-name/le/lesspass-cli/package.nix
@@ -7,7 +7,8 @@
 let
   inherit (python3.pkgs)
     buildPythonApplication
-    pytest
+    setuptools
+    pytestCheckHook
     mock
     pexpect
     ;
@@ -16,7 +17,7 @@ in
 buildPythonApplication rec {
   pname = "lesspass-cli";
   version = "9.1.9";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = repo;
@@ -24,26 +25,30 @@ buildPythonApplication rec {
     rev = version;
     sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh";
   };
+
   sourceRoot = "${src.name}/cli";
 
-  # some tests are designed to run against code in the source directory - adapt to run against
-  # *installed* code
-  postPatch = ''
-    for f in tests/test_functional.py tests/test_interaction.py ; do
-      substituteInPlace $f --replace "lesspass/core.py" "-m lesspass.core"
-    done
-  '';
+  build-system = [
+    setuptools
+  ];
 
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
     mock
     pexpect
   ];
-  checkPhase = ''
+
+  preCheck = ''
     mv lesspass lesspass.hidden  # ensure we're testing against *installed* package
-    pytest tests
+
+    # some tests are designed to run against code in the source directory - adapt to run against
+    # *installed* code
+    substituteInPlace tests/test_functional.py tests/test_interaction.py \
+      --replace-fail "lesspass/core.py" "-m lesspass.core"
   '';
 
+  pythonImportsCheck = [ "lesspass" ];
+
   meta = with lib; {
     description = "Stateless password manager";
     mainProgram = "lesspass";
diff --git a/pkgs/by-name/li/lieer/package.nix b/pkgs/by-name/li/lieer/package.nix
index 9e114def8285..d0689c031c14 100644
--- a/pkgs/by-name/li/lieer/package.nix
+++ b/pkgs/by-name/li/lieer/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "lieer";
   version = "1.6";
-  format = "setuptools";
+  format = "pyproject";
 
   passthru.updateScript = nix-update-script { };
 
@@ -19,12 +19,15 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-U3+Y634oGmvIrvcbSKrrJ8PzLRsMoN0Fd/+d9WE1Q7U=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     notmuch2
     google-api-python-client
     google-auth-oauthlib
     tqdm
-    setuptools
   ];
 
   # no tests
diff --git a/pkgs/by-name/li/lil-pwny/package.nix b/pkgs/by-name/li/lil-pwny/package.nix
index d4d7ef083153..0749f69e08ec 100644
--- a/pkgs/by-name/li/lil-pwny/package.nix
+++ b/pkgs/by-name/li/lil-pwny/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "lil-pwny";
   version = "2.0.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "PaperMtn";
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-EE6+PQTmvAv5EvxI9QR/dQcPby13BBk66KSc7XDNAZA=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   # Project has no test
   doCheck = false;
 
diff --git a/pkgs/by-name/ln/lndmanage/package.nix b/pkgs/by-name/ln/lndmanage/package.nix
index c19ae58d9a0d..63a94ae318f8 100644
--- a/pkgs/by-name/ln/lndmanage/package.nix
+++ b/pkgs/by-name/ln/lndmanage/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "lndmanage";
   version = "0.16.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "bitromortac";
@@ -16,7 +16,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-VUeGnk/DtNAyEYFESV6kXIRbKqUv4IcMnU3fo0NB4uQ=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     cycler
     decorator
     googleapis-common-protos
@@ -33,12 +37,13 @@ python3Packages.buildPythonApplication rec {
   ];
 
   preBuild = ''
-    substituteInPlace setup.py --replace '==' '>='
+    substituteInPlace setup.py --replace-fail '==' '>='
   '';
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  # requires lnregtest
+  doCheck = false;
+
+  pythonImportsCheck = [ "lndmanage" ];
 
   meta = with lib; {
     description = "Channel management tool for lightning network daemon (LND) operators";
diff --git a/pkgs/by-name/lo/log4shell-detector/package.nix b/pkgs/by-name/lo/log4shell-detector/package.nix
index 4115d59d1586..7ae04268092d 100644
--- a/pkgs/by-name/lo/log4shell-detector/package.nix
+++ b/pkgs/by-name/lo/log4shell-detector/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "log4shell-detector";
   version = "unstable-2021-12-16";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Neo23x0";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication {
     sha256 = "sha256-N81x9hq473LfM+bQIQLWizCAsVc/pzyB84PV7/N5jk4=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     zstandard
   ];
 
diff --git a/pkgs/by-name/lo/loxodo/package.nix b/pkgs/by-name/lo/loxodo/package.nix
index c8a1ed6943f1..a85a686bdc5d 100644
--- a/pkgs/by-name/lo/loxodo/package.nix
+++ b/pkgs/by-name/lo/loxodo/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "loxodo";
   version = "unstable-2021-02-08";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "sommer";
@@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication {
 
   patches = [ ./wxpython.patch ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     six
     wxpython
   ];
diff --git a/pkgs/by-name/lx/lxd-image-server/package.nix b/pkgs/by-name/lx/lxd-image-server/package.nix
index b1d68f477418..f89cde401e78 100644
--- a/pkgs/by-name/lx/lxd-image-server/package.nix
+++ b/pkgs/by-name/lx/lxd-image-server/package.nix
@@ -10,7 +10,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "lxd-image-server";
   version = "0.0.4";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Avature";
@@ -24,8 +24,12 @@ python3.pkgs.buildPythonApplication rec {
     ./run.patch
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    setuptools # pkg_resources is imported during runtime
     attrs
     click
     inotify
@@ -45,6 +49,8 @@ python3.pkgs.buildPythonApplication rec {
 
   doCheck = false;
 
+  pythonImportsCheck = [ "lxd_image_server" ];
+
   passthru.tests.lxd-image-server = nixosTests.lxd-image-server;
 
   meta = with lib; {

From 1a9233f54ffa8c365f4dca5c8fc8cbb1cf118528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 9 Jul 2025 18:06:37 +0200
Subject: [PATCH 27/38] mastodon: 4.4.0 -> 4.4.1

---
 pkgs/servers/mastodon/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index c22355c0ea2b..fb3b5482abb7 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.4.0";
+  version = "4.4.1";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-boAf0TnUlr+o4UqjFPzoRk2K6yFlxTo74BbkRowwkhw=";
+    hash = "sha256-hu6AmR0CvI3lVixJ2UmWY3KAlWbqYULCQAjRGJcuIhc=";
     passthru = {
       inherit version;
       yarnHash = "sha256-Qh2jli99rxrT10KVGKnePxP6RXYIjtehDCJB5PfOngM=";

From f0e486b3c740b68cb47aa59748d0fa939ecbb2b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 18:40:19 +0000
Subject: [PATCH 28/38] timewall: 2.0.0 -> 2.0.1

---
 pkgs/by-name/ti/timewall/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix
index 9df87522e09b..d780d7789902 100644
--- a/pkgs/by-name/ti/timewall/package.nix
+++ b/pkgs/by-name/ti/timewall/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "timewall";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "bcyran";
     repo = "timewall";
     rev = version;
-    hash = "sha256-KUPy/mv6cV0BmvBcom+cCXk0s4Erz0hf5dg1i5QB0OE=";
+    hash = "sha256-+9C8wLsaPEfmJfnjyrUkTKMCNrgTRartrlFNq0/U+rA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JOsCGHHbHx2yoFYdFWIYPHfgCfQjEtZA869+2OQ4jKA=";
+  cargoHash = "sha256-viUtr+F1aUE+ZXSa6P9PKRUkKxIYy006GilENdQvvMY=";
 
   nativeBuildInputs = [
     pkg-config

From 2bad2b0f4f6c4c88786834547b4e5d4ec4e7adeb Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 3 Jul 2025 12:40:20 +0200
Subject: [PATCH 29/38] pkgs/by-name/{e,f,g,h}*: migrate to format =
 "pyproject"

---
 pkgs/by-name/ea/easyeda2kicad/package.nix          |  7 +++++--
 pkgs/by-name/en/endgame-singularity/package.nix    |  9 +++++++--
 pkgs/by-name/ep/epr/package.nix                    |  6 +++++-
 pkgs/by-name/er/errbot/package.nix                 |  8 ++++++--
 pkgs/by-name/es/escrotum/package.nix               | 11 +++++++----
 pkgs/by-name/et/etesync-dav/package.nix            |  8 +++++---
 pkgs/by-name/ev/evdevremapkeys/package.nix         |  8 ++++++--
 pkgs/by-name/fa/fastcov/package.nix                |  2 +-
 pkgs/by-name/ff/ffmpeg-normalize/package.nix       |  6 +++++-
 pkgs/by-name/fi/fileinfo/package.nix               |  7 +++++--
 pkgs/by-name/fl/flac2all/package.nix               |  8 ++++++--
 pkgs/by-name/fl/flattenReferencesGraph/package.nix |  8 ++++++--
 pkgs/by-name/fl/flawfinder/package.nix             |  6 +++++-
 pkgs/by-name/fl/flent/package.nix                  |  7 +++++--
 pkgs/by-name/fl/flootty/package.nix                |  6 +++++-
 pkgs/by-name/fl/fluxboxlauncher/package.nix        |  8 ++++++--
 pkgs/by-name/fp/fprettify/package.nix              |  8 ++++++--
 pkgs/by-name/fr/frida-tools/package.nix            | 13 +++++++++++--
 pkgs/by-name/ge/genxword/package.nix               |  8 ++++++--
 pkgs/by-name/ge/gersemi/package.nix                |  8 ++++++--
 pkgs/by-name/gh/gh2md/package.nix                  |  8 ++++++--
 pkgs/by-name/gh/ghdorker/package.nix               |  8 ++++++--
 pkgs/by-name/gh/ghost/package.nix                  |  8 ++++++--
 pkgs/by-name/gi/git-branchstack/package.nix        |  6 +++++-
 pkgs/by-name/gi/git-crecord/package.nix            |  6 ++++--
 pkgs/by-name/gi/git-machete/package.nix            |  4 +++-
 pkgs/by-name/gi/git-privacy/package.nix            |  8 ++++++--
 pkgs/by-name/gi/git-remote-codecommit/package.nix  |  4 +++-
 pkgs/by-name/gi/git-remote-hg/package.nix          |  4 +++-
 pkgs/by-name/gi/gitless/package.nix                |  8 ++++++--
 pkgs/by-name/gl/gladtex/package.nix                |  6 +++++-
 pkgs/by-name/go/gomp/package.nix                   |  6 +++++-
 pkgs/by-name/go/gorilla-cli/package.nix            |  8 ++++++--
 pkgs/by-name/gr/grabserial/package.nix             |  4 +++-
 pkgs/by-name/gr/graph-cli/package.nix              |  8 ++++++--
 pkgs/by-name/gr/graphqlmap/package.nix             |  8 ++++++--
 pkgs/by-name/gs/gshogi/package.nix                 |  8 ++++++--
 pkgs/by-name/ha/hashid/package.nix                 |  6 +++++-
 pkgs/by-name/he/heisenbridge/package.nix           | 12 ++++++++++--
 pkgs/by-name/ho/holehe/package.nix                 | 10 +++++++---
 pkgs/by-name/ht/httpstat/package.nix               |  5 ++++-
 pkgs/by-name/hy/hyp/package.nix                    |  6 +++++-
 42 files changed, 230 insertions(+), 73 deletions(-)

diff --git a/pkgs/by-name/ea/easyeda2kicad/package.nix b/pkgs/by-name/ea/easyeda2kicad/package.nix
index db16be875449..01aa63f5fc89 100644
--- a/pkgs/by-name/ea/easyeda2kicad/package.nix
+++ b/pkgs/by-name/ea/easyeda2kicad/package.nix
@@ -7,15 +7,18 @@
 python3Packages.buildPythonPackage rec {
   pname = "easyeda2kicad";
   version = "0.8.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-p4G+bRB29uBohqQpI3PrkwyZId5McJ1t2Ru26hBPSks=";
   };
 
-  dependencies = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pydantic
     requests
   ];
diff --git a/pkgs/by-name/en/endgame-singularity/package.nix b/pkgs/by-name/en/endgame-singularity/package.nix
index 4736be067c4d..21fd5c4faff5 100644
--- a/pkgs/by-name/en/endgame-singularity/package.nix
+++ b/pkgs/by-name/en/endgame-singularity/package.nix
@@ -25,14 +25,19 @@ let
 in
 
 python3.pkgs.buildPythonApplication {
-  format = "setuptools";
+  format = "pyproject";
   inherit pname version;
 
   srcs = [ main_src ] ++ lib.optional enableDefaultMusicPack music_src;
   sourceRoot = main_src.name;
 
   nativeBuildInputs = [ unzip ]; # The music is zipped
-  propagatedBuildInputs = with python3.pkgs; [
+
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pygame
     numpy
     polib
diff --git a/pkgs/by-name/ep/epr/package.nix b/pkgs/by-name/ep/epr/package.nix
index 4169920893a2..520237e7e018 100644
--- a/pkgs/by-name/ep/epr/package.nix
+++ b/pkgs/by-name/ep/epr/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "epr";
   version = "2.4.13";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "wustho";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-1qsqYlqGlCRhl7HINrcTDt5bGlb7g5PmaERylT+UvEg=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "CLI Epub Reader";
     mainProgram = "epr";
diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix
index 51f8e9916b5d..071643f5ab1c 100644
--- a/pkgs/by-name/er/errbot/package.nix
+++ b/pkgs/by-name/er/errbot/package.nix
@@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
   pname = "errbot";
   version = "6.2.0";
 
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "errbotio";
@@ -17,9 +17,13 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-UdqzBrlcb9NkuVo8ChADJmaKevadoGLyZUrckStb5ko=";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   pythonRelaxDeps = true;
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     ansi
     colorlog
     daemonize
diff --git a/pkgs/by-name/es/escrotum/package.nix b/pkgs/by-name/es/escrotum/package.nix
index 306fe110ee5a..87a42a0f18df 100644
--- a/pkgs/by-name/es/escrotum/package.nix
+++ b/pkgs/by-name/es/escrotum/package.nix
@@ -9,11 +9,10 @@
   wrapGAppsHook3,
 }:
 
-with python3Packages;
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "escrotum";
   version = "unstable-2020-12-07";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Roger";
@@ -32,7 +31,11 @@ buildPythonApplication {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pygobject3
     xcffib
     pycairo
diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix
index 6c9edf44299c..8f88134a4c11 100644
--- a/pkgs/by-name/et/etesync-dav/package.nix
+++ b/pkgs/by-name/et/etesync-dav/package.nix
@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "etesync-dav";
   version = "0.34.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "etesync";
@@ -18,6 +18,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-+rNqyksOmDUh0OuvgEDWv6tuZQkn1gizz35Ptr6izos=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonRelaxDeps = [ "radicale" ];
+
   dependencies = with python3Packages; [
     appdirs
     etebase
@@ -25,10 +29,8 @@ python3Packages.buildPythonApplication rec {
     flask
     flask-wtf
     msgpack
-    setuptools
     (python3Packages.toPythonModule (radicale.override { python3 = python; }))
     requests
-    types-setuptools
     requests.optional-dependencies.socks
   ];
 
diff --git a/pkgs/by-name/ev/evdevremapkeys/package.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix
index f1cde58569b6..2a9e1e44d200 100644
--- a/pkgs/by-name/ev/evdevremapkeys/package.nix
+++ b/pkgs/by-name/ev/evdevremapkeys/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonPackage {
   pname = "evdevremapkeys";
   version = "unstable-2021-05-04";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "philipl";
@@ -16,7 +16,11 @@ python3Packages.buildPythonPackage {
     sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pyyaml
     pyxdg
     python-daemon
diff --git a/pkgs/by-name/fa/fastcov/package.nix b/pkgs/by-name/fa/fastcov/package.nix
index 4e3439da9ae8..95505a638c5e 100644
--- a/pkgs/by-name/fa/fastcov/package.nix
+++ b/pkgs/by-name/fa/fastcov/package.nix
@@ -10,7 +10,7 @@
 python3Packages.buildPythonPackage rec {
   pname = "fastcov";
   version = "1.16";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "RPGillespie6";
diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
index 0f7810b22a53..4739db508f91 100644
--- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix
+++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "ffmpeg-normalize";
   version = "1.31.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit version;
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-sewDSBUX6gCZSIHeRtpx5fQGtOKN8OWZKrtCF2bgI9Y=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   dependencies =
     with python3Packages;
     [
diff --git a/pkgs/by-name/fi/fileinfo/package.nix b/pkgs/by-name/fi/fileinfo/package.nix
index 41bea4d85656..3974e5e526cc 100644
--- a/pkgs/by-name/fi/fileinfo/package.nix
+++ b/pkgs/by-name/fi/fileinfo/package.nix
@@ -6,7 +6,8 @@
 python3Packages.buildPythonApplication {
   pname = "fileinfo";
   version = "unstable-2022-09-16";
-  format = "setuptools";
+  format = "pyproject";
+
   src = fetchFromGitHub {
     owner = "sdushantha";
     repo = "fileinfo";
@@ -14,7 +15,9 @@ python3Packages.buildPythonApplication {
     hash = "sha256-tEmCsR3LmTxeDZAbMvbIwqp/6uaGNUhgGlm18gdsnOw=";
   };
 
-  propagatedBuildInputs = with python3Packages; [ requests ];
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ requests ];
 
   meta = with lib; {
     homepage = "https://github.com/sdushantha/fileinfo";
diff --git a/pkgs/by-name/fl/flac2all/package.nix b/pkgs/by-name/fl/flac2all/package.nix
index 5e8783941393..93ce231f9c54 100644
--- a/pkgs/by-name/fl/flac2all/package.nix
+++ b/pkgs/by-name/fl/flac2all/package.nix
@@ -12,7 +12,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "flac2all";
   version = "5.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -24,7 +24,11 @@ python3Packages.buildPythonApplication rec {
     echo ${version} > ./flac2all_pkg/version
   '';
 
-  propagatedBuildInputs = [
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
     python3Packages.pyzmq
   ];
 
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
index c5b8fbafcd68..952b71e90551 100644
--- a/pkgs/by-name/fl/flattenReferencesGraph/package.nix
+++ b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
@@ -10,13 +10,17 @@ let
 in
 pythonPackages.buildPythonApplication {
   version = "0.1.0";
-  format = "setuptools";
+  format = "pyproject";
   pname = "flatten-references-graph";
 
   # Note: this uses only ./src/.gitignore
   src = nix-gitignore.gitignoreSource [ ] ./src;
 
-  propagatedBuildInputs = with pythonPackages; [
+  build-system = with pythonPackages; [
+    setuptools
+  ];
+
+  dependencies = with pythonPackages; [
     igraph
     toolz
   ];
diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix
index 41d235b269bd..bdb99f4e6ffb 100644
--- a/pkgs/by-name/fl/flawfinder/package.nix
+++ b/pkgs/by-name/fl/flawfinder/package.nix
@@ -7,13 +7,17 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "flawfinder";
   version = "2.0.19";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchurl {
     url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz";
     sha256 = "sha256-/lUJgdNwq/oKKWcTRswLA4Ipqb2QsjnqsPAfEiEt9hg=";
   };
 
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
   # Project is using a combination of bash/Python for the tests
   doCheck = false;
 
diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
index 31c9f6196b3c..c8663c675f1e 100644
--- a/pkgs/by-name/fl/flent/package.nix
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -9,14 +9,17 @@
 python3Packages.buildPythonApplication rec {
   pname = "flent";
   version = "2.2.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg=";
   };
 
-  build-system = [ python3Packages.sphinx ];
+  build-system = with python3Packages; [
+    setuptools
+    sphinx
+  ];
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
 
diff --git a/pkgs/by-name/fl/flootty/package.nix b/pkgs/by-name/fl/flootty/package.nix
index dc3c7619261a..ac43300e145d 100644
--- a/pkgs/by-name/fl/flootty/package.nix
+++ b/pkgs/by-name/fl/flootty/package.nix
@@ -7,13 +7,17 @@
 python3Packages.buildPythonApplication rec {
   pname = "Flootty";
   version = "3.2.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "Collaborative terminal. In practice, it's similar to a shared screen or tmux session";
     mainProgram = "flootty";
diff --git a/pkgs/by-name/fl/fluxboxlauncher/package.nix b/pkgs/by-name/fl/fluxboxlauncher/package.nix
index 1465b094e667..9c1bedd38edd 100644
--- a/pkgs/by-name/fl/fluxboxlauncher/package.nix
+++ b/pkgs/by-name/fl/fluxboxlauncher/package.nix
@@ -16,7 +16,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "fluxboxlauncher";
   version = "0.2.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "mothsart";
@@ -46,7 +46,11 @@ python3.pkgs.buildPythonApplication {
     "--set CHARSET en_us.UTF-8"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pygobject3
   ];
 
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 0433d9294f39..f5b647e3df0a 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "fprettify";
   version = "0.3.7";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pseewald";
@@ -20,7 +20,11 @@ python3Packages.buildPythonApplication rec {
     patchShebangs fprettify.py
   '';
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     configargparse
   ];
 
diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix
index 5ef11d72dde6..c55458108dd0 100644
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@@ -7,14 +7,23 @@
 python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
   version = "14.4.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ACiznCkOZvnPUSB+Xcs4IZfbPGyknr193gLok0FrzqA=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "frida"
+    "websockets"
+  ];
+
+  dependencies = with python3Packages; [
     pygments
     prompt-toolkit
     colorama
diff --git a/pkgs/by-name/ge/genxword/package.nix b/pkgs/by-name/ge/genxword/package.nix
index c16affd8aa22..a65408897ee8 100644
--- a/pkgs/by-name/ge/genxword/package.nix
+++ b/pkgs/by-name/ge/genxword/package.nix
@@ -12,7 +12,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "genxword";
   version = "2.1.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "riverrun";
@@ -32,7 +32,11 @@ python3.pkgs.buildPythonApplication rec {
     gtksourceview3
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pycairo
     pygobject3
   ];
diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index e17fe104e49e..e51346216df8 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "gersemi";
   version = "0.19.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "BlankSpruce";
@@ -16,7 +16,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-CVb6ibO5+Tp0o+nB+bo9G9OKyB4L05wN1QiB9J4bOqY=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     appdirs
     colorama
     lark
diff --git a/pkgs/by-name/gh/gh2md/package.nix b/pkgs/by-name/gh/gh2md/package.nix
index 648a47731d08..8683047dffdc 100644
--- a/pkgs/by-name/gh/gh2md/package.nix
+++ b/pkgs/by-name/gh/gh2md/package.nix
@@ -7,14 +7,18 @@
 python3Packages.buildPythonApplication rec {
   pname = "gh2md";
   version = "2.3.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     six
     requests
     python-dateutil
diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix
index be12f9e18ed6..4d0a079da2af 100644
--- a/pkgs/by-name/gh/ghdorker/package.nix
+++ b/pkgs/by-name/gh/ghdorker/package.nix
@@ -7,14 +7,18 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "ghdorker";
   version = "0.3.2";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     ghapi
     glom
     python-dotenv
diff --git a/pkgs/by-name/gh/ghost/package.nix b/pkgs/by-name/gh/ghost/package.nix
index 3a771183511e..10cda94d8eb1 100644
--- a/pkgs/by-name/gh/ghost/package.nix
+++ b/pkgs/by-name/gh/ghost/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "ghost";
   version = "8.0.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = python3.pythonOlder "3.7";
 
@@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "13p3inw7v55na8438awr692v9vb7zgf5ggxpha9r3m8vfm3sb4iz";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     adb-shell
   ];
 
diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix
index 5df2b45409cd..db3aff164061 100644
--- a/pkgs/by-name/gi/git-branchstack/package.nix
+++ b/pkgs/by-name/gi/git-branchstack/package.nix
@@ -8,7 +8,7 @@ let
   self = python3Packages.buildPythonApplication {
     pname = "git-branchstack";
     version = "0.2.0";
-    format = "setuptools";
+    format = "pyproject";
 
     src = fetchPypi {
       pname = "git-branchstack";
@@ -16,6 +16,10 @@ let
       hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
     };
 
+    build-system = with python3Packages; [
+      setuptools
+    ];
+
     dependencies = with python3Packages; [
       git-revise
     ];
diff --git a/pkgs/by-name/gi/git-crecord/package.nix b/pkgs/by-name/gi/git-crecord/package.nix
index 8ca27f22df10..230ebe72c5f0 100644
--- a/pkgs/by-name/gi/git-crecord/package.nix
+++ b/pkgs/by-name/gi/git-crecord/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "git-crecord";
   version = "20230226.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "andrewshadura";
@@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-zsrMAD9EU+TvkWfWl9x6WbMXuw7YEz50LxQzSFVkKdQ=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ docutils ];
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [ docutils ];
 
   # has no tests
   doCheck = false;
diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix
index e48473843ddc..ef60f119c4e5 100644
--- a/pkgs/by-name/gi/git-machete/package.nix
+++ b/pkgs/by-name/gi/git-machete/package.nix
@@ -10,7 +10,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "git-machete";
   version = "3.36.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
@@ -19,6 +19,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-iSuOiQC+dKqcDCS4nTPMrNFpo3ipPUQhfoofM11UInI=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   nativeCheckInputs =
diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix
index b898beded66e..0a02f7c1ba96 100644
--- a/pkgs/by-name/gi/git-privacy/package.nix
+++ b/pkgs/by-name/gi/git-privacy/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "git-privacy";
   version = "2.3.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "EMPRI-DEVOPS";
@@ -17,7 +17,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     click
     git-filter-repo
     gitpython
diff --git a/pkgs/by-name/gi/git-remote-codecommit/package.nix b/pkgs/by-name/gi/git-remote-codecommit/package.nix
index 038475eb87d6..6e929ec79877 100644
--- a/pkgs/by-name/gi/git-remote-codecommit/package.nix
+++ b/pkgs/by-name/gi/git-remote-codecommit/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "git-remote-codecommit";
   version = "1.17";
-  format = "setuptools";
+  format = "pyproject";
   disabled = !python3Packages.isPy3k;
 
   # The check dependency awscli has some overrides
@@ -25,6 +25,8 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-8heI0Oyfhuvshedw+Eqmwd+e9cOHdDt4O588dplqv/k=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [ botocore ];
 
   nativeCheckInputs =
diff --git a/pkgs/by-name/gi/git-remote-hg/package.nix b/pkgs/by-name/gi/git-remote-hg/package.nix
index 2c480a162d7c..aecaaa05b842 100644
--- a/pkgs/by-name/gi/git-remote-hg/package.nix
+++ b/pkgs/by-name/gi/git-remote-hg/package.nix
@@ -13,7 +13,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "git-remote-hg";
   version = "1.0.4";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "mnauw";
@@ -31,6 +31,8 @@ python3Packages.buildPythonApplication rec {
     libxml2
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [ mercurial ];
 
   postInstall = ''
diff --git a/pkgs/by-name/gi/gitless/package.nix b/pkgs/by-name/gi/gitless/package.nix
index a2dc1a72a35e..deb6505c025a 100644
--- a/pkgs/by-name/gi/gitless/package.nix
+++ b/pkgs/by-name/gi/gitless/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "gitless";
   version = "0.9.17";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "goldstar611";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pygit2
     argcomplete
   ];
diff --git a/pkgs/by-name/gl/gladtex/package.nix b/pkgs/by-name/gl/gladtex/package.nix
index e1c778ee3990..528a428978a2 100644
--- a/pkgs/by-name/gl/gladtex/package.nix
+++ b/pkgs/by-name/gl/gladtex/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonPackage {
   pname = "gladtex";
   version = "unstable-2023-01-22";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "humenda";
@@ -16,6 +16,10 @@ python3Packages.buildPythonPackage {
     sha256 = "sha256-B5sNEmLO4iIJRDgcPhr9LFKV77dPJws8ITNz4R+FE08=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "Embed LaTeX formulas into HTML documents as SVG images";
     mainProgram = "gladtex";
diff --git a/pkgs/by-name/go/gomp/package.nix b/pkgs/by-name/go/gomp/package.nix
index 6a91b600e35b..88e296b4f9f6 100644
--- a/pkgs/by-name/go/gomp/package.nix
+++ b/pkgs/by-name/go/gomp/package.nix
@@ -7,13 +7,17 @@
 python3Packages.buildPythonApplication rec {
   pname = "gomp";
   version = "1.1.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-Ixq9jtV56FKbh68jqmRd3lwpbMG00GcOUIpjzJhnSp0=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   doCheck = false; # tests require interactive terminal
 
   meta = with lib; {
diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix
index 6081e3c16023..a98bb8b3a52f 100644
--- a/pkgs/by-name/go/gorilla-cli/package.nix
+++ b/pkgs/by-name/go/gorilla-cli/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "gorilla-cli";
   version = "0.0.9";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "gorilla-llm";
@@ -19,7 +19,11 @@ python3.pkgs.buildPythonApplication rec {
 
   disabled = python3.pythonOlder "3.6";
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     requests
     halo
     prompt-toolkit
diff --git a/pkgs/by-name/gr/grabserial/package.nix b/pkgs/by-name/gr/grabserial/package.nix
index d95ca513b5ec..e51150729b5d 100644
--- a/pkgs/by-name/gr/grabserial/package.nix
+++ b/pkgs/by-name/gr/grabserial/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "grabserial";
   version = "2.1.8";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tbird20d";
@@ -16,6 +16,8 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-XHI5r4OkJUtMuH83jKvNttEpKpqARjxj9SDLzhSPxSc=";
   };
 
+  build-system = [ python3Packages.setuptools ];
+
   dependencies = [ python3Packages.pyserial ];
 
   # no usable tests
diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix
index b819722d5fac..53ef6d90fed4 100644
--- a/pkgs/by-name/gr/graph-cli/package.nix
+++ b/pkgs/by-name/gr/graph-cli/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "graph-cli";
   version = "0.1.19";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit version;
@@ -24,7 +24,11 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     numpy
     pandas
     (matplotlib.override { enableQt = true; })
diff --git a/pkgs/by-name/gr/graphqlmap/package.nix b/pkgs/by-name/gr/graphqlmap/package.nix
index eb81d9457fbc..4208d54fa3fa 100644
--- a/pkgs/by-name/gr/graphqlmap/package.nix
+++ b/pkgs/by-name/gr/graphqlmap/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "graphqlmap";
   version = "unstable-2022-01-17";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "swisskyrepo";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-lGnhNwtDc8KoPlwJ1p2FYq0NQ8PhSR3HgtluU7uxa/c=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     requests
   ];
 
diff --git a/pkgs/by-name/gs/gshogi/package.nix b/pkgs/by-name/gs/gshogi/package.nix
index c015b3c92c05..39ba5269110a 100644
--- a/pkgs/by-name/gs/gshogi/package.nix
+++ b/pkgs/by-name/gs/gshogi/package.nix
@@ -10,7 +10,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "gshogi";
   version = "0.5.1";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "johncheetham";
@@ -30,7 +30,11 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pygobject3
     pycairo
   ];
diff --git a/pkgs/by-name/ha/hashid/package.nix b/pkgs/by-name/ha/hashid/package.nix
index 15e015dd6589..7aa8ff7e69f6 100644
--- a/pkgs/by-name/ha/hashid/package.nix
+++ b/pkgs/by-name/ha/hashid/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "hashid";
   version = "3.1.4-unstable-2015-03-17";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "psypanda";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication {
     hash = "sha256-R2r/UYRcHbpfOz/XqtSUIpd826eT1Erfo7frAiArT34=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "Software to identify the different types of hashes";
     homepage = "https://github.com/psypanda/hashID";
diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix
index 0015cc014bab..18c80d69b3f6 100644
--- a/pkgs/by-name/he/heisenbridge/package.nix
+++ b/pkgs/by-name/he/heisenbridge/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "heisenbridge";
   version = "1.15.3";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "hifi";
@@ -21,7 +21,15 @@ python3.pkgs.buildPythonApplication rec {
     echo "${version}" > heisenbridge/version.txt
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "irc"
+  ];
+
+  dependencies = with python3.pkgs; [
     irc
     ruamel-yaml
     mautrix
diff --git a/pkgs/by-name/ho/holehe/package.nix b/pkgs/by-name/ho/holehe/package.nix
index 7ca26d2d10af..6b706c77bdb6 100644
--- a/pkgs/by-name/ho/holehe/package.nix
+++ b/pkgs/by-name/ho/holehe/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "holehe";
   version = "unstable-2023-05-18";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "megadose";
@@ -19,10 +19,14 @@ python3.pkgs.buildPythonApplication {
   postPatch = ''
     # https://github.com/megadose/holehe/pull/178
     substituteInPlace setup.py \
-      --replace "bs4" "beautifulsoup4"
+      --replace-fail "bs4" "beautifulsoup4"
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     beautifulsoup4
     colorama
     httpx
diff --git a/pkgs/by-name/ht/httpstat/package.nix b/pkgs/by-name/ht/httpstat/package.nix
index c80eeeb9e8ea..e26f52ffd092 100644
--- a/pkgs/by-name/ht/httpstat/package.nix
+++ b/pkgs/by-name/ht/httpstat/package.nix
@@ -9,13 +9,16 @@
 python3Packages.buildPythonApplication rec {
   pname = "httpstat";
   version = "1.3.1";
-  format = "setuptools";
+  format = "pyproject";
   src = fetchFromGitHub {
     owner = "reorx";
     repo = "httpstat";
     rev = version;
     sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";
   };
+
+  build-system = with python3Packages; [ setuptools ];
+
   doCheck = false; # No tests
   buildInputs = [ glibcLocales ];
   runtimeDeps = [ curl ];
diff --git a/pkgs/by-name/hy/hyp/package.nix b/pkgs/by-name/hy/hyp/package.nix
index e084aba76528..35ed214941a8 100644
--- a/pkgs/by-name/hy/hyp/package.nix
+++ b/pkgs/by-name/hy/hyp/package.nix
@@ -7,13 +7,17 @@
 python3Packages.buildPythonPackage rec {
   pname = "hyp-server";
   version = "1.2.0";
-  format = "setuptools";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
   meta = with lib; {
     description = "Hyperminimal https server";
     mainProgram = "hyp";

From d155caf0c7ff166c4f7a541967d03c9dde4d6088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Fri, 25 Apr 2025 21:47:45 +0200
Subject: [PATCH 30/38] python3Packages.flask-testing: re-enable darwin tests

---
 pkgs/development/python-modules/flask-testing/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix
index 07d410fa1b17..a03bf68c9465 100644
--- a/pkgs/development/python-modules/flask-testing/default.nix
+++ b/pkgs/development/python-modules/flask-testing/default.nix
@@ -29,8 +29,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Some of the tests use localhost networking on darwin
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  __darwinAllowLocalNetworking = true;
 
   disabledTests = [
     # RuntimeError and NotImplementedError

From 48158ba5e2df1fcc5f18d8a67dd75e460fd625d1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 9 Jul 2025 21:47:12 +0200
Subject: [PATCH 31/38] libreswan: 5.2 -> 5.3

---
 pkgs/by-name/li/libreswan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix
index 33c7496907d2..5fb6c5f395d5 100644
--- a/pkgs/by-name/li/libreswan/package.nix
+++ b/pkgs/by-name/li/libreswan/package.nix
@@ -51,11 +51,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libreswan";
-  version = "5.2";
+  version = "5.3";
 
   src = fetchurl {
     url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
-    hash = "sha256-w4K72DjCOfjUxOnMMg86vzT3sI5x2eeO0CmpbZY5QM4=";
+    hash = "sha256-wdNQw/Mpb9IbnbB5TiPT8xmykviAv4F4uC71xjkcYMA=";
   };
 
   strictDeps = true;

From 41ce182e6a6cde31de65e64c1f31824b06d3bb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Fri, 25 Apr 2025 21:47:45 +0200
Subject: [PATCH 32/38] python3Packages.pystatgrab: re-enable darwin tests

---
 pkgs/development/python-modules/pystatgrab/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix
index 904de7a783ca..9f3436fbcb48 100644
--- a/pkgs/development/python-modules/pystatgrab/default.nix
+++ b/pkgs/development/python-modules/pystatgrab/default.nix
@@ -38,9 +38,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "statgrab" ];
 
-  # Tests don't work on darwin due to seg fault
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
   meta = with lib; {
     description = "Python bindings for libstatgrab";
     homepage = "https://github.com/libstatgrab/pystatgrab";

From 9b9c9a49ffca7db551ede23f75c04add1650d945 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 9 Jul 2025 22:43:54 +0200
Subject: [PATCH 33/38] python312Packages.mypy-boto3-ec2: 1.39.3 -> 1.39.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 83e5a960b354..86f7ed861edc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-uYeekAsfyETYQYWR3L8S+uzlp6EQpvYEWsqiX+60b/Y=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.39.3"
-      "sha256-6qP6021SWUQIswXTFaKE/HUHyFAlBXZO+OukAF3GM5A=";
+    buildMypyBoto3Package "ec2" "1.39.4"
+      "sha256-1pZtasWQFl6Z2OWohEmUrwihIVfGIVl0qvihh+n0C0c=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.39.0"

From 15bdcb3f26d02f8ceb511d3cdd9bda00e9b931f0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 9 Jul 2025 22:44:31 +0200
Subject: [PATCH 34/38] python312Packages.mypy-boto3-opsworkscm: 1.39.0 ->
 1.39.4

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 86f7ed861edc..6537877365d7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -982,8 +982,8 @@ rec {
       "sha256-tDHqekgcelTHYZze0rvuHHMseiyZF7ZL9VY3LVvvA8I=";
 
   mypy-boto3-opsworkscm =
-    buildMypyBoto3Package "opsworkscm" "1.39.0"
-      "sha256-Q8Rpjv6omBDmVt+f1kSLkBaQAzVFLU4UqgsOsjnUYLE=";
+    buildMypyBoto3Package "opsworkscm" "1.39.4"
+      "sha256-agKU7FBT2mFP4OXgOG0Io5BdOnh3IDIngs7iPU8VLLs=";
 
   mypy-boto3-organizations =
     buildMypyBoto3Package "organizations" "1.39.0"

From 05a22d89f7ac7a04ed1ef3c2ab60c82875fdc7e7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 9 Jul 2025 22:45:05 +0200
Subject: [PATCH 35/38] python313Packages.boto3-stubs: 1.39.3 -> 1.39.4

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index e931b530c666..fbe81a7a0a91 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.39.3";
+  version = "1.39.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-mq1EOx1pCVH9nMtvogrTh70LEFTHBFZv9l3QBDpj/CY=";
+    hash = "sha256-KbKjX9sB+CvQjGZ3ce/8x13xPgpnPx280lOJNwBdPzA=";
   };
 
   build-system = [ setuptools ];

From a15992c7f56e6fd681b2ea7a6ec6bc6f954eeb67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 22:08:23 +0000
Subject: [PATCH 36/38] nomad-pack: 0.3.0 -> 0.4.0

---
 pkgs/by-name/no/nomad-pack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/no/nomad-pack/package.nix b/pkgs/by-name/no/nomad-pack/package.nix
index b2747e93fc6c..5ef47e7a2a94 100644
--- a/pkgs/by-name/no/nomad-pack/package.nix
+++ b/pkgs/by-name/no/nomad-pack/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nomad-pack";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "nomad-pack";
     rev = "v${version}";
-    sha256 = "sha256-QtpTnChLB9OfzLSJXr19geHzxmOeL5DQ0G4fgcqCdbc=";
+    sha256 = "sha256-9lkRDRXY27KzVAClDfqtD95OMsMPgTqvDesr6qHsNkM=";
   };
 
-  vendorHash = "sha256-lygNUHerj9bMJk2+PTUeAJIdTPK9nUYXaByZpzh7uLY=";
+  vendorHash = "sha256-laCCm+WluxfsYtpTu5RvKy40UBZkkvLgVbWbdRjfAhU=";
 
   # skip running go tests as they require network access
   doCheck = false;

From abb09fa0f630a367fe43d85be5ea62320c9b807d Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Wed, 9 Jul 2025 23:42:48 +0000
Subject: [PATCH 37/38] cup-docker{,-noserver}: init at 3.4.0 (#412710)

---
 pkgs/by-name/cu/cup-docker/package.nix | 98 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 100 insertions(+)
 create mode 100644 pkgs/by-name/cu/cup-docker/package.nix

diff --git a/pkgs/by-name/cu/cup-docker/package.nix b/pkgs/by-name/cu/cup-docker/package.nix
new file mode 100644
index 000000000000..db44b6a69986
--- /dev/null
+++ b/pkgs/by-name/cu/cup-docker/package.nix
@@ -0,0 +1,98 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  lib,
+  stdenvNoCC,
+  bun,
+  nodejs-slim_latest,
+  nix-update-script,
+  withServer ? true,
+}:
+let
+  pname = "cup-docker";
+  version = "3.4.0";
+  src = fetchFromGitHub {
+    owner = "sergi0g";
+    repo = "cup";
+    tag = "v${version}";
+    hash = "sha256-ciH3t2L2eJhk1+JXTqEJSuHve8OuVod7AuQ3iFWmKRE=";
+  };
+  web = stdenvNoCC.mkDerivation (finalAttrs: {
+    pname = "${pname}-web";
+    inherit version src;
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+    sourceRoot = "${finalAttrs.src.name}/web";
+    nativeBuildInputs = [
+      bun
+      nodejs-slim_latest
+    ];
+    configurePhase = ''
+      runHook preConfigure
+      bun install --no-progress --frozen-lockfile
+      substituteInPlace node_modules/.bin/{vite,tsc} \
+        --replace-fail "/usr/bin/env node" "${nodejs-slim_latest}/bin/node"
+      runHook postConfigure
+    '';
+    buildPhase = ''
+      runHook preBuild
+      bun run build
+      runHook postBuild
+    '';
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/dist
+      cp -R ./dist $out
+      runHook postInstall
+    '';
+    outputHash = "sha256-Ac1PJYmTQv9XrmhmF1p77vdXh8252hz0CUKxJA+VQR4=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  });
+in
+rustPlatform.buildRustPackage {
+  inherit
+    src
+    version
+    pname
+    ;
+
+  cargoHash = "sha256-L9zugOwlPwpdtjV87dT1PH7FAMJYHYFuvfyOfPe5b2k=";
+
+  buildNoDefaultFeatures = true;
+  buildFeatures =
+    [
+      "cli"
+    ]
+    ++ lib.optional withServer [
+      "server"
+    ];
+
+  preConfigure = lib.optionalString withServer ''
+    cp -r ${web}/dist src/static
+  '';
+
+  passthru = {
+    inherit web;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "web"
+      ];
+    };
+  };
+
+  meta = {
+    description = "a lightweight way to check for container image updates. written in Rust";
+    homepage = "https://cup.sergi0g.dev";
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.all;
+    changelog = "https://github.com/sergi0g/cup/releases";
+    mainProgram = "cup";
+    maintainers = with lib.maintainers; [
+      kuflierl
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11d6f6fa7141..c119fd7e283d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -369,6 +369,8 @@ with pkgs;
 
   copilot-language-server-fhs = copilot-language-server.fhs;
 
+  cup-docker-noserver = cup-docker.override { withServer = false; };
+
   deck = callPackage ../by-name/de/deck/package.nix {
     buildGoModule = buildGo123Module;
   };

From e57363be151a076509629aa6a91c6affccd6d010 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 10 Jul 2025 01:56:34 +0200
Subject: [PATCH 38/38] nixos/postfix-tlspol: fix default settings and config
 reload

Reloading was insufficient for changing the dns resolver address, so we
make config changes a restart trigger instead.
---
 nixos/modules/services/mail/postfix-tlspol.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index dd49700734df..a44ccbdba652 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -90,7 +90,7 @@ in
           };
 
           dns = {
-            server = mkOption {
+            address = mkOption {
               type = types.str;
               default = "127.0.0.1:53";
               description = ''
@@ -173,7 +173,7 @@ in
         description = "Postfix DANE/MTA-STS TLS policy socketmap service";
         documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
 
-        reloadTriggers = [ configFile ];
+        restartTriggers = [ configFile ];
 
         # https://github.com/Zuplu/postfix-tlspol/blob/main/init/postfix-tlspol.service
         serviceConfig = {