cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #291500 from uninsane/pr-libkiwix-13.1

Browse source 
libkiwix: 12.1.1 -> 13.1.0
This commit is contained in:
kirillrdy 2024-02-27 06:37:12 +11:00 committed by GitHub
commit 83fde4c169
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/kiwix/default.nix
View file

@ -9,15 +9,15 @@
, aria2 , aria2
}: }:
mkDerivation rec { mkDerivation {
pname = "kiwix"; pname = "kiwix";
version = "2.3.1"; version = "2.3.1-unstable-2024-02-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = "kiwix";
repo = "${pname}-desktop"; repo = "kiwix-desktop";
rev = version; rev = "17ac566b07814aefb1decf108e4ba6d7ad9ef7bc";
sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo="; hash = "sha256-BZzFnQE8/dyZkpY0X3zZ6yC6yLZ002Q/RoDzEhSOa/g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

13
pkgs/applications/misc/kiwix/lib.nix
View file

@ -11,15 +11,15 @@
, gtest , gtest
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "libkiwix"; pname = "libkiwix";
version = "12.1.1"; version = "13.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kiwix"; owner = "kiwix";
repo = pname; repo = "libkiwix";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-hcwLxfn1fiUAiwsnIddv4HukvVrFePtx7sDQUD1lGUA="; hash = "sha256-DKOwzfGyad/3diOaV1K8hXqT8YGfqCP6QDKDkxWu/1U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -55,8 +55,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Common code base for all Kiwix ports"; description = "Common code base for all Kiwix ports";
homepage = "https://kiwix.org"; homepage = "https://kiwix.org";
changelog = "https://github.com/kiwix/libkiwix/releases/tag/${finalAttrs.version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ colinsane ]; maintainers = with maintainers; [ colinsane ];
}; };
} })

12
pkgs/applications/misc/kiwix/tools.nix
View file

@ -9,15 +9,15 @@
, stdenv , stdenv
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "kiwix-tools"; pname = "kiwix-tools";
version = "3.5.0"; version = "3.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kiwix"; owner = "kiwix";
repo = "kiwix-tools"; repo = "kiwix-tools";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-bOxi51H28LhA+5caX6kllIY5B3Q1FoGVFadFIhYRkG0="; hash = "sha256-+th86lMAuCcmWj06yQoZ1L7rLZKqNvuTrV+Rra2km44=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ...";
homepage = "https://kiwix.org"; homepage = "https://kiwix.org";
changelog = "https://github.com/kiwix/kiwix-tools/releases/tag/${finalAttrs.version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ colinsane ]; maintainers = with maintainers; [ colinsane ];
}; };
} })