about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix2651
-rw-r--r--maintainers/scripts/check-maintainers-sorted.nix57
-rwxr-xr-xmaintainers/scripts/fetch-kde-qt.sh3
-rw-r--r--maintainers/scripts/haskell/dependencies.nix2
-rwxr-xr-xmaintainers/scripts/haskell/hydra-report.hs4
-rw-r--r--maintainers/scripts/luarocks-packages.csv3
-rw-r--r--maintainers/team-list.nix1
7 files changed, 1490 insertions, 1231 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ce149da00d08..6f3a6a7562f9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -112,11 +112,23 @@
     github = "1000teslas";
     githubId = 47207223;
   };
+  _13r0ck = {
+    name = "Brock Szuszczewicz";
+    email = "bnr@tuta.io";
+    github = "13r0ck";
+    githubId = 58987761;
+  };
   _2gn = {
     name = "Hiram Tanner";
     github = "2gn";
     githubId = 101851090;
   };
+  _360ied = {
+    name = "Brian Zhu";
+    email = "therealbarryplayer@gmail.com";
+    github = "360ied";
+    githubId = 19516527;
+  };
   _3699n = {
     email = "nicholas@nvk.pm";
     github = "3699n";
@@ -129,18 +141,6 @@
     github = "3JlOy-PYCCKUi";
     githubId = 46464602;
   };
-  _360ied = {
-    name = "Brian Zhu";
-    email = "therealbarryplayer@gmail.com";
-    github = "360ied";
-    githubId = 19516527;
-  };
-  _13r0ck = {
-    name = "Brock Szuszczewicz";
-    email = "bnr@tuta.io";
-    github = "13r0ck";
-    githubId = 58987761;
-  };
   _3noch = {
     email = "eacameron@gmail.com";
     github = "3noch";
@@ -206,6 +206,12 @@
     githubId = 22131756;
     name = "Aaqa Ishtyaq";
   };
+  aaronarinder = {
+    email = "aaronarinder@gmail.com";
+    github = "aaronArinder";
+    githubId = 26738844;
+    name = "Aaron Arinder";
+  };
   aaronjanse = {
     email = "aaron@ajanse.me";
     matrix = "@aaronjanse:matrix.org";
@@ -326,6 +332,13 @@
     githubId = 749381;
     name = "Adam Tulinius";
   };
+  addict3d = {
+    email = "nickbathum@gmail.com";
+    matrix = "@nbathum:matrix.org";
+    github = "addict3d";
+    githubId = 49227;
+    name = "Nick Bathum";
+  };
   adelbertc = {
     email = "adelbertc@gmail.com";
     github = "adelbertc";
@@ -338,13 +351,6 @@
     githubId = 1773511;
     name = "Adrien Devresse";
   };
-  addict3d = {
-    email = "nickbathum@gmail.com";
-    matrix = "@nbathum:matrix.org";
-    github = "addict3d";
-    githubId = 49227;
-    name = "Nick Bathum";
-  };
   adisbladis = {
     email = "adisbladis@gmail.com";
     matrix = "@adis:blad.is";
@@ -352,18 +358,18 @@
     githubId = 63286;
     name = "Adam Hose";
   };
-  Adjective-Object = {
-    email = "mhuan13@gmail.com";
-    github = "Adjective-Object";
-    githubId = 1174858;
-    name = "Maxwell Huang-Hobbs";
-  };
   adjacentresearch = {
     email = "nate@adjacentresearch.xyz";
     github = "0xperp";
     githubId = 96147421;
     name = "0xperp";
   };
+  Adjective-Object = {
+    email = "mhuan13@gmail.com";
+    github = "Adjective-Object";
+    githubId = 1174858;
+    name = "Maxwell Huang-Hobbs";
+  };
   adnelson = {
     email = "ithinkican@gmail.com";
     github = "adnelson";
@@ -490,6 +496,12 @@
     githubId = 44871469;
     name = "Etienne Wodey";
   };
+  ajgrf = {
+    email = "a@ajgrf.com";
+    github = "ajgrf";
+    githubId = 10733175;
+    name = "Alex Griffin";
+  };
   ajs124 = {
     email = "nix@ajs124.de";
     matrix = "@andreas.schraegle:helsinki-systems.de";
@@ -497,30 +509,24 @@
     githubId = 1229027;
     name = "Andreas Schrägle";
   };
-  ajgrf = {
-    email = "a@ajgrf.com";
-    github = "ajgrf";
-    githubId = 10733175;
-    name = "Alex Griffin";
-  };
   ak = {
     email = "ak@formalprivacy.com";
     github = "alexanderkjeldaas";
     githubId = 339369;
     name = "Alexander Kjeldaas";
   };
-  akavel = {
-    email = "czapkofan@gmail.com";
-    github = "akavel";
-    githubId = 273837;
-    name = "Mateusz Czapliński";
-  };
   akamaus = {
     email = "dmitryvyal@gmail.com";
     github = "akamaus";
     githubId = 58955;
     name = "Dmitry Vyal";
   };
+  akavel = {
+    email = "czapkofan@gmail.com";
+    github = "akavel";
+    githubId = 273837;
+    name = "Mateusz Czapliński";
+  };
   akaWolf = {
     email = "akawolf0@gmail.com";
     github = "akaWolf";
@@ -533,6 +539,12 @@
     githubId = 1318982;
     name = "Anders Claesson";
   };
+  a-kenji = {
+    email = "aks.kenji@protonmail.com";
+    github = "a-kenji";
+    githubId = 65275785;
+    name = "Alexander Kenji Berthold";
+  };
   akho = {
     name = "Alexander Khodyrev";
     email = "a@akho.name";
@@ -572,6 +584,12 @@
     githubId = 43479487;
     name = "Titouan Biteau";
   };
+  aleksana = {
+    email = "me@aleksana.moe";
+    github = "Aleksanaa";
+    githubId = 42209822;
+    name = "Aleksana QwQ";
+  };
   alekseysidorov = {
     email = "sauron1987@gmail.com";
     github = "alekseysidorov";
@@ -614,6 +632,12 @@
     githubId = 8316672;
     name = "Alex Chapman";
   };
+  alexeyre = {
+    email = "A.Eyre@sms.ed.ac.uk";
+    github = "alexeyre";
+    githubId = 38869148;
+    name = "Alex Eyre";
+  };
   alexfmpe = {
     email = "alexandre.fmp.esteves@gmail.com";
     github = "alexfmpe";
@@ -648,12 +672,6 @@
     githubId = 50754358;
     name = "Alex Winter";
   };
-  alexeyre = {
-    email = "A.Eyre@sms.ed.ac.uk";
-    github = "alexeyre";
-    githubId = 38869148;
-    name = "Alex Eyre";
-  };
   algram = {
     email = "aliasgram@gmail.com";
     github = "Algram";
@@ -672,6 +690,12 @@
     githubId = 36147;
     name = "Alireza Meskin";
   };
+  alizter = {
+    email = "alizter@gmail.com";
+    github = "Alizter";
+    githubId = 8614547;
+    name = "Ali Caglayan";
+  };
   alkasm = {
     email = "alexreynolds00@gmail.com";
     github = "alkasm";
@@ -690,14 +714,11 @@
     githubId = 5892756;
     name = "Alec Snyder";
   };
-  AluisioASG = {
-    name = "Aluísio Augusto Silva Gonçalves";
-    email = "aluisio@aasg.name";
-    github = "AluisioASG";
-    githubId = 1904165;
-    keys = [{
-      fingerprint = "7FDB 17B3 C29B 5BA6 E5A9  8BB2 9FAA 63E0 9750 6D9D";
-    }];
+  almac = {
+    email = "alma.cemerlic@gmail.com";
+    github = "a1mac";
+    githubId = 60479013;
+    name = "Alma Cemerlic";
   };
   Alper-Celik = {
     email = "dev.alpercelik@gmail.com";
@@ -708,18 +729,21 @@
       fingerprint = "6B69 19DD CEE0 FAF3 5C9F  2984 FA90 C0AB 738A B873";
     }];
   };
-  almac = {
-    email = "alma.cemerlic@gmail.com";
-    github = "a1mac";
-    githubId = 60479013;
-    name = "Alma Cemerlic";
-  };
   alternateved = {
     email = "alternateved@pm.me";
     github = "alternateved";
     githubId = 45176912;
     name = "Tomasz Hołubowicz";
   };
+  AluisioASG = {
+    name = "Aluísio Augusto Silva Gonçalves";
+    email = "aluisio@aasg.name";
+    github = "AluisioASG";
+    githubId = 1904165;
+    keys = [{
+      fingerprint = "7FDB 17B3 C29B 5BA6 E5A9  8BB2 9FAA 63E0 9750 6D9D";
+    }];
+  };
   alunduil = {
     email = "alunduil@gmail.com";
     github = "alunduil";
@@ -814,15 +838,6 @@
     githubId = 20530052;
     name = "Andrew Miloradovsky";
   };
-  notbandali = {
-    name = "Amin Bandali";
-    email = "bandali@gnu.org";
-    github = "bandali0";
-    githubId = 1254858;
-    keys = [{
-      fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103";
-    }];
-  };
   aminechikhaoui = {
     email = "amine.chikhaoui91@gmail.com";
     github = "AmineChikhaoui";
@@ -835,12 +850,6 @@
     githubId = 858965;
     name = "Andrew Morsillo";
   };
-  an-empty-string = {
-    name = "Tris Emmy Wilson";
-    email = "tris@tris.fyi";
-    github = "an-empty-string";
-    githubId = 681716;
-  };
   AnatolyPopov = {
     email = "aipopov@live.ru";
     github = "AnatolyPopov";
@@ -914,18 +923,18 @@
     githubId = 587021;
     name = "André V L Matos";
   };
-  andrew-d = {
-    email = "andrew@du.nham.ca";
-    github = "andrew-d";
-    githubId = 1079173;
-    name = "Andrew Dunham";
-  };
   andrewchambers = {
     email = "ac@acha.ninja";
     github = "andrewchambers";
     githubId = 962885;
     name = "Andrew Chambers";
   };
+  andrew-d = {
+    email = "andrew@du.nham.ca";
+    github = "andrew-d";
+    githubId = 1079173;
+    name = "Andrew Dunham";
+  };
   andrewrk = {
     email = "superjoe30@gmail.com";
     github = "andrewrk";
@@ -955,6 +964,12 @@
     githubId = 2085567;
     name = "Aneesh Agrawal";
   };
+  an-empty-string = {
+    name = "Tris Emmy Wilson";
+    email = "tris@tris.fyi";
+    github = "an-empty-string";
+    githubId = 681716;
+  };
   angristan = {
     email = "angristan@pm.me";
     github = "angristan";
@@ -1007,17 +1022,24 @@
     githubId = 750786;
     name = "Justin Wood";
   };
+  anmonteiro = {
+    email = "anmonteiro@gmail.com";
+    github = "anmonteiro";
+    githubId = 661909;
+    name = "Antonio Nuno Monteiro";
+  };
   anna328p = {
     email = "anna328p@gmail.com";
     github = "anna328p";
     githubId = 9790772;
     name = "Anna";
   };
-  anmonteiro = {
-    email = "anmonteiro@gmail.com";
-    github = "anmonteiro";
-    githubId = 661909;
-    name = "Antonio Nuno Monteiro";
+  annaaurora = {
+    email = "anna@annaaurora.eu";
+    matrix = "@papojari:artemislena.eu";
+    github = "auroraanna";
+    githubId = 81317317;
+    name = "Anna Aurora";
   };
   anoa = {
     matrix = "@andrewm:amorgan.xyz";
@@ -1090,6 +1112,12 @@
     githubId = 1078530;
     name = "Alexandre Peyroux";
   };
+  apfelkuchen6 = {
+    email = "apfelkuchen6@hrnz.li";
+    github = "apfelkuchen6";
+    githubId = 73002165;
+    name = "apfelkuchen6";
+  };
   applePrincess = {
     email = "appleprincess@appleprincess.io";
     github = "applePrincess";
@@ -1182,6 +1210,12 @@
     githubId = 10400299;
     name = "Arjan Schrijver";
   };
+  arjix = {
+    email = "arjix@protonmail.com";
+    github = "arjix";
+    githubId = 62168569;
+    name = "arjix";
+  };
   arkivm = {
     email = "vikram186@gmail.com";
     github = "arkivm";
@@ -1245,6 +1279,13 @@
     githubId = 37193992;
     name = "Arthur Teisseire";
   };
+  artturin = {
+    email = "artturin@artturin.com";
+    matrix = "@artturin:matrix.org";
+    github = "Artturin";
+    githubId = 56650223;
+    name = "Artturi N";
+  };
   arturcygan = {
     email = "arczicygan@gmail.com";
     github = "arcz";
@@ -1282,18 +1323,18 @@
     githubId = 9281956;
     name = "ash lea";
   };
-  aske = {
-    email = "aske@fmap.me";
-    github = "aske";
-    githubId = 869771;
-    name = "Kirill Boltaev";
-  };
   ashley = {
     email = "ashley@kira64.xyz";
     github = "kira64xyz";
     githubId = 84152630;
     name = "Ashley Chiara";
   };
+  aske = {
+    email = "aske@fmap.me";
+    github = "aske";
+    githubId = 869771;
+    name = "Kirill Boltaev";
+  };
   asppsa = {
     email = "asppsa@gmail.com";
     github = "asppsa";
@@ -1435,18 +1476,18 @@
     githubId = 790607;
     name = "Romain Viallard";
   };
-  avery = {
-    email = "averyl+nixos@protonmail.com";
-    github = "AveryLychee";
-    githubId = 9147625;
-    name = "Avery Lychee";
-  };
   averelld = {
     email = "averell+nixos@rxd4.com";
     github = "averelld";
     githubId = 687218;
     name = "averelld";
   };
+  avery = {
+    email = "averyl+nixos@protonmail.com";
+    github = "AveryLychee";
+    githubId = 9147625;
+    name = "Avery Lychee";
+  };
   avh4 = {
     email = "gruen0aermel@gmail.com";
     github = "avh4";
@@ -1474,25 +1515,18 @@
     githubId = 206242;
     name = "Andreas Wiese";
   };
+  ayazhafiz = {
+    email = "ayaz.hafiz.1@gmail.com";
+    github = "hafiz";
+    githubId = 262763;
+    name = "Ayaz Hafiz";
+  };
   aycanirican = {
     email = "iricanaycan@gmail.com";
     github = "aycanirican";
     githubId = 135230;
     name = "Aycan iRiCAN";
   };
-  arjix = {
-    email = "arjix@protonmail.com";
-    github = "arjix";
-    githubId = 62168569;
-    name = "arjix";
-  };
-  artturin = {
-    email = "artturin@artturin.com";
-    matrix = "@artturin:matrix.org";
-    github = "Artturin";
-    githubId = 56650223;
-    name = "Artturi N";
-  };
   azahi = {
     name = "Azat Bahawi";
     email = "azat@bahawi.net";
@@ -1503,24 +1537,12 @@
       fingerprint = "2688 0377 C31D 9E81 9BDF  83A8 C8C6 BDDB 3847 F72B";
     }];
   };
-  ayazhafiz = {
-    email = "ayaz.hafiz.1@gmail.com";
-    github = "hafiz";
-    githubId = 262763;
-    name = "Ayaz Hafiz";
-  };
   azuwis = {
     email = "azuwis@gmail.com";
     github = "azuwis";
     githubId = 9315;
     name = "Zhong Jianxin";
   };
-  a-kenji = {
-    email = "aks.kenji@protonmail.com";
-    github = "a-kenji";
-    githubId = 65275785;
-    name = "Alexander Kenji Berthold";
-  };
   b4dm4n = {
     email = "fabianm88@gmail.com";
     github = "B4dM4n";
@@ -1705,6 +1727,12 @@
     githubId = 24027;
     name = "Bruno Bigras";
   };
+  bburdette = {
+    email = "bburdette@protonmail.com";
+    github = "bburdette";
+    githubId = 157330;
+    name = "Ben Burdette";
+  };
   bcarrell = {
     email = "brandoncarrell@gmail.com";
     github = "bcarrell";
@@ -1799,15 +1827,6 @@
     github = "benneti";
     githubId = 11725645;
   };
-  bertof = {
-    name = "Filippo Berto";
-    email = "berto.f@protonmail.com";
-    github = "bertof";
-    githubId = 9915675;
-    keys = [{
-      fingerprint = "17C5 1EF9 C0FE 2EB2 FE56  BB53 FE98 AE5E C52B 1056";
-    }];
-  };
   bennofs = {
     email = "benno.fuenfstueck@gmail.com";
     github = "bennofs";
@@ -1820,6 +1839,12 @@
     githubId = 442623;
     name = "Ben Pye";
   };
+  benwbooth = {
+    email = "benwboooth@gmail.com";
+    github = "benwbooth";
+    githubId = 75972;
+    name = "Ben Booth";
+  };
   berberman = {
     email = "berberman@yandex.com";
     matrix = "@berberman:mozilla.org";
@@ -1866,6 +1891,15 @@
     githubId = 19911;
     name = "Berry Phillips";
   };
+  bertof = {
+    name = "Filippo Berto";
+    email = "berto.f@protonmail.com";
+    github = "bertof";
+    githubId = 9915675;
+    keys = [{
+      fingerprint = "17C5 1EF9 C0FE 2EB2 FE56  BB53 FE98 AE5E C52B 1056";
+    }];
+  };
   betaboon = {
     email = "betaboon@0x80.ninja";
     github = "betaboon";
@@ -2040,12 +2074,6 @@
     githubId = 68566724;
     name = "bootstrap-prime";
   };
-  commandodev = {
-    email = "ben@perurbis.com";
-    github = "commandodev";
-    githubId = 87764;
-    name = "Ben Ford";
-  };
   boppyt = {
     email = "boppy@nwcpz.com";
     github = "boppyt";
@@ -2085,6 +2113,15 @@
     githubId = 115711;
     name = "bpaulin";
   };
+  Br1ght0ne = {
+    email = "brightone@protonmail.com";
+    github = "Br1ght0ne";
+    githubId = 12615679;
+    name = "Oleksii Filonenko";
+    keys = [{
+      fingerprint = "F549 3B7F 9372 5578 FDD3  D0B8 A1BC 8428 323E CFE8";
+    }];
+  };
   bradediger = {
     email = "brad@bradediger.com";
     github = "bradediger";
@@ -2109,12 +2146,30 @@
     githubId = 2506621;
     name = "Brayden Willenborg";
   };
