Skip to content

Commit 28c0f46

Browse files
authored
python313Packages.fontbakery: fix build (#388876)
2 parents 7d01bf7 + 30d7442 commit 28c0f46

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
protobuf,
3030
pytest-xdist,
3131
pytestCheckHook,
32-
pythonOlder,
3332
pyyaml,
3433
requests-mock,
3534
requests,
@@ -51,8 +50,6 @@ buildPythonPackage rec {
5150
version = "0.13.1";
5251
pyproject = true;
5352

54-
disabled = pythonOlder "3.8";
55-
5653
src = fetchPypi {
5754
inherit pname version;
5855
hash = "sha256-NoUqR+u2GgjE+nj05AXvtprdWieT6XbGGcmOnEMolC4=";
@@ -62,6 +59,7 @@ buildPythonPackage rec {
6259

6360
pythonRelaxDeps = [
6461
"collidoscope"
62+
"freetype-py"
6563
"protobuf"
6664
"vharfbuzz"
6765
];
@@ -132,6 +130,7 @@ buildPythonPackage rec {
132130

133131
disabledTests = [
134132
# These require network access
133+
"test_check_axes_match"
135134
"test_check_description_broken_links"
136135
"test_check_description_family_update"
137136
"test_check_metadata_designer_profiles"
@@ -158,6 +157,7 @@ buildPythonPackage rec {
158157
homepage = "https://github.com/googlefonts/fontbakery";
159158
changelog = "https://github.com/fonttools/fontbakery/blob/v${version}/CHANGELOG.md";
160159
license = licenses.asl20;
160+
mainProgram = "fontbakery";
161161
maintainers = with maintainers; [ danc86 ];
162162
};
163163
}
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
{ runCommand, fontbakery }:
1+
{
2+
fontbakery,
3+
lib,
4+
runCommand,
5+
}:
26

37
let
4-
inherit (fontbakery) pname version src;
8+
inherit (fontbakery) version src;
59
in
610

7-
runCommand "${pname}-tests" { meta.timeout = 5; } ''
11+
runCommand "fontbakery-tests" { meta.timeout = 5; } ''
812
# Check the version matches what we packaged.
9-
${fontbakery}/bin/fontbakery --version | grep -q "${version}"
13+
${lib.getExe fontbakery} --version | grep -q "${version}"
1014
1115
# Unpack src to get some test fonts.
12-
tar -xzf ${src} --strip-components=1 ${pname}-${version}/data/test
16+
tar -xzf ${src} --strip-components=1 fontbakery-${version}/data/test
1317
1418
# Run some font checks.
15-
${fontbakery}/bin/fontbakery check-ufo --no-progress --no-colors data/test/test.ufo >>$out
19+
${lib.getExe fontbakery} check-ufo --no-progress --no-colors data/test/test.ufo >>$out
1620
# TODO add more
1721
''

0 commit comments

Comments
 (0)