From a1c13faae260c85b55415821319510713504571b Mon Sep 17 00:00:00 2001
From: Sokhibjon Orzikulov <sakhib@orzklv.uz>
Date: Sun, 11 Jan 2026 14:35:05 +0500
Subject: [PATCH] teams/uzinfocom: drop and replace team with induvidual
 maintainers

---
 maintainers/team-list.nix                  | 11 -----------
 nixos/modules/services/security/e-imzo.nix |  7 ++++++-
 pkgs/by-name/e-/e-imzo-manager/package.nix |  7 ++++++-
 pkgs/by-name/e-/e-imzo/package.nix         |  7 ++++++-
 pkgs/by-name/hu/hunspell/dictionaries.nix  |  7 ++++++-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..3611f3d18637 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -961,17 +961,6 @@ with lib.maintainers;
     shortName = "coqui-ai TTS";
   };
 
-  uzinfocom = {
-    members = [
-      orzklv
-      bahrom04
-      bemeritus
-      shakhzodkudratov
-    ];
-    scope = "Maintain Uzbek Linux state & community packages and modules.";
-    shortName = "Uzinfocom Open Source";
-  };
-
   wdz = {
     members = [
       n0emis
diff --git a/nixos/modules/services/security/e-imzo.nix b/nixos/modules/services/security/e-imzo.nix
index d710cc9ac012..346fd2986246 100644
--- a/nixos/modules/services/security/e-imzo.nix
+++ b/nixos/modules/services/security/e-imzo.nix
@@ -46,5 +46,10 @@ in
     };
   };
 
-  meta.maintainers = lib.teams.uzinfocom.members;
+  meta.maintainers = with lib.maintainers; [
+    orzklv
+    shakhzodkudratov
+    bahrom04
+    bemeritus
+  ];
 }
diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix
index 0f44d22a597c..1ec13b8ae07a 100644
--- a/pkgs/by-name/e-/e-imzo-manager/package.nix
+++ b/pkgs/by-name/e-/e-imzo-manager/package.nix
@@ -77,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "GTK application for managing E-IMZO keys";
     license = with lib.licenses; [ agpl3Plus ];
     platforms = lib.platforms.linux;
-    teams = [ lib.teams.uzinfocom ];
+    maintainers = with lib.maintainers; [
+      orzklv
+      shakhzodkudratov
+      bahrom04
+      bemeritus
+    ];
   };
 })
diff --git a/pkgs/by-name/e-/e-imzo/package.nix b/pkgs/by-name/e-/e-imzo/package.nix
index 623f391ce77a..4802be75b48e 100644
--- a/pkgs/by-name/e-/e-imzo/package.nix
+++ b/pkgs/by-name/e-/e-imzo/package.nix
@@ -49,6 +49,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://e-imzo.soliq.uz";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    teams = [ lib.teams.uzinfocom ];
+    maintainers = with lib.maintainers; [
+      orzklv
+      shakhzodkudratov
+      bahrom04
+      bemeritus
+    ];
   };
 })
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 56b04d1ead2b..25827082149d 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -844,7 +844,12 @@ rec {
       license = with lib.licenses; [
         gpl3Plus
       ];
-      teams = [ lib.teams.uzinfocom ];
+      maintainers = with lib.maintainers; [
+        orzklv
+        shakhzodkudratov
+        bahrom04
+        bemeritus
+      ];
     };
   };