+  breakds = {
+    email = "breakds@gmail.com";
+    github = "breakds";
+    githubId = 1111035;
+    name = "Break Yang";
+  };
+  brecht = {
+    email = "brecht.savelkoul@alumni.lse.ac.uk";
+    github = "brechtcs";
+    githubId = 6107054;
+    name = "Brecht Savelkoul";
+  };
   brendanreis = {
     email = "brendanreis@gmail.com";
     name = "Brendan Reis";
     github = "brendanreis";
     githubId = 10686906;
   };
+  brettlyons = {
+    email = "blyons@fastmail.com";
+    github = "brettlyons";
+    githubId = 3043718;
+    name = "Brett Lyons";
+  };
   brian-dawn = {
     email = "brian.t.dawn@gmail.com";
     github = "brian-dawn";
@@ -2133,45 +2188,6 @@
     github = "brianmcgee";
     githubId = 1173648;
   };
-  Br1ght0ne = {
-    email = "brightone@protonmail.com";
-    github = "Br1ght0ne";
-    githubId = 12615679;
-    name = "Oleksii Filonenko";
-    keys = [{
-      fingerprint = "F549 3B7F 9372 5578 FDD3  D0B8 A1BC 8428 323E CFE8";
-    }];
-  };
-  bsima = {
-    email = "ben@bsima.me";
-    github = "bsima";
-    githubId = 200617;
-    name = "Ben Sima";
-  };
-  bstrik = {
-    email = "dutchman55@gmx.com";
-    github = "bstrik";
-    githubId = 7716744;
-    name = "Berno Strik";
-  };
-  breakds = {
-    email = "breakds@gmail.com";
-    github = "breakds";
-    githubId = 1111035;
-    name = "Break Yang";
-  };
-  brecht = {
-    email = "brecht.savelkoul@alumni.lse.ac.uk";
-    github = "brechtcs";
-    githubId = 6107054;
-    name = "Brecht Savelkoul";
-  };
-  brettlyons = {
-    email = "blyons@fastmail.com";
-    github = "brettlyons";
-    githubId = 3043718;
-    name = "Brett Lyons";
-  };
   brodes = {
     email = "me@brod.es";
     github = "brhoades";
@@ -2200,6 +2216,18 @@
     github = "bryanhonof";
     githubId = 5932804;
   };
+  bsima = {
+    email = "ben@bsima.me";
+    github = "bsima";
+    githubId = 200617;
+    name = "Ben Sima";
+  };
+  bstrik = {
+    email = "dutchman55@gmx.com";
+    github = "bstrik";
+    githubId = 7716744;
+    name = "Berno Strik";
+  };
   btlvr = {
     email = "btlvr@protonmail.com";
     github = "btlvr";
@@ -2231,12 +2259,6 @@
     githubId = 37375448;
     name = "Buildit";
   };
-  bburdette = {
-    email = "bburdette@protonmail.com";
-    github = "bburdette";
-    githubId = 157330;
-    name = "Ben Burdette";
-  };
   bwlang = {
     email = "brad@langhorst.com";
     github = "bwlang";
@@ -2249,18 +2271,18 @@
     githubId = 2647566;
     name = "Bruno Bzeznik";
   };
-  c0bw3b = {
-    email = "c0bw3b@gmail.com";
-    github = "c0bw3b";
-    githubId = 24417923;
-    name = "Renaud";
-  };
   c00w = {
     email = "nix@daedrum.net";
     github = "c00w";
     githubId = 486199;
     name = "Colin";
   };
+  c0bw3b = {
+    email = "c0bw3b@gmail.com";
+    github = "c0bw3b";
+    githubId = 24417923;
+    name = "Renaud";
+  };
   c0deaddict = {
     email = "josvanbakel@protonmail.com";
     github = "c0deaddict";
@@ -2279,6 +2301,12 @@
     githubId = 15320726;
     name = "Car Cdr";
   };
+  caarlos0 = {
+    name = "Carlos A Becker";
+    email = "carlos@becker.software";
+    github = "caarlos0";
+    githubId = 245435;
+  };
   cab404 = {
     email = "cab404@mailbox.org";
     github = "cab404";
@@ -2294,6 +2322,12 @@
       }
     ];
   };
+  CactiChameleon9 = {
+    email = "h19xjkkp@duck.com";
+    github = "CactiChameleon9";
+    githubId = 51231053;
+    name = "Daniel";
+  };
   cafkafk = {
     email = "christina@cafkafk.com";
     matrix = "@cafkafk:matrix.cafkafk.com";
@@ -2309,18 +2343,6 @@
       }
     ];
   };
-  calbrecht = {
-    email = "christian.albrecht@mayflower.de";
-    github = "calbrecht";
-    githubId = 1516457;
-    name = "Christian Albrecht";
-  };
-  CactiChameleon9 = {
-    email = "h19xjkkp@duck.com";
-    github = "CactiChameleon9";
-    githubId = 51231053;
-    name = "Daniel";
-  };
   calavera = {
     email = "david.calavera@gmail.com";
     github = "calavera";
@@ -2328,6 +2350,12 @@
     matrix = "@davidcalavera:matrix.org";
     name = "David Calavera";
   };
+  calbrecht = {
+    email = "christian.albrecht@mayflower.de";
+    github = "calbrecht";
+    githubId = 1516457;
+    name = "Christian Albrecht";
+  };
   callahad = {
     email = "dan.callahan@gmail.com";
     github = "callahad";
@@ -2467,6 +2495,12 @@
     matrix = "@cawilliamson:nixos.dev";
     name = "Christopher A. Williamson";
   };
+  cbleslie = {
+    email = "cameronleslie@gmail.com";
+    github = "cbleslie";
+    githubId = 500963;
+    name = "C.B.Leslie";
+  };
   cbley = {
     email = "claudio.bley@gmail.com";
     github = "avdv";
@@ -2488,6 +2522,12 @@
       fingerprint = "1127 A432 6524 BF02 737B  544E 0704 CD9E 550A 6BCD";
     }];
   };
+  ccellado = {
+    email = "annplague@gmail.com";
+    github = "ccellado";
+    githubId = 44584960;
+    name = "Denis Khalmatov";
+  };
   cdepillabout = {
     email = "cdep.illabout@gmail.com";
     matrix = "@cdepillabout:matrix.org";
@@ -2495,12 +2535,6 @@
     githubId = 64804;
     name = "Dennis Gosnell";
   };
-  ccellado = {
-    email = "annplague@gmail.com";
-    github = "ccellado";
-    githubId = 44584960;
-    name = "Denis Khalmatov";
-  };
   ceedubs = {
     email = "ceedubs@gmail.com";
     github = "ceedubs";
@@ -2563,18 +2597,6 @@
     githubId = 8228888;
     name = "Charlie Hanley";
   };
-  charlesbaynham = {
-    email = "charlesbaynham@gmail.com";
-    github = "charlesbaynham";
-    githubId = 4397637;
-    name = "Charles Baynham";
-  };
-  CharlesHD = {
-    email = "charleshdespointes@gmail.com";
-    github = "CharlesHD";
-    githubId = 6608071;
-    name = "Charles Huyghues-Despointes";
-  };
   chaoflow = {
     email = "flo@chaoflow.net";
     github = "chaoflow";
@@ -2587,6 +2609,18 @@
     githubId = 46527539;
     name = "ChaosAttractor";
   };
+  charlesbaynham = {
+    email = "charlesbaynham@gmail.com";
+    github = "charlesbaynham";
+    githubId = 4397637;
+    name = "Charles Baynham";
+  };
+  CharlesHD = {
+    email = "charleshdespointes@gmail.com";
+    github = "CharlesHD";
+    githubId = 6608071;
+    name = "Charles Huyghues-Despointes";
+  };
   chekoopa = {
     email = "chekoopa@mail.ru";
     github = "chekoopa";
@@ -2662,18 +2696,18 @@
     githubId = 538538;
     name = "Bryan Richter";
   };
-  chris-martin = {
-    email = "ch.martin@gmail.com";
-    github = "chris-martin";
-    githubId = 399718;
-    name = "Chris Martin";
-  };
   chrisjefferson = {
     email = "chris@bubblescope.net";
     github = "ChrisJefferson";
     githubId = 811527;
     name = "Christopher Jefferson";
   };
+  chris-martin = {
+    email = "ch.martin@gmail.com";
+    github = "chris-martin";
+    githubId = 399718;
+    name = "Chris Martin";
+  };
   chrispattison = {
     email = "chpattison@gmail.com";
     github = "ChrisPattison";
@@ -2792,6 +2826,12 @@
     githubId = 25088352;
     name = "Christian Kögler";
   };
+  ckauhaus = {
+    email = "kc@flyingcircus.io";
+    github = "ckauhaus";
+    githubId = 1448923;
+    name = "Christian Kauhaus";
+  };
   ckie = {
     email = "nixpkgs-0efe364@ckie.dev";
     github = "ckiee";
@@ -2802,18 +2842,6 @@
     name = "ckie";
     matrix = "@ckie:ckie.dev";
   };
-  clkamp = {
-    email = "c@lkamp.de";
-    github = "clkamp";
-    githubId = 46303707;
-    name = "Christian Lütke-Stetzkamp";
-  };
-  ckauhaus = {
-    email = "kc@flyingcircus.io";
-    github = "ckauhaus";
-    githubId = 1448923;
-    name = "Christian Kauhaus";
-  };
   cko = {
     email = "christine.koppelt@gmail.com";
     github = "cko";
@@ -2845,6 +2873,12 @@
     githubId = 848609;
     name = "Michael Bishop";
   };
+  clkamp = {
+    email = "c@lkamp.de";
+    github = "clkamp";
+    githubId = 46303707;
+    name = "Christian Lütke-Stetzkamp";
+  };
   cmacrae = {
     email = "hi@cmacr.ae";
     github = "cmacrae";
@@ -2944,6 +2978,16 @@
     githubId = 298705;
     name = "Cyril Cohen";
   };
+  cole-h = {
+    name = "Cole Helbling";
+    email = "cole.e.helbling@outlook.com";
+    matrix = "@cole-h:matrix.org";
+    github = "cole-h";
+    githubId = 28582702;
+    keys = [{
+      fingerprint = "68B8 0D57 B2E5 4AC3 EC1F  49B0 B37E 0F23 7101 6A4C";
+    }];
+  };
   colemickens = {
     email = "cole.mickens@gmail.com";
     matrix = "@colemickens:matrix.org";
@@ -2957,16 +3001,6 @@
     githubId = 5684605;
     name = "Cole Scott";
   };
-  cole-h = {
-    name = "Cole Helbling";
-    email = "cole.e.helbling@outlook.com";
-    matrix = "@cole-h:matrix.org";
-    github = "cole-h";
-    githubId = 28582702;
-    keys = [{
-      fingerprint = "68B8 0D57 B2E5 4AC3 EC1F  49B0 B37E 0F23 7101 6A4C";
-    }];
-  };
   colinsane = {
     name = "Colin Sane";
     email = "colin@uninsane.org";
@@ -2980,42 +3014,18 @@
     githubId = 244239;
     name = "Mauricio Collares";
   };
+  commandodev = {
+    email = "ben@perurbis.com";
+    github = "commandodev";
+    githubId = 87764;
+    name = "Ben Ford";
+  };
   CompEng0001 = {
     email = "sb1501@canterbury.ac.uk";
     github = "CompEng0001";
     githubId = 40290417;
     name = "Seb Blair";
   };
-  considerate = {
-    email = "viktor.kronvall@gmail.com";
-    github = "considerate";
-    githubId = 217918;
-    name = "Viktor Kronvall";
-  };
-  copumpkin = {
-    email = "pumpkingod@gmail.com";
-    github = "copumpkin";
-    githubId = 2623;
-    name = "Dan Peebles";
-  };
-  corngood = {
-    email = "corngood@gmail.com";
-    github = "corngood";
-    githubId = 3077118;
-    name = "David McFarland";
-  };
-  coroa = {
-    email = "jonas@chaoflow.net";
-    github = "coroa";
-    githubId = 2552981;
-    name = "Jonas Hörsch";
-  };
-  costrouc = {
-    email = "chris.ostrouchov@gmail.com";
-    github = "costrouc";
-    githubId = 1740337;
-    name = "Chris Ostrouchov";
-  };
   confus = {
     email = "con-f-use@gmx.net";
     github = "con-f-use";
@@ -3029,11 +3039,12 @@
     name = "Changsheng Wu";
     githubId = 2083950;
   };
-  contrun = {
-    email = "uuuuuu@protonmail.com";
-    github = "contrun";
-    githubId = 32609395;
-    name = "B YI";
+  connorbaker = {
+    email = "connor.baker@tweag.io";
+    matrix = "@connorbaker:matrix.org";
+    github = "connorbaker";
+    name = "Connor Baker";
+    githubId = 3880346;
   };
   conradmearns = {
     email = "conradmearns+github@pm.me";
@@ -3041,6 +3052,24 @@
     githubId = 5510514;
     name = "Conrad Mearns";
   };
+  considerate = {
+    email = "viktor.kronvall@gmail.com";
+    github = "considerate";
+    githubId = 217918;
+    name = "Viktor Kronvall";
+  };
+  contrun = {
+    email = "uuuuuu@protonmail.com";
+    github = "contrun";
+    githubId = 32609395;
+    name = "B YI";
+  };
+  copumpkin = {
+    email = "pumpkingod@gmail.com";
+    github = "copumpkin";
+    githubId = 2623;
+    name = "Dan Peebles";
+  };
   corbanr = {
     email = "corban@raunco.co";
     github = "CorbanR";
@@ -3056,23 +3085,41 @@
       }
     ];
   };
+  corngood = {
+    email = "corngood@gmail.com";
+    github = "corngood";
+    githubId = 3077118;
+    name = "David McFarland";
+  };
+  coroa = {
+    email = "jonas@chaoflow.net";
+    github = "coroa";
+    githubId = 2552981;
+    name = "Jonas Hörsch";
+  };
+  costrouc = {
+    email = "chris.ostrouchov@gmail.com";
+    github = "costrouc";
+    githubId = 1740337;
+    name = "Chris Ostrouchov";
+  };
   couchemar = {
     email = "couchemar@yandex.ru";
     github = "couchemar";
     githubId = 1573344;
     name = "Andrey Pavlov";
   };
-  cpcloud = {
-    name = "Phillip Cloud";
-    github = "cpcloud";
-    githubId = 417981;
-  };
   cpages = {
     email = "page@ruiec.cat";
     github = "cpages";
     githubId = 411324;
     name = "Carles Pagès";
   };
+  cpcloud = {
+    name = "Phillip Cloud";
+    github = "cpcloud";
+    githubId = 417981;
+  };
   cpu = {
     email = "daniel@binaryparadox.net";
     github = "cpu";
@@ -3221,21 +3268,6 @@
     githubId = 217899;
     name = "Cyryl Płotnicki";
   };
-  d-goldin = {
-    email = "dgoldin+github@protonmail.ch";
-    github = "d-goldin";
-    githubId = 43349662;
-    name = "Dima";
-    keys = [{
-      fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
-    }];
-  };
-  d-xo = {
-    email = "hi@d-xo.org";
-    github = "d-xo";
-    githubId = 6689924;
-    name = "David Terry";
-  };
   dadada = {
     name = "dadada";
     email = "dadada@dadada.li";
@@ -3272,6 +3304,12 @@
     githubId = 217543;
     name = "Damien Cassou";
   };
+  dan4ik605743 = {
+    email = "6057430gu@gmail.com";
+    github = "dan4ik605743";
+    githubId = 86075850;
+    name = "Danil Danevich";
+  };
   danbst = {
     email = "abcz2.uprola@gmail.com";
     github = "danbst";
@@ -3293,12 +3331,6 @@
     githubId = 245394;
     name = "Hannu Hartikainen";
   };
-  danderson = {
-    email = "dave@natulte.net";
-    github = "danderson";
-    githubId = 1918;
-    name = "David Anderson";
-  };
   dandellion = {
     email = "daniel@dodsorf.as";
     matrix = "@dandellion:dodsorf.as";
@@ -3306,6 +3338,12 @@
     githubId = 990767;
     name = "Daniel Olsen";
   };
+  danderson = {
+    email = "dave@natulte.net";
+    github = "danderson";
+    githubId = 1918;
+    name = "David Anderson";
+  };
   daneads = {
     email = "me@daneads.com";
     github = "daneads";
@@ -3340,12 +3378,6 @@
       fingerprint = "4779 D1D5 3C97 2EAE 34A5  ED3D D8AF C4BF 0567 0F9D";
     }];
   };
-  dan4ik605743 = {
-    email = "6057430gu@gmail.com";
-    github = "dan4ik605743";
-    githubId = 86075850;
-    name = "Danil Danevich";
-  };
   darkonion0 = {
     name = "Alexandre Peruggia";
     email = "darkgenius1@protonmail.com";
@@ -3359,13 +3391,6 @@
     githubId = 97746;
     name = "Raphael Das Gupta";
   };
-  das_j = {
-    email = "janne@hess.ooo";
-    matrix = "@janne.hess:helsinki-systems.de";
-    github = "dasJ";
-    githubId = 4971975;
-    name = "Janne Heß";
-  };
   dasisdormax = {
     email = "dasisdormax@mailbox.org";
     github = "dasisdormax";
@@ -3375,6 +3400,13 @@
     }];
     name = "Maximilian Wende";
   };
+  das_j = {
+    email = "janne@hess.ooo";
+    matrix = "@janne.hess:helsinki-systems.de";
+    github = "dasJ";
+    githubId = 4971975;
+    name = "Janne Heß";
+  };
   dasj19 = {
     email = "daniel@serbanescu.dk";
     github = "dasj19";
@@ -3398,12 +3430,6 @@
     github = "DavHau";
     githubId = 42246742;
   };
-  david-sawatzke = {
-    email = "d-nix@sawatzke.dev";
-    github = "david-sawatzke";
-    githubId = 11035569;
-    name = "David Sawatzke";
-  };
   david50407 = {
     email = "me@davy.tw";
     github = "david50407";
@@ -3435,6 +3461,12 @@
     githubId = 1832378;
     name = "David Rusu";
   };
+  david-sawatzke = {
+    email = "d-nix@sawatzke.dev";
+    github = "david-sawatzke";
+    githubId = 11035569;
+    name = "David Sawatzke";
+  };
   davidtwco = {
     email = "david@davidtw.co";
     github = "davidtwco";
@@ -3724,6 +3756,15 @@
     githubId = 33262214;
     name = "Dawid Gliwka";
   };
