Merge pull request #175715 from sternenseemann/afdko-3.8.3

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";

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})

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

@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.63.1";
+  version = "4.64.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QjCkkRmkFsiMxH0NLTLV2Q8aKC1eSX1JgBlQcE5Jhj0=";
+    sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/parsing/antlr/4.9.nix

@@ -2,12 +2,12 @@
 , fetchpatch, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, utf8cpp, darwin }:
 
 let
-  version = "4.9.2";
+  version = "4.9.3";
   source = fetchFromGitHub {
     owner = "antlr";
     repo = "antlr4";
     rev = version;
-    sha256 = "0rpqgl2y22iiyg42y8jyiy2g7x421yf0q16cf17j76iai6y0bm5p";
+    sha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm";
   };
 
   runtime = {
@@ -18,14 +18,6 @@ let
 
       outputs = [ "out" "dev" "doc" ];
 
-      patches = [
-        (fetchpatch {
-          name = "use-utfcpp-from-system.patch";
-          url = "https://github.com/antlr/antlr4/commit/5a808b470e1314b63b0a921178040ccabb357945.patch";
-          sha256 = "0nq7iajy9inllcspyqpxskfg3k5s1fwm7ph75i8lfc25rl35k1w7";
-        })
-      ];
-
       patchFlags = [ "-p3" ];
 
       nativeBuildInputs = [ cmake ninja pkg-config ];
@@ -52,7 +44,7 @@ let
 
     src = fetchurl {
       url = "https://www.antlr.org/download/antlr-${version}-complete.jar";
-      sha256 = "1k9pw5gv2zhh06n1vys76kchlz4mz0vgv3iiba8w47b9fqa7n4dv";
+      sha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg";
     };
 
     dontUnpack = true;