commit 0a41c15b2e40db0070818bdee86cc90a22562c0a · pyrox.dev/nixpkgs

+5 -10

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

···

       3
        
         stdenv,

     

       4
        
         # Enables some expensive tests, useful for verifying an update

     

       5
        
         afdko,

     

       6
       -
         antlr4_9,

     

       7
        
         booleanoperations,

     

       8
        
         buildPythonPackage,

     

       9
        
         cmake,

     
···

       27
        
       

     

       28
        
       buildPythonPackage rec {

     

       29
        
         pname = "afdko";

     

       30
       -
         version = "4.0.1";

     

       31
        
         pyproject = true;

     

       32
        
       

     

       33
        
         disabled = pythonOlder "3.8";

     
···

       35
        
         src = fetchFromGitHub {

     

       36
        
           owner = "adobe-type-tools";

     

       37
        
           repo = "afdko";

     

       38
       -
           rev = "refs/tags/${version}";

     

       39
       -
           hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8=";

     

       40
        
         };

     

       41
        
       

     

       42
        
         build-system = [ setuptools-scm ];

     
···

       48
        
         ];

     

       49
        
       

     

       50
        
         buildInputs = [

     

       51
       -
           antlr4_9.runtime.cpp

     

       52
        
           libxml2.dev

     

       53
        
         ];

     

       54
        
       

     
···

       59
        
           # Use antlr4 runtime from nixpkgs and link it dynamically

     

       60
        
           ./use-dynamic-system-antlr4-runtime.patch

     

       61
        
         ];

     

       62
       -
       

     

       63
       -
         # Happy new year

     

       64
       -
         postPatch = ''

     

       65
       -
           substituteInPlace tests/tx_data/expected_output/alt-missing-glif.pfb --replace 2023 2024

     

       66
       -
         '';

     

       67
        
       

     

       68
        
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [

     

       69
        
           "-Wno-error=incompatible-function-pointer-types"

···

       3
        
         stdenv,

     

       4
        
         # Enables some expensive tests, useful for verifying an update

     

       5
        
         afdko,

     

       6
       +
         antlr4_13,

     

       7
        
         booleanoperations,

     

       8
        
         buildPythonPackage,

     

       9
        
         cmake,

     
···

       27
        
       

     

       28
        
       buildPythonPackage rec {

     

       29
        
         pname = "afdko";

     

       30
       +
         version = "4.0.2";

     

       31
        
         pyproject = true;

     

       32
        
       

     

       33
        
         disabled = pythonOlder "3.8";

     
···

       35
        
         src = fetchFromGitHub {

     

       36
        
           owner = "adobe-type-tools";

     

       37
        
           repo = "afdko";

     

       38
       +
           tag = version;

     

       39
       +
           hash = "sha256:0955dvbydifhgx9gswbf5drsmmghry7iyf6jwz6qczhj86clswcm";

     

       40
        
         };

     

       41
        
       

     

       42
        
         build-system = [ setuptools-scm ];

     
···

       48
        
         ];

     

       49
        
       

     

       50
        
         buildInputs = [

     

       51
       +
           antlr4_13.runtime.cpp

     

       52
        
           libxml2.dev

     

       53
        
         ];

     

       54
        
       

     
···

       59
        
           # Use antlr4 runtime from nixpkgs and link it dynamically

     

       60
        
           ./use-dynamic-system-antlr4-runtime.patch

     

       61
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
       

     

       63
        
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [

     

       64
        
           "-Wno-error=incompatible-function-pointer-types"

+3 -3

pkgs/development/python-modules/afdko/no-pypi-build-tools.patch

···

       1
       -
       commit 72b0ab672d1080049431eeee07ae6d2556ae9e4a

     

       2
        
       Author: sternenseemann <sternenseemann@systemli.org>

     

       3
        
       Date:   Tue Oct 5 18:17:20 2021 +0200

     

       4
        
       

     
···

       8
        
           somehow wrap and vendor a version of the proper tool.

     

       9
        
       

     

       10
        
       diff --git a/setup.py b/setup.py

     

       11
       -
       index 50deb781..81417971 100644

     

       12
        
       --- a/setup.py

     

       13
        
       +++ b/setup.py

     

       14
       -
       @@ -196,9 +196,7 @@ def main():

     

       15
        
                  setup_requires=[

     

       16
        
                      'wheel',

     

       17
        
                      'setuptools_scm',

···

       1
       +
       commit a5fde72bd15e0baba008ea54270a1ffe017544a0

     

       2
        
       Author: sternenseemann <sternenseemann@systemli.org>

     

       3
        
       Date:   Tue Oct 5 18:17:20 2021 +0200

     

       4
        
       

     
···

       8
        
           somehow wrap and vendor a version of the proper tool.

     

       9
        
       

     

       10
        
       diff --git a/setup.py b/setup.py

     

       11
       +
       index 973e2826..dba58766 100644

     

       12
        
       --- a/setup.py

     

       13
        
       +++ b/setup.py

     

       14
       +
       @@ -198,9 +198,7 @@ def main():

     

       15
        
                  setup_requires=[

     

       16
        
                      'wheel',

     

       17
        
                      'setuptools_scm',

+15 -15

pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch

···

       1
       -
       commit 286b9c6e69691292dce4f2b4beaac8f886da184d

     

       2
        
       Author: sternenseemann <sternenseemann@systemli.org>

     

       3
        
       Date:   Tue Oct 5 18:16:10 2021 +0200

     

       4
        
       

     
···

       9
        
           called antlr4-runtime, not antlr4_static).

     

       10
        
       

     

       11
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       12
       -
       index 9ce80598..a75b6fb1 100644

     

       13
        
       --- a/CMakeLists.txt

     

       14
        
       +++ b/CMakeLists.txt

     

       15
       -
       @@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

     

       16
        
        # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip

     

       17
        
        # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")

     

       18
        
        

     

       19
        
       -add_definitions(-DANTLR4CPP_STATIC)

     

       20
        
        set(ANTLR4_WITH_STATIC_CRT OFF)

     

       21
       -
        # 4.9.3 is the latest ANTLR4 version

     

       22
       -
        set(ANTLR4_TAG tags/4.9.3)

     

       23
        
       -include(ExternalAntlr4Cpp)

     

       24
        
       +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime)

     

       25
        
       +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER})

     

       26
        
        

     

       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)

     
