From f95b0821149f6a477b62b90206c035448f143947 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 10:13:52 +0000
Subject: [PATCH 01/32] devpi-server: 6.14.0 -> 6.15.0

---
 pkgs/development/tools/devpi-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 4fcaf9aa09c3..0ad6e9e7f830 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonApplication rec {
   pname = "devpi-server";
-  version = "6.14.0";
+  version = "6.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -41,7 +41,7 @@ buildPythonApplication rec {
     owner = "devpi";
     repo = "devpi";
     rev = "server-${version}";
-    hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA=";
+    hash = "sha256-tKR1xZju5bDbFu8t3SunTM8FlaXodSm/OjJ3Jfl7Dzk=";
   };
 
   sourceRoot = "${src.name}/server";

From 4d6af36c7368131c503ff0527f260889c71c1592 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 May 2025 13:23:20 +0300
Subject: [PATCH 02/32] tiny-dfr: 0.3.2 -> 0.3.5

The project has moved to the AsahiLinux org, and now needs librsvg.
---
 pkgs/by-name/ti/tiny-dfr/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix
index 0f217d0f7492..fea0a478aee2 100644
--- a/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/pkgs/by-name/ti/tiny-dfr/package.nix
@@ -7,6 +7,7 @@
   gdk-pixbuf,
   glib,
   libinput,
+  librsvg,
   libxml2,
   pango,
   udev,
@@ -14,17 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tiny-dfr";
-  version = "0.3.2";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
-    owner = "WhatAmISupposedToPutHere";
+    owner = "AsahiLinux";
     repo = "tiny-dfr";
-    rev = "v${version}";
-    hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4=";
+    tag = "v${version}";
+    hash = "sha256-G4OeYZH3VF6fKWxHYLTmwzQmQ4JupgYNH/6aJSgINvg=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-9UlH2W8wNzdZJxIgOafGylliS2RjaBlpirxSWHJ/SIQ=";
+  cargoHash = "sha256-/PtoAc2ZNJfW5gegcFQAAlEmjSMysZ+QebVfHtW35Nk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
     gdk-pixbuf
     glib
     libinput
+    librsvg
     libxml2
     pango
     udev
@@ -49,7 +50,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr";
+    homepage = "https://github.com/AsahiLinux/tiny-dfr";
     description = "Most basic dynamic function row daemon possible";
     license = [
       licenses.asl20

From 8146a3cd564ba953f26d87516c16cb3c930b69ab Mon Sep 17 00:00:00 2001
From: Achmad Fathoni <fathoni.id@gmail.com>
Date: Wed, 16 Apr 2025 12:20:22 +0700
Subject: [PATCH 03/32] perlModules.PerconaToolkit: 3.2.0 -> 3.7.0

perlModules.PerconaToolkit: resolve review
---
 .../perl-modules/Percona-Toolkit/default.nix  | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 8a86295dc45c..d27972dff455 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -7,30 +7,63 @@
   DBI,
   IOSocketSSL,
   TermReadKey,
+  go,
+  buildGoModule,
+  git,
 }:
 
-buildPerlPackage rec {
-  pname = "Percona-Toolkit";
-  version = "3.2.0";
+let
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-toolkit";
     rev = "v${version}";
-    sha256 = "084ldpskvlfm32lfss5qqzm5y9b8hf029aa4i5pcnzgb53xaxkqx";
+    sha256 = "sha256-fJGeL9XZHTFmpns5CE7It35HRnF3JiC6muOpOS1zboI=";
+
+    # needed for build script
+    leaveDotGit = true;
   };
 
+  goDeps =
+    (buildGoModule {
+      pname = "Percona-Toolkit go-bindings";
+      inherit src version;
+
+      vendorHash = "sha256-HAaoVYK6av085zSG0ZRpbmUgEA2UEt7CGWF/834e+z4=";
+    }).goModules;
+in
+buildPerlPackage {
+  pname = "Percona-Toolkit";
+
+  inherit src version;
+
   outputs = [ "out" ];
 
-  nativeBuildInputs = [ shortenPerlShebang ];
+  nativeBuildInputs = [
+    git
+    shortenPerlShebang
+  ];
 
   buildInputs = [
     DBDmysql
+    go
     DBI
     IOSocketSSL
     TermReadKey
   ];
 
+  postPatch = ''
+    cp -r --reflink=auto ${goDeps} vendor
+    chmod -R u+rw vendor
+    substituteInPlace src/go/Makefile \
+      --replace-fail "go get ./..." "echo 'Skipping go get due to offline build'"
+  '';
+
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+
   postInstall = ''
     shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*)
   '';

From bd3d85928a10c5b66b02e632e1d8acfdf1d7af2c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Jul 2025 20:30:20 +0200
Subject: [PATCH 04/32] pkgs/impure-overlays.nix: Factor out from impure.nix

No change in behavior.
By factoring this out, we can pass an extra overlay in addition to
the impure ones in callers.
---
 pkgs/top-level/impure-overlays.nix | 61 ++++++++++++++++++++++++++++++
 pkgs/top-level/impure.nix          | 58 +---------------------------
 2 files changed, 62 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/top-level/impure-overlays.nix

diff --git a/pkgs/top-level/impure-overlays.nix b/pkgs/top-level/impure-overlays.nix
new file mode 100644
index 000000000000..522bb3267429
--- /dev/null
+++ b/pkgs/top-level/impure-overlays.nix
@@ -0,0 +1,61 @@
+/**
+  This file has as its value the list of overlays, as determined from the environment.
+  If Nix evaluation is [pure](https://nix.dev/manual/nix/latest/command-ref/conf-file.html?highlight=pure-eval#conf-pure-eval), then the list is empty.
+*/
+let
+  # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception.
+  try =
+    x: def:
+    let
+      res = builtins.tryEval x;
+    in
+    if res.success then res.value else def;
+  homeDir = builtins.getEnv "HOME";
+
+  isDir = path: builtins.pathExists (path + "/.");
+  pathOverlays = try (toString <nixpkgs-overlays>) "";
+  homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
+  homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
+  overlays =
+    path:
+    # check if the path is a directory or a file
+    if isDir path then
+      # it's a directory, so the set of overlays from the directory, ordered lexicographically
+      let
+        content = builtins.readDir path;
+      in
+      map (n: import (path + ("/" + n))) (
+        builtins.filter (
+          n:
+          (
+            builtins.match ".*\\.nix" n != null
+            &&
+              # ignore Emacs lock files (.#foo.nix)
+              builtins.match "\\.#.*" n == null
+          )
+          || builtins.pathExists (path + ("/" + n + "/default.nix"))
+        ) (builtins.attrNames content)
+      )
+    else
+      # it's a file, so the result is the contents of the file itself
+      import path;
+in
+if pathOverlays != "" && builtins.pathExists pathOverlays then
+  overlays pathOverlays
+else if builtins.pathExists homeOverlaysFile && builtins.pathExists homeOverlaysDir then
+  throw ''
+    Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both.
+    Please remove one of them and try again.
+  ''
+else if builtins.pathExists homeOverlaysFile then
+  if isDir homeOverlaysFile then
+    throw (homeOverlaysFile + " should be a file")
+  else
+    overlays homeOverlaysFile
+else if builtins.pathExists homeOverlaysDir then
+  if !(isDir homeOverlaysDir) then
+    throw (homeOverlaysDir + " should be a directory")
+  else
+    overlays homeOverlaysDir
+else
+  [ ]
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 88a92d7755e5..db79a1588a7c 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -7,14 +7,6 @@ let
 
   homeDir = builtins.getEnv "HOME";
 
