npins & zatura-mupdf update

npins/sources.json

@@ -8,9 +8,9 @@
         "repo": "agenix"
       },
       "branch": "main",
-      "revision": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
+      "revision": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
-      "url": "https://github.com/ryantm/agenix/archive/de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6.tar.gz",
+      "url": "https://github.com/ryantm/agenix/archive/3f1dae074a12feb7327b4bf43cbac0d124488bb7.tar.gz",
-      "hash": "0rkcx72bq7fm5b1qy1nrzp8v93nv784wh11srgi3pi0m6sr9g03f"
+      "hash": "09aldzzc50121p0b3apj2c0l71jgmbif46a76shlgps8wbbbkr35"
     },
     "disko": {
       "type": "GitRelease",
@@ -35,9 +35,9 @@
         "repo": "home-manager"
       },
       "branch": "master",
-      "revision": "90ae324e2c56af10f20549ab72014804a3064c7f",
+      "revision": "6e090576c4824b16e8759ebca3958c5b09659ee8",
-      "url": "https://github.com/nix-community/home-manager/archive/90ae324e2c56af10f20549ab72014804a3064c7f.tar.gz",
+      "url": "https://github.com/nix-community/home-manager/archive/6e090576c4824b16e8759ebca3958c5b09659ee8.tar.gz",
-      "hash": "1nl57zw3y85mx2w2kj634ra54p9alfsnzb67c1z3fbbdwgqr1rcx"
+      "hash": "1dg4r6g12jhmaqns2awiqpapjpwm02lcmk0dq3g5098ivzr0dkdj"
     },
     "nix-patches": {
       "type": "GitRelease",
@@ -61,9 +61,9 @@
         "repo": "nixos-images"
       },
       "branch": "main",
-      "revision": "5eddae0afbcfd4283af5d6676d08ad059ca04b70",
+      "revision": "78065dbf9f7dab6ea3448d3a853c3eae6b4aa22d",
-      "url": "https://github.com/nix-community/nixos-images/archive/5eddae0afbcfd4283af5d6676d08ad059ca04b70.tar.gz",
+      "url": "https://github.com/nix-community/nixos-images/archive/78065dbf9f7dab6ea3448d3a853c3eae6b4aa22d.tar.gz",
-      "hash": "0kckivik3ma65s7cs8lh7jl4dc1ry04h8gc314yz0z045fwd9p4n"
+      "hash": "1954f2xzwqj3rcilyfhz9hnfpkw7v30szklpc350vih7m1mz9x7b"
     },
     "nixos-mailserver": {
       "type": "GitRelease",
@@ -83,8 +83,8 @@
     "nixpkgs": {
       "type": "Channel",
       "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre651763.6af55cb91ca2/nixexprs.tar.xz",
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre660607.c3392ad349a5/nixexprs.tar.xz",
-      "hash": "0pdc7sxmyswcpwv7wa8p8sj81fmjbrvid8ncgzn6dkarvmpaq3xw"
+      "hash": "1g2p74w085252qbxjymrzzccd203bfwxh8sbcyvbzan6bgqfvwi1"
     }
   },
   "version": 3

patches/default.nix

@@ -4,6 +4,10 @@
       _type = "static";
       path = ./nginx-fallback.patch;
     }
+    {
+      _type = "static";
+      path = ./zathura.patch;
+    }
   ];
   betamail = [
     {

patches/zathura.patch

@@ -0,0 +1,72 @@
+From 0e44c983a42028aa46b7e4602ce26f71bda74d87 Mon Sep 17 00:00:00 2001
+From: catvayor <catvayor@katvayor.net>
+Date: Fri, 2 Aug 2024 10:49:38 +0200
+Subject: [PATCH] zathura-mupdf 0.4.2 -> 0.4.3
+
+---
+ pkgs/applications/misc/mupdf/default.nix             | 10 ++++++----
+ pkgs/applications/misc/zathura/pdf-mupdf/default.nix |  4 ++--
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
+index 0f2ec9f39f23..c3beca98aecf 100644
+--- a/pkgs/applications/misc/mupdf/default.nix
++++ b/pkgs/applications/misc/mupdf/default.nix
+@@ -60,15 +60,15 @@ let
+ 
+ in
+ stdenv.mkDerivation rec {
+-  version = "1.23.6";
++  version = "1.24.8";
+   pname = "mupdf";
+ 
+   src = fetchurl {
+     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
+-    sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck=";
++    sha256 = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg=";
+   };
+ 
+-  patches = [ ./0001-Use-command-v-in-favor-of-which.patch
++  patches = [
+               ./0002-Add-Darwin-deps.patch
+               ./0003-Fix-cpp-build.patch
+             ];
+@@ -165,6 +165,8 @@ stdenv.mkDerivation rec {
+     Cflags: -I\''${includedir}
+     EOF
+ 
++    cp $out/lib/libmupdf.so* $out/lib/libmupdf.so
++
+     moveToOutput "bin" "$bin"
+   '' + (lib.optionalString (stdenv.isDarwin) ''
+     for exe in $bin/bin/*; do
+@@ -172,7 +174,7 @@ stdenv.mkDerivation rec {
+     done
+   '') + (lib.optionalString (enableX11 || enableGL) ''
+     mkdir -p $bin/share/icons/hicolor/48x48/apps
+-    cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps
++    cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps
+   '') + (if enableGL then ''
+     ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
+   '' else lib.optionalString (enableX11) ''
+diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+index b3b5d514a84c..7c59616e4ff3 100644
+--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
++++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+@@ -21,12 +21,12 @@
+ }:
+ 
+ stdenv.mkDerivation rec {
+-  version = "0.4.2";
++  version = "0.4.3";
+   pname = "zathura-pdf-mupdf";
+ 
+   src = fetchurl {
+     url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+-    hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM=";
++    hash = "sha256-jM+E7gh+pyqOiLsvJanAELrqJhzrUsw/cyq60l93Z3Y=";
+   };
+ 
+   nativeBuildInputs = [
+-- 
+2.45.2