From 53d0f0af89c3cf43137cb033ee9ba7cd27833f7f Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 22 Mar 2026 21:49:16 +0000
Subject: [PATCH 1/2] maintainers: add tbutter

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5ad86c2b1db6..16032d74aaea 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26584,6 +26584,12 @@
     githubId = 156964;
     name = "Thomas Boerger";
   };
+  tbutter = {
+    email = "tbutter@gmail.com";
+    github = "tbutter";
+    githubId = 1336537;
+    name = "Thomas Butter";
+  };
   tc-kaluza = {
     github = "tc-kaluza";
     githubId = 101565936;

From b37c629e35a7db874d12778e4b367d179dd5b689 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Thu, 16 Apr 2026 18:33:44 +0000
Subject: [PATCH 2/2] avfs: 1.2.0 -> 1.3.0

---
 pkgs/by-name/av/avfs/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix
index 26aa23980605..0a01dd6b4f6d 100644
--- a/pkgs/by-name/av/avfs/package.nix
+++ b/pkgs/by-name/av/avfs/package.nix
@@ -5,14 +5,15 @@
   pkg-config,
   fuse,
   xz,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "avfs";
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchurl {
     url = "mirror://sourceforge/avf/${finalAttrs.version}/avfs-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-olqOxDwe4XJiThpMec5mobkwhBzbVFtyXx7GS8q+iJw=";
+    sha256 = "sha256-B81p1MDH7QgOgP8EDZgChkBa04pEP9xS3Dle/vEcRLE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -20,19 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fuse
     xz
+    zlib
   ];
 
   configureFlags = [
     "--enable-library"
     "--enable-fuse"
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-system-zlib";
 
   meta = {
     homepage = "https://avf.sourceforge.net/";
     description = "Virtual filesystem that allows browsing of compressed files";
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;
-    # The last successful Darwin Hydra build was in 2024
-    broken = stdenv.hostPlatform.isDarwin;
+    maintainers = with lib.maintainers; [ tbutter ];
   };
 })