diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-06-01 10:43:58 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-06-01 10:57:07 +0200 |
| commit | 2cdbcc203a16a245cc12ed24719650ffebcb1f9c (patch) | |
| tree | 39cd1bb3ab5cd5e2bb1117d087cf1c6a99bc45c3 /pkgs/development/python-modules/afdko | |
| parent | fd30fff77376c3bb252d1e356e3d44d5fd2138b7 (diff) | |
python3Packages.afdko: 3.8.1 -> 3.8.3
https://github.com/adobe-type-tools/afdko/blob/3.8.3/NEWS.md#383-released-2022-05-09
Diffstat (limited to 'pkgs/development/python-modules/afdko')
| -rw-r--r-- | pkgs/development/python-modules/afdko/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index bbf8d555b5ef..c9cbd16fc0a6 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.8.1"; + version = "3.8.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BaSpw7TiBymCvoP0/z1zynWKQJH/PjbbGf85ZI9LOZw="; + sha256 = "0mplyla4zcai3qld7is7bl5wn2kzhp87w87yi13wpqnw06i6ij4b"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch index 25e399e78d9b..8198751a1606 100644 --- a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch +++ b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch @@ -1,4 +1,4 @@ -commit 105daa26f09034af58eb13ac7c5c4ff5420c1724 +commit 1ccbf21a67da0fdbaad881a1f5c2a4df915e8c57 Author: sternenseemann <sternenseemann@systemli.org> Date: Tue Oct 5 18:16:10 2021 +0200 @@ -9,19 +9,17 @@ Date: Tue Oct 5 18:16:10 2021 +0200 called antlr4-runtime, not antlr4_static). diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7f86fb6..c43c4456 100644 +index e9c8c08e..dc3a46da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,13 +36,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip +@@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") -add_definitions(-DANTLR4CPP_STATIC) set(ANTLR4_WITH_STATIC_CRT OFF) - # Use slightly more recent commit than 4.9.2 to deal with utfcpp test - # compilation problems - # set(ANTLR4_TAG tags/4.9.2) - set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96) + # 4.9.3 is the latest ANTLR4 version + set(ANTLR4_TAG tags/4.9.3) -include(ExternalAntlr4Cpp) +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) |