+  d-goldin = {
+    email = "dgoldin+github@protonmail.ch";
+    github = "d-goldin";
+    githubId = 43349662;
+    name = "Dima";
+    keys = [{
+      fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
+    }];
+  };
   dgonyeo = {
     email = "derek@gonyeo.com";
     github = "dgonyeo";
@@ -4077,6 +4118,12 @@
     githubId = 6884440;
     name = "Ding Xiang Fei";
   };
+  d-xo = {
+    email = "hi@d-xo.org";
+    github = "d-xo";
+    githubId = 6689924;
+    name = "David Terry";
+  };
   dysinger = {
     email = "tim@dysinger.net";
     github = "dysinger";
@@ -4130,13 +4177,6 @@
     githubId = 424946;
     name = "James Earl Douglas";
   };
-  erikarvstedt = {
-    email = "erik.arvstedt@gmail.com";
-    matrix = "@erikarvstedt:matrix.org";
-    github = "erikarvstedt";
-    githubId = 36110478;
-    name = "Erik Arvstedt";
-  };
   ebbertd = {
     email = "daniel@ebbert.nrw";
     github = "ebbertd";
@@ -4176,6 +4216,12 @@
     githubId = 50854;
     name = "edef";
   };
+  ederoyd46 = {
+    email = "matt@ederoyd.co.uk";
+    github = "ederoyd46";
+    githubId = 119483;
+    name = "Matthew Brown";
+  };
   edlimerkaj = {
     name = "Edli Merkaj";
     email = "edli.merkaj@identinet.io";
@@ -4192,60 +4238,6 @@
     matrix = "@edrex:matrix.org";
     name = "Eric Drechsel";
   };
-  ehllie = {
-    email = "me@ehllie.xyz";
-    github = "ehllie";
-    githubId = 20847625;
-    name = "Elizabeth Paź";
-  };
-  elliottslaughter = {
-    name = "Elliott Slaughter";
-    email = "elliottslaughter@gmail.com";
-    github = "elliottslaughter";
-    githubId = 3129;
-  };
-  emantor = {
-    email = "rouven+nixos@czerwinskis.de";
-    github = "Emantor";
-    githubId = 934284;
-    name = "Rouven Czerwinski";
-  };
-  embr = {
-    email = "hi@liclac.eu";
-    github = "liclac";
-    githubId = 428026;
-    name = "embr";
-  };
-  emily = {
-    email = "nixpkgs@emily.moe";
-    github = "emilazy";
-    githubId = 18535642;
-    name = "Emily";
-  };
-  emilytrau = {
-    name = "Emily Trau";
-    email = "nix@angus.ws";
-    github = "emilytrau";
-    githubId = 13267947;
-  };
-  enderger = {
-    email = "endergeryt@gmail.com";
-    github = "enderger";
-    githubId = 36283171;
-    name = "Daniel";
-  };
-  endocrimes = {
-    email = "dani@builds.terrible.systems";
-    github = "endocrimes";
-    githubId = 1330683;
-    name = "Danielle Lancashire";
-  };
-  ederoyd46 = {
-    email = "matt@ederoyd.co.uk";
-    github = "ederoyd46";
-    githubId = 119483;
-    name = "Matthew Brown";
-  };
   eduarrrd = {
     email = "e.bachmakov@gmail.com";
     github = "eduarrrd";
@@ -4276,6 +4268,12 @@
     githubId = 884970;
     name = "Eric Hegnes";
   };
+  ehllie = {
+    email = "me@ehllie.xyz";
+    github = "ehllie";
+    githubId = 20847625;
+    name = "Elizabeth Paź";
+  };
   ehmry = {
     email = "ehmry@posteo.net";
     github = "ehmry";
@@ -4331,24 +4329,6 @@
     github = "eliandoran";
     githubId = 21236836;
   };
-  elizagamedev = {
-    email = "eliza@eliza.sh";
-    github = "elizagamedev";
-    githubId = 4576666;
-    name = "Eliza Velasquez";
-  };
-  elliot = {
-    email = "hack00mind@gmail.com";
-    github = "Eliot00";
-    githubId = 18375468;
-    name = "Elliot Xu";
-  };
-  elliottvillars = {
-    email = "elliottvillars@gmail.com";
-    github = "elliottvillars";
-    githubId = 48104179;
-    name = "Elliott Villars";
-  };
   eliasp = {
     email = "mail@eliasprobst.eu";
     matrix = "@eliasp:kde.org";
@@ -4374,11 +4354,11 @@
     githubId = 769073;
     name = "Eric Litak";
   };
-  ellis = {
-    email = "nixos@ellisw.net";
-    github = "ellis";
-    githubId = 97852;
-    name = "Ellis Whitehead";
+  elizagamedev = {
+    email = "eliza@eliza.sh";
+    github = "elizagamedev";
+    githubId = 4576666;
+    name = "Eliza Velasquez";
   };
   elkowar = {
     email = "thereal.elkowar@gmail.com";
@@ -4386,6 +4366,30 @@
     githubId = 5300871;
     name = "Leon Kowarschick";
   };
+  elliot = {
+    email = "hack00mind@gmail.com";
+    github = "Eliot00";
+    githubId = 18375468;
+    name = "Elliot Xu";
+  };
+  elliottslaughter = {
+    name = "Elliott Slaughter";
+    email = "elliottslaughter@gmail.com";
+    github = "elliottslaughter";
+    githubId = 3129;
+  };
+  elliottvillars = {
+    email = "elliottvillars@gmail.com";
+    github = "elliottvillars";
+    githubId = 48104179;
+    name = "Elliott Villars";
+  };
+  ellis = {
+    email = "nixos@ellisw.net";
+    github = "ellis";
+    githubId = 97852;
+    name = "Ellis Whitehead";
+  };
   elnudev = {
     email = "elnu@elnu.com";
     github = "ElnuDev";
@@ -4404,12 +4408,36 @@
     githubId = 1365692;
     name = "Will Fancher";
   };
+  emantor = {
+    email = "rouven+nixos@czerwinskis.de";
+    github = "Emantor";
+    githubId = 934284;
+    name = "Rouven Czerwinski";
+  };
   emattiza = {
     email = "nix@mattiza.dev";
     github = "emattiza";
     githubId = 11719476;
     name = "Evan Mattiza";
   };
+  embr = {
+    email = "hi@liclac.eu";
+    github = "liclac";
+    githubId = 428026;
+    name = "embr";
+  };
+  emily = {
+    email = "nixpkgs@emily.moe";
+    github = "emilazy";
+    githubId = 18535642;
+    name = "Emily";
+  };
+  emilytrau = {
+    name = "Emily Trau";
+    email = "nix@angus.ws";
+    github = "emilytrau";
+    githubId = 13267947;
+  };
   emmabastas = {
     email = "emma.bastas@protonmail.com";
     matrix = "@emmabastas:matrix.org";
@@ -4430,12 +4458,24 @@
     githubId = 28287;
     name = "Jon Roberts";
   };
+  enderger = {
+    email = "endergeryt@gmail.com";
+    github = "enderger";
+    githubId = 36283171;
+    name = "Daniel";
+  };
   endgame = {
     email = "jack@jackkelly.name";
     github = "endgame";
     githubId = 231483;
     name = "Jack Kelly";
   };
+  endocrimes = {
+    email = "dani@builds.terrible.systems";
+    github = "endocrimes";
+    githubId = 1330683;
+    name = "Danielle Lancashire";
+  };
   enorris = {
     name = "Eric Norris";
     email = "erictnorris@gmail.com";
@@ -4542,6 +4582,13 @@
       fingerprint = "F178 B4B4 6165 6D1B 7C15  B55D 4029 3358 C7B9 326B";
     }];
   };
+  erikarvstedt = {
+    email = "erik.arvstedt@gmail.com";
+    matrix = "@erikarvstedt:matrix.org";
+    github = "erikarvstedt";
+    githubId = 36110478;
+    name = "Erik Arvstedt";
+  };
   erikbackman = {
     email = "contact@ebackman.net";
     github = "erikbackman";
@@ -4611,6 +4658,12 @@
     github = "ethindp";
     githubId = 8030501;
   };
+  ethinx = {
+    email = "eth2net@gmail.com";
+    github = "ethinx";
+    githubId = 965612;
+    name = "York Wong";
+  };
   Etjean = {
     email = "et.jean@outlook.fr";
     github = "Etjean";
@@ -4727,12 +4780,6 @@
     githubId = 25955146;
     name = "eyJhb";
   };
-  f--t = {
-    email = "git@f-t.me";
-    github = "f--t";
-    githubId = 2817965;
-    name = "f--t";
-  };
   f4814n = {
     email = "me@f4814n.de";
     github = "f4814";
@@ -4864,7 +4911,7 @@
     email = "nixpkgs@felipeqq2.rocks";
     github = "felipeqq2";
     githubId = 71830138;
-    keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A  AA8C 2FD3 4A9E 2671 91B8"; }];
+    keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25  ACA9 C7A7 4616 F302 5DF4"; }];
     matrix = "@felipeqq2:pub.solar";
   };
   felixscheinost = {
@@ -4921,18 +4968,18 @@
     githubId = 5741401;
     name = "Tim Windelschmidt";
   };
-  FireyFly = {
-    email = "nix@firefly.nu";
-    github = "FireyFly";
-    githubId = 415760;
-    name = "Jonas Höglund";
-  };
   firefly-cpp = {
     email = "iztok@iztok-jr-fister.eu";
     github = "firefly-cpp";
     githubId = 1633361;
     name = "Iztok Fister Jr.";
   };
+  FireyFly = {
+    email = "nix@firefly.nu";
+    github = "FireyFly";
+    githubId = 415760;
+    name = "Jonas Höglund";
+  };
   fishi0x01 = {
     email = "fishi0x01@gmail.com";
     github = "fishi0x01";
@@ -5032,18 +5079,18 @@
     githubId = 5918766;
     name = "Franz Thoma";
   };
-  fooker = {
-    email = "fooker@lab.sh";
-    github = "fooker";
-    githubId = 405105;
-    name = "Dustin Frisch";
-  };
   foo-dogsquared = {
     email = "foo.dogsquared@gmail.com";
     github = "foo-dogsquared";
     githubId = 34962634;
     name = "Gabriel Arazas";
   };
+  fooker = {
+    email = "fooker@lab.sh";
+    github = "fooker";
+    githubId = 405105;
+    name = "Dustin Frisch";
+  };
   foolnotion = {
     email = "bogdan.burlacu@pm.me";
     github = "foolnotion";
@@ -5140,36 +5187,42 @@
     githubId = 1010248;
     name = "Frank Lanitz";
   };
-  fro_ozen = {
-    email = "fro_ozen@gmx.de";
-    github = "froozen";
-    githubId = 1943632;
-    name = "fro_ozen";
-  };
   frogamic = {
     email = "frogamic@protonmail.com";
     github = "frogamic";
     githubId = 10263813;
     name = "Dominic Shelton";
   };
-  Frostman = {
-    email = "me@slukjanov.name";
-    github = "Frostman";
-    githubId = 134872;
-    name = "Sergei Lukianov";
-  };
   frontsideair = {
     email = "photonia@gmail.com";
     github = "frontsideair";
     githubId = 868283;
     name = "Fatih Altinok";
   };
+  fro_ozen = {
+    email = "fro_ozen@gmx.de";
+    github = "froozen";
+    githubId = 1943632;
+    name = "fro_ozen";
+  };
+  Frostman = {
+    email = "me@slukjanov.name";
+    github = "Frostman";
+    githubId = 134872;
+    name = "Sergei Lukianov";
+  };
   fstamour = {
     email = "fr.st-amour@gmail.com";
     github = "fstamour";
     githubId = 2881922;
     name = "Francis St-Amour";
   };
+  f--t = {
+    email = "git@f-t.me";
+    github = "f--t";
+    githubId = 2817965;
+    name = "f--t";
+  };
   ftrvxmtrx = {
     email = "ftrvxmtrx@gmail.com";
     github = "ftrvxmtrx";
@@ -5218,6 +5271,12 @@
     githubId = 3036816;
     name = "Edgar Aroutiounian";
   };
+  fxttr = {
+    name = "Florian Büstgens";
+    email = "fb@fx-ttr.de";
+    github = "fxttr";
+    githubId = 16306293;
+  };
   fzakaria = {
     name = "Farid Zakaria";
     email = "farid.m.zakaria@gmail.com";
@@ -5231,18 +5290,18 @@
     githubId = 606000;
     name = "Gabriel Adomnicai";
   };
-  garaiza-93 = {
-    email = "araizagustavo93@gmail.com";
-    github = "garaiza-93";
-    githubId = 57430880;
-    name = "Gustavo Araiza";
-  };
   Gabriel439 = {
     email = "Gabriel439@gmail.com";
     github = "Gabriella439";
     githubId = 1313787;
     name = "Gabriel Gonzalez";
   };
+  GabrielDougherty = {
+    email = "contact@gabrieldougherty.com";
+    github = "GabrielDougherty";
+    githubId = 10541219;
+    name = "Gabriel Dougherty";
+  };
   gador = {
     email = "florian.brandes@posteo.de";
     github = "gador";
@@ -5258,24 +5317,30 @@
     githubId = 33058747;
     name = "Gaetan Lepage";
   };
-  gal_bolle = {
-    email = "florent.becker@ens-lyon.org";
-    github = "FlorentBecker";
-    githubId = 7047019;
-    name = "Florent Becker";
-  };
   galagora = {
     email = "lightningstrikeiv@gmail.com";
     github = "Galagora";
     githubId = 45048741;
     name = "Alwanga Oyango";
   };
+  gal_bolle = {
+    email = "florent.becker@ens-lyon.org";
+    github = "FlorentBecker";
+    githubId = 7047019;
+    name = "Florent Becker";
+  };
   gamb = {
     email = "adam.gamble@pm.me";
     github = "gamb";
     githubId = 293586;
     name = "Adam Gamble";
   };
+  garaiza-93 = {
+    email = "araizagustavo93@gmail.com";
+    github = "garaiza-93";
+    githubId = 57430880;
+    name = "Gustavo Araiza";
+  };
   garbas = {
     email = "rok@garbas.si";
     github = "garbas";
@@ -5644,17 +5709,11 @@
     github = "grindhold";
     githubId = 2592640;
   };
