Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

author: Alyssa Ross <hi@alyssa.is> 2022-12-06 19:57:55 +0000
committer: Alyssa Ross <hi@alyssa.is> 2023-02-08 13:48:30 +0000
commit: bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch)
tree: 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/maintainers
parent: f4afc5a01d9539ce09e47494e679c51f80723d07 (diff)
parent: 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff)
download: nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst
nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip
17 files changed, 2442 insertions, 826 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix
index 25c5bd078e51..be0cfb4930ca 100644
--- a/nixpkgs/maintainers/maintainer-list.nix
+++ b/nixpkgs/maintainers/maintainer-list.nix
@@ -10,7 +10,6 @@
       github = "GithubUsername";
       githubId = your-github-id;
       keys = [{
-        longkeyid = "rsa2048/0x0123456789ABCDEF";
         fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
       }];
     };
@@ -24,7 +23,7 @@
     - `matrix` is your Matrix user ID,
     - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
     - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
-    - `keys` is a list of your PGP/GPG key IDs and fingerprints.
+    - `keys` is a list of your PGP/GPG key fingerprints.
 
     `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
 
@@ -39,14 +38,18 @@
 
     To get the required PGP/GPG values for a key run
     ```shell
-    gpg --keyid-format 0xlong --fingerprint <email> | head -n 2
+    gpg --fingerprint <email> | head -n 2
     ```
 
     !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
 
     More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible.
 
-    Please keep the list alphabetically sorted.
+    When editing this file:
+     * keep the list alphabetically sorted
+     * test the validity of the format with:
+         nix-build lib/tests/maintainers.nix
+
     See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
 */
 {
@@ -63,7 +66,6 @@
     github = "0x4A6F";
     githubId = 9675338;
     keys = [{
-      longkeyid = "rsa8192/0x87027528B006D66D";
       fingerprint = "F466 A548 AD3F C1F1 8C88  4576 8702 7528 B006 D66D";
     }];
   };
@@ -73,10 +75,22 @@
     github = "0xbe7a";
     githubId = 6232980;
     keys = [{
-      longkeyid = "rsa4096/0x6510870A77F49A99";
       fingerprint = "2536 9E86 1AA5 9EB7 4C47  B138 6510 870A 77F4 9A99";
     }];
   };
+  _0xC45 = {
+    email = "jason@0xc45.com";
+    name = "Jason Vigil";
+    github = "0xC45";
+    githubId = 56617252;
+    matrix = "@oxc45:matrix.org";
+  };
+  _0xd61 = {
+    email = "dgl@degit.co";
+    name = "Daniel Glinka";
+    github = "0xd61";
+    githubId = 8351869;
+  };
   _1000101 = {
     email = "b1000101@pm.me";
     github = "1000101";
@@ -89,6 +103,12 @@
     github = "1000teslas";
     githubId = 47207223;
   };
+  _2gn = {
+    name = "Hiram Tanner";
+    email = "101851090+2gn@users.noreply.github.com";
+    github = "2gn";
+    githubId = 101851090;
+  };
   _3699n = {
     email = "nicholas@nvk.pm";
     github = "3699n";
@@ -125,6 +145,12 @@
     githubId = 241628;
     name = "Adam Russell";
   };
+  aacebedo = {
+    email = "alexandre@acebedo.fr";
+    github = "aacebedo";
+    githubId = 1217680;
+    name = "Alexandre Acebedo";
+  };
   aadibajpai = {
     email = "hello@aadibajpai.com";
     github = "aadibajpai";
@@ -182,7 +208,6 @@
     githubId = 2255192;
     name = "Ashish SHUKLA";
     keys = [{
-      longkeyid = "rsa4096/0xC746CFA9E74FA4B0";
       fingerprint = "F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0";
     }];
   };
@@ -200,7 +225,7 @@
   };
   abigailbuccaneer = {
     email = "abigailbuccaneer@gmail.com";
-    github = "abigailbuccaneer";
+    github = "AbigailBuccaneer";
     githubId = 908758;
     name = "Abigail Bunyan";
   };
@@ -322,7 +347,7 @@
   };
   aethelz = {
     email = "aethelz@protonmail.com";
-    github = "aethelz";
+    github = "eugenezastrogin";
     githubId = 10677343;
     name = "Eugene";
   };
@@ -380,12 +405,24 @@
     githubId = 209175;
     name = "Alesya Huzik";
   };
+  aidalgol = {
+    email = "aidalgol+nixpkgs@fastmail.net";
+    github = "aidalgol";
+    githubId = 2313201;
+    name = "Aidan Gauland";
+  };
   aij = {
     email = "aij+git@mrph.org";
     github = "aij";
     githubId = 4732885;
     name = "Ivan Jager";
   };
+  aiotter = {
+    email = "git@aiotter.com";
+    github = "aiotter";
+    githubId = 37664775;
+    name = "Yuto Oguchi";
+  };
   airwoodix = {
     email = "airwoodix@posteo.me";
     github = "airwoodix";
@@ -453,6 +490,12 @@
     githubId = 20405311;
     name = "Aksh Gupta";
   };
+  alapshin = {
+      email = "alapshin@fastmail.com";
+      github = "alapshin";
+      githubId = 321946;
+      name = "Andrei Lapshin";
+  };
   albakham = {
     email = "dev@geber.ga";
     github = "albakham";
@@ -504,24 +547,40 @@
   alexnortung = {
     name = "alexnortung";
     email = "alex_nortung@live.dk";
-    github = "alexnortung";
+    github = "Alexnortung";
     githubId = 1552267;
   };
+  alexshpilkin = {
+    email = "ashpilkin@gmail.com";
+    github = "alexshpilkin";
+    githubId = 1010468;
+    keys = [{
+      fingerprint = "B595 D74D 6615 C010 469F  5A13 73E9 AA11 4B3A 894B";
+    }];
+    matrix = "@alexshpilkin:matrix.org";
+    name = "Alexander Shpilkin";
+  };
   alexvorobiev = {
     email = "alexander.vorobiev@gmail.com";
     github = "alexvorobiev";
     githubId = 782180;
     name = "Alex Vorobiev";
   };
-  alex-eyre = {
+  alexeyre = {
     email = "A.Eyre@sms.ed.ac.uk";
-    github = "alex-eyre";
+    github = "alexeyre";
     githubId = 38869148;
     name = "Alex Eyre";
   };
+  algram = {
+    email = "aliasgram@gmail.com";
+    github = "Algram";
+    githubId = 5053729;
+    name = "Alias Gram";
+  };
   alibabzo = {
     email = "alistair.bill@gmail.com";
-    github = "alibabzo";
+    github = "alistairbill";
     githubId = 2822871;
     name = "Alistair Bill";
   };
@@ -531,16 +590,18 @@
     githubId = 36147;
     name = "Alireza Meskin";
   };
+  alkasm = {
+    email = "alexreynolds00@gmail.com";
+    github = "alkasm";
+    githubId = 9651002;
+    name = "Alexander Reynolds";
+  };
   alkeryn = {
     email = "plbraundev@gmail.com";
     github = "Alkeryn";
     githubId = 11599075;
     name = "Pierre-Louis Braun";
   };
-  all = {
-    email = "nix-commits@lists.science.uu.nl";
-    name = "Nix Committers";
-  };
   allonsy = {
     email = "linuxbash8@gmail.com";
     github = "allonsy";
@@ -553,7 +614,6 @@
     github = "AluisioASG";
     githubId = 1904165;
     keys = [{
-      longkeyid = "rsa4096/0x9FAA63E097506D9D";
       fingerprint = "7FDB 17B3 C29B 5BA6 E5A9  8BB2 9FAA 63E0 9750 6D9D";
     }];
   };
@@ -563,6 +623,12 @@
     githubId = 60479013;
     name = "Alma Cemerlic";
   };
+  alternateved = {
+    email = "alternateved@pm.me";
+    github = "alternateved";
+    githubId = 45176912;
+    name = "Tomasz Hołubowicz";
+  };
   alunduil = {
     email = "alunduil@gmail.com";
     github = "alunduil";
@@ -571,11 +637,10 @@
   };
   alva = {
     email = "alva@skogen.is";
-    github = "fjallarefur";
+    github = "illfygli";
     githubId = 42881386;
     name = "Alva";
     keys = [{
-      longkeyid = "ed25519/0xF53E323342F7A6D3";
       fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";
     }];
   };
@@ -585,7 +650,6 @@
     githubId = 74795488;
     name = "Alexandra Hollmeier";
     keys = [{
-      longkeyid = "rsa3072/0x87D1AADCD25B8DEE";
       fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE";
     }];
   };
@@ -597,7 +661,7 @@
   };
   amar1729 = {
     email = "amar.paul16@gmail.com";
-    github = "amar1729";
+    github = "Amar1729";
     githubId = 15623522;
     name = "Amar Paul";
   };
@@ -619,13 +683,19 @@
     githubId = 2626481;
     name = "Ambroz Bizjak";
   };
+  amesgen = {
+    email = "amesgen@amesgen.de";
+    github = "amesgen";
+    githubId = 15369874;
+    name = "Alexander Esgen";
+    matrix = "@amesgen:amesgen.de";
+  };
   ametrine = {
     name = "Matilde Ametrine";
     email = "matilde@diffyq.xyz";
     github = "matilde-ametrine";
     githubId = 90799677;
     keys = [{
-      longkeyid = "rsa3072/0x07EE1FFCA58A11C5";
       fingerprint = "7931 EB4E 4712 D7BE 04F8  6D34 07EE 1FFC A58A 11C5";
     }];
   };
@@ -653,7 +723,6 @@
     github = "notbandali";
     githubId = 1254858;
     keys = [{
-      longkeyid = "rsa4096/0xA21A020248816103";
       fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103";
     }];
   };
@@ -665,10 +734,22 @@
   };
   amorsillo = {
     email = "andrew.morsillo@gmail.com";
-    github = "AndrewMorsillo";
+    github = "evelant";
     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";
+    githubId = 2312534;
+    name = "Anatolii Popov";
+  };
   andehen = {
     email = "git@andehen.net";
     github = "andehen";
@@ -771,13 +852,22 @@
     githubId = 11699655;
     name = "Stanislas Lange";
   };
+  AngryAnt = {
+    name = "Emil Johansen";
+    email = "git@eej.dk";
+    matrix = "@angryant:envs.net";
+    github = "AngryAnt";
+    githubId = 102513;
+    keys = [{
+      fingerprint = "B7B7 582E 564E 789B FCB8  71AB 0C6D FE2F B234 534A";
+    }];
+  };
   anhdle14 = {
     name = "Le Anh Duc";
     email = "anhdle14@icloud.com";
     github = "anhdle14";
     githubId = 9645992;
     keys = [{
-      longkeyid = "rsa4096/0x0299AFF9ECBB5169";
       fingerprint = "AA4B 8EC3 F971 D350 482E  4E20 0299 AFF9 ECBB 5169";
     }];
   };
@@ -787,6 +877,15 @@
     githubId = 1771266;
     name = "Vo Anh Duy";
   };
+  Anillc = {
+    name = "Anillc";
+    email = "i@anillc.cn";
+    github = "Anillc";
+    githubId = 23411248;
+    keys = [{
+      fingerprint = "6141 1E4F FE10 CE7B 2E14  CD76 0BE8 A88F 47B2 145C";
+    }];
+  };
   anirrudh = {
     email = "anik597@gmail.com";
     github = "anirrudh";
@@ -811,12 +910,35 @@
     githubId = 661909;
     name = "Antonio Nuno Monteiro";
   };
+  anoa = {
+    matrix = "@andrewm:amorgan.xyz";
+    email = "andrew@amorgan.xyz";
+    github = "anoadragon453";
+    githubId = 1342360;
+    name = "Andrew Morgan";
+  };
   anpryl = {
     email = "anpryl@gmail.com";
     github = "anpryl";
     githubId = 5327697;
     name = "Anatolii Prylutskyi";
   };
+  anselmschueler = {
+    email = "mail@anselmschueler.com";
+    github = "schuelermine";
+    githubId = 48802534;
+    name = "Anselm Schüler";
+    matrix = "@schuelermine:matrix.org";
+  };
+  anthonyroussel = {
+    email = "anthony@roussel.dev";
+    github = "anthonyroussel";
+    githubId = 220084;
+    name = "Anthony Roussel";
+    keys = [{
+      fingerprint = "472D 368A F107 F443 F3A5  C712 9DC4 987B 1A55 E75E";
+    }];
+  };
   antoinerg = {
     email = "roygobeil.antoine@gmail.com";
     github = "antoinerg";
@@ -865,7 +987,6 @@
     githubId = 17154507;
     name = "Lein Matsumaru";
     keys = [{
-      longkeyid = "rsa4096/0xAAA50652F0479205";
       fingerprint = "BF8B F725 DA30 E53E 7F11  4ED8 AAA5 0652 F047 9205";
     }];
   };
@@ -941,6 +1062,12 @@
     githubId = 1118815;
     name = "Vikram Narayanan";
   };
+  armeenm = {
+    email = "mahdianarmeen@gmail.com";
+    github = "armeenm";
+    githubId = 29145250;
+    name = "Armeen Mahdian";
+  };
   armijnhemel = {
     email = "armijn@tjaldur.nl";
     github = "armijnhemel";
@@ -961,13 +1088,13 @@
   };
   arnoutkroeze = {
     email = "nixpkgs@arnoutkroeze.nl";
-    github = "arnoutkroeze";
+    github = "ArnoutKroeze";
     githubId = 37151054;
     name = "Arnout Kroeze";
   };
   arobyn = {
     email = "shados@shados.net";
-    github = "shados";
+    github = "Shados";
     githubId = 338268;
     name = "Alexei Robyn";
   };
@@ -977,7 +1104,6 @@
     githubId = 1226638;
     name = "Artemis Tosini";
     keys = [{
-      longkeyid = "rsa4096/0x4FDC96F161E7BA8A";
       fingerprint = "3D2B B230 F9FA F0C5 1832  46DD 4FDC 96F1 61E7 BA8A";
     }];
   };
@@ -1037,8 +1163,8 @@
     name = "Kirill Boltaev";
   };
   ashley = {
-    email = "personavinny@protonmail.com";
-    github = "paranoidcat";
+    email = "ashley@kira64.xyz";
+    github = "kira64xyz";
     githubId = 84152630;
     name = "Ashley Chiara";
   };
@@ -1072,7 +1198,6 @@
     githubId = 192147;
     name = "aszlig";
     keys = [{
-      longkeyid = "ed25519/0x684089CE67EBB691";
       fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691";
     }];
   };
@@ -1102,16 +1227,28 @@
   };
   atnnn = {
     email = "etienne@atnnn.com";
-    github = "atnnn";
+    github = "AtnNn";
     githubId = 706854;
     name = "Etienne Laurin";
   };
+  atry = {
+    name = "Bo Yang";
+    email = "atry@fb.com";
+    github = "Atry";
+    githubId = 601530;
+  };
   attila-lendvai = {
     name = "Attila Lendvai";
     email = "attila@lendvai.name";
     github = "attila-lendvai";
     githubId = 840345;
   };
+  auchter = {
+    name = "Michael Auchter";
+    email = "a@phire.org";
+    github = "auchter";
+    githubId = 1190483;
+  };
   auntie = {
     email = "auntieNeo@gmail.com";
     github = "auntieNeo";
@@ -1132,10 +1269,16 @@
   };
   avaq = {
     email = "nixpkgs@account.avaq.it";
-    github = "avaq";
+    github = "Avaq";
     githubId = 1217745;
     name = "Aldwin Vlasblom";
   };
+  aveltras = {
+    email = "romain.viallard@outlook.fr";
+    github = "aveltras";
+    githubId = 790607;
+    name = "Romain Viallard";
+  };
   avery = {
     email = "averyl+nixos@protonmail.com";
     github = "AveryLychee";
@@ -1160,7 +1303,6 @@
     githubId = 5110816;
     name = "avitex";
     keys = [{
-      longkeyid = "rsa4096/0x8B366C443CABE942";
       fingerprint = "271E 136C 178E 06FA EA4E  B854 8B36 6C44 3CAB E942";
     }];
   };
@@ -1191,7 +1333,7 @@
   artturin = {
     email = "artturin@artturin.com";
     matrix = "@artturin:matrix.org";
-    github = "artturin";
+    github = "Artturin";
     githubId = 56650223;
     name = "Artturi N";
   };
@@ -1202,13 +1344,12 @@
     github = "azahi";
     githubId = 22211000;
     keys = [{
-      longkeyid = "rsa4096/0xC8C6BDDB3847F72B";
       fingerprint = "2688 0377 C31D 9E81 9BDF  83A8 C8C6 BDDB 3847 F72B";
     }];
   };
   ayazhafiz = {
     email = "ayaz.hafiz.1@gmail.com";
-    github = "ayazhafiz";
+    github = "hafiz";
     githubId = 262763;
     name = "Ayaz Hafiz";
   };
@@ -1218,13 +1359,18 @@
     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";
     githubId = 448169;
     name = "Fabian Möller";
     keys = [{
-      longkeyid = "rsa4096/0x754B5C0963C42C5";
       fingerprint = "6309 E212 29D4 DA30 AF24  BDED 754B 5C09 63C4 2C50";
     }];
   };
@@ -1234,7 +1380,6 @@
     githubId = 12128029;
     name = "Bastien Rivière";
     keys = [{
-      longkeyid = "rsa4096/0xF202AD3B6EDF4BD1";
       fingerprint = "2F85 B362 B274 0012 37E2  81EE F202 AD3B 6EDF 4BD1";
     }];
   };
@@ -1244,7 +1389,6 @@
     github = "babbaj";
     githubId = 12820770;
     keys = [{
-      longkeyid = "rsa4096/0xF044309848A07CAC";
       fingerprint = "6FBC A462 4EAF C69C A7C4  98C1 F044 3098 48A0 7CAC";
     }];
   };
@@ -1267,10 +1411,6 @@
     githubId = 35324;
     name = "Badi' Abdul-Wahid";
   };
-  balajisivaraman = {
-    email = "sivaraman.balaji@gmail.com";
-    name = "Balaji Sivaraman";
-  };
   balodja = {
     email = "balodja@gmail.com";
     github = "balodja";
@@ -1291,7 +1431,7 @@
   };
   bandresen = {
     email = "bandresen@gmail.com";
-    github = "bandresen";
+    github = "bennyandresen";
     githubId = 80325;
     name = "Benjamin Andresen";
   };
@@ -1325,7 +1465,6 @@
     githubId = 17708295;
     name = "Wanderson Ferreira";
     keys = [{
-      longkeyid = "rsa4096/0x56840A614DBE37AE";
       fingerprint = "A3E1 C409 B705 50B3 BF41  492B 5684 0A61 4DBE 37AE";
     }];
   };
@@ -1354,6 +1493,12 @@
     githubId = 916366;
     name = "Brandon Elam Barker";
   };
+  bbenno = {
+    email = "nix@bbenno.com";
+    github = "bbenno";
+    githubId = 32938211;
+    name = "Benno Bielmeier";
+  };
   bbigras = {
     email = "bigras.bruno@gmail.com";
     github = "bbigras";
@@ -1378,6 +1523,12 @@
     githubId = 164148;
     name = "Ben Darwin";
   };
+  bdd = {
+    email = "bdd@mindcast.org";
+    github = "bdd";
+    githubId = 11135;
+    name = "Berk D. Demir";
+  };
   bdesham = {
     email = "benjamin@esham.io";
     github = "bdesham";
@@ -1427,7 +1578,6 @@
     github = "bertof";
     githubId = 9915675;
     keys = [{
-      longkeyid = "rsa4096/0xFE98AE5EC52B1056";
       fingerprint = "17C5 1EF9 C0FE 2EB2 FE56  BB53 FE98 AE5E C52B 1056";
     }];
   };
@@ -1480,6 +1630,12 @@
     githubId = 410028;
     name = "Tobias Bergkvist";
   };
+  berryp = {
+    email = "berryphillips@gmail.com";
+    github = "berryp";
+    githubId = 19911;
+    name = "Berry Phillips";
+  };
   betaboon = {
     email = "betaboon@0x80.ninja";
     github = "betaboon";
@@ -1528,15 +1684,23 @@
     githubId = 13324165;
     name = "Bill Ewanick";
   };
+  billhuang = {
+    email = "bill.huang2001@gmail.com";
+    github = "BillHuang2001";
+    githubId = 11801831;
+    name = "Bill Huang";
+  };
   binarin = {
     email = "binarin@binarin.ru";
     github = "binarin";
     githubId = 185443;
     name = "Alexey Lebedeff";
   };
-  bjg = {
-    email = "bjg@gnu.org";
-    name = "Brian Gough";
+  binsky = {
+    email = "timo@binsky.org";
+    github = "binsky08";
+    githubId = 30630233;
+    name = "Timo Triebensky";
   };
   bjornfor = {
     email = "bjorn.forsman@gmail.com";
@@ -1569,12 +1733,6 @@
     githubId = 37907;
     name = "Julian Stecklina";
   };
-  bloomvdomino = {
-    name = "Laura Fäßler";
-    email = "0x@ytex.de";
-    github = "bloomvdomino";
-    githubId = 33204710;
-  };
   bluescreen303 = {
     email = "mathijs@bluescreen303.nl";
     github = "bluescreen303";
@@ -1624,6 +1782,16 @@
     githubId = 50839;
     name = "Brian Jones";
   };
+  booklearner = {
+    name = "booklearner";
+    email = "booklearner@proton.me";
+    matrix = "@booklearner:matrix.org";
+    github = "booklearner";
+    githubId = 103979114;
+    keys = [{
+      fingerprint = "17C7 95D4 871C 2F87 83C8  053D 0C61 C4E5 907F 76C8";
+    }];
+  };
   bootstrap-prime = {
     email = "bootstrap.prime@gmail.com";
     github = "bootstrap-prime";
@@ -1642,7 +1810,6 @@
     githubId = 71049646;
     name = "Zack A";
     keys = [{
-      longkeyid = "rsa4096/0x6310C97DE31D1545";
       fingerprint = "E8D7 5C19 9F65 269B 439D  F77B 6310 C97D E31D 1545";
     }];
   };
@@ -1672,7 +1839,7 @@
   };
   brainrape = {
     email = "martonboros@gmail.com";
-    github = "brainrape";
+    github = "brainrake";
     githubId = 302429;
     name = "Marton Boros";
   };
@@ -1712,7 +1879,6 @@
     githubId = 12615679;
     name = "Oleksii Filonenko";
     keys = [{
-      longkeyid = "rsa3072/0xA1BC8428323ECFE8";
       fingerprint = "F549 3B7F 9372 5578 FDD3  D0B8 A1BC 8428 323E CFE8";
     }];
   };
@@ -1752,7 +1918,6 @@
     githubId = 4763746;
     name = "Billy Rhoades";
     keys = [{
-      longkeyid = "rsa4096/0x8AE74787A4B7C07E";
       fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E";
     }];
   };
@@ -1794,6 +1959,12 @@
     githubId = 7214361;
     name = "Roman Gerasimenko";
   };
+  builditluc = {
+    email = "builditluc@icloud.com";
+    github = "Builditluc";
+    githubId = 37375448;
+    name = "Buildit";
+  };
   bburdette = {
     email = "bburdette@protonmail.com";
     github = "bburdette";
@@ -1845,11 +2016,9 @@
       # compare with https://keybase.io/cab404
       {
         fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
-        longkeyid = "rsa3072/0xCBDECF658C38079E";
       }
       {
         fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
-        longkeyid = "ed25519/0xB7EFFC271D55DB8A";
       }
     ];
   };
@@ -1871,9 +2040,15 @@
     githubId = 7435854;
     name = "Victor Calvert";
   };
+  cameronfyfe = {
+    email = "cameron.j.fyfe@gmail.com";
+    github = "cameronfyfe";
+    githubId = 21013281;
+    name = "Cameron Fyfe";
+  };
   cameronnemo = {
     email = "cnemo@tutanota.com";
-    github = "cameronnemo";
+    github = "CameronNemo";
     githubId = 3212452;
     name = "Cameron Nemo";
   };
@@ -1931,6 +2106,12 @@
     githubId = 1945;
     name = "Casey Rodarmor";
   };
+  catap = {
+    email = "kirill@korins.ky";
+    github = "catap";
+    githubId = 37775;
+    name = "Kirill A. Korinsky";
+  };
   catern = {
     email = "sbaugh@catern.com";
     github = "catern";
@@ -1962,7 +2143,6 @@
     githubId = 109908;
     name = "Carsten Burstedde";
     keys = [{
-      longkeyid = "rsa2048/0x0704CD9E550A6BCD";
       fingerprint = "1127 A432 6524 BF02 737B  544E 0704 CD9E 550A 6BCD";
     }];
   };
@@ -2016,11 +2196,9 @@
     name = "Constantine Evans";
     keys = [
       {
-        longkeyid = "rsa4096/0xB67DB1D20A93A9F9";
         fingerprint = "32B1 6EE7 DBA5 16DE 526E  4C5A B67D B1D2 0A93 A9F9";
       }
       {
-        longkeyid = "rsa4096/0x1A1D58B86AE2AABD";
         fingerprint = "669C 1D24 5A87 DB34 6BE4  3216 1A1D 58B8 6AE2 AABD";
       }
     ];
@@ -2043,6 +2221,12 @@
     githubId = 8228888;
     name = "Charlie Hanley";
   };
+  charlesbaynham = {
+    email = "charlesbaynham@gmail.com";
+    github = "charlesbaynham";
+    githubId = 4397637;
+    name = "Charles Baynham";
+  };
   CharlesHD = {
     email = "charleshdespointes@gmail.com";
     github = "CharlesHD";
@@ -2055,10 +2239,6 @@
     githubId = 89596;
     name = "Florian Friesdorf";
   };
-  chattered = {
-    email = "me@philscotted.com";
-    name = "Phil Scott";
-  };
   chekoopa = {
     email = "chekoopa@mail.ru";
     github = "chekoopa";
@@ -2083,19 +2263,12 @@
     githubId = 18648043;
     name = "Daniel Cartwright";
   };
-  chiiruno = {
-    email = "okinan@protonmail.com";
-    github = "chiiruno";
-    githubId = 30435868;
-    name = "Okina Matara";
-  };
   Chili-Man = {
     email = "dr.elhombrechile@gmail.com";
     name = "Diego Rodriguez";
     github = "Chili-Man";
     githubId = 631802;
     keys = [{
-      longkeyid = "rsa4096/0xE0EBAD78F0190BD9";
       fingerprint = "099E 3F97 FA08 3D47 8C75  EBEC E0EB AD78 F019 0BD9";
     }];
   };
@@ -2149,10 +2322,16 @@
   };
   chrisjefferson = {
     email = "chris@bubblescope.net";
-    github = "chrisjefferson";
+    github = "ChrisJefferson";
     githubId = 811527;
     name = "Christopher Jefferson";
   };
+  chrispattison = {
+    email = "chpattison@gmail.com";
+    github = "ChrisPattison";
+    githubId = 641627;
+    name = "Chris Pattison";
+  };
   chrispickard = {
     email = "chrispickard9@gmail.com";
     github = "chrispickard";
@@ -2171,7 +2350,6 @@
     githubId = 13007345;
     name = "Christian Harke";
     keys = [{
-      longkeyid = "rsa4096/0x830A9728630966F4";
       fingerprint = "4EBB 30F1 E89A 541A A7F2  52BE 830A 9728 6309 66F4";
     }];
   };
@@ -2194,7 +2372,6 @@
     github = "chuangzhu";
     githubId = 31200881;
     keys = [{
-      longkeyid = "rsa4096/E838CED81CFFD3F9";
       fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9";
     }];
   };
@@ -2217,6 +2394,12 @@
     githubId = 3956062;
     name = "Simon Lackerbauer";
   };
+  cimm = {
+    email = "8k9ft8m5gv@astil.be";
+    github = "cimm";
+    githubId = 68112;
+    name = "Simon";
+  };
   cirno-999 = {
     email = "reverene@protonmail.com";
     github = "cirno-999";
@@ -2225,11 +2408,10 @@
   };
   citadelcore = {
     email = "alex@arctarus.co.uk";
-    github = "citadelcore";
+    github = "CitadelCore";
     githubId = 5567402;
     name = "Alex Zero";
     keys = [{
-      longkeyid = "rsa4096/0xA51550EDB450302C";
       fingerprint = "A0AA 4646 B8F6 9D45 4553  5A88 A515 50ED B450 302C";
     }];
   };
@@ -2256,10 +2438,10 @@
     github = "ckiee";
     githubId = 25263210;
     keys = [{
-      longkeyid = "rsa4096/0x13E79449C0525215";
       fingerprint = "539F 0655 4D35 38A5 429A  E253 13E7 9449 C052 5215";
     }];
     name = "ckie";
+    matrix = "@ckie:ckie.dev";
   };
   clkamp = {
     email = "c@lkamp.de";
@@ -2310,13 +2492,12 @@
     githubId = 23741;
     name = "Casey Marshall";
     keys = [{
-      longkeyid = "rsa3072/0x6DEC2758ACD5A973";
       fingerprint = "6B78 7E5F B493 FA4F D009  5D10 6DEC 2758 ACD5 A973";
     }];
   };
   cmcdragonkai = {
     email = "roger.qiu@matrix.ai";
-    github = "cmcdragonkai";
+    github = "CMCDragonkai";
     githubId = 640797;
     name = "Roger Qiu";
   };
@@ -2326,6 +2507,12 @@
     githubId = 20808761;
     name = "cmfwyp";
   };
+  cmm = {
+    email = "repo@cmm.kakpryg.net";
+    github = "cmm";
+    githubId = 718298;
+    name = "Michael Livshin";
+  };
   cobbal = {
     email = "andrew.cobb@gmail.com";
     github = "cobbal";
@@ -2395,10 +2582,16 @@
     github = "cole-h";
     githubId = 28582702;
     keys = [{
-      longkeyid = "rsa4096/0xB37E0F2371016A4C";
       fingerprint = "68B8 0D57 B2E5 4AC3 EC1F  49B0 B37E 0F23 7101 6A4C";
     }];
   };
+  colinsane = {
+    name = "Colin Sane";
+    email = "colin@uninsane.org";
+    matrix = "@colin:uninsane.org";
+    github = "uninsane";
+    githubId = 106709944;
+  };
   collares = {
     email = "mauricio@collares.org";
     github = "collares";
@@ -2438,7 +2631,7 @@
   congee = {
     email = "changshengwu@pm.me";
     matrix = "@congeec:matrix.org";
-    github = "congee";
+    github = "Congee";
     name = "Changsheng Wu";
     githubId = 2083950;
   };
@@ -2462,11 +2655,9 @@
     name = "Corban Raun";
     keys = [
       {
-        longkeyid = "rsa4096/0xA697A56F1F151189";
         fingerprint = "6607 0B24 8CE5 64ED 22CE  0950 A697 A56F 1F15 1189";
       }
       {
-        longkeyid = "ed25519/0x230F4AC153F90F29";
         fingerprint = "D8CB 816A B678 A4E6 1EC7  5325 230F 4AC1 53F9 0F29";
       }
     ];
@@ -2489,10 +2680,15 @@
     githubId = 292650;
     name = "Daniel McCarney";
     keys = [{
-      longkeyid = "rsa2048/0x08FB2BFC470E75B4";
       fingerprint = "8026 D24A A966 BF9C D3CD  CB3C 08FB 2BFC 470E 75B4";
     }];
   };
+  Crafter = {
+    email = "crafter@crafter.rocks";
+    github = "Craftzman7";
+    githubId = 70068692;
+    name = "Crafter";
+  };
   craigem = {
     email = "craige@mcwhirter.io";
     github = "craigem";
@@ -2513,7 +2709,7 @@
   };
   creator54 = {
     email = "hi.creator54@gmail.com";
-    github = "creator54";
+    github = "Creator54";
     githubId = 34543609;
     name = "creator54";
   };
@@ -2530,7 +2726,6 @@
     githubId = 2440581;
     name = "Carl Richard Theodor Schneider";
     keys = [{
-      longkeyid = "rsa4096/0x45BCC1E2709B1788";
       fingerprint = "2017 E152 BB81 5C16 955C  E612 45BC C1E2 709B 1788";
     }];
   };
@@ -2570,7 +2765,6 @@
     githubId = 389387;
     name = "Serg Nesterov";
     keys = [{
-      longkeyid = "rsa4096/0x1512F6EB84AECC8C";
       fingerprint = "6E7D BA30 DB5D BA60 693C  3BE3 1512 F6EB 84AE CC8C";
     }];
   };
@@ -2593,11 +2787,9 @@
     name = "Ștefan D. Mihăilă";
     keys = [
       {
-        longkeyid = "rsa4096/6E68A39BF16A3ECB";
         fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB";
       }
       {
-        longkeyid = "rsa4096/6220AD7846220A52";
         fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52";
       }
     ];
@@ -2615,7 +2807,6 @@
     githubId = 43349662;
     name = "Dima";
     keys = [{
-      longkeyid = "rsa4096/BAB1D15FB7B4D4CE";
       fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
     }];
   };
@@ -2631,7 +2822,6 @@
     github = "dadada";
     githubId = 7216772;
     keys = [{
-      longkeyid = "ed25519/0xEEB8D1CE62C4DFEA";
       fingerprint = "D68C 8469 5C08 7E0F 733A  28D0 EEB8 D1CE 62C4 DFEA";
     }];
   };
@@ -2647,6 +2837,15 @@
     githubId = 16895361;
     name = "Deniz Alp Durmaz";
   };
+  DAlperin = {
+    email = "git@dov.dev";
+    github = "DAlperin";
+    githubId = 16063713;
+    name = "Dov Alperin";
+    keys = [{
+      fingerprint = "4EED 5096 B925 86FA 1101  6673 7F2C 07B9 1B52 BB61";
+    }];
+  };
   DamienCassou = {
     email = "damien@cassou.me";
     github = "DamienCassou";
@@ -2659,6 +2858,15 @@
     githubId = 743057;
     name = "Danylo Hlynskyi";
   };
+  danc86 = {
+    name = "Dan Callaghan";
+    email = "djc@djc.id.au";
+    github = "danc86";
+    githubId = 398575;
+    keys = [{
+      fingerprint = "1C56 01F1 D70A B56F EABB  6BC0 26B5 AA2F DAF2 F30A";
+    }];
+  };
   dancek = {
     email = "hannu.hartikainen@gmail.com";
     github = "dancek";
@@ -2684,12 +2892,6 @@
     githubId = 24708079;
     name = "Dan Eads";
   };
-  danharaj = {
-    email = "dan@obsidian.systems";
-    github = "danharaj";
-    githubId = 23366017;
-    name = "Dan Haraj";
-  };
   danielbarter = {
     email = "danielbarter@gmail.com";
     github = "danielbarter";
@@ -2711,11 +2913,10 @@
   danth = {
     name = "Daniel Thwaites";
     email = "danthwaites30@btinternet.com";
-    matrix = "@danth:matrix.org";
+    matrix = "@danth:pwak.org";
     github = "danth";
     githubId = 28959268;
     keys = [{
-      longkeyid = "rsa3072/0xD8AFC4BF05670F9D";
       fingerprint = "4779 D1D5 3C97 2EAE 34A5  ED3D D8AF C4BF 0567 0F9D";
     }];
   };
@@ -2750,7 +2951,6 @@
     github = "dasisdormax";
     githubId = 3714905;
     keys = [{
-      longkeyid = "rsa4096/0x02BA0D4480CA6C44";
       fingerprint = "E59B A198 61B0 A9ED C1FA  3FB2 02BA 0D44 80CA 6C44";
     }];
     name = "Maximilian Wende";
@@ -2761,10 +2961,6 @@
     githubId = 7589338;
     name = "Daniel Șerbănescu";
   };
-  dasuxullebt = {
-    email = "christoph.senjak@googlemail.com";
-    name = "Christoph-Simon Senjak";
-  };
   datafoo = {
     email = "34766150+datafoo@users.noreply.github.com";
     github = "datafoo";
@@ -2809,12 +3005,11 @@
     name = "David Rusu";
   };
   davidtwco = {
-    email = "nix@david.davidtw.co";
+    email = "david@davidtw.co";
     github = "davidtwco";
     githubId = 1295100;
     name = "David Wood";
     keys = [{
-      longkeyid = "rsa4096/0x01760B4F9F53F154";
       fingerprint = "5B08 313C 6853 E5BF FA91  A817 0176 0B4F 9F53 F154";
     }];
   };
@@ -2842,7 +3037,6 @@
     githubId = 7545665;
     name = "David Birks";
     keys = [{
-      longkeyid = "ed25519/0xBB999F83D9A19A36";
       fingerprint = "B26F 9AD8 DA20 3392 EF87  C61A BB99 9F83 D9A1 9A36";
     }];
   };
@@ -2873,10 +3067,9 @@
   dearrude = {
     name = "Ebrahim Nejati";
     email = "dearrude@tfwno.gf";
-    github = "dearrude";
+    github = "DearRude";
     githubId = 30749142;
     keys = [{
-      longkeyid = "rsa4096/19151E03BF2CF012";
       fingerprint = "4E35 F2E5 2132 D654 E815  A672 DB2C BC24 2868 6000";
     }];
   };
@@ -2912,6 +3105,8 @@
   };
   delta = {
     email = "d4delta@outlook.fr";
+    github = "D4Delta";
+    githubId = 12224254;
     name = "Delta";
   };
   deltadelta = {
@@ -2986,6 +3181,13 @@
     githubId = 1311761;
     name = "Didier J. Devroye";
   };
+  desttinghim = {
+    email = "opensource@louispearson.work";
+    matrix = "@desttinghim:matrix.org";
+    github = "desttinghim";
+    githubId = 10042482;
+    name = "Louis Pearson";
+  };
   devhell = {
     email = ''"^"@regexmail.net'';
     github = "devhell";
@@ -2998,6 +3200,12 @@
     githubId = 17111639;
     name = "Devin Singh";
   };
+  devusb = {
+    email = "mhelton@devusb.us";
+    github = "devusb";
+    githubId = 4951663;
+    name = "Morgan Helton";
+  };
   dezgeg = {
     email = "tuomas.tynkkynen@iki.fi";
     github = "dezgeg";
@@ -3048,7 +3256,7 @@
   };
   diegolelis = {
     email = "diego.o.lelis@gmail.com";
-    github = "diegolelis";
+    github = "DiegoLelis";
     githubId = 8404455;
     name = "Diego Lelis";
   };
@@ -3060,7 +3268,7 @@
   };
   diffumist = {
     email = "git@diffumist.me";
-    github = "diffumist";
+    github = "Diffumist";
     githubId = 32810399;
     name = "Diffumist";
   };
@@ -3102,7 +3310,7 @@
   };
   dizfer = {
     email = "david@izquierdofernandez.com";
-    github = "dizfer";
+    github = "DIzFer";
     githubId = 8852888;
     name = "David Izquierdo";
   };
@@ -3215,7 +3423,6 @@
     githubId = 16120;
     name = "Misha Gusarov";
     keys = [{
-      longkeyid = "rsa4096/0x9D20F6503E338888";
       fingerprint = "A8DF 1326 9E5D 9A38 E57C  FAC2 9D20 F650 3E33 8888";
     }];
   };
@@ -3237,7 +3444,6 @@
     githubId = 1965950;
     name = "Tobias Stenzel";
     keys = [{
-      longkeyid = "rsa2048/0x78C7DD40DF23FB16";
       fingerprint = "4749 0887 CF3B 85A1 6355  C671 78C7 DD40 DF23 FB16";
     }];
   };
@@ -3265,10 +3471,6 @@
     githubId = 6199462;
     name = "Dmytro Rets";
   };
-  drewkett = {
-    email = "burkett.andrew@gmail.com";
-    name = "Andrew Burkett";
-  };
   drewrisinger = {
     email = "drisinger+nixpkgs@gmail.com";
     github = "drewrisinger";
@@ -3281,7 +3483,6 @@
     githubId = 92106371;
     name = "Dr Perceptron";
     keys = [{
-      longkeyid = "rsa4096/0x95EB6DFF26D1CEB0";
       fingerprint = "7E38 89D9 B1A8 B381 C8DE  A15F 95EB 6DFF 26D1 CEB0";
     }];
   };
@@ -3292,7 +3493,6 @@
     github = "drupol";
     githubId = 252042;
     keys = [{
-      longkeyid = "ed25519/0x0AAF2901E8040715";
       fingerprint = "85F3 72DF 4AF3 EF13 ED34  72A3 0AAF 2901 E804 0715";
     }];
   };
@@ -3314,7 +3514,6 @@
     github = "dschrempf";
     githubId = 5596239;
     keys = [{
-      longkeyid = "rsa2048/0x875F2BCF163F1B29";
       fingerprint = "62BC E2BD 49DF ECC7 35C7  E153 875F 2BCF 163F 1B29";
     }];
   };
@@ -3330,17 +3529,21 @@
     githubId = 817330;
     name = "Will Dietz";
     keys = [{
-      longkeyid = "rsa4096/0xFD42C7D0D41494C8";
       fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8";
     }];
   };
+  dukc = {
+    email = "ajieskola@gmail.com";
+    github = "dukc";
+    githubId = 24233408;
+    name = "Ate Eskola";
+  };
   dump_stack = {
     email = "root@dumpstack.io";
     github = "jollheef";
     githubId = 1749762;
     name = "Mikhail Klementev";
     keys = [{
-      longkeyid = "rsa4096/0x1525585D1B43C62A";
       fingerprint = "5DD7 C6F6 0630 F08E DAE7  4711 1525 585D 1B43 C62A";
     }];
   };
@@ -3377,7 +3580,7 @@
   };
   e-user = {
     email = "nixos@sodosopa.io";
-    github = "e-user";
+    github = "outergod";
     githubId = 93086;
     name = "Alexander Kahl";
   };
@@ -3405,7 +3608,7 @@
     githubId = 424946;
     name = "James Earl Douglas";
   };
-  earvstedt = {
+  erikarvstedt = {
     email = "erik.arvstedt@gmail.com";
     matrix = "@erikarvstedt:matrix.org";
     github = "erikarvstedt";
@@ -3418,7 +3621,6 @@
     githubId = 20522234;
     name = "Daniel Ebbert";
     keys = [{
-      longkeyid = "rsa2048/0x47BC155927CBB9C7";
       fingerprint = "E765 FCA3 D9BF 7FDB 856E  AD73 47BC 1559 27CB B9C7";
     }];
   };
@@ -3458,9 +3660,15 @@
     github = "edlimerkaj";
     githubId = 71988351;
   };
+  elliottslaughter = {
+    name = "Elliott Slaughter";
+    email = "elliottslaughter@gmail.com";
+    github = "elliottslaughter";
+    githubId = 3129;
+  };
   emantor = {
     email = "rouven+nixos@czerwinskis.de";
-    github = "emantor";
+    github = "Emantor";
     githubId = 934284;
     name = "Rouven Czerwinski";
   };
@@ -3545,7 +3753,7 @@
   ekleog = {
     email = "leo@gaspard.io";
     matrix = "@leo:gaspard.ninja";
-    github = "ekleog";
+    github = "Ekleog";
     githubId = 411447;
     name = "Leo Gaspard";
   };
@@ -3573,6 +3781,12 @@
     githubId = 103082;
     name = "Ed Brindley";
   };
+  elizagamedev = {
+    email = "eliza@eliza.sh";
+    github = "elizagamedev";
+    githubId = 4576666;
+    name = "Eliza Velasquez";
+  };
   elliot = {
     email = "hack00mind@gmail.com";
     github = "Eliot00";
@@ -3598,6 +3812,12 @@
     githubId = 1897147;
     name = "Elijah Caine";
   };
+  Elinvention = {
+    email = "elia@elinvention.ovh";
+    github = "Elinvention";
+    githubId = 5737945;
+    name = "Elia Argentieri";
+  };
   elitak = {
     email = "elitak@gmail.com";
     github = "elitak";
@@ -3622,29 +3842,18 @@
     githubId = 2536303;
     name = "Enno Lohmeier";
   };
-  elseym = {
-    email = "elseym@me.com";
-    github = "elseym";
-    githubId = 907478;
-    name = "Simon Waibl";
-  };
   elvishjerricco = {
     email = "elvishjerricco@gmail.com";
     github = "ElvishJerricco";
     githubId = 1365692;
     name = "Will Fancher";
   };
-  elyhaka = {
-    email = "elyhaka@protonmail.com";
-    github = "Elyhaka";
-    githubId = 57923898;
-    name = "Elyhaka";
-  };
-  em0lar = {
-    email = "nix@em0lar.dev";
-    github = "em0lar";
-    githubId = 11006031;
-    name = "Leo Maroni";
+  emmabastas = {
+    email = "emma.bastas@protonmail.com";
+    matrix = "@emmabastas:matrix.org";
+    github = "emmabastas";
+    githubId = 22533224;
+    name = "Emma Bastås";
   };
   emmanuelrosa = {
     email = "emmanuelrosa@protonmail.com";
@@ -3695,10 +3904,6 @@
     githubId = 5085029;
     name = "Emanuele Peruffo";
   };
-  epitrochoid = {
-    email = "mpcervin@uncg.edu";
-    name = "Mabry Cervin";
-  };
   equirosa = {
     email = "eduardo@eduardoquiros.com";
     github = "equirosa";
@@ -3723,7 +3928,6 @@
     githubId = 2663216;
     name = "Alexandre Iooss";
     keys = [{
-      longkeyid = "rsa4096/0x6C79278F3FCDCC02";
       fingerprint = "2D37 1AD2 7E2B BC77 97E1  B759 6C79 278F 3FCD CC02";
     }];
   };
@@ -3755,7 +3959,7 @@
   ericson2314 = {
     email = "John.Ericson@Obsidian.Systems";
     matrix = "@ericson2314:matrix.org";
-    github = "ericson2314";
+    github = "Ericson2314";
     githubId = 1055245;
     name = "John Ericson";
   };
@@ -3765,7 +3969,6 @@
     githubId = 11532355;
     name = "Kerstin Humm";
     keys = [{
-      longkeyid = "rsa4096/0x40293358C7B9326B";
       fingerprint = "F178 B4B4 6165 6D1B 7C15  B55D 4029 3358 C7B9 326B";
     }];
   };
@@ -3795,7 +3998,7 @@
   };
   ersin = {
     email = "me@ersinakinci.com";
-    github = "earksiinni";
+    github = "DesertDevErsin";
     githubId = 5427394;
     name = "Ersin Akinci";
   };
@@ -3817,17 +4020,12 @@
     githubId = 2544204;
     name = "Erik Skytthe";
   };
-  Esteth = {
-    email = "adam.copp@gmail.com";
-    name = "Adam Copp";
-  };
   ethancedwards8 = {
     email = "ethan@ethancedwards.com";
     github = "ethancedwards8";
     githubId = 60861925;
     name = "Ethan Carter Edwards";
     keys = [{
-      longkeyid = "rsa4096/0xF93DDAFA26EF2458";
       fingerprint = "0E69 0F46 3457 D812 3387  C978 F93D DAFA 26EF 2458";
     }];
   };
@@ -3837,6 +4035,13 @@
     githubId = 222467;
     name = "Dmitry Ivanov";
   };
+  ethindp = {
+    name = "Ethin Probst";
+    email = "harlydavidsen@gmail.com";
+    matrix = "@ethindp:the-gdn.net";
+    github = "ethindp";
+    githubId = 8030501;
+  };
   Etjean = {
     email = "et.jean@outlook.fr";
     github = "Etjean";
@@ -3850,7 +4055,6 @@
     githubId = 461970;
     name = "Elis Hirwing";
     keys = [{
-      longkeyid = "rsa4096/0xD57EFA625C9A925F";
       fingerprint = "67FE 98F2 8C44 CF22 1828  E12F D57E FA62 5C9A 925F";
     }];
   };
@@ -3867,7 +4071,6 @@
     github = "evalexpr";
     githubId = 23485511;
     keys = [{
-      longkeyid = "rsa4096/0x2D1D402E17763DD6";
       fingerprint = "8129 5B85 9C5A F703 C2F4  1E29 2D1D 402E 1776 3DD6";
     }];
   };
@@ -3916,7 +4119,7 @@
   };
   exfalso = {
     email = "0slemi0@gmail.com";
-    github = "exfalso";
+    github = "exFalso";
     githubId = 1042674;
     name = "Andras Slemmer";
   };
@@ -3939,7 +4142,6 @@
     githubId = 857308;
     name = "Ellie Hermaszewska";
     keys = [{
-      longkeyid = "rsa4096/0xC8116E3A0C1CA76A";
       fingerprint = "FC1D 3E4F CBCA 80DF E870  6397 C811 6E3A 0C1C A76A";
     }];
   };
@@ -3975,7 +4177,6 @@
     github = "fabaff";
     githubId = 116184;
     keys = [{
-      longkeyid = "dsa1024/0xE23CD2DD36A4397F";
       fingerprint = "2F6C 930F D3C4 7E38 6AFA  4EB4 E23C D2DD 36A4 397F";
     }];
   };
@@ -3991,7 +4192,6 @@
     githubId = 368799;
     name = "Fabian Hauser";
     keys = [{
-      longkeyid = "rsa4096/0x8A52A140BEBF7D2C";
       fingerprint = "50B7 11F4 3DFD 2018 DCE6  E8D0 8A52 A140 BEBF 7D2C";
     }];
   };
@@ -4045,7 +4245,7 @@
   };
   fedx-sudo = {
     email = "fedx-sudo@pm.me";
-    github = "Fedx-sudo";
+    github = "FedX-sudo";
     githubId = 66258975;
     name = "Fedx sudo";
     matrix = "fedx:matrix.org";
@@ -4073,11 +4273,16 @@
     matrix = "@felschr:matrix.org";
     github = "felschr";
     githubId = 3314323;
-    name = "Felix Tenley";
-    keys = [{
-      longkeyid = "ed25519/0x910ACB9F6BD26F58";
-      fingerprint = "6AB3 7A28 5420 9A41 82D9  0068 910A CB9F 6BD2 6F58";
-    }];
+    name = "Felix Schröter";
+    keys = [
+      {
+        # historical
+        fingerprint = "6AB3 7A28 5420 9A41 82D9  0068 910A CB9F 6BD2 6F58";
+      }
+      {
+        fingerprint = "7E08 6842 0934 AA1D 6821  1F2A 671E 39E6 744C 807D";
+      }
+    ];
   };
   ffinkdevs = {
     email = "fink@h0st.space";
@@ -4135,10 +4340,16 @@
     githubId = 6499211;
     name = "Sebastian Neubauer";
     keys = [{
-      longkeyid = "rsa4096/0xECC755EE583C1672";
       fingerprint = "2F93 661D AC17 EA98 A104  F780 ECC7 55EE 583C 1672";
     }];
   };
+  fleaz = {
+    email = "mail@felixbreidenstein.de";
+    matrix = "@fleaz:rainbownerds.de";
+    github = "fleaz";
+    githubId = 2489598;
+    name = "Felix Breidenstein";
+  };
   flexagoon = {
     email = "flexagoon@pm.me";
     github = "flexagoon";
@@ -4211,15 +4422,30 @@
     githubId = 405105;
     name = "Dustin Frisch";
   };
+  foo-dogsquared = {
+    email = "foo.dogsquared@gmail.com";
+    github = "foo-dogsquared";
+    githubId = 34962634;
+    name = "Gabriel Arazas";
+  };
+  foolnotion = {
+    email = "bogdan.burlacu@pm.me";
+    github = "foolnotion";
+    githubId = 844222;
+    name = "Bogdan Burlacu";
+    keys = [{
+      fingerprint = "B722 6464 838F 8BDB 2BEA  C8C8 5B0E FDDF BA81 6105";
+    }];
+  };
   forkk = {
     email = "forkk@forkk.net";
-    github = "forkk";
+    github = "Forkk";
     githubId = 1300078;
     name = "Andrew Okin";
   };
   fornever = {
     email = "friedrich@fornever.me";
-    github = "fornever";
+    github = "ForNeVeR";
     githubId = 92793;
     name = "Friedrich von Never";
   };
@@ -4236,7 +4462,6 @@
     githubId = 114159;
     name = "Franz Pletz";
     keys = [{
-      longkeyid = "rsa4096/0x846FDED7792617B4";
       fingerprint = "8A39 615D CE78 AF08 2E23  F303 846F DED7 7926 17B4";
     }];
   };
@@ -4255,13 +4480,13 @@
   };
   freax13 = {
     email = "erbse.13@gmx.de";
-    github = "freax13";
+    github = "Freax13";
     githubId = 14952658;
     name = "Tom Dohrmann";
   };
   fredeb = {
     email = "im@fredeb.dev";
-    github = "fredeeb";
+    github = "FredeEB";
     githubId = 7551358;
     name = "Frede Emil";
   };
@@ -4279,7 +4504,7 @@
   };
   fridh = {
     email = "fridh@fridh.nl";
-    github = "fridh";
+    github = "FRidh";
     githubId = 2129135;
     name = "Frederik Rietdijk";
   };
@@ -4337,10 +4562,6 @@
     githubId = 36706276;
     name = "Fufezan Mihai";
   };
-  funfunctor = {
-    email = "eocallaghan@alterapraxis.com";
-    name = "Edward O'Callaghan";
-  };
   fusion809 = {
     email = "brentonhorne77@gmail.com";
     github = "fusion809";
@@ -4349,26 +4570,16 @@
   };
   fuuzetsu = {
     email = "fuuzetsu@fuuzetsu.co.uk";
-    github = "fuuzetsu";
+    github = "Fuuzetsu";
     githubId = 893115;
     name = "Mateusz Kowalczyk";
   };
-  fuwa = {
-    email = "echowss@gmail.com";
-    github = "fuwa0529";
-    githubId = 40521440;
-    name = "Haruka Akiyama";
-  };
   fuzen = {
     email = "me@fuzen.cafe";
-    github = "fuzen-py";
+    github = "Fuzen-py";
     githubId = 17859309;
     name = "Fuzen";
   };
-  fuzzy-id = {
-    email = "hacking+nixos@babibo.de";
-    name = "Thomas Bach";
-  };
   fxfactorial = {
     email = "edgar.factorial@gmail.com";
     github = "fxfactorial";
@@ -4383,7 +4594,7 @@
   };
   Gabriel439 = {
     email = "Gabriel439@gmail.com";
-    github = "Gabriel439";
+    github = "Gabriella439";
     githubId = 1313787;
     name = "Gabriel Gonzalez";
   };
@@ -4393,10 +4604,15 @@
     githubId = 1883533;
     name = "Florian Brandes";
     keys = [{
-      longkeyid = "rsa4096/0xBBB3E40E53797FD9";
       fingerprint = "0200 3EF8 8D2B CF2D 8F00  FFDC BBB3 E40E 5379 7FD9";
     }];
   };
+  GaetanLepage = {
+    email = "gaetan@glepage.com";
+    github = "GaetanLepage";
+    githubId = 33058747;
+    name = "Gaetan Lepage";
+  };
   gal_bolle = {
     email = "florent.becker@ens-lyon.org";
     github = "FlorentBecker";
@@ -4405,7 +4621,7 @@
   };
   galagora = {
     email = "lightningstrikeiv@gmail.com";
-    github = "galagora";
+    github = "Galagora";
     githubId = 45048741;
     name = "Alwanga Oyango";
   };
@@ -4451,6 +4667,12 @@
     githubId = 37017396;
     name = "gbtb";
   };
+  gdinh = {
+    email = "nix@contact.dinh.ai";
+    github = "gdinh";
+    githubId = 34658064;
+    name = "Grace Dinh";
+  };
   gebner = {
     email = "gebner@gebner.org";
     github = "gebner";
@@ -4463,7 +4685,6 @@
     github = "genofire";
     githubId = 6905586;
     keys = [{
-      longkeyid = "rsa4096/0xFC83907C125BC2BC";
       fingerprint = "386E D1BF 848A BB4A 6B4A  3C45 FC83 907C 125B C2BC";
     }];
   };
@@ -4479,7 +4700,6 @@
     githubId = 19374;
     name = "George Shammas";
     keys = [{
-      longkeyid = "rsa4096/0x82BB70D541AE2DB4";
       fingerprint = "D0CF 440A A703 E0F9 73CB  A078 82BB 70D5 41AE 2DB4";
     }];
   };
@@ -4498,10 +4718,16 @@
   ggpeti = {
     email = "ggpeti@gmail.com";
     matrix = "@ggpeti:ggpeti.com";
-    github = "ggpeti";
+    github = "ggPeti";
     githubId = 3217744;
     name = "Peter Ferenczy";
   };
+  ghostbuster91 = {
+    name = "Kasper Kondzielski";
+    email = "kghost0@gmail.com";
+    github = "ghostbuster91";
+    githubId = 5662622;
+  };
   ghuntley = {
     email = "ghuntley@ghuntley.com";
     github = "ghuntley";
@@ -4546,7 +4772,7 @@
   };
   glenns = {
     email = "glenn.searby@gmail.com";
-    github = "glenns";
+    github = "GlennS";
     githubId = 615606;
     name = "Glenn Searby";
   };
@@ -4556,7 +4782,6 @@
     github = "glittershark";
     githubId = 1481027;
     keys = [{
-      longkeyid = "rsa2048/0x44EF5B5E861C09A7";
       fingerprint = "0F11 A989 879E 8BBB FDC1  E236 44EF 5B5E 861C 09A7";
     }];
   };
@@ -4608,17 +4833,15 @@
     github = "gordiasdot";
     githubId = 94724133;
     keys = [{
-      longkeyid = "ed25519/0x5D47284830FAA4FA";
       fingerprint = "C006 B8A0 0618 F3B6 E0E4  2ECD 5D47 2848 30FA A4FA";
     }];
   };
   govanify = {
     name = "Gauvain 'GovanifY' Roussel-Tarbouriech";
     email = "gauvain@govanify.com";
-    github = "govanify";
+    github = "GovanifY";
     githubId = 6375438;
     keys = [{
-      longkeyid = "rsa4096/0xDE62E1E2A6145556";
       fingerprint = "5214 2D39 A7CE F8FA 872B  CA7F DE62 E1E2 A614 5556";
     }];
   };
@@ -4628,7 +4851,6 @@
     github = "gpanders";
     githubId = 8965202;
     keys = [{
-      longkeyid = "rsa2048/0x56E93C2FB6B08BDB";
       fingerprint = "B9D5 0EDF E95E ECD0 C135  00A9 56E9 3C2F B6B0 8BDB";
     }];
   };
@@ -4656,13 +4878,18 @@
     githubId = 4656860;
     name = "Gaute Ravndal";
   };
+  graysonhead = {
+    email = "grayson@graysonhead.net";
+    github = "graysonhead";
+    githubId = 6179496;
+    name = "Grayson Head";
+  };
   grburst = {
     email = "GRBurst@protonmail.com";
     github = "GRBurst";
     githubId = 4647221;
     name = "GRBurst";
     keys = [{
-      longkeyid = "rsa4096/0x797F623868CD00C2";
       fingerprint = "7FC7 98AB 390E 1646 ED4D  8F1F 797F 6238 68CD 00C2";
     }];
   };
@@ -4684,6 +4911,12 @@
     githubId = 201997;
     name = "Eric Seidel";
   };
+  grindhold = {
+    name = "grindhold";
+    email = "grindhold+nix@skarphed.org";
+    github = "grindhold";
+    githubId = 2592640;
+  };
   gspia = {
     email = "iahogsp@gmail.com";
     github = "gspia";
@@ -4702,6 +4935,12 @@
     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";
@@ -4775,6 +5014,12 @@
     githubId = 1498782;
     name = "Jesse Haber-Kucharsky";
   };
+  hamburger1984 = {
+    email = "hamburger1984@gmail.com";
+    github = "hamburger1984";
+    githubId = 438976;
+    name = "Andreas Krohn";
+  };
   hamhut1066 = {
     email = "github@hamhut1066.com";
     github = "moredhel";
@@ -4783,7 +5028,7 @@
   };
   hanemile = {
     email = "mail@emile.space";
-    github = "hanemile";
+    github = "HanEmile";
     githubId = 22756350;
     name = "Emile Hansmaennel";
   };
@@ -4795,14 +5040,19 @@
   };
   HaoZeke = {
     email = "r95g10@gmail.com";
-    github = "haozeke";
+    github = "HaoZeke";
     githubId = 4336207;
     name = "Rohit Goswami";
     keys = [{
-      longkeyid = "rsa4096/0x9CCCE36402CB49A6";
       fingerprint = "74B1 F67D 8E43 A94A 7554  0768 9CCC E364 02CB 49A6";
     }];
   };
+  happyalu = {
+    email = "alok@parlikar.com";
+    github = "happyalu";
+    githubId = 231523;
+    name = "Alok Parlikar";
+  };
   happysalada = {
     email = "raphael@megzari.com";
     matrix = "@happysalada:matrix.org";
@@ -4822,7 +5072,6 @@
     githubId = 1422583;
     name = "Martin Hardselius";
     keys = [{
-      longkeyid = "rsa4096/0x03A6E6F786936619";
       fingerprint = "3F35 E4CA CBF4 2DE1 2E90  53E5 03A6 E6F7 8693 6619";
     }];
   };
@@ -4834,7 +5083,7 @@
   };
   havvy = {
     email = "ryan.havvy@gmail.com";
-    github = "havvy";
+    github = "Havvy";
     githubId = 731722;
     name = "Ryan Scheel";
   };
@@ -4869,7 +5118,6 @@
     github = "hdhog";
     githubId = 386666;
     keys = [{
-      longkeyid = "rsa496/952EACB76703BA63";
       fingerprint = "A25F 6321 AAB4 4151 4085  9924 952E ACB7 6703 BA63";
     }];
   };
@@ -4887,7 +5135,7 @@
   };
   heel = {
     email = "parizhskiy@gmail.com";
-    github = "heel";
+    github = "HeeL";
     githubId = 287769;
     name = "Sergii Paryzhskyi";
   };
@@ -4897,6 +5145,12 @@
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
+  helium = {
+    email = "helium.dev@tuta.io";
+    github = "helium18";
+    githubId = 86223025;
+    name = "helium";
+  };
   henkkalkwater = {
     email = "chris+nixpkgs@netsoj.nl";
     github = "HenkKalkwater";
@@ -4941,6 +5195,12 @@
     githubId = 222664;
     name = "Matthew Leach";
   };
+  hexchen = {
+    email = "nix@lilwit.ch";
+    github = "hexchen";
+    githubId = 41522204;
+    name = "hexchen";
+  };
   hh = {
     email = "hh@m-labs.hk";
     github = "HarryMakes";
@@ -4953,6 +5213,12 @@
     githubId = 3656888;
     name = "hhm";
   };
+  hhydraa = {
+    email = "hcurfman@keemail.me";
+    github = "hhydraa";
+    githubId = 58676303;
+    name = "hhydraa";
+  };
   higebu = {
     name = "Yuya Kusakabe";
     email = "yuya.kusakabe@gmail.com";
@@ -4965,10 +5231,6 @@
     github = "hiljusti";
     githubId = 17605298;
   };
-  hinton = {
-    email = "t@larkery.com";
-    name = "Tom Hinton";
-  };
   hirenashah = {
     email = "hiren@hiren.io";
     github = "hirenashah";
@@ -4981,7 +5243,6 @@
     githubId = 4025991;
     name = "Valentin Boettcher";
     keys = [{
-      longkeyid = "rsa2048/0xC22D4DE4D7B32D19";
       fingerprint = "45A9 9917 578C D629 9F5F  B5B4 C22D 4DE4 D7B3 2D19";
     }];
   };
@@ -4997,14 +5258,13 @@
     github = "hkjn";
     githubId = 287215;
     keys = [{
-      longkeyid = "rsa4096/0x03EFBF839A5FDC15";
       fingerprint = "D618 7A03 A40A 3D56 62F5  4B46 03EF BF83 9A5F DC15";
     }];
   };
   hleboulanger = {
     email = "hleboulanger@protonmail.com";
     name = "Harold Leboulanger";
-    github = "thbkrhsw";
+    github = "thbkrshw";
     githubId = 33122;
   };
   hlolli = {
@@ -5013,13 +5273,22 @@
     githubId = 6074754;
     name = "Hlodver Sigurdsson";
   };
+  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";
+    github = "HugoReeves";
     githubId = 20039091;
     name = "Hugo Reeves";
     keys = [{
-      longkeyid = "rsa4096/0x49FA39F8A7F735F9";
       fingerprint = "78C2 E81C 828A 420B 269A  EBC1 49FA 39F8 A7F7 35F9";
     }];
   };
@@ -5062,7 +5331,7 @@
   hoverbear = {
     email = "operator+nix@hoverbear.org";
     matrix = "@hoverbear:matrix.org";
-    github = "hoverbear";
+    github = "Hoverbear";
     githubId = 130903;
     name = "Ana Hobden";
   };
@@ -5102,6 +5371,12 @@
     githubId = 39689;
     name = "Hugo Tavares Reis";
   };
+  hufman = {
+    email = "hufman@gmail.com";
+    github = "hufman";
+    githubId = 1592375;
+    name = "Walter Huf";
+  };
   hugolgst = {
     email = "hugo.lageneste@pm.me";
     github = "hugolgst";
@@ -5126,7 +5401,6 @@
     github = "hyshka";
     githubId = 2090758;
     keys = [{
-      longkeyid = "rsa2048/0xDB2D93D1BFAAA6EA";
       fingerprint = "24F4 1925 28C4 8797 E539  F247 DB2D 93D1 BFAA A6EA";
     }];
   };
@@ -5154,14 +5428,13 @@
     githubId = 18238046;
     name = "Iago Manoel Brito";
     keys = [{
-      longkeyid = "rsa4096/0x35D39F9A9A1BC8DA";
       fingerprint = "DF90 9D58 BEE4 E73A 1B8C  5AF3 35D3 9F9A 9A1B C8DA";
     }];
   };
   iammrinal0 = {
     email = "nixpkgs@mrinalpurohit.in";
     matrix = "@iammrinal0:nixos.dev";
-    github = "iammrinal0";
+    github = "iAmMrinal0";
     githubId = 890062;
     name = "Mrinal";
   };
@@ -5183,6 +5456,15 @@
     githubId = 1031119;
     name = "Ian-Woo Kim";
   };
+  ibizaman = {
+    email = "ibizapeanut@gmail.com";
+    github = "ibizaman";
+    githubId = 1044950;
+    name = "Pierre Penninckx";
+    keys = [{
+      fingerprint = "A01F 10C6 7176 B2AE 2A34  1A56 D4C5 C37E 6031 A3FE";
+    }];
+  };
   iblech = {
     email = "iblech@speicherleck.de";
     github = "iblech";
@@ -5239,6 +5521,13 @@
     githubId = 40234257;
     name = "ilkecan bozdogan";
   };
+  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";
@@ -5289,7 +5578,7 @@
   };
   imgabe = {
     email = "gabrielpmonte@hotmail.com";
-    github = "imgabe";
+    github = "ImGabe";
     githubId = 24387926;
     name = "Gabriel Pereira";
   };
@@ -5306,6 +5595,12 @@
     githubId = 510202;
     name = "Ismaël Bouya";
   };
+  imsofi = {
+    email = "sofi+git@mailbox.org";
+    github = "imsofi";
+    githubId = 20756843;
+    name = "Sofi";
+  };
   imuli = {
     email = "i@imu.li";
     github = "imuli";
@@ -5318,6 +5613,12 @@
     githubId = 37965;
     name = "Léo Stefanesco";
   };
+  infinidoge = {
+    name = "Infinidoge";
+    email = "infinidoge@inx.moe";
+    github = "Infinidoge";
+    githubId = 22727114;
+  };
   infinisil = {
     email = "contact@infinisil.com";
     matrix = "@infinisil:matrix.org";
@@ -5325,7 +5626,6 @@
     githubId = 20525370;
     name = "Silvan Mosberger";
     keys = [{
-      longkeyid = "rsa4096/0x422E9EDAE0157170";
       fingerprint = "6C2B 55D4 4E04 8266 6B7D  DA1A 422E 9EDA E015 7170";
     }];
   };
@@ -5342,7 +5642,6 @@
     github = "IreneKnapp";
     githubId = 157678;
     keys = [{
-      longkeyid = "rsa4096/0xDBF252AFFB2619FD";
       fingerprint = "E864 BDFA AB55 36FD C905  5195 DBF2 52AF FB26 19FD";
     }];
   };
@@ -5355,10 +5654,9 @@
   isgy = {
     name = "isgy";
     email = "isgy@teiyg.com";
-    github = "isgy";
+    github = "tgys";
     githubId = 13622947;
     keys = [{
-      longkeyid = "rsa4096/0xD3E1B013B4631293";
       fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293";
     }];
   };
@@ -5389,6 +5687,8 @@
   };
   ivan-tkatchev = {
     email = "tkatchev@gmail.com";
+    github = "ivan-tkatchev";
+    githubId = 650601;
     name = "Ivan Tkatchev";
   };
   ivanbrennan = {
@@ -5397,7 +5697,6 @@
     githubId = 1672874;
     name = "Ivan Brennan";
     keys = [{
-      longkeyid = "rsa4096/0x79C3C47DC652EA54";
       fingerprint = "7311 2700 AB4F 4CDF C68C  F6A5 79C3 C47D C652 EA54";
     }];
   };
@@ -5407,7 +5706,6 @@
     githubId = 75213;
     name = "Ivan Kovnatsky";
     keys = [{
-      longkeyid = "rsa4096/0x3A33FA4C82ED674F";
       fingerprint = "6BD3 7248 30BD 941E 9180  C1A3 3A33 FA4C 82ED 674F";
     }];
   };
@@ -5417,6 +5715,12 @@
     githubId = 41924494;
     name = "Ivar";
   };
+  iwanb = {
+    email = "tracnar@gmail.com";
+    github = "iwanb";
+    githubId = 4035835;
+    name = "Iwan";
+  };
   ixmatus = {
     email = "parnell@digitalmentat.com";
     github = "ixmatus";
@@ -5431,7 +5735,7 @@
   };
   izorkin = {
     email = "Izorkin@gmail.com";
-    github = "izorkin";
+    github = "Izorkin";
     githubId = 26877687;
     name = "Yurii Izorkin";
   };
@@ -5561,6 +5865,12 @@
     githubId = 488556;
     name = "Javier Aguirre";
   };
+  jayesh-bhoot = {
+    name = "Jayesh Bhoot";
+    email = "jayesh@bhoot.sh";
+    github = "jayesh-bhoot";
+    githubId = 1915507;
+  };
   jb55 = {
     email = "jb55@jb55.com";
     github = "jb55";
@@ -5593,7 +5903,7 @@
     githubId = 35612334;
   };
   jceb = {
-    name = "jceb";
+    name = "Jan Christoph Ebersbach";
     email = "jceb@e-jc.de";
     github = "jceb";
     githubId = 101593;
@@ -5610,7 +5920,6 @@
     githubId = 1235045;
     name = "Jichao Ouyang";
     keys = [{
-      longkeyid = "rsa2048/0xDA8B833B52604E63";
       fingerprint = "A506 C38D 5CC8 47D0 DF01  134A DA8B 833B 5260 4E63";
     }];
   };
@@ -5634,10 +5943,9 @@
   };
   jdanek = {
     email = "jdanek@redhat.com";
-    github = "jdanekrh";
+    github = "jirkadanek";
     githubId = 17877663;
     keys = [{
-      longkeyid = "ed25519/0x69275CADF15D872E";
       fingerprint = "D4A6 F051 AD58 2E7C BCED  5439 6927 5CAD F15D 872E";
     }];
     name = "Jiri Daněk";
@@ -5686,7 +5994,7 @@
   };
   jefflabonte = {
     email = "grimsleepless@protonmail.com";
-    github = "jefflabonte";
+    github = "JeffLabonte";
     githubId = 9425955;
     name = "Jean-François Labonté";
   };
@@ -5710,7 +6018,7 @@
   };
   jeschli = {
     email = "jeschli@gmail.com";
-    github = "Jeschli";
+    github = "0mbi";
     githubId = 10786794;
     name = "Markus Hihn";
   };
@@ -5720,6 +6028,12 @@
     githubId = 1667473;
     name = "Jethro Kuan";
   };
+  jevy = {
+    email = "jevin@quickjack.ca";
+    github = "jevy";
+    githubId = 110620;
+    name = "Jevin Maltais";
+  };
   jfb = {
     email = "james@yamtime.com";
     github = "tftio";
@@ -5732,7 +6046,6 @@
     githubId = 3001;
     name = "Jean-Francois Chevrette";
     keys = [{
-      longkeyid = "rsa4096/0x67A0585801290DC6";
       fingerprint = "B612 96A9 498E EECD D5E9  C0F0 67A0 5858 0129 0DC6";
     }];
   };
@@ -5755,7 +6068,6 @@
     github = "jfroche";
     githubId = 207369;
     keys = [{
-      longkeyid = "dsa1024/0xD1D09DE169EA19A0";
       fingerprint = "7EB1 C02A B62B B464 6D7C  E4AE D1D0 9DE1 69EA 19A0";
     }];
   };
@@ -5801,6 +6113,12 @@
     githubId = 2502736;
     name = "James Hillyerd";
   };
+  jiegec = {
+    name = "Jiajie Chen";
+    email = "c@jia.je";
+    github = "jiegec";
+    githubId = 6127678;
+  };
   jiehong = {
     email = "nixos@majiehong.com";
     github = "Jiehong";
@@ -5876,12 +6194,10 @@
     keys = [
       # GitHub signing key
       {
-        longkeyid = "rsa4096/0xDC7AE56AE98E02D7";
         fingerprint = "EC08 7AA3 DEAD A972 F015  6371 DC7A E56A E98E 02D7";
       }
       # Email encryption
       {
-        longkeyid = "ed25519/0x197F9A632D139E30";
         fingerprint = "816D 23F5 E672 EC58 7674  4A73 197F 9A63 2D13 9E30";
       }
     ];
@@ -5928,9 +6244,15 @@
     githubId = 60272884;
     name = "Jonathan Jeppener-Haltenhoff";
   };
+  jocelynthode = {
+    email = "jocelyn.thode@gmail.com";
+    github = "jocelynthode";
+    githubId = 3967312;
+    name = "Jocelyn Thode";
+  };
   joelancaster = {
     email = "joe.a.lancas@gmail.com";
-    github = "joelancaster";
+    github = "JoeLancaster";
     githubId = 16760945;
     name = "Joe Lancaster";
   };
@@ -5946,10 +6268,6 @@
     githubId = 336631;
     name = "Joel Moberg";
   };
-  joelteon = {
-    email = "me@joelt.io";
-    name = "Joel Taylor";
-  };
   joepie91 = {
     email = "admin@cryto.net";
     matrix = "@joepie91:pixie.town";
@@ -5977,7 +6295,7 @@
   };
   johnazoidberg = {
     email = "git@danielschaefer.me";
-    github = "johnazoidberg";
+    github = "JohnAZoidberg";
     githubId = 5307138;
     name = "Daniel Schäfer";
   };
@@ -5989,7 +6307,7 @@
   };
   johnmh = {
     email = "johnmh@openblox.org";
-    github = "johnmh";
+    github = "JohnMH";
     githubId = 2576152;
     name = "John M. Harris, Jr.";
   };
@@ -6018,7 +6336,6 @@
     github = "jojosch";
     githubId = 327488;
     keys = [{
-      longkeyid = "ed25519/059093B1A278BCD0";
       fingerprint = "7249 70E6 A661 D84E 8B47  678A 0590 93B1 A278 BCD0";
     }];
   };
@@ -6028,7 +6345,6 @@
     githubId = 1252547;
     keys = [{
       # compare with https://keybase.io/joko
-      longkeyid = "rsa2048/0x85EAE7D9DF56C5CA";
       fingerprint = "B154 A8F9 0610 DB45 0CA8  CF39 85EA E7D9 DF56 C5CA";
     }];
     name = "Ioannis Koutras";
@@ -6051,6 +6367,12 @@
     githubId = 1843676;
     name = "Jonathan Reeve";
   };
+  jonnybolton = {
+    email = "jonnybolton@gmail.com";
+    github = "jonnybolton";
+    githubId = 8580434;
+    name = "Jonny Bolton";
+  };
   jonringer = {
     email = "jonringer117@gmail.com";
     matrix = "@jonringer:matrix.org";
@@ -6076,6 +6398,12 @@
     github = "JoshuaFern";
     githubId = 4300747;
   };
+  joshvanl = {
+    email = " me@joshvanl.dev ";
+    github = "joshvanl";
+    githubId = 15893072;
+    name = "Josh van Leeuwen";
+  };
   jpas = {
     name = "Jarrod Pas";
     email = "jarrod@jarrodpas.com";
@@ -6130,13 +6458,6 @@
     githubId = 3267697;
     name = "Joshua Potter";
   };
-  jschievink = {
-    email = "jonasschievink@gmail.com";
-    matrix = "@jschievink:matrix.org";
-    github = "jonas-schievink";
-    githubId = 1786438;
-    name = "Jonas Schievink";
-  };
   jshcmpbll = {
     email = "me@joshuadcampbell.com";
     github = "jshcmpbll";
@@ -6156,13 +6477,25 @@
     github = "jsierles";
     githubId = 82;
   };
+  jsimonetti = {
+    email = "jeroen+nixpkgs@simonetti.nl";
+    matrix = "@jeroen:simonetti.nl";
+    name = "Jeroen Simonetti";
+    github = "jsimonetti";
+    githubId = 5478838;
+  };
+  jsoo1 = {
+    email = "jsoo1@asu.edu";
+    github = "jsoo1";
+    name = "John Soo";
+    githubId = 10039785;
+  };
   jtcoolen = {
     email = "jtcoolen@pm.me";
     name = "Julien Coolen";
     github = "jtcoolen";
     githubId = 54635632;
     keys = [{
-      longkeyid = "rsa4096/0x19642151C218F6F5";
       fingerprint = "4C68 56EE DFDA 20FB 77E8  9169 1964 2151 C218 F6F5";
     }];
   };
@@ -6191,6 +6524,13 @@
     githubId = 1189739;
     name = "Julio Borja Barra";
   };
+  jugendhacker = {
+    name = "j.r";
+    email = "j.r@jugendhacker.de";
+    github = "jugendhacker";
+    githubId = 12773748;
+    matrix = "@j.r:chaos.jetzt";
+  };
   juliendehos = {
     email = "dehos@lisic.univ-littoral.fr";
     github = "juliendehos";
@@ -6245,7 +6585,6 @@
     githubId = 1529052;
     name = "Jan van Brügge";
     keys = [{
-      longkeyid = "rsa4096/0x366572BE7D6C78A2";
       fingerprint = "3513 5CE5 77AD 711F 3825  9A99 3665 72BE 7D6C 78A2";
     }];
   };
@@ -6267,10 +6606,6 @@
     githubId = 46386452;
     name = "Jeroen Wijenbergh";
   };
-  jwilberding = {
-    email = "jwilberding@afiniate.com";
-    name = "Jordan Wilberding";
-  };
   jwoudenberg = {
     email = "nixpkgs@jasperwoudenberg.com";
     github = "jwoudenberg";
@@ -6289,7 +6624,6 @@
     githubId = 63786778;
     name = "Joel";
     keys = [{
-      longkeyid = "rsa4096/18550BD205E9EF64";
       fingerprint = "9148 DC9E F4D5 3EB6 A30E  8EF0 1855 0BD2 05E9 EF64";
     }];
   };
@@ -6305,6 +6639,12 @@
     githubId = 66669;
     name = "Jeff Zellner";
   };
+  k3a = {
+    email = "git+nix@catmail.app";
+    name = "Mario Hros";
+    github = "k3a";
+    githubId = 966992;
+  };
   k4leg = {
     name = "k4leg";
     email = "python.bogdan@gmail.com";
@@ -6321,16 +6661,15 @@
   kaction = {
     name = "Dmitry Bogatov";
     email = "KAction@disroot.org";
-    github = "kaction";
+    github = "KAction";
     githubId = 44864956;
     keys = [{
-      longkeyid = "ed25519/0x749FD4DFA2E94236";
       fingerprint = "3F87 0A7C A7B4 3731 2F13  6083 749F D4DF A2E9 4236";
     }];
   };
   kaiha = {
     email = "kai.harries@gmail.com";
-    github = "kaiha";
+    github = "KaiHa";
     githubId = 6544084;
     name = "Kai Harries";
   };
@@ -6353,7 +6692,6 @@
     github = "kamadorueda";
     githubId = 47480384;
     keys = [{
-      longkeyid = "rsa4096/0x04D0CEAF916A9A40";
       fingerprint = "2BE3 BAFD 793E A349 ED1F  F00F 04D0 CEAF 916A 9A40";
     }];
   };
@@ -6389,6 +6727,8 @@
   };
   karolchmist = {
     email = "info+nix@chmist.com";
+    github = "karolchmist";
+    githubId = 1927188;
     name = "karolchmist";
   };
   kayhide = {
@@ -6409,28 +6749,58 @@
     githubId = 37185887;
     name = "Calvin Kim";
   };
+  keksbg = {
+    email = "keksbg@riseup.net";
+    name = "Stella";
+    github = "keksbg";
+    githubId = 10682187;
+    keys = [{
+      fingerprint = "AB42 1F18 5A19 A160 AD77  9885 3D6D CA5B 6F2C 2A7A";
+    }];
+  };
   keldu = {
     email = "mail@keldu.de";
     github = "keldu";
     githubId = 15373888;
     name = "Claudius Holeksa";
   };
+  ken-matsui = {
+    email = "nix@kmatsui.me";
+    github = "ken-matsui";
+    githubId = 26405363;
+    name = "Ken Matsui";
+    keys = [{
+      fingerprint = "3611 8CD3 6DE8 3334 B44A  DDE4 1033 60B3 298E E433";
+    }];
+  };
   kennyballou = {
     email = "kb@devnulllabs.io";
     github = "kennyballou";
     githubId = 2186188;
     name = "Kenny Ballou";
     keys = [{
-      longkeyid = "rsa4096/0xB0CAA28A02958308";
       fingerprint = "932F 3E8E 1C0F 4A98 95D7  B8B8 B0CA A28A 0295 8308";
     }];
   };
+  kenran = {
+    email = "johannes.maier@mailbox.org";
+    github = "kenranunderscore";
+    githubId = 5188977;
+    matrix = "@kenran_:matrix.org";
+    name = "Johannes Maier";
+  };
   kentjames = {
     email = "jameschristopherkent@gmail.com";
-    github = "kentjames";
+    github = "KentJames";
     githubId = 2029444;
     name = "James Kent";
   };
+  kephasp = {
+    email = "pierre@nothos.net";
+    github = "kephas";
+    githubId = 762421;
+    name = "Pierre Thierry";
+  };
   ketzacoatl = {
     email = "ketzacoatl@protonmail.com";
     github = "ketzacoatl";
@@ -6456,6 +6826,13 @@
     githubId = 8211181;
     name = "Kevin Kandlbinder";
   };
+  kfears = {
+    email = "kfearsoff@gmail.com";
+    github = "KFearsoff";
+    githubId = 66781795;
+    matrix = "@kfears:matrix.org";
+    name = "KFears";
+  };
   kfollesdal = {
     email = "kfollesdal@gmail.com";
     github = "kfollesdal";
@@ -6464,7 +6841,7 @@
   };
   kho-dialga = {
     email = "ivandashenyou@gmail.com";
-    github = "kho-dialga";
+    github = "Kho-Dialga";
     githubId = 55767703;
     name = "Iván Brito";
   };
@@ -6476,11 +6853,10 @@
   };
   khushraj = {
     email = "khushraj.rathod@gmail.com";
-    github = "KhushrajRathod";
+    github = "khrj";
     githubId = 44947946;
     name = "Khushraj Rathod";
     keys = [{
-      longkeyid = "rsa2048/0xB77B2A40E7702F19";
       fingerprint = "1988 3FD8 EA2E B4EC 0A93  1E22 B77B 2A40 E770 2F19";
     }];
   };
@@ -6508,6 +6884,12 @@
     githubId = 845652;
     name = "Kier Davis";
   };
+  kilimnik = {
+    email = "mail@kilimnik.de";
+    github = "kilimnik";
+    githubId = 5883283;
+    name = "Daniel Kilimnik";
+  };
   killercup = {
     email = "killercup@gmail.com";
     github = "killercup";
@@ -6564,13 +6946,12 @@
     name = "Jim Fowler";
   };
   kittywitch = {
-    email = "kat@kittywit.ch";
+    email = "kat@inskip.me";
     github = "kittywitch";
     githubId = 67870215;
-    name = "kat witch";
+    name = "Kat Inskip";
     keys = [{
-      longkeyid = "rsa4096/0x7248991EFA8EFBEE";
-      fingerprint = "01F5 0A29 D4AA 9117 5A11  BDB1 7248 991E FA8E FBEE";
+      fingerprint = "9CC6 44B5 69CD A59B C874  C4C9 E8DD E3ED 1C90 F3A0";
     }];
   };
   kiwi = {
@@ -6579,7 +6960,6 @@
     githubId = 35715;
     name = "Robert Djubek";
     keys = [{
-      longkeyid = "rsa4096/0x156C88A5B0A04B2A";
       fingerprint = "8992 44FC D291 5CA2 0A97  802C 156C 88A5 B0A0 4B2A";
     }];
   };
@@ -6595,10 +6975,6 @@
     github = "kjeremy";
     githubId = 4325700;
   };
-  kkallio = {
-    email = "tierpluspluslists@gmail.com";
-    name = "Karn Kallio";
-  };
   klden = {
     name = "Kenzyme Le";
     email = "kl@kenzymele.com";
@@ -6615,10 +6991,9 @@
     email = "me@kloenk.dev";
     matrix = "@kloenk:petabyte.dev";
     name = "Finn Behrens";
-    github = "kloenk";
+    github = "Kloenk";
     githubId = 12898828;
     keys = [{
-      longkeyid = "ed25519/0xB92445CFC9546F9D";
       fingerprint = "6881 5A95 D715 D429 659B  48A4 B924 45CF C954 6F9D";
     }];
   };
@@ -6709,7 +7084,7 @@
   };
   kovirobi = {
     email = "kovirobi@gmail.com";
-    github = "kovirobi";
+    github = "KoviRobi";
     githubId = 1903418;
     name = "Kovacsics Robert";
   };
@@ -6763,7 +7138,7 @@
   };
   kristian-brucaj = {
     email = "kbrucaj@gmail.com";
-    github = "kristian-brucaj";
+    github = "Kristian-Brucaj";
     githubId = 8893110;
     name = "Kristian Brucaj";
   };
@@ -6791,12 +7166,6 @@
     githubId = 99639;
     name = "Pawel Kruszewski";
   };
-  ktosiek = {
-    email = "tomasz.kontusz@gmail.com";
-    github = "ktosiek";
-    githubId = 278013;
-    name = "Tomasz Kontusz";
-  };
   kubukoz = {
     email = "kubukoz@gmail.com";
     github = "kubukoz";
@@ -6815,13 +7184,6 @@
     githubId = 449813;
     name = "Roman Kuznetsov";
   };
-  kvark = {
-    name = "Dzmitry Malyshau";
-    email = "kvark@fastmail.com";
-    matrix = "@kvark:matrix.org";
-    github = "kvark";
-    githubId = 107301;
-  };
   kwohlfahrt = {
     email = "kai.wohlfahrt@gmail.com";
     github = "kwohlfahrt";
@@ -6830,11 +7192,10 @@
   };
   kyleondy = {
     email = "kyle@ondy.org";
-    github = "kyleondy";
+    github = "KyleOndy";
     githubId = 1640900;
     name = "Kyle Ondy";
     keys = [{
-      longkeyid = "rsa4096/0xDB0E3C33491F91C9";
       fingerprint = "3C79 9D26 057B 64E6 D907  B0AC DB0E 3C33 491F 91C9";
     }];
   };
@@ -6846,7 +7207,6 @@
     githubId = 6677292;
 
     keys = [{
-      longkeyid = "rsa4096/81A1540948162372";
       fingerprint = "5A9A 1C9B 2369 8049 3B48  CF5B 81A1 5409 4816 2372";
     }];
   };
@@ -6856,7 +7216,6 @@
     github = "L-as";
     githubId = 22075344;
     keys = [{
-      longkeyid = "rsa2048/0xAC458A7D1087D025";
       fingerprint = "A093 EA17 F450 D4D1 60A0  1194 AC45 8A7D 1087 D025";
     }];
     name = "Las Safin";
@@ -6873,7 +7232,6 @@
     github = "CertainLach";
     githubId = 6235312;
     keys = [{
-      longkeyid = "rsa3072/40B5D6948143175F";
       fingerprint = "323C 95B5 DBF7 2D74 8570  C0B7 40B5 D694 8143 175F";
     }];
     name = "Yaroslav Bolyukin";
@@ -6910,24 +7268,11 @@
   };
   lassulus = {
     email = "lassulus@gmail.com";
-    matrix = "@lassulus:nixos.dev";
+    matrix = "@lassulus:lassul.us";
     github = "Lassulus";
     githubId = 621759;
     name = "Lassulus";
   };
-  lattfein = {
-    email = "lattfein@gmail.com";
-    # Their GitHub account was deleted.
-    #
-    # See: https://github.com/NixOS/nixpkgs/pull/69007 where this
-    # was added but is now owned by a ghost.
-    #
-    # Possibly the username lattfein (currently github ID 56827487) is
-    # owned by the same person, but we should confirm before adding
-    # the GitHub name or ID back.
-    # github = "lattfein";
-    name = "Koki Yasuno";
-  };
   layus = {
     email = "layus.on@gmail.com";
     github = "layus";
@@ -7009,7 +7354,7 @@
   };
   leemachin = {
     email = "me@mrl.ee";
-    github = "leemachin";
+    github = "leemeichin";
     githubId = 736291;
     name = "Lee Machin";
   };
@@ -7019,6 +7364,13 @@
     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";
@@ -7026,18 +7378,16 @@
     githubId = 30902201;
     name = "legendofmiracles";
     keys = [{
-      longkeyid = "rsa4096/0x19B082B3DEFE5451";
       fingerprint = "CC50 F82C 985D 2679 0703  AF15 19B0 82B3 DEFE 5451";
     }];
   };
   leixb = {
     email = "abone9999+nixpkgs@gmail.com";
     matrix = "@leix_b:matrix.org";
-    github = "LeixB";
+    github = "Leixb";
     githubId = 17183803;
     name = "Aleix Boné";
     keys = [{
-      longkeyid = "rsa4096/0xFC035BB2BB28E15D";
       fingerprint = "63D3 F436 EDE8 7E1F 1292  24AF FC03 5BB2 BB28 E15D";
     }];
   };
@@ -7048,10 +7398,20 @@
     name = "Daniel Kuehn";
   };
   leo60228 = {
-    email = "iakornfeld@gmail.com";
+    email = "leo@60228.dev";
+    matrix = "@leo60228:matrix.org";
     github = "leo60228";
     githubId = 8355305;
     name = "leo60228";
+    keys = [{
+      fingerprint = "5BE4 98D5 1C24 2CCD C21A  4604 AC6F 4BA0 78E6 7833";
+    }];
+  };
+  leona = {
+    email = "nix@leona.is";
+    github = "leona-ya";
+    githubId = 11006031;
+    name = "Leona Maroni";
   };
   leonardoce = {
     email = "leonardo.cecchi@gmail.com";
@@ -7096,7 +7456,6 @@
     github = "LEXUGE";
     githubId = 13804737;
     keys = [{
-      longkeyid = "rsa4096/0xAE53B4C2E58EDD45";
       fingerprint = "7FE2 113A A08B 695A C8B8  DDE6 AE53 B4C2 E58E DD45";
     }];
   };
@@ -7130,6 +7489,13 @@
     githubId = 1769386;
     name = "Liam Diprose";
   };
+  libjared = {
+    email = "jared@perrycode.com";
+    github = "libjared";
+    githubId = 3746656;
+    matrix = "@libjared:matrix.org";
+    name = "Jared Perry";
+  };
   liff = {
     email = "liff@iki.fi";
     github = "liff";
@@ -7160,6 +7526,13 @@
     githubId = 714;
     name = "Lily Ballard";
   };
+  lilyinstarlight = {
+    email = "lily@lily.flowers";
+    matrix = "@lily:lily.flowers";
+    github = "lilyinstarlight";
+    githubId = 298109;
+    name = "Lily Foster";
+  };
   limeytexan = {
     email = "limeytexan@gmail.com";
     github = "limeytexan";
@@ -7172,6 +7545,16 @@
     githubId = 667272;
     name = "Lincoln Lee";
   };
+  linj = {
+    name = "Lin Jian";
+    email = "me@linj.tech";
+    matrix = "@me:linj.tech";
+    github = "jian-lin";
+    githubId = 75130626;
+    keys = [{
+      fingerprint = "80EE AAD8 43F9 3097 24B5  3D7E 27E9 7B91 E63A 7FF8";
+    }];
+  };
   linquize = {
     email = "linquize@yahoo.com.hk";
     github = "linquize";
@@ -7196,7 +7579,6 @@
     githubId = 3964494;
     name = "Lev Livnev";
     keys = [{
-      longkeyid = "rsa2048/0x68FF81E6A7850F49";
       fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";
     }];
   };
@@ -7206,7 +7588,6 @@
     github = "lourkeur";
     githubId = 15657735;
     keys = [{
-      longkeyid = "ed25519/0xDFE1D4A017337E2A";
       fingerprint = "5B93 9CFA E8FC 4D8F E07A  3AEA DFE1 D4A0 1733 7E2A";
     }];
   };
@@ -7222,6 +7603,16 @@
     githubId = 22085373;
     name = "Luis Hebendanz";
   };
+  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";
@@ -7248,7 +7639,7 @@
   };
   lnl7 = {
     email = "daiderd@gmail.com";
-    github = "lnl7";
+    github = "LnL7";
     githubId = 689294;
     name = "Daiderd Jordan";
   };
@@ -7277,7 +7668,6 @@
     githubId = 25434434;
     name = "Jan Schmitt";
     keys = [{
-      longkeyid = "dsa2048/0xA2BC3C6F14351991";
       fingerprint = "1763 9903 2D7C 5B82 5D5A  0EAD A2BC 3C6F 1435 1991";
     }];
   };
@@ -7288,7 +7678,7 @@
     name = "Anthony Lodi";
   };
   loicreynier = {
-    email = "loic@loireynier.fr";
+    email = "loic@loicreynier.fr";
     github = "loicreynier";
     githubId = 88983487;
     name = "Loïc Reynier";
@@ -7313,7 +7703,7 @@
   };
   louisdk1 = {
     email = "louis@louis.dk";
-    github = "louisdk1";
+    github = "LouisDK1";
     githubId = 4969294;
     name = "Louis Tim Larsen";
   };
@@ -7330,7 +7720,6 @@
     githubId = 7243783;
     name = "Bernardo Meurer";
     keys = [{
-      longkeyid = "rsa4096/0xF4C0D53B8D14C246";
       fingerprint = "F193 7596 57D5 6DA4 CCD4  786B F4C0 D53B 8D14 C246";
     }];
   };
@@ -7352,10 +7741,6 @@
     githubId = 1597330;
     name = "Leonardo Romor";
   };
-  lrworth = {
-    email = "luke@worth.id.au";
-    name = "Luke Worth";
-  };
   lschuermann = {
     email = "leon.git@is.currently.online";
     matrix = "@leons:is.currently.online";
@@ -7411,7 +7796,6 @@
     github = "Luflosi";
     githubId = 15217907;
     keys = [{
-      longkeyid = "rsa4096/0x6F987CCF224D20B9";
       fingerprint = "66D1 3048 2B5F 2069 81A6  6B83 6F98 7CCF 224D 20B9";
     }];
   };
@@ -7465,12 +7849,12 @@
     githubId = 13547699;
     name = "Corin Hoad";
     keys = [{
-      longkeyid = "rsa2048/0x6A37DF9483188492";
       fingerprint = "BA3A 5886 AE6D 526E 20B4  57D6 6A37 DF94 8318 8492";
     }];
   };
   lux = {
     email = "lux@lux.name";
+    github = "luxferresum";
     githubId = 1208273;
     matrix = "@lux:ontheblueplanet.com";
     name = "Lux";
@@ -7495,14 +7879,10 @@
   };
   lynty = {
     email = "ltdong93+nix@gmail.com";
-    github = "lynty";
+    github = "Lynty";
     githubId = 39707188;
     name = "Lynn Dong";
   };
-  lyt = {
-    email = "wheatdoge@gmail.com";
-    name = "Tim Liou";
-  };
   m00wl = {
     name = "Moritz Lumme";
     email = "moritz.lumme@gmail.com";
@@ -7515,14 +7895,10 @@
     githubId = 3044438;
     name = "Lucas Savva";
   };
-  m3tti = {
-    email = "mathaeus.peter.sander@gmail.com";
-    name = "Mathaeus Sander";
-  };
   ma27 = {
     email = "maximilian@mbosch.me";
     matrix = "@ma27:nicht-so.sexy";
-    github = "ma27";
+    github = "Ma27";
     githubId = 6025220;
     name = "Maximilian Bosch";
   };
@@ -7568,6 +7944,12 @@
     githubId = 7645711;
     name = "Bart Brouns";
   };
+  magnouvean = {
+    email = "rg0zjsyh@anonaddy.me";
+    github = "magnouvean";
+    githubId = 85435692;
+    name = "Maxwell Berg";
+  };
   mahe = {
     email = "matthias.mh.herrmann@gmail.com";
     github = "2chilled";
@@ -7580,6 +7962,18 @@
     githubId = 31056089;
     name = "Tom Ho";
   };
+  majewsky = {
+    email = "majewsky@gmx.net";
+    github = "majewsky";
+    githubId = 24696;
+    name = "Stefan Majewsky";
+  };
+  majiir = {
+    email = "majiir@nabaal.net";
+    github = "Majiir";
+    githubId = 963511;
+    name = "Majiir Paktu";
+  };
   makefu = {
     email = "makefu@syntax-fehler.de";
     github = "makefu";
@@ -7632,7 +8026,7 @@
   };
   marcweber = {
     email = "marco-oweber@gmx.de";
-    github = "marcweber";
+    github = "MarcWeber";
     githubId = 34086;
     name = "Marc Weber";
   };
@@ -7660,9 +8054,11 @@
     githubId = 26470037;
     name = "Markus Kowalewski";
   };
-  markWot = {
-    email = "markus@wotringer.de";
-    name = "Markus Wotringer";
+  mariaa144 = {
+    email = "speechguard_intensivist@aleeas.com";
+    github = "mariaa144";
+    githubId = 105451387;
+    name = "Maria";
   };
   marijanp = {
     name = "Marijan Petričević";
@@ -7682,6 +8078,12 @@
     githubId = 65531;
     name = "Mario Rodas";
   };
+  marsupialgutz = {
+    email = "mars@possums.xyz";
+    github = "marsupialgutz";
+    githubId = 33522919;
+    name = "Marshall Arruda";
+  };
   martijnvermaat = {
     email = "martijn@vermaat.name";
     github = "martijnvermaat";
@@ -7712,7 +8114,6 @@
     githubId = 2551444;
     name = "Marcial Gaißert";
     keys = [{
-      longkeyid = "rsa2048/0xB629036BE399EEE9";
       fingerprint = "B573 5118 0375 A872 FBBF  7770 B629 036B E399 EEE9";
     }];
   };
@@ -7736,7 +8137,7 @@
   };
   mathnerd314 = {
     email = "mathnerd314.gph+hs@gmail.com";
-    github = "mathnerd314";
+    github = "Mathnerd314";
     githubId = 322214;
     name = "Mathnerd314";
   };
@@ -7746,6 +8147,12 @@
     githubId = 1711539;
     name = "matklad";
   };
+  matrss = {
+    name = "Matthias Riße";
+    email = "matthias.risze@t-online.de";
+    github = "matrss";
+    githubId = 9308656;
+  };
   matt-snider = {
     email = "matt.snider@protonmail.com";
     github = "matt-snider";
@@ -7764,6 +8171,12 @@
     githubId = 19036;
     name = "Matthew Bauer";
   };
+  matthiasbenaets = {
+    email = "matthias.benaets@gmail.com";
+    github = "MatthiasBenaets";
+    githubId = 89214559;
+    name = "Matthias Benaets";
+  };
   matthiasbeyer = {
     email = "mail@beyermatthias.de";
     matrix = "@musicmatze:beyermatthi.as";
@@ -7771,6 +8184,15 @@
     githubId = 427866;
     name = "Matthias Beyer";
   };
+  MatthieuBarthel = {
+    email = "matthieu@imatt.ch";
+    name = "Matthieu Barthel";
+    github = "MatthieuBarthel";
+    githubId = 435534;
+    keys = [{
+      fingerprint = "80EB 0F2B 484A BB80 7BEF  4145 BA23 F10E AADC 2E26";
+    }];
+  };
   matthuszagh = {
     email = "huszaghmatt@gmail.com";
     github = "matthuszagh";
@@ -7789,7 +8211,6 @@
     githubId = 26559841;
     name = "Matthew Penner";
     keys = [{
-      longkeyid = "ed25519/0x31311906AD4CF6D6";
       fingerprint = "5118 F1CC B7B0 6C17 4DD1  5267 3131 1906 AD4C F6D6";
     }];
   };
@@ -7811,7 +8232,6 @@
     githubId = 19580458;
     name = "Max Niederman";
     keys = [{
-      longkeyid = "rsa3072/0x9AED881481D8444E";
       fingerprint = "1DE4 424D BF77 1192 5DC4  CF5E 9AED 8814 81D8 444E";
     }];
   };
@@ -7935,7 +8355,6 @@
     githubId = 13689192;
     name = "Nguyễn Gia Phong";
     keys = [{
-      longkeyid = "rsa3072/0x27148B2C06A2224B";
       fingerprint = "E90E 11B8 0493 343B 6132  E394 2714 8B2C 06A2 224B";
     }];
   };
@@ -7951,6 +8370,12 @@
     githubId = 1377571;
     name = "Matthew S. Daiter";
   };
+  mdarocha = {
+    email = "marek@mdarocha.pl";
+    github = "mdarocha";
+    githubId = 11572618;
+    name = "Marek Darocha";
+  };
   mdevlamynck = {
     email = "matthias.devlamynck@mailoo.org";
     github = "mdevlamynck";
@@ -7963,7 +8388,6 @@
     githubId = 1926905;
     name = "Matt Layher";
     keys = [{
-      longkeyid = "rsa2048/0x77BFE531397EDE94";
       fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94";
     }];
   };
@@ -7985,12 +8409,6 @@
     githubId = 1788114;
     name = "Meghea Iulian";
   };
-  mehandes = {
-    email = "niewskici@gmail.com";
-    github = "mehandes";
-    githubId = 32581276;
-    name = "Matt Deming";
-  };
   meisternu = {
     email = "meister@krutt.org";
     github = "meisternu";
@@ -8011,14 +8429,10 @@
   };
   melkor333 = {
     email = "samuel@ton-kunst.ch";
-    github = "melkor333";
+    github = "Melkor333";
     githubId = 6412377;
     name = "Samuel Ruprecht";
   };
-  metabar = {
-    email = "softs@metabarcoding.org";
-    name = "Celine Mercier";
-  };
   kira-bruneau = {
     email = "kira.bruneau@pm.me";
     name = "Kira Bruneau";
@@ -8079,15 +8493,29 @@
     githubId = 20536514;
     name = "Magdalena Haselsteiner";
   };
+  mh182 = {
+    email = "mh182@chello.at";
+    github = "mh182";
+    githubId = 9980864;
+    name = "Max Hofer";
+  };
+  miangraham = {
+    email = "miangraham@users.noreply.github.com";
+    github = "miangraham";
+    githubId = 704580;
+    name = "M. Ian Graham";
+    keys = [{
+      fingerprint = "8CE3 2906 516F C4D8 D373  308A E189 648A 55F5 9A9F";
+    }];
+  };
   mic92 = {
     email = "joerg@thalheim.io";
     matrix = "@mic92:nixos.dev";
-    github = "mic92";
+    github = "Mic92";
     githubId = 96200;
     name = "Jörg Thalheim";
     keys = [{
       # compare with https://keybase.io/Mic92
-      longkeyid = "rsa4096/0x003F2096411B5F92";
       fingerprint = "3DEE 1C55 6E1C 3DC5 54F5  875A 003F 2096 411B 5F92";
     }];
   };
@@ -8140,7 +8568,6 @@
     githubId = 7343721;
     name = "midchildan";
     keys = [{
-      longkeyid = "rsa4096/0x186A1EDAC5C63F83";
       fingerprint = "FEF0 AE2D 5449 3482 5F06  40AA 186A 1EDA C5C6 3F83";
     }];
   };
@@ -8174,7 +8601,6 @@
     githubId = 3490861;
     name = "Mark Vainomaa";
     keys = [{
-      longkeyid = "rsa4096/0xDA015B05B5A11B22";
       fingerprint = "DB43 2895 CF68 F0CE D4B7  EF60 DA01 5B05 B5A1 1B22";
     }];
   };
@@ -8186,7 +8612,7 @@
   };
   milesbreslin = {
     email = "milesbreslin@gmail.com";
-    github = "milesbreslin";
+    github = "MilesBreslin";
     githubId = 38543128;
     name = "Miles Breslin";
   };
@@ -8208,10 +8634,6 @@
     githubId = 5378535;
     name = "Milo Gertjejansen";
   };
-  miltador = {
-    email = "miltador@yandex.ua";
-    name = "Vasiliy Solovey";
-  };
   mimame = {
     email = "miguel.madrid.mencia@gmail.com";
     github = "mimame";
@@ -8230,10 +8652,19 @@
     githubId = 1200507;
     name = "Rémi Nicole";
     keys = [{
-      longkeyid = "rsa2048/0xFEA888C9F5D64F62";
       fingerprint = "3196 83D3 9A1B 4DE1 3DC2  51FD FEA8 88C9 F5D6 4F62";
     }];
   };
+  minion3665 = {
+    name = "Skyler Grey";
+    email = "skyler3665@gmail.com";
+    matrix = "@minion3665:matrix.org";
+    github = "Minion3665";
+    githubId = 34243578;
+    keys = [{
+      fingerprint = "D520 AC8D 7C96 9212 5B2B  BD3A 1AFD 1025 6B3C 714D";
+    }];
+  };
   mir06 = {
     email = "armin.leuprecht@uni-graz.at";
     github = "mir06";
@@ -8252,6 +8683,16 @@
     githubId = 1776903;
     name = "Andrew Abbott";
   };
+  misterio77 = {
+    email = "eu@misterio.me";
+    github = "Misterio77";
+    githubId = 5727578;
+    matrix = "@misterio:matrix.org";
+    name = "Gabriel Fontes";
+    keys = [{
+      fingerprint = "7088 C742 1873 E0DB 97FF  17C2 245C AB70 B4C2 25E9";
+    }];
+  };
   mitchmindtree = {
     email = "mail@mitchellnordine.com";
     github = "mitchmindtree";
@@ -8288,7 +8729,6 @@
     githubId = 7753506;
     name = "Michał Krzysztof Feiler";
     keys = [{
-      longkeyid = "rsa4096/0xE35C2D7C2C6AC724";
       fingerprint = "1E36 9940 CC7E 01C4 CFE8  F20A E35C 2D7C 2C6A C724";
     }];
   };
@@ -8305,7 +8745,6 @@
     githubId = 7735145;
     name = "Maciej Krüger";
     keys = [{
-      longkeyid = "rsa4096/0x0D948CE19CF49C5F";
       fingerprint = "E90C BA34 55B3 6236 740C  038F 0D94 8CE1 9CF4 9C5F";
     }];
   };
@@ -8335,7 +8774,7 @@
   };
   mmesch = {
     email = "mmesch@noreply.github.com";
-    github = "mmesch";
+    github = "MMesch";
     githubId = 2597803;
     name = "Matthias Meschede";
   };
@@ -8388,10 +8827,16 @@
     github = "mohe2015";
     githubId = 13287984;
     keys = [{
-      longkeyid = "rsa4096/0x6794D45A488C2EDE";
       fingerprint = "1248 D3E1 1D11 4A85 75C9  8934 6794 D45A 488C 2EDE";
     }];
   };
+  monaaraj = {
+    name = "Mon Aaraj";
+    email = "owo69uwu69@gmail.com";
+    matrix = "@mon:tchncs.de";
+    github = "MonAaraj";
+    githubId = 46468162;
+  };
   monsieurp = {
     email = "monsieurp@gentoo.org";
     github = "monsieurp";
@@ -8412,11 +8857,10 @@
   };
   moredread = {
     email = "code@apb.name";
-    github = "moredread";
+    github = "Moredread";
     githubId = 100848;
     name = "André-Patrick Bubel";
     keys = [{
-      longkeyid = "rsa8192/0x118CE7C424B45728";
       fingerprint = "4412 38AD CAD3 228D 876C  5455 118C E7C4 24B4 5728";
     }];
   };
@@ -8440,13 +8884,13 @@
   };
   mothsart = {
     email = "jerem.ferry@gmail.com";
-    github = "mothsart";
+    github = "mothsART";
     githubId = 10601196;
     name = "Jérémie Ferry";
   };
   mounium = {
     email = "muoniurn@gmail.com";
-    github = "mounium";
+    github = "Mounium";
     githubId = 20026143;
     name = "Katona László";
   };
@@ -8498,17 +8942,6 @@
     githubId = 3073833;
     name = "Massimo Redaelli";
   };
-  mrhedgehog = {
-    name = "Mr Hedgehog";
-    email = "hedgehog@mrhedgehog.xyz";
-    matrix = "@mrhedgehog:jupiterbroadcasting.com";
-    github = "ModdedGamers";
-    githubId = 35778371;
-    keys = [{
-      longkeyid = "rsa4096/0x7D5107866B1C6752";
-      fingerprint = "38A0 29B0 4A7E 4C13 A4BB  86C8 7D51 0786 6B1C 6752";
-    }];
-  };
   mrkkrp = {
     email = "markkarpov92@gmail.com";
     github = "mrkkrp";
@@ -8527,14 +8960,6 @@
     githubId = 839693;
     name = "Ingolf Wanger";
   };
-  msackman = {
-    email = "matthew@wellquite.org";
-    name = "Matthew Sackman";
-  };
-  mschneider = {
-    email = "markus.schneider.sic+nix@gmail.com";
-    name = "Markus Schneider";
-  };
   mschristiansen = {
     email = "mikkel@rheosystems.com";
     github = "mschristiansen";
@@ -8549,11 +8974,10 @@
   };
   msfjarvis = {
     github = "msfjarvis";
-    githubId = 3348378;
+    githubId = 13348378;
     name = "Harsh Shandilya";
     email = "nixos@msfjarvis.dev";
     keys = [{
-      longkeyid = "rsa4096/0xB7843F823355E9B9";
       fingerprint = "8F87 050B 0F9C B841 1515  7399 B784 3F82 3355 E9B9";
     }];
   };
@@ -8629,22 +9053,16 @@
     githubId = 220262;
     name = "Ion Mudreac";
   };
-  muflax = {
-    email = "mail@muflax.com";
-    github = "muflax";
-    githubId = 69918;
-    name = "Stefan Dorn";
-  };
   multun = {
     email = "victor.collod@epita.fr";
     github = "multun";
     githubId = 5047140;
     name = "Victor Collod";
   };
-  musfay = {
-    email = "musfay@protonmail.com";
-    github = "musfay";
-    githubId = 33374965;
+  muscaln = {
+    email = "muscaln@protonmail.com";
+    github = "muscaln";
+    githubId = 96225281;
     name = "Mustafa Çalışkan";
   };
   mupdt = {
@@ -8660,7 +9078,6 @@
     github = "mvisonneau";
     githubId = 1761583;
     keys = [{
-      longkeyid = "rsa4096/0x150D6F0AE9198D24";
       fingerprint = "EC63 0CEA E8BC 5EE5 5C58  F2E3 150D 6F0A E919 8D24";
     }];
   };
@@ -8685,7 +9102,7 @@
   };
   myrl = {
     email = "myrl.0xf@gmail.com";
-    github = "myrl";
+    github = "Myrl";
     githubId = 9636071;
     name = "Myrl Hex";
   };
@@ -8697,7 +9114,7 @@
   };
   nadrieril = {
     email = "nadrieril@gmail.com";
-    github = "nadrieril";
+    github = "Nadrieril";
     githubId = 6783654;
     name = "Nadrieril Feneanar";
   };
@@ -8719,14 +9136,9 @@
     githubId = 35005234;
     name = "Nasir Hussain";
     keys = [{
-      longkeyid = "rsa4096/0xD8126E559CE7C35D";
       fingerprint = "7A10 AB8E 0BEC 566B 090C  9BE3 D812 6E55 9CE7 C35D";
     }];
   };
-  Nate-Devv = {
-    email = "natedevv@gmail.com";
-    name = "Nathan Moore";
-  };
   nathanruiz = {
     email = "nathanruiz@protonmail.com";
     github = "nathanruiz";
@@ -8745,6 +9157,15 @@
     githubId = 818502;
     name = "Nathan Yong";
   };
+  natsukium = {
+    email = "nixpkgs@natsukium.com";
+    github = "natsukium";
+    githubId = 25083790;
+    name = "Tomoya Otabi";
+    keys = [{
+      fingerprint = "3D14 6004 004C F882 D519  6CD4 9EA4 5A31 DB99 4C53";
+    }];
+  };
   natto1784 = {
     email = "natto@weirdnatto.in";
     github = "natto1784";
@@ -8758,7 +9179,6 @@
     github = "nazarewk";
     githubId = 3494992;
     keys = [{
-      longkeyid = "rsa4096/0x916D8B67241892AE";
       fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";
     }];
   };
@@ -8781,8 +9201,7 @@
     githubId = 4323933;
     name = "Naïm Favier";
     keys = [{
-      longkeyid = "rsa2048/0x49B07322580B7EE2";
-      fingerprint = "51A0 705E 7DD2 3CBC 5EAA  B43E 49B0 7322 580B 7EE2";
+      fingerprint = "F3EB 4BBB 4E71 99BC 299C  D4E9 95AF CE82 1190 8325";
     }];
   };
   nckx = {
@@ -8803,6 +9222,24 @@
     githubId = 3747396;
     name = "Nathan Isom";
   };
+  necrophcodr = {
+    email = "nc@scalehost.eu";
+    github = "necrophcodr";
+    githubId = 575887;
+    name = "Steffen Rytter Postas";
+  };
+  neilmayhew = {
+    email = "nix@neil.mayhew.name";
+    github = "neilmayhew";
+    githubId = 166791;
+    name = "Neil Mayhew";
+  };
+  nek0 = {
+    email = "nek0@nek0.eu";
+    github = "nek0";
+    githubId = 1859691;
+    name = "Amedeo Molnár";
+  };
   nelsonjeppesen = {
     email = "nix@jeppesen.io";
     github = "NelsonJeppesen";
@@ -8823,7 +9260,7 @@
   };
   nequissimus = {
     email = "tim@nequissimus.com";
-    github = "nequissimus";
+    github = "NeQuissimus";
     githubId = 628342;
     name = "Tim Steinbach";
   };
@@ -8836,8 +9273,18 @@
   nessdoor = {
     name = "Tomas Antonio Lopez";
     email = "entropy.overseer@protonmail.com";
+    github = "nessdoor";
     githubId = 25993494;
   };
+  netali = {
+    name = "Jennifer Graul";
+    email = "me@netali.de";
+    github = "NetaliDev";
+    githubId = 15304894;
+    keys = [{
+      fingerprint = "F729 2594 6F58 0B05 8FB3  F271 9C55 E636 426B 40A9";
+    }];
+  };
   netcrns = {
     email = "jason.wing@gmx.de";
     github = "netcrns";
@@ -8874,9 +9321,11 @@
     githubId = 6391776;
     name = "Nikita Voloboev";
   };
-  nfjinjing = {
-    email = "nfjinjing@gmail.com";
-    name = "Jinjing Wang";
+  ngiger = {
+    email = "niklaus.giger@member.fsf.org";
+    github = "ngiger";
+    githubId = 265800;
+    name = "Niklaus Giger";
   };
   nh2 = {
     email = "mail@nh2.me";
@@ -8897,7 +9346,6 @@
     githubId = 77309427;
     name = "Nicolás Kennedy";
     keys = [{
-      longkeyid = "rsa4096/0xC061089EFEBF7A35";
       fingerprint = "7BC1 77D9 C222 B1DC FB2F  0484 C061 089E FEBF 7A35";
     }];
   };
@@ -8915,7 +9363,7 @@
   };
   nickhu = {
     email = "me@nickhu.co.uk";
-    github = "nickhu";
+    github = "NickHu";
     githubId = 450276;
     name = "Nick Hu";
   };
@@ -8943,7 +9391,6 @@
     githubId = 23580910;
     name = "Jakub Kądziołka";
     keys = [{
-      longkeyid = "rsa4096/0xE315A75846131564";
       fingerprint = "E576 BFB2 CF6E B13D F571  33B9 E315 A758 4613 1564";
     }];
   };
@@ -8974,7 +9421,7 @@
   ninjatrappeur = {
     email = "felix@alternativebit.fr";
     matrix = "@ninjatrappeur:matrix.org";
-    github = "ninjatrappeur";
+    github = "NinjaTrappeur";
     githubId = 1219785;
     name = "Félix Baylac-Jacqué";
   };
@@ -8984,7 +9431,6 @@
     githubId = 354934;
     name = "Pontus Stenetorp";
     keys = [{
-      longkeyid = "rsa4096/0xD430287500E6483C";
       fingerprint = "0966 2F9F 3FDA C22B C22E  4CE1 D430 2875 00E6 483C";
     }];
   };
@@ -9000,7 +9446,6 @@
     github = "NKJe";
     githubId = 1102306;
     keys = [{
-      longkeyid = "nistp256/0xDE3BADFECD31A89D";
       fingerprint = "B956 C6A4 22AF 86A0 8F77  A8CA DE3B ADFE CD31 A89D";
     }];
   };
@@ -9012,7 +9457,7 @@
   };
   nkpvk = {
     email = "niko.pavlinek@gmail.com";
-    github = "nkpvk";
+    github = "npavlinek";
     githubId = 16385648;
     name = "Niko Pavlinek";
   };
@@ -9022,7 +9467,6 @@
     githubId = 45737139;
     name = "nixbitcoindev";
     keys = [{
-      longkeyid = "rsa4096/0xDD11F9AD5308B3BA";
       fingerprint = "577A 3452 7F3E 2A85 E80F  E164 DD11 F9AD 5308 B3BA";
     }];
   };
@@ -9094,6 +9538,12 @@
     githubId = 40049608;
     name = "Andy Chun";
   };
+  nook = {
+    name = "Tom Nook";
+    email = "0xnook@protonmail.com";
+    github = "0xnook";
+    githubId = 88323754;
+  };
   noreferences = {
     email = "norkus@norkus.net";
     github = "jozuas";
@@ -9108,7 +9558,7 @@
   };
   notthemessiah = {
     email = "brian.cohen.88@gmail.com";
-    github = "notthemessiah";
+    github = "NOTtheMessiah";
     githubId = 2946283;
     name = "Brian Cohen";
   };
@@ -9143,9 +9593,11 @@
     githubId = 20391;
     name = "Nahum Shalman";
   };
-  nslqqq = {
-    email = "nslqqq@gmail.com";
-    name = "Nikita Mikhailov";
+  nsnelson = {
+    email = "noah.snelson@protonmail.com";
+    github = "peeley";
+    githubId = 30942198;
+    name = "Noah Snelson";
   };
   nthorne = {
     email = "notrupertthorne@gmail.com";
@@ -9203,7 +9655,6 @@
     name = "nzbr";
     matrix = "@nzbr:nzbr.de";
     keys = [{
-      longkeyid = "rsa2048/0x6C78B50B97A42F8A";
       fingerprint = "BF3A 3EE6 3144 2C5F C9FB  39A7 6C78 B50B 97A4 2F8A";
     }];
   };
@@ -9232,10 +9683,18 @@
     githubId = 1260687;
     name = "Felix C. Stegerman";
     keys = [{
-      longkeyid = "rsa4096/0x2F9607F09B360F2D";
       fingerprint = "D5E4 A51D F8D2 55B9 FAC6  A9BB 2F96 07F0 9B36 0F2D";
     }];
   };
+  ocfox = {
+    email = "i@ocfox.me";
+    github = "ocfox";
+    githubId = 47410251;
+    name = "ocfox";
+    keys = [{
+      fingerprint = "939E F8A5 CED8 7F50 5BB5  B2D0 24BC 2738 5F70 234F";
+    }];
+  };
   odi = {
     email = "oliver.dunkl@gmail.com";
     github = "odi";
@@ -9260,10 +9719,6 @@
     githubId = 7249506;
     name = "oida";
   };
-  okasu = {
-    email = "oka.sux@gmail.com";
-    name = "Okasu";
-  };
   olcai = {
     email = "dev@timan.info";
     github = "olcai";
@@ -9288,6 +9743,12 @@
     githubId = 1237862;
     name = "Ollie Bunting";
   };
+  oluceps = {
+    email = "nixos@oluceps.uk";
+    github = "oluceps";
+    githubId = 35628088;
+    name = "oluceps";
+  };
   olynch = {
     email = "owen@olynch.me";
     github = "olynch";
@@ -9308,7 +9769,7 @@
   };
   omnipotententity = {
     email = "omnipotententity@gmail.com";
-    github = "omnipotententity";
+    github = "OmnipotentEntity";
     githubId = 1538622;
     name = "Michael Reilly";
   };
@@ -9330,6 +9791,12 @@
     githubId = 757752;
     name = "Jonas Heinrich";
   };
+  onthestairs = {
+    email = "austinplatt@gmail.com";
+    github = "onthestairs";
+    githubId = 915970;
+    name = "Austin Platt";
+  };
   ony = {
     name = "Mykola Orliuk";
     email = "virkony@gmail.com";
@@ -9374,7 +9841,7 @@
   };
   oro = {
     email = "marco@orovecchia.at";
-    github = "oro";
+    github = "Oro";
     githubId = 357005;
     name = "Marco Orovecchia";
   };
@@ -9390,6 +9857,12 @@
     githubId = 25278;
     name = "Otavio Salvador";
   };
+  otini = {
+    name = "Olivier Nicole";
+    email = "olivier@chnik.fr";
+    github = "OlivierNicole";
+    githubId = 14031333;
+  };
   otwieracz = {
     email = "slawek@otwiera.cz";
     github = "otwieracz";
@@ -9402,8 +9875,7 @@
     githubId = 14816024;
     name = "oxalica";
     keys = [{
-      longkeyid = "rsa4096/0xCED392DE0C483D00";
-      fingerprint = "5CB0 E9E5 D5D5 71F5 7F54  0FEA CED3 92DE 0C48 3D00";
+      fingerprint = "F90F FD6D 585C 2BA1 F13D  E8A9 7571 654C F88E 31C2";
     }];
   };
   oxij = {
@@ -9412,7 +9884,6 @@
     githubId = 391919;
     name = "Jan Malakhovski";
     keys = [{
-      longkeyid = "rsa2048/0x0E6CA66E5C557AA8";
       fingerprint = "514B B966 B46E 3565 0508  86E8 0E6C A66E 5C55 7AA8";
     }];
   };
@@ -9422,7 +9893,6 @@
     githubId = 8402811;
     name = "Alvar Penning";
     keys = [{
-      longkeyid = "rsa4096/0xF32A45637FA25E31";
       fingerprint = "EB14 4E67 E57D 27E2 B5A4  CD8C F32A 4563 7FA2 5E31";
     }];
   };
@@ -9440,7 +9910,7 @@
   };
   pablovsky = {
     email = "dealberapablo07@gmail.com";
-    github = "pablo1107";
+    github = "Pablo1107";
     githubId = 17091659;
     name = "Pablo Andres Dealbera";
   };
@@ -9490,7 +9960,7 @@
   };
   panaeon = {
     email = "vitalii.voloshyn@gmail.com";
-    github = "panaeon";
+    github = "PanAeon";
     githubId = 686076;
     name = "Vitalii Voloshyn";
   };
@@ -9500,18 +9970,24 @@
     githubId = 1788628;
     name = "pandaman";
   };
+  panicgh = {
+    email = "nbenes.gh@xandea.de";
+    github = "panicgh";
+    githubId = 79252025;
+    name = "Nicolas Benes";
+  };
   paperdigits = {
     email = "mica@silentumbrella.com";
     github = "paperdigits";
     githubId = 71795;
     name = "Mica Semrick";
   };
-  papojari = {
-    email = "papojari-git.ovoid@aleeas.com";
+  annaaurora = {
+    email = "anna@annaaurora.eu";
     matrix = "@papojari:artemislena.eu";
-    github = "papojari";
+    github = "auroraanna";
     githubId = 81317317;
-    name = "papojari";
+    name = "Anna Aurora";
   };
   paraseba = {
     email = "paraseba@gmail.com";
@@ -9521,10 +9997,16 @@
   };
   parasrah = {
     email = "nixos@parasrah.com";
-    github = "parasrah";
+    github = "Parasrah";
     githubId = 14935550;
     name = "Brad Pfannmuller";
   };
+  parras = {
+    email = "c@philipp-arras.de";
+    github = "phiadaarr";
+    githubId = 33826198;
+    name = "Philipp Arras";
+  };
   pashashocky = {
     email = "pashashocky@gmail.com";
     github = "pashashocky";
@@ -9543,16 +10025,27 @@
     githubId = 6931743;
     name = "pasqui23";
   };
+  patricksjackson = {
+    email = "patrick@jackson.dev";
+    github = "patricksjackson";
+    githubId = 160646;
+    name = "Patrick Jackson";
+  };
   patryk27 = {
     email = "pwychowaniec@pm.me";
     github = "Patryk27";
     githubId = 3395477;
     name = "Patryk Wychowaniec";
     keys = [{
-      longkeyid = "rsa4096/0xF62547D075E09767";
       fingerprint = "196A BFEC 6A1D D1EC 7594  F8D1 F625 47D0 75E0 9767";
     }];
   };
+  patryk4815 = {
+    email = "patryk.sondej@gmail.com";
+    github = "patryk4815";
+    githubId = 3074260;
+    name = "Patryk Sondej";
+  };
   patternspandemic = {
     email = "patternspandemic@live.com";
     github = "patternspandemic";
@@ -9561,7 +10054,7 @@
   };
   payas = {
     email = "relekarpayas@gmail.com";
-    github = "payasrelekar";
+    github = "bhankas";
     githubId = 24254289;
     name = "Payas Relekar";
   };
@@ -9595,12 +10088,24 @@
     githubId = 6498458;
     name = "pebble kite";
   };
+  pbsds = {
+    name = "Peder Bergebakken Sundt";
+    email = "pbsds@hotmail.com";
+    github = "pbsds";
+    githubId = 140964;
+  };
   pcarrier = {
     email = "pc@rrier.ca";
     github = "pcarrier";
     githubId = 8641;
     name = "Pierre Carrier";
   };
+  pedrohlc = {
+    email = "root@pedrohlc.com";
+    github = "PedroHLC";
+    githubId = 1368952;
+    name = "Pedro Lara Campos";
+  };
   penguwin = {
     email = "penguwin@penguwin.eu";
     github = "penguwin";
@@ -9625,13 +10130,6 @@
     githubId = 152312;
     name = "Periklis Tsirakidis";
   };
-  petabyteboy = {
-    email = "milan@petabyte.dev";
-    matrix = "@milan:petabyte.dev";
-    github = "petabyteboy";
-    githubId = 3250809;
-    name = "Milan Pässler";
-  };
   petercommand = {
     email = "petercommand@gmail.com";
     github = "petercommand";
@@ -9681,6 +10179,27 @@
     githubId = 645664;
     name = "Philippe Hürlimann";
   };
+  phaer = {
+    name = "Paul Haerle";
+    email = "nix@phaer.org";
+
+    matrix = "@phaer:matrix.org";
+    github = "phaer";
+    githubId = 101753;
+    keys = [{
+      fingerprint = "5D69 CF04 B7BC 2BC1 A567  9267 00BC F29B 3208 0700";
+    }];
+  };
+  phfroidmont = {
+    name = "Paul-Henri Froidmont";
+    email = "nix.contact-j9dw4d@froidmont.org";
+
+    github = "phfroidmont";
+    githubId = 8150907;
+    keys = [{
+      fingerprint = "3AC6 F170 F011 33CE 393B  CD94 BE94 8AFD 7E78 73BE";
+    }];
+  };
   philandstuff = {
     email = "philip.g.potter@gmail.com";
     github = "philandstuff";
@@ -9744,7 +10263,7 @@
   };
   pierrer = {
     email = "pierrer@pi3r.be";
-    github = "pierrer";
+    github = "PierreR";
     githubId = 93115;
     name = "Pierre Radermecker";
   };
@@ -9766,7 +10285,6 @@
     githubId = 1576660;
     name = "Jelle Besseling";
     keys = [{
-      longkeyid = "rsa4096/0x9712452E8BE3372E";
       fingerprint = "A3A3 65AE 16ED A7A0 C29C  88F1 9712 452E 8BE3 372E";
     }];
   };
@@ -9776,14 +10294,9 @@
     githubId = 1719781;
     name = "Pablo Ovelleiro Corral";
     keys = [{
-      longkeyid = "rsa4096/0x823A6154426408D3";
       fingerprint = "D03B 218C AE77 1F77 D7F9  20D9 823A 6154 4264 08D3";
     }];
   };
-  piotr = {
-    email = "ppietrasa@gmail.com";
-    name = "Piotr Pietraszkiewicz";
-  };
   pjbarnoy = {
     email = "pjbarnoy@gmail.com";
     github = "pjbarnoy";
@@ -9804,7 +10317,7 @@
   };
   pkmx = {
     email = "pkmx.tw@gmail.com";
-    github = "pkmx";
+    github = "PkmX";
     githubId = 610615;
     name = "Chih-Mao Chen";
   };
@@ -9814,7 +10327,6 @@
     github = "plabadens";
     githubId = 4303706;
     keys = [{
-      longkeyid = "rsa2048/0xF55814E4D6874375";
       fingerprint = "B00F E582 FD3F 0732 EA48  3937 F558 14E4 D687 4375";
     }];
   };
@@ -9854,7 +10366,6 @@
     githubId = 898922;
     name = "Philipp Menke";
     keys = [{
-      longkeyid = "rsa4096/0xEB7F2D4CCBE23B69";
       fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69";
     }];
   };
@@ -9890,7 +10401,7 @@
   };
   pneumaticat = {
     email = "kevin@potatofrom.space";
-    github = "pneumaticat";
+    github = "kliu128";
     githubId = 11365056;
     name = "Kevin Liu";
   };
@@ -9906,10 +10417,27 @@
     githubId = 46154511;
     name = "Kevin Mullins";
     keys = [{
-      longkeyid = "rsa4096/361820A45DB41E9A";
       fingerprint = "2CD2 B030 BD22 32EF DF5A  008A 3618 20A4 5DB4 1E9A";
     }];
   };
+  podocarp = {
+    email = "xdjiaxd@gmail.com";
+    github = "podocarp";
+    githubId = 10473184;
+    name = "Jia Xiaodong";
+  };
+  pogobanane = {
+    email = "mail@peter-okelmann.de";
+    github = "pogobanane";
+    githubId = 38314551;
+    name = "Peter Okelmann";
+  };
+  polarmutex = {
+    email = "brian@brianryall.xyz";
+    github = "polarmutex";
+    githubId = 115141;
+    name = "Brian Ryall";
+  };
   polendri = {
     email = "paul@ijj.li";
     github = "polendri";
@@ -9928,6 +10456,12 @@
     githubId = 81340136;
     name = "polykernel";
   };
+  poelzi = {
+    email = "nix@poelzi.org";
+    github = "poelzi";
+    githubId = 66107;
+    name = "Daniel Poelzleithner";
+  };
   polyrod = {
     email = "dc1mdp@gmail.com";
     github = "polyrod";
@@ -9936,7 +10470,7 @@
   };
   pombeirp = {
     email = "nix@endgr.33mail.com";
-    github = "PombeirP";
+    github = "pedropombeiro";
     githubId = 138074;
     name = "Pedro Pombeiro";
   };
@@ -9946,7 +10480,6 @@
     githubId = 53291983;
     name = "Poscat Tarski";
     keys = [{
-      longkeyid = "rsa4096/2D2595A00D08ACE0";
       fingerprint = "48AD DE10 F27B AFB4 7BB0  CCAF 2D25 95A0 0D08 ACE0";
     }];
   };
@@ -9974,7 +10507,6 @@
     githubId = 9904569;
     name = "Pradyuman Vig";
     keys = [{
-      longkeyid = "rsa4096/4F74D5361C4CA31E";
       fingerprint = "240B 57DE 4271 2480 7CE3  EAC8 4F74 D536 1C4C A31E";
     }];
   };
@@ -10004,15 +10536,21 @@
     name = "Michael Weiss";
     keys = [
       {
-        longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only
+        # Git only
         fingerprint = "86A7 4A55 07D0 58D1 322E  37FD 1308 26A6 C2A3 89FD";
       }
       {
-        longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc.
+        # Email, etc.
         fingerprint = "AF85 991C C950 49A2 4205  1933 BCA9 943D D1DF 4C04";
       }
     ];
   };
+  ProducerMatt = {
+    name = "Matthew Pherigo";
+    email = "ProducerMatt42@gmail.com";
+    github = "ProducerMatt";
+    githubId = 58014742;
+  };
   Profpatsch = {
     email = "mail@profpatsch.de";
     github = "Profpatsch";
@@ -10027,7 +10565,7 @@
   };
   progval = {
     email = "progval+nix@progval.net";
-    github = "ProgVal";
+    github = "progval";
     githubId = 406946;
     name = "Valentin Lorentz";
   };
@@ -10049,7 +10587,6 @@
     githubId = 42201;
     name = "Pavol Rusnak";
     keys = [{
-      longkeyid = "rsa4096/0x91F3B339B9A02A3D";
       fingerprint = "86E6 792F C27B FD47 8860  C110 91F3 B339 B9A0 2A3D";
     }];
   };
@@ -10147,7 +10684,7 @@
   };
   peelz = {
     email = "peelz.dev+nixpkgs@gmail.com";
-    github = "louistakepillz";
+    github = "notpeelz";
     githubId = 920910;
     name = "peelz";
   };
@@ -10169,9 +10706,15 @@
     githubId = 115877;
     name = "Kenny Shen";
   };
+  quag = {
+    email = "quaggy@gmail.com";
+    github = "quag";
+    githubId = 35086;
+    name = "Jonathan Wright";
+  };
   queezle = {
     email = "git@queezle.net";
-    github = "qzle";
+    github = "queezle42";
     githubId = 1024891;
     name = "Jens Nolte";
   };
@@ -10187,7 +10730,6 @@
     githubId = 2768870;
     name = "Alyssa Ross";
     keys = [{
-      longkeyid = "rsa4096/736CCDF9EF51BD97";
       fingerprint = "7573 56D7 79BB B888 773E  415E 736C CDF9 EF51 BD97";
     }];
   };
@@ -10244,13 +10786,13 @@
   ralith = {
     email = "ben.e.saunders@gmail.com";
     matrix = "@ralith:ralith.com";
-    github = "ralith";
+    github = "Ralith";
     githubId = 104558;
     name = "Benjamin Saunders";
   };
   ramkromberg = {
     email = "ramkromberg@mail.com";
-    github = "ramkromberg";
+    github = "RamKromberg";
     githubId = 14829269;
     name = "Ram Kromberg";
   };
@@ -10284,10 +10826,6 @@
     githubId = 25647735;
     name = "Victor Freire";
   };
-  ravloony = {
-    email = "ravloony@gmail.com";
-    name = "Tom Macdonald";
-  };
   rawkode = {
     email = "david.andrew.mckay@gmail.com";
     github = "rawkode";
@@ -10296,7 +10834,7 @@
   };
   razvan = {
     email = "razvan.panda@gmail.com";
-    github = "razvan-panda";
+    github = "razvan-flavius-panda";
     githubId = 1758708;
     name = "Răzvan Flavius Panda";
   };
@@ -10318,7 +10856,6 @@
     github = "rbreslow";
     githubId = 1774125;
     keys = [{
-      longkeyid = "ed25519/0xA0D32ACCA38B88ED";
       fingerprint = "B5B7 BCA0 EE6F F31E 263A  69E3 A0D3 2ACC A38B 88ED";
     }];
   };
@@ -10349,7 +10886,6 @@
     keys = [
       # compare with https://keybase.io/reckenrode
       {
-        longkeyid = "ed25519/0xFBF19A982CCE0048";
         fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048";
       }
     ];
@@ -10378,9 +10914,15 @@
     githubId = 1142322;
     name = "Martin Lavoie";
   };
+  regadas = {
+    email = "oss@regadas.email";
+    name = "Filipe Regadas";
+    github = "regadas";
+    githubId = 163899;
+  };
   regnat = {
     email = "regnat@regnat.ovh";
-    github = "regnat";
+    github = "thufschmitt";
     githubId = 7226587;
     name = "Théophane Hufschmitt";
   };
@@ -10432,7 +10974,6 @@
     github = "revol-xut";
     githubId = 32239737;
     keys = [{
-      longkeyid = "rsa4096/B966009D57E69CC6";
       fingerprint = "91EB E870 1639 1323 642A  6803 B966 009D 57E6 9CC6";
     }];
   };
@@ -10480,7 +11021,7 @@
   };
   rhoriguchi = {
     email = "ryan.horiguchi@gmail.com";
-    github = "rhoriguchi ";
+    github = "rhoriguchi";
     githubId = 6047658;
     name = "Ryan Horiguchi";
   };
@@ -10560,11 +11101,9 @@
     githubId = 18313093;
     keys = [
       {
-        longkeyid = "rsa4096/0xF6FD87B15C263EC9";
         fingerprint = "8A0E 6A7C 08AB B9DE 67DE  2A13 F6FD 87B1 5C26 3EC9";
       }
       {
-        longkeyid = "ed25519/0xBBB7A6801DF1E03F";
         fingerprint = "C0A7 A9BB 115B C857 4D75  EA99 BBB7 A680 1DF1 E03F";
       }
     ];
@@ -10619,7 +11158,6 @@
     githubId = 2817565;
     name = "Michele Guerini Rocco";
     keys = [{
-      longkeyid = "ed25519/0xBFBAF4C975F76450";
       fingerprint = "92B2 904F D293 C94D C4C9  3E6B BFBA F4C9 75F7 6450";
     }];
   };
@@ -10704,7 +11242,7 @@
   };
   ronanmacf = {
     email = "macfhlar@tcd.ie";
-    github = "ronanmacf";
+    github = "RonanMacF";
     githubId = 25930627;
     name = "Ronan Mac Fhlannchadha";
   };
@@ -10721,7 +11259,6 @@
     githubId = 3621083;
     name = "Roosembert (Roosemberth) Palacios";
     keys = [{
-      longkeyid = "rsa2048/0xCAAAECE5C2242BB7";
       fingerprint = "78D9 1871 D059 663B 6117  7532 CAAA ECE5 C224 2BB7";
     }];
   };
@@ -10731,7 +11268,6 @@
     github = "rople380";
     githubId = 55679162;
     keys = [{
-      longkeyid = "rsa2048/0x8526B7574A536236";
       fingerprint = "1401 1B63 393D 16C1 AA9C  C521 8526 B757 4A53 6236";
     }];
   };
@@ -10892,7 +11428,6 @@
     githubId = 798147;
     name = "Robert Helgesson";
     keys = [{
-      longkeyid = "rsa4096/0x3573356C25C424D4";
       fingerprint = "36CA CF52 D098 CC0E 78FB  0CB1 3573 356C 25C4 24D4";
     }];
   };
@@ -10904,11 +11439,10 @@
   };
   rytone = {
     email = "max@ryt.one";
-    github = "rytone";
+    github = "rastertail";
     githubId = 8082305;
     name = "Maxwell Beck";
     keys = [{
-      longkeyid = "rsa2048/0xBB3EFA303760A0DB";
       fingerprint = "D260 79E3 C2BC 2E43 905B  D057 BB3E FA30 3760 A0DB";
     }];
   };
@@ -10932,7 +11466,6 @@
     github = "sagikazarmark";
     githubId = 1226384;
     keys = [{
-      longkeyid = "rsa4096/0xF251ADDC9D041C7E";
       fingerprint = "E628 C811 6FB8 1657 F706  4EA4 F251 ADDC 9D04 1C7E";
     }];
   };
@@ -10966,7 +11499,6 @@
     githubId = 1349989;
     name = "samlich";
     keys = [{
-      longkeyid = "rsa4096/B1568953B1939F1C";
       fingerprint = "AE8C 0836 FDF6 3FFC 9580  C588 B156 8953 B193 9F1C";
     }];
   };
@@ -10989,28 +11521,27 @@
     githubId = 132835;
     name = "Samuel Dionne-Riel";
   };
-  samuelgrf = {
-    email = "s@muel.gr";
-    github = "samuelgrf";
-    githubId = 67663538;
-    name = "Samuel Gräfenstein";
-    keys = [
-      {
-        longkeyid = "rsa4096/0xDE75F92E318123F0";
-        fingerprint = "6F2E 2A90 423C 8111 BFF2  895E DE75 F92E 3181 23F0";
-      }
-      {
-        longkeyid = "rsa4096/0xEF76A063F15C63C8";
-        fingerprint = "FF24 5832 8FAF 4660 18C6  186E EF76 A063 F15C 63C8";
-      }
-    ];
-  };
   samuelrivas = {
     email = "samuelrivas@gmail.com";
     github = "samuelrivas";
     githubId = 107703;
     name = "Samuel Rivas";
   };
+  samw = {
+    email = "sam@wlcx.cc";
+    github = "wlcx";
+    githubId = 3065381;
+    name = "Sam Willcocks";
+  };
+  samyak = {
+    name = "Samyak Sarnayak";
+    email = "samyak201@gmail.com";
+    github = "Samyak2";
+    githubId = 34161949;
+    keys = [{
+      fingerprint = "155C F413 0129 C058 9A5F  5524 3658 73F2 F0C6 153B";
+    }];
+  };
   sander = {
     email = "s.vanderburg@tudelft.nl";
     github = "svanderburg";
@@ -11113,9 +11644,14 @@
     githubId = 5104601;
     name = "schnusch";
   };
-  schristo = {
-    email = "schristopher@konputa.com";
-    name = "Scott Christopher";
+  sciencentistguy = {
+    email = "jamie@quigley.xyz";
+    name = "Jamie Quigley";
+    github = "Sciencentistguy";
+    githubId = 4983935;
+    keys = [{
+      fingerprint = "30BB FF3F AB0B BB3E 0435  F83C 8E8F F66E 2AE8 D970";
+    }];
   };
   scode = {
     email = "peter.schuller@infidyne.com";
@@ -11123,6 +11659,12 @@
     githubId = 59476;
     name = "Peter Schuller";
   };
+  scoder12 = {
+    name = "Spencer Pogorzelski";
+    email = "34356756+Scoder12@users.noreply.github.com";
+    github = "Scoder12";
+    githubId = 34356756;
+  };
   scolobb = {
     email = "sivanov@colimite.fr";
     github = "scolobb";
@@ -11138,7 +11680,7 @@
   Scriptkiddi = {
     email = "nixos@scriptkiddi.de";
     matrix = "@fritz.otlinghaus:helsinki-systems.de";
-    github = "scriptkiddi";
+    github = "Scriptkiddi";
     githubId = 3598650;
     name = "Fritz Otlinghaus";
   };
@@ -11187,7 +11729,7 @@
   };
   sebtm = {
     email = "mail@sebastian-sellmeier.de";
-    github = "sebtm";
+    github = "SebTM";
     githubId = 17243347;
     name = "Sebastian Sellmeier";
   };
@@ -11227,6 +11769,12 @@
     githubId = 307899;
     name = "Gurkan Gur";
   };
+  serge = {
+    email = "sb@canva.com";
+    github = "serge-belov";
+    githubId = 38824235;
+    name = "Serge Belov";
+  };
   sersorrel = {
     email = "ash@sorrel.sh";
     github = "sersorrel";
@@ -11239,7 +11787,6 @@
     githubId = 51969817;
     name = "Serval";
     keys = [{
-      longkeyid = "rsa4096/0x4A2AAAA382F8294C";
       fingerprint = "A317 37B3 693C 921B 480C  C629 4A2A AAA3 82F8 294C";
     }];
   };
@@ -11249,13 +11796,12 @@
     github = "seylerius";
     githubId = 1145981;
     keys = [{
-      longkeyid = "rsa4096/0xDC26B921A9E9DBDE";
       fingerprint = "7246 B6E1 ABB9 9A48 4395  FD11 DC26 B921 A9E9 DBDE";
     }];
   };
   sfrijters = {
     email = "sfrijters@gmail.com";
-    github = "sfrijters";
+    github = "SFrijters";
     githubId = 918365;
     name = "Stefan Frijters";
   };
@@ -11271,6 +11817,19 @@
     githubId = 1151264;
     name = "Sebastian Graf";
   };
+  shadaj = {
+    email = "shadaj@users.noreply.github.com";
+    github = "shadaj";
+    githubId = 543055;
+    name = "Shadaj Laddad";
+  };
+  shadowrz = {
+    email = "shadowrz+nixpkgs@disroot.org";
+    matrix = "@ShadowRZ:matrixim.cc";
+    github = "ShadowRZ";
+    githubId = 23130178;
+    name = "夜坂雅";
+  };
   shahrukh330 = {
     email = "shahrukh330@gmail.com";
     github = "shahrukh330";
@@ -11300,20 +11859,19 @@
     github = "shanesveller";
     githubId = 831;
     keys = [{
-      longkeyid = "rsa4096/0x9210C218023C15CD";
       fingerprint = "F83C 407C ADC4 5A0F 1F2F  44E8 9210 C218 023C 15CD";
     }];
     name = "Shane Sveller";
   };
   shawndellysse = {
     email = "sdellysse@gmail.com";
-    github = "shawndellysse";
+    github = "sdellysse";
     githubId = 293035;
     name = "Shawn Dellysse";
   };
   shawn8901 = {
     email = "shawn8901@googlemail.com";
-    github = "shawn8901";
+    github = "Shawn8901";
     githubId = 12239057;
     name = "Shawn8901";
   };
@@ -11359,7 +11917,6 @@
     github = "shiryel";
     githubId = 35617139;
     keys = [{
-      longkeyid = "ed25519/0xC4041EA6B32633DE";
       fingerprint = "AB63 4CD9 3322 BD42 6231  F764 C404 1EA6 B326 33DE";
     }];
   };
@@ -11399,7 +11956,6 @@
     github = "Shrimpram";
     githubId = 67710369;
     keys = [{
-      longkeyid = "rsa4096/0x163B16EE76ED24CE";
       fingerprint = "EA88 EA07 26E9 6CBF 6365  3966 163B 16EE 76ED 24CE";
     }];
   };
@@ -11439,16 +11995,21 @@
     githubId = 688044;
     name = "Nikolay Korotkiy";
     keys = [{
-      longkeyid = "rsa2048/0xD1DE6D7F693663A5";
       fingerprint = "ADF4 C13D 0E36 1240 BD01  9B51 D1DE 6D7F 6936 63A5";
     }];
   };
   simarra = {
     name = "simarra";
     email = "loic.martel@protonmail.com";
-    github = "simarra";
+    github = "Simarra";
     githubId = 14372987;
   };
+  simoneruffini = {
+    email = "simone.ruffini@tutanota.com";
+    github = "simoneruffini";
+    githubId = 50401154;
+    name = "Simone Ruffini";
+  };
   simonchatts = {
     email = "code@chatts.net";
     github = "simonchatts";
@@ -11467,6 +12028,12 @@
     githubId = 2770647;
     name = "Simon Vandel Sillesen";
   };
+  sir4ur0n = {
+    email = "sir4ur0n@users.noreply.github.com";
+    github = "sir4ur0n";
+    githubId = 1204125;
+    name = "sir4ur0n";
+  };
   siraben = {
     email = "bensiraphob@gmail.com";
     matrix = "@siraben:matrix.org";
@@ -11480,13 +12047,12 @@
     githubId = 23038812;
     name = "Sirio Balmelli";
     keys = [{
-      longkeyid = "ed25519/0xF72C4A887F9A24CA";
       fingerprint = "B234 EFD4 2B42 FE81 EE4D  7627 F72C 4A88 7F9A 24CA";
     }];
   };
   sirseruju = {
     email = "sir.seruju@yandex.ru";
-    github = "sirseruju";
+    github = "SirSeruju";
     githubId = 74881555;
     name = "Fofanov Sergey";
   };
@@ -11520,20 +12086,12 @@
     githubId = 158321;
     name = "Stewart Mackenzie";
   };
-  sjourdois = {
-    email = "sjourdois@gmail.com";
-    name = "Stéphane ‘kwisatz’ Jourdois";
-  };
   skeidel = {
     email = "svenkeidel@gmail.com";
     github = "svenkeidel";
     githubId = 266500;
     name = "Sven Keidel";
   };
-  skrzyp = {
-    email = "jot.skrzyp@gmail.com";
-    name = "Jakub Skrzypnik";
-  };
   skykanin = {
     email = "skykanin@users.noreply.github.com";
     github = "skykanin";
@@ -11555,11 +12113,10 @@
   };
   smakarov = {
     email = "setser200018@gmail.com";
-    github = "setser";
+    github = "SeTSeR";
     githubId = 12733495;
     name = "Sergey Makarov";
     keys = [{
-      longkeyid = "rsa2048/6AA23A1193B7064B";
       fingerprint = "6F8A 18AE 4101 103F 3C54  24B9 6AA2 3A11 93B7 064B";
     }];
   };
@@ -11575,7 +12132,6 @@
     githubId = 95471;
     name = "Sébastien Maret";
     keys = [{
-      longkeyid = "rsa4096/0x86E30E5A0F5FC59C";
       fingerprint = "4242 834C D401 86EF 8281  4093 86E3 0E5A 0F5F C59C";
     }];
   };
@@ -11600,7 +12156,7 @@
   };
   sna = {
     email = "abouzahra.9@wright.edu";
-    github = "s-na";
+    github = "S-NA";
     githubId = 20214715;
     name = "S. Nordin Abouzahra";
   };
@@ -11610,6 +12166,12 @@
     githubId = 602439;
     name = "Serguei Narojnyi";
   };
+  snapdgn = {
+    email = "snapdgn@proton.me";
+    name = "Nitish Kumar";
+    github = "snapdgn";
+    githubId = 85608760;
+  };
   snicket2100 = {
     email = "57048005+snicket2100@users.noreply.github.com";
     github = "snicket2100";
@@ -11630,7 +12192,7 @@
   };
   sohalt = {
     email = "nixos@sohalt.net";
-    github = "sohalt";
+    github = "Sohalt";
     githubId = 2157287;
     name = "sohalt";
   };
@@ -11641,6 +12203,12 @@
     githubId = 26806;
     name = "Scott Olson";
   };
+  somasis = {
+    email = "kylie@somas.is";
+    github = "somasis";
+    githubId = 264788;
+    name = "Kylie McClain";
+  };
   SomeoneSerge = {
     email = "sergei.kozlukov@aalto.fi";
     matrix = "@ss:someonex.net";
@@ -11648,16 +12216,6 @@
     githubId = 9720532;
     name = "Sergei K";
   };
-  sondr3 = {
-    email = "nilsen.sondre@gmail.com";
-    github = "sondr3";
-    githubId = 2280539;
-    name = "Sondre Nilsen";
-    keys = [{
-      longkeyid = "ed25519/0x25676BCBFFAD76B1";
-      fingerprint = "0EC3 FA89 EFBA B421 F82E  40B0 2567 6BCB FFAD 76B1";
-    }];
-  };
   sophrosyne = {
     email = "joshuaortiz@tutanota.com";
     github = "sophrosyne97";
@@ -11720,11 +12278,17 @@
     name = "Spencer Whitt";
   };
   squalus = {
-    email = "squalus@tuta.io";
+    email = "squalus@squalus.net";
     github = "squalus";
     githubId = 36899624;
     name = "squalus";
   };
+  squarepear = {
+    email = "contact@jeffreyharmon.dev";
+    github = "SquarePear";
+    githubId = 16364318;
+    name = "Jeffrey Harmon";
+  };
   srapenne = {
     email = "solene@perso.pw";
     github = "rapenne-s";
@@ -11739,7 +12303,7 @@
   };
   srgom = {
     email = "srgom@users.noreply.github.com";
-    github = "srgom";
+    github = "SRGOM";
     githubId = 8103619;
     name = "SRGOM";
   };
@@ -11758,14 +12322,14 @@
   };
   sstef = {
     email = "stephane@nix.frozenid.net";
-    github = "fkstef";
+    github = "haskelious";
     githubId = 8668915;
     name = "Stephane Schitter";
   };
   staccato = {
     name = "staccato";
     email = "moveq@riseup.net";
-    github = "staccato";
+    github = "braaandon";
     githubId = 86573128;
   };
   stackshadow = {
@@ -11774,6 +12338,12 @@
     githubId = 7512804;
     name = "Martin Langlotz";
   };
+  stargate01 = {
+    email = "christoph.honal@web.de";
+    github = "StarGate01";
+    githubId = 6362238;
+    name = "Christoph Honal";
+  };
   steamwalker = {
     email = "steamwalker@xs4all.nl";
     github = "steamwalker";
@@ -11787,10 +12357,10 @@
     name = "Steve Elliott";
   };
   stehessel = {
-      email = "stephan@stehessel.de";
-      github = "stehessel";
-      githubId = 55607356;
-      name = "Stephan Heßelmann";
+    email = "stephan@stehessel.de";
+    github = "stehessel";
+    githubId = 55607356;
+    name = "Stephan Heßelmann";
   };
   steinybot = {
     name = "Jason Pickens";
@@ -11799,7 +12369,6 @@
     github = "steinybot";
     githubId = 4659562;
     keys = [{
-      longkeyid = "ed25519/0x21DE1CAE59762A0F";
       fingerprint = "2709 1DEC CC42 4635 4299  569C 21DE 1CAE 5976 2A0F";
     }];
   };
@@ -11846,7 +12415,6 @@
     github = "steshaw";
     githubId = 45735;
     keys = [{
-      longkeyid = "rsa4096/0x1D9A17DFD23DCB91";
       fingerprint = "0AFE 77F7 474D 1596 EE55  7A29 1D9A 17DF D23D CB91";
     }];
   };
@@ -11864,13 +12432,13 @@
   };
   stevebob = {
     email = "stephen@sherra.tt";
-    github = "stevebob";
+    github = "gridbugs";
     githubId = 417118;
     name = "Stephen Sherratt";
   };
   steveej = {
     email = "mail@stefanjunker.de";
-    github = "steveej";
+    github = "steveeJ";
     githubId = 1181362;
     name = "Stefan Junker";
   };
@@ -11904,6 +12472,18 @@
     githubId = 1694705;
     name = "Sam Stites";
   };
+  strager = {
+    email = "strager.nds@gmail.com";
+    github = "strager";
+    githubId = 48666;
+    name = "Matthew \"strager\" Glazar";
+  };
+  strikerlulu = {
+    email = "strikerlulu7@gmail.com";
+    github = "strikerlulu";
+    githubId = 38893265;
+    name = "StrikerLulu";
+  };
   stumoss = {
     email = "samoss@gmail.com";
     github = "stumoss";
@@ -11928,6 +12508,12 @@
     githubId = 12984845;
     name = "Subhrajyoti Sen";
   };
+  sudosubin = {
+    email = "sudosubin@gmail.com";
+    github = "sudosubin";
+    githubId = 32478597;
+    name = "Subin Kim";
+  };
   suhr = {
     email = "suhr@i2pmail.org";
     github = "suhr";
@@ -11984,6 +12570,12 @@
     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";
@@ -12053,7 +12645,7 @@
   };
   szczyp = {
     email = "qb@szczyp.com";
-    github = "szczyp";
+    github = "Szczyp";
     githubId = 203195;
     name = "Szczyp";
   };
@@ -12081,7 +12673,6 @@
     githubId = 4098453;
     name = "Tadeo Kondrak";
     keys = [{
-      longkeyid = "ed25519/0xFBE607FCC49516D3";
       fingerprint = "0F2B C0C7 E77C 5B42 AC5B  4C18 FBE6 07FC C495 16D3";
     }];
   };
@@ -12115,7 +12706,6 @@
     githubId = 94917129;
     name = "taikx4";
     keys = [{
-      longkeyid = "ed25519/0xCCD52C7B37BB837E";
       fingerprint = "6B02 8103 C4E5 F68C D77C  9E54 CCD5 2C7B 37BB 837E";
     }];
   };
@@ -12206,6 +12796,15 @@
     githubId = 66133083;
     name = "Tomas Bravo";
   };
+  tchekda = {
+    email = "contact@tchekda.fr";
+    github = "Tchekda";
+    githubId = 23559888;
+    keys = [{
+      fingerprint = "44CE A8DD 3B31 49CD 6246  9D8F D0A0 07ED A4EA DA0F";
+    }];
+    name = "David Tchekachev";
+  };
   tckmn = {
     email = "andy@tck.mn";
     github = "tckmn";
@@ -12230,6 +12829,12 @@
     githubId = 139251;
     name = "Tom Hunger";
   };
+  tejasag = {
+    name = "Tejas Agarwal";
+    email = "tejasagarwalbly@gmail.com";
+    github = "tejasag";
+    githubId = 67542663;
+  };
   telotortium = {
     email = "rirelan@gmail.com";
     github = "telotortium";
@@ -12278,6 +12883,16 @@
     githubId = 886074;
     name = "Matthieu Coudron";
   };
+  teutat3s = {
+    email = "teutates@mailbox.org";
+    matrix = "@teutat3s:pub.solar";
+    github = "teutat3s";
+    githubId = 10206665;
+    name = "teutat3s";
+    keys = [{
+      fingerprint = "81A1 1C61 F413 8C84 9139  A4FA 18DA E600 A6BB E705";
+    }];
+  };
   tex = {
     email = "milan.svoboda@centrum.cz";
     github = "tex";
@@ -12334,7 +12949,6 @@
     github = "thblt";
     githubId = 2453136;
     keys = [{
-      longkeyid = "rsa4096/0x63A44817A52EAB7B";
       fingerprint = "D2A2 F0A1 E7A8 5E6F B711  DEE5 63A4 4817 A52E AB7B";
     }];
   };
@@ -12362,6 +12976,16 @@
     githubId = 8547242;
     name = "Stefan Rohrbacher";
   };
+  thehedgeh0g = {
+    name = "The Hedgehog";
+    email = "hedgehog@mrhedgehog.xyz";
+    matrix = "@mrhedgehog:jupiterbroadcasting.com";
+    github = "theHedgehog0";
+    githubId = 35778371;
+    keys = [{
+      fingerprint = "38A0 29B0 4A7E 4C13 A4BB  86C8 7D51 0786 6B1C 6752";
+    }];
+  };
   thelegy = {
     email = "mail+nixos@0jb.de";
     github = "thelegy";
@@ -12376,10 +13000,9 @@
   };
   thesola10 = {
     email = "me@thesola.io";
-    github = "thesola10";
+    github = "Thesola10";
     githubId = 7287268;
     keys = [{
-      longkeyid = "rsa4096/0x89245619BEBB95BA";
       fingerprint = "1D05 13A6 1AC4 0D8D C6D6  5F2C 8924 5619 BEBB 95BA";
     }];
     name = "Karim Vergnes";
@@ -12395,6 +13018,13 @@
     github = "thiagokokada";
     githubId = 844343;
     name = "Thiago K. Okada";
+    matrix = "@k0kada:matrix.org";
+  };
+  thibaultlemaire = {
+    email = "thibault.lemaire@protonmail.com";
+    github = "ThibaultLemaire";
+    githubId = 21345269;
+    name = "Thibault Lemaire";
   };
   thibautmarty = {
     email = "github@thibautmarty.fr";
@@ -12451,7 +13081,6 @@
     githubId = 11243138;
     name = "Chinmay D. Pai";
     keys = [{
-      longkeyid = "rsa4096/0x75507BE256F40CED";
       fingerprint = "7F3E EEAA EE66 93CC 8782  042A 7550 7BE2 56F4 0CED";
     }];
   };
@@ -12528,10 +13157,15 @@
     githubId = 5722198;
     name = "Thomas Kerber";
     keys = [{
-      longkeyid = "rsa4096/0x8489B911F9ED617B";
       fingerprint = "556A 403F B0A2 D423 F656  3424 8489 B911 F9ED 617B";
     }];
   };
+  tljuniper = {
+    email = "tljuniper1@gmail.com";
+    github = "tljuniper";
+    githubId = 48209000;
+    name = "Anna Gillert";
+  };
   tmarkovski = {
     email = "tmarkovski@gmail.com";
     github = "tmarkovski";
@@ -12564,7 +13198,6 @@
     githubId = 561087;
     name = "toastal";
     keys = [{
-      longkeyid = "ed25519/5CCE6F1466D47C9E";
       fingerprint = "7944 74B7 D236 DAB9 C9EF  E7F9 5CCE 6F14 66D4 7C9E";
     }];
   };
@@ -12611,12 +13244,25 @@
     githubId = 61303;
     name = "Tom Fitzhenry";
   };
+  tomhoule = {
+    email = "secondary+nixpkgs@tomhoule.com";
+    github = "tomhoule";
+    githubId = 13155277;
+    name = "Tom Houle";
+  };
   tomsmeets = {
     email = "tom.tsmeets@gmail.com";
-    github = "tomsmeets";
+    github = "TomSmeets";
     githubId = 6740669;
     name = "Tom Smeets";
   };
+  tomsiewert = {
+    email = "tom@siewert.io";
+    matrix = "@tom:frickel.earth";
+    github = "tomsiewert";
+    githubId = 8794235;
+    name = "Tom Siewert";
+  };
   toonn = {
     email = "nixpkgs@toonn.io";
     matrix = "@toonn:matrix.org";
@@ -12642,6 +13288,13 @@
     githubId = 90456;
     name = "Rebecca (Bex) Kelly";
   };
+  tpw_rules = {
+    name = "Thomas Watson";
+    email = "twatson52@icloud.com";
+    matrix = "@tpw_rules:matrix.org";
+    github = "tpwrules";
+    githubId = 208010;
+  };
   travisbhartwell = {
     email = "nafai@travishartwell.net";
     github = "travisbhartwell";
@@ -12650,7 +13303,7 @@
   };
   travisdavis-ops = {
     email = "travisdavismedia@gmail.com";
-    github = "travisdavis-ops";
+    github = "TravisDavis-ops";
     githubId = 52011418;
     name = "Travis Davis";
   };
@@ -12720,10 +13373,6 @@
     githubId = 15064765;
     name = "tshaynik";
   };
-  tstrobel = {
-    email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";
-    name = "Thomas Strobel";
-  };
   ttuegel = {
     email = "ttuegel@mailbox.org";
     github = "ttuegel";
@@ -12748,7 +13397,6 @@
     githubId = 722482;
     name = "Denny Schäfer";
     keys = [{
-      longkeyid = "rsa4096/0xB057455D1E567270";
       fingerprint = "C752 0E49 4D92 1740 D263  C467 B057 455D 1E56 7270";
     }];
   };
@@ -12772,7 +13420,7 @@
   };
   tvorog = {
     email = "marszaripov@gmail.com";
-    github = "tvorog";
+    github = "TvoroG";
     githubId = 1325161;
     name = "Marsel Zaripov";
   };
@@ -12794,7 +13442,6 @@
     github = "twhitehead";
     githubId = 787843;
     keys = [{
-      longkeyid = "rsa2048/0x594258F0389D2802";
       fingerprint = "E631 8869 586F 99B4 F6E6  D785 5942 58F0 389D 2802";
     }];
   };
@@ -12834,7 +13481,6 @@
     github = "unclechu";
     githubId = 799353;
     keys = [{
-      longkeyid = "rsa4096/0xD276FF7467007335";
       fingerprint = "EE59 5E29 BB5B F2B3 5ED2  3F1C D276 FF74 6700 7335";
     }];
   };
@@ -12864,6 +13510,15 @@
     githubId = 619015;
     name = "Svintsov Dmitry";
   };
+  urandom = {
+    email = "colin@urandom.co.uk";
+    github = "arnottcr";
+    githubId = 2526260;
+    keys = [{
+      fingerprint = "04A3 A2C6 0042 784A AEA7  D051 0447 A663 F7F3 E236";
+    }];
+    name = "Colin Arnott";
+  };
   urbas = {
     email = "matej.urbas@gmail.com";
     github = "urbas";
@@ -12934,7 +13589,7 @@
   valodim = {
     email = "look@my.amazin.horse";
     matrix = "@Valodim:stratum0.org";
-    github = "valodim";
+    github = "Valodim";
     githubId = 27813;
     name = "Vincent Breitmoser";
   };
@@ -12950,7 +13605,6 @@
     githubId = 25173827;
     name = "Vanilla";
     keys = [{
-      longkeyid = "rsa4096/0x3750028ED04FA42E";
       fingerprint = "2649 340C C909 F821 D251  6714 3750 028E D04F A42E";
     }];
   };
@@ -12998,7 +13652,6 @@
     github = "vcunat";
     githubId = 1785925;
     keys = [{
-      longkeyid = "rsa4096/0xE747DF1F9575A3AA";
       fingerprint = "B600 6460 B60A 80E7 8206  2449 E747 DF1F 9575 A3AA";
     }];
   };
@@ -13014,7 +13667,6 @@
     github = "veehaitch";
     githubId = 15069839;
     keys = [{
-      longkeyid = "rsa4096/0x874BD6F916FAA742";
       fingerprint = "4D23 ECDF 880D CADF 5ECA  4458 874B D6F9 16FA A742";
     }];
   };
@@ -13060,7 +13712,6 @@
     githubId = 7953163;
     name = "Vika Shleina";
     keys = [{
-      longkeyid = "rsa2048/0x4F62CD07CE64796A";
       fingerprint = "B3C0 DA1A C18B 82E8 CA8B  B1D1 4F62 CD07 CE64 796A";
     }];
   };
@@ -13070,7 +13721,6 @@
     githubId = 631446;
     name = "Vincent Bernat";
     keys = [{
-      longkeyid = "rsa4096/0x95A42FE8353525F9";
       fingerprint = "AEF2 3487 66F3 71C6 89A7  3600 95A4 2FE8 3535 25F9";
     }];
   };
@@ -13080,6 +13730,12 @@
     githubId = 118959;
     name = "VinyMeuh";
   };
+  virchau13 = {
+    email = "virchau13@hexular.net";
+    github = "virchau13";
+    githubId = 16955157;
+    name = "Vir Chaudhury";
+  };
   viraptor = {
     email = "nix@viraptor.info";
     github = "viraptor";
@@ -13116,6 +13772,12 @@
     githubId = 1771332;
     name = "László Vaskó";
   };
+  vlinkz = {
+    email = "vmfuentes64@gmail.com";
+    github = "vlinkz";
+    githubId = 20145996;
+    name = "Victor Fuentes";
+  };
   vlstill = {
     email = "xstill@fi.muni.cz";
     github = "vlstill";
@@ -13153,12 +13815,6 @@
     githubId = 5604643;
     name = "Mikhail Volkhov";
   };
-  volth = {
-    email = "jaroslavas@volth.com";
-    github = "volth";
-    githubId = 508305;
-    name = "Jaroslavas Pocepko";
-  };
   vonfry = {
     email = "nixos@vonfry.name";
     github = "Vonfry";
@@ -13167,6 +13823,8 @@
   };
   vq = {
     email = "vq@erq.se";
+    github = "vq";
+    githubId = 230381;
     name = "Daniel Nilsson";
   };
   vrinek = {
@@ -13183,7 +13841,7 @@
   };
   vskilet = {
     email = "victor@sene.ovh";
-    github = "vskilet";
+    github = "Vskilet";
     githubId = 7677567;
     name = "Victor SENE";
   };
@@ -13211,7 +13869,6 @@
     github = "wackbyte";
     githubId = 29505620;
     keys = [{
-      longkeyid = "rsa4096/0x937F2AE5CCEFBF59";
       fingerprint = "E595 7FE4 FEF6 714B 1AD3  1483 937F 2AE5 CCEF BF59";
     }];
   };
@@ -13221,7 +13878,6 @@
     github = "wakira";
     githubId = 2338339;
     keys = [{
-      longkeyid = "rsa4096/0x8C9B0A8FC0C0D862";
       fingerprint = "47F7 009E 3AE3 1DA7 988E  12E1 8C9B 0A8F C0C0 D862";
     }];
   };
@@ -13249,9 +13905,15 @@
     github = "wdavidw";
     githubId = 46896;
   };
-  wedens = {
-    email = "kirill.wedens@gmail.com";
-    name = "wedens";
+  WeebSorceress = {
+    name = "WeebSorceress";
+    email = "hello@weebsorceress.anonaddy.me";
+    matrix = "@weebsorceress:matrix.org";
+    github = "WeebSorceress";
+    githubId = 106774777;
+    keys = [{
+      fingerprint = "659A 9BC3 F904 EC24 1461  2EFE 7F57 3443 17F0 FA43";
+    }];
   };
   wegank = {
     name = "Weijia Wang";
@@ -13271,7 +13933,6 @@
     githubId = 16267532;
     name = "Han Verstraete";
     keys = [{
-      longkeyid = "rsa4096/0x11F7BAEA856743FF";
       fingerprint = "2145 955E 3F5E 0C95 3458  41B5 11F7 BAEA 8567 43FF";
     }];
   };
@@ -13305,30 +13966,21 @@
     github = "wildsebastian";
     githubId = 1215623;
     keys = [{
-      longkeyid = "rsa4096/0x366A2940479A06FC";
       fingerprint = "DA03 D6C6 3F58 E796 AD26  E99B 366A 2940 479A 06FC";
     }];
   };
   willibutz = {
     email = "willibutz@posteo.de";
-    github = "willibutz";
+    github = "WilliButz";
     githubId = 20464732;
     name = "Willi Butz";
   };
-  willtim = {
-    email = "tim.williams.public@gmail.com";
-    name = "Tim Philip Williams";
-  };
   willcohen = {
     email = "willcohen@users.noreply.github.com";
     github = "willcohen";
     githubId = 5185341;
     name = "Will Cohen";
   };
-  winden = {
-    email = "windenntw@gmail.com";
-    name = "Antonio Vargas Gonzalez";
-  };
   winpat = {
     email = "patrickwinter@posteo.ch";
     github = "winpat";
@@ -13408,8 +14060,8 @@
     name = "Andrei Pampu";
   };
   wolfangaukang = {
-    email = "liquid.query960@4wrd.cc";
-    github = "wolfangaukang";
+    email = "clone.gleeful135+nixpkgs@anonaddy.me";
+    github = "WolfangAukang";
     githubId = 8378365;
     name = "P. R. d. O.";
   };
@@ -13425,12 +14077,27 @@
     githubId = 28888242;
     name = "WORLDofPEACE";
   };
+  wozeparrot = {
+    email = "wozeparrot@gmail.com";
+    github = "wozeparrot";
+    githubId = 25372613;
+    name = "Woze Parrot";
+  };
   wr0belj = {
     name = "Jakub Wróbel";
     email = "wrobel.jakub@protonmail.com";
     github = "wr0belj";
     githubId = 40501814;
   };
+  wrmilling = {
+    name = "Winston R. Milling";
+    email = "Winston@Milli.ng";
+    github = "WRMilling";
+    githubId = 6162814;
+    keys = [{
+      fingerprint = "21E1 6B8D 2EE8 7530 6A6C  9968 D830 77B9 9F8C 6643";
+    }];
+  };
   wscott = {
     email = "wsc9tt@gmail.com";
     github = "wscott";
@@ -13461,9 +14128,16 @@
     github = "wunderbrick";
     githubId = 52174714;
   };
+  wyndon = {
+    email = "72203260+wyndon@users.noreply.github.com";
+    matrix = "@wyndon:envs.net";
+    github = "wyndon";
+    githubId = 72203260;
+    name = "wyndon";
+  };
   wyvie = {
     email = "elijahrum@gmail.com";
-    github = "wyvie";
+    github = "alicerum";
     githubId = 3992240;
     name = "Elijah Rum";
   };
@@ -13537,7 +14211,7 @@
   };
   xnwdd = {
     email = "nwdd+nixos@no.team";
-    github = "xnwdd";
+    github = "xNWDD";
     githubId = 3028542;
     name = "Guillermo NWDD";
   };
@@ -13565,6 +14239,12 @@
     githubId = 1962985;
     name = "Vincenzo Mantova";
   };
+  xyenon = {
+    name = "XYenon";
+    email = "i@xyenon.bid";
+    github = "XYenon";
+    githubId = 20698483;
+  };
   xzfc = {
     email = "xzfcpw@gmail.com";
     github = "xzfc";
@@ -13620,6 +14300,12 @@
     githubId = 5978566;
     name = "Yves-Stan Le Cornec";
   };
+  ylh = {
+    email = "nixpkgs@ylh.io";
+    github = "ylh";
+    githubId = 9125590;
+    name = "Yestin L. Harrison";
+  };
   ylwghst = {
     email = "ylwghst@onionmail.info";
     github = "ylwghst";
@@ -13647,7 +14333,7 @@
   yorickvp = {
     email = "yorickvanpelt@gmail.com";
     matrix = "@yorickvp:matrix.org";
-    github = "yorickvp";
+    github = "yorickvP";
     githubId = 647076;
     name = "Yorick van Pelt";
   };
@@ -13669,12 +14355,24 @@
     githubId = 7040031;
     name = "Yannik Sander";
   };
+  yureien = {
+    email = "contact@sohamsen.me";
+    github = "Yureien";
+    githubId = 17357089;
+    name = "Soham Sen";
+  };
   yuriaisaka = {
     email = "yuri.aisaka+nix@gmail.com";
     github = "yuriaisaka";
     githubId = 687198;
     name = "Yuri Aisaka";
   };
+  yurkobb = {
+    name = "Yury Bulka";
+    email = "setthemfree@privacyrequired.com";
+    github = "yurkobb";
+    githubId = 479389;
+  };
   yurrriq = {
     email = "eric@ericb.me";
     github = "yurrriq";
@@ -13687,7 +14385,6 @@
     githubId = 24368641;
     name = "Guillaume Pagnoux";
     keys = [{
-      longkeyid = "rsa4096/0xEC5065899AEAAF4C";
       fingerprint = "85F8 E850 F8F2 F823 F934  535B EC50 6589 9AEA AF4C";
     }];
   };
@@ -13705,7 +14402,6 @@
     githubId = 19897088;
     name = "Yusuf Bera Ertan";
     keys = [{
-      longkeyid = "rsa2048/0x61807181F60EFCB2";
       fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2";
     }];
   };
@@ -13715,7 +14411,6 @@
     githubId = 86538850;
     name = "Yuu Yin";
     keys = [{
-      longkeyid = "rsa4096/0x416F303B43C20AC3";
       fingerprint = "9F19 3AE8 AA25 647F FC31  46B5 416F 303B 43C2 0AC3";
     }];
   };
@@ -13775,7 +14470,7 @@
   };
   zauberpony = {
     email = "elmar@athmer.org";
-    github = "zauberpony";
+    github = "elmarx";
     githubId = 250877;
     name = "Elmar Athmer";
   };
@@ -13785,17 +14480,19 @@
     githubId = 6191421;
     name = "Edward d'Albon";
   };
-  zef = {
-    email = "zef@zef.me";
-    name = "Zef Hemel";
+  zebreus = {
+    matrix = "@lennart:cicen.net";
+    email = "lennarteichhorn+nixpkgs@gmail.com";
+    github = "Zebreus";
+    githubId = 1557253;
+    name = "Lennart Eichhorn";
   };
   zeratax = {
     email = "mail@zera.tax";
-    github = "ZerataX";
+    github = "zeratax";
     githubId = 5024958;
     name = "Jona Abdinghoff";
     keys = [{
-      longkeyid = "rsa4096/0x8333735E784DF9D4";
       fingerprint = "44F7 B797 9D3A 27B1 89E0  841E 8333 735E 784D F9D4";
     }];
   };
@@ -13916,7 +14613,7 @@
   };
   rakesh4g = {
     email = "rakeshgupta4u@gmail.com";
-    github = "rakesh4g";
+    github = "Rakesh4G";
     githubId = 50867187;
     name = "Rakesh Gupta";
   };
@@ -13946,7 +14643,7 @@
   };
   matthewcroughan = {
     email = "matt@croughan.sh";
-    github = "matthewcroughan";
+    github = "MatthewCroughan";
     githubId = 26458780;
     name = "Matthew Croughan";
   };
@@ -13980,7 +14677,6 @@
     github = "ymatsiuk";
     githubId = 24990891;
     keys = [{
-      longkeyid = "rsa4096/0x61302290298601AA";
       fingerprint = "7BB8 84B5 74DA FDB1 E194  ED21 6130 2290 2986 01AA";
     }];
   };
@@ -14020,6 +14716,12 @@
     github = "deifactor";
     githubId = 30192992;
   };
+  deinferno = {
+    name = "deinferno";
+    email = "14363193+deinferno@users.noreply.github.com";
+    github = "deinferno";
+    githubId = 14363193;
+  };
   fzakaria = {
     name = "Farid Zakaria";
     email = "farid.m.zakaria@gmail.com";
@@ -14046,7 +14748,6 @@
     github = "hmenke";
     githubId = 1903556;
     keys = [{
-      longkeyid = "rsa4096/0xD65C9AFB4C224DA3";
       fingerprint = "F1C5 760E 45B9 9A44 72E9  6BFB D65C 9AFB 4C22 4DA3";
     }];
   };
@@ -14056,7 +14757,6 @@
     github = "berbiche";
     githubId = 20448408;
     keys = [{
-      longkeyid = "rsa4096/0xB461292445C6E696";
       fingerprint = "D446 E58D 87A0 31C7 EC15  88D7 B461 2924 45C6 E696";
     }];
   };
@@ -14078,7 +14778,6 @@
     github = "starcraft66";
     githubId = 1858154;
     keys = [{
-      longkeyid = "rsa4096/0x9D98CDACFF04FD78";
       fingerprint = "8597 4506 EC69 5392 0443  0805 9D98 CDAC FF04 FD78";
     }];
   };
@@ -14110,10 +14809,9 @@
     name = "Josh Hoffer";
     email = "jhoffer@sansorgan.es";
     matrix = "@princemachiavelli:matrix.org";
-    github = "princemachiavelli";
+    github = "Princemachiavelli";
     githubId = 2730968;
     keys = [{
-      longkeyid = "ed25519/0x83124F97A318EA18";
       fingerprint = "DD54 130B ABEC B65C 1F6B  2A38 8312 4F97 A318 EA18";
     }];
   };
@@ -14123,7 +14821,6 @@
     github = "ydlr";
     githubId = 58453832;
     keys = [{
-      longkeyid = "rsa4096/0x43AB44130A29AD9D";
       fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4";
     }];
   };
@@ -14133,7 +14830,6 @@
     github = "vs49688";
     githubId = 4423262;
     keys = [{
-      longkeyid = "rsa4096/0x68616B2D8AC4DCC5";
       fingerprint = "61AE D40F 368B 6F26 9DAE  3892 6861 6B2D 8AC4 DCC5";
     }];
   };
@@ -14143,13 +14839,18 @@
     github = "zbioe";
     githubId = 7332055;
   };
+  zendo = {
+    name = "zendo";
+    email = "linzway@qq.com";
+    github = "zendo";
+    githubId = 348013;
+  };
   zenithal = {
     name = "zenithal";
     email = "i@zenithal.me";
     github = "ZenithalHourlyRate";
     githubId = 19512674;
     keys = [{
-      longkeyid = "rsa4096/0x87E17EEF9B18B6C9";
       fingerprint = "1127 F188 280A E312 3619  3329 87E1 7EEF 9B18 B6C9";
     }];
   };
@@ -14166,7 +14867,6 @@
     name = "Zoey de Souza Pessanha";
     email = "zoey.spessanha@outlook.com";
     keys = [{
-      longkeyid = "rsa4096/0x1E1E889CDBD6A315";
       fingerprint = "EAA1 51DB 472B 0122 109A  CB17 1E1E 889C DBD6 A315";
     }];
   };
@@ -14182,7 +14882,6 @@
     github = "zseri";
     githubId = 1618343;
     keys = [{
-      longkeyid = "rsa4096/0x229E63AE5644A96D";
       fingerprint = "7AFB C595 0D3A 77BD B00F  947B 229E 63AE 5644 A96D";
     }];
   };
@@ -14235,7 +14934,6 @@
     githubId = 68368;
     matrix = "@qbit:tapenet.org";
     keys = [{
-      longkeyid = "rsa4096/0x1F81112D62A9ADCE";
       fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
     }];
   };
@@ -14251,4 +14949,84 @@
     github = "nigelgbanks";
     githubId = 487373;
   };
+  zanculmarktum = {
+    name = "Azure Zanculmarktum";
+    email = "zanculmarktum@gmail.com";
+    github = "zanculmarktum";
+    githubId = 16958511;
+  };
+  kuwii = {
+    name = "kuwii";
+    email = "kuwii.someone@gmail.com";
+    github = "kuwii";
+    githubId = 10705175;
+  };
+  melias122 = {
+    name = "Martin Elias";
+    email = "martin+nixpkgs@elias.sx";
+    github = "melias122";
+    githubId = 1027766;
+  };
+  bryanhonof = {
+    name = "Bryan Honof";
+    email = "bryanhonof@gmail.com";
+    github = "bryanhonof";
+    githubId = 5932804;
+  };
+  bbenne10 = {
+    email = "Bryan.Bennett@protonmail.com";
+    matrix = "@bryan.bennett:matrix.org";
+    github = "bbenne10";
+    githubId = 687376;
+    name = "Bryan Bennett";
+    keys = [{
+      # compare with https://keybase.io/bbenne10
+      fingerprint = "41EA 00B4 00F9 6970 1CB2  D3AF EF90 E3E9 8B8F 5C0B";
+    }];
+  };
+  snpschaaf = {
+    email = "philipe.schaaf@secunet.com";
+    name = "Philippe Schaaf";
+    github = "snpschaaf";
+    githubId = 105843013;
+  };
+  SohamG = {
+    email = "sohamg2@gmail.com";
+    name = "Soham S Gumaste";
+    github = "SohamG";
+    githubId = 7116239;
+    keys = [{
+      fingerprint = "E067 520F 5EF2 C175 3F60  50C0 BA46 725F 6A26 7442";
+    }];
+  };
+  jali-clarke = {
+    email = "jinnah.ali-clarke@outlook.com";
+    name = "Jinnah Ali-Clarke";
+    github = "jali-clarke";
+    githubId = 17733984;
+  };
+  npatsakula = {
+    email = "nikita.patsakula@gmail.com";
+    name = "Patsakula Nikita";
+    github = "npatsakula";
+    githubId = 23001619;
+  };
+  dfithian = {
+    email = "daniel.m.fithian@gmail.com";
+    name = "Daniel Fithian";
+    github = "dfithian";
+    githubId = 8409320;
+  };
+  nikstur = {
+    email = "nikstur@outlook.com";
+    name = "nikstur";
+    github = "nikstur";
+    githubId = 61635709;
+  };
+  yisuidenghua = {
+    email = "bileiner@gmail.com";
+    name = "Milena Yisui";
+    github = "yisuidenghua";
+    githubId = 102890144;
+  };
 }
diff --git a/nixpkgs/maintainers/scripts/dep-licenses.sh b/nixpkgs/maintainers/scripts/dep-licenses.sh
index 28ad22c334fc..816dcf6d7f76 100755
--- a/nixpkgs/maintainers/scripts/dep-licenses.sh
+++ b/nixpkgs/maintainers/scripts/dep-licenses.sh
@@ -9,7 +9,7 @@ tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX)
 exitHandler() {
     exitCode=$?
     rm -rf "$tmp"
-    exit $exitCode
+    return $exitCode
 }
 
 trap "exitHandler" EXIT
diff --git a/nixpkgs/maintainers/scripts/feature-freeze-teams.pl b/nixpkgs/maintainers/scripts/feature-freeze-teams.pl
new file mode 100755
index 000000000000..eb37150befe3
--- /dev/null
+++ b/nixpkgs/maintainers/scripts/feature-freeze-teams.pl
@@ -0,0 +1,98 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i perl -p perl -p perlPackages.JSON perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.TermReadKey
+
+# This script generates a list of teams to ping for the Feature Freeze announcement on Discourse.
+# It's intended to be used by Release Managers before creating such posts.
+#
+# The script interactively reads a GitHub username and a corresponding GitHub Personal Access token.
+# This is required to access the GitHub Teams API so the token needs at least the read:org privilege.
+
+## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::ProhibitBacktickOperators)
+use strict;
+use warnings;
+use Carp;
+use Cwd 'abs_path';
+use File::Basename;
+use JSON qw(decode_json);
+use LWP::UserAgent;
+use Term::ReadKey qw(ReadLine ReadMode);
+
+sub github_team_members {
+    my ($team_name, $username, $token) = @_;
+    my @ret;
+
+    my $req = HTTP::Request->new('GET', "https://api.github.com/orgs/NixOS/teams/$team_name/members", [ 'Accept' => 'application/vnd.github.v3+json' ]);
+    $req->authorization_basic($username, $token);
+    my $response = LWP::UserAgent->new->request($req);
+
+    if ($response->is_success) {
+        my $content = decode_json($response->decoded_content);
+        foreach (@{$content}) {
+            push @ret, $_->{'login'};
+        }
+    } else {
+        print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: $response->status_line";
+    }
+
+    return \@ret;
+}
+
+# Read GitHub credentials
+print {*STDERR} 'GitHub username: ';
+my $github_user = ReadLine(0);
+ReadMode('noecho');
+print {*STDERR} 'GitHub personal access token (no echo): ';
+my $github_token = ReadLine(0);
+ReadMode('restore');
+print {*STDERR} "\n";
+chomp $github_user;
+chomp $github_token;
+
+# Read nix output
+my $nix_version = `nix --version`;
+my $out;
+my $lib_path = abs_path(dirname(__FILE__)) . '../../../lib';
+if ($nix_version =~ m/2[.]3[.]/msx) {
+    $out = `nix eval --json '(import $lib_path).teams'` || croak 'nix eval failed';
+} else {
+    $out = `nix --extra-experimental-features nix-command eval --json --impure --expr '(import $lib_path).teams'` || croak('nix eval failed');
+}
+my $data = decode_json($out);
+
+# Process teams
+print {*STDERR} "\n";
+while (my ($team_nix_key, $team_config) = each %{$data}) {
+    # Ignore teams that don't want to be or can't be pinged
+    if (not defined $team_config->{enableFeatureFreezePing} or not $team_config->{enableFeatureFreezePing}) {
+        next;
+    }
+    if (not defined $team_config->{shortName}) {
+        print {*STDERR} "!! The team with the nix key '$team_nix_key' has no shortName set - ignoring";
+        next;
+    }
+    #  Team name
+    print {*STDERR} "$team_config->{shortName}:";
+    # GitHub Teams
+    my @github_members;
+    if (defined $team_config->{githubTeams}) {
+        foreach (@{$team_config->{githubTeams}}) {
+            print {*STDERR} " \@NixOS/${_}";
+            push @github_members, @{github_team_members($_, $github_user, $github_token)};
+        }
+    }
+    my %github_members = map { $_ => 1 } @github_members;
+    # Members
+    if (defined $team_config->{members}) {
+        foreach (@{$team_config->{members}}) {
+            my %user = %{$_};
+            my $github_handle = $user{'github'};
+            # Ensure we don't ping team members twice (as team member and directly)
+            if (defined $github_members{$github_handle}) {
+                next;
+            }
+            print {*STDERR} " \@$github_handle";
+        }
+    }
+
+    print {*STDERR} "\n";
+}
diff --git a/nixpkgs/maintainers/scripts/fetch-kde-qt.sh b/nixpkgs/maintainers/scripts/fetch-kde-qt.sh
index 22d78151978b..9e2348fda707 100755
--- a/nixpkgs/maintainers/scripts/fetch-kde-qt.sh
+++ b/nixpkgs/maintainers/scripts/fetch-kde-qt.sh
@@ -2,30 +2,159 @@
 #! nix-shell -i bash -p coreutils findutils gnused nix wget
 
 set -efuo pipefail
+export LC_COLLATE=C # fix sort order
 
-SRCS=
-if [ -d "$1" ]; then
-    SRCS="$(pwd)/$1/srcs.nix"
-    . "$1/fetch.sh"
+# parse files and folders from https://download.kde.org/ and https://download.qt.io/
+# you can override this function in fetch.sh
+function PARSE_INDEX() {
+    cat "$1" | grep -o -E -e '\s+href="[^"]+\.tar\.xz"' -e '\s+href="[-_a-zA-Z0-9]+/"' | cut -d'"' -f2 | sort | uniq
+}
+
+if [ $# != 1 ]; then
+    echo "example use:" >&2
+    echo "cd nixpkgs/" >&2
+    echo "./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.12" >&2
+    exit 1
+fi
+
+if ! echo "$1" | grep -q '^pkgs/'; then
+    echo "error: path argument must start with pkgs/" >&2
+    exit 1
+fi
+
+# need absolute path for the pushd-popd block
+if [ -f "$1" ]; then
+    echo "ok: using fetchfile $1"
+    fetchfilerel="$1"
+    fetchfile="$(readlink -f "$fetchfilerel")" # resolve absolute path
+    basedir="$(dirname "$fetchfile")"
+    basedirrel="$(dirname "$fetchfilerel")"
+elif [ -d "$1" ]; then
+    echo "ok: using basedir $1"
+    basedirrel="$1"
+    basedir="$(readlink -f "$basedirrel")" # resolve absolute path
+    if ! [ -d "$basedir" ]; then
+        basedir="$(dirname "$basedir")"
+    fi
+    fetchfile="$basedir/fetch.sh"
 else
-    SRCS="$(pwd)/$(dirname $1)/srcs.nix"
-    . "$1"
+    echo 'error: $1 must be file or dir' >&2
+    exit 1
 fi
 
-tmp=$(mktemp -d)
+pkgname=$(basename "$basedir")
+SRCS="$basedir/srcs.nix"
+srcsrel="$basedirrel/srcs.nix"
+
+source "$fetchfile"
+
+if [ -n "$WGET_ARGS" ]; then # old format
+    BASE_URL="${WGET_ARGS[0]}" # convert to new format
+    # validate
+    if ! echo "$BASE_URL" | grep -q -E '^(http|https|ftp)://'; then
+        printf 'error: from WGET_ARGS, converted invalid BASE_URL: %q\n' "$BASE_URL" >&2
+        exit 1
+    fi
+    printf 'ok: from WGET_ARGS, converted BASE_URL: %q\n' "$BASE_URL"
+elif [ -n "$BASE_URL" ]; then # new format
+    :
+else
+    echo "error: fetch.sh must set either WGET_ARGS or BASE_URL" >&2
+    exit 1
+fi
+
+tmptpl=tmp.fetch-kde-qt.$pkgname.XXXXXXXXXX
+
+tmp=$(mktemp -d $tmptpl)
 pushd $tmp >/dev/null
-wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null
+echo "tempdir is $tmp"
+
+wgetargs='--quiet --show-progress'
+#wgetargs='' # debug
+
+dirlist="$BASE_URL"
+filelist=""
+base_url_len=${#BASE_URL}
 
-csv=$(mktemp)
-find . -type f | while read src; do
+clean_urls() {
+    # // -> /
+    sed -E 's,//+,/,g' | sed -E 's,^(http|https|ftp):/,&/,'
+}
+
+while [ -n "$dirlist" ]
+do
+    for dirurl in $dirlist
+    do
+        echo "fetching index.html from $dirurl"
+        relpath=$(echo "./${dirurl:$base_url_len}" | clean_urls)
+        mkdir -p "$relpath"
+        indexfile=$(echo "$relpath/index.html" | clean_urls)
+        wget $wgetargs -O "$indexfile" "$dirurl"
+        echo "parsing $indexfile"
+        filedirlist="$(PARSE_INDEX "$indexfile")"
+        filelist_next="$(echo "$filedirlist" | grep '\.tar\.xz$' | while read file; do echo "$dirurl/$file"; done)"
+        filelist_next="$(echo "$filelist_next" | clean_urls)"
+        [ -n "$filelist" ] && filelist+=$'\n'
+        filelist+="$filelist_next"
+        dirlist="$(echo "$filedirlist" | grep -v '\.tar\.xz$' | while read dir; do echo "$dirurl/$dir"; done || true)"
+        dirlist="$(echo "$dirlist" | clean_urls)"
+    done
+done
+
+filecount=$(echo "$filelist" | wc -l)
+
+if [ -z "$filelist" ]
+then
+    echo "error: no files parsed from $tmp/index.html"
+    exit 1
+fi
+
+echo "parsed $filecount tar.xz files:"; echo "$filelist"
+
+# most time is spent here
+echo "fetching $filecount sha256 files ..."
+urllist="$(echo "$filelist" | while read file; do echo "$file.sha256"; done)"
+# wget -r: keep directory structure
+echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent && {
+    actual=$(find . -type f -name '*.sha256' | wc -l)
+    echo "fetching $filecount sha256 files done: got $actual files"
+} || {
+    # workaround: in rare cases, the server does not provide the sha256 files
+    # for example when the release is just a few hours old
+    # and the servers are not yet fully synced
+    actual=$(find . -type f -name '*.sha256' | wc -l)
+    echo "fetching $filecount sha256 files failed: got only $actual files"
+
+    # 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 "generating sha256 files ..."
+    find . -type f -name '*.tar.xz' | while read src; do
+        name=$(basename "$src")
+        sha256=$(sha256sum "$src" | cut -d' ' -f1)
+        echo "$sha256  $name" >"$src.sha256"
+    done
+}
+
+csv=$(mktemp $tmptpl.csv)
+echo "writing temporary file $csv ..."
+find . -type f -name '*.sha256' | while read sha256file; do
+    src="${sha256file%.*}" # remove extension
+    sha256=$(cat $sha256file | cut -d' ' -f1) # base16
+    sha256=$(nix-hash --type sha256 --to-base32 $sha256)
     # Sanitize file name
     filename=$(basename "$src" | tr '@' '_')
     nameVersion="${filename%.tar.*}"
     name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')
     version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-    echo "$name,$version,$src,$filename" >>$csv
+    echo "$name,$version,$src,$filename,$sha256" >>$csv
 done
 
+files_before=$(grep -c 'src = ' "$SRCS")
+
+echo "writing output file $SRCS ..."
 cat >"$SRCS" <<EOF
 # DO NOT EDIT! This file is generated automatically.
 # Command: $0 $@
@@ -39,8 +168,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
     latestVersion=$(echo "$versions" | sort -rV | head -n 1)
     src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
     filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
+    sha256=$(gawk -F , "/^$name,$latestVersion,/ { print \$5 }" $csv)
     url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
     cat >>"$SRCS" <<EOF
   $name = {
     version = "$latestVersion";
@@ -55,6 +184,13 @@ done
 
 echo "}" >>"$SRCS"
 
+files_after=$(grep -c 'src = ' "$SRCS")
+echo "files before: $files_before"
+echo "files after:  $files_after"
+
+echo "compare:"
+echo "git diff $srcsrel"
+
 popd >/dev/null
 rm -fr $tmp >/dev/null
 
diff --git a/nixpkgs/maintainers/scripts/fix-maintainers.pl b/nixpkgs/maintainers/scripts/fix-maintainers.pl
new file mode 100755
index 000000000000..81f6450c5faf
--- /dev/null
+++ b/nixpkgs/maintainers/scripts/fix-maintainers.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i perl -p perl -p perlPackages.LWP -p perlPackages.LWPProtocolHttps -p perlPackages.LWPUserAgent -p perlPackages.JSON -p perlPackages.PathTiny
+use LWP::UserAgent;
+use JSON;
+use Path::Tiny;
+use strict;
+use warnings;
+
+my $maintainers_list_nix = "../maintainer-list.nix";
+my $maintainers_json = from_json(`nix-instantiate --json --eval --expr 'builtins.fromJSON (builtins.toJSON (import $maintainers_list_nix))'`);
+
+STDOUT->autoflush(1);
+
+my $ua = LWP::UserAgent->new();
+
+keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop
+while(my($k, $v) = each %$maintainers_json) {
+    my $current_user = %$v{'github'};
+    if (!defined $current_user) {
+        print "$k has no github handle\n";
+        next;
+    }
+    my $github_id = %$v{'githubId'};
+    if (!defined $github_id) {
+        print "$k has no githubId\n";
+        next;
+    }
+    my $url = 'https://api.github.com/user/' . $github_id;
+    my $resp = $ua->get(
+        $url,
+        "Authorization" => "Token $ENV{GH_TOKEN}"
+    );
+
+    if ($resp->header("X-RateLimit-Remaining") == 0) {
+        my $ratelimit_reset = $resp->header("X-RateLimit-Reset");
+        print "Request limit exceeded, waiting until " . scalar localtime $ratelimit_reset . "\n";
+        sleep($ratelimit_reset - time() + 5);
+    }
+    if ($resp->code != 200) {
+        print $current_user . " likely deleted their github account\n";
+        next;
+    }
+    my $resp_json = from_json($resp->content);
+    my $api_user = %$resp_json{"login"};
+    if ($current_user ne $api_user) {
+        print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n";
+        my $file = path($maintainers_list_nix);
+        my $data = $file->slurp_utf8;
+        $data =~ s/github = "$current_user";$/github = "$api_user";/m;
+        $file->spew_utf8($data);
+    }
+}
diff --git a/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/nixpkgs/maintainers/scripts/haskell/hydra-report.hs
index 360b9f2058de..f7e5f573982d 100755
--- a/nixpkgs/maintainers/scripts/haskell/hydra-report.hs
+++ b/nixpkgs/maintainers/scripts/haskell/hydra-report.hs
@@ -20,14 +20,12 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-{-# OPTIONS_GHC -Wall #-}
 {-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE TupleSections #-}
+{-# OPTIONS_GHC -Wall #-}
 
 import Control.Monad (forM_, (<=<))
 import Control.Monad.Trans (MonadIO (liftIO))
@@ -453,8 +451,8 @@ printBuildSummary
       showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else ""))
       showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers)))
       tldr = case (errors, warnings) of
-               ([],[]) -> [":green_circle: **Ready to merge**"]
-               ([],_) -> [":yellow_circle: **Potential issues**"]
+               ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
+               ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
                _ -> [":red_circle: **Branch not mergeable**"]
       warnings =
          if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <>
diff --git a/nixpkgs/maintainers/scripts/haskell/maintained-broken-pkgs.nix b/nixpkgs/maintainers/scripts/haskell/maintained-broken-pkgs.nix
new file mode 100644
index 000000000000..7416bfa46ee0
--- /dev/null
+++ b/nixpkgs/maintainers/scripts/haskell/maintained-broken-pkgs.nix
@@ -0,0 +1,22 @@
+let
+  nixpkgs = import ../../..;
+  inherit (nixpkgs {}) haskellPackages lib;
+  maintainedPkgs = lib.filterAttrs (
+    _: v: builtins.length (v.meta.maintainers or []) > 0
+  ) haskellPackages;
+  brokenPkgs = lib.filterAttrs (_: v: v.meta.broken) maintainedPkgs;
+  transitiveBrokenPkgs = lib.filterAttrs
+    (_: v: !(builtins.tryEval (v.outPath or null)).success && !v.meta.broken)
+    maintainedPkgs;
+  infoList = pkgs: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: drv: "${name} ${(builtins.elemAt drv.meta.maintainers 0).github}") pkgs);
+in {
+  report = ''
+    BROKEN:
+    ${infoList brokenPkgs}
+
+    TRANSITIVE BROKEN:
+    ${infoList transitiveBrokenPkgs}
+  '';
+  transitiveErrors =
+    builtins.attrValues transitiveBrokenPkgs;
+}
diff --git a/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh b/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
index 18db1da0f2a5..9e6ebafaccc8 100755
--- a/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
+++ b/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
@@ -99,7 +99,7 @@ This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.
 
 This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).
 
-We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) for who is currently in charge of this branch.
+We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) for who is currently in charge of this branch.
 
 ### haskellPackages Workflow Summary
 
diff --git a/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
index ecf38dc4b900..4da9f6d28c2f 100755
--- a/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
+++ b/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
@@ -1,26 +1,38 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.
+# shellcheck shell=bash
 
 set -eu -o pipefail
 
-tmpfile=$(mktemp "update-stackage.XXXXXXX")
-# shellcheck disable=SC2064
+# Stackage solver to use, LTS or Nightly
+# (should be capitalized like the display name)
+SOLVER=LTS
+TMP_TEMPLATE=update-stackage.XXXXXXX
+readonly SOLVER
+readonly TMP_TEMPLATE
+
+toLower() {
+    printf "%s" "$1" | tr '[:upper:]' '[:lower:]'
+}
+
+tmpfile=$(mktemp "$TMP_TEMPLATE")
+tmpfile_new=$(mktemp "$TMP_TEMPLATE")
 
 stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
 
-trap "rm ${tmpfile} ${tmpfile}.new" 0
-touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
+trap 'rm "${tmpfile}" "${tmpfile_new}"' 0
+touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors.
 
-curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile"
-old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/')
-version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile")
+curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile"
+old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g')
+version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")"
 
 if [[ "$old_version" == "$version" ]]; then
    echo "No new stackage version"
    exit 0 # Nothing to do
 fi
 
-echo "Updating Stackage LTS from $old_version to $version."
+echo "Updating Stackage from $old_version to $version."
 
 # Create a simple yaml version of the file.
 sed -r \
@@ -30,10 +42,10 @@ sed -r \
     -e 's|,$||' \
     -e '/installed$/d' \
     -e '/^$/d' \
-    < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
+    < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}"
 
 cat > $stackage_config << EOF
-# Stackage LTS $version
+# Stackage $version
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -45,12 +57,13 @@ sed -r \
     -e '/ distribution-nixpkgs /d' \
     -e '/ jailbreak-cabal /d' \
     -e '/ language-nix /d' \
-    < "${tmpfile}.new" >> $stackage_config
+    -e '/ cabal-install /d' \
+    < "${tmpfile_new}" >> $stackage_config
 
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config
 git commit -F - << EOF
-haskellPackages: stackage-lts $old_version -> $version
+haskellPackages: stackage $old_version -> $version
 
 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
 EOF
diff --git a/nixpkgs/maintainers/scripts/luarocks-config.lua b/nixpkgs/maintainers/scripts/luarocks-config.lua
index 89e74c00ea8e..f7ac9f9e4ba6 100644
--- a/nixpkgs/maintainers/scripts/luarocks-config.lua
+++ b/nixpkgs/maintainers/scripts/luarocks-config.lua
@@ -1,4 +1,8 @@
+
+-- default of luarocks listed at src/luarocks/core/cfg.lua
+-- keep this list synced with pkgs/build-support/fetchurl/mirrors.nix
 rocks_servers = {
-	"https://luarocks.org"
+	"https://luarocks.org",
+	"https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
 }
 version_check_on_fail = false
diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv
index bdda8020a3da..e41e8a162546 100644
--- a/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv
@@ -6,6 +6,7 @@ basexx,https://github.com/teto/basexx.git,,,,,
 binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat
 busted,,,,,,
 cassowary,,,,,,marsam alerque
+cldr,,,,,,alerque
 compat53,,,,0.7-1,,vcunat
 cosmo,,,,,,marsam
 coxpcall,,,,1.17.0-1,,
@@ -14,6 +15,7 @@ cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
 digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3,
 dkjson,,,,,,
 fifo,,,,,,
+fluent,,,,,,alerque
 gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1,
 http,,,,0.3-0,,vcunat
 inspect,,,,,,
@@ -22,6 +24,9 @@ ldoc,https://github.com/stevedonovan/LDoc.git,,,,,
 lgi,,,,,,
 linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,,
 ljsyscall,,,,,lua5_1,lblasc
+lmathx,,,,,lua5_3,alexshpilkin
+lmpfrlib,,,,,lua5_3,alexshpilkin
+loadkit,,,,,,alerque
 lpeg,,,,,,vyp
 lpeg_patterns,,,,,,
 lpeglabel,,,,,,
@@ -34,11 +39,13 @@ lua-cmsgpack,,,,,,
 lua-iconv,,,,,,
 lua-lsp,,,,,,
 lua-messagepack,,,,,,
+lua-protobuf,,,,,,lockejan
 lua-resty-http,,,,,,
 lua-resty-jwt,,,,,,
 lua-resty-openidc,,,,,,
 lua-resty-openssl,,,,,,
 lua-resty-session,,,,,,
+lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,lua5_1,scoder12
 lua-term,,,,,,
 lua-toml,,,,,,
 lua-zlib,,,,,,koral
@@ -52,7 +59,7 @@ luadbi-postgresql,,,,,,
 luadbi-sqlite3,,,,,,
 luaepnf,,,,,,
 luaevent,,,,,,
-luaexpat,,,,1.3.0-1,,arobyn flosse
+luaexpat,,,,1.4.1-1,,arobyn flosse
 luaffi,,,http://luarocks.org/dev,,,
 luafilesystem,,,,1.7.0-2,,flosse
 lualogging,,,,,,
@@ -64,6 +71,8 @@ luasocket,,,,,,
 luasql-sqlite3,,,,,,vyp
 luassert,,,,,,
 luasystem,,,,,,
+luaunbound,,,,,
+luaunit,,,,,,lockejan
 luautf8,,,,,,pstn
 luazip,,,,,,
 lua-yajl,,,,,,pstn
@@ -80,7 +89,10 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
 rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
 readline,,,,,,
 say,https://github.com/Olivine-Labs/say.git,,,,,
+serpent,,,,,,lockejan
+sqlite,,,,,,
 std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
 std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
 stdlib,,,,41.2.2,,vyp
+tl,,,,,,mephistophiles
 vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
diff --git a/nixpkgs/maintainers/scripts/mdize-module.sh b/nixpkgs/maintainers/scripts/mdize-module.sh
new file mode 100755
index 000000000000..e2d2e5467aa9
--- /dev/null
+++ b/nixpkgs/maintainers/scripts/mdize-module.sh
@@ -0,0 +1,83 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=. -i bash -p delta jq perl
+
+set -euo pipefail
+shopt -s inherit_errexit
+
+cat <<'EOF'
+This script attempts to automatically convert option descriptions from
+DocBook syntax to markdown. Naturally this process is incomplete and
+imperfect, so any changes generated by this script MUST be reviewed.
+
+Possible problems include: incorrectly replaced tags, badly formatted
+markdown, DocBook tags this script doesn't recognize remaining in the
+output and crashing the docs build, incorrect escaping of markdown
+metacharacters, incorrect unescaping of XML entities—and the list goes on.
+
+Always review the generated changes!
+
+Some known limitations:
+  - Does not transform literalDocBook items
+  - Replacements can occur in non-option code, such as string literals
+
+
+EOF
+
+
+
+build-options-json() {
+    nix-build --no-out-link --expr '
+        let
+            sys = import ./nixos/default.nix {
+                configuration = {};
+            };
+        in
+        [
+            sys.config.system.build.manual.optionsJSON
+        ]
+    '
+}
+
+
+
+git diff --quiet || {
+    echo "Worktree is dirty. Please stash or commit first."
+    exit 1
+}
+
+echo "Building options.json ..."
+old_options=$(build-options-json)
+
+echo "Applying replacements ..."
+perl -pi -e '
+    BEGIN {
+        undef $/;
+    }
+
+    s,<literal>([^`]*?)</literal>,`$1`,smg;
+    s,<replaceable>([^»]*?)</replaceable>,«$1»,smg;
+    s,<filename>([^`]*?)</filename>,{file}`$1`,smg;
+    s,<option>([^`]*?)</option>,{option}`$1`,smg;
+    s,<code>([^`]*?)</code>,`$1`,smg;
+    s,<command>([^`]*?)</command>,{command}`$1`,smg;
+    s,<link xlink:href="(.+?)" ?/>,<$1>,smg;
+    s,<link xlink:href="(.+?)">(.*?)</link>,[$2]($1),smg;
+    s,<package>([^`]*?)</package>,`$1`,smg;
+    s,<emphasis>([^*]*?)</emphasis>,*$1*,smg;
+    s,<citerefentry>\s*
+        <refentrytitle>\s*(.*?)\s*</refentrytitle>\s*
+        <manvolnum>\s*(.*?)\s*</manvolnum>\s*
+      </citerefentry>,{manpage}`$1($2)`,smgx;
+    s,^( +description =),\1 lib.mdDoc,smg;
+' "$@"
+
+echo "Building options.json again ..."
+new_options=$(build-options-json)
+
+
+! cmp -s {$old_options,$new_options}/share/doc/nixos/options.json && {
+    diff -U10 \
+        <(jq . <$old_options/share/doc/nixos/options.json) \
+        <(jq . <$new_options/share/doc/nixos/options.json) \
+        | delta
+}
diff --git a/nixpkgs/maintainers/scripts/patchelf-hints.sh b/nixpkgs/maintainers/scripts/patchelf-hints.sh
index 5fdfc15dc232..802ecab0f0a1 100755
--- a/nixpkgs/maintainers/scripts/patchelf-hints.sh
+++ b/nixpkgs/maintainers/scripts/patchelf-hints.sh
@@ -61,7 +61,7 @@ for bin in $(find $binaryDist -executable -type f) :; do
             uniq;
         )
 
-        if test "$names" = "glibc"; then names="stdenv.glibc"; fi
+        if test "$names" = "glibc"; then names="glibc"; fi
         if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.cc"; fi
 
         if test $lib != $libPath; then
diff --git a/nixpkgs/maintainers/scripts/pluginupdate.py b/nixpkgs/maintainers/scripts/pluginupdate.py
index 017e3ac758ac..55eda3c7d45d 100644
--- a/nixpkgs/maintainers/scripts/pluginupdate.py
+++ b/nixpkgs/maintainers/scripts/pluginupdate.py
@@ -8,6 +8,7 @@
 # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
 
 import argparse
+import csv
 import functools
 import http
 import json
@@ -28,7 +29,7 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union, Any, Callable
 from urllib.parse import urljoin, urlparse
 from tempfile import NamedTemporaryFile
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 
 import git
 
@@ -85,21 +86,31 @@ def make_request(url: str, token=None) -> urllib.request.Request:
         headers["Authorization"] = f"token {token}"
     return urllib.request.Request(url, headers=headers)
 
+
+# a dictionary of plugins and their new repositories
+Redirects = Dict['PluginDesc', 'Repo']
+
 class Repo:
     def __init__(
-        self, uri: str, branch: str, alias: Optional[str]
+        self, uri: str, branch: str
     ) -> None:
         self.uri = uri
         '''Url to the repo'''
-        self.branch = branch
-        self.alias = alias
-        self.redirect: Dict[str, str] = {}
+        self._branch = branch
+        # Redirect is the new Repo to use
+        self.redirect: Optional['Repo'] = None
         self.token = "dummy_token"
 
     @property
     def name(self):
         return self.uri.split('/')[-1]
 
+    @property
+    def branch(self):
+        return self._branch or "HEAD"
+
+    def __str__(self) -> str:
+        return f"{self.uri}"
     def __repr__(self) -> str:
         return f"Repo({self.name}, {self.uri})"
 
@@ -109,6 +120,7 @@ class Repo:
 
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def latest_commit(self) -> Tuple[str, datetime]:
+        log.debug("Latest commit")
         loaded = self._prefetch(None)
         updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z")
 
@@ -124,6 +136,7 @@ class Repo:
         return loaded
 
     def prefetch(self, ref: Optional[str]) -> str:
+        print("Prefetching")
         loaded = self._prefetch(ref)
         return loaded["sha256"]
 
@@ -137,21 +150,22 @@ class Repo:
 
 class RepoGitHub(Repo):
     def __init__(
-        self, owner: str, repo: str, branch: str, alias: Optional[str]
+        self, owner: str, repo: str, branch: str
     ) -> None:
         self.owner = owner
         self.repo = repo
         self.token = None
         '''Url to the repo'''
-        super().__init__(self.url(""), branch, alias)
-        log.debug("Instantiating github repo %s/%s", self.owner, self.repo)
+        super().__init__(self.url(""), branch)
+        log.debug("Instantiating github repo owner=%s and repo=%s", self.owner, self.repo)
 
     @property
     def name(self):
         return self.repo
 
     def url(self, path: str) -> str:
-        return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
+        res = urljoin(f"https://github.com/{self.owner}/{self.repo}/", path)
+        return res
 
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def has_submodules(self) -> bool:
@@ -168,6 +182,7 @@ class RepoGitHub(Repo):
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def latest_commit(self) -> Tuple[str, datetime]:
         commit_url = self.url(f"commits/{self.branch}.atom")
+        log.debug("Sending request to %s", commit_url)
         commit_req = make_request(commit_url, self.token)
         with urllib.request.urlopen(commit_req, timeout=10) as req:
             self._check_for_redirect(commit_url, req)
@@ -191,12 +206,9 @@ class RepoGitHub(Repo):
             new_owner, new_name = (
                 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
             )
-            end_line = "\n" if self.alias is None else f" as {self.alias}\n"
-            plugin_line = "{owner}/{name}" + end_line
 
-            old_plugin = plugin_line.format(owner=self.owner, name=self.name)
-            new_plugin = plugin_line.format(owner=new_owner, name=new_name)
-            self.redirect[old_plugin] = new_plugin
+            new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)
+            self.redirect = new_repo
 
 
     def prefetch(self, commit: str) -> str:
@@ -207,9 +219,9 @@ class RepoGitHub(Repo):
         return sha256
 
     def prefetch_github(self, ref: str) -> str:
-        data = subprocess.check_output(
-            ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
-        )
+        cmd = ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
+        log.debug("Running %s", cmd)
+        data = subprocess.check_output(cmd)
         return data.strip().decode("utf-8")
 
     def as_nix(self, plugin: "Plugin") -> str:
@@ -226,7 +238,7 @@ class RepoGitHub(Repo):
     }}'''
 
 
-@dataclass
+@dataclass(frozen=True)
 class PluginDesc:
     repo: Repo
     branch: str
@@ -239,21 +251,38 @@ class PluginDesc:
         else:
             return self.alias
 
+    def __lt__(self, other):
+        return self.repo.name < other.repo.name
+
+    @staticmethod
+    def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> 'PluginDesc':
+        branch = row["branch"]
+        repo = make_repo(row['repo'], branch.strip())
+        repo.token = config.github_token
+        return PluginDesc(repo, branch.strip(), row["alias"])
+
+
+    @staticmethod
+    def load_from_string(config: FetchConfig, line: str) -> 'PluginDesc':
+        branch = "HEAD"
+        alias = None
+        uri = line
+        if " as " in uri:
+            uri, alias = uri.split(" as ")
+            alias = alias.strip()
+        if "@" in uri:
+            uri, branch = uri.split("@")
+        repo = make_repo(uri.strip(), branch.strip())
+        repo.token = config.github_token
+        return PluginDesc(repo, branch.strip(), alias)
 
+@dataclass
 class Plugin:
-    def __init__(
-        self,
-        name: str,
-        commit: str,
-        has_submodules: bool,
-        sha256: str,
-        date: Optional[datetime] = None,
-    ) -> None:
-        self.name = name
-        self.commit = commit
-        self.has_submodules = has_submodules
-        self.sha256 = sha256
-        self.date = date
+    name: str
+    commit: str
+    has_submodules: bool
+    sha256: str
+    date: Optional[datetime] = None
 
     @property
     def normalized_name(self) -> str:
@@ -270,6 +299,27 @@ class Plugin:
         return copy
 
 
+def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[PluginDesc]:
+    log.debug("Load plugins from csv %s", input_file)
+    plugins = []
+    with open(input_file, newline='') as csvfile:
+        log.debug("Writing into %s", input_file)
+        reader = csv.DictReader(csvfile,)
+        for line in reader:
+            plugin = PluginDesc.load_from_csv(config, line)
+            plugins.append(plugin)
+
+    return plugins
+
+def run_nix_expr(expr):
+    with CleanEnvironment():
+        cmd = ["nix", "eval", "--extra-experimental-features",
+                "nix-command", "--impure", "--json", "--expr", expr]
+        log.debug("Running command %s", cmd)
+        out = subprocess.check_output(cmd)
+    data = json.loads(out)
+    return data
+
 
 class Editor:
     """The configuration of the update script."""
@@ -293,20 +343,20 @@ class Editor:
         self.deprecated = deprecated or root.joinpath("deprecated.json")
         self.cache_file = cache_file or f"{name}-plugin-cache.json"
 
-    def get_current_plugins(self):
+    def get_current_plugins(self) -> List[Plugin]:
         """To fill the cache"""
-        return get_current_plugins(self)
-
-    def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:
+        data = run_nix_expr(self.get_plugins)
         plugins = []
-        with open(plugin_file) as f:
-            for line in f:
-                if line.startswith("#"):
-                    continue
-                plugin = parse_plugin_line(config, line)
-                plugins.append(plugin)
+        for name, attr in data.items():
+            print("get_current_plugins: name %s" % name)
+            p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
+            plugins.append(p)
         return plugins
 
+    def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:
+        '''CSV spec'''
+        return load_plugins_from_csv(config, plugin_file)
+
     def generate_nix(self, plugins, outfile: str):
         '''Returns nothing for now, writes directly to outfile'''
         raise NotImplementedError()
@@ -316,11 +366,11 @@ class Editor:
         _prefetch = functools.partial(prefetch, cache=cache)
 
         def update() -> dict:
-            plugin_names = self.load_plugin_spec(config, input_file)
+            plugins = self.load_plugin_spec(config, input_file)
 
             try:
                 pool = Pool(processes=config.proc)
-                results = pool.map(_prefetch, plugin_names)
+                results = pool.map(_prefetch, plugins)
             finally:
                 cache.store()
 
@@ -415,23 +465,10 @@ class CleanEnvironment(object):
         self.empty_config.close()
 
 
-def get_current_plugins(editor: Editor) -> List[Plugin]:
-    with CleanEnvironment():
-        cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins]
-        log.debug("Running command %s", cmd)
-        out = subprocess.check_output(cmd)
-    data = json.loads(out)
-    plugins = []
-    for name, attr in data.items():
-        p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
-        plugins.append(p)
-    return plugins
-
-
 def prefetch_plugin(
     p: PluginDesc,
     cache: "Optional[Cache]" = None,
-) -> Tuple[Plugin, Dict[str, str]]:
+) -> Tuple[Plugin, Optional[Repo]]:
     repo, branch, alias = p.repo, p.branch, p.alias
     name = alias or p.repo.name
     commit = None
@@ -445,7 +482,7 @@ def prefetch_plugin(
         return cached_plugin, repo.redirect
 
     has_submodules = repo.has_submodules()
-    print(f"prefetch {name}")
+    log.debug(f"prefetch {name}")
     sha256 = repo.prefetch(commit)
 
     return (
@@ -454,12 +491,7 @@ def prefetch_plugin(
     )
 
 
-def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
-    plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
-    return plugin
-
-
-def print_download_error(plugin: str, ex: Exception):
+def print_download_error(plugin: PluginDesc, ex: Exception):
     print(f"{plugin}: {ex}", file=sys.stderr)
     ex_traceback = ex.__traceback__
     tb_lines = [
@@ -468,20 +500,22 @@ def print_download_error(plugin: str, ex: Exception):
     ]
     print("\n".join(tb_lines))
 
-
 def check_results(
-    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Dict[str, str]]]
-) -> Tuple[List[Tuple[PluginDesc, Plugin]], Dict[str, str]]:
+    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]
+) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
     ''' '''
-    failures: List[Tuple[str, Exception]] = []
+    failures: List[Tuple[PluginDesc, Exception]] = []
     plugins = []
-    redirects: Dict[str, str] = {}
+    redirects: Redirects = {}
     for (pdesc, result, redirect) in results:
         if isinstance(result, Exception):
-            failures.append((pdesc.name, result))
+            failures.append((pdesc, result))
         else:
-            plugins.append((pdesc, result))
-            redirects.update(redirect)
+            new_pdesc = pdesc
+            if redirect is not None:
+                redirects.update({pdesc: redirect})
+                new_pdesc = PluginDesc(redirect, pdesc.branch, pdesc.alias)
+            plugins.append((new_pdesc, result))
 
     print(f"{len(results) - len(failures)} plugins were checked", end="")
     if len(failures) == 0:
@@ -495,31 +529,17 @@ def check_results(
 
         sys.exit(1)
 
-def make_repo(uri, branch, alias) -> Repo:
+def make_repo(uri: str, branch) -> Repo:
     '''Instantiate a Repo with the correct specialization depending on server (gitub spec)'''
     # dumb check to see if it's of the form owner/repo (=> github) or https://...
-    res = uri.split('/')
-    if len(res) <= 2:
-        repo = RepoGitHub(res[0], res[1], branch, alias)
+    res = urlparse(uri)
+    if res.netloc in [ "github.com", ""]:
+        res = res.path.strip('/').split('/')
+        repo = RepoGitHub(res[0], res[1], branch)
     else:
-        repo = Repo(uri.strip(), branch, alias)
+        repo = Repo(uri.strip(), branch)
     return repo
 
-def parse_plugin_line(config: FetchConfig, line: str) -> PluginDesc:
-    branch = "HEAD"
-    alias = None
-    uri = line
-    if " as " in uri:
-        uri, alias = uri.split(" as ")
-        alias = alias.strip()
-    if "@" in uri:
-        uri, branch = uri.split("@")
-
-    repo = make_repo(uri.strip(), branch.strip(), alias)
-    repo.token = config.github_token
-
-    return PluginDesc(repo, branch.strip(), alias)
-
 
 def get_cache_path(cache_file_name: str) -> Optional[Path]:
     xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
@@ -576,36 +596,37 @@ class Cache:
 
 def prefetch(
     pluginDesc: PluginDesc, cache: Cache
-) -> Tuple[PluginDesc, Union[Exception, Plugin], dict]:
+) -> Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]:
     try:
         plugin, redirect = prefetch_plugin(pluginDesc, cache)
         cache[plugin.commit] = plugin
         return (pluginDesc, plugin, redirect)
     except Exception as e:
-        return (pluginDesc, e, {})
+        return (pluginDesc, e, None)
+
 
 
 def rewrite_input(
     config: FetchConfig,
     input_file: Path,
     deprecated: Path,
-    redirects: Dict[str, str] = None,
-    append: Tuple = (),
+    # old pluginDesc and the new
+    redirects: Redirects = {},
+    append: List[PluginDesc] = [],
 ):
-    with open(input_file, "r") as f:
-        lines = f.readlines()
+    plugins = load_plugins_from_csv(config, input_file,)
 
-    lines.extend(append)
+    plugins.extend(append)
 
     if redirects:
-        lines = [redirects.get(line, line) for line in lines]
 
         cur_date_iso = datetime.now().strftime("%Y-%m-%d")
         with open(deprecated, "r") as f:
             deprecations = json.load(f)
-        for old, new in redirects.items():
-            old_plugin = fetch_plugin_from_pluginline(config, old)
-            new_plugin = fetch_plugin_from_pluginline(config, new)
+        for pdesc, new_repo in redirects.items():
+            new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)
+            old_plugin, _ = prefetch_plugin(pdesc)
+            new_plugin, _ = prefetch_plugin(new_pdesc)
             if old_plugin.normalized_name != new_plugin.normalized_name:
                 deprecations[old_plugin.normalized_name] = {
                     "new": new_plugin.normalized_name,
@@ -615,10 +636,14 @@ def rewrite_input(
             json.dump(deprecations, f, indent=4, sort_keys=True)
             f.write("\n")
 
-    lines = sorted(lines, key=str.casefold)
-
     with open(input_file, "w") as f:
-        f.writelines(lines)
+        log.debug("Writing into %s", input_file)
+        # fields = dataclasses.fields(PluginDesc)
+        fieldnames = ['repo', 'branch', 'alias']
+        writer = csv.DictWriter(f, fieldnames, dialect='unix', quoting=csv.QUOTE_NONE)
+        writer.writeheader()
+        for plugin in sorted(plugins):
+            writer.writerow(asdict(plugin))
 
 
 def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
@@ -660,9 +685,11 @@ def update_plugins(editor: Editor, args):
             )
 
     for plugin_line in args.add_plugins:
-        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
+        pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
+        append = [ pdesc ]
+        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append)
         update()
-        plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
+        plugin, _ = prefetch_plugin(pdesc, )
         if autocommit:
             commit(
                 nixpkgs_repo,
diff --git a/nixpkgs/maintainers/scripts/rebuild-amount.sh b/nixpkgs/maintainers/scripts/rebuild-amount.sh
index bedd352db5f3..32810f6b98c0 100755
--- a/nixpkgs/maintainers/scripts/rebuild-amount.sh
+++ b/nixpkgs/maintainers/scripts/rebuild-amount.sh
@@ -35,7 +35,7 @@ toRemove=()
 cleanup() {
     rm -rf "${toRemove[@]}"
 }
-trap cleanup EXIT SIGINT SIGQUIT ERR
+trap cleanup EXIT
 
 MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'
 
diff --git a/nixpkgs/maintainers/scripts/update-luarocks-packages b/nixpkgs/maintainers/scripts/update-luarocks-packages
index 73a233c5f103..cab63ca44e38 100755
--- a/nixpkgs/maintainers/scripts/update-luarocks-packages
+++ b/nixpkgs/maintainers/scripts/update-luarocks-packages
@@ -31,7 +31,7 @@ from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
 PKG_LIST="maintainers/scripts/luarocks-packages.csv"
 TMP_FILE="$(mktemp)"
 GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix"
-LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
+LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua"
 
 HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
 Regenerate it with:
@@ -158,14 +158,14 @@ def generate_pkg_nix(plug: LuaPlugin):
     Our cache key associates "p.name-p.version" to its rockspec
     '''
     log.debug("Generating nix expression for %s", plug.name)
-    cmd = [ "luarocks", "nix"]
+    custom_env = os.environ.copy()
+    custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG
 
+    cmd = [ "luarocks", "nix"]
 
     if plug.maintainers:
         cmd.append(f"--maintainers={plug.maintainers}")
 
-    # updates plugin directly from its repository
-    print("server: [%s]" % plug.server)
     # if plug.server == "src":
     if plug.src != "":
         if plug.src is None:
@@ -194,7 +194,8 @@ def generate_pkg_nix(plug: LuaPlugin):
             cmd.append(f"--lua-dir={lua_drv_path}/bin")
 
     log.debug("running %s", ' '.join(cmd))
-    output = subprocess.check_output(cmd, text=True)
+
+    output = subprocess.check_output(cmd, env=custom_env, text=True)
     output = "callPackage(" + output.strip() + ") {};\n\n"
     return (plug, output)
 
diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix
index bf4fcc6a4a7d..86d297730ce3 100644
--- a/nixpkgs/maintainers/team-list.nix
+++ b/nixpkgs/maintainers/team-list.nix
@@ -3,16 +3,26 @@
       # Required
       members = [ maintainer1 maintainer2 ];
       scope = "Maintain foo packages.";
+      shortName = "foo";
+      # Optional
+      enableFeatureFreezePing = true;
+      githubTeams = [ "my-subsystem" ];
     };
 
   where
 
   - `members` is the list of maintainers belonging to the group,
   - `scope` describes the scope of the group.
+  - `shortName` short human-readable name
+  - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases
+  - `githubTeams` will ping specified GitHub teams as well
 
   More fields may be added in the future.
 
-  Please keep the list alphabetically sorted.
+  When editing this file:
+   * keep the list alphabetically sorted
+   * test the validity of the format with:
+       nix-build lib/tests/teams.nix
   */
 
 { lib }:
@@ -27,6 +37,7 @@ with lib.maintainers; {
       m1cr0man
     ];
     scope = "Maintain ACME-related packages and modules.";
+    shortName = "ACME";
   };
 
   bazel = {
@@ -41,6 +52,8 @@ with lib.maintainers; {
       ylecornec
     ];
     scope = "Bazel build tool & related tools https://bazel.build/";
+    shortName = "Bazel";
+    enableFeatureFreezePing = true;
   };
 
   beam = {
@@ -53,7 +66,43 @@ with lib.maintainers; {
       minijackson
       yurrriq
     ];
+    githubTeams = [
+      "beam"
+    ];
     scope = "Maintain BEAM-related packages and modules.";
+    shortName = "BEAM";
+    enableFeatureFreezePing = true;
+  };
+
+  blockchains = {
+    members = [
+      mmahut
+      RaghavSood
+    ];
+    scope = "Maintain Blockchain packages and modules.";
+    shortName = "Blockchains";
+    enableFeatureFreezePing = true;
+  };
+
+  c = {
+    members = [
+      matthewbauer
+      mic92
+    ];
+    scope = "Maintain C libraries and tooling.";
+    shortName = "C";
+    enableFeatureFreezePing = true;
+  };
+
+  c3d2 = {
+    members = [
+      astro
+      SuperSandro2000
+      revol-xut
+    ];
+    scope = "Maintain packages used in the C3D2 hackspace";
+    shortName = "c3d2";
+    enableFeatureFreezePing = true;
   };
 
   cinnamon = {
@@ -61,6 +110,8 @@ with lib.maintainers; {
       mkg20001
     ];
     scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";
+    shortName = "Cinnamon";
+    enableFeatureFreezePing = true;
   };
 
   chia = {
@@ -68,6 +119,41 @@ with lib.maintainers; {
       lourkeur
     ];
     scope = "Maintain the Chia blockchain and its dependencies";
+    shortName = "Chia Blockchain";
+  };
+
+  coq = {
+    members = [
+      cohencyril
+      Zimmi48
+      # gares has no entry in the maintainers list
+      siraben
+      vbgl
+    ];
+    scope = "Maintain the Coq theorem prover and related packages.";
+    shortName = "Coq";
+    enableFeatureFreezePing = true;
+  };
+
+  darwin = {
+    members = [
+      toonn
+    ];
+    githubTeams = [
+      "darwin-maintainers"
+    ];
+    scope = "Maintain Darwin compatibility of packages and Darwin-only packages.";
+    shortName = "Darwin";
+    enableFeatureFreezePing = true;
+  };
+
+  cosmopolitan = {
+    members = [
+      lourkeur
+      tomberek
+    ];
+    scope = "Maintain the Cosmopolitan LibC and related programs.";
+    shortName = "Cosmopolitan";
   };
 
   deshaw = {
@@ -76,6 +162,7 @@ with lib.maintainers; {
       limeytexan
     ];
     scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
+    shortName = "Shaw employees";
   };
 
   determinatesystems = {
@@ -85,11 +172,75 @@ with lib.maintainers; {
       grahamc
     ];
     scope = "Group registration for packages maintained by Determinate Systems.";
+    shortName = "Determinate Systems employees";
+  };
+
+  dhall = {
+    members = [
+      Gabriel439
+      ehmry
+    ];
+    scope = "Maintain Dhall and related packages.";
+    shortName = "Dhall";
+    enableFeatureFreezePing = true;
+  };
+
+  docker = {
+    members = [
+      roberth
+      utdemir
+    ];
+    scope = "Maintain Docker and related tools.";
+    shortName = "DockerTools";
+    enableFeatureFreezePing = true;
+  };
+
+  docs = {
+    members = [
+      ryantm
+    ];
+    scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
+    shortName = "Docs";
+    enableFeatureFreezePing = true;
+  };
+
+  emacs = {
+    members = [
+      adisbladis
+    ];
+    scope = "Maintain the Emacs editor and packages.";
+    shortName = "Emacs";
+    enableFeatureFreezePing = true;
+  };
+
+  enlightenment = {
+    members = [
+      romildo
+    ];
+    githubTeams = [
+      "enlightenment"
+    ];
+    scope = "Maintain Enlightenment desktop environment and related packages.";
+    shortName = "Enlightenment";
+    enableFeatureFreezePing = true;
+  };
+
+  # Dummy group for the "everyone else" section
+  feature-freeze-everyone-else = {
+    members = [ ];
+    githubTeams = [
+      "nixpkgs-committers"
+      "release-engineers"
+    ];
+    scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
+    shortName = "Everyone else";
+    enableFeatureFreezePing = true;
   };
 
   freedesktop = {
     members = [ jtojnar ];
     scope = "Maintain Freedesktop.org packages for graphical desktop.";
+    shortName = "freedesktop.org packaging";
   };
 
   gcc = {
@@ -99,30 +250,35 @@ with lib.maintainers; {
       ericson2314
     ];
     scope = "Maintain GCC (GNU Compiler Collection) compilers";
+    shortName = "GCC";
   };
 
   golang = {
     members = [
       c00w
-      cstrahan
-      Frostman
       kalbasit
       mic92
-      orivej
-      rvolosatovs
       zowoq
     ];
     scope = "Maintain Golang compilers.";
+    shortName = "Go";
+    enableFeatureFreezePing = true;
   };
 
   gnome = {
     members = [
+      bobby285271
       hedning
       jtojnar
       dasj19
       maxeaubrey
     ];
+    githubTeams = [
+      "gnome"
+    ];
     scope = "Maintain GNOME desktop environment and platform.";
+    shortName = "GNOME";
+    enableFeatureFreezePing = true;
   };
 
   haskell = {
@@ -132,7 +288,12 @@ with lib.maintainers; {
       maralorn
       sternenseemann
     ];
+    githubTeams = [
+      "haskell"
+    ];
     scope = "Maintain Haskell packages and infrastructure.";
+    shortName = "Haskell";
+    enableFeatureFreezePing = true;
   };
 
   home-assistant = {
@@ -143,6 +304,7 @@ with lib.maintainers; {
       mic92
     ];
     scope = "Maintain the Home Assistant ecosystem";
+    shortName = "Home Assistant";
   };
 
   iog = {
@@ -154,16 +316,17 @@ with lib.maintainers; {
       nrdxp
     ];
     scope = "Input-Output Global employees, which maintain critical software";
+    shortName = "Input-Output Global employees";
   };
 
   jitsi = {
     members = [
       cleeyv
-      petabyteboy
       ryantm
       yuka
     ];
     scope = "Maintain Jitsi.";
+    shortName = "Jitsi";
   };
 
   kubernetes = {
@@ -175,6 +338,7 @@ with lib.maintainers; {
       zowoq
     ];
     scope = "Maintain the Kubernetes package and module";
+    shortName = "Kubernetes";
   };
 
   kodi = {
@@ -187,6 +351,7 @@ with lib.maintainers; {
       sephalon
     ];
     scope = "Maintain Kodi and related packages.";
+    shortName = "Kodi";
   };
 
   linux-kernel = {
@@ -197,6 +362,51 @@ with lib.maintainers; {
       qyliss
     ];
     scope = "Maintain the Linux kernel.";
+    shortName = "Linux Kernel";
+  };
+
+  lumiguide = {
+    # Verify additions by approval of an already existing member of the team.
+    members = [
+      roelvandijk
+      lucus16
+    ];
+    scope = "Group registration for LumiGuide employees who collectively maintain packages.";
+    shortName = "Lumiguide employees";
+  };
+
+  lumina = {
+    members = [
+      romildo
+    ];
+    githubTeams = [
+      "lumina"
+    ];
+    scope = "Maintain lumina desktop environment and related packages.";
+    shortName = "Lumina";
+    enableFeatureFreezePing = true;
+  };
+
+  lxqt = {
+    members = [
+      romildo
+    ];
+    githubTeams = [
+      "lxqt"
+    ];
+    scope = "Maintain LXQt desktop environment and related packages.";
+    shortName = "LXQt";
+    enableFeatureFreezePing = true;
+  };
+
+  marketing = {
+    members = [
+      garbas
+      tomberek
+    ];
+    scope = "Marketing of Nix/NixOS/nixpkgs.";
+    shortName = "Marketing";
+    enableFeatureFreezePing = true;
   };
 
   mate = {
@@ -205,6 +415,7 @@ with lib.maintainers; {
       romildo
     ];
     scope = "Maintain Mate desktop environment and related packages.";
+    shortName = "MATE";
   };
 
   matrix = {
@@ -218,6 +429,53 @@ with lib.maintainers; {
       sumnerevans
     ];
     scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
+    shortName = "Matrix";
+  };
+
+  mobile = {
+    members = [
+      samueldr
+    ];
+    scope = "Maintain Mobile NixOS.";
+    shortName = "Mobile";
+    enableFeatureFreezePing = true;
+  };
+
+  nix = {
+    members = [
+      Profpatsch
+      eelco
+      grahamc
+      pierron
+    ];
+    scope = "Maintain the Nix package manager.";
+    shortName = "Nix/nix-cli ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
+  nixos-modules = {
+    members = [
+      ericson2314
+      infinisil
+      qyliss
+      roberth
+    ];
+    scope = "Maintain nixpkgs module system internals.";
+    shortName = "NixOS Modules / internals";
+    enableFeatureFreezePing = true;
+  };
+
+  numtide = {
+    members = [
+      mic92
+      flokli
+      jfroche
+      tazjin
+      zimbatm
+    ];
+    enableFeatureFreezePing = true;
+    scope = "Group registration for Numtide team members who collectively maintain packages.";
+    shortName = "Numtide team";
   };
 
   openstack = {
@@ -226,6 +484,7 @@ with lib.maintainers; {
       SuperSandro2000
     ];
     scope = "Maintain the ecosystem around OpenStack";
+    shortName = "OpenStack";
   };
 
   pantheon = {
@@ -233,7 +492,21 @@ with lib.maintainers; {
       davidak
       bobby285271
     ];
+    githubTeams = [
+      "pantheon"
+    ];
     scope = "Maintain Pantheon desktop environment and platform.";
+    shortName = "Pantheon";
+    enableFeatureFreezePing = true;
+  };
+
+  perl = {
+    members = [
+      sgo
+    ];
+    scope = "Maintain the Perl interpreter and Perl packages.";
+    shortName = "Perl";
+    enableFeatureFreezePing = true;
   };
 
   php = {
@@ -245,7 +518,12 @@ with lib.maintainers; {
       ma27
       talyz
     ];
+    githubTeams = [
+      "php"
+    ];
     scope = "Maintain PHP related packages and extensions.";
+    shortName = "PHP";
+    enableFeatureFreezePing = true;
   };
 
   podman = {
@@ -255,7 +533,54 @@ with lib.maintainers; {
       vdemeester
       zowoq
     ];
+    githubTeams = [
+      "podman"
+    ];
     scope = "Maintain Podman and CRI-O related packages and modules.";
+    shortName = "Podman";
+    enableFeatureFreezePing = true;
+  };
+
+  postgres = {
+    members = [
+      thoughtpolice
+    ];
+    scope = "Maintain the PostgreSQL package and plugins along with the NixOS module.";
+    shortName = "PostgreSQL";
+    enableFeatureFreezePing = true;
+  };
+
+  python = {
+    members = [
+      fridh
+      hexa
+      jonringer
+    ];
+    scope = "Maintain the Python interpreter and related packages.";
+    shortName = "Python";
+    enableFeatureFreezePing = true;
+  };
+
+  qt-kde = {
+    members = [
+      ttuegel
+    ];
+    githubTeams = [
+      "qt-kde"
+    ];
+    scope = "Maintain the KDE desktop environment and Qt.";
+    shortName = "Qt / KDE";
+    enableFeatureFreezePing = true;
+  };
+
+  r = {
+    members = [
+      bcdarwin
+      jbedo
+    ];
+    scope = "Maintain the R programming language and related packages.";
+    shortName = "R";
+    enableFeatureFreezePing = true;
   };
 
   redcodelabs = {
@@ -265,6 +590,38 @@ with lib.maintainers; {
       wintrmvte
     ];
     scope = "Maintain Red Code Labs related packages and modules.";
+    shortName = "Red Code Labs";
+  };
+
+  release = {
+    members = [ ];
+    githubTeams = [
+      "nixos-release-managers"
+    ];
+    scope = "Manage the current nixpkgs/NixOS release.";
+    shortName = "Release";
+    enableFeatureFreezePing = true;
+  };
+
+  ruby = {
+    members = [
+      marsam
+    ];
+    scope = "Maintain the Ruby interpreter and related packages.";
+    shortName = "Ruby";
+    enableFeatureFreezePing = true;
+  };
+
+  rust = {
+    members = [
+      andir
+      lnl7
+      mic92
+      zowoq
+    ];
+    scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
+    shortName = "Rust";
+    enableFeatureFreezePing = true;
   };
 
   sage = {
@@ -275,6 +632,7 @@ with lib.maintainers; {
       collares
     ];
     scope = "Maintain SageMath and the dependencies that are likely to break it.";
+    shortName = "SageMath";
   };
 
   sphinx = {
@@ -282,6 +640,7 @@ with lib.maintainers; {
       SuperSandro2000
     ];
     scope = "Maintain Sphinx related packages.";
+    shortName = "Sphinx";
   };
 
   serokell = {
@@ -291,6 +650,26 @@ with lib.maintainers; {
       mkaito
     ];
     scope = "Group registration for Serokell employees who collectively maintain packages.";
+    shortName = "Serokell employees";
+  };
+
+  systemd = {
+    members = [ ];
+    githubTeams = [
+      "systemd"
+    ];
+    scope = "Maintain systemd for NixOS.";
+    shortName = "systemd";
+    enableFeatureFreezePing = true;
+  };
+
+  tests = {
+    members = [
+      tfc
+    ];
+    scope = "Maintain the NixOS VM test runner.";
+    shortName = "NixOS tests";
+    enableFeatureFreezePing = true;
   };
 
   tts = {
@@ -299,6 +678,18 @@ with lib.maintainers; {
       mic92
     ];
     scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages";
+    shortName = "coqui-ai TTS";
+  };
+
+  vim = {
+    members = [
+      jonringer
+      softinio
+      teto
+    ];
+    scope = "Maintain the vim and neovim text editors and related packages.";
+    shortName = "Vim/Neovim";
+    enableFeatureFreezePing = true;
   };
 
   xfce = {
@@ -306,5 +697,6 @@ with lib.maintainers; {
       romildo
     ];
     scope = "Maintain Xfce desktop environment and related packages.";
+    shortName = "Xfce";
   };
 }
author	Alyssa Ross <hi@alyssa.is>	2022-12-06 19:57:55 +0000
committer	Alyssa Ross <hi@alyssa.is>	2023-02-08 13:48:30 +0000
commit	bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch)
tree	698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/maintainers
parent	f4afc5a01d9539ce09e47494e679c51f80723d07 (diff)
parent	99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff)
download	nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip