From 1b844a8e744ea2be7eeb22c6124ae6825fd475dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:45:21 -0700
Subject: [PATCH 1/5] Revert "python313Packages.fs: pin to setuptools_80"

This reverts commit 6c81b30e2cd1aa5d76191ae549726cfc4cc31ae1 because
versioned attributes are not allowed in `dependencies`.
This lead to two versions of setuptools in bentoml's closure.
---
 pkgs/development/python-modules/fs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index c579ac186a6e..44715f97f82d 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -12,7 +12,7 @@
   pytestCheckHook,
   pythonAtLeast,
   pytz,
-  setuptools_80,
+  setuptools,
   six,
 }:
 
@@ -35,10 +35,10 @@ buildPythonPackage rec {
       --replace ThreadedTestFTPd FtpdThreadWrapper
   '';
 
-  build-system = [ setuptools_80 ];
+  build-system = [ setuptools ];
 
   dependencies = [
-    setuptools_80
+    setuptools
     six
     appdirs
     pytz

From 66e34083af508a84ad33f71c88491c70aee4f8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 11:50:54 -0700
Subject: [PATCH 2/5] python313Packages.fs: mark broken

It doesn't suffice to use setuptools_80 in `build-system` because fs
imports pkg_resources.
---
 pkgs/development/python-modules/fs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 44715f97f82d..d0dd7d12ff6a 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -88,6 +88,8 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   meta = {
+    # https://github.com/PyFilesystem/pyfilesystem2/issues/577
+    broken = lib.versionAtLeast setuptools.version "82";
     description = "Filesystem abstraction";
     homepage = "https://github.com/PyFilesystem/pyfilesystem2";
     changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md";

From 5c54aeaa1b1e88b3fc67bf04b90710dc2601bb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:02:09 -0700
Subject: [PATCH 3/5] python3Packages.fontfeatures: update dependencies

---
 .../python-modules/fontfeatures/default.nix         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix
index 450380bb166d..d67e7adcbd18 100644
--- a/pkgs/development/python-modules/fontfeatures/default.nix
+++ b/pkgs/development/python-modules/fontfeatures/default.nix
@@ -1,11 +1,9 @@
 {
   lib,
+  babelfont,
   buildPythonPackage,
   fetchPypi,
-  beziers,
   fonttools,
-  fs,
-  glyphtools,
   lxml,
   pytestCheckHook,
   youseedee,
@@ -25,12 +23,13 @@ buildPythonPackage rec {
     hash = "sha256-3PpUgaTXyFcthJrFaQqeUOvDYYFosJeXuRFnFrwp0R8=";
   };
 
-  propagatedBuildInputs = [
-    beziers
+  dependencies = [
     fonttools
-    fs
-    glyphtools
     lxml
+  ];
+
+  optional-dependencies.shaper = [
+    babelfont
     youseedee
   ];
 

From c850aa1420a7a128def76875aba2ee96611e7d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:16:31 -0700
Subject: [PATCH 4/5] python3Packages.ufolint: update dependencies

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

diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix
index 5993296e9e37..17dff4f048fd 100644
--- a/pkgs/development/python-modules/ufolint/default.nix
+++ b/pkgs/development/python-modules/ufolint/default.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
   commandlines,
   fonttools,
-  fs,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ufolint";
   version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   # PyPI source tarballs omit tests, fetch from Github instead
   src = fetchFromGitHub {
@@ -21,11 +21,13 @@ buildPythonPackage rec {
     hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M=";
   };
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [
     commandlines
-    fs
     fonttools
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeBuildInputs = [ pytestCheckHook ];
 

From 0897fed1ad28b2196bebd97873b59e162d138fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 12:18:47 -0700
Subject: [PATCH 5/5] python3Packages.statmake: update dependencies

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

diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 2a73d88a0eb1..f3369f12f0c5 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -5,8 +5,6 @@
   cattrs,
   fetchFromGitHub,
   fonttools,
-  fs,
-  poetry-core,
   pytestCheckHook,
   ufo2ft,
   ufolib2,
@@ -30,16 +28,12 @@ buildPythonPackage rec {
     hatchling
     hatch-vcs
   ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     cattrs
     fonttools
-    # required by fonttools[ufo]
-    fs
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo;
 
   nativeCheckInputs = [
     pytestCheckHook