pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

python3Packages.afdko: 3.8.3 -> 3.9.0

3.9.1 is problematic atm because it'll unconditionally use the libxml2
externalproject on linux:
https://github.com/adobe-type-tools/afdko/pull/1527#issuecomment-1172872618

https://github.com/adobe-type-tools/afdko/blob/3.9.0/NEWS.md#390-released-2022-06-23

sternenseemann 7b5ee6d9 eb0ee679

+47 -9
+6 -2
pkgs/development/python-modules/afdko/default.nix
··· 5 5 , setuptools-scm, scikit-build 6 6 , cmake 7 7 , antlr4_9 8 + , libxml2 8 9 , pytestCheckHook 9 10 # Enables some expensive tests, useful for verifying an update 10 11 , runAllTests ? false ··· 13 14 14 15 buildPythonPackage rec { 15 16 pname = "afdko"; 16 - version = "3.8.3"; 17 + version = "3.9.0"; 17 18 18 19 disabled = pythonOlder "3.7"; 19 20 20 21 src = fetchPypi { 21 22 inherit pname version; 22 - sha256 = "0mplyla4zcai3qld7is7bl5wn2kzhp87w87yi13wpqnw06i6ij4b"; 23 + sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; 23 24 }; 24 25 25 26 format = "pyproject"; ··· 32 33 33 34 buildInputs = [ 34 35 antlr4_9.runtime.cpp 36 + libxml2.dev 35 37 ]; 36 38 37 39 patches = [ ··· 40 42 41 43 # Use antlr4 runtime from nixpkgs and link it dynamically 42 44 ./use-dynamic-system-antlr4-runtime.patch 45 + 46 + ./libxml2-cmake-find-package.patch 43 47 ]; 44 48 45 49 # setup.py will always (re-)execute cmake in buildPhase
+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)
+19 -7
pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch
··· 1 - commit 1ccbf21a67da0fdbaad881a1f5c2a4df915e8c57 1 + commit 286b9c6e69691292dce4f2b4beaac8f886da184d 2 2 Author: sternenseemann <sternenseemann@systemli.org> 3 3 Date: Tue Oct 5 18:16:10 2021 +0200 4 4 ··· 9 9 called antlr4-runtime, not antlr4_static). 10 10 11 11 diff --git a/CMakeLists.txt b/CMakeLists.txt 12 - index e9c8c08e..dc3a46da 100644 12 + index 9ce80598..a75b6fb1 100644 13 13 --- a/CMakeLists.txt 14 14 +++ b/CMakeLists.txt 15 15 @@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) ··· 24 24 +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) 25 25 +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) 26 26 27 - # sanitizer support 28 - # work around https://github.com/pypa/setuptools/issues/1928 with environment 27 + FIND_PACKAGE(LibXml2) 28 + IF (NOT ${LibXml2_FOUND}) 29 + diff --git a/c/makeotf/lib/cffread/CMakeLists.txt b/c/makeotf/lib/cffread/CMakeLists.txt 30 + index 9a400fde..5452d987 100644 31 + --- a/c/makeotf/lib/cffread/CMakeLists.txt 32 + +++ b/c/makeotf/lib/cffread/CMakeLists.txt 33 + @@ -13,6 +13,6 @@ else () 34 + endif() 35 + endif() 36 + 37 + -target_link_libraries(makeotf_cffread PUBLIC antlr4_static) 38 + +target_link_libraries(makeotf_cffread PUBLIC antlr4-runtime) 39 + 40 + target_compile_definitions(makeotf_cffread PRIVATE $<$<CONFIG:Debug>:CFF_DEBUG=1> CFF_T13_SUPPORT=0) 29 41 diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt 30 - index 82257bf2..02eb2e30 100644 42 + index 3cceceea..9695ea21 100644 31 43 --- a/c/makeotf/lib/hotconv/CMakeLists.txt 32 44 +++ b/c/makeotf/lib/hotconv/CMakeLists.txt 33 45 @@ -69,7 +69,7 @@ add_library(hotconv STATIC ··· 37 49 -target_link_libraries(hotconv PUBLIC antlr4_static) 38 50 +target_link_libraries(hotconv PUBLIC antlr4-runtime) 39 51 40 - if ( CMAKE_COMPILER_IS_GNUCC ) 41 - target_compile_options(hotconv PRIVATE -Wall -Wno-attributes) 52 + if (${LibXml2_FOUND}) 53 + target_link_libraries(hotconv PUBLIC ${LIBXML2_LIBRARY})