Skip to content

zathura: 0.5.6 -> 0.5.8, all plugins updated #337383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpletz merged 2 commits into from
Sep 5, 2024
Merged

zathura: 0.5.6 -> 0.5.8, all plugins updated #337383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4982873
zathuraPkgs: modernize
smancill Aug 26, 2024
b5fae88
zathura: 0.5.6 -> 0.5.8
smancill Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions pkgs/applications/misc/zathura/cb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,44 @@
girara,
gettext,
libarchive,
desktop-file-utils,
appstream-glib,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zathura-cb";
version = "0.1.10";
version = "0.1.11";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g=";
url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz";
hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc=";
};

nativeBuildInputs = [
meson
ninja
pkg-config
gettext
desktop-file-utils
appstream-glib
Comment thread
smancill marked this conversation as resolved.
Outdated
];

buildInputs = [
libarchive
zathura_core
girara
];

PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura-cb/";
description = "Zathura CB plugin";
longDescription = ''
The zathura-cb plugin adds comic book support to zathura.
'';
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ jlesquembre ];
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ jlesquembre ];
};
}
})
23 changes: 17 additions & 6 deletions pkgs/applications/misc/zathura/core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
meson,
ninja,
wrapGAppsHook3,
Expand All @@ -28,15 +29,24 @@

stdenv.mkDerivation (finalAttrs: {
pname = "zathura";
version = "0.5.6";
version = "0.5.8";

src = fetchFromGitHub {
owner = "pwmt";
repo = "zathura";
rev = finalAttrs.version;
hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac=";
hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c=";
};

patches = [
# https://github.com/pwmt/zathura/issues/664
(fetchpatch {
name = "fix-build-on-macos.patch";
url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch";
hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI=";
})
];

outputs = [
"bin"
"man"
Expand All @@ -54,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
# Make sure tests are enabled for doCheck
# (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
(lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)
(lib.mesonEnable "landlock" stdenv.hostPlatform.isLinux)
];

nativeBuildInputs = [
Expand Down Expand Up @@ -85,11 +96,11 @@ stdenv.mkDerivation (finalAttrs: {

passthru.updateScript = gitUpdater { };

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura";
description = "Core component for zathura PDF viewer";
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ globin ];
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ globin ];
};
})
23 changes: 14 additions & 9 deletions pkgs/applications/misc/zathura/djvu/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@
girara,
djvulibre,
gettext,
desktop-file-utils,
appstream-glib,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zathura-djvu";
version = "0.2.9";
version = "0.2.10";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA=";
url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz";
hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU=";
};

nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
appstream-glib
];

buildInputs = [
djvulibre
gettext
Expand All @@ -34,17 +39,17 @@ stdenv.mkDerivation rec {
girara
];

PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura-djvu/";
description = "Zathura DJVU plugin";
longDescription = ''
The zathura-djvu plugin adds DjVu support to zathura by using the
djvulibre library.
'';
license = licenses.zlib;
platforms = platforms.unix;
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
})
22 changes: 13 additions & 9 deletions pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,26 @@
tesseract,
leptonica,
mujs,
desktop-file-utils,
appstream-glib,
gitUpdater,
}:

stdenv.mkDerivation rec {
version = "0.4.2";
stdenv.mkDerivation (finalAttrs: {
version = "0.4.4";
pname = "zathura-pdf-mupdf";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM=";
url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz";
hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw=";
};

nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
appstream-glib
];

buildInputs = [
Expand All @@ -49,23 +53,23 @@ stdenv.mkDerivation rec {
mujs
] ++ lib.optional stdenv.isDarwin gtk-mac-integration;

PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

postPatch = ''
sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build
'';

passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; };

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/";
description = "Zathura PDF plugin (mupdf)";
longDescription = ''
The zathura-pdf-mupdf plugin adds PDF support to zathura by
using the mupdf rendering library.
'';
license = licenses.zlib;
platforms = platforms.unix;
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
})
23 changes: 14 additions & 9 deletions pkgs/applications/misc/zathura/pdf-poppler/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,44 @@
zathura_core,
girara,
poppler,
desktop-file-utils,
appstream-glib,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zathura-pdf-poppler";
version = "0.3.2";
version = "0.3.3";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE=";
url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz";
hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU=";
};

nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
appstream-glib
zathura_core
];

buildInputs = [
poppler
girara
];

PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura-pdf-poppler/";
description = "Zathura PDF plugin (poppler)";
longDescription = ''
The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering library.
'';
license = licenses.zlib;
platforms = platforms.unix;
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
})
23 changes: 14 additions & 9 deletions pkgs/applications/misc/zathura/ps/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,45 @@
girara,
libspectre,
gettext,
desktop-file-utils,
appstream-glib,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zathura-ps";
version = "0.2.7";
version = "0.2.8";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY=";
url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz";
hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko=";
};

nativeBuildInputs = [
meson
ninja
pkg-config
gettext
desktop-file-utils
appstream-glib
];

buildInputs = [
libspectre
zathura_core
girara
];

PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

meta = with lib; {
meta = {
homepage = "https://pwmt.org/projects/zathura-ps/";
description = "Zathura PS plugin";
longDescription = ''
The zathura-ps plugin adds PS support to zathura by using the
libspectre library.
'';
license = licenses.zlib;
platforms = platforms.unix;
license = lib.licenses.zlib;
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
})