mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 03:30:45 +00:00
Merge pull request #291500 from uninsane/pr-libkiwix-13.1
libkiwix: 12.1.1 -> 13.1.0
This commit is contained in:
commit
83fde4c169
|
@ -9,15 +9,15 @@
|
|||
, aria2
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "kiwix";
|
||||
version = "2.3.1";
|
||||
version = "2.3.1-unstable-2024-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "${pname}-desktop";
|
||||
rev = version;
|
||||
sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo=";
|
||||
owner = "kiwix";
|
||||
repo = "kiwix-desktop";
|
||||
rev = "17ac566b07814aefb1decf108e4ba6d7ad9ef7bc";
|
||||
hash = "sha256-BZzFnQE8/dyZkpY0X3zZ6yC6yLZ002Q/RoDzEhSOa/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,15 +11,15 @@
|
|||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkiwix";
|
||||
version = "12.1.1";
|
||||
version = "13.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwix";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hcwLxfn1fiUAiwsnIddv4HukvVrFePtx7sDQUD1lGUA=";
|
||||
repo = "libkiwix";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-DKOwzfGyad/3diOaV1K8hXqT8YGfqCP6QDKDkxWu/1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -55,8 +55,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Common code base for all Kiwix ports";
|
||||
homepage = "https://kiwix.org";
|
||||
changelog = "https://github.com/kiwix/libkiwix/releases/tag/${finalAttrs.version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -9,15 +9,15 @@
|
|||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kiwix-tools";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwix";
|
||||
repo = "kiwix-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-bOxi51H28LhA+5caX6kllIY5B3Q1FoGVFadFIhYRkG0=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+th86lMAuCcmWj06yQoZ1L7rLZKqNvuTrV+Rra2km44=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ...";
|
||||
homepage = "https://kiwix.org";
|
||||
changelog = "https://github.com/kiwix/kiwix-tools/releases/tag/${finalAttrs.version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
};
|
||||
}
|
||||
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue