From 687b46d1eb812daa171c8ca858575de65b762b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Fri, 29 May 2026 19:10:03 +0300
Subject: [PATCH 1/2] maintainers: add dshatz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index baf912a567cf..ca36ed670ad8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7366,6 +7366,13 @@
     github = "DSeeLP";
     githubId = 46624152;
   };
+  dshatz = {
+    email = "dev@dshatz.com";
+    github = "dshatz";
+    githubId = 23437798;
+    name = "Daniels Šatcs";
+    keys = [ { fingerprint = "7452B4B47EA8F6635AB545CA4B974CC26375BB06"; } ];
+  };
   dsluijk = {
     name = "Dany Sluijk";
     email = "nix@dany.dev";

From 9f49d219bfcd63b65f724005e322b0b85cd81809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Fri, 29 May 2026 16:14:37 +0300
Subject: [PATCH 2/2] python3Packages.adbutils: init at 2.12.0

---
 .../python-modules/adbutils/default.nix       | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbutils/default.nix

diff --git a/pkgs/development/python-modules/adbutils/default.nix b/pkgs/development/python-modules/adbutils/default.nix
new file mode 100644
index 000000000000..61787192397b
--- /dev/null
+++ b/pkgs/development/python-modules/adbutils/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  setuptools,
+  fetchFromGitHub,
+  pytestCheckHook,
+  requests,
+  deprecation,
+  retry2,
+  pillow,
+  pbr,
+  stdenv,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbutils";
+  version = "2.12.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "openatx";
+    repo = "adbutils";
+    tag = finalAttrs.version;
+    hash = "sha256-zJz4fBekKOUeqBBfBPgGnHXVEKddelqReAQ2CEblObs=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  env = {
+    PBR_VERSION = finalAttrs.version;
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  dependencies = [
+    pbr
+    deprecation
+    pillow
+    requests
+    retry2
+  ];
+
+  pythonImportsCheck = [ "adbutils" ];
+
+  meta = {
+    description = "Pure python adb library for google adb service";
+    homepage = "https://github.com/openatx/adbutils";
+    changelog = "https://github.com/openatx/adbutils/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dshatz ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdd6de621e08..d765c05825eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -85,6 +85,8 @@ self: super: with self; {
 
   adblock = callPackage ../development/python-modules/adblock { };
 
+  adbutils = callPackage ../development/python-modules/adbutils { };
+
   add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { };
 
   addict = callPackage ../development/python-modules/addict { };