summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-01 18:01:01 +0000
committerGitHub <noreply@github.com>2023-11-01 18:01:01 +0000
commitcd7af6170bf16a4935e2729594ebfc7f03760ec8 (patch)
tree0fab6b4d9518da1d8238f2365bfae676a94a7a4e /maintainers
parentd07f6b7c345d3565a83dc2fb683c9aa9fa2c3b4f (diff)
parent6b6bb56d412fec32860dbd35310a622f84119f5f (diff)
downloadnixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar.gz
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar.bz2
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar.lz
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar.xz
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.tar.zst
nixpkgs-cd7af6170bf16a4935e2729594ebfc7f03760ec8.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f1a5dece6d8..e27d8db9b16 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3055,6 +3055,9 @@
     email = "chayleaf-nix@pavluk.org";
     github = "chayleaf";
     githubId = 9590981;
+    keys = [{
+      fingerprint = "4314 3701 154D 9E5F 7051  7ECF 7817 1AD4 6227 E68E";
+    }];
     matrix = "@chayleaf:matrix.pavluk.org";
     name = "Anna Pavlyuk";
   };
@@ -12123,6 +12126,14 @@
     github = "MrTarantoga";
     githubId = 53876219;
   };
+  mrtnvgr = {
+    name = "Egor Martynov";
+    github = "mrtnvgr";
+    githubId = 48406064;
+    keys = [{
+      fingerprint = "6FAD DB43 D5A5 FE52 6835  0943 5B33 79E9 81EF 48B1";
+    }];
+  };
   mrVanDalo = {
     email = "contact@ingolf-wagner.de";
     github = "mrVanDalo";