zim-tools: 3.4.0 -> 3.5.0, fix build with icu76; zimlib: remove (#387922)

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

@@ -8,7 +8,7 @@
   pkg-config,
   gobject-introspection,
   glib,
-  zimlib,
+  libzim,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
-    zimlib
+    libzim
   ];
 
   # requires downloading test sample of a specific zimlib version

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

@@ -60,11 +60,14 @@ stdenv.mkDerivation rec {
     "-Dtest_data_dir=none"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Reference implementation of the ZIM specification";
     homepage = "https://github.com/openzim/libzim";
     changelog = "https://github.com/openzim/libzim/releases/tag/${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
+      fab
+      greg
+    ];
   };
 }

pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch

@@ -0,0 +1,18 @@
+diff --git a/meson.build b/meson.build
+index 344bbaf..ddad570 100644
+--- a/meson.build
++++ b/meson.build
+@@ -17,8 +17,11 @@ if static_linkage
+   endif
+ endif
+ 
+-libzim_dep = dependency('libzim', version:'>=9.2.0', static:static_linkage)
+-libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage)
++libzim_dep = [
++  dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage),
++  dependency('icu-i18n', static:static_linkage),
++  dependency('icu-uc', static:static_linkage)
++]
+ 
+ with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
+ 

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

@@ -9,33 +9,43 @@
   file,
   gumbo,
   mustache-hpp,
-  zimlib,
+  libzim,
+  icu,
   zlib,
   gtest,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zim-tools";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "zim-tools";
-    rev = version;
-    sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc=";
+    tag = version;
+    hash = "sha256-gcCo3u1pLm1CnTF3CATOri5+zat839zUbmQnMOVjanI=";
   };
 
+  patches = [
+    # Took from:
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/zim-tools/-/blob/0b4ffc61be76f1cfc61500f8157f99e28bb3c7b1/0001-Fix-build-with-ICU-76.patch
+    # https://github.com/openzim/libzim/pull/936
+    ./fix_build_with_icu76.patch
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
   ];
+
   buildInputs = [
     docopt_cpp
     file
     gumbo
     mustache-hpp
-    zimlib
+    libzim
+    icu
     zlib
   ];
 

pkgs/by-name/zi/zimlib/package.nix

@@ -1,75 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchzip,
-  meson,
-  ninja,
-  pkg-config,
-  python3,
-  icu,
-  libuuid,
-  xapian,
-  xz,
-  zstd,
-  gtest,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zimlib";
-  version = "9.1.0";
-
-  src = fetchFromGitHub {
-    owner = "openzim";
-    repo = "libzim";
-    rev = version;
-    hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs=";
-  };
-
-  testData = fetchzip rec {
-    passthru.version = "0.5";
-    url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz";
-    hash = "sha256-hCIFT1WPDjhoZMlsR2cFbt4NhmIJ4DX1H/tDCIv4NjQ=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    pkg-config
-    ninja
-    python3
-  ];
-
-  propagatedBuildInputs = [
-    icu
-    libuuid
-    xapian
-    xz
-    zstd
-  ];
-
-  postPatch = ''
-    patchShebangs scripts
-  '';
-
-  mesonFlags = [ "-Dtest_data_dir=${testData}" ];
-
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isGNU) [
-      "-Wno-error=mismatched-new-delete"
-    ]
-  );
-
-  nativeCheckInputs = [
-    gtest
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Library for reading and writing ZIM files";
-    homepage = "https://www.openzim.org/wiki/Zimlib";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ greg ];
-    platforms = platforms.unix;
-  };
-}

pkgs/top-level/aliases.nix

@@ -1676,6 +1676,7 @@ mapAliases {
   zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
   zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
   zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
+  zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
   zinc = zincsearch; # Added 2023-05-28
   zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
   zkg = throw "'zkg' has been replaced by 'zeek'";