about summary refs log tree commit diff
path: root/maintainers/maintainer-list.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-05 00:12:06 +0000
committerGitHub <noreply@github.com>2024-03-05 00:12:06 +0000
commit1ad8409e69bd168fbcffb57af8102eaaee4adfa3 (patch)
tree462cf7048f7d4f10d3c31d2222ac9c1937c6ec07 /maintainers/maintainer-list.nix
parent51a22900610b3ba34ee976e56a5ce31954d1adf1 (diff)
parent788f65a3d7fdd14bdecf975fd45a9cfd04e367c8 (diff)
downloadnixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar.gz
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar.bz2
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar.lz
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar.xz
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.tar.zst
nixlib-1ad8409e69bd168fbcffb57af8102eaaee4adfa3.zip
Merge master into haskell-updates
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r--maintainers/maintainer-list.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 766232b7e7f6..8493923b8ed4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -681,7 +681,7 @@
   };
   ajs124 = {
     email = "nix@ajs124.de";
-    matrix = "@andreas.schraegle:helsinki-systems.de";
+    matrix = "@ajs124:ajs124.de";
     github = "ajs124";
     githubId = 1229027;
     name = "Andreas Schrägle";
@@ -9142,6 +9142,12 @@
     githubId = 8900;
     name = "Johan Magnus Jonsson";
   };
+  jmarmstrong1207 = {
+    name = "James Armstrong";
+    email = "jm.armstrong1207@gmail.com";
+    github = "jmarmstrong1207";
+    githubId = 32995055;
+  };
   jmbaur = {
     email = "jaredbaur@fastmail.com";
     github = "jmbaur";