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-08 12:01:52 +0000
committerGitHub <noreply@github.com>2023-10-08 12:01:52 +0000
commit81871f4c87a029aa89e9e9f58037ab2bc50baf0b (patch)
tree0503b9eba37e27fbd54e8cdd749180eb06b5e75b /maintainers/maintainer-list.nix
parent187f681cb4921d413ad940834baab18654cb0f9a (diff)
parent0b4a97a07f72bcf265034e5e2d95d6fa02e694a7 (diff)
downloadnixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.gz
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.bz2
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.lz
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.xz
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.zst
nixpkgs-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.zip
Merge staging-next into staging
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r--maintainers/maintainer-list.nix18
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 91f9454a437..f3b7925667f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8039,6 +8039,12 @@
     githubId = 854319;
     name = "Matt McHenry";
   };
+  jerrysm64 = {
+    email = "jerry.starke@icloud.com";
+    github = "jerrysm64";
+    githubId = 42114389;
+    name = "Jerry Starke";
+  };
   jeschli = {
     email = "jeschli@gmail.com";
     github = "0mbi";
@@ -8542,6 +8548,12 @@
     github = "jorsn";
     githubId = 4646725;
   };
+  joscha = {
+    name = "Joscha Loos";
+    email = "j.loos@posteo.net";
+    github = "jooooscha";
+    githubId = 57965027;
+  };
   josephst = {
     name = "Joseph Stahl";
     email = "hello@josephstahl.com";
@@ -8584,6 +8596,12 @@
     githubId = 1918771;
     name = "Joe Doyle";
   };
+  jpentland = {
+    email = "joe.pentland@gmail.com";
+    github = "jpentland";
+    githubId = 1135582;
+    name = "Joe Pentland";
+  };
   jperras = {
     email = "joel@nerderati.com";
     github = "jperras";