about summary refs log tree commit diff
path: root/nixpkgs/maintainers
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-10-22 08:39:18 +0000
committerAlyssa Ross <hi@alyssa.is>2023-10-22 08:39:18 +0000
commit403acf82248d3cdbc0beda0c5c373c1b46b9b636 (patch)
treee3913fd47e374b9525858fa1e61064fd1113e475 /nixpkgs/maintainers
parentb5faee77a2dceb31545db209ebee1476acb71198 (diff)
parent8dfad603247387df1df4826b8bea58efc5d012d8 (diff)
downloadnixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.gz
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.bz2
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.lz
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.xz
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.zst
nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.zip
Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8'
Diffstat (limited to 'nixpkgs/maintainers')
-rw-r--r--nixpkgs/maintainers/maintainer-list.nix20
1 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix
index 36183e351999..403e2841839b 100644
--- a/nixpkgs/maintainers/maintainer-list.nix
+++ b/nixpkgs/maintainers/maintainer-list.nix
@@ -6199,6 +6199,16 @@
     githubId = 45048741;
     name = "Alwanga Oyango";
   };
+  galaxy = {
+    email = "galaxy@dmc.chat";
+    matrix = "@galaxy:mozilla.org";
+    name = "The Galaxy";
+    github = "ga1aksy";
+    githubId = 148551648;
+    keys = [{
+      fingerprint = "48CA 3873 9E9F CA8E 76A0  835A E3DE CF85 4212 E1EA";
+    }];
+  };
   gal_bolle = {
     email = "florent.becker@ens-lyon.org";
     github = "FlorentBecker";
@@ -13664,6 +13674,12 @@
     githubId = 152312;
     name = "Periklis Tsirakidis";
   };
+  perstark = {
+    email = "perstark.se@gmail.com";
+    github = "perstarkse";
+    githubId = 63069986;
+    name = "Per Stark";
+  };
   petercommand = {
     email = "petercommand@gmail.com";
     github = "petercommand";
@@ -17883,6 +17899,10 @@
     githubId = 13155277;
     name = "Tom Houle";
   };
+  tomkoid = {
+    email = "tomaszierl@outlook.com";
+    name = "Tomkoid";
+  };
   tomodachi94 = {
     email = "tomodachi94+nixpkgs@protonmail.com";
     matrix = "@tomodachi94:matrix.org";