diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index c3478627b38b..8da351b48069 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 (finalAttrs: { pname = "zathura-cb"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; - hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; + hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 756bfbdbc600..c2a4abacb50e 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 = [ diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c38c3827c183..87ac40d1b204 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -10,21 +10,25 @@ girara, djvulibre, gettext, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; - hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; + hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 54c7a3b549fa..b49371b24dea 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 (finalAttrs: { - version = "0.4.2"; + version = "0.4.4"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; - hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; + hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 9395ab23cc0f..37941f268983 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -8,21 +8,25 @@ zathura_core, girara, poppler, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; - hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; + hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib zathura_core ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 026e59c5a1eb..3978668991c3 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 (finalAttrs: { pname = "zathura-ps"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; - hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; + hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; buildInputs = [