From 9c7c3e3836268f6b9be9173e3c1ea1eb7c51711a Mon Sep 17 00:00:00 2001 From: nyanotech Date: Thu, 13 Nov 2025 10:51:00 -0800 Subject: [PATCH] proxmark3: 4.20469 -> 4.20728 --- .../security/proxmark3/darwin-always-gui.patch | 13 ------------- pkgs/tools/security/proxmark3/default.nix | 13 +++++-------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/security/proxmark3/darwin-always-gui.patch diff --git a/pkgs/tools/security/proxmark3/darwin-always-gui.patch b/pkgs/tools/security/proxmark3/darwin-always-gui.patch deleted file mode 100644 index 99c4495e9661..000000000000 --- a/pkgs/tools/security/proxmark3/darwin-always-gui.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c -index 6c77bfad3..0d41a2d6b 100644 ---- a/client/src/proxmark3.c -+++ b/client/src/proxmark3.c -@@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) { - - #ifdef HAVE_GUI - --# if defined(_WIN32) -+# if defined(_WIN32) || (defined(__MACH__) && defined(__APPLE__)) - InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop); - MainGraphics(); - # else diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index c927ca5b7743..4b0c8e646c05 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -13,6 +13,7 @@ lua, lz4, udevCheckHook, + nix-update-script, withGui ? true, wrapQtAppsHook, qtbase, @@ -30,21 +31,15 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "proxmark3"; - version = "4.20469"; + version = "4.20728"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z87YCuNWQ66FTAq7qXUYKI25BEWrXD+YK0GczDmWc9A="; + hash = "sha256-dmWPi5xOcXXdvUc45keXGUNhYmQEzAHbKexpDOwIHhE="; }; - patches = [ - # Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if - # XQuartz is installed, however it is not actually required for GUI features - ./darwin-always-gui.patch - ]; - postPatch = '' # Remove hardcoded paths on Darwin substituteInPlace Makefile.defs \ @@ -91,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; homepage = "https://github.com/RfidResearchGroup/proxmark3";