diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-18 23:23:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-18 23:23:38 +0200 |
commit | f73b762f53cf7301d7e0877456a086e7868cea7b (patch) | |
tree | 9bee291ab3ca3c84f2443956af79a67c0261371b /pkgs | |
parent | 84863007421fe887aec1d2e9600aa1e436fd98d7 (diff) | |
parent | 43555b34363a372a0ac2051808d7c70f0599bf99 (diff) |
Merge pull request #254971 from azuwis/mfoc-hardnested
mfoc-hardnested: unstable-2021-08-14 -> unstable-2023-03-27
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/mf/mfoc-hardnested/package.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/security/mfoc-hardnested/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 38 insertions, 27 deletions
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 0000000000000..550d3a5c46677 --- /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 ee6d5a3dd30f7..0000000000000 --- 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 715fabe0ab389..71ee2bca43f0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10796,8 +10796,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 { }; |