diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5db08cf0f594..0f7d83033528 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2737,6 +2737,12 @@ githubId = 31864305; name = "William Hai"; }; + bahrom04 = { + name = "Baxrom Raxmatov"; + email = "magdiyevbahrom@gmail.com"; + github = "bahrom04"; + githubId = 116780481; + }; baileylu = { name = "Luke Bailey"; email = "baileylu@tcd.ie"; @@ -3034,6 +3040,12 @@ githubId = 32039602; keys = [ { fingerprint = "2B46 58FF 887A 8366 F88B BE92 CF83 0BB3 B973 9A6A"; } ]; }; + bemeritus = { + name = "Shohrux Rasulov"; + email = "bemerituss@gmail.com"; + github = "bemeritus"; + githubId = 175357618; + }; ben9986 = { name = "Ben Carmichael"; email = "ben9986.unvmn@passinbox.com"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0a710c3dd49f..6cbbf8f719e1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1252,6 +1252,16 @@ with lib.maintainers; shortName = "coqui-ai TTS"; }; + uzinfocom = { + members = [ + orzklv + bahrom04 + bemeritus + ]; + scope = "Maintain Uzbek Linux state & community packages and modules."; + shortName = "Uzinfocom Open Source"; + }; + windows = { members = [ RossSmyth diff --git a/nixos/modules/services/security/e-imzo.nix b/nixos/modules/services/security/e-imzo.nix index 1423f3ec9596..d710cc9ac012 100644 --- a/nixos/modules/services/security/e-imzo.nix +++ b/nixos/modules/services/security/e-imzo.nix @@ -46,5 +46,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ orzklv ]; + meta.maintainers = lib.teams.uzinfocom.members; } diff --git a/pkgs/by-name/e-/e-imzo/package.nix b/pkgs/by-name/e-/e-imzo/package.nix index bc4fc51ae611..d104833b269c 100644 --- a/pkgs/by-name/e-/e-imzo/package.nix +++ b/pkgs/by-name/e-/e-imzo/package.nix @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://e-imzo.soliq.uz"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ orzklv ]; + teams = [ lib.teams.uzinfocom ]; }; })