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-04-25 00:12:16 +0000
committerGitHub <noreply@github.com>2023-04-25 00:12:16 +0000
commit6b4c504b91f70741eeb6b669bde40222c5fcfad0 (patch)
treed918b5a451a624319836be4ed2121f57704ad27f /maintainers
parenta3617cb0aa693bbd508101931a9f64c031d75bea (diff)
parentde91114b6178d85db143d846228edd1d5c1e19d6 (diff)
downloadnixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar.gz
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar.bz2
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar.lz
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar.xz
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.tar.zst
nixpkgs-6b4c504b91f70741eeb6b669bde40222c5fcfad0.zip
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix24
1 files changed, 24 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d23e6ae18c3..fb7af9a05e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5592,6 +5592,12 @@
       fingerprint = "D0CF 440A A703 E0F9 73CB  A078 82BB 70D5 41AE 2DB4";
     }];
   };
+  geri1701 = {
+    email = "geri@sdf.org";
+    github = "geri1701";
+    githubId = 67984144;
+    name = "Gerhard Schwanzer";
+  };
   gerschtli = {
     email = "tobias.happ@gmx.de";
     github = "Gerschtli";
@@ -6118,6 +6124,12 @@
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
+  hellwolf = {
+    email = "zhicheng.miao@gmail.com";
+    github = "hellwolf";
+    githubId = 186660;
+    name = "Miao, ZhiCheng";
+  };
   henkery = {
     email = "jim@reupload.nl";
     github = "henkery";
@@ -11795,6 +11807,12 @@
     githubId = 11016164;
     name = "Fedor Pakhomov";
   };
+  pallix = {
+    email = "pierre.allix.work@gmail.com";
+    github = "pallix";
+    githubId = 676838;
+    name = "Pierre Allix";
+  };
   paluh = {
     email = "paluho@gmail.com";
     github = "paluh";
@@ -11983,6 +12001,12 @@
     githubId = 920910;
     name = "peelz";
   };
+  pelme = {
+    email = "andreas@pelme.se";
+    github = "pelme";
+    githubId = 20529;
+    name = "Andreas Pelme";
+  };
   penalty1083 = {
     email = "penalty1083@outlook.com";
     github = "penalty1083";