From 43555b34363a372a0ac2051808d7c70f0599bf99 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Wed, 13 Sep 2023 23:22:07 +0800
Subject: [PATCH] mfoc-hardnested: unstable-2021-08-14 -> unstable-2023-03-27

- Migrate to by-name hierarchy
- Use the finalAttrs pattern for easier overrides
- Fix build on aarch64-darwin
---
 pkgs/by-name/mf/mfoc-hardnested/package.nix   | 38 +++++++++++++++++++
 .../security/mfoc-hardnested/default.nix      | 25 ------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/by-name/mf/mfoc-hardnested/package.nix
 delete mode 100644 pkgs/tools/security/mfoc-hardnested/default.nix

diff --git a/pkgs/by-name/mf/mfoc-hardnested/package.nix b/pkgs/by-name/mf/mfoc-hardnested/package.nix
new file mode 100644
index 000000000000..550d3a5c4667
--- /dev/null
+++ b/pkgs/by-name/mf/mfoc-hardnested/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libnfc
+, xz
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mfoc-hardnested";
+  version = "unstable-2023-03-27";
+
+  src = fetchFromGitHub {
+    owner = "nfc-tools";
+    repo = finalAttrs.pname;
+    rev = "a6007437405a0f18642a4bbca2eeba67c623d736";
+    hash = "sha256-YcUMS4wx5ML4yYiARyfm7T7nLomgG9YCSFj+ZUg5XZk=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libnfc
+    xz
+  ];
+
+  meta = with lib; {
+    description = "A fork of mfoc integrating hardnested code from the proxmark";
+    license = licenses.gpl2;
+    homepage = "https://github.com/nfc-tools/mfoc-hardnested";
+    maintainers = with maintainers; [ azuwis ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/security/mfoc-hardnested/default.nix b/pkgs/tools/security/mfoc-hardnested/default.nix
deleted file mode 100644
index ee6d5a3dd30f..000000000000
--- a/pkgs/tools/security/mfoc-hardnested/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnfc, xz }:
-
-stdenv.mkDerivation rec {
-  pname = "mfoc-hardnested";
-  version = "unstable-2021-08-14";
-
-  src = fetchFromGitHub {
-    owner = "nfc-tools";
-    repo = pname;
-    rev = "2c25bf05a0b13827b9d06382c5d384b2e5c88238";
-    hash = "sha256-fhfevQCw0E5TorHx61Vltpmv7DAjgH73i27O7aBKxz4=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ libnfc xz ];
-
-  meta = with lib; {
-    description = "A fork of mfoc integrating hardnested code from the proxmark";
-    license = licenses.gpl2;
-    homepage = "https://github.com/nfc-tools/mfoc-hardnested";
-    maintainers = with maintainers; [ azuwis ];
-    platforms = platforms.unix;
-    broken = (stdenv.isDarwin && stdenv.isAarch64); # Undefined symbols "_memalign" referenced
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cc291e0cd63..3294f4d399aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10793,8 +10793,6 @@ with pkgs;
 
   mfoc = callPackage ../tools/security/mfoc { };
 
-  mfoc-hardnested = callPackage ../tools/security/mfoc-hardnested { };
-
   microbin = callPackage ../servers/microbin { };
 
   microdnf = callPackage ../tools/package-management/microdnf { };