about 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-12-21 06:01:01 +0000
committerGitHub <noreply@github.com>2023-12-21 06:01:01 +0000
commit459873d8d6492b492ca7f9b03d5a50117099abfa (patch)
tree21225650967d645a416f2fa1b38298733e5d466b /maintainers
parent63203647a1b4a4aac56cee091f430e07d50afb67 (diff)
parentd6863cbcbbb80e71cecfc03356db1cda38919523 (diff)
downloadnixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar.gz
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar.bz2
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar.lz
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar.xz
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.tar.zst
nixlib-459873d8d6492b492ca7f9b03d5a50117099abfa.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 59e1abdcd579..792f432607be 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4240,6 +4240,12 @@
       fingerprint = "B26F 9AD8 DA20 3392 EF87  C61A BB99 9F83 D9A1 9A36";
     }];
   };
+  dblsaiko = {
+    email = "me@dblsaiko.net";
+    github = "2xsaiko";
+    githubId = 3987560;
+    name = "Marco Rebhan";
+  };
   dbohdan = {
     email = "dbohdan@dbohdan.com";
     github = "dbohdan";
@@ -6773,6 +6779,10 @@
     githubId = 1447245;
     name = "Robin Gloster";
   };
+  gm6k = {
+    email = "nix@quidecco.pl";
+    name = "Isidor Zeuner";
+  };
   gmemstr = {
     email = "git@gmem.ca";
     github = "gmemstr";
@@ -9041,6 +9051,12 @@
     githubId = 752510;
     name = "Martin Potier";
   };
+  jpts = {
+    email = "james+nixpkgs@cleverley-prance.uk";
+    github = "jpts";
+    githubId = 5352661;
+    name = "James Cleverley-Prance";
+  };
   jqqqqqqqqqq = {
     email = "jqqqqqqqqqq@gmail.com";
     github = "jqqqqqqqqqq";