libzim: 9.3.0 -> 9.5.0, libkiwix: 14.0.0 -> 14.1.1, kiwix-tools: 3.7.0-unstable-2024-12-21 -> 3.8.1 (#495709)

pkgs/by-name/ki/kiwix-tools/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kiwix-tools";
-  version = "3.7.0-unstable-2024-12-21";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "kiwix-tools";
-    rev = "43b00419dd3f33eb644e1d83c2e802fc200b2de7";
-    hash = "sha256-Rctb6ZPTXjgSrLRB5VK4CEqYHuEPB7a+SQaNi47cxv0=";
+    tag = finalAttrs.version;
+    hash = "sha256-lq7pP9ftRe26EEVntdY9xs951mvrvUKMMep/Oup4jdE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/li/libkiwix/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libkiwix";
-  version = "14.0.0";
+  version = "14.1.1";
 
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "libkiwix";
     rev = finalAttrs.version;
-    hash = "sha256-QP23ZS0FJsMVtnWOofywaAPIU0GJ2L+hLP/x0LXMKiU=";
+    hash = "sha256-yZWzzu0LLUxg0CbdeKARuaFsf3UxvJJbqPRDGXWDjLI=";
   };
 
   nativeBuildInputs = [
@@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs scripts
-    substituteInPlace meson.build \
-        --replace-fail "libicu_dep = dependency('icu-i18n', static:static_deps)" \
-                       "libicu_dep = [dependency('icu-i18n', static:static_deps), dependency('icu-uc', static:static_deps)]"
   '';
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/li/libzim/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
+  nix-update-script,
   icu,
   meson,
   ninja,
@@ -15,24 +16,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libzim";
-  version = "9.3.0";
+  version = "9.5.0";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "libzim";
     tag = finalAttrs.version;
-    hash = "sha256-DZiFeZ2ry3JpXDs3mvf0q7diwhkjQ2730KQkDQPbgcY=";
+    hash = "sha256-YeskvTtwibKQxMY4c6yEHW+EmXUq4AXpd5XLxKfsmXg=";
   };
 
-  patches = [
-    # Upstream patch for ICU76 compatibility.
-    # https://github.com/openzim/libzim/pull/936
-    (fetchpatch {
-      url = "https://github.com/openzim/libzim/commit/4a42b3c6971c9534b104f48f6d13db8630a97d2f.patch";
-      hash = "sha256-FjaGZ2bI1ROLg3rvWIGLbVoImGr51MbWjbBj+lGj1rs=";
-    })
-  ];
-
   nativeBuildInputs = [
     ninja
     meson
@@ -60,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dtest_data_dir=none"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Reference implementation of the ZIM specification";
     homepage = "https://github.com/openzim/libzim";

pkgs/by-name/zi/zim-tools/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   meson,
   ninja,
   pkg-config,
@@ -33,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix_build_with_icu76.patch
   ];
 
+  postPatch = ''
+    # Disable werror, since the use of deprecated functions in libzim causes the build to fail
+    substituteInPlace meson.build \
+      --replace-fail "'werror=true', " ""
+  '';
+
   nativeBuildInputs = [
     meson
     ninja
@@ -52,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [ gtest ];
   doCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Various ZIM command line tools";
     homepage = "https://github.com/openzim/zim-tools";