pyrox.dev / nixpkgs
lol
fork atom

kiwix: 2.2.1 -> 2.3.1

changelog:
- 2.3.1
- Fix the AppImage packaging. Now published AppImages work correctly on recent distrubution (mgautierfr 905)
- Improve zim file picker (kelson42 886)
- Do not show ServiceWorker zim file from the remote catalog (kelson42 887)
- 2.3.0
- Fix downloading of file bigger than 4G (Juzz0 855)
- Hide top widget and topbar in fullscreen (Juzz0 859)
- Add shortcuts for navigating tabs (Ctrl-tab, Ctrl-shift-tab) (Juzz0 867)
- Do not use deprecated method QWebEngineDownloadItem::setPath (Juzz0 853)
- Fix compilation with last version of libkiwix (mgautierfr 858)
- Fix README.md (psypherium 860)
- Update translations.
- 2.2.2
- Remove usage of deprecated libkiwix function (Juzz0 mgautiefr 831)
- Adapt kiwix-desktop to last libkiwix api (mgautierfr 842, veloman-yunkan 844)
- Do not search (and crash) on a zim file without fulltext index (mgautierfr 830)
- Update translations.
- [Flathub] Update link to screenshot

libkiwix changelog:
<https://github.com/kiwix/libkiwix/blob/0ae31bd181b1522cf1f7e7a8bbba3a840646dbbe/ChangeLog>

libkiwix now requires libzim to be compiled with xapian support.
kiwix-desktop fails to link of xapian isn't also found there, so i made
this part of `propagatedBuildInputs`. `xz` also needed to be propagated,
otherwise libkiwix would fail with
```
> meson.build:38:0: ERROR: Could not generate cargs for libzim:
> Package liblzma was not found in the pkg-config search path.
```

additionally, upstream renamed the repo to `libkiwix`. the old `kiwix-lib` repo redirects to
`libkiwix`, so i updated pname to reflect this.

colin bea06ddf 7634c325

+19 -9
unified split
+2 -2
pkgs/applications/misc/kiwix/default.nix
··· 11 12 mkDerivation rec { 13 pname = "kiwix"; 14 - version = "2.2.1"; 15 16 src = fetchFromGitHub { 17 owner = pname; 18 repo = "${pname}-desktop"; 19 rev = version; 20 - sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8="; 21 }; 22 23 nativeBuildInputs = [
··· 11 12 mkDerivation rec { 13 pname = "kiwix"; 14 + version = "2.3.1"; 15 16 src = fetchFromGitHub { 17 owner = pname; 18 repo = "${pname}-desktop"; 19 rev = version; 20 + sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo="; 21 }; 22 23 nativeBuildInputs = [
+5 -5
pkgs/applications/misc/kiwix/lib.nix
··· 3 , python3 4 , curl 5 , icu 6 , pugixml 7 - , zimlib 8 , zlib 9 , libmicrohttpd 10 , mustache-hpp ··· 12 }: 13 14 stdenv.mkDerivation rec { 15 - pname = "kiwix-lib"; 16 - version = "10.1.1"; 17 18 src = fetchFromGitHub { 19 owner = "kiwix"; 20 repo = pname; 21 rev = version; 22 - sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM="; 23 }; 24 25 nativeBuildInputs = [ ··· 38 propagatedBuildInputs = [ 39 curl 40 libmicrohttpd 41 pugixml 42 - zimlib 43 ]; 44 45 checkInputs = [
··· 3 , python3 4 , curl 5 , icu 6 + , libzim 7 , pugixml 8 , zlib 9 , libmicrohttpd 10 , mustache-hpp ··· 12 }: 13 14 stdenv.mkDerivation rec { 15 + pname = "libkiwix"; 16 + version = "12.0.0"; 17 18 src = fetchFromGitHub { 19 owner = "kiwix"; 20 repo = pname; 21 rev = version; 22 + sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc="; 23 }; 24 25 nativeBuildInputs = [ ··· 38 propagatedBuildInputs = [ 39 curl 40 libmicrohttpd 41 + libzim 42 pugixml 43 ]; 44 45 checkInputs = [
+12 -2
pkgs/development/libraries/libzim/default.nix
··· 5 , meson 6 , ninja 7 , pkg-config 8 , xz 9 , zstd 10 }: ··· 24 ninja 25 meson 26 pkg-config 27 ]; 28 29 buildInputs = [ 30 icu 31 - xz 32 zstd 33 ]; 34 35 mesonFlags = [ 36 # Tests are located at https://github.com/openzim/zim-testing-suite 37 # "...some tests need up to 16GB of memory..." 38 "-Dtest_data_dir=none" 39 - "-Dwith_xapian=false" 40 ]; 41 42 meta = with lib; {
··· 5 , meson 6 , ninja 7 , pkg-config 8 + , python3 9 + , xapian 10 , xz 11 , zstd 12 }: ··· 26 ninja 27 meson 28 pkg-config 29 + python3 30 ]; 31 32 buildInputs = [ 33 icu 34 zstd 35 ]; 36 37 + propagatedBuildInputs = [ 38 + xapian 39 + xz 40 + ]; 41 + 42 + postPatch = '' 43 + patchShebangs scripts 44 + ''; 45 + 46 mesonFlags = [ 47 # Tests are located at https://github.com/openzim/zim-testing-suite 48 # "...some tests need up to 16GB of memory..." 49 "-Dtest_data_dir=none" 50 ]; 51 52 meta = with lib; {