-  gspia = {
-    email = "iahogsp@gmail.com";
-    github = "gspia";
-    githubId = 3320792;
-    name = "gspia";
-  };
-  guibert = {
-    email = "david.guibert@gmail.com";
-    github = "dguibert";
-    githubId = 1178864;
-    name = "David Guibert";
+  grnnja = {
+    email = "grnnja@gmail.com";
+    github = "grnnja";
+    githubId = 31556469;
+    name = "Prem Netsuwan";
   };
   groodt = {
     email = "groodt@gmail.com";
@@ -5662,12 +5721,6 @@
     githubId = 343415;
     name = "Greg Roodt";
   };
-  grnnja = {
-    email = "grnnja@gmail.com";
-    github = "grnnja";
-    githubId = 31556469;
-    name = "Prem Netsuwan";
-  };
   gruve-p = {
     email = "groestlcoin@gmail.com";
     github = "gruve-p";
@@ -5680,12 +5733,24 @@
     githubId = 2490088;
     name = "Gregory Schwartz";
   };
+  gspia = {
+    email = "iahogsp@gmail.com";
+    github = "gspia";
+    githubId = 3320792;
+    name = "gspia";
+  };
   gtrunsec = {
     email = "gtrunsec@hardenedlinux.org";
     github = "GTrunSec";
     githubId = 21156405;
     name = "GuangTao Zhang";
   };
+  guibert = {
+    email = "david.guibert@gmail.com";
+    github = "dguibert";
+    githubId = 1178864;
+    name = "David Guibert";
+  };
   guibou = {
     email = "guillaum.bouchard@gmail.com";
     github = "guibou";
@@ -5789,6 +5854,12 @@
     githubId = 231523;
     name = "Alok Parlikar";
   };
+  happy-river = {
+    email = "happyriver93@runbox.com";
+    github = "happy-river";
+    githubId = 54728477;
+    name = "Happy River";
+  };
   happysalada = {
     email = "raphael@megzari.com";
     matrix = "@happysalada:matrix.org";
@@ -5796,12 +5867,6 @@
     githubId = 5317234;
     name = "Raphael Megzari";
   };
-  happy-river = {
-    email = "happyriver93@runbox.com";
-    github = "happy-river";
-    githubId = 54728477;
-    name = "Happy River";
-  };
   hardselius = {
     email = "martin@hardselius.dev";
     github = "hardselius";
@@ -5887,17 +5952,23 @@
     githubId = 287769;
     name = "Sergii Paryzhskyi";
   };
+  helium = {
+    email = "helium.dev@tuta.io";
+    github = "helium18";
+    githubId = 86223025;
+    name = "helium";
+  };
   helkafen = {
     email = "arnaudpourseb@gmail.com";
     github = "Helkafen";
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
-  helium = {
-    email = "helium.dev@tuta.io";
-    github = "helium18";
-    githubId = 86223025;
-    name = "helium";
+  henkery = {
+    email = "jim@reupload.nl";
+    github = "henkery";
+    githubId = 1923309;
+    name = "Jim van Abkoude";
   };
   henkkalkwater = {
     email = "chris+nixpkgs@netsoj.nl";
@@ -5906,12 +5977,6 @@
     matrix = "@chris:netsoj.nl";
     name = "Chris Josten";
   };
-  henkery = {
-    email = "jim@reupload.nl";
-    github = "henkery";
-    githubId = 1923309;
-    name = "Jim van Abkoude";
-  };
   henrikolsson = {
     email = "henrik@fixme.se";
     github = "henrikolsson";
@@ -6052,37 +6117,18 @@
       fingerprint = "F1C5 760E 45B9 9A44 72E9  6BFB D65C 9AFB 4C22 4DA3";
     }];
   };
-  huantian = {
-    name = "David Li";
-    email = "davidtianli@gmail.com";
-    matrix = "@huantian:huantian.dev";
-    github = "huantianad";
-    githubId = 20760920;
-    keys = [{
-      fingerprint = "731A 7A05 AD8B 3AE5 956A  C227 4A03 18E0 4E55 5DE5";
-    }];
-  };
-  hugoreeves = {
-    email = "hugo@hugoreeves.com";
-    github = "HugoReeves";
-    githubId = 20039091;
-    name = "Hugo Reeves";
-    keys = [{
-      fingerprint = "78C2 E81C 828A 420B 269A  EBC1 49FA 39F8 A7F7 35F9";
-    }];
-  };
-  humancalico = {
-    email = "humancalico@disroot.org";
-    github = "humancalico";
-    githubId = 51334444;
-    name = "Akshat Agarwal";
-  };
   hodapp = {
     email = "hodapp87@gmail.com";
     github = "Hodapp87";
     githubId = 896431;
     name = "Chris Hodapp";
   };
+  holgerpeters = {
+    name = "Holger Peters";
+    email = "holger.peters@posteo.de";
+    github = "HolgerPeters";
+    githubId = 4097049;
+  };
   hollowman6 = {
     email = "hollowman@hollowman.ml";
     github = "HollowMan6";
@@ -6121,12 +6167,6 @@
     githubId = 130903;
     name = "Ana Hobden";
   };
-  holgerpeters = {
-    name = "Holger Peters";
-    email = "holger.peters@posteo.de";
-    github = "HolgerPeters";
-    githubId = 4097049;
-  };
   hqurve = {
     email = "hqurve@outlook.com";
     github = "hqurve";
@@ -6157,6 +6197,16 @@
     githubId = 39689;
     name = "Hugo Tavares Reis";
   };
+  huantian = {
+    name = "David Li";
+    email = "davidtianli@gmail.com";
+    matrix = "@huantian:huantian.dev";
+    github = "huantianad";
+    githubId = 20760920;
+    keys = [{
+      fingerprint = "731A 7A05 AD8B 3AE5 956A  C227 4A03 18E0 4E55 5DE5";
+    }];
+  };
   hufman = {
     email = "hufman@gmail.com";
     github = "hufman";
@@ -6175,6 +6225,21 @@
     githubId = 15371828;
     name = "Hugo Lageneste";
   };
+  hugoreeves = {
+    email = "hugo@hugoreeves.com";
+    github = "HugoReeves";
+    githubId = 20039091;
+    name = "Hugo Reeves";
+    keys = [{
+      fingerprint = "78C2 E81C 828A 420B 269A  EBC1 49FA 39F8 A7F7 35F9";
+    }];
+  };
+  humancalico = {
+    email = "humancalico@disroot.org";
+    github = "humancalico";
+    githubId = 51334444;
+    name = "Akshat Agarwal";
+  };
   huyngo = {
     email = "huyngo@disroot.org";
     github = "Huy-Ngo";
@@ -6332,20 +6397,6 @@
     githubId = 40234257;
     name = "ilkecan bozdogan";
   };
-  imincik = {
-    email = "ivan.mincik@gmail.com";
-    matrix = "@imincik:matrix.org";
-    github = "imincik";
-    githubId = 476346;
-    name = "Ivan Mincik";
-  };
-  not-my-segfault = {
-    email = "michal@tar.black";
-    matrix = "@michal:tar.black";
-    github = "not-my-segfault";
-    githubId = 30374463;
-    name = "Michal S.";
-  };
   illegalprime = {
     email = "themichaeleden@gmail.com";
     github = "illegalprime";
@@ -6400,6 +6451,13 @@
     githubId = 24387926;
     name = "Gabriel Pereira";
   };
+  imincik = {
+    email = "ivan.mincik@gmail.com";
+    matrix = "@imincik:matrix.org";
+    github = "imincik";
+    githubId = 476346;
+    name = "Ivan Mincik";
+  };
   imlonghao = {
     email = "nixos@esd.cc";
     github = "imlonghao";
@@ -6441,18 +6499,18 @@
     githubId = 36667224;
     name = "Yingchi Long";
   };
-  ineol = {
-    email = "leo.stefanesco@gmail.com";
-    github = "ineol";
-    githubId = 37965;
-    name = "Léo Stefanesco";
-  };
   indeednotjames = {
     email = "nix@indeednotjames.com";
     github = "IndeedNotJames";
     githubId = 55066419;
     name = "Emily Lange";
   };
+  ineol = {
+    email = "leo.stefanesco@gmail.com";
+    github = "ineol";
+    githubId = 37965;
+    name = "Léo Stefanesco";
+  };
   infinidoge = {
     name = "Infinidoge";
     email = "infinidoge@inx.moe";
@@ -6525,18 +6583,6 @@
     github = "bobrik";
     githubId = 89186;
   };
-  ivan-timokhin = {
-    email = "nixpkgs@ivan.timokhin.name";
-    name = "Ivan Timokhin";
-    github = "ivan-timokhin";
-    githubId = 9802104;
-  };
-  ivan-tkatchev = {
-    email = "tkatchev@gmail.com";
-    github = "ivan-tkatchev";
-    githubId = 650601;
-    name = "Ivan Tkatchev";
-  };
   ivanbrennan = {
     email = "ivan.brennan@gmail.com";
     github = "ivanbrennan";
@@ -6554,6 +6600,18 @@
       fingerprint = "6BD3 7248 30BD 941E 9180  C1A3 3A33 FA4C 82ED 674F";
     }];
   };
+  ivan-timokhin = {
+    email = "nixpkgs@ivan.timokhin.name";
+    name = "Ivan Timokhin";
+    github = "ivan-timokhin";
+    githubId = 9802104;
+  };
+  ivan-tkatchev = {
+    email = "tkatchev@gmail.com";
+    github = "ivan-tkatchev";
+    githubId = 650601;
+    name = "Ivan Tkatchev";
+  };
   ivar = {
     email = "ivar.scholten@protonmail.com";
     github = "IvarWithoutBones";
@@ -6584,11 +6642,11 @@
     githubId = 26877687;
     name = "Yurii Izorkin";
   };
-  j0xaf = {
-    email = "j0xaf@j0xaf.de";
-    name = "Jörn Gersdorf";
-    github = "j0xaf";
-    githubId = 932697;
+  j03 = {
+    email = "github@johannesloetzsch.de";
+    github = "johannesloetzsch";
+    githubId = 175537;
+    name = "Johannes Lötzsch";
   };
   j0hax = {
     name = "Johannes Arnold";
@@ -6602,6 +6660,12 @@
     github = "j0lol";
     githubId = 24716467;
   };
+  j0xaf = {
+    email = "j0xaf@j0xaf.de";
+    name = "Jörn Gersdorf";
+    github = "j0xaf";
+    githubId = 932697;
+  };
   j4m3s = {
     name = "James Landrein";
     email = "github@j4m3s.eu";
@@ -6614,52 +6678,6 @@
     github = "jacg";
     githubId = 2570854;
   };
-  jakehamilton = {
-    name = "Jake Hamilton";
-    email = "jake.hamilton@hey.com";
-    matrix = "@jakehamilton:matrix.org";
-    github = "jakehamilton";
-    githubId = 7005773;
-    keys = [{
-      fingerprint = "B982 0250 1720 D540 6A18  2DA8 188E 4945 E85B 2D21";
-    }];
-  };
-  jali-clarke = {
-    email = "jinnah.ali-clarke@outlook.com";
-    name = "Jinnah Ali-Clarke";
-    github = "jali-clarke";
-    githubId = 17733984;
-  };
-  jasoncarr = {
-    email = "jcarr250@gmail.com";
-    github = "jasoncarr0";
-    githubId = 6874204;
-    name = "Jason Carr";
-  };
-  j-brn = {
-    email = "me@bricker.io";
-    github = "j-brn";
-    githubId = 40566146;
-    name = "Jonas Braun";
-  };
-  j-hui = {
-    email = "j-hui@cs.columbia.edu";
-    github = "j-hui";
-    githubId = 11800204;
-    name = "John Hui";
-  };
-  j-keck = {
-    email = "jhyphenkeck@gmail.com";
-    github = "j-keck";
-    githubId = 3081095;
-    name = "Jürgen Keck";
-  };
-  j03 = {
-    email = "github@johannesloetzsch.de";
-    github = "johannesloetzsch";
-    githubId = 175537;
-    name = "Johannes Lötzsch";
-  };
   jackgerrits = {
     email = "jack@jackgerrits.com";
     github = "jackgerrits";
@@ -6672,6 +6690,16 @@
     githubId = 2179419;
     name = "Arseniy Seroka";
   };
+  jakehamilton = {
+    name = "Jake Hamilton";
+    email = "jake.hamilton@hey.com";
+    matrix = "@jakehamilton:matrix.org";
+    github = "jakehamilton";
+    githubId = 7005773;
+    keys = [{
+      fingerprint = "B982 0250 1720 D540 6A18  2DA8 188E 4945 E85B 2D21";
+    }];
+  };
   jakeisnt = {
     name = "Jacob Chvatal";
     email = "jake@isnt.online";
@@ -6702,6 +6730,12 @@
     githubId = 2212681;
     name = "Jakub Grzgorz Sokołowski";
   };
+  jali-clarke = {
+    email = "jinnah.ali-clarke@outlook.com";
+    name = "Jinnah Ali-Clarke";
+    github = "jali-clarke";
+    githubId = 17733984;
+  };
   jamiemagee = {
     email = "jamie.magee@gmail.com";
     github = "JamieMagee";
@@ -6733,6 +6767,12 @@
     githubId = 3874017;
     name = "Jappie Klooster";
   };
+  jasoncarr = {
+    email = "jcarr250@gmail.com";
+    github = "jasoncarr0";
+    githubId = 6874204;
+    name = "Jason Carr";
+  };
   javaguirre = {
     email = "contacto@javaguirre.net";
     github = "javaguirre";
@@ -6783,6 +6823,12 @@
     matrix = "@jboy:utwente.io";
     name = "John Boy";
   };
+  j-brn = {
+    email = "me@bricker.io";
+    github = "j-brn";
+    githubId = 40566146;
+    name = "Jonas Braun";
+  };
   jc = {
     name = "Josh Cooper";
     email = "josh@cooper.is";
@@ -7024,6 +7070,12 @@
     githubId = 2502736;
     name = "James Hillyerd";
   };
+  j-hui = {
+    email = "j-hui@cs.columbia.edu";
+    github = "j-hui";
+    githubId = 11800204;
+    name = "John Hui";
+  };
   jiegec = {
     name = "Jiajie Chen";
     email = "c@jia.je";
@@ -7067,6 +7119,12 @@
     githubId = 1204734;
     name = "Emil Karlson";
   };
+  j-keck = {
+    email = "jhyphenkeck@gmail.com";
+    github = "j-keck";
+    githubId = 3081095;
+    name = "Jürgen Keck";
+  };
   jlamur = {
     email = "contact@juleslamur.fr";
     github = "jlamur";
@@ -7224,12 +7282,6 @@
     githubId = 297653;
     name = "Joe Salisbury";
   };
-  john-shaffer = {
-    email = "jdsha@proton.me";
-    github = "john-shaffer";
-    githubId = 53870456;
-    name = "John Shaffer";
-  };
   johanot = {
     email = "write@ownrisk.dk";
     github = "johanot";
@@ -7272,6 +7324,12 @@
     githubId = 6321578;
     name = "John Rinehart";
   };
+  john-shaffer = {
+    email = "jdsha@proton.me";
+    github = "john-shaffer";
+    githubId = 53870456;
+    name = "John Shaffer";
+  };
   johntitor = {
     email = "huyuumi.dev@gmail.com";
     github = "JohnTitor";
@@ -7654,6 +7712,13 @@
     githubId = 87115;
     name = "Wael Nasreddine";
   };
+  kalebpace = {
+    email = "kaleb.pace@pm.me";
+    matrix = "@kalebpace:matrix.org";
+    github = "kalebpace";
+    githubId = 5586615;
+    name = "Kaleb Pace";
+  };
   kalekseev = {
     email = "mail@kalekseev.com";
     github = "kalekseev";
@@ -7739,7 +7804,6 @@
     name = "Claudius Holeksa";
   };
   ken-matsui = {
-    email = "nix@kmatsui.me";
     github = "ken-matsui";
     githubId = 26405363;
     name = "Ken Matsui";
@@ -7905,6 +7969,12 @@
     githubId = 691290;
     name = "Keshav Kini";
   };
+  kira-bruneau = {
+    email = "kira.bruneau@pm.me";
+    name = "Kira Bruneau";
+    github = "kira-bruneau";
+    githubId = 382041;
+  };
   kirelagin = {
     email = "kirelagin@gmail.com";
     matrix = "@kirelagin:matrix.org";
@@ -7918,6 +7988,12 @@
     githubId = 804677;
     name = "Kirill Kazakov";
   };
+  kirillrdy = {
+    email = "kirillrdy@gmail.com";
+    github = "kirillrdy";
+    githubId = 12160;
+    name = "Kirill Radzikhovskyy";
+  };
   kisonecat = {
     email = "kisonecat@gmail.com";
     github = "kisonecat";
@@ -8043,6 +8119,13 @@
     githubId = 15692230;
     name = "Muhammad Herdiansyah";
   };
+  konradmalik = {
+    email = "konrad.malik@gmail.com";
+    matrix = "@konradmalik:matrix.org";
+    name = "Konrad Malik";
+    github = "konradmalik";
+    githubId = 13033392;
+  };
   koozz = {
     email = "koozz@linux.com";
     github = "koozz";
@@ -8115,6 +8198,18 @@
     githubId = 4032;
     name = "Kristoffer Thømt Ravneberg";
   };
+  kristian-brucaj = {
+    email = "kbrucaj@gmail.com";
+    github = "Kristian-Brucaj";
+    githubId = 8893110;
+    name = "Kristian Brucaj";
+  };
+  kristoff3r = {
+    email = "k.soeholm@gmail.com";
+    github = "kristoff3r";
+    githubId = 160317;
+    name = "Kristoffer Søholm";
+  };
   kritnich = {
     email = "kritnich@kritni.ch";
     github = "Kritnich";
@@ -8133,18 +8228,6 @@
     githubId = 5759930;
     name = "Alexis Destrez";
   };
-  kristian-brucaj = {
-    email = "kbrucaj@gmail.com";
-    github = "Kristian-Brucaj";
-    githubId = 8893110;
-    name = "Kristian Brucaj";
-  };
-  kristoff3r = {
-    email = "k.soeholm@gmail.com";
-    github = "kristoff3r";
-    githubId = 160317;
-    name = "Kristoffer Søholm";
-  };
   ktf = {
     email = "giulio.eulisse@cern.ch";
     github = "ktf";
@@ -8213,16 +8296,6 @@
       fingerprint = "5A9A 1C9B 2369 8049 3B48  CF5B 81A1 5409 4816 2372";
     }];
   };
-  l-as = {
-    email = "las@protonmail.ch";
-    matrix = "@Las:matrix.org";
-    github = "L-as";
-    githubId = 22075344;
-    keys = [{
-      fingerprint = "A093 EA17 F450 D4D1 60A0  1194 AC45 8A7D 1087 D025";
-    }];
-    name = "Las Safin";
-  };
   l3af = {
     email = "L3afMeAlon3@gmail.com";
     matrix = "@L3afMe:matrix.org";
@@ -8260,6 +8333,12 @@
     githubId = 55911173;
     name = "Gwendolyn Quasebarth";
   };
+  lambda-11235 = {
+    email = "taranlynn0@gmail.com";
+    github = "lambda-11235";
+    githubId = 16354815;
+    name = "Taran Lynn";
+  };
   lammermann = {
     email = "k.o.b.e.r@web.de";
     github = "lammermann";
@@ -8272,18 +8351,22 @@
     githubId = 182024;
     name = "Lars Rasmusson";
   };
+  l-as = {
+    email = "las@protonmail.ch";
+    matrix = "@Las:matrix.org";
+    github = "L-as";
+    githubId = 22075344;
+    keys = [{
+      fingerprint = "A093 EA17 F450 D4D1 60A0  1194 AC45 8A7D 1087 D025";
+    }];
+    name = "Las Safin";
+  };
   lasandell = {
     email = "lasandell@gmail.com";
     github = "lasandell";
     githubId = 2034420;
     name = "Luke Sandell";
   };
-  lambda-11235 = {
-    email = "taranlynn0@gmail.com";
-    github = "lambda-11235";
-    githubId = 16354815;
-    name = "Taran Lynn";
-  };
   lassulus = {
     email = "lassulus@gmail.com";
     matrix = "@lassulus:lassul.us";
@@ -8309,18 +8392,6 @@
     githubId = 45168934;
     name = "Louis Blin";
   };
-  lucc = {
-    email = "lucc+nix@posteo.de";
-    github = "lucc";
-    githubId = 1104419;
-    name = "Lucas Hoffmann";
-  };
-  lucasew = {
-    email = "lucas59356@gmail.com";
-    github = "lucasew";
-    githubId = 15693688;
-    name = "Lucas Eduardo Wendt";
-  };
   lde = {
     email = "lilian.deloche@puck.fr";
     github = "lde";
@@ -8382,23 +8453,6 @@
     githubId = 4158274;
     name = "Michiel Leenaars";
   };
-  logo = {
-    email = "logo4poop@protonmail.com";
-    matrix = "@logo4poop:matrix.org";
-    github = "logo4poop";
-    githubId = 24994565;
-    name = "Isaac Silverstein";
-  };
-  lom = {
-    email = "legendofmiracles@protonmail.com";
-    matrix = "@legendofmiracles:matrix.org";
-    github = "legendofmiracles";
-    githubId = 30902201;
-    name = "legendofmiracles";
-    keys = [{
-      fingerprint = "CC50 F82C 985D 2679 0703  AF15 19B0 82B3 DEFE 5451";
-    }];
-  };
   leifhelm = {
     email = "jakob.leifhelm@gmail.com";
     github = "leifhelm";
@@ -8607,6 +8661,12 @@
     githubId = 725613;
     name = "Linus Arver";
   };
+  lionello = {
+    email = "lio@lunesu.com";
+    github = "lionello";
+    githubId = 591860;
+    name = "Lionello Lunesu";
+  };
   livnev = {
     email = "lev@liv.nev.org.uk";
     github = "livnev";
@@ -8616,67 +8676,6 @@
       fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";
     }];
   };
