pyrox.dev / nixpkgs
lol
fork atom

python3Packages.afdko: 3.9.0 -> 3.9.2

authored by Jonas Heinrich and committed by sternenseemann d9a7ea80 c956f85f

+34 -42
unified split
+34 -20
pkgs/development/python-modules/afdko/default.nix
··· 1 - { lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder 2 - , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens 3 - , brotli, fontmath, mutatormath, booleanoperations 4 - , ufoprocessor, ufonormalizer, psautohint, tqdm 5 - , setuptools-scm, scikit-build 1 + { lib 2 + , stdenv 3 + , buildPythonPackage 4 + , fetchPypi 5 + , fetchpatch 6 + , pythonOlder 7 + , fonttools 8 + , defcon 9 + , lxml 10 + , fs 11 + , unicodedata2 12 + , zopfli 13 + , brotlipy 14 + , fontpens 15 + , brotli 16 + , fontmath 17 + , mutatormath 18 + , booleanoperations 19 + , ufoprocessor 20 + , ufonormalizer 21 + , psautohint 22 + , tqdm 23 + , setuptools-scm 24 + , scikit-build 6 25 , cmake 7 26 , antlr4_9 8 27 , libxml2 ··· 14 33 15 34 buildPythonPackage rec { 16 35 pname = "afdko"; 17 - version = "3.9.0"; 36 + version = "3.9.2"; 37 + format = "pyproject"; 18 38 19 39 disabled = pythonOlder "3.7"; 20 40 21 41 src = fetchPypi { 22 42 inherit pname version; 23 - sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; 43 + sha256 = "sha256-3JEnQbS4CtZEqAb+/ngqkO+nv9SZ0Zi8sPJLyW+tQ9w="; 24 44 }; 25 45 26 - format = "pyproject"; 27 - 28 46 nativeBuildInputs = [ 29 47 setuptools-scm 30 48 scikit-build ··· 42 60 43 61 # Use antlr4 runtime from nixpkgs and link it dynamically 44 62 ./use-dynamic-system-antlr4-runtime.patch 45 - 46 - ./libxml2-cmake-find-package.patch 47 63 ]; 48 64 49 65 # setup.py will always (re-)execute cmake in buildPhase ··· 67 83 psautohint 68 84 tqdm 69 85 ]; 86 + 87 + # Use system libxml2 88 + FORCE_SYSTEM_LIBXML2 = true; 70 89 71 90 checkInputs = [ pytestCheckHook ]; 91 + 72 92 preCheck = '' 73 93 export PATH=$PATH:$out/bin 74 - 75 - # Update tests to match ufinormalizer-0.6.1 expectations: 76 - # https://github.com/adobe-type-tools/afdko/issues/1418 77 - find tests -name layerinfo.plist -delete 78 94 ''; 95 + 79 96 disabledTests = lib.optionals (!runAllTests) [ 80 97 # Disable slow tests, reduces test time ~25 % 81 98 "test_report" ··· 91 108 "test_spec" 92 109 ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ 93 110 "test_type1mm_inputs" 94 - ] ++ [ 95 - # No longer succeeds in 2023 96 - # https://github.com/adobe-type-tools/afdko/issues/1589 97 - "test_ufo_fontinfo_parsing" 98 111 ]; 99 112 100 113 passthru.tests = { ··· 102 115 }; 103 116 104 117 meta = with lib; { 118 + changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; 105 119 description = "Adobe Font Development Kit for OpenType"; 106 - homepage = "https://adobe-type-tools.github.io/afdko/"; 120 + homepage = "https://adobe-type-tools.github.io/afdko"; 107 121 license = licenses.asl20; 108 122 maintainers = [ maintainers.sternenseemann ]; 109 123 };
-22
pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch
··· 1 - commit c423d1ddf0345aed7ecaf4c8b9e1fa5108aafc6f 2 - Author: sternenseemann <sternenseemann@systemli.org> 3 - Date: Sat Jul 2 12:35:56 2022 +0200 4 - 5 - Force use of CMake-shipped FindLibXml2 module 6 - 7 - This is needed to work around a nixpkgs bug: 8 - https://github.com/NixOS/nixpkgs/issues/125008 9 - 10 - diff --git a/CMakeLists.txt b/CMakeLists.txt 11 - index a75b6fb1..c1408283 100644 12 - --- a/CMakeLists.txt 13 - +++ b/CMakeLists.txt 14 - @@ -42,7 +42,7 @@ set(ANTLR4_TAG tags/4.9.3) 15 - find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) 16 - set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) 17 - 18 - -FIND_PACKAGE(LibXml2) 19 - +FIND_PACKAGE(LibXml2 REQUIRED MODULE) 20 - IF (NOT ${LibXml2_FOUND}) 21 - MESSAGE(STATUS "Could not locate LibXml2, will install externally.") 22 - set(LIBXML2_TAG tags/v2.9.13)