Skip to content

Commit f1ac8de

Browse files
authored
python313Packages.fs: mark broken (#541148)
2 parents a9db4ec + 0897fed commit f1ac8de

4 files changed

Lines changed: 20 additions & 23 deletions

File tree

pkgs/development/python-modules/fontfeatures/default.nix

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
22
lib,
3+
babelfont,
34
buildPythonPackage,
45
fetchPypi,
5-
beziers,
66
fonttools,
7-
fs,
8-
glyphtools,
97
lxml,
108
pytestCheckHook,
119
youseedee,
@@ -25,12 +23,13 @@ buildPythonPackage rec {
2523
hash = "sha256-3PpUgaTXyFcthJrFaQqeUOvDYYFosJeXuRFnFrwp0R8=";
2624
};
2725

28-
propagatedBuildInputs = [
29-
beziers
26+
dependencies = [
3027
fonttools
31-
fs
32-
glyphtools
3328
lxml
29+
];
30+
31+
optional-dependencies.shaper = [
32+
babelfont
3433
youseedee
3534
];
3635

pkgs/development/python-modules/fs/default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
pytestCheckHook,
1313
pythonAtLeast,
1414
pytz,
15-
setuptools_80,
15+
setuptools,
1616
six,
1717
}:
1818

@@ -35,10 +35,10 @@ buildPythonPackage rec {
3535
--replace ThreadedTestFTPd FtpdThreadWrapper
3636
'';
3737

38-
build-system = [ setuptools_80 ];
38+
build-system = [ setuptools ];
3939

4040
dependencies = [
41-
setuptools_80
41+
setuptools
4242
six
4343
appdirs
4444
pytz
@@ -88,6 +88,8 @@ buildPythonPackage rec {
8888
__darwinAllowLocalNetworking = true;
8989

9090
meta = {
91+
# https://github.com/PyFilesystem/pyfilesystem2/issues/577
92+
broken = lib.versionAtLeast setuptools.version "82";
9193
description = "Filesystem abstraction";
9294
homepage = "https://github.com/PyFilesystem/pyfilesystem2";
9395
changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md";

pkgs/development/python-modules/statmake/default.nix

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
cattrs,
66
fetchFromGitHub,
77
fonttools,
8-
fs,
9-
poetry-core,
108
pytestCheckHook,
119
ufo2ft,
1210
ufolib2,
@@ -30,16 +28,12 @@ buildPythonPackage rec {
3028
hatchling
3129
hatch-vcs
3230
];
33-
34-
nativeBuildInputs = [ poetry-core ];
35-
36-
propagatedBuildInputs = [
31+
dependencies = [
3732
attrs
3833
cattrs
3934
fonttools
40-
# required by fonttools[ufo]
41-
fs
42-
];
35+
]
36+
++ fonttools.optional-dependencies.ufo;
4337

4438
nativeCheckInputs = [
4539
pytestCheckHook

pkgs/development/python-modules/ufolint/default.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
fetchFromGitHub,
55
commandlines,
66
fonttools,
7-
fs,
87
pytestCheckHook,
8+
setuptools,
99
}:
1010

1111
buildPythonPackage rec {
1212
pname = "ufolint";
1313
version = "1.2.0";
14-
format = "setuptools";
14+
pyproject = true;
1515

1616
# PyPI source tarballs omit tests, fetch from Github instead
1717
src = fetchFromGitHub {
@@ -21,11 +21,13 @@ buildPythonPackage rec {
2121
hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M=";
2222
};
2323

24+
build-system = [ setuptools ];
25+
2426
propagatedBuildInputs = [
2527
commandlines
26-
fs
2728
fonttools
28-
];
29+
]
30+
++ fonttools.optional-dependencies.ufo;
2931

3032
nativeBuildInputs = [ pytestCheckHook ];
3133

0 commit comments

Comments
 (0)