-  lourkeur = {
-    name = "Louis Bettens";
-    email = "louis@bettens.info";
-    github = "lourkeur";
-    githubId = 15657735;
-    keys = [{
-      fingerprint = "5B93 9CFA E8FC 4D8F E07A  3AEA DFE1 D4A0 1733 7E2A";
-    }];
-  };
-  lorenz = {
-    name = "Lorenz Brun";
-    email = "lorenz@brun.one";
-    github = "lorenz";
-    githubId = 5228892;
-  };
-  lorenzleutgeb = {
-    email = "lorenz@leutgeb.xyz";
-    github = "lorenzleutgeb";
-    githubId = 542154;
-    name = "Lorenz Leutgeb";
-  };
-  luis = {
-    email = "luis.nixos@gmail.com";
-    github = "Luis-Hebendanz";
-    githubId = 22085373;
-    name = "Luis Hebendanz";
-  };
-  luizirber = {
-    email = "nixpkgs@luizirber.org";
-    github = "luizirber";
-    githubId = 6642;
-    name = "Luiz Irber";
-  };
-  luizribeiro = {
-    email = "nixpkgs@l9o.dev";
-    matrix = "@luizribeiro:matrix.org";
-    name = "Luiz Ribeiro";
-    github = "luizribeiro";
-    githubId = 112069;
-    keys = [{
-      fingerprint = "97A0 AE5E 03F3 499B 7D7A  65C6 76A4 1432 37EF 5817";
-    }];
-  };
-  lunarequest = {
-    email = "nullarequest@vivlaid.net";
-    github = "Lunarequest";
-    githubId = 30698906;
-    name = "Luna D Dragon";
-  };
-  LunNova = {
-    email = "nixpkgs-maintainer@lunnova.dev";
-    github = "LunNova";
-    githubId = 782440;
-    name = "Luna Nova";
-  };
-  lionello = {
-    email = "lio@lunesu.com";
-    github = "lionello";
-    githubId = 591860;
-    name = "Lionello Lunesu";
-  };
   lluchs = {
     email = "lukas.werling@gmail.com";
     github = "lluchs";
@@ -8695,12 +8694,6 @@
     githubId = 169170;
     name = "Mathias Schreck";
   };
-  loewenheim = {
-    email = "loewenheim@mailbox.org";
-    github = "loewenheim";
-    githubId = 7622248;
-    name = "Sebastian Zivota";
-  };
   locallycompact = {
     email = "dan.firth@homotopic.tech";
     github = "locallycompact";
@@ -8723,18 +8716,59 @@
     githubId = 918448;
     name = "Anthony Lodi";
   };
+  loewenheim = {
+    email = "loewenheim@mailbox.org";
+    github = "loewenheim";
+    githubId = 7622248;
+    name = "Sebastian Zivota";
+  };
+  logo = {
+    email = "logo4poop@protonmail.com";
+    matrix = "@logo4poop:matrix.org";
+    github = "logo4poop";
+    githubId = 24994565;
+    name = "Isaac Silverstein";
+  };
   loicreynier = {
     email = "loic@loicreynier.fr";
     github = "loicreynier";
     githubId = 88983487;
     name = "Loïc Reynier";
   };
+  lom = {
+    email = "legendofmiracles@protonmail.com";
+    matrix = "@legendofmiracles:matrix.org";
+    github = "legendofmiracles";
+    githubId = 30902201;
+    name = "legendofmiracles";
+    keys = [{
+      fingerprint = "CC50 F82C 985D 2679 0703  AF15 19B0 82B3 DEFE 5451";
+    }];
+  };
+  longer = {
+    email = "michal@mieszczak.com.pl";
+    name = "Michał Mieszczak";
+    github = "LongerHV";
+    githubId = 46924944;
+  };
   lopsided98 = {
     email = "benwolsieffer@gmail.com";
     github = "lopsided98";
     githubId = 5624721;
     name = "Ben Wolsieffer";
   };
+  lorenz = {
+    name = "Lorenz Brun";
+    email = "lorenz@brun.one";
+    github = "lorenz";
+    githubId = 5228892;
+  };
+  lorenzleutgeb = {
+    email = "lorenz@leutgeb.xyz";
+    github = "lorenzleutgeb";
+    githubId = 542154;
+    name = "Lorenz Leutgeb";
+  };
   loskutov = {
     email = "ignat.loskutov@gmail.com";
     github = "loskutov";
@@ -8753,6 +8787,15 @@
     githubId = 4969294;
     name = "Louis Tim Larsen";
   };
+  lourkeur = {
+    name = "Louis Bettens";
+    email = "louis@bettens.info";
+    github = "lourkeur";
+    githubId = 15657735;
+    keys = [{
+      fingerprint = "5B93 9CFA E8FC 4D8F E07A  3AEA DFE1 D4A0 1733 7E2A";
+    }];
+  };
   loveisgrief = {
     name = "LoveIsGrief";
     email = "loveisgrief@tuta.io";
@@ -8821,6 +8864,18 @@
     githubId = 59375051;
     name = "Lucas Ransan";
   };
+  lucasew = {
+    email = "lucas59356@gmail.com";
+    github = "lucasew";
+    githubId = 15693688;
+    name = "Lucas Eduardo Wendt";
+  };
+  lucc = {
+    email = "lucc+nix@posteo.de";
+    github = "lucc";
+    githubId = 1104419;
+    name = "Lucas Hoffmann";
+  };
   lucperkins = {
     email = "lucperkins@gmail.com";
     github = "lucperkins";
@@ -8854,12 +8909,40 @@
       fingerprint = "66D1 3048 2B5F 2069 81A6  6B83 6F98 7CCF 224D 20B9";
     }];
   };
+  lugarun = {
+    email = "lfschmidt.me@gmail.com";
+    github = "lugarun";
+    githubId = 5767106;
+    name = "Lukas Schmidt";
+  };
+  luis = {
+    email = "luis.nixos@gmail.com";
+    github = "Luis-Hebendanz";
+    githubId = 22085373;
+    name = "Luis Hebendanz";
+  };
   luispedro = {
     email = "luis@luispedro.org";
     github = "luispedro";
     githubId = 79334;
     name = "Luis Pedro Coelho";
   };
+  luizirber = {
+    email = "nixpkgs@luizirber.org";
+    github = "luizirber";
+    githubId = 6642;
+    name = "Luiz Irber";
+  };
+  luizribeiro = {
+    email = "nixpkgs@l9o.dev";
+    matrix = "@luizribeiro:matrix.org";
+    name = "Luiz Ribeiro";
+    github = "luizribeiro";
+    githubId = 112069;
+    keys = [{
+      fingerprint = "97A0 AE5E 03F3 499B 7D7A  65C6 76A4 1432 37EF 5817";
+    }];
+  };
   lukeadams = {
     email = "luke.adams@belljar.io";
     github = "lukeadams";
@@ -8897,6 +8980,12 @@
     githubId = 26020062;
     name = "lumi";
   };
+  lunarequest = {
+    email = "nullarequest@vivlaid.net";
+    github = "Lunarequest";
+    githubId = 30698906;
+    name = "Luna D Dragon";
+  };
   lunik1 = {
     email = "ch.nixpkgs@themaw.xyz";
     matrix = "@lunik1:lunik.one";
@@ -8904,9 +8993,16 @@
     githubId = 13547699;
     name = "Corin Hoad";
     keys = [{
-      fingerprint = "BA3A 5886 AE6D 526E 20B4  57D6 6A37 DF94 8318 8492";
+      # fingerprint = "BA3A 5886 AE6D 526E 20B4  57D6 6A37 DF94 8318 8492"; # old key, superseded
+      fingerprint = "6E69 6A19 4BD8 BFAE 7362  ACDB 6437 4619 95CA 7F16";
     }];
   };
+  LunNova = {
+    email = "nixpkgs-maintainer@lunnova.dev";
+    github = "LunNova";
+    githubId = 782440;
+    name = "Luna Nova";
+  };
   lux = {
     email = "lux@lux.name";
     github = "luxzeitlos";
@@ -9018,6 +9114,12 @@
     githubId = 1140462;
     name = "magenbluten";
   };
+  maggesi = {
+    email = "marco.maggesi@gmail.com";
+    github = "maggesi";
+    githubId = 1809783;
+    name = "Marco Maggesi";
+  };
   magnetophon = {
     email = "bart@magnetophon.nl";
     github = "magnetophon";
@@ -9066,6 +9168,17 @@
     githubId = 115218;
     name = "Felix Richter";
   };
+  MakiseKurisu = {
+    github = "MakiseKurisu";
+    githubId = 2321672;
+    name = "Makise Kurisu";
+  };
+  malbarbo = {
+    email = "malbarbo@gmail.com";
+    github = "malbarbo";
+    githubId = 1678126;
+    name = "Marco A L Barbosa";
+  };
   malo = {
     email = "mbourgon@gmail.com";
     github = "malob";
@@ -9078,12 +9191,6 @@
     githubId = 34393802;
     name = "Malte Voos";
   };
-  malbarbo = {
-    email = "malbarbo@gmail.com";
-    github = "malbarbo";
-    githubId = 1678126;
-    name = "Marco A L Barbosa";
-  };
   malyn = {
     email = "malyn@strangeGizmo.com";
     github = "malyn";
@@ -9110,36 +9217,30 @@
     githubId = 1651325;
     name = "maralorn";
   };
-  marcweber = {
-    email = "marco-oweber@gmx.de";
-    github = "MarcWeber";
-    githubId = 34086;
-    name = "Marc Weber";
-  };
   marcus7070 = {
     email = "marcus@geosol.com.au";
     github = "marcus7070";
     githubId = 50230945;
     name = "Marcus Boyd";
   };
+  marcusramberg = {
+    email = "marcus@means.no";
+    github = "marcusramberg";
+    githubId = 5526;
+    name = "Marcus Ramberg";
+  };
+  marcweber = {
+    email = "marco-oweber@gmx.de";
+    github = "MarcWeber";
+    githubId = 34086;
+    name = "Marc Weber";
+  };
   marenz = {
     email = "marenz@arkom.men";
     github = "marenz2569";
     githubId = 12773269;
     name = "Markus Schmidl";
   };
-  markus1189 = {
-    email = "markus1189@gmail.com";
-    github = "markus1189";
-    githubId = 591567;
-    name = "Markus Hauck";
-  };
-  markuskowa = {
-    email = "markus.kowalewski@gmail.com";
-    github = "markuskowa";
-    githubId = 26470037;
-    name = "Markus Kowalewski";
-  };
   mariaa144 = {
     email = "speechguard_intensivist@aleeas.com";
     github = "mariaa144";
@@ -9158,6 +9259,24 @@
     github = "marius851000";
     githubId = 22586596;
   };
+  markbeep = {
+    email = "mrkswrn@gmail.com";
+    github = "markbeep";
+    githubId = 20665331;
+    name = "Mark";
+  };
+  markus1189 = {
+    email = "markus1189@gmail.com";
+    github = "markus1189";
+    githubId = 591567;
+    name = "Markus Hauck";
+  };
+  markuskowa = {
+    email = "markus.kowalewski@gmail.com";
+    github = "markuskowa";
+    githubId = 26470037;
+    name = "Markus Kowalewski";
+  };
   marsam = {
     github = "marsam";
     githubId = 65531;
@@ -9169,6 +9288,12 @@
     githubId = 33522919;
     name = "Marshall Arruda";
   };
+  martfont = {
+    name = "Martino Fontana";
+    email = "tinozzo123@tutanota.com";
+    github = "SuperSamus";
+    githubId = 40663462;
+  };
   martijnvermaat = {
     email = "martijn@vermaat.name";
     github = "martijnvermaat";
@@ -9187,12 +9312,6 @@
     githubId = 458783;
     name = "Martin Gammelsæter";
   };
-  martfont = {
-    name = "Martino Fontana";
-    email = "tinozzo123@tutanota.com";
-    github = "SuperSamus";
-    githubId = 40663462;
-  };
   marzipankaiser = {
     email = "nixos@gaisseml.de";
     github = "marzipankaiser";
@@ -9226,11 +9345,11 @@
     githubId = 854770;
     name = "Matej Cotman";
   };
-  mathnerd314 = {
-    email = "mathnerd314.gph+hs@gmail.com";
-    github = "Mathnerd314";
-    githubId = 322214;
-    name = "Mathnerd314";
+  mateodd25 = {
+    email = "mateodd@icloud.com";
+    github = "mateodd25";
+    githubId = 854770;
+    name = "Mateo Diaz";
   };
   math-42 = {
     email = "matheus.4200@gmail.com";
@@ -9238,6 +9357,12 @@
     githubId = 43853194;
     name = "Matheus Vieira";
   };
+  mathnerd314 = {
+    email = "mathnerd314.gph+hs@gmail.com";
+    github = "Mathnerd314";
+    githubId = 322214;
+    name = "Mathnerd314";
+  };
   matklad = {
     email = "aleksey.kladov@gmail.com";
     github = "matklad";
@@ -9250,23 +9375,17 @@
     github = "matrss";
     githubId = 9308656;
   };
-  matt-snider = {
-    email = "matt.snider@protonmail.com";
-    github = "matt-snider";
-    githubId = 11810057;
-    name = "Matt Snider";
-  };
   mattchrist = {
     email = "nixpkgs-matt@christ.systems";
     github = "mattchrist";
     githubId = 952712;
     name = "Matt Christ";
   };
-  matthew-levan = {
-    email = "matthew@coeli.network";
-    github = "matthew-levan";
-    githubId = 91502660;
-    name = "Matthew LeVan";
+  matthewbauer = {
+    email = "mjbauer95@gmail.com";
+    github = "matthewbauer";
+    githubId = 19036;
+    name = "Matthew Bauer";
   };
   matthewcroughan = {
     email = "matt@croughan.sh";
@@ -9274,11 +9393,20 @@
     githubId = 26458780;
     name = "Matthew Croughan";
   };
-  matthewbauer = {
-    email = "mjbauer95@gmail.com";
-    github = "matthewbauer";
-    githubId = 19036;
-    name = "Matthew Bauer";
+  matthew-levan = {
+    email = "matthew@coeli.network";
+    github = "matthew-levan";
+    githubId = 91502660;
+    name = "Matthew LeVan";
+  };
+  matthewpi = {
+    email = "me+nix@matthewp.io";
+    github = "matthewpi";
+    githubId = 26559841;
+    name = "Matthew Penner";
+    keys = [{
+      fingerprint = "5118 F1CC B7B0 6C17 4DD1  5267 3131 1906 AD4C F6D6";
+    }];
   };
   matthiasbenaets = {
     email = "matthias.benaets@gmail.com";
@@ -9314,14 +9442,11 @@
     githubId = 279868;
     name = "Matti Kariluoma";
   };
-  matthewpi = {
-    email = "me+nix@matthewp.io";
-    github = "matthewpi";
-    githubId = 26559841;
-    name = "Matthew Penner";
-    keys = [{
-      fingerprint = "5118 F1CC B7B0 6C17 4DD1  5267 3131 1906 AD4C F6D6";
-    }];
+  matt-snider = {
+    email = "matt.snider@protonmail.com";
+    github = "matt-snider";
+    githubId = 11810057;
+    name = "Matt Snider";
   };
   maurer = {
     email = "matthew.r.maurer+nix@gmail.com";
@@ -9335,21 +9460,6 @@
     githubId = 95194;
     name = "Mauricio Scheffer";
   };
-  maxhero = {
-    email = "contact@maxhero.dev";
-    github = "themaxhero";
-    githubId = 4708337;
-    name = "Marcelo A. de L. Santos";
-  };
-  max-niederman = {
-    email = "max@maxniederman.com";
-    github = "max-niederman";
-    githubId = 19580458;
-    name = "Max Niederman";
-    keys = [{
-      fingerprint = "1DE4 424D BF77 1192 5DC4  CF5E 9AED 8814 81D8 444E";
-    }];
-  };
    maxbrunet = {
     email = "max@brnt.mx";
     github = "maxbrunet";
@@ -9371,24 +9481,39 @@
     githubId = 35892750;
     name = "Maxine Aubrey";
   };
-  maxhille = {
-    email = "mh@lambdasoup.com";
-    github = "maxhille";
-    githubId = 693447;
-    name = "Max Hille";
-  };
   maxhbr = {
     email = "nixos@maxhbr.dev";
     github = "maxhbr";
     githubId = 1187050;
     name = "Maximilian Huber";
   };
+  maxhero = {
+    email = "contact@maxhero.dev";
+    github = "themaxhero";
+    githubId = 4708337;
+    name = "Marcelo A. de L. Santos";
+  };
+  maxhille = {
+    email = "mh@lambdasoup.com";
+    github = "maxhille";
+    githubId = 693447;
+    name = "Max Hille";
+  };
   maximsmol = {
     email = "maximsmol@gmail.com";
     github = "maximsmol";
     githubId = 1472826;
     name = "Max Smolin";
   };
+  max-niederman = {
+    email = "max@maxniederman.com";
+    github = "max-niederman";
+    githubId = 19580458;
+    name = "Max Niederman";
+    keys = [{
+      fingerprint = "1DE4 424D BF77 1192 5DC4  CF5E 9AED 8814 81D8 444E";
+    }];
+  };
   maxux = {
     email = "root@maxux.net";
     github = "maxux";
@@ -9401,6 +9526,12 @@
     githubId = 17859747;
     name = "Maxwell L-T";
   };
+  maxwilson = {
+    email = "nixpkgs@maxwilson.dev";
+    github = "mwilsoncoding";
+    githubId = 43796009;
+    name = "Max Wilson";
+  };
   maxxk = {
     email = "maxim.krivchikov@gmail.com";
     github = "maxxk";
@@ -9593,12 +9724,6 @@
     githubId = 15093162;
     name = "Melanie B. Sigl";
   };
-  kira-bruneau = {
-    email = "kira.bruneau@pm.me";
-    name = "Kira Bruneau";
-    github = "kira-bruneau";
-    githubId = 382041;
-  };
   mephistophiles = {
     email = "mussitantesmortem@gmail.com";
     name = "Maxim Zhukov";
@@ -9653,18 +9778,18 @@
     githubId = 68288772;
     name = "Markus Heinrich";
   };
-  mhaselsteiner = {
-    email = "magdalena.haselsteiner@gmx.at";
-    github = "mhaselsteiner";
-    githubId = 20536514;
-    name = "Magdalena Haselsteiner";
-  };
   mh182 = {
     email = "mh182@chello.at";
     github = "mh182";
     githubId = 9980864;
     name = "Max Hofer";
   };
+  mhaselsteiner = {
+    email = "magdalena.haselsteiner@gmx.at";
+    github = "mhaselsteiner";
+    githubId = 20536514;
+    name = "Magdalena Haselsteiner";
+  };
   miangraham = {
     github = "miangraham";
     githubId = 704580;
@@ -9766,18 +9891,18 @@
     githubId = 978196;
     name = "Michaël Faille";
   };
-  mikoim = {
-    email = "ek@esh.ink";
-    github = "mikoim";
-    githubId = 3958340;
-    name = "Eshin Kunishima";
-  };
   mikesperber = {
     email = "sperber@deinprogramm.de";
     github = "mikesperber";
     githubId = 1387206;
     name = "Mike Sperber";
   };
+  mikoim = {
+    email = "ek@esh.ink";
+    github = "mikoim";
+    githubId = 3958340;
+    name = "Eshin Kunishima";
+  };
   mikroskeem = {
     email = "mikroskeem@mikroskeem.eu";
     github = "mikroskeem";
@@ -9817,6 +9942,12 @@
     githubId = 5378535;
     name = "Milo Gertjejansen";
   };
+  milran = {
+    email = "milranmike@protonmail.com";
+    github = "milran";
+    githubId = 93639059;
+    name = "Milran Mike";
+  };
   mimame = {
     email = "miguel.madrid.mencia@gmail.com";
     github = "mimame";
@@ -10141,12 +10272,6 @@
     githubId = 2072185;
     name = "Marc Scholten";
   };
-  mtrsk = {
-    email = "marcos.schonfinkel@protonmail.com";
-    github = "mtrsk";
-    githubId = 16356569;
-    name = "Marcos Benevides";
-  };
   mredaelli = {
     email = "massimo@typish.io";
     github = "mredaelli";
@@ -10276,6 +10401,12 @@
     githubId = 39034;
     name = "Max Treskin";
   };
+  mtrsk = {
+    email = "marcos.schonfinkel@protonmail.com";
+    github = "mtrsk";
+    githubId = 16356569;
+    name = "Marcos Benevides";
+  };
   mudri = {
     email = "lamudri@gmail.com";
     github = "laMudri";
@@ -10304,18 +10435,18 @@
       fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2";
     }];
   };
-  muscaln = {
-    email = "muscaln@protonmail.com";
-    github = "muscaln";
-    githubId = 96225281;
-    name = "Mustafa Çalışkan";
-  };
   mupdt = {
     email = "nix@pdtpartners.com";
     github = "mupdt";
     githubId = 25388474;
     name = "Matej Urbas";
   };
+  muscaln = {
+    email = "muscaln@protonmail.com";
+    github = "muscaln";
+    githubId = 96225281;
+    name = "Mustafa Çalışkan";
+  };
   mvisonneau = {
     name = "Maxime VISONNEAU";
     email = "maxime@visonneau.fr";
@@ -10345,12 +10476,6 @@
     githubId = 38578268;
     name = "Morgan Wolfe";
   };
-  maxwilson = {
-    email = "nixpkgs@maxwilson.dev";
-    github = "mwilsoncoding";
-    githubId = 43796009;
-    name = "Max Wilson";
-  };
   myaats = {
     email = "mats@mats.sh";
     github = "Myaats";
@@ -10421,18 +10546,18 @@
     githubId = 93013864;
     name = "nat-418";
   };
-  nathanruiz = {
-    email = "nathanruiz@protonmail.com";
-    github = "nathanruiz";
-    githubId = 18604892;
-    name = "Nathan Ruiz";
-  };
   nathan-gs = {
     email = "nathan@nathan.gs";
     github = "nathan-gs";
     githubId = 330943;
     name = "Nathan Bijnens";
   };
+  nathanruiz = {
+    email = "nathanruiz@protonmail.com";
+    github = "nathanruiz";
+    githubId = 18604892;
+    name = "Nathan Ruiz";
+  };
   nathyong = {
     github = "nathyong";
     githubId = 818502;
@@ -10508,18 +10633,18 @@
     matrix = "@n3t:matrix.org";
     name = "Adrian Sadłocha";
   };
-  neeasade = {
-    email = "nathanisom27@gmail.com";
-    github = "neeasade";
-    githubId = 3747396;
-    name = "Nathan Isom";
-  };
   necrophcodr = {
     email = "nc@scalehost.eu";
     github = "necrophcodr";
     githubId = 575887;
     name = "Steffen Rytter Postas";
   };
+  neeasade = {
+    email = "nathanisom27@gmail.com";
+    github = "neeasade";
+    githubId = 3747396;
+    name = "Nathan Isom";
+  };
   neilmayhew = {
     email = "nix@neil.mayhew.name";
     github = "neilmayhew";
@@ -10575,12 +10700,6 @@
     github = "nessdoor";
     githubId = 25993494;
   };
-  net-mist = {
-    email = "archimist.linux@gmail.com";
-    github = "Net-Mist";
-    githubId = 13920346;
-    name = "Sébastien Iooss";
-  };
   netali = {
     name = "Jennifer Graul";
     email = "me@netali.de";
@@ -10602,6 +10721,12 @@
     githubId = 1488603;
     name = "François Espinet";
   };
+  net-mist = {
+    email = "archimist.linux@gmail.com";
+    github = "Net-Mist";
+    githubId = 13920346;
+    name = "Sébastien Iooss";
+  };
   neverbehave = {
     email = "i@never.pet";
     github = "NeverBehave";
@@ -10614,30 +10739,6 @@
     githubId = 7845120;
     name = "Alex Martens";
   };
-  nialov = {
-    email = "nikolasovaskainen@gmail.com";
-    github = "nialov";
-    githubId = 47318483;
-    name = "Nikolas Ovaskainen";
-  };
-  nikitavoloboev = {
-    email = "nikita.voloboev@gmail.com";
-    github = "nikitavoloboev";
-    githubId = 6391776;
-    name = "Nikita Voloboev";
-  };
-  nikstur = {
-    email = "nikstur@outlook.com";
-    name = "nikstur";
-    github = "nikstur";
-    githubId = 61635709;
-  };
-  nintron = {
-    email = "nintron@sent.com";
-    github = "Nintron27";
-    githubId = 47835714;
-    name = "Nintron";
-  };
   ngerstle = {
     name = "Nicholas Gerstle";
     email = "ngerstle@gmail.com";
@@ -10663,6 +10764,12 @@
     githubId = 10180857;
     name = "Anmol Sethi";
   };
+  nialov = {
+    email = "nikolasovaskainen@gmail.com";
+    github = "nialov";
+    githubId = 47318483;
+    name = "Nikolas Ovaskainen";
+  };
   nicbk = {
     email = "nicolas@nicbk.com";
     github = "nicbk";
@@ -10672,12 +10779,6 @@
       fingerprint = "7BC1 77D9 C222 B1DC FB2F  0484 C061 089E FEBF 7A35";
     }];
   };