···

       39
        
        

     

       40
        
        target_compile_definitions(makeotf_cffread PRIVATE $<$<CONFIG:Debug>:CFF_DEBUG=1> CFF_T13_SUPPORT=0)

     

       41
        
       diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt

     

       42
       -
       index 3cceceea..9695ea21 100644

     

       43
        
       --- a/c/makeotf/lib/hotconv/CMakeLists.txt

     

       44
        
       +++ b/c/makeotf/lib/hotconv/CMakeLists.txt

     

       45
       -
       @@ -69,7 +69,7 @@ add_library(hotconv STATIC

     

       46
       -
        

     

       47
        
        set_property(TARGET hotconv PROPERTY C_STANDARD 99)

     

       0
        
       
     

       48
        
        target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)

     

       49
        
       -target_link_libraries(hotconv PUBLIC antlr4_static)

     

       50
        
       +target_link_libraries(hotconv PUBLIC antlr4-runtime)

     

       51
        
        

     

       52
       -
        if (${LibXml2_FOUND})

     

       53
       -
            target_link_libraries(hotconv PUBLIC ${LIBXML2_LIBRARY})

···

       1
       +
       commit 3560653d5d52bf30a52ce971ecfe262b1a09d7a3

     

       2
        
       Author: sternenseemann <sternenseemann@systemli.org>

     

       3
        
       Date:   Tue Oct 5 18:16:10 2021 +0200

     

       4
        
       

     
···

       9
        
           called antlr4-runtime, not antlr4_static).

     

       10
        
       

     

       11
        
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       12
       +
       index 88e9cfd0..3df902b4 100644

     

       13
        
       --- a/CMakeLists.txt

     

       14
        
       +++ b/CMakeLists.txt

     

       15
       +
       @@ -36,11 +36,10 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

     

       16
        
        # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip

     

       17
        
        # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")

     

       18
        
        

     

       19
        
       -add_definitions(-DANTLR4CPP_STATIC)

     

       20
        
        set(ANTLR4_WITH_STATIC_CRT OFF)

     

       21
       +
       -# 4.9.3 is the latest ANTLR4 version

     

       22
       +
        set(ANTLR4_TAG tags/4.13.2)

     

       23
        
       -include(ExternalAntlr4Cpp)

     

       24
        
       +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime)

     

       25
        
       +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER})

     

       26
        
        

     

       27
       +
        

     

       28
       +
        if (DEFINED ENV{FORCE_BUILD_LIBXML2})

     

       29
        
       diff --git a/c/makeotf/lib/cffread/CMakeLists.txt b/c/makeotf/lib/cffread/CMakeLists.txt

     

       30
       +
       index 2990035f..fab25a77 100644

     

       31
        
       --- a/c/makeotf/lib/cffread/CMakeLists.txt

     

       32
        
       +++ b/c/makeotf/lib/cffread/CMakeLists.txt

     

       33
       +
       @@ -8,6 +8,6 @@ if (${NEED_LIBXML2_DEPEND})

     

       34
       +
            add_dependencies(makeotf_cffread ${LIBXML2_TARGET})

     

       35
        
        endif()

     

       36
        
        

     

       37
        
       -target_link_libraries(makeotf_cffread PUBLIC antlr4_static)

     
···

       39
        
        

     

       40
        
        target_compile_definitions(makeotf_cffread PRIVATE $<$<CONFIG:Debug>:CFF_DEBUG=1> CFF_T13_SUPPORT=0)

     

       41
        
       diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt

     

       42
       +
       index 60e49458..ada728c0 100644

     

       43
        
       --- a/c/makeotf/lib/hotconv/CMakeLists.txt

     

       44
        
       +++ b/c/makeotf/lib/hotconv/CMakeLists.txt

     

       45
       +
       @@ -70,7 +70,7 @@ add_library(hotconv STATIC

     

       0
        
       
     

       46
        
        set_property(TARGET hotconv PROPERTY C_STANDARD 99)

     

       47
       +
        set_property(TARGET hotconv PROPERTY CXX_STANDARD 17)

     

       48
        
        target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)

     

       49
        
       -target_link_libraries(hotconv PUBLIC antlr4_static)

     

       50
        
       +target_link_libraries(hotconv PUBLIC antlr4-runtime)

     

       51
        
        

     

       52
       +
        target_link_libraries(hotconv PUBLIC ${CHOSEN_LIBXML2_LIBRARY})

     

       53
       +