From aa36c7759ddb65fb8a39cc252b362e913038e432 Mon Sep 17 00:00:00 2001
From: kpcyrd <git@rxv.cc>
Date: Wed, 11 Dec 2024 10:21:51 +0100
Subject: [PATCH 1/2] maintainers: add kpcyrd

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9a4e26d944d6..cfd7945e8a76 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11993,6 +11993,12 @@
     githubId = 1903418;
     name = "Kovacsics Robert";
   };
+  kpcyrd = {
+    email = "git@rxv.cc";
+    github = "kpcyrd";
+    githubId = 7763184;
+    name = "kpcyrd";
+  };
   kquick = {
     email = "quick@sparq.org";
     github = "kquick";

From a9cbefabf37dcaa9e313f172f276be28ab1062ed Mon Sep 17 00:00:00 2001
From: kpcyrd <git@rxv.cc>
Date: Wed, 11 Dec 2024 15:30:40 +0100
Subject: [PATCH 2/2] spytrap-adb: init at 0.3.3

---
 pkgs/by-name/sp/spytrap-adb/package.nix | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/sp/spytrap-adb/package.nix

diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix
new file mode 100644
index 000000000000..4f619f13e486
--- /dev/null
+++ b/pkgs/by-name/sp/spytrap-adb/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  android-tools,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "spytrap-adb";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "spytrap-org";
+    repo = "spytrap-adb";
+    tag = "v${version}";
+    hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E=";
+  };
+
+  cargoHash = "sha256-Utg3ds0nGAUjBfuEjGfkohkmssKIZT1NiH9hiFnW4ps=";
+
+  env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb";
+
+  meta = {
+    description = "Test a phone for stalkerware using adb and usb debugging to scan for suspicious apps and configuration";
+    homepage = "https://github.com/spytrap-org/spytrap-adb";
+    changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${version}";
+    mainProgram = "spytrap-adb";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ kpcyrd ];
+    platforms = lib.platforms.all;
+  };
+}