-  nichtsfrei = {
-    email = "philipp.eder@posteo.net";
-    github = "nichtsfrei";
-    githubId = 1665818;
-    name = "Philipp Eder";
-  };
   nickcao = {
     name = "Nick Cao";
     email = "nickcao@nichi.co";
@@ -10723,30 +10824,42 @@
     github = "nigelgbanks";
     githubId = 487373;
   };
+  nikitavoloboev = {
+    email = "nikita.voloboev@gmail.com";
+    github = "nikitavoloboev";
+    githubId = 6391776;
+    name = "Nikita Voloboev";
+  };
   NikolaMandic = {
     email = "nikola@mandic.email";
     github = "NikolaMandic";
     githubId = 4368690;
     name = "Ratko Mladic";
   };
+  nikstur = {
+    email = "nikstur@outlook.com";
+    name = "nikstur";
+    github = "nikstur";
+    githubId = 61635709;
+  };
   nilp0inter = {
     email = "robertomartinezp@gmail.com";
     github = "nilp0inter";
     githubId = 1224006;
     name = "Roberto Abdelkader Martínez Pérez";
   };
-  nilsirl = {
-    email = "nils@nilsand.re";
-    github = "NilsIrl";
-    githubId = 26231126;
-    name = "Nils ANDRÉ-CHANG";
-  };
   nils-degroot = {
     email = "nils@peeko.nl";
     github = "nils-degroot";
     githubId = 53556985;
     name = "Nils de Groot";
   };
+  nilsirl = {
+    email = "nils@nilsand.re";
+    github = "NilsIrl";
+    githubId = 26231126;
+    name = "Nils ANDRÉ-CHANG";
+  };
   ninjatrappeur = {
     email = "felix@alternativebit.fr";
     matrix = "@ninjatrappeur:matrix.org";
@@ -10754,32 +10867,23 @@
     githubId = 1219785;
     name = "Félix Baylac-Jacqué";
   };
+  nintron = {
+    email = "nintron@sent.com";
+    github = "Nintron27";
+    githubId = 47835714;
+    name = "Nintron";
+  };
   nioncode = {
     email = "nioncode+github@gmail.com";
     github = "nioncode";
     githubId = 3159451;
     name = "Nicolas Schneider";
   };
-  nkje = {
-    name = "Niels Kristian Lyshøj Jensen";
-    email = "n@nk.je";
-    github = "NKJe";
-    githubId = 1102306;
-    keys = [{
-      fingerprint = "B956 C6A4 22AF 86A0 8F77  A8CA DE3B ADFE CD31 A89D";
-    }];
-  };
   nitsky = {
     name = "nitsky";
     github = "nitsky";
     githubId = 492793;
   };
-  nkpvk = {
-    email = "niko.pavlinek@gmail.com";
-    github = "npavlinek";
-    githubId = 16385648;
-    name = "Niko Pavlinek";
-  };
   nixbitcoin = {
     email = "nixbitcoin@i2pmail.org";
     github = "nixbitcoin";
@@ -10808,6 +10912,21 @@
     githubId = 7347290;
     name = "Nisala Kalupahana";
   };
+  nkje = {
+    name = "Niels Kristian Lyshøj Jensen";
+    email = "n@nk.je";
+    github = "NKJe";
+    githubId = 1102306;
+    keys = [{
+      fingerprint = "B956 C6A4 22AF 86A0 8F77  A8CA DE3B ADFE CD31 A89D";
+    }];
+  };
+  nkpvk = {
+    email = "niko.pavlinek@gmail.com";
+    github = "npavlinek";
+    githubId = 16385648;
+    name = "Niko Pavlinek";
+  };
   nloomans = {
     email = "noah@nixos.noahloomans.com";
     github = "nloomans";
@@ -10875,24 +10994,40 @@
     githubId = 3521180;
     name = "Tom Sydney Kerckhove";
   };
+  notbandali = {
+    name = "Amin Bandali";
+    email = "bandali@gnu.org";
+    github = "bandali0";
+    githubId = 1254858;
+    keys = [{
+      fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103";
+    }];
+  };
+  not-my-segfault = {
+    email = "michal@tar.black";
+    matrix = "@michal:tar.black";
+    github = "not-my-segfault";
+    githubId = 30374463;
+    name = "Michal S.";
+  };
   notthemessiah = {
     email = "brian.cohen.88@gmail.com";
     github = "NOTtheMessiah";
     githubId = 2946283;
     name = "Brian Cohen";
   };
-  novoxd = {
-    email = "radnovox@gmail.com";
-    github = "novoxd";
-    githubId = 6052922;
-    name = "Kirill Struokov";
-  };
   novenary = {
     email = "streetwalkermc@gmail.com";
     github = "9ary";
     githubId = 1155030;
     name = "novenary";
   };
+  novoxd = {
+    email = "radnovox@gmail.com";
+    github = "novoxd";
+    githubId = 6052922;
+    name = "Kirill Struokov";
+  };
   np = {
     email = "np.nix@nicolaspouillard.fr";
     github = "np";
@@ -10948,18 +11083,18 @@
     githubId = 22592293;
     name = "Kartik Gokte";
   };
-  nullx76 = {
-    email = "nix@xirion.net";
-    github = "NULLx76";
-    githubId = 1809198;
-    name = "Victor Roest";
-  };
   nullishamy = {
     email = "amy.codes@null.net";
     name = "nullishamy";
     github = "nullishamy";
     githubId = 99221043;
   };
+  nullx76 = {
+    email = "nix@xirion.net";
+    github = "NULLx76";
+    githubId = 1809198;
+    name = "Victor Roest";
+  };
   numinit = {
     email = "me@numin.it";
     github = "numinit";
@@ -11025,12 +11160,6 @@
     githubId = 61095988;
     name = "Brian Shu";
   };
-  obsidian-systems-maintenance = {
-    name = "Obsidian Systems Maintenance";
-    email = "maintainer@obsidian.systems";
-    github = "obsidian-systems-maintenance";
-    githubId = 80847921;
-  };
   obfusk = {
     email = "flx@obfusk.net";
     matrix = "@obfusk:matrix.org";
@@ -11041,6 +11170,12 @@
       fingerprint = "D5E4 A51D F8D2 55B9 FAC6  A9BB 2F96 07F0 9B36 0F2D";
     }];
   };
+  obsidian-systems-maintenance = {
+    name = "Obsidian Systems Maintenance";
+    email = "maintainer@obsidian.systems";
+    github = "obsidian-systems-maintenance";
+    githubId = 80847921;
+  };
   ocfox = {
     email = "i@ocfox.me";
     github = "ocfox";
@@ -11132,18 +11267,18 @@
     githubId = 817073;
     name = "Yc. Shen";
   };
-  onsails = {
-    email = "andrey@onsails.com";
-    github = "onsails";
-    githubId = 107261;
-    name = "Andrey Kuznetsov";
-  };
   onny = {
     email = "onny@project-insanity.org";
     github = "onny";
     githubId = 757752;
     name = "Jonas Heinrich";
   };
+  onsails = {
+    email = "andrey@onsails.com";
+    github = "onsails";
+    githubId = 107261;
+    name = "Andrey Kuznetsov";
+  };
   onthestairs = {
     email = "austinplatt@gmail.com";
     github = "onthestairs";
@@ -11156,18 +11291,18 @@
     github = "ony";
     githubId = 11265;
   };
-  OPNA2608 = {
-    email = "christoph.neidahl@gmail.com";
-    github = "OPNA2608";
-    githubId = 23431373;
-    name = "Christoph Neidahl";
-  };
   opeik = {
     email = "sandro@stikic.com";
     github = "opeik";
     githubId = 11566773;
     name = "Sandro Stikić";
   };
+  OPNA2608 = {
+    email = "christoph.neidahl@gmail.com";
+    github = "OPNA2608";
+    githubId = 23431373;
+    name = "Christoph Neidahl";
+  };
   orbekk = {
     email = "kjetil.orbekk@gmail.com";
     github = "orbekk";
@@ -11204,6 +11339,15 @@
     githubId = 111265;
     name = "Ozan Sener";
   };
+  ostrolucky = {
+    email = "gabriel.ostrolucky@gmail.com";
+    github = "ostrolucky";
+    githubId = 496233;
+    name = "Gabriel Ostrolucký";
+    keys = [{
+      fingerprint = "6611 22A7 B778 6E4A E99A  9D6E C79A D015 19EF B134";
+    }];
+  };
   otavio = {
     email = "otavio.salvador@ossystems.com.br";
     github = "otavio";
@@ -11222,6 +11366,12 @@
     githubId = 108072;
     name = "Slawomir Gonet";
   };
+  ovlach = {
+    email = "ondrej@vlach.xyz";
+    name = "Ondrej Vlach";
+    github = "ovlach";
+    githubId = 4405107;
+  };
   oxalica = {
     email = "oxalicc@pm.me";
     github = "oxalica";
@@ -11264,18 +11414,18 @@
     githubId = 15930073;
     name = "Moritz Scheuren";
   };
-  ovlach = {
-    email = "ondrej@vlach.xyz";
-    name = "Ondrej Vlach";
-    github = "ovlach";
-    githubId = 4405107;
-  };
   ozkutuk = {
     email = "ozkutuk@protonmail.com";
     github = "ozkutuk";
     githubId = 5948762;
     name = "Berk Özkütük";
   };
+  p3psi = {
+    name = "Elliot Boo";
+    email = "p3psi.boo@gmail.com";
+    github = "p3psi-boo";
+    githubId = 43925055;
+  };
   pablovsky = {
     email = "dealberapablo07@gmail.com";
     github = "Pablo1107";
@@ -11350,13 +11500,6 @@
     githubId = 71795;
     name = "Mica Semrick";
   };
-  annaaurora = {
-    email = "anna@annaaurora.eu";
-    matrix = "@papojari:artemislena.eu";
-    github = "auroraanna";
-    githubId = 81317317;
-    name = "Anna Aurora";
-  };
   paraseba = {
     email = "paraseba@gmail.com";
     github = "paraseba";
@@ -11426,18 +11569,18 @@
     githubId = 49961859;
     name = "Pavel Sobolev";
   };
-  payas = {
-    email = "relekarpayas@gmail.com";
-    github = "bhankas";
-    githubId = 24254289;
-    name = "Payas Relekar";
-  };
   pawelpacana = {
     email = "pawel.pacana@gmail.com";
     github = "pawelpacana";
     githubId = 116740;
     name = "Paweł Pacana";
   };
+  payas = {
+    email = "relekarpayas@gmail.com";
+    github = "bhankas";
+    githubId = 24254289;
+    name = "Payas Relekar";
+  };
   pb- = {
     email = "pbaecher@gmail.com";
     github = "pb-";
@@ -11450,6 +11593,12 @@
     githubId = 26949935;
     name = "Pierce Bartine";
   };
+  pblkt = {
+    email = "pebblekite@gmail.com";
+    github = "pblkt";
+    githubId = 6498458;
+    name = "pebble kite";
+  };
   pbogdan = {
     email = "ppbogdan@gmail.com";
     github = "pbogdan";
@@ -11462,12 +11611,6 @@
     githubId = 434254;
     name = "Pavel Borzenkov";
   };
-  pblkt = {
-    email = "pebblekite@gmail.com";
-    github = "pblkt";
-    githubId = 6498458;
-    name = "pebble kite";
-  };
   pbsds = {
     name = "Peder Bergebakken Sundt";
     email = "pbsds@hotmail.com";
@@ -11486,6 +11629,18 @@
     githubId = 1368952;
     name = "Pedro Lara Campos";
   };
+  peelz = {
+    email = "peelz.dev+nixpkgs@gmail.com";
+    github = "notpeelz";
+    githubId = 920910;
+    name = "peelz";
+  };
+  penalty1083 = {
+    email = "penalty1083@outlook.com";
+    github = "penalty1083";
+    githubId = 121009904;
+    name = "penalty1083";
+  };
   penguwin = {
     email = "penguwin@penguwin.eu";
     github = "penguwin";
@@ -11498,12 +11653,6 @@
     github = "pennae";
     githubId = 82953136;
   };
-  p3psi = {
-    name = "Elliot Boo";
-    email = "p3psi.boo@gmail.com";
-    github = "p3psi-boo";
-    githubId = 43925055;
-  };
   periklis = {
     email = "theopompos@gmail.com";
     github = "periklis";
@@ -11617,6 +11766,12 @@
     githubId = 9267430;
     name = "Philipp Mildenberger";
   };
