From ad3fc738de5f4b645acaa8c0a9effb2704c66305 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:21:30 +0800 Subject: [PATCH 1/4] girara: 0.4.3 -> 0.4.5 --- pkgs/applications/misc/girara/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 56354f205f24..20c7b060a78e 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, meson, ninja, pkg-config, @@ -19,19 +19,18 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.4.3"; + version = "0.4.5"; outputs = [ "out" "dev" ]; - src = fetchFromGitLab { - domain = "git.pwmt.org"; + src = fetchFromGitHub { owner = "pwmt"; repo = "girara"; - rev = version; - hash = "sha256-/bJXdLXksTxUFC3w7zuBZY6Zh7tJxUJVbS87ENDQbDE="; + tag = version; + hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI="; }; nativeBuildInputs = [ @@ -79,15 +78,15 @@ stdenv.mkDerivation rec { inherit zathura; }; - meta = with lib; { - homepage = "https://git.pwmt.org/pwmt/girara"; + meta = { + homepage = "https://pwmt.org/projects/girara"; description = "User interface library"; longDescription = '' girara is a library that implements a GTK based VIM-like user interface that focuses on simplicity and minimalism. ''; - license = licenses.zlib; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.zlib; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; } From 123ff530c3b8ef605bbed8f3ae3150fcd5abbc86 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:22:53 +0800 Subject: [PATCH 2/4] zathura: 0.5.8 -> 0.5.10 --- .../misc/zathura/core/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 7aa63a9b6dde..7d1652cac932 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchFromGitHub, - fetchpatch, + fetchurl, meson, ninja, wrapGAppsHook3, @@ -33,24 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.8"; + version = "0.5.10"; - src = fetchFromGitHub { - owner = "pwmt"; - repo = "zathura"; - rev = finalAttrs.version; - hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c="; + src = fetchurl { + url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz"; + hash = "sha256-+0mOyXJJEIM/avPSF9qDD8+qW3ViBIvpP+T3S4Ye810="; }; - 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" From d152a71090cc8ce005d41a1eea29a8a76e18a977 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:30:50 +0800 Subject: [PATCH 3/4] zathura: wrap zathura-sandbox --- pkgs/applications/misc/zathura/wrapper.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 282034cc6b38..6f5d5bcee4e1 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -16,6 +16,7 @@ zathura_cb (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ], + stdenv, }: symlinkJoin { inherit (zathura_core) version; @@ -36,7 +37,12 @@ symlinkJoin { let fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; in - '' + (lib.optionalString stdenv.hostPlatform.isLinux '' + makeWrapper ${zathura_core.bin}/bin/zathura-sandbox $out/bin/zathura-sandbox \ + --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ + --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" + '') + + '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" @@ -46,11 +52,11 @@ symlinkJoin { # so we need to fix the path to reference $out instead. rm "$out/${fishCompletion}" substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ - --replace "${zathura_core.out}" "$out" + --replace-fail "${zathura_core.out}" "$out" ''; - meta = with lib; { - homepage = "https://pwmt.org/projects/zathura/"; + meta = { + homepage = "https://pwmt.org/projects/zathura"; description = "Highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the @@ -58,9 +64,9 @@ symlinkJoin { is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ smironov globin TethysSvensson From c9f841f44da2512ce2edbc845564c92ed037dada Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 19 Dec 2024 00:56:13 +0800 Subject: [PATCH 4/4] zathura: 0.5.10 -> 0.5.11 --- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 7d1652cac932..b23e88761577 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.10"; + version = "0.5.11"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz"; - hash = "sha256-+0mOyXJJEIM/avPSF9qDD8+qW3ViBIvpP+T3S4Ye810="; + hash = "sha256-VEWKmZivD7j67y6TSoESe75LeQyG3NLIuPMjZfPRtTw="; }; outputs = [