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 ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index c579ac186a6e..d0dd7d12ff6a 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 @@ -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"; 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 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 ];