-  # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception.
-  try =
-    x: def:
-    let
-      res = builtins.tryEval x;
-    in
-    if res.success then res.value else def;
-
 in
 
 {
@@ -50,55 +42,7 @@ in
   # Overlays are used to extend Nixpkgs collection with additional
   # collections of packages.  These collection of packages are part of the
   # fix-point made by Nixpkgs.
-  overlays ?
-    let
-      isDir = path: builtins.pathExists (path + "/.");
-      pathOverlays = try (toString <nixpkgs-overlays>) "";
-      homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
-      homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
-      overlays =
-        path:
-        # check if the path is a directory or a file
-        if isDir path then
-          # it's a directory, so the set of overlays from the directory, ordered lexicographically
-          let
-            content = builtins.readDir path;
-          in
-          map (n: import (path + ("/" + n))) (
-            builtins.filter (
-              n:
-              (
-                builtins.match ".*\\.nix" n != null
-                &&
-                  # ignore Emacs lock files (.#foo.nix)
-                  builtins.match "\\.#.*" n == null
-              )
-              || builtins.pathExists (path + ("/" + n + "/default.nix"))
-            ) (builtins.attrNames content)
-          )
-        else
-          # it's a file, so the result is the contents of the file itself
-          import path;
-    in
-    if pathOverlays != "" && builtins.pathExists pathOverlays then
-      overlays pathOverlays
-    else if builtins.pathExists homeOverlaysFile && builtins.pathExists homeOverlaysDir then
-      throw ''
-        Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both.
-        Please remove one of them and try again.
-      ''
-    else if builtins.pathExists homeOverlaysFile then
-      if isDir homeOverlaysFile then
-        throw (homeOverlaysFile + " should be a file")
-      else
-        overlays homeOverlaysFile
-    else if builtins.pathExists homeOverlaysDir then
-      if !(isDir homeOverlaysDir) then
-        throw (homeOverlaysDir + " should be a directory")
-      else
-        overlays homeOverlaysDir
-    else
-      [ ],
+  overlays ? import ./impure-overlays.nix,
 
   crossOverlays ? [ ],
 

From b78a8c9109b481e559c7b350695e671b3fbc37db Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Jul 2025 20:36:26 +0200
Subject: [PATCH 05/32] flake.nix: Construct legacyPackages in one go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This saves the construction of an unused `pkgs` attrset and all that
is required to reach that, which is not a lot, but still significant.

Benchmark 1: nix eval .?ref=42608bc8e65c5bf596d6155ad2f0ded6253b1e69#hello.outPath --no-eval-cache
  Time (mean ± σ):      1.062 s ±  0.011 s    [User: 0.674 s, System: 0.226 s]
  Range (min … max):    1.040 s …  1.080 s    10 runs

Benchmark 2: nix eval .?ref=8a7e18b270cb2256a0526b9cda1d9e410aacd440#hello.outPath --no-eval-cache
  Time (mean ± σ):      1.317 s ±  0.033 s    [User: 0.835 s, System: 0.270 s]
  Range (min … max):    1.282 s …  1.371 s    10 runs

Summary
  nix eval .?ref=42608bc8e65c5bf596d6155ad2f0ded6253b1e69#hello.outPath --no-eval-cache ran
    1.24 ± 0.03 times faster than nix eval .?ref=8a7e18b270cb2256a0526b9cda1d9e410aacd440#hello.outPath --no-eval-cache

(where 42608bc had the same tree as this commit)
---
 flake.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3bd0a48a5cce..3d01030806fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -209,11 +209,14 @@
       */
       legacyPackages = forAllSystems (
         system:
-        (import ./. { inherit system; }).extend (
-          final: prev: {
-            lib = prev.lib.extend libVersionInfoOverlay;
-          }
-        )
+        (import ./. {
+          inherit system;
+          overlays = import ./pkgs/top-level/impure-overlays.nix ++ [
+            (final: prev: {
+              lib = prev.lib.extend libVersionInfoOverlay;
+            })
+          ];
+        })
       );
 
       /**

From 69d5f8c674fa8b83b644e404c3814eb58ead6872 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 21:15:55 +0000
Subject: [PATCH 06/32] koboldcpp: 1.94 -> 1.95.1

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

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 35551dadaef1..d5fc0c3e8122 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.94";
+  version = "1.95.1";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qWH8yGjDTkMPLHjfMopfQKyBA5T1HHgllEH9Joceq3s=";
+    hash = "sha256-aoVOEPK3hPuzkrHIFvDrnAw2D/OxXlRLXXP0CZJghx4=";
   };
 
   enableParallelBuilding = true;

From c6f393b9dfd1b71b924616fc4cd4b1317325da9a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 14:49:30 +0300
Subject: [PATCH 07/32] python312Packages.pybtex: no with lib; in meta

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

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index 94df8e4f62bb..4b6170fe336c 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -26,9 +26,9 @@ buildPythonPackage rec {
     sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pybtex.org/";
     description = "BibTeX-compatible bibliography processor written in Python";
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }

From 6a058ea348a812862a07e5461eca6f01407a323d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 14:49:56 +0300
Subject: [PATCH 08/32] python312Packages.pybtex: add meta.changelog

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

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index 4b6170fe336c..c38171cc48ec 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://pybtex.org/";
+    changelog = "https://bitbucket.org/pybtex-devs/pybtex/src/master/CHANGES";
     description = "BibTeX-compatible bibliography processor written in Python";
     license = lib.licenses.mit;
   };

From b92e4ee231c8bf26815a043a203b7246890e6459 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 14:51:10 +0300
Subject: [PATCH 09/32] python312Packages.pybtex: reorder inputs and arguments
 modernly

---
 .../python-modules/pybtex/default.nix         | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index c38171cc48ec..998b9ff606bf 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -2,30 +2,38 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   latexcodec,
   pyyaml,
-  setuptools,
 }:
 
 buildPythonPackage rec {
-  version = "0.24.0";
-  format = "setuptools";
   pname = "pybtex";
-
-  doCheck = false;
-  pythonImportsCheck = [ "pybtex" ];
-
-  propagatedBuildInputs = [
-    latexcodec
-    pyyaml
-    setuptools
-  ];
+  version = "0.24.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
     sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755";
   };
 
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    latexcodec
+    pyyaml
+  ];
+
+  pythonImportsCheck = [ "pybtex" ];
+
+  doCheck = false;
+
   meta = {
     homepage = "https://pybtex.org/";
     changelog = "https://bitbucket.org/pybtex-devs/pybtex/src/master/CHANGES";

From 640593d0e5634eb505226f8a476c871348170947 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 15:58:32 +0200
Subject: [PATCH 10/32] python312Packages.pybibget: use standard formatting

---
 pkgs/by-name/py/pybibget/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix
index 4aad76fdc760..af7b3d2515f5 100644
--- a/pkgs/by-name/py/pybibget/package.nix
+++ b/pkgs/by-name/py/pybibget/package.nix
@@ -4,20 +4,16 @@
   fetchPypi,
 }:
 
-let
+python3.pkgs.buildPythonApplication rec {
   pname = "pybibget";
   version = "0.1.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-M6CIctTOVn7kIPmsoHQmYl2wQaUzfel7ryw/3ebQitg=";
   };
 
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
-  pyproject = true;
-
   propagatedBuildInputs = with python3.pkgs; [
     lxml
     httpx

From 43b3fd8851cda983ff545c9fd3da33202dea9b73 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 15:59:07 +0200
Subject: [PATCH 11/32] python313Packages.pybibget: use setuptools in
 build-system

Needed ever since `pybtex` stopped propagating setuptools in a previous
commit.
---
 pkgs/by-name/py/pybibget/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix
index af7b3d2515f5..b8cad1e423fb 100644
--- a/pkgs/by-name/py/pybibget/package.nix
+++ b/pkgs/by-name/py/pybibget/package.nix
@@ -14,6 +14,10 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-M6CIctTOVn7kIPmsoHQmYl2wQaUzfel7ryw/3ebQitg=";
   };
 
+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
   propagatedBuildInputs = with python3.pkgs; [
     lxml
     httpx

From aa9a1b2c8dbd9790b36b5cc8eb3599acfc19aaa4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 13:24:46 +0300
Subject: [PATCH 12/32] python313Packages.pybtex: 0.24.0 -> 0.25.1

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

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index 998b9ff606bf..68c98f91a0b5 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "pybtex";
-  version = "0.24.0";
+  version = "0.25.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755";
+    sha256 = "sha256-nq+QJnx+g+Ilr4n+plw3Cvv2X0WCINOUap4wSeHspJE=";
   };
 
   build-system = [

From 0fb19cb4ed54e949c24980263bb2a303baab690d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 14:53:00 +0300
Subject: [PATCH 13/32] python313Packages.pybtex: enable tests

---
 pkgs/development/python-modules/pybtex/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index 68c98f91a0b5..f2eb9539e1d9 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -9,6 +9,9 @@
   # dependencies
   latexcodec,
   pyyaml,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -32,7 +35,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pybtex" ];
 
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = {
     homepage = "https://pybtex.org/";

From 0b5e6cbcbee29beb914dd28fd5b36de416af79f2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 14:01:25 +0200
Subject: [PATCH 14/32] python312Packages.sphinxcontrib-bibtex: 2.6.3 -> 2.6.5

Diff: https://github.com/mcmtroffaes/sphinxcontrib-bibtex/compare/refs/tags/2.6.3...refs/tags/2.6.5

NOTE: This update is coupled to `pybtex: 0.24.0 -> 0.25.1` update from a
previous commit.
---
 .../python-modules/sphinxcontrib-bibtex/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 377682ae2529..3e1f64080743 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-bibtex";
-  version = "2.6.3";
+  version = "2.6.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "mcmtroffaes";
     repo = "sphinxcontrib-bibtex";
     tag = version;
-    hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY=";
+    hash = "sha256-sT23DkIfJcb3cFBFdL31RRzlDoJRcCUYIdpUVuYjGuo=";
   };
 
   build-system = [ setuptools ];

From 9b7323641ebf266b26cce717ffd9b3ea63548eb9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 1 Jul 2025 16:59:39 +0300
Subject: [PATCH 15/32] python312Packages.svgpathtools: init at 1.7.1

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

diff --git a/pkgs/development/python-modules/svgpathtools/default.nix b/pkgs/development/python-modules/svgpathtools/default.nix
new file mode 100644
index 000000000000..abd043fed018
--- /dev/null
+++ b/pkgs/development/python-modules/svgpathtools/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+  scipy,
+  svgwrite,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "svgpathtools";
+  version = "1.7.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mathandy";
+    repo = "svgpathtools";
+    tag = "v${version}";
+    hash = "sha256-SzYssDJ+uGb5zXZ16XaMCvIPF8BKJ4VVI/gUghz1IyA=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+    scipy
+    svgwrite
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "svgpathtools"
+  ];
+
+  meta = {
+    description = "A collection of tools for manipulating and analyzing SVG Path objects and Bezier curves";
+    homepage = "https://github.com/mathandy/svgpathtools";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a5fa59e59dc..bbd73abf9545 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17358,6 +17358,8 @@ self: super: with self; {
 
   svglib = callPackage ../development/python-modules/svglib { };
 
+  svgpathtools = callPackage ../development/python-modules/svgpathtools { };
+
   svgutils = callPackage ../development/python-modules/svgutils { };
 
   svgwrite = callPackage ../development/python-modules/svgwrite { };

From bc40ea87d49c8df046b91e44b6f199d12bfc079e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 1 Jul 2025 16:51:34 +0300
Subject: [PATCH 16/32] python312Packages.svgdigitizer: init at 0.12.6

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

diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix
new file mode 100644
index 000000000000..e94e7e0e7a96
--- /dev/null
+++ b/pkgs/development/python-modules/svgdigitizer/default.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  astropy,
+  click,
+  frictionless,
+  matplotlib,
+  mergedeep,
+  pandas,
+  pillow,
+  pybtex,
+  pymupdf,
+  pyyaml,
+  scipy,
+  svg-path,
+  svgpathtools,
+  svgwrite,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "svgdigitizer";
+  version = "0.12.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "echemdb";
+    repo = "svgdigitizer";
+    tag = version;
+    hash = "sha256-aodPjms92+/6bbheIs/8w+M4T+mfw5PWf1dsxFuojwA=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    astropy
+    click
+    frictionless
+    matplotlib
+    mergedeep
+    pandas
+    pillow
+    pybtex
+    pymupdf
+    pyyaml
+    scipy
+    svg-path
+    svgpathtools
+    svgwrite
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+  pytestFlags = [
+    "--doctest-modules"
+    "svgdigitizer"
+  ];
+
+  pythonImportsCheck = [
+    "svgdigitizer"
+  ];
+
+  meta = {
+    description = "(x,y) Data Points from SVG files";
+    homepage = "https://github.com/echemdb/svgdigitizer";
+    changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.rev}/ChangeLog";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bbd73abf9545..53831ece72e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17354,6 +17354,8 @@ self: super: with self; {
 
   svg2tikz = callPackage ../development/python-modules/svg2tikz { };
 
+  svgdigitizer = callPackage ../development/python-modules/svgdigitizer { };
+
   svgelements = callPackage ../development/python-modules/svgelements { };
 
   svglib = callPackage ../development/python-modules/svglib { };

From 500d5bcce15cd83c91684044c77e9b63f1116a99 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 18:03:11 +0300
Subject: [PATCH 17/32] python312Packages.pymatgen: disable another failing
 test on Darwin

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

diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index adb87f41b992..e5599671c90b 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -170,6 +170,7 @@ buildPythonPackage rec {
 
       # attempt to insert nil object from objects[1]
       "test_timer_10_2_7"
+      "test_timer"
     ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

From 42cbb4f64d27fbcdcad77687b9c1bac824e53790 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 9 Jul 2025 18:03:54 +0300
Subject: [PATCH 18/32] python313Packages.svgdigitizer: mark as broken on
 Darwin

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

diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix
index e94e7e0e7a96..e66a37255080 100644
--- a/pkgs/development/python-modules/svgdigitizer/default.nix
+++ b/pkgs/development/python-modules/svgdigitizer/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  stdenv,
 
   # build-system
   setuptools,
@@ -77,5 +78,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.rev}/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ doronbehar ];
+    # https://github.com/echemdb/svgdigitizer/issues/252
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 75dbbd22ca9704ef96622b9dd289945e2537b14d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 23:38:40 +0000
Subject: [PATCH 19/32] haproxy: 3.2.1 -> 3.2.3

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 389c0fb29ecc..774c8ee3b82b 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.2.1";
+  version = "3.2.3";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-uz+Wenl8iFHQhoPsQ9+v5K179a2G+msHIcrQM+qeWuU=";
+    hash = "sha256-r472Qoa93ckyMsXb5OpDaozLXchBfPoeiFvsUohPk0c=";
   };
 
   buildInputs =

From b29dc3a7c6708300a217e2d79c3874a03bee88b3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 9 Jul 2025 23:23:36 +0200
Subject: [PATCH 20/32] mimeo: migrate to pyproject = true, clean up
 installation

---
 pkgs/by-name/mi/mimeo/package.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix
index 95f41f74a50f..4c655035b62d 100644
--- a/pkgs/by-name/mi/mimeo/package.nix
+++ b/pkgs/by-name/mi/mimeo/package.nix
@@ -12,30 +12,25 @@ in
 python3Packages.buildPythonApplication {
   pname = "mimeo";
   inherit version;
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchurl {
     url = "https://xyne.dev/projects/mimeo/src/mimeo-${version}.tar.xz";
     hash = "sha256-CahvSypwR1aHVDHTdtty1ZfaKBWPolxc73uZ5OyeqZA=";
   };
 
-  buildInputs = [
-    file
-    desktop-file-utils
-  ];
+  build-system = [ python3Packages.setuptools ];
 
-  propagatedBuildInputs = [ python3Packages.pyxdg ];
+  dependencies = [ python3Packages.pyxdg ];
 
-  preConfigure = ''
+  postPatch = ''
     substituteInPlace Mimeo.py \
-      --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \
-                "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \
-      --replace "EXE_FILE = 'file'" \
-                "EXE_FILE = '${file}/bin/file'"
+      --replace-fail "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \
+                     "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \
+      --replace-fail "EXE_FILE = 'file'" \
+                     "EXE_FILE = '${file}/bin/file'"
   '';
 
-  installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo";
-
   doInstallCheck = true;
   installCheckPhase = ''
     $out/bin/mimeo --help > /dev/null

From 60e667982d26f650e56f0e33e27e3867ba51f413 Mon Sep 17 00:00:00 2001
From: Alexandru Nechita <alexandru.italia32@gmail.com>
Date: Sat, 12 Jul 2025 08:54:14 +0200
Subject: [PATCH 21/32] jetbrains: add forceWayland flag

forceWayland makes the jetbrains IDEs to use WLToolkit if Wayland is
detected, allowing to use Wayland natively instead of using XWayland
---
 pkgs/applications/editors/jetbrains/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 71eaaa2e9ba2..ba84e12d14b3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -37,6 +37,7 @@ in
   libX11,
 
   vmopts ? null,
+  forceWayland ? false,
 }:
 
 let
@@ -83,9 +84,13 @@ let
       inherit
         pname
         jdk
-        extraWrapperArgs
         extraBuildInputs
         ;
+      extraWrapperArgs =
+        extraWrapperArgs
+        ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [
+          ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
+        ];
       extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ];
       src =
         if fromSource then

From 3c186416e580f99a7ef213c67c0a055ee274b4fc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 11 Jul 2025 22:17:38 +0200
Subject: [PATCH 22/32] pkgs/by-name/{m,n}*: migrate to pyproject = true

---
 pkgs/by-name/ma/macpm/package.nix             | 18 ++++++++++++------
 pkgs/by-name/ma/mapproxy/package.nix          |  9 +++++++--
 pkgs/by-name/ma/mastodon-archive/package.nix  | 10 ++++++++--
 pkgs/by-name/md/md-tangle/package.nix         |  6 +++++-
 pkgs/by-name/md/mdslides/package.nix          |  6 +++++-
 pkgs/by-name/me/me_cleaner/package.nix        |  4 +++-
 pkgs/by-name/ml/mlarchive2maildir/package.nix | 11 ++++++++---
 pkgs/by-name/ml/mloader/package.nix           | 11 +++++------
 pkgs/by-name/mo/mongoaudit/package.nix        |  8 ++++++--
 pkgs/by-name/mo/moodle-dl/package.nix         |  8 ++++++--
 pkgs/by-name/mp/mpfshell/package.nix          |  7 +++++--
 pkgs/by-name/mu/mutmut/package.nix            |  8 ++++++--
 pkgs/by-name/mu/mutt-ics/package.nix          | 11 +++++++----
 pkgs/by-name/my/mymcplus/package.nix          |  8 ++++++--
 pkgs/by-name/na/nagstamon/package.nix         |  2 +-
 pkgs/by-name/nb/nbstripout/package.nix        | 10 ++++++++--
 pkgs/by-name/nb/nbutools/package.nix          |  6 ++++--
 pkgs/by-name/ne/nemo-emblems/package.nix      |  9 +++++----
 pkgs/by-name/ne/neovim-remote/package.nix     | 15 +++++++++------
 pkgs/by-name/ni/nix-bisect/package.nix        |  8 ++++++--
 pkgs/by-name/no/norminette/package.nix        | 15 +++++++++++----
 pkgs/by-name/no/nototools/package.nix         | 13 +++++++------
 pkgs/by-name/no/nox/package.nix               | 16 ++++++++--------
 pkgs/by-name/np/npm-lockfile-fix/package.nix  | 10 +++++++---
 pkgs/by-name/nt/ntfy/package.nix              |  8 ++++++--
 pkgs/by-name/nt/ntfy/webpush.nix              |  9 ++++++---
 pkgs/by-name/nt/ntlmrecon/package.nix         |  6 ++++--
 pkgs/by-name/nv/nvitop/package.nix            |  6 +++++-
 pkgs/by-name/nv/nvpy/package.nix              | 10 +++++++---
 pkgs/by-name/nw/nwg-clipman/package.nix       |  4 +++-
 pkgs/by-name/nw/nwg-wrapper/package.nix       |  6 ++++--
 pkgs/by-name/ny/nyx/package.nix               | 12 +++++++-----
 32 files changed, 197 insertions(+), 93 deletions(-)

diff --git a/pkgs/by-name/ma/macpm/package.nix b/pkgs/by-name/ma/macpm/package.nix
index ea9dca568992..ec4d36618bd9 100644
--- a/pkgs/by-name/ma/macpm/package.nix
+++ b/pkgs/by-name/ma/macpm/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication {
   pname = "macpm";
   version = "0.24-unstable-2024-11-19";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "visualcjy";
@@ -17,6 +17,16 @@ python3Packages.buildPythonApplication {
     hash = "sha256-jqaPPvYbuL8q6grmBLyZLf8aDmjugYxMOWAh1Ix82jc=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    dashing
+    humanize
+    psutil
+  ];
+
   # has no tests
   doCheck = false;
 
@@ -25,11 +35,7 @@ python3Packages.buildPythonApplication {
     ln -rs $out/bin/macpm $out/bin/asitop
   '';
 
-  dependencies = with python3Packages; [
-    dashing
-    humanize
-    psutil
-  ];
+  pythonImportsCheck = [ "macpm" ];
 
   meta = {
     description = "Perf monitoring CLI tool for Apple Silicon; previously named 'asitop'";
diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index e6575e811d33..9b01f2851989 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "mapproxy";
   version = "5.0.0";
-  format = "setuptools";
+  pyproject = true;
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
@@ -22,6 +22,10 @@ python3Packages.buildPythonApplication rec {
     substituteInPlace mapproxy/util/ext/serving.py --replace-warn "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonRemoveDeps = [ "future" ];
+
   dependencies = with python3Packages; [
     boto3 # needed for caches service
     jsonschema
@@ -31,7 +35,6 @@ python3Packages.buildPythonApplication rec {
     shapely
     gdal
     lxml
-    setuptools
     werkzeug
   ];
 
@@ -40,6 +43,8 @@ python3Packages.buildPythonApplication rec {
   #    https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt
   doCheck = false;
 
+  pythonImportsCheck = [ "mapproxy" ];
+
   meta = {
     description = "Open source proxy for geospatial data";
     homepage = "https://mapproxy.org/";
diff --git a/pkgs/by-name/ma/mastodon-archive/package.nix b/pkgs/by-name/ma/mastodon-archive/package.nix
index 7825493545d9..0eb10039b414 100644
--- a/pkgs/by-name/ma/mastodon-archive/package.nix
+++ b/pkgs/by-name/ma/mastodon-archive/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "mastodon-archive";
   version = "1.4.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kensanata";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-b4bYQshz7mwxEfpRYV7ze4C8hz58R9cVp58wHvGFb0A=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     html2text
     mastodon-py
     progress
@@ -25,6 +29,8 @@ python3.pkgs.buildPythonApplication rec {
   # There is no test
   doCheck = false;
 
+  pythonImportsCheck = [ "mastodon_archive" ];
+
   meta = with lib; {
     description = "Utility for backing up your Mastodon content";
     mainProgram = "mastodon-archive";
diff --git a/pkgs/by-name/md/md-tangle/package.nix b/pkgs/by-name/md/md-tangle/package.nix
index b5d5d7650888..9f530492496e 100644
--- a/pkgs/by-name/md/md-tangle/package.nix
+++ b/pkgs/by-name/md/md-tangle/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonPackage rec {
   pname = "md-tangle";
   version = "1.4.4";
-  format = "setuptools";
+  pyproject = true;
 
   # By some strange reason, fetchPypi fails miserably
   src = fetchFromGitHub {
@@ -17,10 +17,14 @@ python3.pkgs.buildPythonPackage rec {
     hash = "sha256-PkOKSsyY8uwS4mhl0lB+KGeUvXfEc7PUDHZapHMYv4c=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   # Pure Python application, uses only standard modules and comes without
   # testing suite
   doCheck = false;
 
+  pythonImportsCheck = [ "md_tangle" ];
+
   meta = with lib; {
     homepage = "https://github.com/joakimmj/md-tangle/";
     description = "Generates (\"tangles\") source code from Markdown documents";
diff --git a/pkgs/by-name/md/mdslides/package.nix b/pkgs/by-name/md/mdslides/package.nix
index 6932e8a4a526..7b97eacd102d 100644
--- a/pkgs/by-name/md/mdslides/package.nix
+++ b/pkgs/by-name/md/mdslides/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "mdslides";
   version = "unstable-2022-12-15";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dadoomer";
@@ -16,8 +16,12 @@ python3Packages.buildPythonApplication {
     sha256 = "sha256-31ALsy1P/vfI+H6Onmg4TXLeKbVAQ1FlnFs4k6ZOgHQ=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   doCheck = false;
 
+  pythonImportsCheck = [ "mdslides" ];
+
   meta = with lib; {
     longDescription = "Using markdown, write simple but beautiful presentations with math, animations and media, which can be visualized in a web browser or exported to PDF.";
     homepage = "https://github.com/dadoomer/markdown-slides";
diff --git a/pkgs/by-name/me/me_cleaner/package.nix b/pkgs/by-name/me/me_cleaner/package.nix
index 3d5419fd5b56..d0996351fc6f 100644
--- a/pkgs/by-name/me/me_cleaner/package.nix
+++ b/pkgs/by-name/me/me_cleaner/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonPackage rec {
   pname = "me_cleaner";
   version = "1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corna";
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonPackage rec {
     sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "Tool for partial deblobbing of Intel ME/TXE firmware images";
diff --git a/pkgs/by-name/ml/mlarchive2maildir/package.nix b/pkgs/by-name/ml/mlarchive2maildir/package.nix
index 73de65a83b06..7089c79fdf68 100644
--- a/pkgs/by-name/ml/mlarchive2maildir/package.nix
+++ b/pkgs/by-name/ml/mlarchive2maildir/package.nix
@@ -7,16 +7,19 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "mlarchive2maildir";
   version = "0.0.9";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
   };
 
-  nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
+  build-system = with python3.pkgs; [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     beautifulsoup4
     click
     click-log
@@ -24,6 +27,8 @@ python3.pkgs.buildPythonApplication rec {
     six
   ];
 
+  pythonImportsCheck = [ "mlarchive2maildir" ];
+
   meta = with lib; {
     homepage = "https://github.com/flokli/mlarchive2maildir";
     description = "Imports mail from (pipermail) archives into a maildir";
diff --git a/pkgs/by-name/ml/mloader/package.nix b/pkgs/by-name/ml/mloader/package.nix
index 6691d11440fa..9e61c8f8134d 100644
--- a/pkgs/by-name/ml/mloader/package.nix
+++ b/pkgs/by-name/ml/mloader/package.nix
@@ -7,19 +7,18 @@
 python3Packages.buildPythonApplication rec {
   pname = "mloader";
   version = "1.1.12";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "protobuf~=3.6" "protobuf"
-  '';
+  build-system = with python3Packages; [ setuptools ];
 
-  propagatedBuildInputs = with python3Packages; [
+  pythonRelaxDeps = [ "protobuf" ];
+
+  dependencies = with python3Packages; [
     click
     protobuf
     requests
diff --git a/pkgs/by-name/mo/mongoaudit/package.nix b/pkgs/by-name/mo/mongoaudit/package.nix
index 9c043d092ebe..8a9ad93c2fa7 100644
--- a/pkgs/by-name/mo/mongoaudit/package.nix
+++ b/pkgs/by-name/mo/mongoaudit/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "mongoaudit";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = python3.pythonOlder "3.8";
 
@@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pymongo
     setuptools
     urwid
diff --git a/pkgs/by-name/mo/moodle-dl/package.nix b/pkgs/by-name/mo/moodle-dl/package.nix
index b63b672ac8ca..4356aeaae407 100644
--- a/pkgs/by-name/mo/moodle-dl/package.nix
+++ b/pkgs/by-name/mo/moodle-dl/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "moodle-dl";
   version = "2.3.13";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "C0D3D3V";
@@ -17,7 +17,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-6arwc72gu7XyT6HokSEs2TkvE2FG7mIvy4F+/i/0eJg=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     aiodns
     aiofiles
     aiohttp
@@ -35,6 +37,8 @@ python3Packages.buildPythonApplication rec {
   # upstream has no tests
   doCheck = false;
 
+  pythonImportsCheck = [ "moodle_dl" ];
+
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
diff --git a/pkgs/by-name/mp/mpfshell/package.nix b/pkgs/by-name/mp/mpfshell/package.nix
index f89827a72c35..41d93206afd8 100644
--- a/pkgs/by-name/mp/mpfshell/package.nix
+++ b/pkgs/by-name/mp/mpfshell/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonPackage {
   pname = "mpfshell-unstable";
   version = "2020-04-11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wendlers";
@@ -16,10 +16,13 @@ python3Packages.buildPythonPackage {
     sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     pyserial
     colorama
     websocket-client
+    standard-telnetlib # Python no longer provides telnetlib since python313
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix
index 57a5618bb775..c0c6f9939584 100644
--- a/pkgs/by-name/mu/mutmut/package.nix
+++ b/pkgs/by-name/mu/mutmut/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "mutmut";
   version = "3.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     repo = "mutmut";
@@ -24,7 +24,9 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     click
     parso
     junit-xml
@@ -32,6 +34,8 @@ python3Packages.buildPythonApplication rec {
     textual
   ];
 
+  pythonImportsCheck = [ "mutmut" ];
+
   meta = {
     description = "mutation testing system for Python, with a strong focus on ease of use";
     mainProgram = "mutmut";
diff --git a/pkgs/by-name/mu/mutt-ics/package.nix b/pkgs/by-name/mu/mutt-ics/package.nix
index 5e9a6d985f57..bf8f91015263 100644
--- a/pkgs/by-name/mu/mutt-ics/package.nix
+++ b/pkgs/by-name/mu/mutt-ics/package.nix
@@ -4,11 +4,10 @@
   fetchPypi,
 }:
 
-with python3.pkgs;
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "mutt-ics";
   version = "0.9.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,7 +15,11 @@ buildPythonApplication rec {
     sha256 = "d44d4bec4e71c7f14df01b90fdb9563cdc784ece4250abfea5b0b675cfe85a50";
   };
 
-  propagatedBuildInputs = [ icalendar ];
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [ icalendar ];
+
+  pythonImportsCheck = [ "mutt_ics" ];
 
   meta = with lib; {
     homepage = "https://github.com/dmedvinsky/mutt-ics";
diff --git a/pkgs/by-name/my/mymcplus/package.nix b/pkgs/by-name/my/mymcplus/package.nix
index 9c69614b3b24..69bf95eae1f2 100644
--- a/pkgs/by-name/my/mymcplus/package.nix
+++ b/pkgs/by-name/my/mymcplus/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "mymcplus";
   version = "3.0.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromSourcehut {
     owner = "~thestr4ng3r";
@@ -21,11 +21,15 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     pyopengl
     wxpython
   ];
 
+  pythonImportsCheck = [ "mymcplus" ];
+
   meta = with lib; {
     homepage = "https://git.sr.ht/~thestr4ng3r/mymcplus";
     description = "PlayStation 2 memory card manager";
diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix
index 2145411fee4a..067d23986057 100644
--- a/pkgs/by-name/na/nagstamon/package.nix
+++ b/pkgs/by-name/na/nagstamon/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "nagstamon";
   version = "3.16.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "HenriWahl";
diff --git a/pkgs/by-name/nb/nbstripout/package.nix b/pkgs/by-name/nb/nbstripout/package.nix
index 8f957f53e2e2..d378808b4e0c 100644
--- a/pkgs/by-name/nb/nbstripout/package.nix
+++ b/pkgs/by-name/nb/nbstripout/package.nix
@@ -10,7 +10,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   version = "0.8.1";
-  format = "setuptools";
+  pyproject = true;
   pname = "nbstripout";
 
   src = fetchPypi {
@@ -25,7 +25,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     nbformat
   ];
 
@@ -53,6 +57,8 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace tests/test_end_to_end.py --replace "tests/e2e_notebooks" "$TMPDIR/e2e_notebooks"
   '';
 
+  pythonImportsCheck = [ "nbstripout" ];
+
   meta = {
     description = "Strip output from Jupyter and IPython notebooks";
     homepage = "https://github.com/kynan/nbstripout";
diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix
index 83993b160ea4..a8113651b66c 100644
--- a/pkgs/by-name/nb/nbutools/package.nix
+++ b/pkgs/by-name/nb/nbutools/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "nbutools";
   version = "unstable-2023-06-06";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "airbus-seclab";
@@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-YOiFlTIDpeTFOHPU37v0pYf8s3HdaE/4pnd9qrsFtSI=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     aiodns
     aiohttp
     beautifulsoup4
diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix
index 08d8886022d2..ece3a9f62f1b 100644
--- a/pkgs/by-name/ne/nemo-emblems/package.nix
+++ b/pkgs/by-name/ne/nemo-emblems/package.nix
@@ -8,6 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
   version = "6.4.0";
+  pyproject = true;
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -17,18 +18,18 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
-  format = "setuptools";
-
   sourceRoot = "${src.name}/nemo-emblems";
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "/usr/share" "share"
+      --replace-fail "/usr/share" "share"
 
     substituteInPlace nemo-extension/nemo-emblems.py \
-      --replace "/usr/share/locale" "${cinnamon-translations}/share/locale"
+      --replace-fail "/usr/share/locale" "${cinnamon-translations}/share/locale"
   '';
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-emblems";
     description = "Change a folder or file emblem in Nemo";
diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix
index 29737cc3cdc7..ac9a703a8086 100644
--- a/pkgs/by-name/ne/neovim-remote/package.nix
+++ b/pkgs/by-name/ne/neovim-remote/package.nix
@@ -1,16 +1,16 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   python3,
   neovim,
   fetchpatch,
 }:
 
-with python3.pkgs;
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "neovim-remote";
   version = "2.5.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mhinz";
@@ -27,15 +27,16 @@ buildPythonApplication rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     pynvim
     psutil
-    setuptools
   ];
 
   nativeCheckInputs = [
     neovim
-    pytestCheckHook
+    python3.pkgs.pytestCheckHook
   ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
@@ -44,6 +45,8 @@ buildPythonApplication rec {
     export HOME="$(mktemp -d)"
   '';
 
+  pythonImportsCheck = [ "nvr" ];
+
   meta = with lib; {
     description = "Tool that helps controlling nvim processes from a terminal";
     homepage = "https://github.com/mhinz/neovim-remote/";
diff --git a/pkgs/by-name/ni/nix-bisect/package.nix b/pkgs/by-name/ni/nix-bisect/package.nix
index 421b2e035a9f..1e4873227e62 100644
--- a/pkgs/by-name/ni/nix-bisect/package.nix
+++ b/pkgs/by-name/ni/nix-bisect/package.nix
@@ -10,7 +10,7 @@ let
 in
 python3.pkgs.buildPythonApplication {
   inherit pname version;
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "timokau";
@@ -19,7 +19,9 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-zyeE1jYo/9NEG8fB4gQBAR01siP4tyLvjjHN1yUS4Ug=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     appdirs
     numpy
     pexpect
@@ -27,6 +29,8 @@ python3.pkgs.buildPythonApplication {
 
   doCheck = false;
 
+  pythonImportsCheck = [ "nix_bisect" ];
+
   meta = with lib; {
     description = "Bisect nix builds";
     homepage = "https://github.com/timokau/nix-bisect";
diff --git a/pkgs/by-name/no/norminette/package.nix b/pkgs/by-name/no/norminette/package.nix
index 87c6998f1ca7..a7a639f0eacf 100644
--- a/pkgs/by-name/no/norminette/package.nix
+++ b/pkgs/by-name/no/norminette/package.nix
@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "norminette";
   version = "3.3.58";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "42School";
@@ -16,13 +16,20 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-6hBBbfW2PQFb8rcDihvtWK0df7WcvOk0il1E82GOxaU=";
   };
 
+  build-system = with python3Packages; [
+    poetry-core
+  ];
+
+  pythonRemoveDeps = [
+    # Can be removed once https://github.com/42school/norminette/issues/565 is addressed
+    "argparse"
+  ];
+
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
   ];
 
-  preCheck = ''
-    export PYTHONPATH=norminette:$PYTHONPATH
-  '';
+  pythonImportsCheck = [ "norminette" ];
 
   meta = with lib; {
     description = "Open source norminette to apply 42's norme to C files";
diff --git a/pkgs/by-name/no/nototools/package.nix b/pkgs/by-name/no/nototools/package.nix
index 8ec68eecefdb..c2676f413011 100644
--- a/pkgs/by-name/no/nototools/package.nix
+++ b/pkgs/by-name/no/nototools/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "nototools";
   version = "0.2.20";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
@@ -17,11 +17,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-id4UhyWOFHrtmBZHhnaY2jHDIK0s7rcGBpg4QsBTLKs=";
   };
 
-  postPatch = ''
-    sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
-  '';
-
-  build-system = with python3Packages; [ setuptools-scm ];
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
 
   pythonRemoveDeps = [
     # https://github.com/notofonts/nototools/pull/901
@@ -72,6 +71,8 @@ python3Packages.buildPythonApplication rec {
     cp -r third_party $out
   '';
 
+  pythonImportsCheck = [ "nototools" ];
+
   meta = with lib; {
     description = "Noto fonts support tools and scripts plus web site generation";
     homepage = "https://github.com/googlefonts/nototools";
diff --git a/pkgs/by-name/no/nox/package.nix b/pkgs/by-name/no/nox/package.nix
index e1db0d13a542..80d608fd122d 100644
--- a/pkgs/by-name/no/nox/package.nix
+++ b/pkgs/by-name/no/nox/package.nix
@@ -2,14 +2,12 @@
   lib,
   python3Packages,
   fetchurl,
-  git,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "nox";
   version = "0.0.6";
-  format = "setuptools";
-  namePrefix = "";
+  pyproject = true;
 
   src = fetchurl {
     url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz";
@@ -18,19 +16,21 @@ python3Packages.buildPythonApplication rec {
 
   patches = [ ./nox-review-wip.patch ];
 
-  buildInputs = [
-    python3Packages.pbr
-    git
+  build-system = with python3Packages; [
+    setuptools
+    pbr
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     dogpile-cache
     click
     requests
     characteristic
-    setuptools
+    setuptools # pkg_resources is imported during runtime
   ];
 
+  pythonImportsCheck = [ "nox" ];
+
   meta = {
     homepage = "https://github.com/madjar/nox";
     description = "Tools to make nix nicer to use";
diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix
index ece36548399e..e12c88d607c8 100644
--- a/pkgs/by-name/np/npm-lockfile-fix/package.nix
+++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix
@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "npm-lockfile-fix";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jeslie0";
@@ -17,8 +17,12 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g=";
   };
 
-  propagatedBuildInputs = [
-    python3.pkgs.requests
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
+    requests
   ];
 
   doCheck = false; # no tests
diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 2cfbace33ecf..5d2d50e9ae06 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec {
   pname = "ntfy";
   version = "2.7.0";
 
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dschep";
@@ -73,9 +73,11 @@ python.pkgs.buildPythonApplication rec {
   postPatch = ''
     # We disable the Darwin specific things because it relies on pyobjc, which we don't have.
     substituteInPlace setup.py \
-      --replace "':sys_platform == \"darwin\"'" "'darwin'"
+      --replace-fail "':sys_platform == \"darwin\"'" "'darwin'"
   '';
 
+  build-system = with python.pkgs; [ setuptools ];
+
   dependencies =
     with python.pkgs;
     (
@@ -123,6 +125,8 @@ python.pkgs.buildPythonApplication rec {
     export HOME=$(mktemp -d)
   '';
 
+  pythonImportsCheck = [ "ntfy" ];
+
   meta = with lib; {
     description = "Utility for sending notifications, on demand and when commands finish";
     homepage = "https://ntfy.readthedocs.io/en/latest/";
diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix
index 0669562b1d42..b7674de5791d 100644
--- a/pkgs/by-name/nt/ntfy/webpush.nix
+++ b/pkgs/by-name/nt/ntfy/webpush.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pywebpush,
   py-vapid,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "ntfy-webpush";
   version = "0.1.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dschep";
@@ -21,10 +22,12 @@ buildPythonPackage rec {
   postPatch = ''
     # break dependency loop
     substituteInPlace setup.py \
-      --replace "'ntfy', " ""
+      --replace-fail "'ntfy', " ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pywebpush
     py-vapid
   ];
diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
index 94f47b691f32..ed11fac64873 100644
--- a/pkgs/by-name/nt/ntlmrecon/package.nix
+++ b/pkgs/by-name/nt/ntlmrecon/package.nix
@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "ntlmrecon";
   version = "0.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pwnfoo";
@@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     colorama
     iptools
     requests
diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix
index eb4d98ad8b08..1f92222f31e7 100644
--- a/pkgs/by-name/nv/nvitop/package.nix
+++ b/pkgs/by-name/nv/nvitop/package.nix
@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "nvitop";
   version = "1.5.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "XuehaiPan";
@@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-FQbY9j6eJtupBiYTSCEJHAAlpDltb6U5hgWet42AKho=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   pythonRelaxDeps = [ "nvidia-ml-py" ];
 
   dependencies = with python3Packages; [
@@ -30,6 +32,8 @@ python3Packages.buildPythonApplication rec {
   ];
   versionCheckProgramArg = "--version";
 
+  pythonImportsCheck = [ "nvitop" ];
+
   meta = {
     description = "Interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management";
     homepage = "https://github.com/XuehaiPan/nvitop";
diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix
index 2a8c539328da..d17d640701a7 100644
--- a/pkgs/by-name/nv/nvpy/package.nix
+++ b/pkgs/by-name/nv/nvpy/package.nix
@@ -8,9 +8,9 @@ let
   pythonPackages = python3Packages;
 in
 pythonPackages.buildPythonApplication rec {
-  version = "2.3.1";
-  format = "setuptools";
   pname = "nvpy";
+  version = "2.3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cpbotha";
@@ -19,7 +19,9 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "sha256-guNdLu/bCk89o5M3gQU7J0W4h7eZdLHM0FG5IAPLE7c=";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  build-system = with pythonPackages; [ setuptools ];
+
+  dependencies = with pythonPackages; [
     markdown
     docutils
     simplenote
@@ -37,6 +39,8 @@ pythonPackages.buildPythonApplication rec {
     install -m644 README.rst "$out/share/doc/nvpy/README"
   '';
 
+  pythonImportsCheck = [ "nvpy" ];
+
   meta = with pkgs.lib; {
     description = "Simplenote-syncing note-taking tool inspired by Notational Velocity";
     homepage = "https://github.com/cpbotha/nvpy";
diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix
index 0d8a4ccf7ca0..03d3b5bcab7b 100644
--- a/pkgs/by-name/nw/nwg-clipman/package.nix
+++ b/pkgs/by-name/nw/nwg-clipman/package.nix
@@ -14,7 +14,7 @@
 python3Packages.buildPythonPackage rec {
   pname = "nwg-clipman";
   version = "0.2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
@@ -55,6 +55,8 @@ python3Packages.buildPythonPackage rec {
 
   strictDeps = true;
 
+  pythonImportsCheck = [ "nwg_clipman" ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/nw/nwg-wrapper/package.nix b/pkgs/by-name/nw/nwg-wrapper/package.nix
index 8a7bfa40ed5c..8ea443fc3f67 100644
--- a/pkgs/by-name/nw/nwg-wrapper/package.nix
+++ b/pkgs/by-name/nw/nwg-wrapper/package.nix
@@ -12,7 +12,7 @@
 python3Packages.buildPythonPackage rec {
   pname = "nwg-wrapper";
   version = "0.1.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
@@ -31,7 +31,9 @@ python3Packages.buildPythonPackage rec {
     gtk-layer-shell
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     i3ipc
     pygobject3
   ];
diff --git a/pkgs/by-name/ny/nyx/package.nix b/pkgs/by-name/ny/nyx/package.nix
index 093869d0ede0..cfc82671f18f 100644
--- a/pkgs/by-name/ny/nyx/package.nix
+++ b/pkgs/by-name/ny/nyx/package.nix
@@ -4,23 +4,25 @@
   fetchPypi,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "nyx";
   version = "2.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "02rrlllz2ci6i6cs3iddyfns7ang9a54jrlygd2jw1f9s6418ll8";
   };
 
-  propagatedBuildInputs = [ stem ];
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ stem ];
 
   # ./run_tests.py returns `TypeError: testFailure() takes exactly 1 argument`
   doCheck = false;
 
+  pythonImportsCheck = [ "nyx" ];
+
   meta = with lib; {
     description = "Command-line monitor for Tor";
     mainProgram = "nyx";

From 3f8900135ba48ff5af163db463c3b917df3f9095 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 20:10:32 +0000
Subject: [PATCH 23/32] gersemi: 0.19.3 -> 0.20.1

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

diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index e51346216df8..04cdb78f6650 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gersemi";
-  version = "0.19.3";
+  version = "0.20.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "BlankSpruce";
     repo = "gersemi";
     tag = version;
-    hash = "sha256-CVb6ibO5+Tp0o+nB+bo9G9OKyB4L05wN1QiB9J4bOqY=";
+    hash = "sha256-6lBUP+xi0owlD33TLTOlaIFBcfWTnsniK/9cQdo/ND4=";
   };
 
   build-system = with python3Packages; [

From f2eda9a6a9d63793409f581ede99d450b0f76243 Mon Sep 17 00:00:00 2001
From: Quinn Flavel <quinnydf@yahoo.ca>
Date: Wed, 9 Jul 2025 23:12:45 +0000
Subject: [PATCH 24/32] nixos/postfix: fix in secure systemd-nspawn containers

---
 nixos/modules/services/mail/postfix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 85e04b992259..7b2d62e1fc97 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -894,7 +894,7 @@ in
             ${lib.concatStringsSep "\n" (
               lib.mapAttrsToList (to: from: ''
                 ln -sf ${from} /var/lib/postfix/conf/${to}
-                ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/${to}
+                ${pkgs.postfix}/bin/postmap -o -p /var/lib/postfix/conf/${to}
               '') cfg.mapFiles
             )}
 

From c75ed2dfbb32e0f1a2da7356022f79ad0b448db6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 21:35:22 +0000
Subject: [PATCH 25/32] mold: 2.40.1 -> 2.40.2

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

diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index ec88f0ce9394..89437aa7034b 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mold";
-  version = "2.40.1";
+  version = "2.40.2";
 
   src = fetchFromGitHub {
     owner = "rui314";
     repo = "mold";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-161ATZkgoipFMRcI4x4TNqxbyWxM75Cmo/rL4Hn1JFQ=";
+    hash = "sha256-Db2IxHCQWb6JdJROi+nOi0pV4zb+8/TcFrJWUCdH6N8=";
   };
 
   nativeBuildInputs = [

From 98f7d03f088fc5935c422060da5e0b7a7cf158dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 23:31:21 +0000
Subject: [PATCH 26/32] libretro.dosbox-pure: 0-unstable-2025-06-16 ->
 0-unstable-2025-07-10

---
 pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 28aa7f84267f..d6d031c1ba2c 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-06-16";
+  version = "0-unstable-2025-07-10";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "8c48d34327f5ffc44892899cf2567feaa9bbf72a";
-    hash = "sha256-u5kxj4Sl7LpivEuNhTec8Z2u3Dw/X8xFDBQ++hQAtFc=";
+    rev = "92894e7bdb6304d23278dc77f8a9fa7212450f6e";
+    hash = "sha256-uA/pm3DyT0VCyq85DzZGXjSGrKQ9uoEIfrs839ta97s=";
   };
 
   hardeningDisable = [ "format" ];

From 66048acc1ea8f686a30b68fe4f031b1a0e8f549d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 02:29:18 +0000
Subject: [PATCH 27/32] luau: 0.681 -> 0.682

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

diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index b57ebef04bd6..358e9e60e5a6 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.681";
+  version = "0.682";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-pqKvh08AybuVATNQOzV14wI0GsOVzxskgeol1JA9dg8=";
+    hash = "sha256-yHmcUDBgNKcOg6ZW/fP7ZatdkCgG1y1ECRUbnZ7wHZY=";
   };
 
   nativeBuildInputs = [ cmake ];

From 115dc338f4ffd719ebf6e253448258db285d9367 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 04:34:21 +0000
Subject: [PATCH 28/32] ghostfolio: 2.176.0 -> 2.181.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 21f5a7b48630..6b9b3690321b 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.176.0";
+  version = "2.181.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-T14omi5NkMCrqiXF+gSi6ELEdfH4QMp7luJtuCWhGM4=";
+    hash = "sha256-+oDR+VSR0bGbTJIqNCe1WN1QWm+sEtMIuy/mNhumeyk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-0vFH4gdrtaBca1lWxm2uZ1VerP4hJEJgBQzygDbja3I=";
+  npmDepsHash = "sha256-vcn9vhpQlacfIxHFt8G67aB91nTr9IClvA9pb+4XFFI=";
 
   nativeBuildInputs = [
     prisma

From 46d070c6b44182816b2f5bcc64d8daa03bf21fd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 05:59:37 +0000
Subject: [PATCH 29/32] libretro.play: 0-unstable-2025-07-01 ->
 0-unstable-2025-07-09

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index f1ec8a93f18c..199fb453b1ca 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-07-01";
+  version = "0-unstable-2025-07-09";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "5fa3b71304aec0d2a70569bd38c87433f719e6ce";
-    hash = "sha256-t61xAqghmOmZJzAxU2Ez1ALQ8jjuHZKwmrNoRA9L+4k=";
+    rev = "ae9afb4e45e8de35382fb98c55d13dec9fcf8ed8";
+    hash = "sha256-HWKhgGChPGhRmrXXbjEvBt0coGpQ1JAPUTd8Ze4yKww=";
     fetchSubmodules = true;
   };
 

From cfad37c45971010b30b0547acad9e9e3ff142a4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 05:59:56 +0000
Subject: [PATCH 30/32] redpanda-client: 25.1.6 -> 25.1.7

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

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index ce3a194c4cc7..06e7d1baf782 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "25.1.6";
+  version = "25.1.7";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-Cl2coxcK2f53uJnC5CBkqJ/oAQ+jpvjo2vknKqx7FXQ=";
+    sha256 = "sha256-GRWLEzf0YfSk96oDCuthMNmu0C1KJCk10Uz7eApS4mk=";
   };
 in
 buildGoModule rec {

From 0f506f219157bd37dc809698bcb44bd5622fc356 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 20:16:36 +1000
Subject: [PATCH 31/32] python3Packages.uiprotect: 7.14.1 -> 7.14.2 (#424736)

https://github.com/uilibs/uiprotect/blob/v7.14.2/CHANGELOG.md
---
 pkgs/development/python-modules/uiprotect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 0da212286f9d..4a40e324cd02 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "7.14.1";
+  version = "7.14.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${version}";
-    hash = "sha256-e5VfG20hl+SGssNsLMoQ2ULJAcVS6gahNkC6XqRuXb0=";
+    hash = "sha256-amCE5y/4tAdrvlk6ZSa6QaG9XuLnFfz1ml1r/H80fdE=";
   };
 
   build-system = [ poetry-core ];

From 89dc88bf09a22319ca845d1fbf0e99018d4438a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Jul 2025 09:08:13 +0000
Subject: [PATCH 32/32] roddhjav-apparmor-rules: 0-unstable-2025-06-21 ->
 0-unstable-2025-07-12

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 4da10f4c476f..fc6f025c68cd 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-06-21";
+  version = "0-unstable-2025-07-12";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "1aee62f52cb02cbdb054c233a350f4f07d828e48";
-    hash = "sha256-5gK2JTct89HrjJHAVAPxEUyKf6ukHExFgNb3Os4kv9M=";
+    rev = "8fc70859aaef7cc20181ac6d115a6ff8ca5a9162";
+    hash = "sha256-MbbjiLa24PxaD7ZizR2CbTPy6yDFZTAV3QurFyYb3r8=";
   };
 
   dontConfigure = true;