mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-17 18:47:57 +03:00
Merge pull request #206254 from uninsane/pr/kiwix-2.3.1
kiwix-tools: init at 3.4.0
This commit is contained in:
commit
36a8e63fe1
@ -1,5 +1,5 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, callPackage
|
||||
, libkiwix
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qtbase
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kiwix";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "${pname}-desktop";
|
||||
rev = version;
|
||||
sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8=";
|
||||
sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -26,11 +26,11 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libkiwix
|
||||
qtbase
|
||||
qtwebengine
|
||||
qtsvg
|
||||
qtimageformats
|
||||
(callPackage ./lib.nix {})
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
@ -40,7 +40,7 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "An offline reader for Web content";
|
||||
homepage = "https://kiwix.org";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ajs124 ];
|
||||
};
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config
|
||||
, python3
|
||||
, curl
|
||||
, icu
|
||||
, libzim
|
||||
, pugixml
|
||||
, zimlib
|
||||
, zlib
|
||||
, libmicrohttpd
|
||||
, mustache-hpp
|
||||
@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kiwix-lib";
|
||||
version = "10.1.1";
|
||||
pname = "libkiwix";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwix";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM=";
|
||||
sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [
|
||||
curl
|
||||
libmicrohttpd
|
||||
libzim
|
||||
pugixml
|
||||
zimlib
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -51,4 +51,12 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Common code base for all Kiwix ports";
|
||||
homepage = "https://kiwix.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
};
|
||||
}
|
||||
|
41
pkgs/applications/misc/kiwix/tools.nix
Normal file
41
pkgs/applications/misc/kiwix/tools.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, icu
|
||||
, libkiwix
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kiwix-tools";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwix";
|
||||
repo = "kiwix-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
libkiwix
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ...";
|
||||
homepage = "https://kiwix.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
};
|
||||
}
|
||||
|
@ -5,6 +5,8 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, xapian
|
||||
, xz
|
||||
, zstd
|
||||
}:
|
||||
@ -24,19 +26,27 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
meson
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
xz
|
||||
zstd
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
xapian
|
||||
xz
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
# Tests are located at https://github.com/openzim/zim-testing-suite
|
||||
# "...some tests need up to 16GB of memory..."
|
||||
"-Dtest_data_dir=none"
|
||||
"-Dwith_xapian=false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -30210,6 +30210,8 @@ with pkgs;
|
||||
|
||||
kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
|
||||
|
||||
kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
|
||||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
|
||||
@ -30430,6 +30432,8 @@ with pkgs;
|
||||
|
||||
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
|
||||
|
||||
libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
|
||||
|
||||
libowfat = callPackage ../development/libraries/libowfat { };
|
||||
|
||||
libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
|
||||
|
Loading…
Reference in New Issue
Block a user