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-01-09 00:14:37 +0000
committerGitHub <noreply@github.com>2023-01-09 00:14:37 +0000
commitfb50c4dbba6e718666f2c964402e58bf853c75bc (patch)
tree4cbad8db173331ec41befc1c5dd6484626521e44 /maintainers
parent43af53bc7f49b3c542604ddae08cbdb61a276c2b (diff)
parent4769274f53e6ccf1512da30c20e26952633f8b59 (diff)
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a8888b9cc74fd..169663a2f5730 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4647,10 +4647,11 @@
   };
   felipeqq2 = {
     name = "Felipe Silva";
-    email = "felipeqq2@outlook.com";
+    email = "nixpkgs@felipeqq2.rocks";
     github = "felipeqq2";
     githubId = 71830138;
     keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A  AA8C 2FD3 4A9E 2671 91B8"; }];
+    matrix = "@felipeqq2:pub.solar";
   };
   felixscheinost = {
     name = "Felix Scheinost";
@@ -13320,6 +13321,12 @@
     githubId = 6362238;
     name = "Christoph Honal";
   };
+  stasjok = {
+    name = "Stanislav Asunkin";
+    email = "nixpkgs@stasjok.ru";
+    github = "stasjok";
+    githubId = 1353637;
+  };
   steamwalker = {
     email = "steamwalker@xs4all.nl";
     github = "steamwalker";