+  phip1611 = {
+    email = "phip1611@gmail.com";
+    github = "phip1611";
+    githubId = 5737016;
+    name = "Philipp Schuster";
+  };
   Phlogistique = {
     email = "noe.rubinstein@gmail.com";
     github = "Phlogistique";
@@ -11726,12 +11881,6 @@
     githubId = 3737;
     name = "Peter Jones";
   };
-  phip1611 = {
-    email = "phip1611@gmail.com";
-    github = "phip1611";
-    githubId = 5737016;
-    name = "Philipp Schuster";
-  };
   pkharvey = {
     email = "kayharvey@protonmail.com";
     github = "pkharvey";
@@ -11874,6 +12023,12 @@
     githubId = 10473184;
     name = "Jia Xiaodong";
   };
+  poelzi = {
+    email = "nix@poelzi.org";
+    github = "poelzi";
+    githubId = 66107;
+    name = "Daniel Poelzleithner";
+  };
   pogobanane = {
     email = "mail@peter-okelmann.de";
     github = "pogobanane";
@@ -11903,12 +12058,6 @@
     githubId = 81340136;
     name = "polykernel";
   };
-  poelzi = {
-    email = "nix@poelzi.org";
-    github = "poelzi";
-    githubId = 66107;
-    name = "Daniel Poelzleithner";
-  };
   polyrod = {
     email = "dc1mdp@gmail.com";
     github = "polyrod";
@@ -11993,16 +12142,6 @@
     githubId = 228931;
     name = "Philipp Riegger";
   };
-  princemachiavelli = {
-    name = "Josh Hoffer";
-    email = "jhoffer@sansorgan.es";
-    matrix = "@princemachiavelli:matrix.org";
-    github = "Princemachiavelli";
-    githubId = 2730968;
-    keys = [{
-      fingerprint = "DD54 130B ABEC B65C 1F6B  2A38 8312 4F97 A318 EA18";
-    }];
-  };
   prikhi = {
     email = "pavan.rikhi@gmail.com";
     github = "prikhi";
@@ -12026,11 +12165,15 @@
       }
     ];
   };
-  prtzl = {
-    email = "matej.blagsic@protonmail.com";
-    github = "prtzl";
-    githubId = 32430344;
-    name = "Matej Blagsic";
+  princemachiavelli = {
+    name = "Josh Hoffer";
+    email = "jhoffer@sansorgan.es";
+    matrix = "@princemachiavelli:matrix.org";
+    github = "Princemachiavelli";
+    githubId = 2730968;
+    keys = [{
+      fingerprint = "DD54 130B ABEC B65C 1F6B  2A38 8312 4F97 A318 EA18";
+    }];
   };
   ProducerMatt = {
     name = "Matthew Pherigo";
@@ -12068,6 +12211,21 @@
     githubId = 4633847;
     name = "Ben Hamlin";
   };
+  prrlvr = {
+    email = "po@prrlvr.fr";
+    github = "prrlvr";
+    githubId = 33699501;
+    name = "Pierre-Olivier Rey";
+    keys = [{
+      fingerprint = "40A0 78FD 297B 0AC1 E6D8  A119 4D38 49D9 9555 1307";
+    }];
+  };
+  prtzl = {
+    email = "matej.blagsic@protonmail.com";
+    github = "prtzl";
+    githubId = 32430344;
+    name = "Matej Blagsic";
+  };
   prusnak = {
     email = "pavol@rusnak.io";
     github = "prusnak";
@@ -12180,12 +12338,6 @@
     githubId = 4579165;
     name = "Danny Bautista";
   };
-  peelz = {
-    email = "peelz.dev+nixpkgs@gmail.com";
-    github = "notpeelz";
-    githubId = 920910;
-    name = "peelz";
-  };
   q3k = {
     email = "q3k@q3k.org";
     github = "q3k";
@@ -12249,12 +12401,6 @@
       fingerprint = "7573 56D7 79BB B888 773E  415E 736C CDF9 EF51 BD97";
     }];
   };
-  r-burns = {
-    email = "rtburns@protonmail.com";
-    github = "r-burns";
-    githubId = 52847440;
-    name = "Ryan Burns";
-  };
   r3dl3g = {
     email = "redleg@rothfuss-web.de";
     github = "r3dl3g";
@@ -12283,18 +12429,24 @@
       fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6";
     }];
   };
-  RaghavSood = {
-    email = "r@raghavsood.com";
-    github = "RaghavSood";
-    githubId = 903072;
-    name = "Raghav Sood";
-  };
   rafaelgg = {
     email = "rafael.garcia.gallego@gmail.com";
     github = "rafaelgg";
     githubId = 1016742;
     name = "Rafael García";
   };
+  ragge = {
+    email = "r.dahlen@gmail.com";
+    github = "ragnard";
+    githubId = 882;
+    name = "Ragnar Dahlen";
+  };
+  RaghavSood = {
+    email = "r@raghavsood.com";
+    github = "RaghavSood";
+    githubId = 903072;
+    name = "Raghav Sood";
+  };
   raitobezarius = {
     email = "ryan@lahfa.xyz";
     matrix = "@raitobezarius:matrix.org";
@@ -12302,31 +12454,18 @@
     githubId = 314564;
     name = "Ryan Lahfa";
   };
-  raphaelr = {
-    email = "raphael-git@tapesoftware.net";
-    matrix = "@raphi:tapesoftware.net";
-    github = "raphaelr";
-    githubId = 121178;
-    name = "Raphael Robatsch";
-  };
-  raquelgb = {
-    email = "raquel.garcia.bautista@gmail.com";
-    github = "raquelgb";
-    githubId = 1246959;
-    name = "Raquel García";
-  };
-  ragge = {
-    email = "r.dahlen@gmail.com";
-    github = "ragnard";
-    githubId = 882;
-    name = "Ragnar Dahlen";
-  };
   rakesh4g = {
     email = "rakeshgupta4u@gmail.com";
     github = "Rakesh4G";
     githubId = 50867187;
     name = "Rakesh Gupta";
   };
+  ralismark = {
+    email = "nixpkgs@ralismark.xyz";
+    github = "ralismark";
+    githubId = 13449732;
+    name = "Temmie";
+  };
   ralith = {
     email = "ben.e.saunders@gmail.com";
     matrix = "@ralith:ralith.com";
@@ -12346,6 +12485,19 @@
     github = "ranfdev";
     githubId = 23294184;
   };
+  raphaelr = {
+    email = "raphael-git@tapesoftware.net";
+    matrix = "@raphi:tapesoftware.net";
+    github = "raphaelr";
+    githubId = 121178;
+    name = "Raphael Robatsch";
+  };
+  raquelgb = {
+    email = "raquel.garcia.bautista@gmail.com";
+    github = "raquelgb";
+    githubId = 1246959;
+    name = "Raquel García";
+  };
   rardiol = {
     email = "ricardo.ardissone@gmail.com";
     github = "rardiol";
@@ -12414,6 +12566,12 @@
     githubId = 743058;
     name = "Rob Brewer";
   };
+  r-burns = {
+    email = "rtburns@protonmail.com";
+    github = "r-burns";
+    githubId = 52847440;
+    name = "Ryan Burns";
+  };
   rdnetto = {
     email = "rdnetto@gmail.com";
     github = "rdnetto";
@@ -12426,12 +12584,6 @@
     github = "realsnick";
     githubId = 1440852;
   };
-  redbaron = {
-    email = "ivanov.maxim@gmail.com";
-    github = "redbaron";
-    githubId = 16624;
-    name = "Maxim Ivanov";
-  };
   reckenrode = {
     name = "Randy Eckenrode";
     email = "randy@largeandhighquality.com";
@@ -12445,6 +12597,12 @@
       }
     ];
   };
+  redbaron = {
+    email = "ivanov.maxim@gmail.com";
+    github = "redbaron";
+    githubId = 16624;
+    name = "Maxim Ivanov";
+  };
   redfish64 = {
     email = "engler@gmail.com";
     github = "redfish64";
@@ -12536,18 +12694,18 @@
       fingerprint = "91EB E870 1639 1323 642A  6803 B966 009D 57E6 9CC6";
     }];
   };
-  rexim = {
-    email = "reximkut@gmail.com";
-    github = "rexim";
-    githubId = 165283;
-    name = "Alexey Kutepov";
-  };
   rewine = {
     email = "lhongxu@outlook.com";
     github = "wineee";
     githubId = 22803888;
     name = "Lu Hongxu";
   };
+  rexim = {
+    email = "reximkut@gmail.com";
+    github = "rexim";
+    githubId = 165283;
+    name = "Alexey Kutepov";
+  };
   rgnns = {
     email = "jglievano@gmail.com";
     github = "rgnns";
@@ -12572,18 +12730,18 @@
     githubId = 12279531;
     name = "Ricardo Guevara";
   };
-  rht = {
-    email = "rhtbot@protonmail.com";
-    github = "rht";
-    githubId = 395821;
-    name = "rht";
-  };
   rhoriguchi = {
     email = "ryan.horiguchi@gmail.com";
     github = "rhoriguchi";
     githubId = 6047658;
     name = "Ryan Horiguchi";
   };
+  rht = {
+    email = "rhtbot@protonmail.com";
+    github = "rht";
+    githubId = 395821;
+    name = "rht";
+  };
   rhysmdnz = {
     email = "rhys@memes.nz";
     matrix = "@rhys:memes.nz";
@@ -12673,6 +12831,12 @@
     githubId = 449990;
     name = "Cedric Cellier";
   };
+  rizary = {
+    email = "andika@numtide.com";
+    github = "Rizary";
+    githubId = 7221768;
+    name = "Andika Demas Riyandi";
+  };
   rkitover = {
     email = "rkitover@gmail.com";
     github = "rkitover";
@@ -12685,12 +12849,6 @@
     githubId = 2507744;
     name = "Roland Koebler";
   };
-  rizary = {
-    email = "andika@numtide.com";
-    github = "Rizary";
-    githubId = 7221768;
-    name = "Andika Demas Riyandi";
-  };
   rkrzr = {
     email = "ops+nixpkgs@channable.com";
     github = "rkrzr";
@@ -12911,18 +13069,18 @@
     github = "rski";
     githubId = 2960312;
   };
-  rszibele = {
-    email = "richard@szibele.com";
-    github = "rszibele";
-    githubId = 1387224;
-    name = "Richard Szibele";
-  };
   rsynnest = {
     email = "contact@rsynnest.com";
     github = "rsynnest";
     githubId = 4392850;
     name = "Roland Synnestvedt";
   };
+  rszibele = {
+    email = "richard@szibele.com";
+    github = "rszibele";
+    githubId = 1387224;
+    name = "Richard Szibele";
+  };
   rtburns-jpl = {
     email = "rtburns@jpl.nasa.gov";
     github = "rtburns-jpl";
@@ -12935,12 +13093,23 @@
     githubId = 61306;
     name = "Rene Treffer";
   };
+  ruby0b = {
+    github = "ruby0b";
+    githubId = 106119328;
+    name = "ruby0b";
+  };
   rubyowo = {
     name = "Rei Star";
     email = "perhaps-you-know@what-is.ml";
     github = "rubyowo";
     githubId = 105302757;
   };
+  Ruixi-rebirth = {
+    name = "Ruixi-rebirth";
+    email = "ruixirebirth@gmail.com";
+    github = "Ruixi-rebirth";
+    githubId = 75824585;
+  };
   rumpelsepp = {
     name = "Stefan Tatschner";
     email = "stefan@rumpelsepp.org";
@@ -12995,6 +13164,12 @@
     githubId = 12877905;
     name = "Roman Volosatovs";
   };
+  rxiao = {
+    email = "ben.xiao@me.com";
+    github = "benxiao";
+    githubId = 10908495;
+    name = "Ran Xiao";
+  };
   ryanartecona = {
     email = "ryanartecona@gmail.com";
     github = "ryanartecona";
@@ -13205,6 +13380,12 @@
     githubId = 8534888;
     name = "Savanni D'Gerinel";
   };
+  savyajha = {
+    email = "savya.jha@hawkradius.com";
+    github = "savyajha";
+    githubId = 3996019;
+    name = "Savyasachee Jha";
+  };
   sayanarijit = {
     email = "sayanarijit@gmail.com";
     github = "sayanarijit";
@@ -13246,17 +13427,6 @@
     githubId = 3958212;
     name = "Tom Sorlie";
   };
-  sioodmy = {
-    name = "Antoni Sokołowski";
-    github = "sioodmy";
-    githubId = 81568712;
-  };
-  siph = {
-    name = "Chris Dawkins";
-    email = "dawkins.chris.dev@gmail.com";
-    github = "siph";
-    githubId = 6619112;
-  };
   schmitthenner = {
     email = "development@schmitthenner.eu";
     github = "fkz";
@@ -13548,18 +13718,18 @@
     githubId = 46294732;
     name = "Sharzy";
   };
-  shawndellysse = {
-    email = "sdellysse@gmail.com";
-    github = "sdellysse";
-    githubId = 293035;
-    name = "Shawn Dellysse";
-  };
   shawn8901 = {
     email = "shawn8901@googlemail.com";
     github = "Shawn8901";
     githubId = 12239057;
     name = "Shawn8901";
   };
+  shawndellysse = {
+    email = "sdellysse@gmail.com";
+    github = "sdellysse";
+    githubId = 293035;
+    name = "Shawn Dellysse";
+  };
   shazow = {
     email = "andrey.petrov@shazow.net";
     github = "shazow";
@@ -13696,18 +13866,18 @@
     github = "Simarra";
     githubId = 14372987;
   };
-  simoneruffini = {
-    email = "simone.ruffini@tutanota.com";
-    github = "simoneruffini";
-    githubId = 50401154;
-    name = "Simone Ruffini";
-  };
   simonchatts = {
     email = "code@chatts.net";
     github = "simonchatts";
     githubId = 11135311;
     name = "Simon Chatterjee";
   };
+  simoneruffini = {
+    email = "simone.ruffini@tutanota.com";
+    github = "simoneruffini";
+    githubId = 50401154;
+    name = "Simone Ruffini";
+  };
   simonkampe = {
     email = "simon.kampe+nix@gmail.com";
     github = "simonkampe";
@@ -13720,6 +13890,17 @@
     githubId = 2770647;
     name = "Simon Vandel Sillesen";
   };
+  sioodmy = {
+    name = "Antoni Sokołowski";
+    github = "sioodmy";
+    githubId = 81568712;
+  };
+  siph = {
+    name = "Chris Dawkins";
+    email = "dawkins.chris.dev@gmail.com";
+    github = "siph";
+    githubId = 6619112;
+  };
   sir4ur0n = {
     github = "sir4ur0n";
     githubId = 1204125;
@@ -14175,18 +14356,18 @@
     githubId = 113068;
     name = "Stefan Siegl";
   };
-  steve-chavez = {
-    email = "stevechavezast@gmail.com";
-    github = "steve-chavez";
-    githubId = 1829294;
-    name = "Steve Chávez";
-  };
   stevebob = {
     email = "stephen@sherra.tt";
     github = "gridbugs";
     githubId = 417118;
     name = "Stephen Sherratt";
   };
+  steve-chavez = {
+    email = "stevechavezast@gmail.com";
+    github = "steve-chavez";
+    githubId = 1829294;
+    name = "Steve Chávez";
+  };
   steveej = {
     email = "mail@stefanjunker.de";
     github = "steveeJ";
@@ -14327,18 +14508,18 @@
     githubId = 1040871;
     name = "Mathis Antony";
   };
-  sven-of-cord = {
-    email = "sven@cord.com";
-    github = "sven-of-cord";
-    githubId = 98333944;
-    name = "Sven Over";
-  };
   svend = {
     email = "svend@svends.net";
     github = "svend";
     githubId = 306190;
     name = "Svend Sorensen";
   };
+  sven-of-cord = {
+    email = "sven@cord.com";
+    github = "sven-of-cord";
+    githubId = 98333944;
+    name = "Sven Over";
+  };
   svrana = {
     email = "shaw@vranix.com";
     github = "svrana";
@@ -14466,12 +14647,6 @@
     githubId = 6457015;
     name = "Taha Gharib";
   };
-  tailhook = {
-    email = "paul@colomiets.name";
-    github = "tailhook";
-    githubId = 321799;
-    name = "Paul Colomiets";
-  };
   taikx4 = {
     email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";
     github = "taikx4";
@@ -14481,6 +14656,12 @@
       fingerprint = "6B02 8103 C4E5 F68C D77C  9E54 CCD5 2C7B 37BB 837E";
     }];
   };
+  tailhook = {
+    email = "paul@colomiets.name";
+    github = "tailhook";
+    githubId = 321799;
+    name = "Paul Colomiets";
+  };
   takagiy = {
     email = "takagiy.4dev@gmail.com";
     github = "takagiy";
@@ -14708,18 +14889,18 @@
     github = "tfmoraes";
     githubId = 351108;
   };
-  tg-x = {
-    email = "*@tg-x.net";
-    github = "tg-x";
-    githubId = 378734;
-    name = "TG ⊗ Θ";
-  };
   tgunnoe = {
     email = "t@gvno.net";
     github = "tgunnoe";
     githubId = 7254833;
     name = "Taylor Gunnoe";
   };
+  tg-x = {
+    email = "*@tg-x.net";
+    github = "tg-x";
+    githubId = 378734;
+    name = "TG ⊗ Θ";
+  };
   th0rgal = {
     email = "thomas.marchand@tuta.io";
     github = "Th0rgal";
@@ -14773,18 +14954,18 @@
     githubId = 629710;
     name = "David Meister";
   };
-  thefloweringash = {
-    email = "lorne@cons.org.nz";
-    github = "thefloweringash";
-    githubId = 42933;
-    name = "Andrew Childs";
-  };
   thefenriswolf = {
     email = "stefan.rohrbacher97@gmail.com";
     github = "thefenriswolf";
     githubId = 8547242;
     name = "Stefan Rohrbacher";
   };
+  thefloweringash = {
+    email = "lorne@cons.org.nz";
+    github = "thefloweringash";
+    githubId = 42933;
+    name = "Andrew Childs";
+  };
   thehedgeh0g = {
     name = "The Hedgehog";
     email = "hedgehog@mrhedgehog.xyz";
@@ -14795,6 +14976,15 @@
       fingerprint = "38A0 29B0 4A7E 4C13 A4BB  86C8 7D51 0786 6B1C 6752";
     }];
   };
