From 8bc1cf44b41b7e439852eda6e26720d9f841208f Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Fri, 17 Oct 2025 22:28:35 +0100
Subject: [PATCH 1/2] maintainers: add yuannan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a07d0e41b379..b394fa06412e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28662,6 +28662,12 @@
     githubId = 7040031;
     name = "Yannik Sander";
   };
+  yuannan = {
+    email = "brandon@emergence.ltd";
+    github = "yuannan";
+    githubId = 8006928;
+    name = "Yuannan (Brandon) Lin";
+  };
   yuka = {
     email = "yuka@yuka.dev";
     matrix = "@yuka:yuka.dev";

From ca4788621e326697de2f0bad02224022f854282f Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Fri, 17 Oct 2025 22:35:11 +0100
Subject: [PATCH 2/2] dislocker: 0.7.3 -> 0.7.3-unstable-2025-09-07

---
 pkgs/by-name/di/dislocker/package.nix | 41 +++++++--------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index 72984a914545..a0f844006471 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -2,53 +2,31 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
-  mbedtls_2,
-  fuse,
+  fuse3,
+  mbedtls,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dislocker";
-  version = "0.7.3";
+  version = "0.7.3-unstable-2025-09-07";
 
   src = fetchFromGitHub {
     owner = "Aorimn";
     repo = "dislocker";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-U8BD3kE1CH+Mjh/7SlXG9gKY6/LyF9+ER5C3soNGZqo=";
+    rev = "4ff070f0ea9e56948ab316fb76b91f54dd6727aa";
+    hash = "sha256-hrIt5D9YjBWs0Q9chWGQM2bo1SZ7qLCd898zFHWWcqA=";
   };
 
-  patches = [
-    # This patch
-    #   1. adds support for the latest FUSE on macOS
-    #   2. uses pkg-config to find libfuse instead of searching in predetermined
-    #      paths
-    #
-    # https://github.com/Aorimn/dislocker/pull/246
-    (fetchpatch {
-      name = "feat-support-the-latest-FUSE-on-macOS.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.patch";
-      hash = "sha256-JX+4DJLcw9qP1nIs+sZDcduSFvU4YdGyblFLtxZj/i4=";
-    })
-    # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html)
-    # https://github.com/Aorimn/dislocker/pull/346
-    (fetchpatch {
-      name = "cmake-raise-minimum-required-version-to-3.5.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/337d05dc7447436539f2fb481eef0e528a000b66.patch";
-      hash = "sha256-6LTRjaZfyGS2BCdpcJy/qo0r8soXJSZqWjZRbaKvcQk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
   buildInputs = [
-    fuse
-    mbedtls_2
+    fuse3
+    mbedtls
   ];
 
   meta = {
@@ -56,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Aorimn/dislocker";
     changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = with lib.maintainers; [
+      elitak
+      yuannan
+    ];
     platforms = lib.platforms.unix;
   };
 })