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>2023-10-28 18:00:57 +0000
committerGitHub <noreply@github.com>2023-10-28 18:00:57 +0000
commit52b6b902433085b135c30c8024e0c5c28ed757c5 (patch)
treefe9c934e2ad002d1035b968722a12405cbb55e8d /maintainers/maintainer-list.nix
parent223afab31f02a156627ce5918a083e0a8ef3b8be (diff)
parentd59ba91d5a8687a8872ce4941ef23533fc2aa009 (diff)
downloadnixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar.gz
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar.bz2
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar.lz
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar.xz
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.tar.zst
nixpkgs-52b6b902433085b135c30c8024e0c5c28ed757c5.zip
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r--maintainers/maintainer-list.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bc4ae7bdb7c..15c82e4c67c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1771,12 +1771,6 @@
     githubId = 1217745;
     name = "Aldwin Vlasblom";
   };
-  aveltras = {
-    email = "romain.viallard@outlook.fr";
-    github = "aveltras";
-    githubId = 790607;
-    name = "Romain Viallard";
-  };
   averelld = {
     email = "averell+nixos@rxd4.com";
     github = "averelld";
@@ -7884,6 +7878,12 @@
     githubId = 2212681;
     name = "Jakub Grzgorz SokoĊ‚owski";
   };
+  jakuzure = {
+    email = "shin@posteo.jp";
+    github = "jakuzure";
+    githubId = 11823547;
+    name = "jakuzure";
+  };
   jali-clarke = {
     email = "jinnah.ali-clarke@outlook.com";
     name = "Jinnah Ali-Clarke";