+  thekostins = {
+    name = "Konstantin";
+    email = "anisimovkosta19@gmail.com";
+    github = "TheKostins";
+    githubId = 39405421;
+    keys = [{
+      fingerprint = "B216 7B33 E248 097F D82A  991D C94D 589A 4D0D CDD2";
+    }];
+  };
   thelegy = {
     email = "mail+nixos@0jb.de";
     github = "thelegy";
@@ -14866,12 +15056,6 @@
     github = "thled";
     githubId = 28220902;
   };
-  thyol = {
-    name = "thyol";
-    email = "thyol@pm.me";
-    github = "thyol";
-    githubId = 81481634;
-  };
   thmzlt = {
     email = "git@thomazleite.com";
     github = "thmzlt";
@@ -14884,18 +15068,18 @@
     githubId = 681004;
     name = "Thomas Desrosiers";
   };
-  ThomasMader = {
-    email = "thomas.mader@gmail.com";
-    github = "ThomasMader";
-    githubId = 678511;
-    name = "Thomas Mader";
-  };
   thomasjm = {
     email = "tom@codedown.io";
     github = "thomasjm";
     githubId = 1634990;
     name = "Tom McLaughlin";
   };
+  ThomasMader = {
+    email = "thomas.mader@gmail.com";
+    github = "ThomasMader";
+    githubId = 678511;
+    name = "Thomas Mader";
+  };
   thornycrackers = {
     email = "codyfh@gmail.com";
     github = "thornycrackers";
@@ -14929,6 +15113,12 @@
       fingerprint = "7F3E EEAA EE66 93CC 8782  042A 7550 7BE2 56F4 0CED";
     }];
   };
+  thyol = {
+    name = "thyol";
+    email = "thyol@pm.me";
+    github = "thyol";
+    githubId = 81481634;
+  };
   tiagolobocastro = {
     email = "tiagolobocastro@gmail.com";
     github = "tiagolobocastro";
@@ -15068,18 +15258,18 @@
       fingerprint = "7944 74B7 D236 DAB9 C9EF  E7F9 5CCE 6F14 66D4 7C9E";
     }];
   };
-  tobim = {
-    email = "nix@tobim.fastmail.fm";
-    github = "tobim";
-    githubId = 858790;
-    name = "Tobias Mayer";
-  };
   tobiasBora = {
     email = "tobias.bora.list@gmail.com";
     github = "tobiasBora";
     githubId = 2164118;
     name = "Tobias Bora";
   };
+  tobim = {
+    email = "nix@tobim.fastmail.fm";
+    github = "tobim";
+    githubId = 858790;
+    name = "Tobias Mayer";
+  };
   tokudan = {
     email = "git@danielfrank.net";
     github = "tokudan";
@@ -15118,12 +15308,6 @@
     githubId = 68489118;
     name = "Tomodachi94";
   };
-  tomsmeets = {
-    email = "tom.tsmeets@gmail.com";
-    github = "TomSmeets";
-    githubId = 6740669;
-    name = "Tom Smeets";
-  };
   tomsiewert = {
     email = "tom@siewert.io";
     matrix = "@tom:frickel.earth";
@@ -15131,6 +15315,12 @@
     githubId = 8794235;
     name = "Tom Siewert";
   };
+  tomsmeets = {
+    email = "tom.tsmeets@gmail.com";
+    github = "TomSmeets";
+    githubId = 6740669;
+    name = "Tom Smeets";
+  };
   tonyshkurenko = {
     email = "support@twingate.com";
     github = "antonshkurenko";
@@ -15265,6 +15455,18 @@
     githubId = 563054;
     name = "Thomas Tuegel";
   };
+  tu-maurice = {
+    email = "valentin.gehrke+nixpkgs@zom.bi";
+    github = "tu-maurice";
+    githubId = 16151097;
+    name = "Valentin Gehrke";
+  };
+  Tungsten842 = {
+    name = "Tungsten842";
+    email = "886724vf@anonaddy.me";
+    github = "Tungsten842";
+    githubId = 24614168;
+  };
   turbomack = {
     email = "marek.faj@gmail.com";
     github = "turboMaCk";
@@ -15277,12 +15479,6 @@
     githubId = 303489;
     name = "Manuel Bärenz";
   };
-  tu-maurice = {
-    email = "valentin.gehrke+nixpkgs@zom.bi";
-    github = "tu-maurice";
-    githubId = 16151097;
-    name = "Valentin Gehrke";
-  };
   tuxinaut = {
     email = "trash4you@tuxinaut.de";
     github = "tuxinaut";
@@ -15689,18 +15885,18 @@
     githubId = 118959;
     name = "VinyMeuh";
   };
-  virchau13 = {
-    email = "virchau13@hexular.net";
-    github = "virchau13";
-    githubId = 16955157;
-    name = "Vir Chaudhury";
-  };
   viraptor = {
     email = "nix@viraptor.info";
     github = "viraptor";
     githubId = 188063;
     name = "Stanisław Pitucha";
   };
+  virchau13 = {
+    email = "virchau13@hexular.net";
+    github = "virchau13";
+    githubId = 16955157;
+    name = "Vir Chaudhury";
+  };
   viric = {
     email = "viric@viric.name";
     github = "viric";
@@ -15958,15 +16154,6 @@
     githubId = 13031455;
     name = "Jakob Schmutz";
   };
-  witchof0x20 = {
-    name = "Jade";
-    email = "jade@witchof.space";
-    github = "witchof0x20";
-    githubId = 36118348;
-    keys = [{
-      fingerprint = "69C9 876B 5797 1B2E 11C5  7C39 80A1 F76F C9F9 54AE";
-    }];
-  };
   WhiteBlackGoose = {
     email = "wbg@angouri.org";
     github = "WhiteBlackGoose";
@@ -15997,6 +16184,11 @@
       fingerprint = "DA03 D6C6 3F58 E796 AD26  E99B 366A 2940 479A 06FC";
     }];
   };
+  willcohen = {
+    github = "willcohen";
+    githubId = 5185341;
+    name = "Will Cohen";
+  };
   williamvds = {
     email = "nixpkgs@williamvds.me";
     github = "williamvds";
@@ -16012,11 +16204,6 @@
     githubId = 20464732;
     name = "Willi Butz";
   };
-  willcohen = {
-    github = "willcohen";
-    githubId = 5185341;
-    name = "Will Cohen";
-  };
   wilsonehusin = {
     name = "Wilson E. Husin";
     email = "wilsonehusin@gmail.com";
@@ -16052,6 +16239,15 @@
     githubId = 42300264;
     name = "wishfort36";
   };
+  witchof0x20 = {
+    name = "Jade";
+    email = "jade@witchof.space";
+    github = "witchof0x20";
+    githubId = 36118348;
+    keys = [{
+      fingerprint = "69C9 876B 5797 1B2E 11C5  7C39 80A1 F76F C9F9 54AE";
+    }];
+  };
   wizeman = {
     email = "rcorreia@wizy.org";
     github = "wizeman";
@@ -16157,12 +16353,6 @@
     githubId = 20400405;
     name = "Wucke";
   };
-  wykurz = {
-    email = "wykurz@gmail.com";
-    github = "wykurz";
-    githubId = 483465;
-    name = "Mateusz Wykurz";
-  };
   wulfsta = {
     email = "wulfstawulfsta@gmail.com";
     github = "Wulfsta";
@@ -16181,6 +16371,12 @@
     github = "wuyoli";
     githubId = 104238274;
   };
+  wykurz = {
+    email = "wykurz@gmail.com";
+    github = "wykurz";
+    githubId = 483465;
+    name = "Mateusz Wykurz";
+  };
   wyndon = {
     matrix = "@wyndon:envs.net";
     github = "wyndon";
@@ -16241,12 +16437,6 @@
     githubId = 36407913;
     name = "Uli Baum";
   };
-  xfnw = {
-    email = "xfnw+nixos@riseup.net";
-    github = "xfnw";
-    githubId = 66233223;
-    name = "Owen";
-  };
   xfix = {
     email = "konrad@borowski.pw";
     matrix = "@xfix:matrix.org";
@@ -16254,6 +16444,12 @@
     githubId = 1297598;
     name = "Konrad Borowski";
   };
+  xfnw = {
+    email = "xfnw+nixos@riseup.net";
+    github = "xfnw";
+    githubId = 66233223;
+    name = "Owen";
+  };
   xgroleau = {
     email = "xgroleau@gmail.com";
     github = "xgroleau";
@@ -16387,6 +16583,12 @@
     github = "YisuiDenghua";
     githubId = 102890144;
   };
+  yl3dy = {
+    email = "aleksandr.kiselyov@gmail.com";
+    github = "yl3dy";
+    githubId = 1311192;
+    name = "Alexander Kiselyov";
+  };
   ylecornec = {
     email = "yves.stan.lecornec@tweag.io";
     github = "ylecornec";
@@ -16405,12 +16607,6 @@
     githubId = 26011724;
     name = "Burim Augustin Berisa";
   };
-  yl3dy = {
-    email = "aleksandr.kiselyov@gmail.com";
-    github = "yl3dy";
-    githubId = 1311192;
-    name = "Alexander Kiselyov";
-  };
   ymarkus = {
     name = "Yannick Markus";
     email = "nixpkgs@ymarkus.dev";
@@ -16473,6 +16669,22 @@
     githubId = 7040031;
     name = "Yannik Sander";
   };
+  yuka = {
+    email = "yuka@yuka.dev";
+    matrix = "@yuka:yuka.dev";
+    github = "yu-re-ka";
+    githubId = 86169957;
+    name = "Yureka";
+  };
+  Yumasi = {
+    email = "gpagnoux@gmail.com";
+    github = "Yumasi";
+    githubId = 24368641;
+    name = "Guillaume Pagnoux";
+    keys = [{
+      fingerprint = "85F8 E850 F8F2 F823 F934  535B EC50 6589 9AEA AF4C";
+    }];
+  };
   yureien = {
     email = "contact@sohamsen.me";
     github = "Yureien";
@@ -16497,22 +16709,6 @@
     githubId = 1866448;
     name = "Eric Bailey";
   };
-  Yumasi = {
-    email = "gpagnoux@gmail.com";
-    github = "Yumasi";
-    githubId = 24368641;
-    name = "Guillaume Pagnoux";
-    keys = [{
-      fingerprint = "85F8 E850 F8F2 F823 F934  535B EC50 6589 9AEA AF4C";
-    }];
-  };
-  yuka = {
-    email = "yuka@yuka.dev";
-    matrix = "@yuka:yuka.dev";
-    github = "yu-re-ka";
-    githubId = 86169957;
-    name = "Yureka";
-  };
   yusdacra = {
     email = "y.bera003.06@protonmail.com";
     matrix = "@yusdacra:nixos.dev";
@@ -16524,7 +16720,8 @@
     }];
   };
   yuu = {
-    email = "yuuyin@protonmail.com";
+    email = "yuunix@grrlz.net";
+    matrix = "@yuu:matrix.org";
     github = "yuuyins";
     githubId = 86538850;
     name = "Yuu Yin";
@@ -16544,18 +16741,18 @@
     githubId = 5253988;
     name = "yvt";
   };
-  maggesi = {
-    email = "marco.maggesi@gmail.com";
-    github = "maggesi";
-    githubId = 1809783;
-    name = "Marco Maggesi";
-  };
   zachcoyle = {
     email = "zach.coyle@gmail.com";
     github = "zachcoyle";
     githubId = 908716;
     name = "Zach Coyle";
   };
+  Zaechus = {
+    email = "zaechus@proton.me";
+    github = "Zaechus";
+    githubId = 19353212;
+    name = "Maxwell Anderson";
+  };
   zagy = {
     email = "cz@flyingcircus.io";
     github = "zagy";
@@ -16568,6 +16765,12 @@
     githubId = 110625;
     name = "Zak B. Elep";
   };
+  zakkor = {
+    email = "edward.dalbon@gmail.com";
+    github = "zakkor";
+    githubId = 6191421;
+    name = "Edward d'Albon";
+  };
   zalakain = {
     email = "ping@umazalakain.info";
     github = "umazalakain";
@@ -16607,12 +16810,6 @@
     githubId = 250877;
     name = "Elmar Athmer";
   };
-  zakkor = {
-    email = "edward.dalbon@gmail.com";
-    github = "zakkor";
-    githubId = 6191421;
-    name = "Edward d'Albon";
-  };
   zbioe = {
     name = "Iury Fukuda";
     email = "zbioe@protonmail.com";
@@ -16626,12 +16823,6 @@
     githubId = 1557253;
     name = "Lennart Eichhorn";
   };
-  zeri = {
-    name = "zeri";
-    matrix = "@zeri:matrix.org";
-    github = "zeri42";
-    githubId = 68825133;
-  };
   zendo = {
     name = "zendo";
     email = "linzway@qq.com";
@@ -16656,6 +16847,12 @@
       fingerprint = "44F7 B797 9D3A 27B1 89E0  841E 8333 735E 784D F9D4";
     }];
   };
+  zeri = {
+    name = "zeri";
+    matrix = "@zeri:matrix.org";
+    github = "zeri42";
+    githubId = 68825133;
+  };
   zfnmxt = {
     name = "zfnmxt";
     email = "zfnmxt@zfnmxt.com";
diff --git a/maintainers/scripts/check-maintainers-sorted.nix b/maintainers/scripts/check-maintainers-sorted.nix
new file mode 100644
index 000000000000..3de4e07550c4
--- /dev/null
+++ b/maintainers/scripts/check-maintainers-sorted.nix
@@ -0,0 +1,57 @@
+let
+  lib = import ../../lib;
+  inherit (lib)
+    add attrNames elemAt foldl' genList length replaceStrings sort toLower trace;
+
+  maintainers = import ../maintainer-list.nix;
+  simplify = replaceStrings [ "-" "_" ] [ "" "" ];
+  compare = a: b: simplify (toLower a) < simplify (toLower b);
+  namesSorted =
+    sort
+      (a: b: a.key < b.key)
+      (map
+        (n: let pos = builtins.unsafeGetAttrPos n maintainers;
+            in assert pos == null -> throw "maintainers entry ${n} is malformed";
+              { name = n; line = pos.line; key = toLower (simplify n); })
+        (attrNames maintainers));
+  before = { name, line, key }:
+    foldl'
+      (acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc)
+      null
+      namesSorted;
+  errors = foldl' add 0
+    (map
+      (i: let a = elemAt namesSorted i;
+              b = elemAt namesSorted (i + 1);
+              lim = let t = before a; in if t == null then "the initial {" else t.name;
+          in if a.line >= b.line
+             then trace
+               ("maintainer ${a.name} (line ${toString a.line}) should be listed "
+                + "after ${lim}, not after ${b.name} (line ${toString b.line})")
+               1
+             else 0)
+      (genList (i: i) (length namesSorted - 1)));
+in
+assert errors == 0; "all good!"
+
+# generate edit commands to sort the list.
+# may everything following the last current entry (closing } ff) in the wrong place
+# with lib;
+# concatStringsSep
+#   "\n"
+#   (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted;
+#        commands = map
+#          (i: let e = elemAt namesSorted i;
+#                  begin = foldl'
+#                    (acc: n: if n.line < e.line && n.line > acc then n.line else acc)
+#                    1
+#                    namesSorted;
+#                  end =
+#                    foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc)
+#                      999999999
+#                      namesSorted;
+#              in "${toString e.line},${toString (end - 1)} p")
+#          (genList (i: i) (length namesSorted));
+#    in map
+#      (c: "sed -ne '${c}' maintainers/maintainer-list.nix")
+#      ([ "1,${toString (first - 1)} p" ] ++ commands))
diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh
index 9e2348fda707..c43e8ad904d7 100755
--- a/maintainers/scripts/fetch-kde-qt.sh
+++ b/maintainers/scripts/fetch-kde-qt.sh
@@ -127,8 +127,7 @@ echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent && {
 
     # TODO fetch only missing tar.xz files
     echo "fetching $filecount tar.xz files ..."
-    urllist="$(echo "$filelist" | while read file; do echo "$BASE_URL/$file"; done)"
-    echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent
+    echo "$filelist" | xargs wget $wgetargs -nH -r -c --no-parent
 
     echo "generating sha256 files ..."
     find . -type f -name '*.tar.xz' | while read src; do
diff --git a/maintainers/scripts/haskell/dependencies.nix b/maintainers/scripts/haskell/dependencies.nix
index f0620902c0ee..fd8338c0029a 100644
--- a/maintainers/scripts/haskell/dependencies.nix
+++ b/maintainers/scripts/haskell/dependencies.nix
@@ -3,7 +3,7 @@ let
   pkgs = import ../../.. {};
   inherit (pkgs) lib;
   getDeps = _: pkg: {
-    deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));
+    deps = builtins.filter (x: x != null) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));
     broken = (pkg.meta.hydraPlatforms or [null]) == [];
   };
 in
diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs
index 27b3d3c43a8a..2cbeedeaf7a5 100755
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of
    "x86_64-linux" -> ":penguin:"
    "aarch64-linux" -> ":iphone:"
    "x86_64-darwin" -> ":apple:"
+   "aarch64-darwin" -> ":green_apple:"
    _ -> x
 
 data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)
@@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =
          if' (isNothing maintainedJob) "No `maintained` job found." <>
          if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <>
          if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <>
-         if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux."
+         if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <>
+         if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin."
       if' p e = if p then [e] else mempty
       outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m
       maintainedJob = Map.lookup "maintained" summary
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 4f7e26ec58e3..60389f9abb2d 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -19,6 +19,7 @@ fennel,,,,,,misterio77
 fifo,,,,,,
 fluent,,,,,,alerque
 gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
+haskell-tools.nvim,,,,,,
 http,,,,0.3-0,,vcunat
 inspect,,,,,,
 jsregexp,,,,,,
@@ -102,6 +103,8 @@ std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
 std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
 stdlib,,,,41.2.2,,vyp
 teal-language-server,,,http://luarocks.org/dev,,,
+telescope.nvim,,,,,5.1,
+telescope-manix,,,,,,
 tl,,,,,,mephistophiles
 vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
 vusted,,,,,,figsoda
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 4b3c0176910f..2201fc7f76bc 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -142,6 +142,7 @@ with lib.maintainers; {
       # gares has no entry in the maintainers list
       siraben
       vbgl
+      alizter
     ];
     scope = "Maintain the Coq theorem prover and related packages.";
     shortName = "Coq";