diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index 288eb8eab8dc..4e2981096b21 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/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 + ]; }; } diff --git a/pkgs/by-name/zi/zimlib/package.nix b/pkgs/by-name/zi/zimlib/package.nix deleted file mode 100644 index f1ab313018dd..000000000000 --- a/pkgs/by-name/zi/zimlib/package.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76be3c4173d4..a9f0013a555c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1664,6 +1664,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'";