diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 2c4dc76abb477..8da351b480691 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -9,15 +9,17 @@ 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 = [ @@ -25,23 +27,26 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; + 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 ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b7b7a517310b7..c2a4abacb50e7 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, meson, ninja, wrapGAppsHook3, @@ -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" @@ -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 = [ @@ -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 ]; }; }) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 00d3563d5b769..87ac40d1b2045 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -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 @@ -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 = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b3b5d514a84c9..b49371b24deab 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -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 = [ @@ -49,7 +53,7 @@ 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 @@ -57,15 +61,15 @@ stdenv.mkDerivation rec { 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 = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 7119acd037464..37941f2689831 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -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 = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 54202f919669d..3978668991c30 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -9,15 +9,17 @@ 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 = [ @@ -25,24 +27,27 @@ stdenv.mkDerivation rec { 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 = [ ]; }; -} +})