From b9495cc30f5cbb32cf2b6243ce775361dc31bf52 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jun 2022 14:20:37 +0000 Subject: [PATCH 1/3] zimlib: 6.3.2 -> 7.2.2 --- pkgs/development/libraries/zimlib/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 9f8e357d3ab0..56438f8e1735 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchzip , meson, ninja, pkg-config , python3 , icu @@ -11,13 +11,19 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "6.3.2"; + version = "7.2.2"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI="; + sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; + }; + + testData = fetchzip rec { + passthru.version = "0.4"; + url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz"; + sha256 = "sha256-2eJqmvs/GrvOD/pq8dTubaiO9ZpW2WqTNQByv354Z0w="; }; nativeBuildInputs = [ @@ -39,6 +45,8 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; + mesonFlags = [ "-Dtest_data_dir=${testData}" ]; + checkInputs = [ gtest ]; From 8320da218e04e672a64873b949bf2578373da308 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jun 2022 14:21:10 +0000 Subject: [PATCH 2/3] zimwriterfs 1.0 -> zim-tools 3.1.1 This package has absorbed zimwriterfs and some other programs. I've kept the maintainer the same since if they were interested in zimwriterfs they're presumably also interested in the new package. --- pkgs/tools/text/zim-tools/default.nix | 31 ++++++++++++++++++ pkgs/tools/text/zimwriterfs/default.nix | 43 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 33 insertions(+), 44 deletions(-) create mode 100644 pkgs/tools/text/zim-tools/default.nix delete mode 100644 pkgs/tools/text/zimwriterfs/default.nix diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix new file mode 100644 index 000000000000..319eb47be271 --- /dev/null +++ b/pkgs/tools/text/zim-tools/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config +, docopt_cpp, file, gumbo, mustache-hpp, zimlib, zlib +, gtest +}: + +stdenv.mkDerivation rec { + pname = "zim-tools"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "openzim"; + repo = "zim-tools"; + rev = version; + sha256 = "sha256-xZae1o4L9AdGDqBnFDZniWNM/dLsYRcS0OLWw9+Wecs="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ docopt_cpp file gumbo mustache-hpp zimlib zlib ]; + + checkInputs = [ gtest ]; + doCheck = true; + + meta = { + description = "Various ZIM command line tools"; + homepage = "https://github.com/openzim/zim-tools"; + maintainers = with lib.maintainers; [ robbinch ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix deleted file mode 100644 index 9a7e495df2b8..000000000000 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub - -, autoconf -, automake -, libtool -, pkg-config - -, file -, icu -, gumbo -, xz -, xapian -, zimlib -, zlib -}: - -stdenv.mkDerivation rec { - pname = "zimwriterfs"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "wikimedia"; - repo = "openzim"; - rev = "${pname}-${version}"; - sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19"; - }; - - nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = [ file icu gumbo xz zimlib zlib xapian ]; - setSourceRoot = '' - sourceRoot=$(echo */zimwriterfs) - ''; - preConfigure = "./autogen.sh"; - - meta = { - description = "A console tool to create ZIM files"; - homepage = "http://git.wikimedia.org/log/openzim"; - maintainers = with lib.maintainers; [ robbinch ]; - license = lib.licenses.gpl3; - platforms = with lib.platforms; [ linux ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e3fa8e0f269..0dec5d31a220 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1510,6 +1510,7 @@ mapAliases ({ zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 + zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ab652f0b961..f610659c5d47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11992,7 +11992,7 @@ with pkgs; zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; - zimwriterfs = callPackage ../tools/text/zimwriterfs { }; + zim-tools = callPackage ../tools/text/zim-tools { }; zld = callPackage ../development/tools/zld { }; From 207e649ab90fce65db78e89eab956c8567348cc5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jun 2022 14:21:47 +0000 Subject: [PATCH 3/3] kiwix: 2.0.5 -> 2.2.1 --- pkgs/applications/misc/kiwix/default.nix | 4 ++-- pkgs/applications/misc/kiwix/lib.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index f3406d4159b8..e64feb416555 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "kiwix"; - version = "2.0.5"; + version = "2.2.1"; src = fetchFromGitHub { owner = pname; repo = "${pname}-desktop"; rev = version; - sha256 = "12v43bcg4g8fcp02y2srsfdvcb7dpl4pxb9z7a235006s0kfv8yn"; + sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index dcde5c390a47..9d365cd328c8 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "kiwix-lib"; - version = "9.4.1"; + version = "10.1.1"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw"; + sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM="; }; nativeBuildInputs = [