diff options
Diffstat (limited to 'maintainers')
37 files changed, 5356 insertions, 2100 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 51fa21323a297..9d5f3e6082921 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3,12 +3,13 @@ handle = { # Required name = "Your name"; - email = "address@example.org"; - # Optional + # Optional, but at least one of email, matrix or githubId must be given + email = "address@example.org"; matrix = "@user:example.org"; github = "GithubUsername"; githubId = your-github-id; + keys = [{ fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; }]; @@ -25,6 +26,9 @@ - `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 fingerprints. + Specifying a GitHub account ensures that you automatically get a review request on + pull requests that modify a package for which you are a maintainer. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. If `github` begins with a numeral, `handle` should be prefixed with an underscore. @@ -72,7 +76,7 @@ _0xB10C = { email = "nixpkgs@b10c.me"; name = "0xB10C"; - github = "0xb10c"; + github = "0xB10C"; githubId = 19157360; }; _0xbe7a = { @@ -97,6 +101,13 @@ github = "0xd61"; githubId = 8351869; }; + _0xMRTT = { + email = "0xMRTT@proton.me"; + name = "0xMRTT"; + github = "0xMRTT"; + githubId = 105598867; + matrix = "@0xmrtt:envs.net"; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; @@ -105,33 +116,37 @@ }; _1000teslas = { name = "Kevin Tran"; - email = "47207223+1000teslas@users.noreply.github.com"; github = "1000teslas"; githubId = 47207223; }; + _13r0ck = { + name = "Brock Szuszczewicz"; + email = "bnr@tuta.io"; + github = "13r0ck"; + githubId = 58987761; + }; _2gn = { name = "Hiram Tanner"; - email = "101851090+2gn@users.noreply.github.com"; github = "2gn"; githubId = 101851090; }; - _3699n = { - email = "nicholas@nvk.pm"; - github = "3699n"; - githubId = 7414843; - name = "Nicholas von Klitzing"; - }; _360ied = { name = "Brian Zhu"; email = "therealbarryplayer@gmail.com"; github = "360ied"; githubId = 19516527; }; - _13r0ck = { - name = "Brock Szuszczewicz"; - email = "bnr@tuta.io"; - github = "13r0ck"; - githubId = 58987761; + _3699n = { + email = "nicholas@nvk.pm"; + github = "3699n"; + githubId = 7414843; + name = "Nicholas von Klitzing"; + }; + _3JlOy-PYCCKUi = { + name = "3JlOy-PYCCKUi"; + email = "3jl0y_pycckui@riseup.net"; + github = "3JlOy-PYCCKUi"; + githubId = 46464602; }; _3noch = { email = "eacameron@gmail.com"; @@ -161,6 +176,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _9999years = { + email = "rbt@fastmail.com"; + github = "9999years"; + githubId = 15312184; + name = "Rebecca Turner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -186,6 +207,18 @@ githubId = 7755101; name = "Aaron Andersen"; }; + aaqaishtyaq = { + email = "aaqaishtyaq@gmail.com"; + github = "aaqaishtyaq"; + githubId = 22131756; + name = "Aaqa Ishtyaq"; + }; + aaronarinder = { + email = "aaronarinder@gmail.com"; + github = "aaronArinder"; + githubId = 26738844; + name = "Aaron Arinder"; + }; aaronjanse = { email = "aaron@ajanse.me"; matrix = "@aaronjanse:matrix.org"; @@ -306,6 +339,13 @@ githubId = 749381; name = "Adam Tulinius"; }; + addict3d = { + email = "nickbathum@gmail.com"; + matrix = "@nbathum:matrix.org"; + github = "addict3d"; + githubId = 49227; + name = "Nick Bathum"; + }; adelbertc = { email = "adelbertc@gmail.com"; github = "adelbertc"; @@ -318,13 +358,6 @@ githubId = 1773511; name = "Adrien Devresse"; }; - addict3d = { - email = "nickbathum@gmail.com"; - matrix = "@nbathum:matrix.org"; - github = "addict3d"; - githubId = 49227; - name = "Nick Bathum"; - }; adisbladis = { email = "adisbladis@gmail.com"; matrix = "@adis:blad.is"; @@ -332,18 +365,18 @@ githubId = 63286; name = "Adam Hose"; }; - Adjective-Object = { - email = "mhuan13@gmail.com"; - github = "Adjective-Object"; - githubId = 1174858; - name = "Maxwell Huang-Hobbs"; - }; adjacentresearch = { email = "nate@adjacentresearch.xyz"; github = "0xperp"; githubId = 96147421; name = "0xperp"; }; + Adjective-Object = { + email = "mhuan13@gmail.com"; + github = "Adjective-Object"; + githubId = 1174858; + name = "Maxwell Huang-Hobbs"; + }; adnelson = { email = "ithinkican@gmail.com"; github = "adnelson"; @@ -470,6 +503,12 @@ githubId = 44871469; name = "Etienne Wodey"; }; + ajgrf = { + email = "a@ajgrf.com"; + github = "ajgrf"; + githubId = 10733175; + name = "Alex Griffin"; + }; ajs124 = { email = "nix@ajs124.de"; matrix = "@andreas.schraegle:helsinki-systems.de"; @@ -477,30 +516,24 @@ githubId = 1229027; name = "Andreas Schrägle"; }; - ajgrf = { - email = "a@ajgrf.com"; - github = "ajgrf"; - githubId = 10733175; - name = "Alex Griffin"; - }; ak = { email = "ak@formalprivacy.com"; github = "alexanderkjeldaas"; githubId = 339369; name = "Alexander Kjeldaas"; }; - akavel = { - email = "czapkofan@gmail.com"; - github = "akavel"; - githubId = 273837; - name = "Mateusz Czapliński"; - }; akamaus = { email = "dmitryvyal@gmail.com"; github = "akamaus"; githubId = 58955; name = "Dmitry Vyal"; }; + akavel = { + email = "czapkofan@gmail.com"; + github = "akavel"; + githubId = 273837; + name = "Mateusz Czapliński"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; @@ -513,6 +546,12 @@ githubId = 1318982; name = "Anders Claesson"; }; + a-kenji = { + email = "aks.kenji@protonmail.com"; + github = "a-kenji"; + githubId = 65275785; + name = "Alexander Kenji Berthold"; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; @@ -540,6 +579,12 @@ githubId = 20405311; name = "Aksh Gupta"; }; + alanpearce = { + email = "alan@alanpearce.eu"; + github = "alanpearce"; + githubId = 850317; + name = "Alan Pearce"; + }; alapshin = { email = "alapshin@fastmail.com"; github = "alapshin"; @@ -552,6 +597,18 @@ githubId = 43479487; name = "Titouan Biteau"; }; + aleksana = { + email = "me@aleksana.moe"; + github = "Aleksanaa"; + githubId = 42209822; + name = "Aleksana QwQ"; + }; + alekseysidorov = { + email = "sauron1987@gmail.com"; + github = "alekseysidorov"; + githubId = 83360; + name = "Aleksey Sidorov"; + }; alerque = { email = "caleb@alerque.com"; github = "alerque"; @@ -588,6 +645,12 @@ githubId = 8316672; name = "Alex Chapman"; }; + alexeyre = { + email = "A.Eyre@sms.ed.ac.uk"; + github = "alexeyre"; + githubId = 38869148; + name = "Alex Eyre"; + }; alexfmpe = { email = "alexandre.fmp.esteves@gmail.com"; github = "alexfmpe"; @@ -622,12 +685,6 @@ githubId = 50754358; name = "Alex Winter"; }; - alexeyre = { - email = "A.Eyre@sms.ed.ac.uk"; - github = "alexeyre"; - githubId = 38869148; - name = "Alex Eyre"; - }; algram = { email = "aliasgram@gmail.com"; github = "Algram"; @@ -646,6 +703,12 @@ githubId = 36147; name = "Alireza Meskin"; }; + alizter = { + email = "alizter@gmail.com"; + github = "Alizter"; + githubId = 8614547; + name = "Ali Caglayan"; + }; alkasm = { email = "alexreynolds00@gmail.com"; github = "alkasm"; @@ -664,27 +727,36 @@ githubId = 5892756; name = "Alec Snyder"; }; - AluisioASG = { - name = "Aluísio Augusto Silva Gonçalves"; - email = "aluisio@aasg.name"; - github = "AluisioASG"; - githubId = 1904165; - keys = [{ - fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; - }]; - }; almac = { email = "alma.cemerlic@gmail.com"; github = "a1mac"; githubId = 60479013; name = "Alma Cemerlic"; }; + Alper-Celik = { + email = "dev.alpercelik@gmail.com"; + name = "Alper Çelik"; + github = "Alper-Celik"; + githubId = 110625473; + keys = [{ + fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; + }]; + }; alternateved = { email = "alternateved@pm.me"; github = "alternateved"; githubId = 45176912; name = "Tomasz Hołubowicz"; }; + AluisioASG = { + name = "Aluísio Augusto Silva Gonçalves"; + email = "aluisio@aasg.name"; + github = "AluisioASG"; + githubId = 1904165; + keys = [{ + fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; + }]; + }; alunduil = { email = "alunduil@gmail.com"; github = "alunduil"; @@ -701,10 +773,10 @@ }]; }; alyaeanyx = { - email = "alexandra.hollmeier@mailbox.org"; + email = "alyaeanyx@mailbox.org"; github = "alyaeanyx"; githubId = 74795488; - name = "Alexandra Hollmeier"; + name = "alyaeanyx"; keys = [{ fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; }]; @@ -739,6 +811,12 @@ githubId = 2626481; name = "Ambroz Bizjak"; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; amesgen = { email = "amesgen@amesgen.de"; github = "amesgen"; @@ -773,15 +851,6 @@ githubId = 20530052; name = "Andrew Miloradovsky"; }; - notbandali = { - name = "Amin Bandali"; - email = "bandali@gnu.org"; - github = "notbandali"; - githubId = 1254858; - keys = [{ - fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; - }]; - }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; @@ -794,11 +863,11 @@ githubId = 858965; name = "Andrew Morsillo"; }; - an-empty-string = { - name = "Tris Emmy Wilson"; - email = "tris@tris.fyi"; - github = "an-empty-string"; - githubId = 681716; + amz-x = { + email = "mail@amz-x.com"; + github = "amz-x"; + githubId = 18249234; + name = "Christopher Crouse"; }; AnatolyPopov = { email = "aipopov@live.ru"; @@ -873,24 +942,30 @@ githubId = 587021; name = "André V L Matos"; }; - andrew-d = { - email = "andrew@du.nham.ca"; - github = "andrew-d"; - githubId = 1079173; - name = "Andrew Dunham"; - }; andrewchambers = { email = "ac@acha.ninja"; github = "andrewchambers"; githubId = 962885; name = "Andrew Chambers"; }; + andrew-d = { + email = "andrew@du.nham.ca"; + github = "andrew-d"; + githubId = 1079173; + name = "Andrew Dunham"; + }; andrewrk = { email = "superjoe30@gmail.com"; github = "andrewrk"; githubId = 106511; name = "Andrew Kelley"; }; + andrewsmith = { + email = "andrew@velvet.software"; + github = "andrewsmith"; + githubId = 29887; + name = "Andrew Smith"; + }; andsild = { email = "andsild@gmail.com"; github = "andsild"; @@ -898,7 +973,6 @@ name = "Anders Sildnes"; }; andys8 = { - email = "andys8@users.noreply.github.com"; github = "andys8"; githubId = 13085980; name = "Andy"; @@ -909,6 +983,12 @@ githubId = 2085567; name = "Aneesh Agrawal"; }; + an-empty-string = { + name = "Tris Emmy Wilson"; + email = "tris@tris.fyi"; + github = "an-empty-string"; + githubId = 681716; + }; angristan = { email = "angristan@pm.me"; github = "angristan"; @@ -916,7 +996,7 @@ name = "Stanislas Lange"; }; AngryAnt = { - name = "Emil Johansen"; + name = "Emil \"AngryAnt\" Johansen"; email = "git@eej.dk"; matrix = "@angryant:envs.net"; github = "AngryAnt"; @@ -961,17 +1041,24 @@ githubId = 750786; name = "Justin Wood"; }; + anmonteiro = { + email = "anmonteiro@gmail.com"; + github = "anmonteiro"; + githubId = 661909; + name = "Antonio Nuno Monteiro"; + }; anna328p = { email = "anna328p@gmail.com"; github = "anna328p"; githubId = 9790772; name = "Anna"; }; - anmonteiro = { - email = "anmonteiro@gmail.com"; - github = "anmonteiro"; - githubId = 661909; - name = "Antonio Nuno Monteiro"; + annaaurora = { + email = "anna@annaaurora.eu"; + matrix = "@papojari:artemislena.eu"; + github = "auroraanna"; + githubId = 81317317; + name = "Anna Aurora"; }; anoa = { matrix = "@andrewm:amorgan.xyz"; @@ -980,6 +1067,22 @@ githubId = 1342360; name = "Andrew Morgan"; }; + anomalocaris = { + email = "duncan@anomalocaris.xyz"; + github = "Anomalocaridid"; + githubId = 29845794; + name = "Duncan Russell"; + }; + anpin = { + email = "pavel@anpin.fyi"; + github = "anpin"; + githubId = 6060545; + matrix = "@anpin:matrix.org"; + name = "Pavel Anpin"; + keys = [{ + fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; + }]; + }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; @@ -1044,6 +1147,22 @@ githubId = 1078530; name = "Alexandre Peyroux"; }; + apfelkuchen6 = { + email = "apfelkuchen6@hrnz.li"; + github = "apfelkuchen6"; + githubId = 73002165; + name = "apfelkuchen6"; + }; + aplund = { + email = "austin.lund@gmail.com"; + matrix = "@aplund:matrix.org"; + github = "aplund"; + githubId = 1369436; + name = "Austin Lund"; + keys = [{ + fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; + }]; + }; applePrincess = { email = "appleprincess@appleprincess.io"; github = "applePrincess"; @@ -1084,7 +1203,6 @@ name = "Blaž Hrastnik"; }; arcnmx = { - email = "arcnmx@users.noreply.github.com"; github = "arcnmx"; githubId = 13426784; name = "arcnmx"; @@ -1107,6 +1225,12 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + arian-d = { + email = "arianxdehghani@gmail.com"; + github = "arian-d"; + githubId = 40076285; + name = "Arian Dehghani"; + }; arianvp = { email = "arian.vanputten@gmail.com"; github = "arianvp"; @@ -1137,6 +1261,12 @@ githubId = 10400299; name = "Arjan Schrijver"; }; + arjix = { + email = "arjix@protonmail.com"; + github = "arjix"; + githubId = 62168569; + name = "arjix"; + }; arkivm = { email = "vikram186@gmail.com"; github = "arkivm"; @@ -1200,6 +1330,13 @@ githubId = 37193992; name = "Arthur Teisseire"; }; + artturin = { + email = "artturin@artturin.com"; + matrix = "@artturin:matrix.org"; + github = "Artturin"; + githubId = 56650223; + name = "Artturi N"; + }; arturcygan = { email = "arczicygan@gmail.com"; github = "arcz"; @@ -1237,18 +1374,24 @@ githubId = 9281956; name = "ash lea"; }; - aske = { - email = "aske@fmap.me"; - github = "aske"; - githubId = 869771; - name = "Kirill Boltaev"; - }; ashley = { email = "ashley@kira64.xyz"; github = "kira64xyz"; githubId = 84152630; name = "Ashley Chiara"; }; + ashleyghooper = { + email = "ashleyghooper@gmail.com"; + github = "ashleyghooper"; + githubId = 11037075; + name = "Ashley Hooper"; + }; + aske = { + email = "aske@fmap.me"; + github = "aske"; + githubId = 869771; + name = "Kirill Boltaev"; + }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; @@ -1312,6 +1455,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + athre0z = { + email = "joel@zyantific.com"; + github = "athre0z"; + githubId = 6553158; + name = "Joel Höner"; + }; atila = { name = "Átila Saraiva"; email = "atilasaraiva@gmail.com"; @@ -1324,6 +1473,17 @@ githubId = 5193600; name = "Atkins Chang"; }; + atkrad = { + name = "Mohammad Abdolirad"; + email = "m.abdolirad@gmail.com"; + github = "atkrad"; + githubId = 351364; + keys = [ + { + fingerprint = "0380 F2F8 DF7A BA1A E7DB D84A 1935 1496 62CA FDB8"; + } + ]; + }; atnnn = { email = "etienne@atnnn.com"; github = "AtnNn"; @@ -1354,6 +1514,12 @@ githubId = 574938; name = "Jonathan Glines"; }; + austin-artificial = { + email = "austin.platt@artificial.io"; + github = "austin-artificial"; + githubId = 126663376; + name = "Austin Platt"; + }; austinbutler = { email = "austinabutler@gmail.com"; github = "austinbutler"; @@ -1366,6 +1532,27 @@ githubId = 12958979; name = "Mika Naylor"; }; + autrimpo = { + email = "michal@koutensky.net"; + github = "autrimpo"; + githubId = 5968483; + name = "Michal Koutenský"; + }; + autumnal = { + name = "Sven Friedrich"; + email = "sven@autumnal.de"; + github = "sevenautumns"; + githubId = 20627275; + keys = [{ + fingerprint = "6A2E 7FDD 1037 11A8 B996 E28E B051 064E 2FCA B71B"; + }]; + }; + avakhrenev = { + email = "avakhrenev@gmail.com"; + github = "avakhrenev"; + githubId = 1060224; + name = "Alexey Vakhrenev"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "Avaq"; @@ -1378,18 +1565,18 @@ githubId = 790607; name = "Romain Viallard"; }; - avery = { - email = "averyl+nixos@protonmail.com"; - github = "AveryLychee"; - githubId = 9147625; - name = "Avery Lychee"; - }; averelld = { email = "averell+nixos@rxd4.com"; github = "averelld"; githubId = 687218; name = "averelld"; }; + avery = { + email = "averyl+nixos@protonmail.com"; + github = "AveryLychee"; + githubId = 9147625; + name = "Avery Lychee"; + }; avh4 = { email = "gruen0aermel@gmail.com"; github = "avh4"; @@ -1417,25 +1604,18 @@ githubId = 206242; name = "Andreas Wiese"; }; + ayazhafiz = { + email = "ayaz.hafiz.1@gmail.com"; + github = "hafiz"; + githubId = 262763; + name = "Ayaz Hafiz"; + }; aycanirican = { email = "iricanaycan@gmail.com"; github = "aycanirican"; githubId = 135230; name = "Aycan iRiCAN"; }; - arjix = { - email = "arjix@protonmail.com"; - github = "arjix"; - githubId = 62168569; - name = "arjix"; - }; - artturin = { - email = "artturin@artturin.com"; - matrix = "@artturin:matrix.org"; - github = "Artturin"; - githubId = 56650223; - name = "Artturi N"; - }; azahi = { name = "Azat Bahawi"; email = "azat@bahawi.net"; @@ -1446,24 +1626,12 @@ fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; - ayazhafiz = { - email = "ayaz.hafiz.1@gmail.com"; - github = "hafiz"; - githubId = 262763; - name = "Ayaz Hafiz"; - }; azuwis = { email = "azuwis@gmail.com"; github = "azuwis"; githubId = 9315; name = "Zhong Jianxin"; }; - a-kenji = { - email = "aks.kenji@protonmail.com"; - github = "a-kenji"; - githubId = 65275785; - name = "Alexander Kenji Berthold"; - }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -1474,12 +1642,12 @@ }]; }; babariviere = { - email = "babathriviere@gmail.com"; + email = "me@babariviere.com"; github = "babariviere"; githubId = 12128029; name = "Bastien Rivière"; keys = [{ - fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1"; + fingerprint = "74AA 9AB4 E6FF 872B 3C5A CB3E 3903 5CC0 B75D 1142"; }]; }; babbaj = { @@ -1504,6 +1672,16 @@ githubId = 1017537; name = "Bruno Bieth"; }; + badele = { + name = "Bruno Adelé"; + email = "brunoadele@gmail.com"; + matrix = "@badele:matrix.org"; + github = "badele"; + githubId = 2806307; + keys = [{ + fingerprint = "00F4 21C4 C537 7BA3 9820 E13F 6B95 E13D E469 CC5D"; + }]; + }; badmutex = { email = "github@badi.sh"; github = "badmutex"; @@ -1597,6 +1775,16 @@ githubId = 45811; name = "Svein Ove Aas"; }; + Bauke = { + name = "Bauke"; + email = "me@bauke.xyz"; + matrix = "@baukexyz:matrix.org"; + github = "Bauke"; + githubId = 19501722; + keys = [{ + fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; + }]; + }; bb010g = { email = "me@bb010g.com"; matrix = "@bb010g:matrix.org"; @@ -1604,12 +1792,28 @@ githubId = 340132; name = "Brayden Banks"; }; + bb2020 = { + github = "bb2020"; + githubId = 19290397; + name = "Tunc Uzlu"; + }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; githubId = 916366; name = "Brandon Elam Barker"; }; + 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"; + }]; + }; bbenno = { email = "nix@bbenno.com"; github = "bbenno"; @@ -1622,6 +1826,12 @@ githubId = 24027; name = "Bruno Bigras"; }; + bburdette = { + email = "bburdette@protonmail.com"; + github = "bburdette"; + githubId = 157330; + name = "Ben Burdette"; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -1677,15 +1887,39 @@ githubId = 214787; name = "Herwig Hochleitner"; }; + benediktbroich = { + name = "Benedikt Broich"; + email = "b.broich@posteo.de"; + github = "BenediktBroich"; + githubId = 32903896; + keys = [{ + fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; + }]; + }; benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; - github = "benesim"; + github = "BeneSim"; githubId = 29384538; keys = [{ fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; }]; }; + benjaminedwardwebb = { + name = "Ben Webb"; + email = "benjaminedwardwebb@gmail.com"; + github = "benjaminedwardwebb"; + githubId = 7118777; + keys = [{ + fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; + }]; + }; + benkuhn = { + email = "ben@ben-kuhn.com"; + github = "ben-kuhn"; + githubId = 16821405; + name = "Ben Kuhn"; + }; benley = { email = "benley@gmail.com"; github = "benley"; @@ -1698,15 +1932,6 @@ github = "benneti"; githubId = 11725645; }; - bertof = { - name = "Filippo Berto"; - email = "berto.f@protonmail.com"; - github = "bertof"; - githubId = 9915675; - keys = [{ - fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; - }]; - }; bennofs = { email = "benno.fuenfstueck@gmail.com"; github = "bennofs"; @@ -1720,7 +1945,7 @@ name = "Ben Pye"; }; benwbooth = { - email = "benwbooth@gmail.com"; + email = "benwboooth@gmail.com"; github = "benwbooth"; githubId = 75972; name = "Ben Booth"; @@ -1732,6 +1957,15 @@ githubId = 26041945; name = "Potato Hatsue"; }; + berbiche = { + name = "Nicolas Berbiche"; + email = "nicolas@normie.dev"; + github = "berbiche"; + githubId = 20448408; + keys = [{ + fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; + }]; + }; berce = { email = "bert.moens@gmail.com"; github = "berce"; @@ -1762,6 +1996,15 @@ githubId = 19911; name = "Berry Phillips"; }; + bertof = { + name = "Filippo Berto"; + email = "berto.f@protonmail.com"; + github = "bertof"; + githubId = 9915675; + keys = [{ + fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; + }]; + }; betaboon = { email = "betaboon@0x80.ninja"; github = "betaboon"; @@ -1774,6 +2017,12 @@ githubId = 9730330; name = "Benoit de Chezelles"; }; + bezmuth = { + email = "benkel97@protonmail.com"; + name = "Ben Kelly"; + github = "bezmuth"; + githubId = 31394095; + }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; @@ -1804,12 +2053,6 @@ githubId = 28444296; name = "Benjamin Hougland"; }; - bigzilla = { - email = "m.billyzaelani@gmail.com"; - github = "bigzilla"; - githubId = 20436235; - name = "Billy Zaelani Malik"; - }; billewanick = { email = "bill@ewanick.com"; github = "billewanick"; @@ -1871,6 +2114,12 @@ githubId = 16330; name = "Mathijs Kwik"; }; + blusk = { + email = "bluskript@gmail.com"; + github = "Bluskript"; + githubId = 52386117; + name = "Blusk"; + }; bmilanov = { name = "Biser Milanov"; email = "bmilanov11+nixpkgs@gmail.com"; @@ -1930,27 +2179,18 @@ githubId = 68566724; name = "bootstrap-prime"; }; - commandodev = { - email = "ben@perurbis.com"; - github = "commandodev"; - githubId = 87764; - name = "Ben Ford"; - }; - boppyt = { - email = "boppy@nwcpz.com"; - github = "boppyt"; - githubId = 71049646; - name = "Zack A"; - keys = [{ - fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545"; - }]; - }; borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; githubId = 1743184; name = "Boris Babić"; }; + borlaag = { + email = "borlaag@proton.me"; + github = "Borlaag"; + githubId = 114830266; + name = "Børlaag"; + }; bosu = { email = "boriss@gmail.com"; github = "bosu"; @@ -1963,6 +2203,21 @@ github = "bouk"; githubId = 97820; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; + Br1ght0ne = { + email = "brightone@protonmail.com"; + github = "Br1ght0ne"; + githubId = 12615679; + name = "Oleksii Filonenko"; + keys = [{ + fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; + }]; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -1987,12 +2242,30 @@ githubId = 2506621; name = "Brayden Willenborg"; }; + breakds = { + email = "breakds@gmail.com"; + github = "breakds"; + githubId = 1111035; + name = "Break Yang"; + }; + brecht = { + email = "brecht.savelkoul@alumni.lse.ac.uk"; + github = "brechtcs"; + githubId = 6107054; + name = "Brecht Savelkoul"; + }; brendanreis = { email = "brendanreis@gmail.com"; name = "Brendan Reis"; github = "brendanreis"; githubId = 10686906; }; + brettlyons = { + email = "blyons@fastmail.com"; + github = "brettlyons"; + githubId = 3043718; + name = "Brett Lyons"; + }; brian-dawn = { email = "brian.t.dawn@gmail.com"; github = "brian-dawn"; @@ -2011,45 +2284,6 @@ github = "brianmcgee"; githubId = 1173648; }; - Br1ght0ne = { - email = "brightone@protonmail.com"; - github = "Br1ght0ne"; - githubId = 12615679; - name = "Oleksii Filonenko"; - keys = [{ - fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; - }]; - }; - bsima = { - email = "ben@bsima.me"; - github = "bsima"; - githubId = 200617; - name = "Ben Sima"; - }; - bstrik = { - email = "dutchman55@gmx.com"; - github = "bstrik"; - githubId = 7716744; - name = "Berno Strik"; - }; - breakds = { - email = "breakds@gmail.com"; - github = "breakds"; - githubId = 1111035; - name = "Break Yang"; - }; - brecht = { - email = "brecht.savelkoul@alumni.lse.ac.uk"; - github = "brechtcs"; - githubId = 6107054; - name = "Brecht Savelkoul"; - }; - brettlyons = { - email = "blyons@fastmail.com"; - github = "brettlyons"; - githubId = 3043718; - name = "Brett Lyons"; - }; brodes = { email = "me@brod.es"; github = "brhoades"; @@ -2072,6 +2306,24 @@ githubId = 53131727; name = "Bryan Albuquerque"; }; + bryanhonof = { + name = "Bryan Honof"; + email = "bryanhonof@gmail.com"; + github = "bryanhonof"; + githubId = 5932804; + }; + bsima = { + email = "ben@bsima.me"; + github = "bsima"; + githubId = 200617; + name = "Ben Sima"; + }; + bstrik = { + email = "dutchman55@gmx.com"; + github = "bstrik"; + githubId = 7716744; + name = "Berno Strik"; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -2103,12 +2355,6 @@ githubId = 37375448; name = "Buildit"; }; - bburdette = { - email = "bburdette@protonmail.com"; - github = "bburdette"; - githubId = 157330; - name = "Ben Burdette"; - }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; @@ -2121,18 +2367,18 @@ githubId = 2647566; name = "Bruno Bzeznik"; }; - c0bw3b = { - email = "c0bw3b@gmail.com"; - github = "c0bw3b"; - githubId = 24417923; - name = "Renaud"; - }; c00w = { email = "nix@daedrum.net"; github = "c00w"; githubId = 486199; name = "Colin"; }; + c0bw3b = { + email = "c0bw3b@gmail.com"; + github = "c0bw3b"; + githubId = 24417923; + name = "Renaud"; + }; c0deaddict = { email = "josvanbakel@protonmail.com"; github = "c0deaddict"; @@ -2151,6 +2397,12 @@ githubId = 15320726; name = "Car Cdr"; }; + caarlos0 = { + name = "Carlos A Becker"; + email = "carlos@becker.software"; + github = "caarlos0"; + githubId = 245435; + }; cab404 = { email = "cab404@mailbox.org"; github = "cab404"; @@ -2166,18 +2418,33 @@ } ]; }; - calbrecht = { - email = "christian.albrecht@mayflower.de"; - github = "calbrecht"; - githubId = 1516457; - name = "Christian Albrecht"; - }; CactiChameleon9 = { email = "h19xjkkp@duck.com"; github = "CactiChameleon9"; githubId = 51231053; name = "Daniel"; }; + cadkin = { + email = "cva@siliconslumber.net"; + name = "Cameron Adkins"; + github = "cadkin"; + githubId = 34077838; + }; + cafkafk = { + email = "christina@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys = [ + { + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + } + { + fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; + } + ]; + }; calavera = { email = "david.calavera@gmail.com"; github = "calavera"; @@ -2185,6 +2452,12 @@ matrix = "@davidcalavera:matrix.org"; name = "David Calavera"; }; + calbrecht = { + email = "christian.albrecht@mayflower.de"; + github = "calbrecht"; + githubId = 1516457; + name = "Christian Albrecht"; + }; callahad = { email = "dan.callahan@gmail.com"; github = "callahad"; @@ -2209,6 +2482,12 @@ githubId = 3212452; name = "Cameron Nemo"; }; + camillemndn = { + email = "camillemondon@free.fr"; + github = "camillemndn"; + githubId = 26444818; + name = "Camille M."; + }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; @@ -2221,12 +2500,6 @@ githubId = 91694; name = "Javier Candeira"; }; - candyc1oud = { - email = "candyc1oud@outlook.com"; - github = "candyc1oud"; - githubId = 113157395; - name = "Candy Cloud"; - }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; @@ -2245,6 +2518,12 @@ github = "CaptainJawZ"; githubId = 43111068; }; + CardboardTurkey = { + name = "Kiran Ostrolenk"; + email = "kostrolenk@gmail.com"; + github = "CardboardTurkey"; + githubId = 34030186; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -2287,6 +2566,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + cathalmullan = { + email = "contact@cathal.dev"; + github = "CathalMullan"; + githubId = 37139470; + name = "Cathal Mullan"; + }; catouc = { email = "catouc@philipp.boeschen.me"; github = "catouc"; @@ -2306,12 +2591,24 @@ matrix = "@cawilliamson:nixos.dev"; name = "Christopher A. Williamson"; }; + cbleslie = { + email = "cameronleslie@gmail.com"; + github = "cbleslie"; + githubId = 500963; + name = "C.B.Leslie"; + }; cbley = { email = "claudio.bley@gmail.com"; github = "avdv"; githubId = 3471749; name = "Claudio Bley"; }; + cbrewster = { + email = "cbrewster@hey.com"; + github = "cbrewster"; + githubId = 9086315; + name = "Connor Brewster"; + }; cburstedde = { email = "burstedde@ins.uni-bonn.de"; github = "cburstedde"; @@ -2321,6 +2618,12 @@ fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; }]; }; + ccellado = { + email = "annplague@gmail.com"; + github = "ccellado"; + githubId = 44584960; + name = "Denis Khalmatov"; + }; cdepillabout = { email = "cdep.illabout@gmail.com"; matrix = "@cdepillabout:matrix.org"; @@ -2328,12 +2631,6 @@ githubId = 64804; name = "Dennis Gosnell"; }; - ccellado = { - email = "annplague@gmail.com"; - github = "ccellado"; - githubId = 44584960; - name = "Denis Khalmatov"; - }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; @@ -2396,6 +2693,18 @@ githubId = 8228888; name = "Charlie Hanley"; }; + chaoflow = { + email = "flo@chaoflow.net"; + github = "chaoflow"; + githubId = 89596; + name = "Florian Friesdorf"; + }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; charlesbaynham = { email = "charlesbaynham@gmail.com"; github = "charlesbaynham"; @@ -2408,12 +2717,6 @@ githubId = 6608071; name = "Charles Huyghues-Despointes"; }; - chaoflow = { - email = "flo@chaoflow.net"; - github = "chaoflow"; - githubId = 89596; - name = "Florian Friesdorf"; - }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -2489,18 +2792,18 @@ githubId = 538538; name = "Bryan Richter"; }; - chris-martin = { - email = "ch.martin@gmail.com"; - github = "chris-martin"; - githubId = 399718; - name = "Chris Martin"; - }; chrisjefferson = { email = "chris@bubblescope.net"; github = "ChrisJefferson"; githubId = 811527; name = "Christopher Jefferson"; }; + chris-martin = { + email = "ch.martin@gmail.com"; + github = "chris-martin"; + githubId = 399718; + name = "Chris Martin"; + }; chrispattison = { email = "chpattison@gmail.com"; github = "ChrisPattison"; @@ -2529,7 +2832,6 @@ }]; }; christophcharles = { - email = "23055925+christophcharles@users.noreply.github.com"; github = "christophcharles"; githubId = 23055925; name = "Christoph Charles"; @@ -2540,6 +2842,15 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + christoph-heiss = { + email = "christoph@c8h4.io"; + github = "christoph-heiss"; + githubId = 7571069; + name = "Christoph Heiss"; + keys = [{ + fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; + }]; + }; chuahou = { email = "human+github@chuahou.dev"; github = "chuahou"; @@ -2620,6 +2931,12 @@ githubId = 25088352; name = "Christian Kögler"; }; + ckauhaus = { + email = "kc@flyingcircus.io"; + github = "ckauhaus"; + githubId = 1448923; + name = "Christian Kauhaus"; + }; ckie = { email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; @@ -2630,18 +2947,6 @@ name = "ckie"; matrix = "@ckie:ckie.dev"; }; - clkamp = { - email = "c@lkamp.de"; - github = "clkamp"; - githubId = 46303707; - name = "Christian Lütke-Stetzkamp"; - }; - ckauhaus = { - email = "kc@flyingcircus.io"; - github = "ckauhaus"; - githubId = 1448923; - name = "Christian Kauhaus"; - }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; @@ -2673,6 +2978,12 @@ githubId = 848609; name = "Michael Bishop"; }; + clkamp = { + email = "c@lkamp.de"; + github = "clkamp"; + githubId = 46303707; + name = "Christian Lütke-Stetzkamp"; + }; cmacrae = { email = "hi@cmacr.ae"; github = "cmacrae"; @@ -2706,6 +3017,13 @@ githubId = 718298; name = "Michael Livshin"; }; + CobaltCause = { + name = "Charles Hall"; + email = "charles@computer.surgery"; + github = "CobaltCause"; + githubId = 7003738; + matrix = "@charles:computer.surgery"; + }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; @@ -2765,6 +3083,23 @@ githubId = 298705; name = "Cyril Cohen"; }; + colamaroro = { + name = "Corentin Rondier"; + email = "github@rondier.io"; + github = "colamaroro"; + githubId = 12484955; + matrix = "@colamaroro:lovelyrad.io"; + }; + cole-h = { + name = "Cole Helbling"; + email = "cole.e.helbling@outlook.com"; + matrix = "@cole-h:matrix.org"; + github = "cole-h"; + githubId = 28582702; + keys = [{ + fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; + }]; + }; colemickens = { email = "cole.mickens@gmail.com"; matrix = "@colemickens:matrix.org"; @@ -2778,16 +3113,6 @@ githubId = 5684605; name = "Cole Scott"; }; - cole-h = { - name = "Cole Helbling"; - email = "cole.e.helbling@outlook.com"; - matrix = "@cole-h:matrix.org"; - github = "cole-h"; - githubId = 28582702; - keys = [{ - fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; - }]; - }; colinsane = { name = "Colin Sane"; email = "colin@uninsane.org"; @@ -2801,42 +3126,18 @@ githubId = 244239; name = "Mauricio Collares"; }; + commandodev = { + email = "ben@perurbis.com"; + github = "commandodev"; + githubId = 87764; + name = "Ben Ford"; + }; CompEng0001 = { email = "sb1501@canterbury.ac.uk"; github = "CompEng0001"; githubId = 40290417; name = "Seb Blair"; }; - considerate = { - email = "viktor.kronvall@gmail.com"; - github = "considerate"; - githubId = 217918; - name = "Viktor Kronvall"; - }; - copumpkin = { - email = "pumpkingod@gmail.com"; - github = "copumpkin"; - githubId = 2623; - name = "Dan Peebles"; - }; - corngood = { - email = "corngood@gmail.com"; - github = "corngood"; - githubId = 3077118; - name = "David McFarland"; - }; - coroa = { - email = "jonas@chaoflow.net"; - github = "coroa"; - githubId = 2552981; - name = "Jonas Hörsch"; - }; - costrouc = { - email = "chris.ostrouchov@gmail.com"; - github = "costrouc"; - githubId = 1740337; - name = "Chris Ostrouchov"; - }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -2850,11 +3151,12 @@ name = "Changsheng Wu"; githubId = 2083950; }; - contrun = { - email = "uuuuuu@protonmail.com"; - github = "contrun"; - githubId = 32609395; - name = "B YI"; + connorbaker = { + email = "connor.baker@tweag.io"; + matrix = "@connorbaker:matrix.org"; + github = "connorbaker"; + name = "Connor Baker"; + githubId = 3880346; }; conradmearns = { email = "conradmearns+github@pm.me"; @@ -2862,6 +3164,24 @@ githubId = 5510514; name = "Conrad Mearns"; }; + considerate = { + email = "viktor.kronvall@gmail.com"; + github = "considerate"; + githubId = 217918; + name = "Viktor Kronvall"; + }; + contrun = { + email = "uuuuuu@protonmail.com"; + github = "contrun"; + githubId = 32609395; + name = "B YI"; + }; + copumpkin = { + email = "pumpkingod@gmail.com"; + github = "copumpkin"; + githubId = 2623; + name = "Dan Peebles"; + }; corbanr = { email = "corban@raunco.co"; github = "CorbanR"; @@ -2877,6 +3197,24 @@ } ]; }; + corngood = { + email = "corngood@gmail.com"; + github = "corngood"; + githubId = 3077118; + name = "David McFarland"; + }; + coroa = { + email = "jonas@chaoflow.net"; + github = "coroa"; + githubId = 2552981; + name = "Jonas Hörsch"; + }; + costrouc = { + email = "chris.ostrouchov@gmail.com"; + github = "costrouc"; + githubId = 1740337; + name = "Chris Ostrouchov"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -2889,6 +3227,11 @@ githubId = 411324; name = "Carles Pagès"; }; + cpcloud = { + name = "Phillip Cloud"; + github = "cpcloud"; + githubId = 417981; + }; cpu = { email = "daniel@binaryparadox.net"; github = "cpu"; @@ -2983,7 +3326,7 @@ cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; - githubId = 389387; + githubId = 119854490; name = "Serg Nesterov"; keys = [{ fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; @@ -3001,6 +3344,25 @@ githubId = 16950437; name = "cwyc"; }; + cynerd = { + name = "Karel Kočí"; + email = "cynerd@email.cz"; + github = "Cynerd"; + githubId = 3811900; + keys = [{ + fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; + }]; + }; + cyntheticfox = { + email = "cyntheticfox@gh0st.sh"; + github = "cyntheticfox"; + githubId = 17628961; + keys = [{ + fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; + }]; + matrix = "@houstdav000:gh0st.ems.host"; + name = "Cynthia Fox"; + }; cyounkins = { name = "Craig Younkins"; email = "cyounkins@gmail.com"; @@ -3028,21 +3390,6 @@ githubId = 217899; name = "Cyryl Płotnicki"; }; - d-goldin = { - email = "dgoldin+github@protonmail.ch"; - github = "d-goldin"; - githubId = 43349662; - name = "Dima"; - keys = [{ - fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; - }]; - }; - d-xo = { - email = "hi@d-xo.org"; - github = "d-xo"; - githubId = 6689924; - name = "David Terry"; - }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -3079,6 +3426,12 @@ githubId = 217543; name = "Damien Cassou"; }; + dan4ik605743 = { + email = "6057430gu@gmail.com"; + github = "dan4ik605743"; + githubId = 86075850; + name = "Danil Danevich"; + }; danbst = { email = "abcz2.uprola@gmail.com"; github = "danbst"; @@ -3100,12 +3453,6 @@ githubId = 245394; name = "Hannu Hartikainen"; }; - danderson = { - email = "dave@natulte.net"; - github = "danderson"; - githubId = 1918; - name = "David Anderson"; - }; dandellion = { email = "daniel@dodsorf.as"; matrix = "@dandellion:dodsorf.as"; @@ -3113,6 +3460,12 @@ githubId = 990767; name = "Daniel Olsen"; }; + danderson = { + email = "dave@natulte.net"; + github = "danderson"; + githubId = 1918; + name = "David Anderson"; + }; daneads = { email = "me@daneads.com"; github = "daneads"; @@ -3137,6 +3490,17 @@ githubId = 1298344; name = "Daniel Fullmer"; }; + daniyalsuri6 = { + email = "daniyal.suri@gmail.com"; + github = "daniyalsuri6"; + githubId = 107034852; + name = "Daniyal Suri"; + }; + dansbandit = { + github = "dansbandit"; + githubId = 4530687; + name = "dansbandit"; + }; danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; @@ -3147,12 +3511,6 @@ fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; }]; }; - dan4ik605743 = { - email = "6057430gu@gmail.com"; - github = "dan4ik605743"; - githubId = 86075850; - name = "Danil Danevich"; - }; darkonion0 = { name = "Alexandre Peruggia"; email = "darkgenius1@protonmail.com"; @@ -3166,13 +3524,6 @@ githubId = 97746; name = "Raphael Das Gupta"; }; - das_j = { - email = "janne@hess.ooo"; - matrix = "@janne.hess:helsinki-systems.de"; - github = "dasJ"; - githubId = 4971975; - name = "Janne Heß"; - }; dasisdormax = { email = "dasisdormax@mailbox.org"; github = "dasisdormax"; @@ -3182,6 +3533,13 @@ }]; name = "Maximilian Wende"; }; + das_j = { + email = "janne@hess.ooo"; + matrix = "@janne.hess:helsinki-systems.de"; + github = "dasJ"; + githubId = 4971975; + name = "Janne Heß"; + }; dasj19 = { email = "daniel@serbanescu.dk"; github = "dasj19"; @@ -3189,23 +3547,22 @@ name = "Daniel Șerbănescu"; }; datafoo = { - email = "34766150+datafoo@users.noreply.github.com"; github = "datafoo"; githubId = 34766150; name = "datafoo"; }; + davegallant = { + name = "Dave Gallant"; + email = "davegallant@gmail.com"; + github = "davegallant"; + githubId = 4519234; + }; davhau = { email = "d.hauer.it@gmail.com"; name = "David Hauer"; github = "DavHau"; githubId = 42246742; }; - david-sawatzke = { - email = "d-nix@sawatzke.dev"; - github = "david-sawatzke"; - githubId = 11035569; - name = "David Sawatzke"; - }; david50407 = { email = "me@davy.tw"; github = "david50407"; @@ -3225,12 +3582,30 @@ githubId = 6754950; name = "David Armstrong Lewis"; }; + davidcromp = { + email = "davidcrompton1192@gmail.com"; + github = "CyborgPotato"; + githubId = 10701143; + name = "David Crompton"; + }; + david-hamelin = { + email = "david.hamelin@outlook.fr"; + github = "HamelinDavid"; + githubId = 118536343; + name = "David Hamelin"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; githubId = 1832378; name = "David Rusu"; }; + david-sawatzke = { + email = "d-nix@sawatzke.dev"; + github = "david-sawatzke"; + githubId = 11035569; + name = "David Sawatzke"; + }; davidtwco = { email = "david@davidtw.co"; github = "davidtwco"; @@ -3240,12 +3615,24 @@ fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; }]; }; + davisrichard437 = { + email = "davisrichard437@gmail.com"; + github = "davisrichard437"; + githubId = 85075437; + name = "Richard Davis"; + }; davorb = { email = "davor@davor.se"; github = "davorb"; githubId = 798427; name = "Davor Babic"; }; + davsanchez = { + email = "davidslt+nixpkgs@pm.me"; + github = "DavSanchez"; + githubId = 11422515; + name = "David Sánchez"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; @@ -3321,6 +3708,17 @@ githubId = 156239; name = "D Anzorge"; }; + deifactor = { + name = "Ash Zahlen"; + email = "ext0l@riseup.net"; + github = "deifactor"; + githubId = 30192992; + }; + deinferno = { + name = "deinferno"; + github = "deinferno"; + githubId = 14363193; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -3334,7 +3732,6 @@ githubId = 1153808; }; deliciouslytyped = { - email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped"; githubId = 47436522; name = "deliciouslytyped"; @@ -3387,6 +3784,12 @@ githubId = 706758; name = "Christian Gerbrandt"; }; + derdennisop = { + email = "dennish@wuitz.de"; + github = "derdennisop"; + githubId = 52411861; + name = "Dennis"; + }; derekcollison = { email = "derek@nats.io"; github = "derekcollison"; @@ -3430,6 +3833,25 @@ githubId = 10042482; name = "Louis Pearson"; }; + detegr = { + name = "Antti Keränen"; + email = "detegr@rbx.email"; + github = "Detegr"; + githubId = 724433; + }; + Dettorer = { + name = "Paul Hervot"; + email = "paul.hervot@dettorer.net"; + matrix = "@dettorer:matrix.org"; + github = "Dettorer"; + githubId = 2761682; + }; + developer-guy = { + name = "Batuhan Apaydın"; + email = "developerguyn@gmail.com"; + github = "developer-guy"; + githubId = 16693043; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -3454,6 +3876,12 @@ githubId = 579369; name = "Tuomas Tynkkynen"; }; + dfithian = { + email = "daniel.m.fithian@gmail.com"; + name = "Daniel Fithian"; + github = "dfithian"; + githubId = 8409320; + }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; @@ -3472,6 +3900,15 @@ githubId = 33262214; name = "Dawid Gliwka"; }; + d-goldin = { + email = "dgoldin+github@protonmail.ch"; + github = "d-goldin"; + githubId = 43349662; + name = "Dima"; + keys = [{ + fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; + }]; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -3491,7 +3928,6 @@ name = "David Leung"; }; DianaOlympos = { - email = "DianaOlympos@noreply.github.com"; github = "DianaOlympos"; githubId = 15774340; name = "Thomas Depierre"; @@ -3516,7 +3952,6 @@ }; diogox = { name = "Diogo Xavier"; - email = "13244408+diogox@users.noreply.github.com"; github = "diogox"; githubId = 13244408; }; @@ -3550,12 +3985,6 @@ githubId = 14034137; name = "Mostly Void"; }; - dizfer = { - email = "david@izquierdofernandez.com"; - github = "DIzFer"; - githubId = 8852888; - name = "David Izquierdo"; - }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -3646,12 +4075,27 @@ githubId = 126339; name = "Domen Kozar"; }; + DomesticMoth = { + name = "Andrew"; + email = "silkmoth@protonmail.com"; + github = "DomesticMoth"; + githubId = 91414737; + keys = [{ + fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; + }]; + }; dominikh = { email = "dominik@honnef.co"; github = "dominikh"; githubId = 39825; name = "Dominik Honnef"; }; + doriath = { + email = "tomasz.zurkowski@gmail.com"; + github = "doriath"; + githubId = 150959; + name = "Tomasz Zurkowski"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; @@ -3674,12 +4118,6 @@ fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; }]; }; - doublec = { - email = "chris.double@double.co.nz"; - github = "doublec"; - githubId = 16599; - name = "Chris Double"; - }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; @@ -3695,6 +4133,13 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + DPDmancul = { + name = "Davide Peressoni"; + email = "davide.peressoni@tuta.io"; + matrix = "@dpd-:matrix.org"; + github = "DPDmancul"; + githubId = 3186857; + }; dpercy = { email = "dpercy@dpercy.dev"; github = "dpercy"; @@ -3707,6 +4152,15 @@ githubId = 108501; name = "David Pflug"; }; + dr460nf1r3 = { + email = "root@dr460nf1r3.org"; + github = "dr460nf1r3"; + githubId = 12834713; + name = "Nico Jensch"; + keys = [{ + fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; + }]; + }; dramaturg = { email = "seb@ds.ag"; github = "dramaturg"; @@ -3732,7 +4186,6 @@ name = "Dominik Ritter"; }; drperceptron = { - email = "92106371+drperceptron@users.noreply.github.com"; github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; @@ -3750,12 +4203,6 @@ fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; }]; }; - drzoidberg = { - email = "jakob@mast3rsoft.com"; - github = "jakobneufeld"; - githubId = 24791219; - name = "Jakob Neufeld"; - }; dsalaza4 = { email = "podany270895@gmail.com"; github = "dsalaza4"; @@ -3777,6 +4224,21 @@ githubId = 1931963; name = "David Sferruzza"; }; + dsuetin = { + name = "Danil Suetin"; + email = "suetin085@gmail.com"; + matrix = "@dani0854:matrix.org"; + github = "dani0854"; + githubId = 32674935; + keys = [{ + fingerprint = "6CC2 D713 6703 0D86 CA29 C71F 23B5 AA6F A374 F2FE"; + }]; + }; + dsymbol = { + name = "dsymbol"; + github = "dsymbol"; + githubId = 88138099; + }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; @@ -3813,6 +4275,18 @@ githubId = 6884440; name = "Ding Xiang Fei"; }; + d-xo = { + email = "hi@d-xo.org"; + github = "d-xo"; + githubId = 6689924; + name = "David Terry"; + }; + dylanmtaylor = { + email = "dylan@dylanmtaylor.com"; + github = "dylanmtaylor"; + githubId = 277927; + name = "Dylan Taylor"; + }; dysinger = { email = "tim@dysinger.net"; github = "dysinger"; @@ -3832,11 +4306,15 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; - e-user = { - email = "nixos@sodosopa.io"; - github = "outergod"; - githubId = 93086; - name = "Alexander Kahl"; + e1mo = { + email = "nixpkgs@e1mo.de"; + matrix = "@e1mo:chaos.jetzt"; + github = "e1mo"; + githubId = 61651268; + name = "Moritz Fromm"; + keys = [{ + fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; + }]; }; eadwu = { email = "edmund.wu@protonmail.com"; @@ -3862,13 +4340,6 @@ githubId = 424946; name = "James Earl Douglas"; }; - erikarvstedt = { - email = "erik.arvstedt@gmail.com"; - matrix = "@erikarvstedt:matrix.org"; - github = "erikarvstedt"; - githubId = 36110478; - name = "Erik Arvstedt"; - }; ebbertd = { email = "daniel@ebbert.nrw"; github = "ebbertd"; @@ -3908,65 +4379,27 @@ githubId = 50854; name = "edef"; }; + ederoyd46 = { + email = "matt@ederoyd.co.uk"; + github = "ederoyd46"; + githubId = 119483; + name = "Matthew Brown"; + }; edlimerkaj = { name = "Edli Merkaj"; email = "edli.merkaj@identinet.io"; github = "edlimerkaj"; githubId = 71988351; }; - ehllie = { - email = "me@ehllie.xyz"; - github = "ehllie"; - githubId = 20847625; - name = "Elizabeth Paź"; - }; - elliottslaughter = { - name = "Elliott Slaughter"; - email = "elliottslaughter@gmail.com"; - github = "elliottslaughter"; - githubId = 3129; - }; - emantor = { - email = "rouven+nixos@czerwinskis.de"; - github = "Emantor"; - githubId = 934284; - name = "Rouven Czerwinski"; - }; - embr = { - email = "hi@liclac.eu"; - github = "liclac"; - githubId = 428026; - name = "embr"; - }; - emily = { - email = "nixpkgs@emily.moe"; - github = "emilazy"; - githubId = 18535642; - name = "Emily"; - }; - emilytrau = { - name = "Emily Trau"; - email = "nix@angus.ws"; - github = "emilytrau"; - githubId = 13267947; - }; - enderger = { - email = "endergeryt@gmail.com"; - github = "enderger"; - githubId = 36283171; - name = "Daniel"; - }; - endocrimes = { - email = "dani@builds.terrible.systems"; - github = "endocrimes"; - githubId = 1330683; - name = "Danielle Lancashire"; - }; - ederoyd46 = { - email = "matt@ederoyd.co.uk"; - github = "ederoyd46"; - githubId = 119483; - name = "Matthew Brown"; + edrex = { + email = "ericdrex@gmail.com"; + github = "edrex"; + githubId = 14615; + keys = [{ + fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; + }]; + matrix = "@edrex:matrix.org"; + name = "Eric Drechsel"; }; eduarrrd = { email = "e.bachmakov@gmail.com"; @@ -3998,6 +4431,12 @@ githubId = 884970; name = "Eric Hegnes"; }; + ehllie = { + email = "me@ehllie.xyz"; + github = "ehllie"; + githubId = 20847625; + name = "Elizabeth Paź"; + }; ehmry = { email = "ehmry@posteo.net"; github = "ehmry"; @@ -4016,6 +4455,12 @@ githubId = 701128; name = "Eike Kettner"; }; + eken = { + email = "edvin.kallstrom@protonmail.com"; + github = "Eken-beep"; + name = "Edvin Källström"; + githubId = 84442052; + }; ekleog = { email = "leo@gaspard.io"; matrix = "@leo:gaspard.ninja"; @@ -4047,23 +4492,17 @@ githubId = 103082; name = "Ed Brindley"; }; - elizagamedev = { - email = "eliza@eliza.sh"; - github = "elizagamedev"; - githubId = 4576666; - name = "Eliza Velasquez"; + elesiuta = { + email = "elesiuta@gmail.com"; + github = "elesiuta"; + githubId = 8146662; + name = "Eric Lesiuta"; }; - elliot = { - email = "hack00mind@gmail.com"; - github = "Eliot00"; - githubId = 18375468; - name = "Elliot Xu"; - }; - elliottvillars = { - email = "elliottvillars@gmail.com"; - github = "elliottvillars"; - githubId = 48104179; - name = "Elliott Villars"; + eliandoran = { + email = "contact@eliandoran.me"; + name = "Elian Doran"; + github = "eliandoran"; + githubId = 21236836; }; eliasp = { email = "mail@eliasprobst.eu"; @@ -4090,11 +4529,11 @@ githubId = 769073; name = "Eric Litak"; }; - ellis = { - email = "nixos@ellisw.net"; - github = "ellis"; - githubId = 97852; - name = "Ellis Whitehead"; + elizagamedev = { + email = "eliza@eliza.sh"; + github = "elizagamedev"; + githubId = 4576666; + name = "Eliza Velasquez"; }; elkowar = { email = "thereal.elkowar@gmail.com"; @@ -4102,6 +4541,36 @@ githubId = 5300871; name = "Leon Kowarschick"; }; + elliot = { + email = "hack00mind@gmail.com"; + github = "Eliot00"; + githubId = 18375468; + name = "Elliot Xu"; + }; + elliottslaughter = { + name = "Elliott Slaughter"; + email = "elliottslaughter@gmail.com"; + github = "elliottslaughter"; + githubId = 3129; + }; + elliottvillars = { + email = "elliottvillars@gmail.com"; + github = "elliottvillars"; + githubId = 48104179; + name = "Elliott Villars"; + }; + ellis = { + email = "nixos@ellisw.net"; + github = "ellis"; + githubId = 97852; + name = "Ellis Whitehead"; + }; + elnudev = { + email = "elnu@elnu.com"; + github = "ElnuDev"; + githubId = 9874955; + name = "Elnu"; + }; elohmeier = { email = "elo-nixos@nerdworks.de"; github = "elohmeier"; @@ -4110,10 +4579,41 @@ }; elvishjerricco = { email = "elvishjerricco@gmail.com"; + matrix = "@elvishjerricco:matrix.org"; github = "ElvishJerricco"; githubId = 1365692; name = "Will Fancher"; }; + emantor = { + email = "rouven+nixos@czerwinskis.de"; + github = "Emantor"; + githubId = 934284; + name = "Rouven Czerwinski"; + }; + emattiza = { + email = "nix@mattiza.dev"; + github = "emattiza"; + githubId = 11719476; + name = "Evan Mattiza"; + }; + embr = { + email = "hi@liclac.eu"; + github = "liclac"; + githubId = 428026; + name = "embr"; + }; + emily = { + email = "nixpkgs@emily.moe"; + github = "emilazy"; + githubId = 18535642; + name = "Emily"; + }; + emilytrau = { + name = "Emily Trau"; + email = "nix@angus.ws"; + github = "emilytrau"; + githubId = 13267947; + }; emmabastas = { email = "emma.bastas@protonmail.com"; matrix = "@emmabastas:matrix.org"; @@ -4134,12 +4634,24 @@ githubId = 28287; name = "Jon Roberts"; }; + enderger = { + email = "endergeryt@gmail.com"; + github = "enderger"; + githubId = 36283171; + name = "Daniel"; + }; endgame = { email = "jack@jackkelly.name"; github = "endgame"; githubId = 231483; name = "Jack Kelly"; }; + endocrimes = { + email = "dani@builds.terrible.systems"; + github = "endocrimes"; + githubId = 1330683; + name = "Danielle Lancashire"; + }; enorris = { name = "Eric Norris"; email = "erictnorris@gmail.com"; @@ -4153,7 +4665,6 @@ name = "Ente"; }; Enzime = { - email = "enzime@users.noreply.github.com"; github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; @@ -4247,6 +4758,13 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + erikarvstedt = { + email = "erik.arvstedt@gmail.com"; + matrix = "@erikarvstedt:matrix.org"; + github = "erikarvstedt"; + githubId = 36110478; + name = "Erik Arvstedt"; + }; erikbackman = { email = "contact@ebackman.net"; github = "erikbackman"; @@ -4284,7 +4802,6 @@ name = "Ertugrul Söylemez"; }; esclear = { - email = "esclear@users.noreply.github.com"; github = "esclear"; githubId = 7432848; name = "Daniel Albert"; @@ -4317,12 +4834,24 @@ github = "ethindp"; githubId = 8030501; }; + ethinx = { + email = "eth2net@gmail.com"; + github = "ethinx"; + githubId = 965612; + name = "York Wong"; + }; Etjean = { email = "et.jean@outlook.fr"; github = "Etjean"; githubId = 32169529; name = "Etienne Jean"; }; + ettom = { + email = "ettom22@hotmail.com"; + github = "ettom"; + githubId = 36895504; + name = "ettom"; + }; etu = { email = "elis@hirwing.se"; matrix = "@etu:semi.social"; @@ -4349,6 +4878,13 @@ fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; }]; }; + evan-goode = { + email = "mail@evangoo.de"; + name = "Evan Goode"; + github = "evan-goode"; + githubId = 7495216; + matrix = "@goode:matrix.org"; + }; evanjs = { email = "evanjsx@gmail.com"; github = "evanjs"; @@ -4368,7 +4904,7 @@ name = "Eric Evenchick"; }; evenbrenden = { - email = "evenbrenden@gmail.com"; + email = "packages@anythingexternal.com"; github = "evenbrenden"; githubId = 2512008; name = "Even Brenden"; @@ -4382,7 +4918,7 @@ }; ewok = { email = "ewok@ewok.ru"; - github = "ewok"; + github = "ewok-old"; githubId = 454695; name = "Artur Taranchiev"; }; @@ -4433,11 +4969,11 @@ githubId = 25955146; name = "eyJhb"; }; - f--t = { - email = "git@f-t.me"; - github = "f--t"; - githubId = 2817965; - name = "f--t"; + f2k1de = { + name = "f2k1de"; + email = "hi@f2k1.de"; + github = "f2k1de"; + githubId = 11199213; }; f4814n = { email = "me@f4814n.de"; @@ -4488,6 +5024,12 @@ githubId = 225893; name = "James Cook"; }; + farcaller = { + name = "Vladimir Pouzanov"; + email = "farcaller@gmail.com"; + github = "farcaller"; + githubId = 693; + }; fare = { email = "fahree@gmail.com"; github = "fare"; @@ -4530,6 +5072,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + federicoschonborn = { + name = "Federico Damián Schonborn"; + email = "fdschonborn@gmail.com"; + github = "FedericoSchonborn"; + githubId = 62166915; + matrix = "@FedericoDSchonborn:matrix.org"; + keys = [ + { fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; } + ]; + }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; @@ -4551,10 +5103,18 @@ }; felipeqq2 = { name = "Felipe Silva"; - email = "felipeqq2@outlook.com"; + email = "nixpkgs@felipeqq2.rocks"; github = "felipeqq2"; githubId = 71830138; - keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }]; + keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; }]; + matrix = "@felipeqq2:pub.solar"; + }; + felixalbrigtsen = { + email = "felixalbrigtsen@gmail.com"; + github = "felixalbrigtsen"; + githubId = 64613093; + name = "Felix Albrigtsen"; + matrix = "@felixalb:pvv.ntnu.no"; }; felixscheinost = { name = "Felix Scheinost"; @@ -4610,18 +5170,18 @@ githubId = 5741401; name = "Tim Windelschmidt"; }; - FireyFly = { - email = "nix@firefly.nu"; - github = "FireyFly"; - githubId = 415760; - name = "Jonas Höglund"; - }; firefly-cpp = { email = "iztok@iztok-jr-fister.eu"; github = "firefly-cpp"; githubId = 1633361; name = "Iztok Fister Jr."; }; + FireyFly = { + email = "nix@firefly.nu"; + github = "FireyFly"; + githubId = 415760; + name = "Jonas Höglund"; + }; fishi0x01 = { email = "fishi0x01@gmail.com"; github = "fishi0x01"; @@ -4640,6 +5200,12 @@ github = "fkautz"; githubId = 135706; }; + FlafyDev = { + name = "Flafy Arazi"; + email = "flafyarazi@gmail.com"; + github = "FlafyDev"; + githubId = 44374434; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; @@ -4662,6 +5228,13 @@ githubId = 66178592; name = "Pavel Zolotarevskiy"; }; + flexiondotorg = { + name = "Martin Wimpress"; + email = "martin@wimpress.org"; + matrix = "@wimpress:matrix.org"; + github = "flexiondotorg"; + githubId = 304639; + }; fliegendewurst = { email = "arne.keller@posteo.de"; github = "FliegendeWurst"; @@ -4675,7 +5248,6 @@ name = "Florian Klink"; }; florentc = { - email = "florentc@users.noreply.github.com"; github = "florentc"; githubId = 1149048; name = "Florent Ch."; @@ -4722,18 +5294,18 @@ githubId = 5918766; name = "Franz Thoma"; }; - fooker = { - email = "fooker@lab.sh"; - github = "fooker"; - githubId = 405105; - name = "Dustin Frisch"; - }; foo-dogsquared = { email = "foo.dogsquared@gmail.com"; github = "foo-dogsquared"; githubId = 34962634; name = "Gabriel Arazas"; }; + fooker = { + email = "fooker@lab.sh"; + github = "fooker"; + githubId = 405105; + name = "Dustin Frisch"; + }; foolnotion = { email = "bogdan.burlacu@pm.me"; github = "foolnotion"; @@ -4777,13 +5349,18 @@ githubId = 84968; name = "Florian Paul Schmidt"; }; - fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; githubId = 119691; name = "Michael Gough"; }; + franzmondlichtmann = { + name = "Franz Schroepf"; + email = "franz-schroepf@t-online.de"; + github = "franzmondlichtmann"; + githubId = 105480088; + }; freax13 = { email = "erbse.13@gmx.de"; github = "Freax13"; @@ -4797,7 +5374,6 @@ name = "Frede Emil"; }; freezeboy = { - email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; githubId = 13279982; name = "freezeboy"; @@ -4826,36 +5402,42 @@ githubId = 1010248; name = "Frank Lanitz"; }; - fro_ozen = { - email = "fro_ozen@gmx.de"; - github = "froozen"; - githubId = 1943632; - name = "fro_ozen"; - }; frogamic = { email = "frogamic@protonmail.com"; github = "frogamic"; githubId = 10263813; name = "Dominic Shelton"; }; - Frostman = { - email = "me@slukjanov.name"; - github = "Frostman"; - githubId = 134872; - name = "Sergei Lukianov"; - }; frontsideair = { email = "photonia@gmail.com"; github = "frontsideair"; githubId = 868283; name = "Fatih Altinok"; }; + fro_ozen = { + email = "fro_ozen@gmx.de"; + github = "froozen"; + githubId = 1943632; + name = "fro_ozen"; + }; + Frostman = { + email = "me@slukjanov.name"; + github = "Frostman"; + githubId = 134872; + name = "Sergei Lukianov"; + }; fstamour = { email = "fr.st-amour@gmail.com"; github = "fstamour"; githubId = 2881922; name = "Francis St-Amour"; }; + f--t = { + email = "git@f-t.me"; + github = "f--t"; + githubId = 2817965; + name = "f--t"; + }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; @@ -4874,6 +5456,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "FugiMuffi"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -4898,6 +5486,19 @@ githubId = 3036816; name = "Edgar Aroutiounian"; }; + fxttr = { + name = "Florian Büstgens"; + email = "fb@fx-ttr.de"; + github = "fxttr"; + githubId = 16306293; + }; + fzakaria = { + name = "Farid Zakaria"; + email = "farid.m.zakaria@gmail.com"; + matrix = "@fzakaria:matrix.org"; + github = "fzakaria"; + githubId = 605070; + }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; @@ -4910,6 +5511,12 @@ githubId = 1313787; name = "Gabriel Gonzalez"; }; + GabrielDougherty = { + email = "contact@gabrieldougherty.com"; + github = "GabrielDougherty"; + githubId = 10541219; + name = "Gabriel Dougherty"; + }; gador = { email = "florian.brandes@posteo.de"; github = "gador"; @@ -4925,24 +5532,30 @@ githubId = 33058747; name = "Gaetan Lepage"; }; - gal_bolle = { - email = "florent.becker@ens-lyon.org"; - github = "FlorentBecker"; - githubId = 7047019; - name = "Florent Becker"; - }; galagora = { email = "lightningstrikeiv@gmail.com"; github = "Galagora"; githubId = 45048741; name = "Alwanga Oyango"; }; + gal_bolle = { + email = "florent.becker@ens-lyon.org"; + github = "FlorentBecker"; + githubId = 7047019; + name = "Florent Becker"; + }; gamb = { email = "adam.gamble@pm.me"; github = "gamb"; githubId = 293586; name = "Adam Gamble"; }; + garaiza-93 = { + email = "araizagustavo93@gmail.com"; + github = "garaiza-93"; + githubId = 57430880; + name = "Gustavo Araiza"; + }; garbas = { email = "rok@garbas.si"; github = "garbas"; @@ -4967,6 +5580,11 @@ githubId = 2430469; name = "Gavin Rogers"; }; + gaykitty = { + github = "gaykitty"; + githubId = 126119280; + name = "Kitty Pride"; + }; gazally = { email = "gazally@runbox.com"; github = "gazally"; @@ -5004,6 +5622,15 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genericnerdyusername = { + name = "GenericNerdyUsername"; + email = "genericnerdyusername@proton.me"; + github = "GenericNerdyUsername"; + githubId = 111183546; + keys = [{ + fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; + }]; + }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; @@ -5037,6 +5664,12 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + geri1701 = { + email = "geri@sdf.org"; + github = "geri1701"; + githubId = 67984144; + name = "Gerhard Schwanzer"; + }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; @@ -5056,6 +5689,15 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ggwpaiushtha = { + name = "Ivan"; + email = "ggwpaiushtha@gmail.com"; + github = "GGwpAiushtha"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; @@ -5074,6 +5716,12 @@ githubId = 15957973; name = "Jeffry Molanus"; }; + gilice = { + email = "gilice@proton.me"; + github = "gilice"; + githubId = 104317939; + name = "gilice"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -5092,12 +5740,24 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giorgiga = { + email = "giorgio.gallo@bitnic.it"; + github = "giorgiga"; + githubId = 471835; + name = "Giorgio Gallo"; + }; GKasparov = { email = "mizozahr@gmail.com"; github = "GKasparov"; githubId = 60962839; name = "Mazen Zahr"; }; + gkleen = { + name = "Gregor Kleen"; + email = "xpnfr@bouncy.email"; + github = "gkleen"; + githubId = 20089782; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; @@ -5149,6 +5809,15 @@ githubId = 643494; name = "Cillian de Róiste"; }; + GoldsteinE = { + email = "root@goldstein.rs"; + github = "GoldsteinE"; + githubId = 12019211; + name = "Maximilian Siling"; + keys = [{ + fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; + }]; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; @@ -5248,6 +5917,12 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greg = { + email = "greg.hellings@gmail.com"; + github = "greg-hellings"; + githubId = 273582; + name = "greg"; + }; greizgh = { email = "greizgh@ephax.org"; github = "greizgh"; @@ -5272,17 +5947,11 @@ github = "grindhold"; githubId = 2592640; }; - gspia = { - email = "iahogsp@gmail.com"; - github = "gspia"; - githubId = 3320792; - name = "gspia"; - }; - guibert = { - email = "david.guibert@gmail.com"; - github = "dguibert"; - githubId = 1178864; - name = "David Guibert"; + grnnja = { + email = "grnnja@gmail.com"; + github = "grnnja"; + githubId = 31556469; + name = "Prem Netsuwan"; }; groodt = { email = "groodt@gmail.com"; @@ -5290,12 +5959,6 @@ githubId = 343415; name = "Greg Roodt"; }; - grnnja = { - email = "grnnja@gmail.com"; - github = "grnnja"; - githubId = 31556469; - name = "Prem Netsuwan"; - }; gruve-p = { email = "groestlcoin@gmail.com"; github = "gruve-p"; @@ -5308,12 +5971,24 @@ githubId = 2490088; name = "Gregory Schwartz"; }; + gspia = { + email = "iahogsp@gmail.com"; + github = "gspia"; + githubId = 3320792; + name = "gspia"; + }; gtrunsec = { email = "gtrunsec@hardenedlinux.org"; github = "GTrunSec"; githubId = 21156405; name = "GuangTao Zhang"; }; + guibert = { + email = "david.guibert@gmail.com"; + github = "dguibert"; + githubId = 1178864; + name = "David Guibert"; + }; guibou = { email = "guillaum.bouchard@gmail.com"; github = "guibou"; @@ -5333,7 +6008,6 @@ name = "Guillaume Koenig"; }; guserav = { - email = "guserav@users.noreply.github.com"; github = "guserav"; githubId = 28863828; name = "guserav"; @@ -5367,6 +6041,12 @@ fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; }]; }; + hacker1024 = { + name = "hacker1024"; + email = "hacker1024@users.sourceforge.net"; + github = "hacker1024"; + githubId = 20849728; + }; hagl = { email = "harald@glie.be"; github = "hagl"; @@ -5418,6 +6098,12 @@ githubId = 231523; name = "Alok Parlikar"; }; + happy-river = { + email = "happyriver93@runbox.com"; + github = "happy-river"; + githubId = 54728477; + name = "Happy River"; + }; happysalada = { email = "raphael@megzari.com"; matrix = "@happysalada:matrix.org"; @@ -5425,12 +6111,6 @@ githubId = 5317234; name = "Raphael Megzari"; }; - happy-river = { - email = "happyriver93@runbox.com"; - github = "happy-river"; - githubId = 54728477; - name = "Happy River"; - }; hardselius = { email = "martin@hardselius.dev"; github = "hardselius"; @@ -5442,7 +6122,7 @@ }; harrisonthorne = { email = "harrisonthorne@proton.me"; - github = "harrisonthorne"; + github = "muni-corn"; githubId = 33523827; name = "Harrison Thorne"; }; @@ -5516,17 +6196,29 @@ githubId = 287769; name = "Sergii Paryzhskyi"; }; + helium = { + email = "helium.dev@tuta.io"; + github = "helium18"; + githubId = 86223025; + name = "helium"; + }; helkafen = { email = "arnaudpourseb@gmail.com"; github = "Helkafen"; githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; - helium = { - email = "helium.dev@tuta.io"; - github = "helium18"; - githubId = 86223025; - name = "helium"; + hellwolf = { + email = "zhicheng.miao@gmail.com"; + github = "hellwolf"; + githubId = 186660; + name = "Miao, ZhiCheng"; + }; + henkery = { + email = "jim@reupload.nl"; + github = "henkery"; + githubId = 1923309; + name = "Jim van Abkoude"; }; henkkalkwater = { email = "chris+nixpkgs@netsoj.nl"; @@ -5541,6 +6233,12 @@ githubId = 982322; name = "Henrik Olsson"; }; + henrirosten = { + email = "henri.rosten@unikie.com"; + github = "henrirosten"; + githubId = 49935860; + name = "Henri Rosten"; + }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; @@ -5578,6 +6276,15 @@ githubId = 41522204; name = "hexchen"; }; + heyimnova = { + email = "git@heyimnova.dev"; + github = "heyimnova"; + githubId = 115728866; + name = "Nova Witterick"; + keys = [{ + fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; + }]; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; @@ -5602,6 +6309,14 @@ github = "higebu"; githubId = 733288; }; + + hikari = { + email = "HikariNee@protonmail.com"; + github = "HikariNee"; + githubId = 72349937; + name = "Hikari"; + }; + hiljusti = { name = "J.R. Hill"; email = "hiljusti@so.dang.cool"; @@ -5614,6 +6329,7 @@ githubId = 19825977; name = "Hiren Shah"; }; + hiro98 = { email = "hiro@protagon.space"; github = "vale981"; @@ -5644,43 +6360,40 @@ github = "thbkrshw"; githubId = 33122; }; + hloeffler = { + name = "Hauke Löffler"; + email = "nix@hauke-loeffler.de"; + github = "hloeffler"; + githubId = 6627191; + }; hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; 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"; - githubId = 20039091; - name = "Hugo Reeves"; + hmenke = { + name = "Henri Menke"; + email = "henri@henrimenke.de"; + matrix = "@hmenke:matrix.org"; + github = "hmenke"; + githubId = 1903556; keys = [{ - fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; + fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; }]; }; - humancalico = { - email = "humancalico@disroot.org"; - github = "humancalico"; - githubId = 51334444; - name = "Akshat Agarwal"; - }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; githubId = 896431; name = "Chris Hodapp"; }; + holgerpeters = { + name = "Holger Peters"; + email = "holger.peters@posteo.de"; + github = "HolgerPeters"; + githubId = 4097049; + }; hollowman6 = { email = "hollowman@hollowman.ml"; github = "HollowMan6"; @@ -5705,13 +6418,6 @@ githubId = 25618740; name = "Vincent Cui"; }; - houstdav000 = { - email = "houstdav000@gmail.com"; - github = "houstdav000"; - githubId = 17628961; - matrix = "@houstdav000:gh0st.ems.host"; - name = "David Houston"; - }; hoverbear = { email = "operator+nix@hoverbear.org"; matrix = "@hoverbear:matrix.org"; @@ -5719,18 +6425,18 @@ githubId = 130903; name = "Ana Hobden"; }; - holgerpeters = { - name = "Holger Peters"; - email = "holger.peters@posteo.de"; - github = "HolgerPeters"; - githubId = 4097049; - }; hqurve = { email = "hqurve@outlook.com"; github = "hqurve"; githubId = 53281855; name = "hqurve"; }; + hraban = { + email = "hraban@0brg.net"; + github = "hraban"; + githubId = 137852; + name = "Hraban Luyat"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -5755,18 +6461,49 @@ githubId = 39689; name = "Hugo Tavares Reis"; }; + huantian = { + name = "David Li"; + email = "davidtianli@gmail.com"; + matrix = "@huantian:huantian.dev"; + github = "huantianad"; + githubId = 20760920; + keys = [{ + fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; + }]; + }; hufman = { email = "hufman@gmail.com"; github = "hufman"; githubId = 1592375; name = "Walter Huf"; }; + hughobrien = { + email = "github@hughobrien.ie"; + github = "hughobrien"; + githubId = 3400690; + name = "Hugh O'Brien"; + }; hugolgst = { email = "hugo.lageneste@pm.me"; github = "hugolgst"; githubId = 15371828; name = "Hugo Lageneste"; }; + hugoreeves = { + email = "hugo@hugoreeves.com"; + github = "HugoReeves"; + githubId = 20039091; + name = "Hugo Reeves"; + keys = [{ + fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; + }]; + }; + humancalico = { + email = "humancalico@disroot.org"; + github = "humancalico"; + githubId = 51334444; + name = "Akshat Agarwal"; + }; huyngo = { email = "huyngo@disroot.org"; github = "Huy-Ngo"; @@ -5816,7 +6553,6 @@ name = "Imran Hossain"; }; iagoq = { - email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; @@ -5870,6 +6606,11 @@ github = "icewind1991"; githubId = 1283854; }; + icyrockcom = { + github = "icyrockcom"; + githubId = 785140; + name = "icyrock"; + }; icy-thought = { name = "Icy-Thought"; email = "gilganyx@pm.me"; @@ -5877,6 +6618,12 @@ github = "Icy-Thought"; githubId = 53710398; }; + idlip = { + name = "Dilip"; + email = "igoldlip@gmail.com"; + github = "idlip"; + githubId = 117019901; + }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; @@ -5884,7 +6631,6 @@ name = "Dominic Steinitz"; }; ifurther = { - email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; @@ -5926,20 +6672,6 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; - imincik = { - email = "ivan.mincik@gmail.com"; - matrix = "@imincik:matrix.org"; - github = "imincik"; - githubId = 476346; - name = "Ivan Mincik"; - }; - not-my-segfault = { - email = "michal@tar.black"; - matrix = "@michal:tar.black"; - github = "not-my-segfault"; - githubId = 30374463; - name = "Michal S."; - }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; @@ -5994,6 +6726,13 @@ githubId = 24387926; name = "Gabriel Pereira"; }; + imincik = { + email = "ivan.mincik@gmail.com"; + matrix = "@imincik:matrix.org"; + github = "imincik"; + githubId = 476346; + name = "Ivan Mincik"; + }; imlonghao = { email = "nixos@esd.cc"; github = "imlonghao"; @@ -6029,6 +6768,24 @@ githubId = 4085046; name = "Imuli"; }; + inclyc = { + email = "i@lyc.dev"; + github = "inclyc"; + githubId = 36667224; + name = "Yingchi Long"; + }; + indeednotjames = { + email = "nix@indeednotjames.com"; + github = "IndeedNotJames"; + githubId = 55066419; + name = "Emily Lange"; + }; + indexyz = { + email = "indexyz@pm.me"; + github = "5aaee9"; + githubId = 7685264; + name = "Indexyz"; + }; ineol = { email = "leo.stefanesco@gmail.com"; github = "ineol"; @@ -6051,12 +6808,37 @@ fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; }]; }; + infinitivewitch = { + name = "Infinitive Witch"; + email = "infinitivewitch@disroot.org"; + matrix = "@infinitivewitch:fedora.im"; + github = "infinitivewitch"; + githubId = 128256833; + keys = [{ + fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; + }]; + }; ingenieroariel = { email = "ariel@nunez.co"; github = "ingenieroariel"; githubId = 54999; name = "Ariel Nunez"; }; + Intuinewin = { + email = "antoinelabarussias@gmail.com"; + github = "Intuinewin"; + githubId = 13691729; + name = "Antoine Labarussias"; + keys = [{ + fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; + }]; + }; + ionutnechita = { + email = "ionut_n2001@yahoo.com"; + github = "ionutnechita"; + githubId = 9405900; + name = "Ionut Nechita"; + }; iopq = { email = "iop_jr@yahoo.com"; github = "iopq"; @@ -6107,18 +6889,6 @@ github = "bobrik"; githubId = 89186; }; - ivan-timokhin = { - email = "nixpkgs@ivan.timokhin.name"; - name = "Ivan Timokhin"; - github = "ivan-timokhin"; - githubId = 9802104; - }; - ivan-tkatchev = { - email = "tkatchev@gmail.com"; - github = "ivan-tkatchev"; - githubId = 650601; - name = "Ivan Tkatchev"; - }; ivanbrennan = { email = "ivan.brennan@gmail.com"; github = "ivanbrennan"; @@ -6129,7 +6899,6 @@ }]; }; ivankovnatsky = { - email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -6137,6 +6906,24 @@ fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; }]; }; + ivanmoreau = { + email = "Iván Molina Rebolledo"; + github = "ivanmoreau"; + githubId = 10843250; + name = "ivan@ivmoreau.com"; + }; + ivan-timokhin = { + email = "nixpkgs@ivan.timokhin.name"; + name = "Ivan Timokhin"; + github = "ivan-timokhin"; + githubId = 9802104; + }; + ivan-tkatchev = { + email = "tkatchev@gmail.com"; + github = "ivan-tkatchev"; + githubId = 650601; + name = "Ivan Tkatchev"; + }; ivar = { email = "ivar.scholten@protonmail.com"; github = "IvarWithoutBones"; @@ -6167,11 +6954,11 @@ githubId = 26877687; name = "Yurii Izorkin"; }; - j0xaf = { - email = "j0xaf@j0xaf.de"; - name = "Jörn Gersdorf"; - github = "j0xaf"; - githubId = 932697; + j03 = { + email = "github@johannesloetzsch.de"; + github = "johannesloetzsch"; + githubId = 175537; + name = "Johannes Lötzsch"; }; j0hax = { name = "Johannes Arnold"; @@ -6185,6 +6972,12 @@ github = "j0lol"; githubId = 24716467; }; + j0xaf = { + email = "j0xaf@j0xaf.de"; + name = "Jörn Gersdorf"; + github = "j0xaf"; + githubId = 932697; + }; j4m3s = { name = "James Landrein"; email = "github@j4m3s.eu"; @@ -6197,46 +6990,6 @@ github = "jacg"; githubId = 2570854; }; - jakehamilton = { - name = "Jake Hamilton"; - email = "jake.hamilton@hey.com"; - matrix = "@jakehamilton:matrix.org"; - github = "jakehamilton"; - githubId = 7005773; - keys = [{ - fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; - }]; - }; - jasoncarr = { - email = "jcarr250@gmail.com"; - github = "jasoncarr0"; - githubId = 6874204; - name = "Jason Carr"; - }; - j-brn = { - email = "me@bricker.io"; - github = "j-brn"; - githubId = 40566146; - name = "Jonas Braun"; - }; - j-hui = { - email = "j-hui@cs.columbia.edu"; - github = "j-hui"; - githubId = 11800204; - name = "John Hui"; - }; - j-keck = { - email = "jhyphenkeck@gmail.com"; - github = "j-keck"; - githubId = 3081095; - name = "Jürgen Keck"; - }; - j03 = { - email = "github@johannesloetzsch.de"; - github = "johannesloetzsch"; - githubId = 175537; - name = "Johannes Lötzsch"; - }; jackgerrits = { email = "jack@jackgerrits.com"; github = "jackgerrits"; @@ -6249,6 +7002,16 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakehamilton = { + name = "Jake Hamilton"; + email = "jake.hamilton@hey.com"; + matrix = "@jakehamilton:matrix.org"; + github = "jakehamilton"; + githubId = 7005773; + keys = [{ + fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; + }]; + }; jakeisnt = { name = "Jacob Chvatal"; email = "jake@isnt.online"; @@ -6279,6 +7042,12 @@ githubId = 2212681; name = "Jakub Grzgorz Sokołowski"; }; + jali-clarke = { + email = "jinnah.ali-clarke@outlook.com"; + name = "Jinnah Ali-Clarke"; + github = "jali-clarke"; + githubId = 17733984; + }; jamiemagee = { email = "jamie.magee@gmail.com"; github = "JamieMagee"; @@ -6291,6 +7060,13 @@ githubId = 20176306; name = "jammerful"; }; + janik = { + name = "Janik"; + email = "janik@aq0.de"; + matrix = "@janik0:matrix.org"; + github = "Janik-Haag"; + githubId = 80165193; + }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; @@ -6303,6 +7079,18 @@ githubId = 3874017; name = "Jappie Klooster"; }; + jasoncarr = { + email = "jcarr250@gmail.com"; + github = "jasoncarr0"; + githubId = 6874204; + name = "Jason Carr"; + }; + jasonodoom = { + email = "jasonodoom@riseup.net"; + github = "jasonodoom"; + githubId = 6789916; + name = "Jason Odoom"; + }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; @@ -6311,10 +7099,16 @@ }; jayesh-bhoot = { name = "Jayesh Bhoot"; - email = "jayesh@bhoot.sh"; + email = "jb@jayeshbhoot.com"; github = "jayeshbhoot"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -6340,6 +7134,26 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jbgosselin = { + email = "gosselinjb@gmail.com"; + matrix = "@dennajort:matrix.org"; + github = "jbgosselin"; + githubId = 1536838; + name = "Jean-Baptiste Gosselin"; + }; + jboy = { + email = "jboy+nixos@bius.moe"; + githubId = 2187261; + github = "jboynyc"; + matrix = "@jboy:utwente.io"; + name = "John Boy"; + }; + j-brn = { + email = "me@bricker.io"; + github = "j-brn"; + githubId = 40566146; + name = "Jonas Braun"; + }; jc = { name = "Josh Cooper"; email = "josh@cooper.is"; @@ -6442,6 +7256,12 @@ githubId = 17029738; name = "Jean-Charles Quillet"; }; + jedsek = { + email = "jedsek@qq.com"; + github = "jedsek"; + githubId = 63626406; + name = "Jedsek"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; @@ -6478,6 +7298,12 @@ githubId = 10786794; name = "Markus Hihn"; }; + jessemoore = { + email = "jesse@jessemoore.dev"; + github = "jesseDMoore1994"; + githubId = 30251156; + name = "Jesse Moore"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; @@ -6527,6 +7353,13 @@ fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; }]; }; + jfvillablanca = { + email = "jmfv.dev@gmail.com"; + matrix = "@jfvillablanca:matrix.org"; + github = "jfvillablanca"; + githubId = 31008330; + name = "Jann Marc Villablanca"; + }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; @@ -6575,6 +7408,12 @@ githubId = 2502736; name = "James Hillyerd"; }; + j-hui = { + email = "j-hui@cs.columbia.edu"; + github = "j-hui"; + githubId = 11800204; + name = "John Hui"; + }; jiegec = { name = "Jiajie Chen"; email = "c@jia.je"; @@ -6614,10 +7453,16 @@ }; jkarlson = { email = "jekarlson@gmail.com"; - github = "jkarlson"; + github = "ethorsoe"; githubId = 1204734; name = "Emil Karlson"; }; + j-keck = { + email = "jhyphenkeck@gmail.com"; + github = "j-keck"; + githubId = 3081095; + name = "Jürgen Keck"; + }; jlamur = { email = "contact@juleslamur.fr"; github = "jlamur"; @@ -6627,6 +7472,12 @@ fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; }]; }; + jleightcap = { + email = "jack@leightcap.com"; + github = "jleightcap"; + githubId = 30168080; + name = "Jack Leightcap"; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; @@ -6685,6 +7536,12 @@ githubId = 2308444; name = "Joshua Gilman"; }; + jnsgruk = { + email = "jon@sgrs.uk"; + github = "jnsgruk"; + githubId = 668505; + name = "Jon Seager"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; @@ -6721,6 +7578,11 @@ githubId = 3967312; name = "Jocelyn Thode"; }; + joedevivo = { + github = "joedevivo"; + githubId = 55951; + name = "Joe DeVivo"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; @@ -6733,6 +7595,12 @@ githubId = 310981; name = "Joel Burget"; }; + joelkoen = { + email = "mail@joelkoen.com"; + github = "joelkoen"; + githubId = 122502655; + name = "Joel Koen"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -6746,18 +7614,18 @@ github = "joepie91"; githubId = 1663259; }; + joerdav = { + email = "joe.davidson.21111@gmail.com"; + github = "joerdav"; + name = "Joe Davidson"; + githubId = 19927761; + }; joesalisbury = { email = "salisbury.joseph@gmail.com"; github = "JosephSalisbury"; githubId = 297653; name = "Joe Salisbury"; }; - john-shaffer = { - email = "jdsha@proton.me"; - github = "john-shaffer"; - githubId = 53870456; - name = "John Shaffer"; - }; johanot = { email = "write@ownrisk.dk"; github = "johanot"; @@ -6800,6 +7668,12 @@ githubId = 6321578; name = "John Rinehart"; }; + john-shaffer = { + email = "jdsha@proton.me"; + github = "john-shaffer"; + githubId = 53870456; + name = "John Shaffer"; + }; johntitor = { email = "huyuumi.dev@gmail.com"; github = "JohnTitor"; @@ -6867,6 +7741,13 @@ githubId = 7673602; name = "Jonathan Ringer"; }; + jopejoe1 = { + email = "johannes@joens.email"; + matrix = "@jopejoe1:matrix.org"; + github = "jopejoe1"; + githubId = 34899572; + name = "Johannes Jöns"; + }; jordanisaacs = { name = "Jordan Isaacs"; email = "nix@jdisaacs.com"; @@ -6885,6 +7766,12 @@ github = "jorsn"; githubId = 4646725; }; + joshniemela = { + name = "Joshua Niemelä"; + email = "josh@jniemela.dk"; + github = "joshniemela"; + githubId = 88747315; + }; joshuafern = { name = "Joshua Fern"; email = "joshuafern@protonmail.com"; @@ -6897,6 +7784,12 @@ githubId = 15893072; name = "Josh van Leeuwen"; }; + jpagex = { + name = "Jérémy Pagé"; + email = "contact@jeremypage.me"; + github = "jpagex"; + githubId = 635768; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -7066,6 +7959,12 @@ githubId = 2469618; name = "Junji Hashimoto"; }; + jurraca = { + email = "julienu@pm.me"; + github = "jurraca"; + githubId = 5124422; + name = "Julien Urraca"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; @@ -7123,12 +8022,6 @@ githubId = 20658981; name = "Jarosław Wygoda"; }; - jyooru = { - email = "joel@joel.tokyo"; - github = "jyooru"; - githubId = 63786778; - name = "Joel"; - }; jyp = { email = "jeanphilippe.bernardy@gmail.com"; github = "jyp"; @@ -7176,6 +8069,13 @@ githubId = 87115; name = "Wael Nasreddine"; }; + kalebpace = { + email = "kaleb.pace@pm.me"; + matrix = "@kalebpace:matrix.org"; + github = "kalebpace"; + githubId = 5586615; + name = "Kaleb Pace"; + }; kalekseev = { email = "mail@kalekseev.com"; github = "kalekseev"; @@ -7239,6 +8139,19 @@ githubId = 1047859; name = "Kaz Wesley"; }; + kazenyuk = { + email = "kazenyuk@pm.me"; + github = "nvmd"; + githubId = 524492; + name = "Sergey Kazenyuk"; + }; + kbdharun = { + email = "kbdharunkrishna@gmail.com"; + matrix = "@kbdk:matrix.org"; + github = "kbdharun"; + githubId = 26346867; + name = "K.B.Dharun Krishna"; + }; kcalvinalvin = { email = "calvin@kcalvinalvin.info"; github = "kcalvinalvin"; @@ -7261,7 +8174,6 @@ name = "Claudius Holeksa"; }; ken-matsui = { - email = "nix@kmatsui.me"; github = "ken-matsui"; githubId = 26405363; name = "Ken Matsui"; @@ -7362,6 +8274,12 @@ githubId = 16481032; name = "Kiba Fox"; }; + kidanger = { + email = "angerj.dev@gmail.com"; + github = "kidanger"; + githubId = 297479; + name = "Jérémy Anger"; + }; kidd = { email = "raimonster@gmail.com"; github = "kidd"; @@ -7374,6 +8292,11 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + github = "Kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -7416,12 +8339,24 @@ githubId = 843652; name = "Kim Burgess"; }; + kindrowboat = { + email = "hello@kindrobot.ca"; + github = "kindrowboat"; + githubId = 777773; + name = "Stef Dunlap"; + }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; githubId = 691290; name = "Keshav Kini"; }; + kira-bruneau = { + email = "kira.bruneau@pm.me"; + name = "Kira Bruneau"; + github = "kira-bruneau"; + githubId = 382041; + }; kirelagin = { email = "kirelagin@gmail.com"; matrix = "@kirelagin:matrix.org"; @@ -7435,6 +8370,17 @@ githubId = 804677; name = "Kirill Kazakov"; }; + kirillrdy = { + email = "kirillrdy@gmail.com"; + github = "kirillrdy"; + githubId = 12160; + name = "Kirill Radzikhovskyy"; + }; + kiskae = { + github = "Kiskae"; + githubId = 546681; + name = "Jeroen van Leusen"; + }; kisonecat = { email = "kisonecat@gmail.com"; github = "kisonecat"; @@ -7465,6 +8411,12 @@ github = "kjeremy"; githubId = 4325700; }; + kkharji = { + name = "kkharji"; + email = "kkharji@protonmail.com"; + github = "kkharji"; + githubId = 65782666; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -7554,6 +8506,19 @@ githubId = 15692230; name = "Muhammad Herdiansyah"; }; + konradmalik = { + email = "konrad.malik@gmail.com"; + matrix = "@konradmalik:matrix.org"; + name = "Konrad Malik"; + github = "konradmalik"; + githubId = 13033392; + }; + konst-aa = { + email = "konstantin.astafurov@gmail.com"; + github = "konst-aa"; + githubId = 40547702; + name = "Konstantin Astafurov"; + }; koozz = { email = "koozz@linux.com"; github = "koozz"; @@ -7614,6 +8579,12 @@ githubId = 735008; name = "Louis Taylor"; }; + kranurag7 = { + email = "contact.anurag7@gmail.com"; + github = "kranurag7"; + githubId = 81210977; + name = "Anurag"; + }; kranzes = { email = "personal@ilanjoselevich.com"; github = "Kranzes"; @@ -7626,6 +8597,18 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; + kristian-brucaj = { + email = "kbrucaj@gmail.com"; + github = "Flameslice"; + githubId = 8893110; + name = "Kristian Brucaj"; + }; + kristoff3r = { + email = "k.soeholm@gmail.com"; + github = "kristoff3r"; + githubId = 160317; + name = "Kristoffer Søholm"; + }; kritnich = { email = "kritnich@kritni.ch"; github = "Kritnich"; @@ -7638,17 +8621,11 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; - kristian-brucaj = { - email = "kbrucaj@gmail.com"; - github = "Kristian-Brucaj"; - githubId = 8893110; - name = "Kristian Brucaj"; - }; - kristoff3r = { - email = "k.soeholm@gmail.com"; - github = "kristoff3r"; - githubId = 160317; - name = "Kristoffer Søholm"; + krostar = { + email = "alexis.destrez@pm.me"; + github = "krostar"; + githubId = 5759930; + name = "Alexis Destrez"; }; ktf = { email = "giulio.eulisse@cern.ch"; @@ -7680,6 +8657,12 @@ githubId = 2943605; name = "Evgeny Kurnevsky"; }; + kuwii = { + name = "kuwii"; + email = "kuwii.someone@gmail.com"; + github = "kuwii"; + githubId = 10705175; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; @@ -7692,6 +8675,12 @@ githubId = 2422454; name = "Kai Wohlfahrt"; }; + kylehendricks = { + name = "Kyle Hendricks"; + email = "kyle-github@mail.hendricks.nu"; + github = "kylehendricks"; + githubId = 981958; + }; kyleondy = { email = "kyle@ondy.org"; github = "KyleOndy"; @@ -7712,16 +8701,6 @@ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; - l-as = { - email = "las@protonmail.ch"; - matrix = "@Las:matrix.org"; - github = "L-as"; - githubId = 22075344; - keys = [{ - fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; - }]; - name = "Las Safin"; - }; l3af = { email = "L3afMeAlon3@gmail.com"; matrix = "@L3afMe:matrix.org"; @@ -7744,12 +8723,27 @@ }]; name = "Yaroslav Bolyukin"; }; + lafrenierejm = { + email = "joseph@lafreniere.xyz"; + github = "lafrenierejm"; + githubId = 11155300; + keys = [{ + fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; + }]; + name = "Joseph LaFreniere"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + lambda-11235 = { + email = "taranlynn0@gmail.com"; + github = "lambda-11235"; + githubId = 16354815; + name = "Taran Lynn"; + }; lammermann = { email = "k.o.b.e.r@web.de"; github = "lammermann"; @@ -7762,18 +8756,22 @@ githubId = 182024; name = "Lars Rasmusson"; }; + l-as = { + email = "las@protonmail.ch"; + matrix = "@Las:matrix.org"; + github = "L-as"; + githubId = 22075344; + keys = [{ + fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; + }]; + name = "Las Safin"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; githubId = 2034420; name = "Luke Sandell"; }; - lambda-11235 = { - email = "taranlynn0@gmail.com"; - github = "lambda-11235"; - githubId = 16354815; - name = "Taran Lynn"; - }; lassulus = { email = "lassulus@gmail.com"; matrix = "@lassulus:lassul.us"; @@ -7781,6 +8779,12 @@ githubId = 621759; name = "Lassulus"; }; + laurent-f1z1 = { + email = "laurent.nixpkgs@fainsin.bzh"; + github = "Laurent2916"; + githubId = 21087104; + name = "Laurent Fainsin"; + }; layus = { email = "layus.on@gmail.com"; github = "layus"; @@ -7799,18 +8803,6 @@ githubId = 45168934; name = "Louis Blin"; }; - lucc = { - email = "lucc+nix@posteo.de"; - github = "lucc"; - githubId = 1104419; - name = "Lucas Hoffmann"; - }; - lucasew = { - email = "lucas59356@gmail.com"; - github = "lucasew"; - githubId = 15693688; - name = "Lucas Eduardo Wendt"; - }; lde = { email = "lilian.deloche@puck.fr"; github = "lde"; @@ -7872,21 +8864,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"; - github = "legendofmiracles"; - githubId = 30902201; - name = "legendofmiracles"; - keys = [{ - fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; + leifhelm = { + email = "jakob.leifhelm@gmail.com"; + github = "leifhelm"; + githubId = 31693262; + name = "Jakob Leifhelm"; + keys =[{ + fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; }]; }; leixb = { @@ -7905,6 +8889,12 @@ githubId = 567634; name = "Daniel Kuehn"; }; + lelgenio = { + email = "lelgenio@disroot.org"; + github = "lelgenio"; + githubId = 31388299; + name = "Leonardo Eugênio"; + }; leo60228 = { email = "leo@60228.dev"; matrix = "@leo60228:matrix.org"; @@ -8035,6 +9025,12 @@ githubId = 3696783; name = "Leroy Hopson"; }; + lillycham = { + email = "lillycat332@gmail.com"; + github = "lillycat332"; + githubId = 54189319; + name = "Lilly Cham"; + }; lilyball = { email = "lily@sb.org"; github = "lilyball"; @@ -8088,6 +9084,12 @@ githubId = 725613; name = "Linus Arver"; }; + lionello = { + email = "lio@lunesu.com"; + github = "lionello"; + githubId = 591860; + name = "Lionello Lunesu"; + }; livnev = { email = "lev@liv.nev.org.uk"; github = "livnev"; @@ -8097,54 +9099,11 @@ fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; }]; }; - lourkeur = { - name = "Louis Bettens"; - email = "louis@bettens.info"; - github = "lourkeur"; - githubId = 15657735; - keys = [{ - fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; - }]; - }; - lorenzleutgeb = { - email = "lorenz@leutgeb.xyz"; - github = "lorenzleutgeb"; - githubId = 542154; - name = "Lorenz Leutgeb"; - }; - luis = { - email = "luis.nixos@gmail.com"; - github = "Luis-Hebendanz"; - githubId = 22085373; - name = "Luis Hebendanz"; - }; - luizribeiro = { - email = "nixpkgs@l9o.dev"; - matrix = "@luizribeiro:matrix.org"; - name = "Luiz Ribeiro"; - github = "luizribeiro"; - githubId = 112069; - keys = [{ - fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; - }]; - }; - lunarequest = { - email = "nullarequest@vivlaid.net"; - github = "Lunarequest"; - githubId = 30698906; - name = "Luna D Dragon"; - }; - LunNova = { - email = "nixpkgs-maintainer@lunnova.dev"; - github = "LunNova"; - githubId = 782440; - name = "Luna Nova"; - }; - lionello = { - email = "lio@lunesu.com"; - github = "lionello"; - githubId = 591860; - name = "Lionello Lunesu"; + lizelive = { + email = "nixpkgs@lize.live"; + github = "lizelive"; + githubId = 40217331; + name = "LizeLive"; }; lluchs = { email = "lukas.werling@gmail.com"; @@ -8164,12 +9123,6 @@ githubId = 169170; name = "Mathias Schreck"; }; - loewenheim = { - email = "loewenheim@mailbox.org"; - github = "loewenheim"; - githubId = 7622248; - name = "Sebastian Zivota"; - }; locallycompact = { email = "dan.firth@homotopic.tech"; github = "locallycompact"; @@ -8192,18 +9145,59 @@ githubId = 918448; name = "Anthony Lodi"; }; + loewenheim = { + email = "loewenheim@mailbox.org"; + github = "loewenheim"; + githubId = 7622248; + name = "Sebastian Zivota"; + }; + logo = { + email = "logo4poop@protonmail.com"; + matrix = "@logo4poop:matrix.org"; + github = "logo4poop"; + githubId = 24994565; + name = "Isaac Silverstein"; + }; loicreynier = { email = "loic@loicreynier.fr"; github = "loicreynier"; githubId = 88983487; name = "Loïc Reynier"; }; + lom = { + email = "legendofmiracles@protonmail.com"; + matrix = "@legendofmiracles:matrix.org"; + github = "legendofmiracles"; + githubId = 30902201; + name = "legendofmiracles"; + keys = [{ + fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; + }]; + }; + longer = { + email = "michal@mieszczak.com.pl"; + name = "Michał Mieszczak"; + github = "LongerHV"; + githubId = 46924944; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; githubId = 5624721; name = "Ben Wolsieffer"; }; + lorenz = { + name = "Lorenz Brun"; + email = "lorenz@brun.one"; + github = "lorenz"; + githubId = 5228892; + }; + lorenzleutgeb = { + email = "lorenz@leutgeb.xyz"; + github = "lorenzleutgeb"; + githubId = 542154; + name = "Lorenz Leutgeb"; + }; loskutov = { email = "ignat.loskutov@gmail.com"; github = "loskutov"; @@ -8222,6 +9216,24 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; + lourkeur = { + name = "Louis Bettens"; + email = "louis@bettens.info"; + github = "lourkeur"; + githubId = 15657735; + keys = [{ + fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; + }]; + }; + loveisgrief = { + name = "LoveIsGrief"; + email = "loveisgrief@tuta.io"; + github = "LoveIsGrief"; + githubId = 2829538; + keys = [{ + fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; + }]; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; @@ -8281,6 +9293,18 @@ githubId = 59375051; name = "Lucas Ransan"; }; + lucasew = { + email = "lucas59356@gmail.com"; + github = "lucasew"; + githubId = 15693688; + name = "Lucas Eduardo Wendt"; + }; + lucc = { + email = "lucc+nix@posteo.de"; + github = "lucc"; + githubId = 1104419; + name = "Lucas Hoffmann"; + }; lucperkins = { email = "lucperkins@gmail.com"; github = "lucperkins"; @@ -8314,12 +9338,40 @@ fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; }]; }; + lugarun = { + email = "lfschmidt.me@gmail.com"; + github = "lugarun"; + githubId = 5767106; + name = "Lukas Schmidt"; + }; + luis = { + email = "luis.nixos@gmail.com"; + github = "Luis-Hebendanz"; + githubId = 22085373; + name = "Luis Hebendanz"; + }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; githubId = 79334; name = "Luis Pedro Coelho"; }; + luizirber = { + email = "nixpkgs@luizirber.org"; + github = "luizirber"; + githubId = 6642; + name = "Luiz Irber"; + }; + luizribeiro = { + email = "nixpkgs@l9o.dev"; + matrix = "@luizribeiro:matrix.org"; + name = "Luiz Ribeiro"; + github = "luizribeiro"; + githubId = 112069; + keys = [{ + fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; + }]; + }; lukeadams = { email = "luke.adams@belljar.io"; github = "lukeadams"; @@ -8357,6 +9409,12 @@ githubId = 26020062; name = "lumi"; }; + lunarequest = { + email = "nullarequest@vivlaid.net"; + github = "Lunarequest"; + githubId = 30698906; + name = "Luna D Dragon"; + }; lunik1 = { email = "ch.nixpkgs@themaw.xyz"; matrix = "@lunik1:lunik.one"; @@ -8364,12 +9422,19 @@ githubId = 13547699; name = "Corin Hoad"; keys = [{ - fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; + # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded + fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; }]; }; + LunNova = { + email = "nixpkgs-maintainer@lunnova.dev"; + github = "LunNova"; + githubId = 782440; + name = "Luna Nova"; + }; lux = { email = "lux@lux.name"; - github = "luxferresum"; + github = "luxzeitlos"; githubId = 1208273; matrix = "@lux:ontheblueplanet.com"; name = "Lux"; @@ -8386,6 +9451,13 @@ githubId = 2057309; name = "Sergey Sofeychuk"; }; + lx = { + email = "alex@adnab.me"; + github = "Alexis211"; + githubId = 101484; + matrix = "@lx:deuxfleurs.fr"; + name = "Alex Auvolat"; + }; lxea = { email = "nix@amk.ie"; github = "lxea"; @@ -8416,6 +9488,9 @@ github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; + keys = [{ + fingerprint = "62B9 9C26 F046 721E 26B0 04F6 D006 A998 C6AB FDF1"; + }]; }; ma9e = { email = "sean@lfo.team"; @@ -8429,6 +9504,15 @@ githubId = 42545625; name = "Maas Lalani"; }; + macalinao = { + email = "me@ianm.com"; + name = "Ian Macalinao"; + github = "macalinao"; + githubId = 401263; + keys = [{ + fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; + }]; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; @@ -8466,6 +9550,12 @@ githubId = 1140462; name = "magenbluten"; }; + maggesi = { + email = "marco.maggesi@gmail.com"; + github = "maggesi"; + githubId = 1809783; + name = "Marco Maggesi"; + }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; @@ -8484,6 +9574,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + mahmoudk1000 = { + email = "mahmoudk1000@gmail.com"; + github = "mahmoudk1000"; + githubId = 24735185; + name = "Mahmoud Ayman"; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; @@ -8508,24 +9604,29 @@ githubId = 115218; name = "Felix Richter"; }; + MakiseKurisu = { + github = "MakiseKurisu"; + githubId = 2321672; + name = "Makise Kurisu"; + }; + malbarbo = { + email = "malbarbo@gmail.com"; + github = "malbarbo"; + githubId = 1678126; + name = "Marco A L Barbosa"; + }; malo = { email = "mbourgon@gmail.com"; github = "malob"; githubId = 2914269; name = "Malo Bourgon"; }; - malvo = { - email = "malte@malvo.org"; + malte-v = { + email = "nixpkgs@mal.tc"; github = "malte-v"; githubId = 34393802; name = "Malte Voos"; }; - malbarbo = { - email = "malbarbo@gmail.com"; - github = "malbarbo"; - githubId = 1678126; - name = "Marco A L Barbosa"; - }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; @@ -8552,36 +9653,30 @@ githubId = 1651325; name = "maralorn"; }; - marcweber = { - email = "marco-oweber@gmx.de"; - github = "MarcWeber"; - githubId = 34086; - name = "Marc Weber"; - }; marcus7070 = { email = "marcus@geosol.com.au"; github = "marcus7070"; githubId = 50230945; name = "Marcus Boyd"; }; + marcusramberg = { + email = "marcus@means.no"; + github = "marcusramberg"; + githubId = 5526; + name = "Marcus Ramberg"; + }; + marcweber = { + email = "marco-oweber@gmx.de"; + github = "MarcWeber"; + githubId = 34086; + name = "Marc Weber"; + }; marenz = { email = "marenz@arkom.men"; github = "marenz2569"; githubId = 12773269; name = "Markus Schmidl"; }; - markus1189 = { - email = "markus1189@gmail.com"; - github = "markus1189"; - githubId = 591567; - name = "Markus Hauck"; - }; - markuskowa = { - email = "markus.kowalewski@gmail.com"; - github = "markuskowa"; - githubId = 26470037; - name = "Markus Kowalewski"; - }; mariaa144 = { email = "speechguard_intensivist@aleeas.com"; github = "mariaa144"; @@ -8600,8 +9695,25 @@ github = "marius851000"; githubId = 22586596; }; + markbeep = { + email = "mrkswrn@gmail.com"; + github = "markbeep"; + githubId = 20665331; + name = "Mark"; + }; + markus1189 = { + email = "markus1189@gmail.com"; + github = "markus1189"; + githubId = 591567; + name = "Markus Hauck"; + }; + markuskowa = { + email = "markus.kowalewski@gmail.com"; + github = "markuskowa"; + githubId = 26470037; + name = "Markus Kowalewski"; + }; marsam = { - email = "marsam@users.noreply.github.com"; github = "marsam"; githubId = 65531; name = "Mario Rodas"; @@ -8612,6 +9724,12 @@ githubId = 33522919; name = "Marshall Arruda"; }; + martfont = { + name = "Martino Fontana"; + email = "tinozzo123@tutanota.com"; + github = "SuperSamus"; + githubId = 40663462; + }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; @@ -8630,11 +9748,11 @@ githubId = 458783; name = "Martin Gammelsæter"; }; - martfont = { - name = "Martino Fontana"; - email = "tinozzo123@tutanota.com"; - github = "SuperSamus"; - githubId = 40663462; + martinramm = { + email = "martin-ramm@gmx.de"; + github = "MartinRamm"; + githubId = 31626748; + name = "Martin Ramm"; }; marzipankaiser = { email = "nixos@gaisseml.de"; @@ -8645,6 +9763,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + masaeedu = { + email = "masaeedu@gmail.com"; + github = "masaeedu"; + githubId = 3674056; + name = "Asad Saeeduddin"; + }; masipcat = { email = "jordi@masip.cat"; github = "masipcat"; @@ -8663,6 +9787,24 @@ githubId = 854770; name = "Matej Cotman"; }; + mateodd25 = { + email = "mateodd@icloud.com"; + github = "mateodd25"; + githubId = 7878181; + name = "Mateo Diaz"; + }; + math-42 = { + email = "matheus.4200@gmail.com"; + github = "Math-42"; + githubId = 43853194; + name = "Matheus Vieira"; + }; + mathiassven = { + email = "github@mathiassven.com"; + github = "MathiasSven"; + githubId = 24759037; + name = "Mathias Sven"; + }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; github = "Mathnerd314"; @@ -8681,12 +9823,6 @@ github = "matrss"; githubId = 9308656; }; - matt-snider = { - email = "matt.snider@protonmail.com"; - github = "matt-snider"; - githubId = 11810057; - name = "Matt Snider"; - }; mattchrist = { email = "nixpkgs-matt@christ.systems"; github = "mattchrist"; @@ -8699,6 +9835,27 @@ githubId = 19036; name = "Matthew Bauer"; }; + matthewcroughan = { + email = "matt@croughan.sh"; + github = "MatthewCroughan"; + githubId = 26458780; + name = "Matthew Croughan"; + }; + matthew-levan = { + email = "matthew@coeli.network"; + github = "matthew-levan"; + githubId = 91502660; + name = "Matthew LeVan"; + }; + matthewpi = { + email = "me+nix@matthewp.io"; + github = "matthewpi"; + githubId = 26559841; + name = "Matthew Penner"; + keys = [{ + fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; + }]; + }; matthiasbenaets = { email = "matthias.benaets@gmail.com"; github = "MatthiasBenaets"; @@ -8733,14 +9890,11 @@ githubId = 279868; name = "Matti Kariluoma"; }; - matthewpi = { - email = "me+nix@matthewp.io"; - github = "matthewpi"; - githubId = 26559841; - name = "Matthew Penner"; - keys = [{ - fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; - }]; + matt-snider = { + email = "matt.snider@protonmail.com"; + github = "matt-snider"; + githubId = 11810057; + name = "Matt Snider"; }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; @@ -8754,21 +9908,6 @@ githubId = 95194; name = "Mauricio Scheffer"; }; - maxhero = { - email = "contact@maxhero.dev"; - github = "themaxhero"; - githubId = 4708337; - name = "Marcelo A. de L. Santos"; - }; - max-niederman = { - email = "max@maxniederman.com"; - github = "max-niederman"; - githubId = 19580458; - name = "Max Niederman"; - keys = [{ - fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; - }]; - }; maxbrunet = { email = "max@brnt.mx"; github = "maxbrunet"; @@ -8790,24 +9929,39 @@ githubId = 35892750; name = "Maxine Aubrey"; }; - maxhille = { - email = "mh@lambdasoup.com"; - github = "maxhille"; - githubId = 693447; - name = "Max Hille"; - }; maxhbr = { email = "nixos@maxhbr.dev"; github = "maxhbr"; githubId = 1187050; name = "Maximilian Huber"; }; + maxhero = { + email = "contact@maxhero.dev"; + github = "themaxhero"; + githubId = 4708337; + name = "Marcelo A. de L. Santos"; + }; + maxhille = { + email = "mh@lambdasoup.com"; + github = "maxhille"; + githubId = 693447; + name = "Max Hille"; + }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; githubId = 1472826; name = "Max Smolin"; }; + max-niederman = { + email = "max@maxniederman.com"; + github = "max-niederman"; + githubId = 19580458; + name = "Max Niederman"; + keys = [{ + fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; + }]; + }; maxux = { email = "root@maxux.net"; github = "maxux"; @@ -8816,10 +9970,16 @@ }; maxwell-lt = { email = "maxwell.lt@live.com"; - github = "maxwell-lt"; + github = "Maxwell-lt"; githubId = 17859747; name = "Maxwell L-T"; }; + maxwilson = { + email = "nixpkgs@maxwilson.dev"; + github = "mwilsoncoding"; + githubId = 43796009; + name = "Max Wilson"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -8839,7 +9999,6 @@ name = "Mateusz Mazur"; }; mbaeten = { - email = "mbaeten@users.noreply.github.com"; github = "mbaeten"; githubId = 2649304; name = "M. Baeten"; @@ -8946,6 +10105,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdr = { + email = "MattRussellUK@gmail.com"; + github = "mdr"; + githubId = 241257; + name = "Matt Russell"; + }; meain = { email = "mail@meain.io"; matrix = "@meain:matrix.org"; @@ -8983,11 +10148,11 @@ githubId = 365721; name = "Francois Truphemus"; }; - melsigl = { - email = "melanie.bianca.sigl@gmail.com"; - github = "melsigl"; - githubId = 15093162; - name = "Melanie B. Sigl"; + melias122 = { + name = "Martin Elias"; + email = "martin+nixpkgs@elias.sx"; + github = "melias122"; + githubId = 1027766; }; melkor333 = { email = "samuel@ton-kunst.ch"; @@ -8995,11 +10160,17 @@ githubId = 6412377; name = "Samuel Ruprecht"; }; - kira-bruneau = { - email = "kira.bruneau@pm.me"; - name = "Kira Bruneau"; - github = "kira-bruneau"; - githubId = 382041; + melling = { + email = "mattmelling@fastmail.com"; + github = "mattmelling"; + githubId = 1215331; + name = "Matt Melling"; + }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + githubId = 15093162; + name = "Melanie B. Sigl"; }; mephistophiles = { email = "mussitantesmortem@gmail.com"; @@ -9051,25 +10222,23 @@ name = "Maximilian Güntner"; }; mh = { - email = "68288772+markus-heinrich@users.noreply.github.com"; github = "markus-heinrich"; githubId = 68288772; name = "Markus Heinrich"; }; - mhaselsteiner = { - email = "magdalena.haselsteiner@gmx.at"; - github = "mhaselsteiner"; - githubId = 20536514; - name = "Magdalena Haselsteiner"; - }; mh182 = { email = "mh182@chello.at"; github = "mh182"; githubId = 9980864; name = "Max Hofer"; }; + mhaselsteiner = { + email = "magdalena.haselsteiner@gmx.at"; + github = "mhaselsteiner"; + githubId = 20536514; + name = "Magdalena Haselsteiner"; + }; miangraham = { - email = "miangraham@users.noreply.github.com"; github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; @@ -9094,6 +10263,27 @@ githubId = 1575834; name = "Michael Adler"; }; + michaelBelsanti = { + email = "mbels03@protonmail.com"; + name = "Mike Belsanti"; + github = "michaelBelsanti"; + githubId = 62124625; + }; + michaelgrahamevans = { + email = "michaelgrahamevans@gmail.com"; + name = "Michael Evans"; + github = "michaelgrahamevans"; + githubId = 5932424; + }; + michaelpachec0 = { + email = "michaelpacheco@protonmail.com"; + name = "Michael Pacheco"; + github = "MichaelPachec0"; + githubId = 48970112; + keys = [ { + fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; + }]; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; @@ -9158,18 +10348,18 @@ githubId = 978196; name = "Michaël Faille"; }; - mikoim = { - email = "ek@esh.ink"; - github = "mikoim"; - githubId = 3958340; - name = "Eshin Kunishima"; - }; mikesperber = { email = "sperber@deinprogramm.de"; github = "mikesperber"; githubId = 1387206; name = "Mike Sperber"; }; + mikoim = { + email = "ek@esh.ink"; + github = "mikoim"; + githubId = 3958340; + name = "Eshin Kunishima"; + }; mikroskeem = { email = "mikroskeem@mikroskeem.eu"; github = "mikroskeem"; @@ -9209,6 +10399,12 @@ githubId = 5378535; name = "Milo Gertjejansen"; }; + milran = { + email = "milranmike@protonmail.com"; + github = "milran"; + githubId = 93639059; + name = "Milran Mike"; + }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; @@ -9240,6 +10436,12 @@ fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; }]; }; + minizilla = { + email = "m.billyzaelani@gmail.com"; + github = "minizilla"; + githubId = 20436235; + name = "Billy Zaelani Malik"; + }; mir06 = { email = "armin.leuprecht@uni-graz.at"; github = "mir06"; @@ -9258,6 +10460,12 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mislavzanic = { + email = "mislavzanic3@gmail.com"; + github = "mislavzanic"; + githubId = 48838244; + name = "Mislav Zanic"; + }; misterio77 = { email = "eu@misterio.me"; github = "Misterio77"; @@ -9268,6 +10476,12 @@ fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; }]; }; + misuzu = { + email = "bakalolka@gmail.com"; + github = "misuzu"; + githubId = 248143; + name = "misuzu"; + }; mitchmindtree = { email = "mail@mitchellnordine.com"; github = "mitchmindtree"; @@ -9332,6 +10546,12 @@ fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; }]; }; + mlatus = { + email = "wqseleven@gmail.com"; + github = "Ninlives"; + githubId = 17873203; + name = "mlatus"; + }; mlieberman85 = { email = "mlieberman85@gmail.com"; github = "mlieberman85"; @@ -9340,7 +10560,6 @@ }; mlvzk = { name = "mlvzk"; - email = "mlvzk@users.noreply.github.com"; github = "mlvzk"; githubId = 44906333; }; @@ -9357,7 +10576,6 @@ name = "Henri Bourcereau"; }; mmesch = { - email = "mmesch@noreply.github.com"; github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; @@ -9418,7 +10636,7 @@ name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; matrix = "@mon:tchncs.de"; - github = "MonAaraj"; + github = "ribosomerocker"; githubId = 46468162; }; monsieurp = { @@ -9433,6 +10651,15 @@ githubId = 249317; name = "montag451"; }; + montchr = { + name = "Chris Montgomery"; + email = "chris@cdom.io"; + github = "montchr"; + githubId = 1757914; + keys = [{ + fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; + }]; + }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; @@ -9508,18 +10735,30 @@ githubId = 2072185; name = "Marc Scholten"; }; - mtrsk = { - email = "marcos.schonfinkel@protonmail.com"; - github = "mtrsk"; - githubId = 16356569; - name = "Marcos Benevides"; - }; mredaelli = { email = "massimo@typish.io"; github = "mredaelli"; githubId = 3073833; name = "Massimo Redaelli"; }; + mrene = { + email = "mathieu.rene@gmail.com"; + github = "mrene"; + githubId = 254443; + name = "Mathieu Rene"; + }; + mrfreezeex = { + email = "arthur@cri.epita.fr"; + github = "MrFreezeex"; + name = "Arthur Outhenin-Chalandre"; + githubId = 3845213; + }; + mrityunjaygr8 = { + email = "mrityunjaysaxena1996@gmail.com"; + github = "mrityunjaygr8"; + name = "Mrityunjay Saxena"; + githubId = 14573967; + }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -9571,6 +10810,12 @@ githubId = 133448; name = "Mikołaj Siedlarek"; }; + mslingsby = { + email = "morten.slingsby@eviny.no"; + github = "MortenSlingsby"; + githubId = 111859550; + name = "Morten Slingsby"; + }; msm = { email = "msm@tailcall.net"; github = "msm-code"; @@ -9631,6 +10876,12 @@ githubId = 39034; name = "Max Treskin"; }; + mtrsk = { + email = "marcos.schonfinkel@protonmail.com"; + github = "mtrsk"; + githubId = 16356569; + name = "Marcos Benevides"; + }; mudri = { email = "lamudri@gmail.com"; github = "laMudri"; @@ -9649,11 +10900,15 @@ githubId = 5047140; name = "Victor Collod"; }; - muscaln = { - email = "muscaln@protonmail.com"; - github = "muscaln"; - githubId = 96225281; - name = "Mustafa Çalışkan"; + munksgaard = { + name = "Philip Munksgaard"; + email = "philip@munksgaard.me"; + github = "Munksgaard"; + githubId = 230613; + matrix = "@philip:matrix.munksgaard.me"; + keys = [{ + fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; + }]; }; mupdt = { email = "nix@pdtpartners.com"; @@ -9661,6 +10916,12 @@ githubId = 25388474; name = "Matej Urbas"; }; + muscaln = { + email = "muscaln@protonmail.com"; + github = "muscaln"; + githubId = 96225281; + name = "Mustafa Çalışkan"; + }; mvisonneau = { name = "Maxime VISONNEAU"; email = "maxime@visonneau.fr"; @@ -9684,24 +10945,29 @@ githubId = 772914; name = "Mikael Voss"; }; + mwdomino = { + email = "matt@dominey.io"; + github = "mwdomino"; + githubId = 46284538; + name = "Matt Dominey"; + }; mwolfe = { email = "corp@m0rg.dev"; github = "m0rg-dev"; githubId = 38578268; name = "Morgan Wolfe"; }; - maxwilson = { - email = "nixpkgs@maxwilson.dev"; - github = "mwilsoncoding"; - githubId = 43796009; - name = "Max Wilson"; - }; myaats = { email = "mats@mats.sh"; github = "Myaats"; githubId = 6295090; name = "Mats"; }; + mynacol = { + github = "Mynacol"; + githubId = 26695166; + name = "Paul Prechtel"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; @@ -9720,6 +10986,12 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; nagy = { email = "danielnagy@posteo.de"; github = "nagy"; @@ -9742,7 +11014,6 @@ name = "Roman Naumann"; }; naphta = { - email = "naphta@noreply.github.com"; github = "naphta"; githubId = 6709831; name = "Jake Hill"; @@ -9756,11 +11027,10 @@ fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; }]; }; - nathanruiz = { - email = "nathanruiz@protonmail.com"; - github = "nathanruiz"; - githubId = 18604892; - name = "Nathan Ruiz"; + nat-418 = { + github = "nat-418"; + githubId = 93013864; + name = "nat-418"; }; nathan-gs = { email = "nathan@nathan.gs"; @@ -9768,8 +11038,13 @@ githubId = 330943; name = "Nathan Bijnens"; }; + nathanruiz = { + email = "nathanruiz@protonmail.com"; + github = "nathanruiz"; + githubId = 18604892; + name = "Nathan Ruiz"; + }; nathyong = { - email = "nathyong@noreply.github.com"; github = "nathyong"; githubId = 818502; name = "Nathan Yong"; @@ -9791,7 +11066,6 @@ }; nazarewk = { name = "Krzysztof Nazarewski"; - email = "3494992+nazarewk@users.noreply.github.com"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -9800,7 +11074,6 @@ }]; }; nbr = { - email = "nbr@users.noreply.github.com"; github = "nbr"; githubId = 3819225; name = "Nick Braga"; @@ -9833,6 +11106,18 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + ne9z = { + email = "yuchen@apvc.uk"; + github = "ne9z"; + githubId = 77314501; + name = "Maurice Zhou"; + }; + nebulka = { + email = "arapun@proton.me"; + github = "nebulka1"; + githubId = 121920704; + name = "Nebulka"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -9840,18 +11125,18 @@ matrix = "@n3t:matrix.org"; name = "Adrian Sadłocha"; }; - neeasade = { - email = "nathanisom27@gmail.com"; - github = "neeasade"; - githubId = 3747396; - name = "Nathan Isom"; - }; necrophcodr = { email = "nc@scalehost.eu"; github = "necrophcodr"; githubId = 575887; name = "Steffen Rytter Postas"; }; + neeasade = { + email = "nathanisom27@gmail.com"; + github = "neeasade"; + githubId = 3747396; + name = "Nathan Isom"; + }; neilmayhew = { email = "nix@neil.mayhew.name"; github = "neilmayhew"; @@ -9907,12 +11192,6 @@ github = "nessdoor"; githubId = 25993494; }; - net-mist = { - email = "archimist.linux@gmail.com"; - github = "Net-Mist"; - githubId = 13920346; - name = "Sébastien Iooss"; - }; netali = { name = "Jennifer Graul"; email = "me@netali.de"; @@ -9928,12 +11207,28 @@ githubId = 34162313; name = "Jason Wing"; }; + netfox = { + name = "netfox"; + email = "say-hi@netfox.rip"; + matrix = "@netfox:catgirl.cloud"; + github = "0xnetfox"; + githubId = 97521402; + keys = [{ + fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; + }]; + }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; githubId = 1488603; name = "François Espinet"; }; + net-mist = { + email = "archimist.linux@gmail.com"; + github = "Net-Mist"; + githubId = 13920346; + name = "Sébastien Iooss"; + }; neverbehave = { email = "i@never.pet"; github = "NeverBehave"; @@ -9946,17 +11241,11 @@ githubId = 7845120; name = "Alex Martens"; }; - nialov = { - email = "nikolasovaskainen@gmail.com"; - github = "nialov"; - githubId = 47318483; - name = "Nikolas Ovaskainen"; - }; - nikitavoloboev = { - email = "nikita.voloboev@gmail.com"; - github = "nikitavoloboev"; - githubId = 6391776; - name = "Nikita Voloboev"; + ngerstle = { + name = "Nicholas Gerstle"; + email = "ngerstle@gmail.com"; + github = "ngerstle"; + githubId = 1023752; }; ngiger = { email = "niklaus.giger@member.fsf.org"; @@ -9977,6 +11266,12 @@ githubId = 10180857; name = "Anmol Sethi"; }; + nialov = { + email = "nikolasovaskainen@gmail.com"; + github = "nialov"; + githubId = 47318483; + name = "Nikolas Ovaskainen"; + }; nicbk = { email = "nicolas@nicbk.com"; github = "nicbk"; @@ -9986,18 +11281,17 @@ fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; }]; }; - nichtsfrei = { - email = "philipp.eder@posteo.net"; - github = "nichtsfrei"; - githubId = 1665818; - name = "Philipp Eder"; - }; nickcao = { name = "Nick Cao"; email = "nickcao@nichi.co"; github = "NickCao"; githubId = 15247171; }; + nickgerace = { + name = "Nick Gerace"; + github = "nickgerace"; + githubId = 39320683; + }; nickhu = { email = "me@nickhu.co.uk"; github = "NickHu"; @@ -10016,6 +11310,15 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nicoo = { + email = "nicoo@debian.org"; + github = "nbraud"; + githubId = 1155801; + name = "nicoo"; + keys = [{ + fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; + }]; + }; nidabdella = { name = "Mohamed Nidabdella"; email = "nidabdella.mohamed@gmail.com"; @@ -10031,30 +11334,48 @@ fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; }]; }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; + nikitavoloboev = { + email = "nikita.voloboev@gmail.com"; + github = "nikitavoloboev"; + githubId = 6391776; + name = "Nikita Voloboev"; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; githubId = 4368690; name = "Ratko Mladic"; }; + nikstur = { + email = "nikstur@outlook.com"; + name = "nikstur"; + github = "nikstur"; + githubId = 61635709; + }; nilp0inter = { email = "robertomartinezp@gmail.com"; github = "nilp0inter"; githubId = 1224006; name = "Roberto Abdelkader Martínez Pérez"; }; - nilsirl = { - email = "nils@nilsand.re"; - github = "NilsIrl"; - githubId = 26231126; - name = "Nils ANDRÉ-CHANG"; - }; nils-degroot = { email = "nils@peeko.nl"; github = "nils-degroot"; githubId = 53556985; name = "Nils de Groot"; }; + nilsirl = { + email = "nils@nilsand.re"; + github = "NilsIrl"; + githubId = 26231126; + name = "Nils ANDRÉ-CHANG"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; matrix = "@ninjatrappeur:matrix.org"; @@ -10062,14 +11383,17 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; - ninjin = { - email = "pontus@stenetorp.se"; - github = "ninjin"; - githubId = 354934; - name = "Pontus Stenetorp"; - keys = [{ - fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; - }]; + nintron = { + email = "nintron@sent.com"; + github = "Nintron27"; + githubId = 47835714; + name = "Nintron"; + }; + niols = { + email = "niols@niols.fr"; + github = "niols"; + githubId = 5920602; + name = "Nicolas Jeannerod"; }; nioncode = { email = "nioncode+github@gmail.com"; @@ -10077,27 +11401,11 @@ githubId = 3159451; name = "Nicolas Schneider"; }; - nkje = { - name = "Niels Kristian Lyshøj Jensen"; - email = "n@nk.je"; - github = "NKJe"; - githubId = 1102306; - keys = [{ - fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; - }]; - }; nitsky = { name = "nitsky"; - email = "492793+nitsky@users.noreply.github.com"; github = "nitsky"; githubId = 492793; }; - nkpvk = { - email = "niko.pavlinek@gmail.com"; - github = "npavlinek"; - githubId = 16385648; - name = "Niko Pavlinek"; - }; nixbitcoin = { email = "nixbitcoin@i2pmail.org"; github = "nixbitcoin"; @@ -10126,6 +11434,21 @@ githubId = 7347290; name = "Nisala Kalupahana"; }; + nkje = { + name = "Niels Kristian Lyshøj Jensen"; + email = "n@nk.je"; + github = "NKJe"; + githubId = 1102306; + keys = [{ + fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; + }]; + }; + nkpvk = { + email = "niko.pavlinek@gmail.com"; + github = "npavlinek"; + githubId = 16385648; + name = "Niko Pavlinek"; + }; nloomans = { email = "noah@nixos.noahloomans.com"; github = "nloomans"; @@ -10193,12 +11516,40 @@ githubId = 3521180; name = "Tom Sydney Kerckhove"; }; + NotAShelf = { + name = "NotAShelf"; + email = "itsashelf@gmail.com"; + github = "NotAShelf"; + githubId = 62766066; + }; + notbandali = { + name = "Amin Bandali"; + email = "bandali@gnu.org"; + github = "bandali0"; + githubId = 1254858; + keys = [{ + fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; + }]; + }; + not-my-segfault = { + email = "michal@tar.black"; + matrix = "@michal:tar.black"; + github = "not-my-segfault"; + githubId = 30374463; + name = "Michal S."; + }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "NOTtheMessiah"; githubId = 2946283; name = "Brian Cohen"; }; + novenary = { + email = "streetwalkermc@gmail.com"; + github = "9ary"; + githubId = 1155030; + name = "novenary"; + }; novoxd = { email = "radnovox@gmail.com"; github = "novoxd"; @@ -10211,6 +11562,12 @@ githubId = 5548; name = "Nicolas Pouillard"; }; + npatsakula = { + email = "nikita.patsakula@gmail.com"; + name = "Patsakula Nikita"; + github = "npatsakula"; + githubId = 23001619; + }; nphilou = { email = "nphilou@gmail.com"; github = "nphilou"; @@ -10224,6 +11581,12 @@ githubId = 34083928; name = "Tim DeHerrera"; }; + nrhelmi = { + email = "helmiinour@gmail.com"; + github = "NRHelmi"; + githubId = 15707703; + name = "Helmi Nour"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -10248,18 +11611,18 @@ githubId = 22592293; name = "Kartik Gokte"; }; - nullx76 = { - email = "nix@xirion.net"; - github = "NULLx76"; - githubId = 1809198; - name = "Victor Roest"; - }; nullishamy = { email = "amy.codes@null.net"; name = "nullishamy"; github = "nullishamy"; githubId = 99221043; }; + nullx76 = { + email = "nix@xirion.net"; + github = "NULLx76"; + githubId = 1809198; + name = "Victor Roest"; + }; numinit = { email = "me@numin.it"; github = "numinit"; @@ -10325,12 +11688,6 @@ githubId = 61095988; name = "Brian Shu"; }; - obsidian-systems-maintenance = { - name = "Obsidian Systems Maintenance"; - email = "maintainer@obsidian.systems"; - github = "obsidian-systems-maintenance"; - githubId = 80847921; - }; obfusk = { email = "flx@obfusk.net"; matrix = "@obfusk:matrix.org"; @@ -10341,6 +11698,12 @@ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; }; + obsidian-systems-maintenance = { + name = "Obsidian Systems Maintenance"; + email = "maintainer@obsidian.systems"; + github = "obsidian-systems-maintenance"; + githubId = 80847921; + }; ocfox = { email = "i@ocfox.me"; github = "ocfox"; @@ -10350,6 +11713,15 @@ fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; }]; }; + oddlama = { + email = "oddlama@oddlama.org"; + github = "oddlama"; + githubId = 31919558; + name = "oddlama"; + keys = [{ + fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; + }]; + }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; @@ -10393,7 +11765,6 @@ name = "Ole Jørgen Brønner"; }; ollieB = { - email = "1237862+oliverbunting@users.noreply.github.com"; github = "oliverbunting"; githubId = 1237862; name = "Ollie Bunting"; @@ -10411,7 +11782,6 @@ name = "Owen Lynch"; }; omasanori = { - email = "167209+omasanori@users.noreply.github.com"; github = "omasanori"; githubId = 167209; name = "Masanori Ogino"; @@ -10428,24 +11798,30 @@ githubId = 1538622; name = "Michael Reilly"; }; + onedragon = { + name = "YiLong Liu"; + email = "18922251299@163.com"; + github = "jackyliu16"; + githubId = 50787361; + }; onixie = { email = "onixie@gmail.com"; github = "onixie"; githubId = 817073; name = "Yc. Shen"; }; - onsails = { - email = "andrey@onsails.com"; - github = "onsails"; - githubId = 107261; - name = "Andrey Kuznetsov"; - }; onny = { email = "onny@project-insanity.org"; github = "onny"; githubId = 757752; name = "Jonas Heinrich"; }; + onsails = { + email = "andrey@onsails.com"; + github = "onsails"; + githubId = 107261; + name = "Andrey Kuznetsov"; + }; onthestairs = { email = "austinplatt@gmail.com"; github = "onthestairs"; @@ -10458,18 +11834,18 @@ github = "ony"; githubId = 11265; }; - OPNA2608 = { - email = "christoph.neidahl@gmail.com"; - github = "OPNA2608"; - githubId = 23431373; - name = "Christoph Neidahl"; - }; opeik = { email = "sandro@stikic.com"; github = "opeik"; githubId = 11566773; name = "Sandro Stikić"; }; + OPNA2608 = { + email = "christoph.neidahl@gmail.com"; + github = "OPNA2608"; + githubId = 23431373; + name = "Christoph Neidahl"; + }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; @@ -10506,6 +11882,15 @@ githubId = 111265; name = "Ozan Sener"; }; + ostrolucky = { + email = "gabriel.ostrolucky@gmail.com"; + github = "ostrolucky"; + githubId = 496233; + name = "Gabriel Ostrolucký"; + keys = [{ + fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134"; + }]; + }; otavio = { email = "otavio.salvador@ossystems.com.br"; github = "otavio"; @@ -10524,6 +11909,12 @@ githubId = 108072; name = "Slawomir Gonet"; }; + ovlach = { + email = "ondrej@vlach.xyz"; + name = "Ondrej Vlach"; + github = "ovlach"; + githubId = 4405107; + }; oxalica = { email = "oxalicc@pm.me"; github = "oxalica"; @@ -10572,6 +11963,12 @@ githubId = 5948762; name = "Berk Özkütük"; }; + p3psi = { + name = "Elliot Boo"; + email = "p3psi.boo@gmail.com"; + github = "p3psi-boo"; + githubId = 43925055; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "Pablo1107"; @@ -10593,7 +11990,7 @@ }; paddygord = { email = "pgpatrickgordon@gmail.com"; - github = "paddygord"; + github = "avaunit02"; githubId = 10776658; name = "Patrick Gordon"; }; @@ -10609,6 +12006,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + pallix = { + email = "pierre.allix.work@gmail.com"; + github = "pallix"; + githubId = 676838; + name = "Pierre Allix"; + }; paluh = { email = "paluho@gmail.com"; github = "paluh"; @@ -10628,6 +12031,12 @@ githubId = 686076; name = "Vitalii Voloshyn"; }; + panda2134 = { + email = "me+nixpkgs@panda2134.site"; + github = "panda2134"; + githubId = 7239200; + name = "panda2134"; + }; pandaman = { email = "kointosudesuyo@infoseek.jp"; github = "pandaman64"; @@ -10646,13 +12055,6 @@ githubId = 71795; name = "Mica Semrick"; }; - annaaurora = { - email = "anna@annaaurora.eu"; - matrix = "@papojari:artemislena.eu"; - github = "auroraanna"; - githubId = 81317317; - name = "Anna Aurora"; - }; paraseba = { email = "paraseba@gmail.com"; github = "paraseba"; @@ -10716,11 +12118,11 @@ githubId = 15645854; name = "Brad Christensen"; }; - payas = { - email = "relekarpayas@gmail.com"; - github = "bhankas"; - githubId = 24254289; - name = "Payas Relekar"; + paveloom = { + email = "paveloom@riseup.net"; + github = "paveloom"; + githubId = 49961859; + name = "Pavel Sobolev"; }; pawelpacana = { email = "pawel.pacana@gmail.com"; @@ -10728,6 +12130,12 @@ githubId = 116740; name = "Paweł Pacana"; }; + payas = { + email = "relekarpayas@gmail.com"; + github = "bhankas"; + githubId = 24254289; + name = "Payas Relekar"; + }; pb- = { email = "pbaecher@gmail.com"; github = "pb-"; @@ -10740,6 +12148,22 @@ githubId = 26949935; name = "Pierce Bartine"; }; + pbek = { + email = "patrizio@bekerle.com"; + matrix = "@patrizio:bekerle.com"; + github = "pbek"; + githubId = 1798101; + name = "Patrizio Bekerle"; + keys = [{ + fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; + }]; + }; + pblkt = { + email = "pebblekite@gmail.com"; + github = "pblkt"; + githubId = 6498458; + name = "pebble kite"; + }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; @@ -10752,12 +12176,6 @@ githubId = 434254; name = "Pavel Borzenkov"; }; - pblkt = { - email = "pebblekite@gmail.com"; - github = "pblkt"; - githubId = 6498458; - name = "pebble kite"; - }; pbsds = { name = "Peder Bergebakken Sundt"; email = "pbsds@hotmail.com"; @@ -10776,6 +12194,24 @@ githubId = 1368952; name = "Pedro Lara Campos"; }; + peelz = { + email = "peelz.dev+nixpkgs@gmail.com"; + github = "notpeelz"; + githubId = 920910; + name = "peelz"; + }; + pelme = { + email = "andreas@pelme.se"; + github = "pelme"; + githubId = 20529; + name = "Andreas Pelme"; + }; + penalty1083 = { + email = "penalty1083@outlook.com"; + github = "penalty1083"; + githubId = 121009904; + name = "penalty1083"; + }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; @@ -10788,12 +12224,6 @@ github = "pennae"; githubId = 82953136; }; - p3psi = { - name = "Elliot Boo"; - email = "p3psi.boo@gmail.com"; - github = "p3psi-boo"; - githubId = 43925055; - }; periklis = { email = "theopompos@gmail.com"; github = "periklis"; @@ -10869,6 +12299,16 @@ fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; }]; }; + phdcybersec = { + name = "Léo Lavaur"; + email = "phdcybersec@pm.me"; + + github = "phdcybersec"; + githubId = 82591009; + keys = [{ + fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; + }]; + }; phfroidmont = { name = "Paul-Henri Froidmont"; email = "nix.contact-j9dw4d@froidmont.org"; @@ -10885,6 +12325,16 @@ githubId = 581269; name = "Philip Potter"; }; + philclifford = { + email = "philip.clifford@gmail.com"; + matrix = "@phil8o:matrix.org"; + github = "philclifford"; + githubId = 8797027; + keys = [{ + fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; + }]; + name = "Phil Clifford"; + }; phile314 = { email = "nix@314.ch"; github = "phile314"; @@ -10897,6 +12347,12 @@ githubId = 9267430; name = "Philipp Mildenberger"; }; + phip1611 = { + email = "phip1611@gmail.com"; + github = "phip1611"; + githubId = 5737016; + name = "Philipp Schuster"; + }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; @@ -10967,6 +12423,12 @@ fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; }]; }; + pinkcreeper100 = { + email = "benmoreosm@gmail.com"; + github = "pinkcreeper100"; + githubId = 35699052; + name = "Oliver Samuel Morris"; + }; pinpox = { email = "mail@pablo.tools"; github = "pinpox"; @@ -10976,6 +12438,12 @@ fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; + piperswe = { + email = "contact@piperswe.me"; + github = "piperswe"; + githubId = 1830959; + name = "Piper McCorkle"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; @@ -11136,6 +12604,12 @@ githubId = 10473184; name = "Jia Xiaodong"; }; + poelzi = { + email = "nix@poelzi.org"; + github = "poelzi"; + githubId = 66107; + name = "Daniel Poelzleithner"; + }; pogobanane = { email = "mail@peter-okelmann.de"; github = "pogobanane"; @@ -11161,17 +12635,10 @@ githubId = 51489; }; polykernel = { - email = "81340136+polykernel@users.noreply.github.com"; github = "polykernel"; githubId = 81340136; name = "polykernel"; }; - poelzi = { - email = "nix@poelzi.org"; - github = "poelzi"; - githubId = 66107; - name = "Daniel Poelzleithner"; - }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; @@ -11184,6 +12651,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + pongo1231 = { + email = "pongo1999712@gmail.com"; + github = "pongo1231"; + githubId = 4201956; + name = "pongo1231"; + }; + portothree = { + name = "Gustavo Porto"; + email = "gus@p8s.co"; + github = "portothree"; + githubId = 3718120; + }; poscat = { email = "poscat@mail.poscat.moe"; github = "poscat0x04"; @@ -11199,6 +12678,12 @@ githubId = 146413; name = "Tobias Poschwatta"; }; + PowerUser64 = { + email = "blakelysnorth@gmail.com"; + github = "PowerUser64"; + githubId = 24578572; + name = "Blake North"; + }; ppenguin = { name = "Jeroen Versteeg"; email = "hieronymusv@gmail.com"; @@ -11206,9 +12691,9 @@ githubId = 17690377; }; ppom = { - name = "Paco Pompeani"; - email = "paco@ecomail.io"; - github = "aopom"; + name = "ppom"; + email = "ppom@ecomail.fr"; + github = "ppom0"; githubId = 38916722; }; pradeepchhetri = { @@ -11261,11 +12746,15 @@ } ]; }; - prtzl = { - email = "matej.blagsic@protonmail.com"; - github = "prtzl"; - githubId = 32430344; - name = "Matej Blagsic"; + princemachiavelli = { + name = "Josh Hoffer"; + email = "jhoffer@sansorgan.es"; + matrix = "@princemachiavelli:matrix.org"; + github = "Princemachiavelli"; + githubId = 2730968; + keys = [{ + fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; + }]; }; ProducerMatt = { name = "Matthew Pherigo"; @@ -11303,6 +12792,21 @@ githubId = 4633847; name = "Ben Hamlin"; }; + prrlvr = { + email = "po@prrlvr.fr"; + github = "prrlvr"; + githubId = 33699501; + name = "Pierre-Olivier Rey"; + keys = [{ + fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307"; + }]; + }; + prtzl = { + email = "matej.blagsic@protonmail.com"; + github = "prtzl"; + githubId = 32430344; + name = "Matej Blagsic"; + }; prusnak = { email = "pavol@rusnak.io"; github = "prusnak"; @@ -11379,6 +12883,11 @@ githubId = 37715; name = "Brian McKenna"; }; + pulsation = { + name = "Philippe Sam-Long"; + github = "pulsation"; + githubId = 1838397; + }; purcell = { email = "steve@sanityinc.com"; github = "purcell"; @@ -11398,17 +12907,23 @@ githubId = 23097564; name = "Nora Widdecke"; }; + pwoelfel = { + name = "Philipp Woelfel"; + email = "philipp.woelfel@gmail.com"; + github = "PhilippWoelfel"; + githubId = 19400064; + }; pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; githubId = 4579165; name = "Danny Bautista"; }; - peelz = { - email = "peelz.dev+nixpkgs@gmail.com"; - github = "notpeelz"; - githubId = 920910; - name = "peelz"; + pyxels = { + email = "pyxels.dev@gmail.com"; + github = "Pyxels"; + githubId = 39232833; + name = "Jonas"; }; q3k = { email = "q3k@q3k.org"; @@ -11416,6 +12931,22 @@ githubId = 315234; name = "Serge Bazanski"; }; + qbit = { + name = "Aaron Bieber"; + email = "aaron@bolddaemon.com"; + github = "qbit"; + githubId = 68368; + matrix = "@qbit:tapenet.org"; + keys = [{ + fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; + }]; + }; + qjoly = { + email = "github@thoughtless.eu"; + github = "qjoly"; + githubId = 82603435; + name = "Quentin JOLY"; + }; qknight = { email = "js@lastlog.de"; github = "qknight"; @@ -11447,6 +12978,15 @@ githubId = 1024891; name = "Jens Nolte"; }; + quentin = { + email = "quentin@mit.edu"; + github = "quentinmit"; + githubId = 115761; + name = "Quentin Smith"; + keys = [{ + fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; + }]; + }; quentini = { email = "quentini@airmail.cc"; github = "QuentinI"; @@ -11458,16 +12998,11 @@ github = "alyssais"; githubId = 2768870; name = "Alyssa Ross"; + matrix = "@qyliss:fairydust.space"; keys = [{ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; - r-burns = { - email = "rtburns@protonmail.com"; - github = "r-burns"; - githubId = 52847440; - name = "Ryan Burns"; - }; r3dl3g = { email = "redleg@rothfuss-web.de"; github = "r3dl3g"; @@ -11481,11 +13016,20 @@ githubId = 131856; name = "Arnout Engelen"; }; - RaghavSood = { - email = "r@raghavsood.com"; - github = "RaghavSood"; - githubId = 903072; - name = "Raghav Sood"; + raehik = { + email = "thefirstmuffinman@gmail.com"; + github = "raehik"; + githubId = 3764592; + name = "Ben Orchard"; + }; + rafael = { + name = "Rafael"; + email = "pr9@tuta.io"; + github = "rafa-dot-el"; + githubId = 104688305; + keys = [{ + fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; + }]; }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; @@ -11493,6 +13037,24 @@ githubId = 1016742; name = "Rafael García"; }; + ragge = { + email = "r.dahlen@gmail.com"; + github = "ragnard"; + githubId = 882; + name = "Ragnar Dahlen"; + }; + RaghavSood = { + email = "r@raghavsood.com"; + github = "RaghavSood"; + githubId = 903072; + name = "Raghav Sood"; + }; + ragingpastry = { + email = "senior.crepe@gmail.com"; + github = "ragingpastry"; + githubId = 6778250; + name = "Nick Wilburn"; + }; raitobezarius = { email = "ryan@lahfa.xyz"; matrix = "@raitobezarius:matrix.org"; @@ -11500,24 +13062,17 @@ githubId = 314564; name = "Ryan Lahfa"; }; - raphaelr = { - email = "raphael-git@tapesoftware.net"; - matrix = "@raphi:tapesoftware.net"; - github = "raphaelr"; - githubId = 121178; - name = "Raphael Robatsch"; - }; - raquelgb = { - email = "raquel.garcia.bautista@gmail.com"; - github = "raquelgb"; - githubId = 1246959; - name = "Raquel García"; + rakesh4g = { + email = "rakeshgupta4u@gmail.com"; + github = "Rakesh4G"; + githubId = 50867187; + name = "Rakesh Gupta"; }; - ragge = { - email = "r.dahlen@gmail.com"; - github = "ragnard"; - githubId = 882; - name = "Ragnar Dahlen"; + ralismark = { + email = "nixpkgs@ralismark.xyz"; + github = "ralismark"; + githubId = 13449732; + name = "Temmie"; }; ralith = { email = "ben.e.saunders@gmail.com"; @@ -11532,12 +13087,32 @@ githubId = 14829269; name = "Ram Kromberg"; }; + rampoina = { + email = "rampoina@protonmail.com"; + matrix = "@rampoina:matrix.org"; + github = "Rampoina"; + githubId = 5653911; + name = "Rampoina"; + }; ranfdev = { email = "ranfdev@gmail.com"; name = "Lorenzo Miglietta"; github = "ranfdev"; githubId = 23294184; }; + raphaelr = { + email = "raphael-git@tapesoftware.net"; + matrix = "@raphi:tapesoftware.net"; + github = "raphaelr"; + githubId = 121178; + name = "Raphael Robatsch"; + }; + raquelgb = { + email = "raquel.garcia.bautista@gmail.com"; + github = "raquelgb"; + githubId = 1246959; + name = "Raquel García"; + }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; @@ -11558,7 +13133,7 @@ }; ratsclub = { email = "victor@freire.dev.br"; - github = "vtrf"; + github = "ratsclub"; githubId = 25647735; name = "Victor Freire"; }; @@ -11574,6 +13149,12 @@ githubId = 1758708; name = "Răzvan Flavius Panda"; }; + rb = { + email = "maintainers@cloudposse.com"; + github = "nitrocode"; + githubId = 7775707; + name = "RB"; + }; rb2k = { email = "nix@marc-seeger.com"; github = "rb2k"; @@ -11588,7 +13169,6 @@ }; rbreslow = { name = "Rocky Breslow"; - email = "1774125+rbreslow@users.noreply.github.com"; github = "rbreslow"; githubId = 1774125; keys = [{ @@ -11601,17 +13181,23 @@ githubId = 743058; name = "Rob Brewer"; }; + r-burns = { + email = "rtburns@protonmail.com"; + github = "r-burns"; + githubId = 52847440; + name = "Ryan Burns"; + }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; githubId = 1973389; name = "Reuben D'Netto"; }; - redbaron = { - email = "ivanov.maxim@gmail.com"; - github = "redbaron"; - githubId = 16624; - name = "Maxim Ivanov"; + realsnick = { + name = "Ido Samuelson"; + email = "ido.samuelson@gmail.com"; + github = "realsnick"; + githubId = 1440852; }; reckenrode = { name = "Randy Eckenrode"; @@ -11626,6 +13212,12 @@ } ]; }; + redbaron = { + email = "ivanov.maxim@gmail.com"; + github = "redbaron"; + githubId = 16624; + name = "Maxim Ivanov"; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -11675,7 +13267,6 @@ name = "Ricky Elrod"; }; rembo10 = { - email = "rembo10@users.noreply.github.com"; github = "rembo10"; githubId = 801525; name = "rembo10"; @@ -11686,12 +13277,6 @@ githubId = 220211; name = "Renato Garcia"; }; - rencire = { - email = "546296+rencire@users.noreply.github.com"; - github = "rencire"; - githubId = 546296; - name = "Eric Ren"; - }; renesat = { name = "Ivan Smolyakov"; email = "smol.ivan97@gmail.com"; @@ -11704,12 +13289,6 @@ githubId = 3302; name = "Renzo Carbonara"; }; - retrry = { - email = "retrry@gmail.com"; - github = "retrry"; - githubId = 500703; - name = "Tadas Barzdžius"; - }; revol-xut = { email = "revol-xut@protonmail.com"; name = "Tassilo Tanneberger"; @@ -11719,18 +13298,18 @@ fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; }]; }; - rexim = { - email = "reximkut@gmail.com"; - github = "rexim"; - githubId = 165283; - name = "Alexey Kutepov"; - }; rewine = { email = "lhongxu@outlook.com"; github = "wineee"; githubId = 22803888; name = "Lu Hongxu"; }; + rexim = { + email = "reximkut@gmail.com"; + github = "rexim"; + githubId = 165283; + name = "Alexey Kutepov"; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; @@ -11755,11 +13334,10 @@ githubId = 12279531; name = "Ricardo Guevara"; }; - rht = { - email = "rhtbot@protonmail.com"; - github = "rht"; - githubId = 395821; - name = "rht"; + rhendric = { + name = "Ryan Hendrickson"; + github = "rhendric"; + githubId = 1570964; }; rhoriguchi = { email = "ryan.horiguchi@gmail.com"; @@ -11767,6 +13345,12 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + rht = { + email = "rhtbot@protonmail.com"; + github = "rht"; + githubId = 395821; + name = "rht"; + }; rhysmdnz = { email = "rhys@memes.nz"; matrix = "@rhys:memes.nz"; @@ -11780,6 +13364,12 @@ github = "ribose-jeffreylau"; githubId = 2649467; }; + ricarch97 = { + email = "ricardo.steijn97@gmail.com"; + github = "RicArch97"; + githubId = 61013287; + name = "Ricardo Steijn"; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; @@ -11813,7 +13403,7 @@ }; rika = { email = "rika@paymentswit.ch"; - github = "NekomimiScience"; + github = "ScarletHg"; githubId = 1810487; name = "Rika"; }; @@ -11856,6 +13446,12 @@ githubId = 449990; name = "Cedric Cellier"; }; + rizary = { + email = "andika@numtide.com"; + github = "Rizary"; + githubId = 7221768; + name = "Andika Demas Riyandi"; + }; rkitover = { email = "rkitover@gmail.com"; github = "rkitover"; @@ -11868,12 +13464,6 @@ githubId = 2507744; name = "Roland Koebler"; }; - rizary = { - email = "andika@numtide.com"; - github = "Rizary"; - githubId = 7221768; - name = "Andika Demas Riyandi"; - }; rkrzr = { email = "ops+nixpkgs@channable.com"; github = "rkrzr"; @@ -11976,12 +13566,30 @@ githubId = 852967; name = "Russell O'Connor"; }; + rodrgz = { + email = "erik@rodgz.com"; + github = "rodrgz"; + githubId = 53882428; + name = "Erik Rodriguez"; + }; roelvandijk = { email = "roel@lambdacube.nl"; github = "roelvandijk"; githubId = 710906; name = "Roel van Dijk"; }; + rogarb = { + email = "rogarb@rgarbage.fr"; + github = "rogarb"; + githubId = 69053978; + name = "rogarb"; + }; + roman = { + email = "open-source@roman-gonzalez.info"; + github = "roman"; + githubId = 7335; + name = "Roman Gonzalez"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; @@ -12012,13 +13620,18 @@ }; rople380 = { name = "rople380"; - email = "55679162+rople380@users.noreply.github.com"; github = "rople380"; githubId = 55679162; keys = [{ fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; + RossComputerGuy = { + name = "Tristan Ross"; + email = "tristan.ross@midstall.com"; + github = "RossComputerGuy"; + githubId = 19699320; + }; rowanG077 = { email = "goemansrowan@gmail.com"; github = "rowanG077"; @@ -12065,6 +13678,7 @@ email = "rrbutani+nix@gmail.com"; github = "rrbutani"; githubId = 7833358; + matrix = "@rbutani:matrix.org"; keys = [{ fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; }]; @@ -12076,18 +13690,18 @@ github = "rski"; githubId = 2960312; }; - rszibele = { - email = "richard@szibele.com"; - github = "rszibele"; - githubId = 1387224; - name = "Richard Szibele"; - }; rsynnest = { email = "contact@rsynnest.com"; github = "rsynnest"; githubId = 4392850; name = "Roland Synnestvedt"; }; + rszibele = { + email = "richard@szibele.com"; + github = "rszibele"; + githubId = 1387224; + name = "Richard Szibele"; + }; rtburns-jpl = { email = "rtburns@jpl.nasa.gov"; github = "rtburns-jpl"; @@ -12100,6 +13714,29 @@ githubId = 61306; name = "Rene Treffer"; }; + ruby0b = { + github = "ruby0b"; + githubId = 106119328; + name = "ruby0b"; + }; + rubyowo = { + name = "Rei Star"; + email = "perhaps-you-know@what-is.ml"; + github = "rubyowo"; + githubId = 105302757; + }; + Ruixi-rebirth = { + name = "Ruixi-rebirth"; + email = "ruixirebirth@gmail.com"; + github = "Ruixi-rebirth"; + githubId = 75824585; + }; + rumpelsepp = { + name = "Stefan Tatschner"; + email = "stefan@rumpelsepp.org"; + github = "rumpelsepp"; + githubId = 1961699; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -12136,12 +13773,24 @@ githubId = 5236428; name = "Gaëtan André"; }; + rvnstn = { + email = "github@rvnstn.de"; + github = "rvnstn"; + githubId = 2364742; + name = "Tobias Ravenstein"; + }; rvolosatovs = { email = "rvolosatovs@riseup.net"; github = "rvolosatovs"; githubId = 12877905; name = "Roman Volosatovs"; }; + rxiao = { + email = "ben.xiao@me.com"; + github = "benxiao"; + githubId = 10908495; + name = "Ran Xiao"; + }; ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; @@ -12149,7 +13798,6 @@ name = "Ryan Artecona"; }; ryanorendorff = { - email = "12442942+ryanorendorff@users.noreply.github.com"; github = "ryanorendorff"; githubId = 12442942; name = "Ryan Orendorff"; @@ -12250,6 +13898,12 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samhug = { + email = "s@m-h.ug"; + github = "samhug"; + githubId = 171470; + name = "Sam Hug"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -12329,6 +13983,12 @@ githubId = 695473; name = "Sascha Grunert"; }; + saulecabrera = { + name = "Saúl Cabrera"; + email = "saulecabrera@gmail.com"; + github = "saulecabrera"; + githubId = 1423601; + }; sauyon = { email = "s@uyon.co"; github = "sauyon"; @@ -12341,6 +14001,12 @@ githubId = 8534888; name = "Savanni D'Gerinel"; }; + savyajha = { + email = "savya.jha@hawkradius.com"; + github = "savyajha"; + githubId = 3996019; + name = "Savyasachee Jha"; + }; sayanarijit = { email = "sayanarijit@gmail.com"; github = "sayanarijit"; @@ -12361,7 +14027,6 @@ }; sbond75 = { name = "sbond75"; - email = "43617712+sbond75@users.noreply.github.com"; github = "sbond75"; githubId = 43617712; }; @@ -12383,18 +14048,6 @@ githubId = 3958212; name = "Tom Sorlie"; }; - sioodmy = { - name = "Antoni Sokołowski"; - email = "81568712+sioodmy@users.noreply.github.com"; - github = "sioodmy"; - githubId = 81568712; - }; - siph = { - name = "Chris Dawkins"; - email = "dawkins.chris.dev@gmail.com"; - github = "siph"; - githubId = 6619112; - }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; @@ -12414,7 +14067,6 @@ name = "schneefux"; }; schnusch = { - email = "schnusch@users.noreply.github.com"; github = "schnusch"; githubId = 5104601; name = "schnusch"; @@ -12436,7 +14088,6 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - email = "34356756+Scoder12@users.noreply.github.com"; github = "Scoder12"; githubId = 34356756; }; @@ -12466,7 +14117,7 @@ github = "Scrumplex"; githubId = 11587657; keys = [{ - fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422"; + fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; }]; }; scubed2 = { @@ -12527,6 +14178,22 @@ githubId = 17243347; name = "Sebastian Sellmeier"; }; + sefidel = { + name = "sefidel"; + email = "contact@sefidel.net"; + matrix = "@sef:exotic.sh"; + github = "sefidel"; + githubId = 71049646; + keys = [{ + fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; + }]; + }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -12545,6 +14212,15 @@ githubId = 893474; name = "Stefan Wiehler"; }; + sephi = { + name = "Sylvain Fankhauser"; + email = "sephi@fhtagn.top"; + github = "sephii"; + githubId = 754333; + keys = [{ + fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; + }]; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; @@ -12569,6 +14245,12 @@ githubId = 38824235; name = "Serge Belov"; }; + serge_sans_paille = { + email = "serge.guelton@telecom-bretagne.eu"; + github = "serge-sans-paille"; + githubId = 863807; + name = "Serge Guelton"; + }; sersorrel = { email = "ash@sorrel.sh"; github = "sersorrel"; @@ -12612,7 +14294,6 @@ name = "Sebastian Graf"; }; shadaj = { - email = "shadaj@users.noreply.github.com"; github = "shadaj"; githubId = 543055; name = "Shadaj Laddad"; @@ -12638,16 +14319,9 @@ }; ShamrockLee = { name = "Shamrock Lee"; - email = "44064051+ShamrockLee@users.noreply.github.com"; github = "ShamrockLee"; githubId = 44064051; }; - shanemikel = { - email = "shanepearlman@pm.me"; - github = "shanemikel"; - githubId = 6720672; - name = "Shane Pearlman"; - }; shanesveller = { email = "shane@sveller.dev"; github = "shanesveller"; @@ -12657,11 +14331,17 @@ }]; name = "Shane Sveller"; }; - shawndellysse = { - email = "sdellysse@gmail.com"; - github = "sdellysse"; - githubId = 293035; - name = "Shawn Dellysse"; + shardy = { + email = "shardul@baral.ca"; + github = "shardulbee"; + githubId = 16765155; + name = "Shardul Baral"; + }; + sharzy = { + email = "me@sharzy.in"; + github = "SharzyL"; + githubId = 46294732; + name = "Sharzy"; }; shawn8901 = { email = "shawn8901@googlemail.com"; @@ -12669,6 +14349,12 @@ githubId = 12239057; name = "Shawn8901"; }; + shawndellysse = { + email = "sdellysse@gmail.com"; + github = "sdellysse"; + githubId = 293035; + name = "Shawn Dellysse"; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; @@ -12699,6 +14385,12 @@ githubId = 251028; name = "Shell Turner"; }; + shhht = { + name = "shhht"; + email = "stp.tjeerd@gmail.com"; + github = "shhht"; + githubId = 118352823; + }; shikanime = { name = "William Phetsinorath"; email = "deva.shikanime@protonmail.com"; @@ -12720,6 +14412,12 @@ githubId = 487050; name = "Shea Levy"; }; + shlok = { + email = "sd-nix-maintainer@quant.is"; + github = "shlok"; + githubId = 3000933; + name = "Shlok Datye"; + }; shmish111 = { email = "shmish111@gmail.com"; github = "shmish111"; @@ -12747,7 +14445,7 @@ shreerammodi = { name = "Shreeram Modi"; email = "shreerammodi10@gmail.com"; - github = "Shrimpram"; + github = "shrimpram"; githubId = 67710369; keys = [{ fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; @@ -12805,18 +14503,18 @@ github = "Simarra"; githubId = 14372987; }; - simoneruffini = { - email = "simone.ruffini@tutanota.com"; - github = "simoneruffini"; - githubId = 50401154; - name = "Simone Ruffini"; - }; simonchatts = { email = "code@chatts.net"; github = "simonchatts"; githubId = 11135311; name = "Simon Chatterjee"; }; + simoneruffini = { + email = "simone.ruffini@tutanota.com"; + github = "simoneruffini"; + githubId = 50401154; + name = "Simone Ruffini"; + }; simonkampe = { email = "simon.kampe+nix@gmail.com"; github = "simonkampe"; @@ -12829,8 +14527,18 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + sioodmy = { + name = "Antoni Sokołowski"; + github = "sioodmy"; + githubId = 81568712; + }; + siph = { + name = "Chris Dawkins"; + email = "dawkins.chris.dev@gmail.com"; + github = "siph"; + githubId = 6619112; + }; sir4ur0n = { - email = "sir4ur0n@users.noreply.github.com"; github = "sir4ur0n"; githubId = 1204125; name = "sir4ur0n"; @@ -12894,7 +14602,6 @@ name = "Sven Keidel"; }; skykanin = { - email = "skykanin@users.noreply.github.com"; github = "skykanin"; githubId = 3789764; name = "skykanin"; @@ -12912,6 +14619,15 @@ githubId = 12828415; name = "Michel Weitbrecht"; }; + slwst = { + email = "email@slw.st"; + github = "slwst"; + githubId = 11047377; + name = "slwst"; + keys = [{ + fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; + }]; + }; smakarov = { email = "setser200018@gmail.com"; github = "SeTSeR"; @@ -12952,7 +14668,7 @@ name = "Smitty van Bodegom"; email = "me@smitop.com"; matrix = "@smitop:kde.org"; - github = "Smittyvb"; + github = "syvb"; githubId = 10530973; }; sna = { @@ -12973,12 +14689,29 @@ github = "snapdgn"; githubId = 85608760; }; + snglth = { + email = "illia@ishestakov.com"; + github = "snglth"; + githubId = 8686360; + name = "Illia Shestakov"; + }; snicket2100 = { - email = "57048005+snicket2100@users.noreply.github.com"; github = "snicket2100"; githubId = 57048005; name = "snicket2100"; }; + sno2wman = { + name = "SnO2WMaN"; + email = "me@sno2wman.net"; + github = "SnO2WMaN"; + githubId = 15155608; + }; + snpschaaf = { + email = "philipe.schaaf@secunet.com"; + name = "Philippe Schaaf"; + github = "snpschaaf"; + githubId = 105843013; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -12997,6 +14730,15 @@ githubId = 2157287; name = "sohalt"; }; + 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"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -13035,6 +14777,16 @@ githubId = 6277322; name = "Wei Tang"; }; + soywod = { + name = "Clément DOUIN"; + email = "clement.douin@posteo.net"; + matrix = "@soywod:matrix.org"; + github = "soywod"; + githubId = 10437171; + keys = [{ + fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; + }]; + }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -13072,12 +14824,6 @@ githubId = 6391601; name = "Roger Mason"; }; - spwhitt = { - email = "sw@swhitt.me"; - github = "spwhitt"; - githubId = 1414088; - name = "Spencer Whitt"; - }; squalus = { email = "squalus@squalus.net"; github = "squalus"; @@ -13103,7 +14849,6 @@ name = "Sergei Khoma"; }; srgom = { - email = "srgom@users.noreply.github.com"; github = "SRGOM"; githubId = 8103619; name = "SRGOM"; @@ -13115,6 +14860,12 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srounce = { + name = "Samuel Rounce"; + email = "me@samuelrounce.co.uk"; + github = "srounce"; + githubId = 60792; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -13139,12 +14890,33 @@ githubId = 7512804; name = "Martin Langlotz"; }; + starcraft66 = { + name = "Tristan Gosselin-Hane"; + email = "starcraft66@gmail.com"; + github = "starcraft66"; + githubId = 1858154; + keys = [{ + fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; + }]; + }; stargate01 = { email = "christoph.honal@web.de"; github = "StarGate01"; githubId = 6362238; name = "Christoph Honal"; }; + star-szr = { + email = "nixpkgs@szr.fastmail.com"; + github = "star-szr"; + githubId = 327943; + name = "Scott Zhu Reeves"; + }; + stasjok = { + name = "Stanislav Asunkin"; + email = "nixpkgs@stasjok.ru"; + github = "stasjok"; + githubId = 1353637; + }; steamwalker = { email = "steamwalker@xs4all.nl"; github = "steamwalker"; @@ -13157,6 +14929,12 @@ githubId = 1699155; name = "Steve Elliott"; }; + stefanfehrenbach = { + email = "stefan.fehrenbach@gmail.com"; + github = "fehrenbach"; + githubId = 203168; + name = "Stefan Fehrenbach"; + }; stehessel = { email = "stephan@stehessel.de"; github = "stehessel"; @@ -13179,6 +14957,22 @@ githubId = 22163194; name = "Stel Abrego"; }; + stepbrobd = { + name = "StepBroBD"; + github = "StepBroBD"; + githubId = 81826728; + email = "Hi@StepBroBD.com"; + matrix = "@stepbrobd:matrix.org"; + keys = [{ + fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51"; + }]; + }; + stepech = { + name = "stepech"; + github = "stepech"; + githubId = 29132060; + matrix = "@stepech:matrix.org"; + }; stephank = { email = "nix@stephank.nl"; matrix = "@skochen:matrix.org"; @@ -13194,7 +14988,6 @@ }; stephenwithph = { name = "StephenWithPH"; - email = "StephenWithPH@users.noreply.github.com"; github = "StephenWithPH"; githubId = 2990492; }; @@ -13225,18 +15018,18 @@ githubId = 113068; name = "Stefan Siegl"; }; - steve-chavez = { - email = "stevechavezast@gmail.com"; - github = "steve-chavez"; - githubId = 1829294; - name = "Steve Chávez"; - }; stevebob = { email = "stephen@sherra.tt"; github = "gridbugs"; githubId = 417118; name = "Stephen Sherratt"; }; + steve-chavez = { + email = "stevechavezast@gmail.com"; + github = "steve-chavez"; + githubId = 1829294; + name = "Steve Chávez"; + }; steveej = { email = "mail@stefanjunker.de"; github = "steveeJ"; @@ -13262,10 +15055,12 @@ name = "Stijn DW"; }; StillerHarpo = { - email = "florianengel39@gmail.com"; + email = "engelflorian@posteo.de"; github = "StillerHarpo"; githubId = 25526706; name = "Florian Engel"; + keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }]; + matrix = "@qe7ftcyrpg:matrix.org"; }; stites = { email = "sam@stites.io"; @@ -13327,6 +15122,12 @@ githubId = 16734772; name = "Sumner Evans"; }; + suominen = { + email = "kimmo@suominen.com"; + github = "suominen"; + githubId = 1939855; + name = "Kimmo Suominen"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; @@ -13346,6 +15147,12 @@ githubId = 187109; name = "Bjarki Ágúst Guðmundsson"; }; + surfaceflinger = { + email = "nat@nekopon.pl"; + github = "surfaceflinger"; + githubId = 44725111; + name = "nat"; + }; suryasr007 = { email = "94suryateja@gmail.com"; github = "suryasr007"; @@ -13364,18 +15171,18 @@ githubId = 1040871; name = "Mathis Antony"; }; - sven-of-cord = { - email = "sven@cord.com"; - github = "sven-of-cord"; - githubId = 98333944; - name = "Sven Over"; - }; svend = { email = "svend@svends.net"; github = "svend"; githubId = 306190; name = "Svend Sorensen"; }; + sven-of-cord = { + email = "sven@cord.com"; + github = "sven-of-cord"; + githubId = 98333944; + name = "Sven Over"; + }; svrana = { email = "shaw@vranix.com"; github = "svrana"; @@ -13467,6 +15274,15 @@ githubId = 5991987; name = "Alexander Sosedkin"; }; + t4ccer = { + email = "t4ccer@gmail.com"; + github = "t4ccer"; + githubId = 64430288; + name = "Tomasz Maciosowski"; + keys = [{ + fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; + }]; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; @@ -13494,12 +15310,6 @@ githubId = 6457015; name = "Taha Gharib"; }; - tailhook = { - email = "paul@colomiets.name"; - github = "tailhook"; - githubId = 321799; - name = "Paul Colomiets"; - }; taikx4 = { email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion"; github = "taikx4"; @@ -13509,6 +15319,12 @@ fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; }]; }; + tailhook = { + email = "paul@colomiets.name"; + github = "tailhook"; + githubId = 321799; + name = "Paul Colomiets"; + }; takagiy = { email = "takagiy.4dev@gmail.com"; github = "takagiy"; @@ -13602,6 +15418,12 @@ githubId = 66133083; name = "Tomas Bravo"; }; + tchab = { + email = "dev@chabs.name"; + github = "t-chab"; + githubId = 2120966; + name = "t-chab"; + }; tchekda = { email = "contact@tchekda.fr"; github = "Tchekda"; @@ -13611,6 +15433,12 @@ }]; name = "David Tchekachev"; }; + tcheronneau = { + email = "nix@mcth.fr"; + github = "tcheronneau"; + githubId = 7914437; + name = "Thomas Cheronneau"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; @@ -13624,7 +15452,6 @@ name = "techknowlogick"; }; Technical27 = { - email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; githubId = 38222826; name = "Aamaruvi Yogamani"; @@ -13635,21 +15462,41 @@ githubId = 139251; name = "Tom Hunger"; }; + tehmatt = { + name = "tehmatt"; + email = "nix@programsareproofs.com"; + github = "tehmatt"; + githubId = 3358866; + }; tejasag = { name = "Tejas Agarwal"; email = "tejasagarwalbly@gmail.com"; github = "tejasag"; githubId = 67542663; }; + tejing = { + name = "Jeff Huffman"; + email = "tejing@tejing.com"; + matrix = "@tejing:matrix.org"; + github = "tejing1"; + githubId = 5663576; + keys = [{ fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; }]; + }; telotortium = { email = "rirelan@gmail.com"; github = "telotortium"; githubId = 1755789; name = "Robert Irelan"; }; + tennox = { + email = "tennox+nix@txlab.io"; + github = "tennox"; + githubId = 2084639; + name = "Manu"; + }; teozkr = { email = "teo@nullable.se"; - github = "teozkr"; + github = "nightkr"; githubId = 649832; name = "Teo Klestrup Röijezon"; }; @@ -13712,11 +15559,10 @@ githubId = 29044; name = "Jacek Galowicz"; }; - tg-x = { - email = "*@tg-x.net"; - github = "tg-x"; - githubId = 378734; - name = "TG ⊗ Θ"; + tfmoraes = { + name = "Thiago Franco de Moraes"; + github = "tfmoraes"; + githubId = 351108; }; tgunnoe = { email = "t@gvno.net"; @@ -13724,6 +15570,12 @@ githubId = 7254833; name = "Taylor Gunnoe"; }; + tg-x = { + email = "*@tg-x.net"; + github = "tg-x"; + githubId = 378734; + name = "TG ⊗ Θ"; + }; th0rgal = { email = "thomas.marchand@tuta.io"; github = "Th0rgal"; @@ -13758,6 +15610,13 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + the-argus = { + email = "i.mcfarlane2002@gmail.com"; + github = "the-argus"; + name = "Ian McFarlane"; + githubId = 70479099; + matrix = "@eyes1238:matrix.org"; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; @@ -13770,18 +15629,18 @@ githubId = 629710; name = "David Meister"; }; - thefloweringash = { - email = "lorne@cons.org.nz"; - github = "thefloweringash"; - githubId = 42933; - name = "Andrew Childs"; - }; thefenriswolf = { email = "stefan.rohrbacher97@gmail.com"; github = "thefenriswolf"; githubId = 8547242; name = "Stefan Rohrbacher"; }; + thefloweringash = { + email = "lorne@cons.org.nz"; + github = "thefloweringash"; + githubId = 42933; + name = "Andrew Childs"; + }; thehedgeh0g = { name = "The Hedgehog"; email = "hedgehog@mrhedgehog.xyz"; @@ -13792,6 +15651,15 @@ fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; }]; }; + thekostins = { + name = "Konstantin"; + email = "anisimovkosta19@gmail.com"; + github = "TheKostins"; + githubId = 39405421; + keys = [{ + fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2"; + }]; + }; thelegy = { email = "mail+nixos@0jb.de"; github = "thelegy"; @@ -13810,6 +15678,15 @@ githubId = 57180880; name = "Ansh Tyagi"; }; + therealr5 = { + email = "rouven@rfive.de"; + github = "therealr5"; + githubId = 72568063; + name = "Rouven Seifert"; + keys = [{ + fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; + }]; + }; therishidesai = { email = "desai.rishi1@gmail.com"; github = "therishidesai"; @@ -13857,11 +15734,17 @@ githubId = 3268082; name = "Thibaut Marty"; }; - thyol = { - name = "thyol"; - email = "thyol@pm.me"; - github = "thyol"; - githubId = 81481634; + thielema = { + name = "Henning Thielemann"; + email = "nix@henning-thielemann.de"; + github = "thielema"; + githubId = 898989; + }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; }; thmzlt = { email = "git@thomazleite.com"; @@ -13875,17 +15758,23 @@ githubId = 681004; name = "Thomas Desrosiers"; }; + thomasjm = { + email = "tom@codedown.io"; + github = "thomasjm"; + githubId = 1634990; + name = "Tom McLaughlin"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; githubId = 678511; name = "Thomas Mader"; }; - thomasjm = { - email = "tom@codedown.io"; - github = "thomasjm"; - githubId = 1634990; - name = "Tom McLaughlin"; + thornycrackers = { + email = "codyfh@gmail.com"; + github = "thornycrackers"; + githubId = 4313010; + name = "Cody Hiar"; }; thoughtpolice = { email = "aseipp@pobox.com"; @@ -13905,6 +15794,12 @@ githubId = 1391883; name = "Tom Hall"; }; + thubrecht = { + email = "tom@hubrecht.ovh"; + github = "Tom-Hubrecht"; + githubId = 26650391; + name = "Tom Hubrecht"; + }; Thunderbottom = { email = "chinmaydpai@gmail.com"; github = "Thunderbottom"; @@ -13914,12 +15809,24 @@ fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; }]; }; + thyol = { + name = "thyol"; + email = "thyol@pm.me"; + github = "thyol"; + githubId = 81481634; + }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; githubId = 1618946; name = "Tiago Castro"; }; + tie = { + name = "Ivan Trubach"; + email = "mr.trubach@icloud.com"; + github = "tie"; + githubId = 14792994; + }; tilcreator = { name = "TilCreator"; email = "contact.nixos@tc-j.de"; @@ -13928,10 +15835,11 @@ githubId = 18621411; }; tilpner = { - email = "till@hoeppner.ws"; + name = "Till Höppner"; + email = "nixpkgs@tilpner.com"; + matrix = "@tilpner:tx0.co"; github = "tilpner"; githubId = 4322055; - name = "Till Höppner"; }; timbertson = { email = "tim@gfxmonk.net"; @@ -13987,6 +15895,16 @@ githubId = 13026; name = "Jonathan Rudenberg"; }; + tjni = { + email = "43ngvg@masqt.com"; + matrix = "@tni:matrix.org"; + name = "Theodore Ni"; + github = "tjni"; + githubId = 3806110; + keys = [{ + fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; + }]; + }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; @@ -14008,6 +15926,12 @@ githubId = 1280118; name = "Tomislav Markovski"; }; + tmarkus = { + email = "tobias@markus-regensburg.de"; + github = "hesiod"; + githubId = 3159881; + name = "Tobias Markus"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -14029,7 +15953,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:matrix.org"; + matrix = "@toastal:mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -14037,18 +15961,18 @@ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; }]; }; - tobim = { - email = "nix@tobim.fastmail.fm"; - github = "tobim"; - githubId = 858790; - name = "Tobias Mayer"; - }; tobiasBora = { email = "tobias.bora.list@gmail.com"; github = "tobiasBora"; githubId = 2164118; name = "Tobias Bora"; }; + tobim = { + email = "nix@tobim.fastmail.fm"; + github = "tobim"; + githubId = 858790; + name = "Tobias Mayer"; + }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; @@ -14061,6 +15985,12 @@ githubId = 8577941; name = "Kevin Rauscher"; }; + tomaskala = { + email = "public+nixpkgs@tomaskala.com"; + github = "tomaskala"; + githubId = 7727887; + name = "Tomas Kala"; + }; tomberek = { email = "tomberek@gmail.com"; matrix = "@tomberek:matrix.org"; @@ -14080,11 +16010,12 @@ githubId = 13155277; name = "Tom Houle"; }; - tomsmeets = { - email = "tom.tsmeets@gmail.com"; - github = "TomSmeets"; - githubId = 6740669; - name = "Tom Smeets"; + tomodachi94 = { + email = "tomodachi94+nixpkgs@protonmail.com"; + matrix = "@tomodachi94:matrix.org"; + github = "tomodachi94"; + githubId = 68489118; + name = "Tomodachi94"; }; tomsiewert = { email = "tom@siewert.io"; @@ -14093,6 +16024,18 @@ githubId = 8794235; name = "Tom Siewert"; }; + tomsmeets = { + email = "tom.tsmeets@gmail.com"; + github = "TomSmeets"; + githubId = 6740669; + name = "Tom Smeets"; + }; + tonyshkurenko = { + email = "support@twingate.com"; + github = "antonshkurenko"; + githubId = 8597964; + name = "Anton Shkurenko"; + }; toonn = { email = "nixpkgs@toonn.io"; matrix = "@toonn:matrix.org"; @@ -14137,6 +16080,12 @@ githubId = 52011418; name = "Travis Davis"; }; + traxys = { + email = "quentin+dev@familleboyer.net"; + github = "traxys"; + githubId = 5623227; + name = "Quentin Boyer"; + }; TredwellGit = { email = "tredwell@tutanota.com"; github = "TredwellGit"; @@ -14215,18 +16164,30 @@ githubId = 563054; name = "Thomas Tuegel"; }; - turion = { - email = "programming@manuelbaerenz.de"; - github = "turion"; - githubId = 303489; - name = "Manuel Bärenz"; - }; tu-maurice = { email = "valentin.gehrke+nixpkgs@zom.bi"; github = "tu-maurice"; githubId = 16151097; name = "Valentin Gehrke"; }; + Tungsten842 = { + name = "Tungsten842"; + email = "886724vf@anonaddy.me"; + github = "Tungsten842"; + githubId = 24614168; + }; + turbomack = { + email = "marek.faj@gmail.com"; + github = "turboMaCk"; + githubId = 2130305; + name = "Marek Fajkus"; + }; + turion = { + email = "programming@manuelbaerenz.de"; + github = "turion"; + githubId = 303489; + name = "Manuel Bärenz"; + }; tuxinaut = { email = "trash4you@tuxinaut.de"; github = "tuxinaut"; @@ -14356,6 +16317,11 @@ github = "unrooted"; githubId = 30440603; }; + unsolvedcypher = { + name = "Matthew M"; + github = "UnsolvedCypher"; + githubId = 3170853; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -14416,10 +16382,16 @@ }; uthar = { email = "galkowskikasper@gmail.com"; - github = "uthar"; + github = "Uthar"; githubId = 15697697; name = "Kasper Gałkowski"; }; + utkarshgupta137 = { + email = "utkarshgupta137@gmail.com"; + github = "utkarshgupta137"; + githubId = 5155100; + name = "Utkarsh Gupta"; + }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; @@ -14438,6 +16410,12 @@ github = "deviant"; githubId = 68829907; }; + vaci = { + email = "vaci@vaci.org"; + github = "vaci"; + githubId = 6882568; + name = "Vaci"; + }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; matrix = "@vaibhavsagar:matrix.org"; @@ -14464,6 +16442,12 @@ githubId = 27813; name = "Vincent Breitmoser"; }; + vamega = { + email = "github@madiathv.com"; + github = "vamega"; + githubId = 223408; + name = "Varun Madiath"; + }; vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; @@ -14509,6 +16493,12 @@ githubId = 797581; name = "Vincent Bernardoff"; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; vcanadi = { email = "vito.canadi@gmail.com"; github = "vcanadi"; @@ -14532,6 +16522,12 @@ githubId = 6508; name = "Vincent Demeester"; }; + vdot0x23 = { + name = "Victor Büttner"; + email = "nix.victor@0x23.dk"; + github = "vdot0x23"; + githubId = 40716069; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; @@ -14604,24 +16600,30 @@ fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; + vinnymeller = { + email = "vinnymeller@proton.me"; + github = "vinnymeller"; + githubId = 19894025; + name = "Vinny Meller"; + }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; githubId = 118959; name = "VinyMeuh"; }; - virchau13 = { - email = "virchau13@hexular.net"; - github = "virchau13"; - githubId = 16955157; - name = "Vir Chaudhury"; - }; viraptor = { email = "nix@viraptor.info"; github = "viraptor"; githubId = 188063; name = "Stanisław Pitucha"; }; + virchau13 = { + email = "virchau13@hexular.net"; + github = "virchau13"; + githubId = 16955157; + name = "Vir Chaudhury"; + }; viric = { email = "viric@viric.name"; github = "viric"; @@ -14752,6 +16754,18 @@ fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; }]; }; + waelwindows = { + email = "waelwindows9922@gmail.com"; + github = "Waelwindows"; + githubId = 5228243; + name = "waelwindows"; + }; + waiting-for-dev = { + email = "marc@lamarciana.com"; + github = "waiting-for-dev"; + githubId = 52650; + name = "Marc Busqué"; + }; wakira = { name = "Sheng Wang"; email = "sheng@a64.work"; @@ -14785,6 +16799,12 @@ githubId = 34962284; name = "wchresta"; }; + wd15 = { + email = "daniel.wheeler2@gmail.com"; + github = "wd15"; + githubId = 1986844; + name = "Daniel Wheeler"; + }; wdavidw = { name = "David Worms"; email = "david@adaltas.com"; @@ -14807,12 +16827,6 @@ github = "wegank"; githubId = 9713184; }; - weihua = { - email = "luwh364@gmail.com"; - github = "weihua-lu"; - githubId = 9002575; - name = "Weihua Lu"; - }; welteki = { email = "welteki@pm.me"; github = "welteki"; @@ -14822,6 +16836,12 @@ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; }]; }; + wenngle = { + name = "Zeke Stephens"; + email = "zekestephens@gmail.com"; + github = "wenngle"; + githubId = 63376671; + }; wentam = { name = "Matt Egeler"; email = "wentam42@gmail.com"; @@ -14834,6 +16854,12 @@ github = "wentasah"; githubId = 140542; }; + wesleyjrz = { + email = "dev@wesleyjrz.com"; + name = "Wesley V. Santos Jr."; + github = "wesleyjrz"; + githubId = 60184588; + }; wesnel = { name = "Wesley Nelson"; email = "wgn@wesnel.dev"; @@ -14849,6 +16875,15 @@ githubId = 13031455; name = "Jakob Schmutz"; }; + WhiteBlackGoose = { + email = "wbg@angouri.org"; + github = "WhiteBlackGoose"; + githubId = 31178401; + name = "WhiteBlackGoose"; + keys = [{ + fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; + }]; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -14870,17 +16905,31 @@ fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; }]; }; + willcohen = { + github = "willcohen"; + githubId = 5185341; + name = "Will Cohen"; + }; + williamvds = { + email = "nixpkgs@williamvds.me"; + github = "williamvds"; + githubId = 26379999; + name = "William Vigolo"; + keys = [{ + fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; + }]; + }; willibutz = { email = "willibutz@posteo.de"; github = "WilliButz"; githubId = 20464732; name = "Willi Butz"; }; - willcohen = { - email = "willcohen@users.noreply.github.com"; - github = "willcohen"; - githubId = 5185341; - name = "Will Cohen"; + wilsonehusin = { + name = "Wilson E. Husin"; + email = "wilsonehusin@gmail.com"; + github = "wilsonehusin"; + githubId = 14004487; }; winpat = { email = "patrickwinter@posteo.ch"; @@ -14907,11 +16956,19 @@ name = "Alexander Krimm"; }; wishfort36 = { - email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; githubId = 42300264; name = "wishfort36"; }; + witchof0x20 = { + name = "Jade"; + email = "jade@witchof.space"; + github = "witchof0x20"; + githubId = 36118348; + keys = [{ + fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; + }]; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; @@ -14990,6 +17047,12 @@ github = "wr0belj"; githubId = 40501814; }; + wraithm = { + name = "Matthew Wraith"; + email = "wraithm@gmail.com"; + github = "wraithm"; + githubId = 1512913; + }; wrmilling = { name = "Winston R. Milling"; email = "Winston@Milli.ng"; @@ -15011,12 +17074,6 @@ githubId = 20400405; name = "Wucke"; }; - wykurz = { - email = "wykurz@gmail.com"; - github = "wykurz"; - githubId = 483465; - name = "Mateusz Wykurz"; - }; wulfsta = { email = "wulfstawulfsta@gmail.com"; github = "Wulfsta"; @@ -15029,8 +17086,19 @@ github = "wunderbrick"; githubId = 52174714; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; + wykurz = { + email = "wykurz@gmail.com"; + github = "wykurz"; + githubId = 483465; + name = "Mateusz Wykurz"; + }; wyndon = { - email = "72203260+wyndon@users.noreply.github.com"; matrix = "@wyndon:envs.net"; github = "wyndon"; githubId = 72203260; @@ -15060,6 +17128,12 @@ githubId = 11050617; name = "Dominik Xaver Hörl"; }; + xavierzwirtz = { + email = "me@xavierzwirtz.com"; + github = "xavierzwirtz"; + githubId = 474343; + name = "Xavier Zwirtz"; + }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; @@ -15068,7 +17142,6 @@ }; xdhampus = { name = "Hampus"; - email = "16954508+xdHampus@users.noreply.github.com"; github = "xdHampus"; githubId = 16954508; }; @@ -15085,12 +17158,6 @@ githubId = 36407913; name = "Uli Baum"; }; - xfnw = { - email = "xfnw+nixos@riseup.net"; - github = "xfnw"; - githubId = 66233223; - name = "Owen"; - }; xfix = { email = "konrad@borowski.pw"; matrix = "@xfix:matrix.org"; @@ -15098,6 +17165,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xfnw = { + email = "xfnw+nixos@riseup.net"; + github = "xfnw"; + githubId = 66233223; + name = "Owen"; + }; xgroleau = { email = "xgroleau@gmail.com"; github = "xgroleau"; @@ -15110,6 +17183,12 @@ githubId = 17534323; name = "Quentin Vaucher"; }; + xlambein = { + email = "xlambein@gmail.com"; + github = "xlambein"; + githubId = 5629059; + name = "Xavier Lambein"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; @@ -15123,7 +17202,6 @@ name = "Guillermo NWDD"; }; xrelkd = { - email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; githubId = 46590321; name = "xrelkd"; @@ -15141,7 +17219,6 @@ name = "Marti Serra"; }; xworld21 = { - email = "1962985+xworld21@users.noreply.github.com"; github = "xworld21"; githubId = 1962985; name = "Vincenzo Mantova"; @@ -15164,14 +17241,25 @@ githubId = 2242427; name = "Yoann Ono"; }; + yajo = { + email = "yajo.sk8@gmail.com"; + github = "yajo"; + githubId = 973709; + name = "Jairo Llopis"; + }; yana = { email = "yana@riseup.net"; github = "yanalunaterra"; githubId = 1643293; name = "Yana Timoshenko"; }; + yanganto = { + name = "Antonio Yang"; + email = "yanganto@gmail.com"; + github = "yanganto"; + githubId = 10803111; + }; yarny = { - email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; githubId = 41838844; name = "Yarny"; @@ -15189,6 +17277,15 @@ githubId = 73759599; name = "Lara A."; }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -15201,6 +17298,18 @@ githubId = 11229748; name = "Lin Yinfeng"; }; + yisuidenghua = { + email = "bileiner@gmail.com"; + name = "Milena Yisui"; + github = "YisuiDenghua"; + githubId = 102890144; + }; + yl3dy = { + email = "aleksandr.kiselyov@gmail.com"; + github = "yl3dy"; + githubId = 1311192; + name = "Alexander Kiselyov"; + }; ylecornec = { email = "yves.stan.lecornec@tweag.io"; github = "ylecornec"; @@ -15219,11 +17328,24 @@ githubId = 26011724; name = "Burim Augustin Berisa"; }; - yl3dy = { - email = "aleksandr.kiselyov@gmail.com"; - github = "yl3dy"; - githubId = 1311192; - name = "Alexander Kiselyov"; + ymarkus = { + name = "Yannick Markus"; + email = "nixpkgs@ymarkus.dev"; + github = "ymarkus"; + githubId = 62380378; + }; + ymatsiuk = { + name = "Yurii Matsiuk"; + github = "ymatsiuk"; + githubId = 24990891; + keys = [{ + fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; + }]; + }; + ymeister = { + name = "Yuri Meister"; + github = "ymeister"; + githubId = 47071325; }; yochai = { email = "yochai@titat.info"; @@ -15256,12 +17378,34 @@ github = "yrd"; githubId = 1820447; }; + yshym = { + name = "Yevhen Shymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; + githubId = 44244245; + }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; githubId = 7040031; name = "Yannik Sander"; }; + yuka = { + email = "yuka@yuka.dev"; + matrix = "@yuka:yuka.dev"; + github = "yu-re-ka"; + githubId = 86169957; + name = "Yureka"; + }; + Yumasi = { + email = "gpagnoux@gmail.com"; + github = "Yumasi"; + githubId = 24368641; + name = "Guillaume Pagnoux"; + keys = [{ + fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; + }]; + }; yureien = { email = "contact@sohamsen.me"; github = "Yureien"; @@ -15286,22 +17430,6 @@ githubId = 1866448; name = "Eric Bailey"; }; - Yumasi = { - email = "gpagnoux@gmail.com"; - github = "Yumasi"; - githubId = 24368641; - name = "Guillaume Pagnoux"; - keys = [{ - fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; - }]; - }; - yuka = { - email = "yuka@yuka.dev"; - matrix = "@yuka:yuka.dev"; - github = "yu-re-ka"; - githubId = 86169957; - name = "Yureka"; - }; yusdacra = { email = "y.bera003.06@protonmail.com"; matrix = "@yusdacra:nixos.dev"; @@ -15313,7 +17441,8 @@ }]; }; yuu = { - email = "yuuyin@protonmail.com"; + email = "yuunix@grrlz.net"; + matrix = "@yuu:matrix.org"; github = "yuuyins"; githubId = 86538850; name = "Yuu Yin"; @@ -15333,36 +17462,63 @@ githubId = 5253988; name = "yvt"; }; - maggesi = { - email = "marco.maggesi@gmail.com"; - github = "maggesi"; - githubId = 1809783; - name = "Marco Maggesi"; - }; zachcoyle = { email = "zach.coyle@gmail.com"; github = "zachcoyle"; githubId = 908716; name = "Zach Coyle"; }; + Zaechus = { + email = "zaechus@proton.me"; + github = "Zaechus"; + githubId = 19353212; + name = "Maxwell Anderson"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; githubId = 568532; name = "Christian Zagrodnick"; }; + zahrun = { + email = "zahrun@murena.io"; + github = "zahrun"; + githubId = 10415894; + name = "Zahrun"; + }; zakame = { email = "zakame@zakame.net"; github = "zakame"; githubId = 110625; name = "Zak B. Elep"; }; + zakkor = { + email = "edward.dalbon@gmail.com"; + github = "zakkor"; + githubId = 6191421; + name = "Edward d'Albon"; + }; zalakain = { email = "ping@umazalakain.info"; github = "umazalakain"; githubId = 1319905; name = "Uma Zalakain"; }; + zanculmarktum = { + name = "Azure Zanculmarktum"; + email = "zanculmarktum@gmail.com"; + github = "zanculmarktum"; + githubId = 16958511; + }; + zane = { + name = "Zane van Iperen"; + email = "zane@zanevaniperen.com"; + github = "vs49688"; + githubId = 4423262; + keys = [{ + fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; + }]; + }; zaninime = { email = "francesco@zanini.me"; github = "zaninime"; @@ -15381,19 +17537,34 @@ githubId = 250877; name = "Elmar Athmer"; }; - zakkor = { - email = "edward.dalbon@gmail.com"; - github = "zakkor"; - githubId = 6191421; - name = "Edward d'Albon"; + zbioe = { + name = "Iury Fukuda"; + email = "zbioe@protonmail.com"; + github = "zbioe"; + githubId = 7332055; }; zebreus = { matrix = "@lennart:cicen.net"; email = "lennarteichhorn+nixpkgs@gmail.com"; - github = "Zebreus"; + github = "zebreus"; githubId = 1557253; name = "Lennart Eichhorn"; }; + zendo = { + name = "zendo"; + email = "linzway@qq.com"; + github = "zendo"; + githubId = 348013; + }; + zenithal = { + name = "zenithal"; + email = "i@zenithal.me"; + github = "ZenithalHourlyRate"; + githubId = 19512674; + keys = [{ + fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; + }]; + }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; @@ -15403,6 +17574,12 @@ fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; }]; }; + zeri = { + name = "zeri"; + matrix = "@zeri:matrix.org"; + github = "zeri42"; + githubId = 68825133; + }; zfnmxt = { name = "zfnmxt"; email = "zfnmxt@zfnmxt.com"; @@ -15422,6 +17599,12 @@ githubId = 2189609; name = "Zhaofeng Li"; }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; @@ -15429,17 +17612,38 @@ name = "zimbatm"; }; Zimmi48 = { - email = "theo.zimmermann@univ-paris-diderot.fr"; + email = "theo.zimmermann@telecom-paris.fr"; github = "Zimmi48"; githubId = 1108325; name = "Théo Zimmermann"; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zohl = { email = "zohl@fmap.me"; github = "zohl"; githubId = 6067895; name = "Al Zohali"; }; + zokrezyl = { + email = "zokrezyl@gmail.com"; + github = "zokrezyl"; + githubId = 51886259; + name = "Zokre Zyl"; + }; + zombiezen = { + name = "Ross Light"; + email = "ross@zombiezen.com"; + github = "zombiezen"; + githubId = 181535; + }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; @@ -15453,7 +17657,6 @@ name = "Alexandre Macabies"; }; zowoq = { - email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; githubId = 59103226; name = "zowoq"; @@ -15464,564 +17667,62 @@ githubId = 8100652; name = "David Mell"; }; - ztzg = { - email = "dd@crosstwine.com"; - github = "ztzg"; - githubId = 393108; - name = "Damien Diederen"; - }; - zx2c4 = { - email = "Jason@zx2c4.com"; - github = "zx2c4"; - githubId = 10643; - name = "Jason A. Donenfeld"; - }; - zyansheep = { - email = "zyansheep@protonmail.com"; - github = "zyansheep"; - githubId = 20029431; - name = "Zyansheep"; - }; - zzamboni = { - email = "diego@zzamboni.org"; - github = "zzamboni"; - githubId = 32876; - name = "Diego Zamboni"; - }; - turbomack = { - email = "marek.faj@gmail.com"; - github = "turboMaCk"; - githubId = 2130305; - name = "Marek Fajkus"; - }; - melling = { - email = "mattmelling@fastmail.com"; - github = "mattmelling"; - githubId = 1215331; - name = "Matt Melling"; - }; - wd15 = { - email = "daniel.wheeler2@gmail.com"; - github = "wd15"; - githubId = 1986844; - name = "Daniel Wheeler"; - }; - misuzu = { - email = "bakalolka@gmail.com"; - github = "misuzu"; - githubId = 248143; - name = "misuzu"; - }; - zokrezyl = { - email = "zokrezyl@gmail.com"; - github = "zokrezyl"; - githubId = 51886259; - name = "Zokre Zyl"; - }; - rakesh4g = { - email = "rakeshgupta4u@gmail.com"; - github = "Rakesh4G"; - githubId = 50867187; - name = "Rakesh Gupta"; - }; - mlatus = { - email = "wqseleven@gmail.com"; - github = "Ninlives"; - githubId = 17873203; - name = "mlatus"; - }; - waiting-for-dev = { - email = "marc@lamarciana.com"; - github = "waiting-for-dev"; - githubId = 52650; - name = "Marc Busqué"; - }; - snglth = { - email = "illia@ishestakov.com"; - github = "snglth"; - githubId = 8686360; - name = "Illia Shestakov"; - }; - masaeedu = { - email = "masaeedu@gmail.com"; - github = "masaeedu"; - githubId = 3674056; - name = "Asad Saeeduddin"; - }; - matthewcroughan = { - email = "matt@croughan.sh"; - github = "MatthewCroughan"; - githubId = 26458780; - name = "Matthew Croughan"; - }; - ngerstle = { - name = "Nicholas Gerstle"; - email = "ngerstle@gmail.com"; - github = "ngerstle"; - githubId = 1023752; - }; - shardy = { - email = "shardul@baral.ca"; - github = "shardulbee"; - githubId = 16765155; - name = "Shardul Baral"; - }; - xavierzwirtz = { - email = "me@xavierzwirtz.com"; - github = "xavierzwirtz"; - githubId = 474343; - name = "Xavier Zwirtz"; - }; - ymarkus = { - name = "Yannick Markus"; - email = "nixpkgs@ymarkus.dev"; - github = "ymarkus"; - githubId = 62380378; - }; - ymatsiuk = { - name = "Yurii Matsiuk"; - email = "ymatsiuk@users.noreply.github.com"; - github = "ymatsiuk"; - githubId = 24990891; - keys = [{ - fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; - }]; - }; - ymeister = { - name = "Yuri Meister"; - email = "47071325+ymeister@users.noreply.github.com"; - github = "ymeister"; - githubId = 47071325; - }; - cpcloud = { - name = "Phillip Cloud"; - email = "417981+cpcloud@users.noreply.github.com"; - github = "cpcloud"; - githubId = 417981; - }; - davegallant = { - name = "Dave Gallant"; - email = "davegallant@gmail.com"; - github = "davegallant"; - githubId = 4519234; - }; - saulecabrera = { - name = "Saúl Cabrera"; - email = "saulecabrera@gmail.com"; - github = "saulecabrera"; - githubId = 1423601; - }; - tfmoraes = { - name = "Thiago Franco de Moraes"; - email = "351108+tfmoraes@users.noreply.github.com"; - github = "tfmoraes"; - githubId = 351108; - }; - deifactor = { - name = "Ash Zahlen"; - email = "ext0l@riseup.net"; - 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"; - matrix = "@fzakaria:matrix.org"; - github = "fzakaria"; - githubId = 605070; - }; - nagisa = { - name = "Simonas Kazlauskas"; - email = "nixpkgs@kazlauskas.me"; - github = "nagisa"; - githubId = 679122; - }; - yshym = { - name = "Yevhen Shymotiuk"; - email = "yshym@pm.me"; - github = "yshym"; - githubId = 44244245; - }; - hmenke = { - name = "Henri Menke"; - email = "henri@henrimenke.de"; - matrix = "@hmenke:matrix.org"; - github = "hmenke"; - githubId = 1903556; - keys = [{ - fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; - }]; - }; - berbiche = { - name = "Nicolas Berbiche"; - email = "nicolas@normie.dev"; - github = "berbiche"; - githubId = 20448408; - keys = [{ - fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; - }]; - }; - wenngle = { - name = "Zeke Stephens"; - email = "zekestephens@gmail.com"; - github = "wenngle"; - githubId = 63376671; - }; - yanganto = { - name = "Antonio Yang"; - email = "yanganto@gmail.com"; - github = "yanganto"; - githubId = 10803111; - }; - starcraft66 = { - name = "Tristan Gosselin-Hane"; - email = "starcraft66@gmail.com"; - github = "starcraft66"; - githubId = 1858154; - keys = [{ - fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; - }]; - }; - hloeffler = { - name = "Hauke Löffler"; - email = "nix@hauke-loeffler.de"; - github = "hloeffler"; - githubId = 6627191; - }; - wilsonehusin = { - name = "Wilson E. Husin"; - email = "wilsonehusin@gmail.com"; - github = "wilsonehusin"; - githubId = 14004487; - }; - bb2020 = { - email = "bb2020@users.noreply.github.com"; - github = "bb2020"; - githubId = 19290397; - name = "Tunc Uzlu"; - }; - pulsation = { - name = "Philippe Sam-Long"; - email = "1838397+pulsation@users.noreply.github.com"; - github = "pulsation"; - githubId = 1838397; - }; - princemachiavelli = { - name = "Josh Hoffer"; - email = "jhoffer@sansorgan.es"; - matrix = "@princemachiavelli:matrix.org"; - github = "Princemachiavelli"; - githubId = 2730968; - keys = [{ - fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; - }]; - }; - ydlr = { - name = "ydlr"; - email = "ydlr@ydlr.io"; - github = "ydlr"; - githubId = 58453832; - keys = [{ - fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; - }]; - }; - zane = { - name = "Zane van Iperen"; - email = "zane@zanevaniperen.com"; - github = "vs49688"; - githubId = 4423262; - keys = [{ - fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; - }]; - }; - zbioe = { - name = "Iury Fukuda"; - email = "zbioe@protonmail.com"; - 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 = [{ - fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; - }]; - }; - zeri = { - name = "zeri"; - email = "68825133+zeri42@users.noreply.github.com"; - matrix = "@zeri:matrix.org"; - github = "zeri42"; - githubId = 68825133; - }; - zoedsoupe = { - github = "zoedsoupe"; - githubId = 44469426; - name = "Zoey de Souza Pessanha"; - email = "zoey.spessanha@outlook.com"; - keys = [{ - fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; - }]; - }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; - github = "zseri"; + github = "fogti"; githubId = 1618343; keys = [{ fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; }]; }; + ztzg = { + email = "dd@crosstwine.com"; + github = "ztzg"; + githubId = 393108; + name = "Damien Diederen"; + }; + zumorica = { + name = "Vera Aguilera Puerto"; + email = "gradientvera+nix@outlook.com"; + github = "Zumorica"; + githubId = 6766154; + }; zupo = { name = "Nejc Zupan"; email = "nejczupan+nix@gmail.com"; github = "zupo"; githubId = 311580; }; - sei40kr = { - name = "Seong Yong-ju"; - email = "sei40kr@gmail.com"; - github = "sei40kr"; - githubId = 11665236; - }; - vdot0x23 = { - name = "Victor Büttner"; - email = "nix.victor@0x23.dk"; - github = "vdot0x23"; - githubId = 40716069; - }; - jpagex = { - name = "Jérémy Pagé"; - email = "contact@jeremypage.me"; - github = "jpagex"; - githubId = 635768; - }; - vbrandl = { - name = "Valentin Brandl"; - email = "mail+nixpkgs@vbrandl.net"; - github = "vbrandl"; - githubId = 20639051; - }; - portothree = { - name = "Gustavo Porto"; - email = "gus@p8s.co"; - github = "portothree"; - githubId = 3718120; - }; - pwoelfel = { - name = "Philipp Woelfel"; - email = "philipp.woelfel@gmail.com"; - github = "PhilippWoelfel"; - githubId = 19400064; - }; - qbit = { - name = "Aaron Bieber"; - email = "aaron@bolddaemon.com"; - github = "qbit"; - githubId = 68368; - matrix = "@qbit:tapenet.org"; - keys = [{ - fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; - }]; - }; - ameer = { - name = "Ameer Taweel"; - email = "ameertaweel2002@gmail.com"; - github = "AmeerTaweel"; - githubId = 20538273; - }; - nigelgbanks = { - name = "Nigel Banks"; - email = "nigel.g.banks@gmail.com"; - 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; - }; - wesleyjrz = { - email = "wesleyjr2002@gmail.com"; - name = "Wesley V. Santos Jr."; - github = "wesleyjrz"; - githubId = 60184588; - }; - 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; - }; - macalinao = { - email = "me@ianm.com"; - name = "Ian Macalinao"; - github = "macalinao"; - githubId = 401263; - keys = [{ - fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; - }]; - }; - tjni = { - email = "43ngvg@masqt.com"; - matrix = "@tni:matrix.org"; - name = "Theodore Ni"; - github = "tjni"; - githubId = 3806110; - keys = [{ - fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; - }]; - }; - bezmuth = { - email = "benkel97@protonmail.com"; - name = "Ben Kelly"; - github = "bezmuth"; - githubId = 31394095; - }; - cafkafk = { - email = "christina@cafkafk.com"; - matrix = "@cafkafk:matrix.cafkafk.com"; - name = "Christina Sørensen"; - github = "cafkafk"; - githubId = 89321978; - keys = [ - { - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - } - { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; - } - ]; - }; - rb = { - email = "maintainers@cloudposse.com"; - github = "nitrocode"; - githubId = 7775707; - name = "RB"; - }; - bpaulin = { - email = "brunopaulin@bpaulin.net"; - github = "bpaulin"; - githubId = 115711; - name = "bpaulin"; - }; zuzuleinen = { email = "andrey.boar@gmail.com"; name = "Andrei Boar"; github = "zuzuleinen"; githubId = 944919; }; - quasigod-io = { - email = "quasigod-io@protonmail.com"; - name = "Michael Belsanti"; - github = "quasigod-io"; - githubId = 62124625; + zx2c4 = { + email = "Jason@zx2c4.com"; + github = "zx2c4"; + githubId = 10643; + name = "Jason A. Donenfeld"; }; - waelwindows = { - email = "waelwindows9922@gmail.com"; - github = "Waelwindows"; - githubId = 5228243; - name = "waelwindows"; + zyansheep = { + email = "zyansheep@protonmail.com"; + github = "zyansheep"; + githubId = 20029431; + name = "Zyansheep"; }; - wuyoli = { - name = "wuyoli"; - email = "wuyoli@tilde.team"; - github = "wuyoli"; - githubId = 104238274; + zygot = { + email = "stefan.bordei13@gmail.com"; + github = "stefan-bordei"; + githubId = 71881325; + name = "Stefan Bordei"; }; - ziguana = { - name = "Zig Uana"; - email = "git@ziguana.dev"; - github = "ziguana"; - githubId = 45833444; + zzamboni = { + email = "diego@zzamboni.org"; + github = "zzamboni"; + githubId = 32876; + name = "Diego Zamboni"; }; } +/* Keep the list alphabetically sorted. */ diff --git a/maintainers/scripts/check-maintainers-sorted.nix b/maintainers/scripts/check-maintainers-sorted.nix new file mode 100644 index 0000000000000..3de4e07550c42 --- /dev/null +++ b/maintainers/scripts/check-maintainers-sorted.nix @@ -0,0 +1,57 @@ +let + lib = import ../../lib; + inherit (lib) + add attrNames elemAt foldl' genList length replaceStrings sort toLower trace; + + maintainers = import ../maintainer-list.nix; + simplify = replaceStrings [ "-" "_" ] [ "" "" ]; + compare = a: b: simplify (toLower a) < simplify (toLower b); + namesSorted = + sort + (a: b: a.key < b.key) + (map + (n: let pos = builtins.unsafeGetAttrPos n maintainers; + in assert pos == null -> throw "maintainers entry ${n} is malformed"; + { name = n; line = pos.line; key = toLower (simplify n); }) + (attrNames maintainers)); + before = { name, line, key }: + foldl' + (acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc) + null + namesSorted; + errors = foldl' add 0 + (map + (i: let a = elemAt namesSorted i; + b = elemAt namesSorted (i + 1); + lim = let t = before a; in if t == null then "the initial {" else t.name; + in if a.line >= b.line + then trace + ("maintainer ${a.name} (line ${toString a.line}) should be listed " + + "after ${lim}, not after ${b.name} (line ${toString b.line})") + 1 + else 0) + (genList (i: i) (length namesSorted - 1))); +in +assert errors == 0; "all good!" + +# generate edit commands to sort the list. +# may everything following the last current entry (closing } ff) in the wrong place +# with lib; +# concatStringsSep +# "\n" +# (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted; +# commands = map +# (i: let e = elemAt namesSorted i; +# begin = foldl' +# (acc: n: if n.line < e.line && n.line > acc then n.line else acc) +# 1 +# namesSorted; +# end = +# foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc) +# 999999999 +# namesSorted; +# in "${toString e.line},${toString (end - 1)} p") +# (genList (i: i) (length namesSorted)); +# in map +# (c: "sed -ne '${c}' maintainers/maintainer-list.nix") +# ([ "1,${toString (first - 1)} p" ] ++ commands)) diff --git a/maintainers/scripts/convert-to-import-cargo-lock.sh b/maintainers/scripts/convert-to-import-cargo-lock.sh new file mode 100755 index 0000000000000..b38825d4d3e0c --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=. -i bash -p "import ./maintainers/scripts/convert-to-import-cargo-lock" nix-prefetch-git + +convert-to-import-cargo-lock "$@" diff --git a/maintainers/scripts/convert-to-import-cargo-lock/.gitignore b/maintainers/scripts/convert-to-import-cargo-lock/.gitignore new file mode 100644 index 0000000000000..ea8c4bf7f35f6 --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/.gitignore @@ -0,0 +1 @@ +/target diff --git a/maintainers/scripts/convert-to-import-cargo-lock/Cargo.lock b/maintainers/scripts/convert-to-import-cargo-lock/Cargo.lock new file mode 100644 index 0000000000000..b69fbc59ae846 --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/Cargo.lock @@ -0,0 +1,106 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "basic-toml" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e819b667739967cd44d308b8c7b71305d8bb0729ac44a248aa08f33d01950b4" +dependencies = [ + "serde", +] + +[[package]] +name = "convert-to-import-cargo-lock" +version = "0.1.0" +dependencies = [ + "anyhow", + "basic-toml", + "serde", + "serde_json", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" diff --git a/maintainers/scripts/convert-to-import-cargo-lock/Cargo.toml b/maintainers/scripts/convert-to-import-cargo-lock/Cargo.toml new file mode 100644 index 0000000000000..41f5729f01a2c --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "convert-to-import-cargo-lock" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +anyhow = { version = "1.0.69" } +basic-toml = "0.1.1" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.93" diff --git a/maintainers/scripts/convert-to-import-cargo-lock/default.nix b/maintainers/scripts/convert-to-import-cargo-lock/default.nix new file mode 100644 index 0000000000000..f4c1f553d64f9 --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/default.nix @@ -0,0 +1,16 @@ +with import ../../../. { }; + +rustPlatform.buildRustPackage { + name = "convert-to-import-cargo-lock"; + + src = lib.cleanSourceWith { + src = ./.; + filter = name: type: + let + name' = builtins.baseNameOf name; + in + name' != "default.nix" && name' != "target"; + }; + + cargoLock.lockFile = ./Cargo.lock; +} diff --git a/maintainers/scripts/convert-to-import-cargo-lock/shell.nix b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix new file mode 100644 index 0000000000000..8e913fdcd8be5 --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix @@ -0,0 +1,5 @@ +with import ../../../. { }; + +mkShell { + packages = [ rustc cargo clippy rustfmt ] ++ lib.optional stdenv.isDarwin libiconv; +} diff --git a/maintainers/scripts/convert-to-import-cargo-lock/src/main.rs b/maintainers/scripts/convert-to-import-cargo-lock/src/main.rs new file mode 100644 index 0000000000000..6eb6768d14e96 --- /dev/null +++ b/maintainers/scripts/convert-to-import-cargo-lock/src/main.rs @@ -0,0 +1,241 @@ +#![warn(clippy::pedantic)] +#![allow(clippy::too_many_lines)] + +use anyhow::anyhow; +use serde::Deserialize; +use std::{collections::HashMap, env, fs, path::PathBuf, process::Command}; + +#[derive(Deserialize)] +struct CargoLock<'a> { + #[serde(rename = "package", borrow)] + packages: Vec<Package<'a>>, + metadata: Option<HashMap<&'a str, &'a str>>, +} + +#[derive(Deserialize)] +struct Package<'a> { + name: &'a str, + version: &'a str, + source: Option<&'a str>, + checksum: Option<&'a str>, +} + +#[derive(Deserialize)] +struct PrefetchOutput { + sha256: String, +} + +fn main() -> anyhow::Result<()> { + let mut hashes = HashMap::new(); + + let attr_count = env::args().len() - 1; + + for (i, attr) in env::args().skip(1).enumerate() { + println!("converting {attr} ({}/{attr_count})", i + 1); + + convert(&attr, &mut hashes)?; + } + + Ok(()) +} + +fn convert(attr: &str, hashes: &mut HashMap<String, String>) -> anyhow::Result<()> { + let package_path = nix_eval(format!("{attr}.meta.position"))? + .and_then(|p| p.split_once(':').map(|(f, _)| PathBuf::from(f))); + + if package_path.is_none() { + eprintln!("can't automatically convert {attr}: doesn't exist"); + return Ok(()); + } + + let package_path = package_path.unwrap(); + + if package_path.with_file_name("Cargo.lock").exists() { + eprintln!("skipping {attr}: already has a vendored Cargo.lock"); + return Ok(()); + } + + let mut src = PathBuf::from( + String::from_utf8( + Command::new("nix-build") + .arg("-A") + .arg(format!("{attr}.src")) + .output()? + .stdout, + )? + .trim(), + ); + + if !src.exists() { + eprintln!("can't automatically convert {attr}: src doesn't exist (bad attr?)"); + return Ok(()); + } else if !src.metadata()?.is_dir() { + eprintln!("can't automatically convert {attr}: src isn't a directory"); + return Ok(()); + } + + if let Some(mut source_root) = nix_eval(format!("{attr}.sourceRoot"))?.map(PathBuf::from) { + source_root = source_root.components().skip(1).collect(); + src.push(source_root); + } + + let cargo_lock_path = src.join("Cargo.lock"); + + if !cargo_lock_path.exists() { + eprintln!("can't automatically convert {attr}: src doesn't contain Cargo.lock"); + return Ok(()); + } + + let cargo_lock_content = fs::read_to_string(cargo_lock_path)?; + + let cargo_lock: CargoLock = basic_toml::from_str(&cargo_lock_content)?; + + let mut git_dependencies = Vec::new(); + + for package in cargo_lock.packages.iter().filter(|p| { + p.source.is_some() + && p.checksum + .or_else(|| { + cargo_lock + .metadata + .as_ref()? + .get( + format!("checksum {} {} ({})", p.name, p.version, p.source.unwrap()) + .as_str(), + ) + .copied() + }) + .is_none() + }) { + let (typ, original_url) = package + .source + .unwrap() + .split_once('+') + .expect("dependency should have well-formed source url"); + + if let Some(hash) = hashes.get(original_url) { + continue; + } + + assert_eq!( + typ, "git", + "packages without checksums should be git dependencies" + ); + + let (mut url, rev) = original_url + .split_once('#') + .expect("git dependency should have commit"); + + // TODO: improve + if let Some((u, _)) = url.split_once('?') { + url = u; + } + + let prefetch_output: PrefetchOutput = serde_json::from_slice( + &Command::new("nix-prefetch-git") + .args(["--url", url, "--rev", rev, "--quiet", "--fetch-submodules"]) + .output()? + .stdout, + )?; + + let output_hash = String::from_utf8( + Command::new("nix") + .args([ + "--extra-experimental-features", + "nix-command", + "hash", + "to-sri", + "--type", + "sha256", + &prefetch_output.sha256, + ]) + .output()? + .stdout, + )?; + + let hash = output_hash.trim().to_string(); + + git_dependencies.push(( + format!("{}-{}", package.name, package.version), + output_hash.trim().to_string().clone(), + )); + + hashes.insert(original_url.to_string(), hash); + } + + fs::write( + package_path.with_file_name("Cargo.lock"), + cargo_lock_content, + )?; + + let mut package_lines: Vec<_> = fs::read_to_string(&package_path)? + .lines() + .map(String::from) + .collect(); + + let (cargo_deps_line_index, cargo_deps_line) = package_lines + .iter_mut() + .enumerate() + .find(|(_, l)| { + l.trim_start().starts_with("cargoHash") || l.trim_start().starts_with("cargoSha256") + }) + .expect("package should contain cargoHash/cargoSha256"); + + let spaces = " ".repeat(cargo_deps_line.len() - cargo_deps_line.trim_start().len()); + + if git_dependencies.is_empty() { + *cargo_deps_line = format!("{spaces}cargoLock.lockFile = ./Cargo.lock;"); + } else { + *cargo_deps_line = format!("{spaces}cargoLock = {{"); + + let mut index_iter = cargo_deps_line_index + 1..; + + package_lines.insert( + index_iter.next().unwrap(), + format!("{spaces} lockFile = ./Cargo.lock;"), + ); + + package_lines.insert( + index_iter.next().unwrap(), + format!("{spaces} outputHashes = {{"), + ); + + for ((dep, hash), index) in git_dependencies.drain(..).zip(&mut index_iter) { + package_lines.insert(index, format!("{spaces} {dep:?} = {hash:?};")); + } + + package_lines.insert(index_iter.next().unwrap(), format!("{spaces} }};")); + package_lines.insert(index_iter.next().unwrap(), format!("{spaces}}};")); + } + + if package_lines.last().map(String::as_str) != Some("") { + package_lines.push(String::new()); + } + + fs::write(package_path, package_lines.join("\n"))?; + + Ok(()) +} + +fn nix_eval(attr: impl AsRef<str>) -> anyhow::Result<Option<String>> { + let output = String::from_utf8( + Command::new("nix-instantiate") + .args(["--eval", "-A", attr.as_ref()]) + .output()? + .stdout, + )?; + + let trimmed = output.trim(); + + if trimmed.is_empty() || trimmed == "null" { + Ok(None) + } else { + Ok(Some( + trimmed + .strip_prefix('"') + .and_then(|p| p.strip_suffix('"')) + .ok_or_else(|| anyhow!("couldn't parse nix-instantiate output: {output:?}"))? + .to_string(), + )) + } +} diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index c81b49bfb5993..b17cd82f4d1c8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -50,19 +50,22 @@ while (@ARGV) { } } +my $bucket; -# S3 setup. -my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n"; -my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n"; +if (not defined $ENV{DEBUG}) { + # S3 setup. + my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n"; + my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n"; -my $s3 = Net::Amazon::S3->new( - { aws_access_key_id => $aws_access_key_id, - aws_secret_access_key => $aws_secret_access_key, - retry => 1, - host => "s3-eu-west-1.amazonaws.com", - }); + my $s3 = Net::Amazon::S3->new( + { aws_access_key_id => $aws_access_key_id, + aws_secret_access_key => $aws_secret_access_key, + retry => 1, + host => "s3-eu-west-1.amazonaws.com", + }); -my $bucket = $s3->bucket("nixpkgs-tarballs") or die; + $bucket = $s3->bucket("nixpkgs-tarballs") or die; +} my $doWrite = 0; my $cacheFile = ($ENV{"HOME"} or die "\$HOME is not set") . "/.cache/nix/copy-tarballs"; @@ -159,13 +162,18 @@ elsif (defined $expr) { # Check every fetchurl call discovered by find-tarballs.nix. my $mirrored = 0; my $have = 0; - foreach my $fetch (sort { $a->{url} cmp $b->{url} } @{$fetches}) { - my $url = $fetch->{url}; + foreach my $fetch (sort { $a->{urls}->[0] cmp $b->{urls}->[0] } @{$fetches}) { + my $urls = $fetch->{urls}; my $algo = $fetch->{type}; my $hash = $fetch->{hash}; my $name = $fetch->{name}; my $isPatch = $fetch->{isPatch}; + if ($isPatch) { + print STDERR "skipping $urls->[0] (support for patches is missing)\n"; + next; + } + if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { $algo = $1; $hash = `nix hash to-base16 $hash` or die; @@ -180,62 +188,60 @@ elsif (defined $expr) { chomp $hash; } - if (defined $ENV{DEBUG}) { - print "$url $algo $hash\n"; - next; - } - - if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { - print STDERR "skipping $url (unsupported scheme)\n"; - next; - } - - if ($isPatch) { - print STDERR "skipping $url (support for patches is missing)\n"; - next; - } + my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); - next if defined $exclude && $url =~ /$exclude/; + for my $url (@$urls) { + if (defined $ENV{DEBUG}) { + print "$url $algo $hash\n"; + next; + } - if (alreadyMirrored($algo, $hash)) { - $have++; - next; - } + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { + print STDERR "skipping $url (unsupported scheme)\n"; + next; + } - my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); + next if defined $exclude && $url =~ /$exclude/; - print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; + if (alreadyMirrored($algo, $hash)) { + $have++; + last; + } - if ($dryRun) { - $mirrored++; - next; - } + print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; - # Substitute the output. - if (!isValidPath($storePath)) { - system("nix-store", "-r", $storePath); - } + if ($dryRun) { + $mirrored++; + last; + } - # Otherwise download the file using nix-prefetch-url. - if (!isValidPath($storePath)) { - $ENV{QUIET} = 1; - $ENV{PRINT_PATH} = 1; - my $fh; - my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; - waitpid($pid, 0) or die; - if ($? != 0) { - print STDERR "failed to fetch $url: $?\n"; - next; + # Substitute the output. + if (!isValidPath($storePath)) { + system("nix-store", "-r", $storePath); } - <$fh>; my $storePath2 = <$fh>; chomp $storePath2; - if ($storePath ne $storePath2) { - warn "strange: $storePath != $storePath2\n"; - next; + + # Otherwise download the file using nix-prefetch-url. + if (!isValidPath($storePath)) { + $ENV{QUIET} = 1; + $ENV{PRINT_PATH} = 1; + my $fh; + my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; + waitpid($pid, 0) or die; + if ($? != 0) { + print STDERR "failed to fetch $url: $?\n"; + next; + } + <$fh>; my $storePath2 = <$fh>; chomp $storePath2; + if ($storePath ne $storePath2) { + warn "strange: $storePath != $storePath2\n"; + next; + } } - } - uploadFile($storePath, $url); - $mirrored++; + uploadFile($storePath, $url); + $mirrored++; + last; + } } print STDERR "mirrored $mirrored files, already have $have files\n"; diff --git a/maintainers/scripts/db-to-md.sh b/maintainers/scripts/db-to-md.sh index 01357d1e24120..aa2a2775b6dea 100755 --- a/maintainers/scripts/db-to-md.sh +++ b/maintainers/scripts/db-to-md.sh @@ -41,7 +41,7 @@ pandoc_flags=( # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) # - media extraction (was only required for diagram generator) # - myst-reader/roles.lua (only relevant for MyST → DocBook) - # - link-unix-man-references.lua (links should only be added to display output) + # - link-manpages.lua (links should only be added to display output) # - docbook-writer/rst-roles.lua (only relevant for → DocBook) # - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook) "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua" diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index bb9572cbc7956..4f0ca24650251 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -17,6 +17,7 @@ let if (builtins.tryEval attrs.drvPath).success then { inherit (attrs) name drvPath; } else { failed = true; } + else if attrs == null then {} else { recurseForDerivations = true; } // mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs else { }; diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index 9e2348fda7072..c43e8ad904d7d 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -127,8 +127,7 @@ echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent && { # TODO fetch only missing tar.xz files echo "fetching $filecount tar.xz files ..." - urllist="$(echo "$filelist" | while read file; do echo "$BASE_URL/$file"; done)" - echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent + echo "$filelist" | xargs wget $wgetargs -nH -r -c --no-parent echo "generating sha256 files ..." find . -type f -name '*.tar.xz' | while read src; do diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 685a33d137ce0..c47b5168abd9a 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -9,12 +9,12 @@ let root = expr; - uniqueUrls = map (x: x.file) (genericClosure { - startSet = map (file: { key = file.url; inherit file; }) urls; + uniqueFiles = map (x: x.file) (genericClosure { + startSet = map (file: { key = with file; (if type == null then "" else type + "+") + hash; inherit file; }) files; operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; + files = map (drv: { urls = drv.urls or [ drv.url ]; hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; fetchurlDependencies = filter @@ -47,4 +47,4 @@ let canEval = val: (builtins.tryEval val).success; -in uniqueUrls +in uniqueFiles diff --git a/maintainers/scripts/haskell/dependencies.nix b/maintainers/scripts/haskell/dependencies.nix index f0620902c0ee0..fd8338c0029a9 100644 --- a/maintainers/scripts/haskell/dependencies.nix +++ b/maintainers/scripts/haskell/dependencies.nix @@ -3,7 +3,7 @@ let pkgs = import ../../.. {}; inherit (pkgs) lib; getDeps = _: pkg: { - deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or [])); + deps = builtins.filter (x: x != null) (map (x: x.pname or null) (pkg.propagatedBuildInputs or [])); broken = (pkg.meta.hydraPlatforms or [null]) == []; }; in diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index f7e5f573982d9..5f7e40a28bcd8 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -19,6 +19,8 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -26,11 +28,13 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE TupleSections #-} {-# LANGUAGE ViewPatterns #-} {-# OPTIONS_GHC -Wall #-} +{-# LANGUAGE DataKinds #-} import Control.Monad (forM_, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) import Data.Aeson ( FromJSON, + FromJSONKey, ToJSON, decodeFileStrict', eitherDecodeStrict', @@ -50,21 +54,27 @@ import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as Text import Data.Text.Encoding (encodeUtf8) +import qualified Data.Text.IO as Text import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) import Data.Time.Clock (UTCTime) import GHC.Generics (Generic) import Network.HTTP.Req ( - GET (GET), - NoReqBody (NoReqBody), - defaultHttpConfig, - header, - https, - jsonResponse, - req, - responseBody, - responseTimeout, - runReq, - (/:), + GET (GET), + HttpResponse (HttpResponseBody), + NoReqBody (NoReqBody), + Option, + Req, + Scheme (Https), + bsResponse, + defaultHttpConfig, + header, + https, + jsonResponse, + req, + responseBody, + responseTimeout, + runReq, + (/:), ) import System.Directory (XdgDirectory (XdgCache), getXdgDirectory) import System.Environment (getArgs) @@ -76,17 +86,24 @@ import Control.Exception (evaluate) import qualified Data.IntMap.Strict as IntMap import qualified Data.IntSet as IntSet import Data.Bifunctor (second) +import Data.Data (Proxy) +import Data.ByteString (ByteString) +import qualified Data.ByteString.Char8 as ByteString +import Distribution.Simple.Utils (safeLast, fromUTF8BS) newtype JobsetEvals = JobsetEvals { evals :: Seq Eval } - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype Nixpkgs = Nixpkgs {revision :: Text} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) data Eval = Eval { id :: Int @@ -94,13 +111,42 @@ data Eval = Eval } deriving (Generic, ToJSON, FromJSON, Show) +-- | Hydra job name. +-- +-- Examples: +-- - @"haskellPackages.lens.x86_64-linux"@ +-- - @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- - @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ +-- - @"arion.aarch64-linux"@ +newtype JobName = JobName { unJobName :: Text } + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSONKey, FromJSON, Ord, ToJSON) + +-- | Datatype representing the result of querying the build evals of the +-- haskell-updates Hydra jobset. +-- +-- The URL <https://hydra.nixos.org/eval/EVAL_ID/builds> (where @EVAL_ID@ is a +-- value like 1792418) returns a list of 'Build'. data Build = Build - { job :: Text + { job :: JobName , buildstatus :: Maybe Int + -- ^ Status of the build. See 'getBuildState' for the meaning of each state. , finished :: Int + -- ^ Whether or not the build is finished. @0@ if finished, non-zero otherwise. , id :: Int , nixname :: Text + -- ^ Nix name of the derivation. + -- + -- Examples: + -- - @"lens-5.2.1"@ + -- - @"cabal-install-3.8.0.1"@ + -- - @"lens-static-x86_64-unknown-linux-musl-5.1.1"@ , system :: Text + -- ^ System + -- + -- Examples: + -- - @"x86_64-linux"@ + -- - @"aarch64-darwin"@ , jobsetevals :: Seq Int } deriving (Generic, ToJSON, FromJSON, Show) @@ -112,7 +158,8 @@ main = do ["get-report"] -> getBuildReports ["ping-maintainers"] -> printMaintainerPing ["mark-broken-list"] -> printMarkBrokenList - _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list" + ["eval-info"] -> printEvalInfo + _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info" reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -122,17 +169,31 @@ showT = Text.pack . show getBuildReports :: IO () getBuildReports = runReq defaultHttpConfig do - evalMay <- Seq.lookup 0 . evals <$> myReq (https "hydra.nixos.org" /: "jobset" /: "nixpkgs" /: "haskell-updates" /: "evals") mempty + evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"] eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..." - buildReports :: Seq Build <- myReq (https "hydra.nixos.org" /: "eval" /: showT id /: "builds") (responseTimeout 600000000) + buildReports :: Seq Build <- hydraJSONQuery (responseTimeout 600000000) ["eval", showT id, "builds"] liftIO do fileName <- reportFileName putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName now <- getCurrentTime encodeFile fileName (eval, now, buildReports) - where - myReq query option = responseBody <$> req GET query NoReqBody jsonResponse (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option) + +hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) +hydraQuery responseType option query = + responseBody + <$> req + GET + (foldl' (/:) (https "hydra.nixos.org") query) + NoReqBody + responseType + (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option) + +hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a +hydraJSONQuery = hydraQuery jsonResponse + +hydraPlainQuery :: [Text] -> Req ByteString +hydraPlainQuery = hydraQuery bsResponse mempty hydraEvalCommand :: FilePath hydraEvalCommand = "hydra-eval-jobs" @@ -171,7 +232,7 @@ newtype Maintainers = Maintainers { maintainers :: Maybe Text } -- -- Note that Hydra jobs without maintainers will have an empty string for the -- maintainer list. -type HydraJobs = Map Text Maintainers +type HydraJobs = Map JobName Maintainers -- | Map of email addresses to GitHub handles. -- This is built from the file @../../maintainer-list.nix@. @@ -196,12 +257,12 @@ type EmailToGitHubHandles = Map Text Text -- , ("conduit.x86_64-darwin", ["snoyb", "webber"]) -- ] -- @@ -type MaintainerMap = Map Text (NonEmpty Text) +type MaintainerMap = Map JobName (NonEmpty Text) -- | Information about a package which lists its dependencies and whether the -- package is marked broken. data DepInfo = DepInfo { - deps :: Set Text, + deps :: Set PkgName, broken :: Bool } deriving stock (Generic, Show) @@ -209,23 +270,37 @@ data DepInfo = DepInfo { -- | Map from package names to their DepInfo. This is the data we get out of a -- nix call. -type DependencyMap = Map Text DepInfo +type DependencyMap = Map PkgName DepInfo -- | Map from package names to its broken state, number of reverse dependencies (fst) and -- unbroken reverse dependencies (snd). -type ReverseDependencyMap = Map Text (Int, Int) +type ReverseDependencyMap = Map PkgName (Int, Int) -- | Calculate the (unbroken) reverse dependencies of a package by transitively -- going through all packages if it’s a dependency of them. calculateReverseDependencies :: DependencyMap -> ReverseDependencyMap -calculateReverseDependencies depMap = Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) +calculateReverseDependencies depMap = + Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) where -- This code tries to efficiently invert the dependency map and calculate -- it’s transitive closure by internally identifying every pkg with it’s index -- in the package list and then using memoization. + keys :: [PkgName] keys = Map.keys depMap + + pkgToIndexMap :: Map PkgName Int pkgToIndexMap = Map.fromDistinctAscList (zip keys [0..]) - intDeps = zip [0..] $ (\DepInfo{broken,deps} -> (broken,mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps)) <$> Map.elems depMap + + depInfos :: [DepInfo] + depInfos = Map.elems depMap + + depInfoToIdx :: DepInfo -> (Bool, [Int]) + depInfoToIdx DepInfo{broken,deps} = + (broken, mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps) + + intDeps :: [(Int, (Bool, [Int]))] + intDeps = zip [0..] (fmap depInfoToIdx depInfos) + rdepMap onlyUnbroken = IntSet.size <$> resultList where resultList = go <$> [0..] @@ -242,7 +317,7 @@ getMaintainerMap = do handlesMap :: EmailToGitHubHandles <- readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: " pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs - where + where -- Split a comma-spearated string of Maintainers into a NonEmpty list of -- GitHub handles. splitMaintainersToGitHubHandles @@ -254,7 +329,10 @@ getMaintainerMap = do -- script ./dependencies.nix. getDependencyMap :: IO DependencyMap getDependencyMap = - readJSONProcess nixExprCommand ("maintainers/scripts/haskell/dependencies.nix":nixExprParams) "Failed to decode nix output for lookup of dependencies: " + readJSONProcess + nixExprCommand + ("maintainers/scripts/haskell/dependencies.nix" : nixExprParams) + "Failed to decode nix output for lookup of dependencies: " -- | Run a process that produces JSON on stdout and and decode the JSON to a -- data type. @@ -303,18 +381,80 @@ platformIcon (Platform x) = case x of "x86_64-linux" -> ":penguin:" "aarch64-linux" -> ":iphone:" "x86_64-darwin" -> ":apple:" + "aarch64-darwin" -> ":green_apple:" _ -> x +platformIsOS :: OS -> Platform -> Bool +platformIsOS os (Platform x) = case (os, x) of + (Linux, "x86_64-linux") -> True + (Linux, "aarch64-linux") -> True + (Darwin, "x86_64-darwin") -> True + (Darwin, "aarch64-darwin") -> True + _ -> False + + +-- | A package name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgName' +-- @"lens"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgName' @"cabal-install"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgName' @"ghc90"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgName' @"arion"@. +-- +-- 'PkgName' is also used as a key in 'DependencyMap' and 'ReverseDependencyMap'. +-- In this case, 'PkgName' originally comes from attribute names in @haskellPackages@ +-- in Nixpkgs. +newtype PkgName = PkgName Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + +-- | A package set name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgSet' +-- @"haskellPackages"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgSet' @"haskell.packages.ghc925"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgSet' @"pkgsMusl.haskell.compiler"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgSet' @""@. +-- +-- As you can see from the last example, 'PkgSet' can be empty (@""@) for +-- top-level jobs. +newtype PkgSet = PkgSet Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) -newtype Table row col a = Table (Map (row, col) a) data SummaryEntry = SummaryEntry { - summaryBuilds :: Table Text Platform BuildResult, + summaryBuilds :: Table PkgSet Platform BuildResult, summaryMaintainers :: Set Text, summaryReverseDeps :: Int, summaryUnbrokenReverseDeps :: Int } -type StatusSummary = Map Text SummaryEntry +type StatusSummary = Map PkgName SummaryEntry + +data OS = Linux | Darwin + +newtype Table row col a = Table (Map (row, col) a) + +singletonTable :: row -> col -> a -> Table row col a +singletonTable row col a = Table $ Map.singleton (row, col) a + +unionTable :: (Ord row, Ord col) => Table row col a -> Table row col a -> Table row col a +unionTable (Table l) (Table r) = Table $ Map.union l r + +filterWithKeyTable :: (row -> col -> a -> Bool) -> Table row col a -> Table row col a +filterWithKeyTable f (Table t) = Table $ Map.filterWithKey (\(r,c) a -> f r c a) t + +nullTable :: Table row col a -> Bool +nullTable (Table t) = Map.null t instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) @@ -325,29 +465,57 @@ instance Functor (Table row col) where instance Foldable (Table row col) where foldMap f (Table a) = foldMap f a -buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary -buildSummary maintainerMap reverseDependencyMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary +getBuildState :: Build -> BuildState +getBuildState Build{finished, buildstatus} = case (finished, buildstatus) of + (0, _) -> Unfinished + (_, Just 0) -> Success + (_, Just 1) -> Failed + (_, Just 2) -> DependencyFailed + (_, Just 3) -> HydraFailure + (_, Just 4) -> Canceled + (_, Just 7) -> TimedOut + (_, Just 11) -> OutputLimitExceeded + (_, i) -> Unknown i + +combineStatusSummaries :: Seq StatusSummary -> StatusSummary +combineStatusSummaries = foldl (Map.unionWith unionSummary) Map.empty where - unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) - toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (SummaryEntry (Table (Map.singleton (set, Platform system) (BuildResult state id))) maintainers reverseDeps unbrokenReverseDeps) - where - state :: BuildState - state = case (finished, buildstatus) of - (0, _) -> Unfinished - (_, Just 0) -> Success - (_, Just 1) -> Failed - (_, Just 2) -> DependencyFailed - (_, Just 3) -> HydraFailure - (_, Just 4) -> Canceled - (_, Just 7) -> TimedOut - (_, Just 11) -> OutputLimitExceeded - (_, i) -> Unknown i - packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) - splitted = nonEmpty $ Text.splitOn "." packageName - name = maybe packageName NonEmpty.last splitted - set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted - maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) - (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap + unionSummary :: SummaryEntry -> SummaryEntry -> SummaryEntry + unionSummary (SummaryEntry lb lm lr lu) (SummaryEntry rb rm rr ru) = + SummaryEntry (unionTable lb rb) (lm <> rm) (max lr rr) (max lu ru) + +buildToPkgNameAndSet :: Build -> (PkgName, PkgSet) +buildToPkgNameAndSet Build{job = JobName jobName, system} = (name, set) + where + packageName :: Text + packageName = fromMaybe jobName (Text.stripSuffix ("." <> system) jobName) + + splitted :: Maybe (NonEmpty Text) + splitted = nonEmpty $ Text.splitOn "." packageName + + name :: PkgName + name = PkgName $ maybe packageName NonEmpty.last splitted + + set :: PkgSet + set = PkgSet $ maybe "" (Text.intercalate "." . NonEmpty.init) splitted + +buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> StatusSummary +buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = + Map.singleton pkgName summaryEntry + where + (pkgName, pkgSet) = buildToPkgNameAndSet build + + maintainers :: Set Text + maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + + (reverseDeps, unbrokenReverseDeps) = + Map.findWithDefault (0,0) pkgName reverseDependencyMap + + buildTable :: Table PkgSet Platform BuildResult + buildTable = + singletonTable pkgSet (Platform system) (BuildResult (getBuildState build) id) + + summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps readBuildReports :: IO (Eval, UTCTime, Seq Build) readBuildReports = do @@ -369,19 +537,36 @@ printTable name showR showC showE (Table mapping) = joinTable <$> (name : map sh rows = toList $ Set.fromList (fst <$> Map.keys mapping) cols = toList $ Set.fromList (snd <$> Map.keys mapping) -printJob :: Int -> Text -> (Table Text Platform BuildResult, Text) -> [Text] -printJob evalId name (Table mapping, maintainers) = +printJob :: Int -> PkgName -> (Table PkgSet Platform BuildResult, Text) -> [Text] +printJob evalId (PkgName name) (Table mapping, maintainers) = if length sets <= 1 then map printSingleRow sets - else ["- [ ] " <> makeJobSearchLink "" name <> " " <> maintainers] <> map printRow sets + else ["- [ ] " <> makeJobSearchLink (PkgSet "") name <> " " <> maintainers] <> map printRow sets where - printRow set = " - " <> printState set <> " " <> makeJobSearchLink set (if Text.null set then "toplevel" else set) - printSingleRow set = "- [ ] " <> printState set <> " " <> makeJobSearchLink set (makePkgName set) <> " " <> maintainers - makePkgName set = (if Text.null set then "" else set <> ".") <> name - printState set = Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms - makeJobSearchLink set linkLabel= makeSearchLink evalId linkLabel (makePkgName set) + printRow :: PkgSet -> Text + printRow (PkgSet set) = + " - " <> printState (PkgSet set) <> " " <> + makeJobSearchLink (PkgSet set) (if Text.null set then "toplevel" else set) + + printSingleRow set = + "- [ ] " <> printState set <> " " <> + makeJobSearchLink set (makePkgName set) <> " " <> maintainers + + makePkgName :: PkgSet -> Text + makePkgName (PkgSet set) = (if Text.null set then "" else set <> ".") <> name + + printState set = + Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms + + makeJobSearchLink :: PkgSet -> Text -> Text + makeJobSearchLink set linkLabel = makeSearchLink evalId linkLabel (makePkgName set) + + sets :: [PkgSet] sets = toList $ Set.fromList (fst <$> Map.keys mapping) + + platforms :: [Platform] platforms = toList $ Set.fromList (snd <$> Map.keys mapping) + label pf (BuildResult s i) = "[[" <> platformIcon pf <> icon s <> "]](https://hydra.nixos.org/build/" <> showT i <> ")" makeSearchLink :: Int -> Text -> Text -> Text @@ -396,78 +581,184 @@ jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKe details :: Text -> [Text] -> [Text] details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""] -printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text -printBuildSummary - Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} - fetchTime - summary - topBrokenRdeps = - Text.unlines $ - headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] - <> totals - <> optionalList "#### Maintained packages with build failure" (maintainedList fails) - <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) - <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) - <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) - <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) - <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) - <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) - <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] - <> footer - where - footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"] - totals = - [ "#### Build summary" - , "" - ] - <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - headline = - [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , "*evaluation [" - <> showT id - <> "](https://hydra.nixos.org/eval/" - <> showT id - <> ") of nixpkgs commit [" - <> Text.take 7 revision - <> "](https://github.com/NixOS/nixpkgs/commits/" - <> revision - <> ") as of " - <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) - <> "*" - ] - brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " - numSummary = statusToNumSummary summary - jobsByState predicate = Map.filter (predicate . worstState) summary - worstState = foldl' min Success . fmap state . summaryBuilds - fails = jobsByState (== Failed) - failedDeps = jobsByState (== DependencyFailed) - unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) - withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) - withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) - optionalList heading list = if null list then mempty else [heading] <> list - optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list - maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer - unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer - 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** (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." <> - if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> - if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." - errors = - if' (isNothing mergeableJob) "No `mergeable` job found." <> - if' (isNothing maintainedJob) "No `maintained` job found." <> - if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> - if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." - if' p e = if p then [e] else mempty - outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m - maintainedJob = Map.lookup "maintained" summary - mergeableJob = Map.lookup "mergeable" summary +evalLine :: Eval -> UTCTime -> Text +evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime = + "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" + +printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(PkgName, Int)] -> Text +printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = + Text.unlines $ + headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] + <> totals + <> optionalList "#### Maintained Linux packages with build failure" (maintainedList (fails summaryLinux)) + <> optionalList "#### Maintained Linux packages with failed dependency" (maintainedList (failedDeps summaryLinux)) + <> optionalList "#### Maintained Linux packages with unknown error" (maintainedList (unknownErr summaryLinux)) + <> optionalHideableList "#### Maintained Darwin packages with build failure" (maintainedList (fails summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with failed dependency" (maintainedList (failedDeps summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with unknown error" (maintainedList (unknownErr summaryDarwin)) + <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList (fails summary)) + <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList (failedDeps summary)) + <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList (unknownErr summary)) + <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) + <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] + <> footer + where + footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , evalLine eval fetchTime + ] + + totals :: [Text] + totals = + [ "#### Build summary" + , "" + ] <> + printTable + "Platform" + (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) + (\x -> showT x <> " " <> icon x) + showT + numSummary + + brokenLine :: (PkgName, Int) -> Text + brokenLine (PkgName name, rdeps) = + "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> + ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + + numSummary = statusToNumSummary summary + + summaryLinux :: StatusSummary + summaryLinux = withOS Linux summary + + summaryDarwin :: StatusSummary + summaryDarwin = withOS Darwin summary + + -- Remove all BuildResult from the Table that have Platform that isn't for + -- the given OS. + tableForOS :: OS -> Table PkgSet Platform BuildResult -> Table PkgSet Platform BuildResult + tableForOS os = filterWithKeyTable (\_ platform _ -> platformIsOS os platform) + + -- Remove all BuildResult from the StatusSummary that have a Platform that + -- isn't for the given OS. Completely remove all PkgName from StatusSummary + -- that end up with no BuildResults. + withOS + :: OS + -> StatusSummary + -> StatusSummary + withOS os = + Map.mapMaybe + (\e@SummaryEntry{summaryBuilds} -> + let buildsForOS = tableForOS os summaryBuilds + in if nullTable buildsForOS then Nothing else Just e { summaryBuilds = buildsForOS } + ) + + jobsByState :: (BuildState -> Bool) -> StatusSummary -> StatusSummary + jobsByState predicate = Map.filter (predicate . worstState) + + worstState :: SummaryEntry -> BuildState + worstState = foldl' min Success . fmap state . summaryBuilds + + fails :: StatusSummary -> StatusSummary + fails = jobsByState (== Failed) + + failedDeps :: StatusSummary -> StatusSummary + failedDeps = jobsByState (== DependencyFailed) + + unknownErr :: StatusSummary -> StatusSummary + unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) + + withMaintainer :: StatusSummary -> Map PkgName (Table PkgSet Platform BuildResult, NonEmpty Text) + withMaintainer = + Map.mapMaybe + (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + + withoutMaintainer :: StatusSummary -> StatusSummary + withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) + + optionalList :: Text -> [Text] -> [Text] + optionalList heading list = if null list then mempty else [heading] <> list + + optionalHideableList :: Text -> [Text] -> [Text] + optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list + + maintainedList :: StatusSummary -> [Text] + maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer + + summaryEntryGetReverseDeps :: SummaryEntry -> (Int, Int) + summaryEntryGetReverseDeps sumEntry = + ( negate $ summaryUnbrokenReverseDeps sumEntry + , negate $ summaryReverseDeps sumEntry + ) + + sortOnReverseDeps :: [(PkgName, SummaryEntry)] -> [(PkgName, SummaryEntry)] + sortOnReverseDeps = sortOn (\(_, sumEntry) -> summaryEntryGetReverseDeps sumEntry) + + unmaintainedList :: StatusSummary -> [Text] + unmaintainedList = showBuild <=< sortOnReverseDeps . Map.toList . withoutMaintainer + + showBuild :: (PkgName, SummaryEntry) -> [Text] + 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 + :: (PkgName, (Table PkgSet Platform BuildResult, NonEmpty Text)) -> [Text] + showMaintainedBuild (name, (table, maintainers)) = + printJob + id + name + ( table + , Text.intercalate " " (fmap ("@" <>) (toList maintainers)) + ) + + tldr = case (errors, warnings) of + ([],[]) -> [":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." <> + if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> + if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." + errors = + if' (isNothing mergeableJob) "No `mergeable` job found." <> + if' (isNothing maintainedJob) "No `maintained` job found." <> + if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> + if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." + + if' p e = if p then [e] else mempty + + outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m + + maintainedJob = Map.lookup (PkgName "maintained") summary + mergeableJob = Map.lookup (PkgName "mergeable") summary + +printEvalInfo :: IO () +printEvalInfo = do + (eval, fetchTime, _) <- readBuildReports + putStrLn (Text.unpack $ evalLine eval fetchTime) printMaintainerPing :: IO () printMaintainerPing = do @@ -477,12 +768,32 @@ printMaintainerPing = do let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap pure (rdepMap, tops) (eval, fetchTime, buildReport) <- readBuildReports - putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap reverseDependencyMap buildReport) topBrokenRdeps)) + let statusSummaries = + fmap (buildToStatusSummary maintainerMap reverseDependencyMap) buildReport + buildSum :: StatusSummary + buildSum = combineStatusSummaries statusSummaries + textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps + Text.putStrLn textBuildSummary printMarkBrokenList :: IO () printMarkBrokenList = do - (_, _, buildReport) <- readBuildReports - forM_ buildReport \Build{buildstatus, job} -> - case (buildstatus, Text.splitOn "." job) of - (Just 1, ["haskellPackages", name, "x86_64-linux"]) -> putStrLn $ " - " <> Text.unpack name + (_, fetchTime, buildReport) <- readBuildReports + runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} -> + case (getBuildState build, Text.splitOn "." $ unJobName job) of + (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do + -- Fetch build log from hydra to figure out the cause of the error. + build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"] + -- We use the last probable error cause found in the build log file. + let error_message = fromMaybe " failure " $ safeLast $ mapMaybe probableErrorCause build_log + liftIO $ putStrLn $ " - " <> Text.unpack name <> " # " <> error_message <> " in job https://hydra.nixos.org/build/" <> show id <> " at " <> formatTime defaultTimeLocale "%Y-%m-%d" fetchTime _ -> pure () + +{- | This function receives a line from a Nix Haskell builder build log and returns a possible error cause. + | We might need to add other causes in the future if errors happen in unusual parts of the builder. +-} +probableErrorCause :: ByteString -> Maybe String +probableErrorCause "Setup: Encountered missing or private dependencies:" = Just "dependency missing" +probableErrorCause "running tests" = Just "test failure" +probableErrorCause build_line | ByteString.isPrefixOf "Building" build_line = Just ("failure building " <> fromUTF8BS (fst $ ByteString.breakSubstring " for" $ ByteString.drop 9 build_line)) +probableErrorCause build_line | ByteString.isSuffixOf "Phase" build_line = Just ("failure in " <> fromUTF8BS build_line) +probableErrorCause _ = Nothing diff --git a/maintainers/scripts/haskell/maintainer-handles.nix b/maintainers/scripts/haskell/maintainer-handles.nix index 08c6bc4c96afd..d650e82f8b0c1 100644 --- a/maintainers/scripts/haskell/maintainer-handles.nix +++ b/maintainers/scripts/haskell/maintainer-handles.nix @@ -1,7 +1,21 @@ # Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. +# +# This script produces an attr set mapping of email addresses to GitHub handles: +# +# ```nix +# > import ./maintainer-handles.nix +# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... } +# ``` +# +# This mapping contains all maintainers in ../../mainatainer-list.nix, but it +# ignores maintainers who don't have a GitHub account or an email address. let pkgs = import ../../.. {}; maintainers = import ../../maintainer-list.nix; inherit (pkgs) lib; - mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {}; + mkMailGithubPair = _: maintainer: + if (maintainer ? email) && (maintainer ? github) then + { "${maintainer.email}" = maintainer.github; } + else + {}; in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 97dd5be8aaa65..2624311aac9db 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -32,8 +32,7 @@ EOF sort -iu "$tmpfile" >> "$broken_config" clear="env -u HOME -u NIXPKGS_CONFIG" $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh -$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh +evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config @@ -42,6 +41,8 @@ git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: mark builds failing on hydra as broken -This commit has been generated by maintainers/scripts/haskell/mark-broken.sh +This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on +$evalline +from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates EOF fi diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 9e6ebafaccc86..8b292ca50c8c9 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -85,7 +85,8 @@ echo "Updating Stackage..." echo "Updating Hackage hashes..." ./maintainers/scripts/haskell/update-hackage.sh --do-commit echo "Regenerating Hackage packages..." -./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit +# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check. +./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit # Push these new commits to the haskell-updates branch echo "Pushing commits just created to the remote haskell-updates branch..." @@ -112,6 +113,8 @@ The short version is this: * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. * If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) +More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell). + --- This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 9d51eb4ca4afd..96a18aa8ed87f 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,40 +1,114 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. -# This script is used to regenerate nixpkgs' Haskell package set, using the -# tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the -# config files in pkgs/development/haskell-modules/configuration-hackage2nix -# and generates a Nix expression for package version specified there, using the -# Cabal files from the Hackage database (available under all-cabal-hashes) and -# its companion tool cabal2nix. -# -# Related scripts are update-hackage.sh, for updating the snapshot of the -# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, -# for updating the version of hackage2nix used to perform this task. - set -euo pipefail +self=$0 + +print_help () { +cat <<END_HELP +Usage: $self [options] + +Options: + --do-commit Commit changes to this file. + -f | --fast Do not update the transitive-broken.yaml file. + -h | --help Show this help. + +This script is used to regenerate nixpkgs' Haskell package set, using the +tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the +config files in pkgs/development/haskell-modules/configuration-hackage2nix +and generates a Nix expression for package version specified there, using the +Cabal files from the Hackage database (available under all-cabal-hashes) and +its companion tool cabal2nix. + +Unless --fast is used, it will then use the generated nix expression by +running regenerate-transitive-broken-packages.sh which updates the transitive-broken.yaml +file. Then it re-runs hackage2nix. + +Related scripts are update-hackage.sh, for updating the snapshot of the +Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, +for updating the version of hackage2nix used to perform this task. + +Note that this script doesn't gcroot anything, so it may be broken by an +unfortunately timed nix-store --gc. + +END_HELP +} + +DO_COMMIT=0 +REGENERATE_TRANSITIVE=1 + +options=$(getopt -o "fh" -l "help,fast,do-commit" -- "$@") + +eval set -- "$options" + +while true; do + case "$1" in + --do-commit) + DO_COMMIT=1 + ;; + -f|--fast) + REGENERATE_TRANSITIVE=0 + ;; + -h|--help) + print_help + exit 0 + ;; + --) + break;; + *) + print_help + exit 1 + ;; + esac + shift +done + HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # To prevent hackage2nix fails because of encoding. # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 -extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' -unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix -echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." +run_hackage2nix() { "$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ --nixpkgs "$PWD" \ + --config "$compiler_config" \ --config "$config_dir/main.yaml" \ --config "$config_dir/stackage.yaml" \ --config "$config_dir/broken.yaml" \ --config "$config_dir/transitive-broken.yaml" +} + +echo "Obtaining Hackage data …" +extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' +unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" + +echo "Generating compiler configuration …" +compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfig --no-out-link)" + +echo "Running hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix …" +run_hackage2nix + +if [[ "$REGENERATE_TRANSITIVE" -eq 1 ]]; then + +echo "Regenerating transitive-broken.yaml … (pass --fast to $self to skip this step)" + +maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh + +echo "Running hackage2nix again to reflect changes in transitive-broken.yaml …" + +run_hackage2nix + +fi + -if [[ "${1:-}" == "--do-commit" ]]; then +if [[ "$DO_COMMIT" -eq 1 ]]; then +git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: regenerate package set based on current config diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 94104e00edb81..a317dba4d4e77 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,9 +1,18 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. +#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=. + +set -euo pipefail + +TMP_TEMPLATE=transitive-broken.XXXXXXX +readonly TMP_TEMPLATE + +tmpfile=$(mktemp "$TMP_TEMPLATE") + +trap 'rm -f "${tmpfile}"' 0 config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml -cat > $config_file << EOF +cat > $tmpfile << EOF # This file is automatically generated by # maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh # It is supposed to list all haskellPackages that cannot evaluate because they @@ -11,5 +20,6 @@ cat > $config_file << EOF dont-distribute-packages: EOF -echo "Regenerating list of transitive broken packages ..." -echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file +nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile + +mv $tmpfile $config_file diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix index 12287896b50df..8473ed4db8a2c 100644 --- a/maintainers/scripts/haskell/test-configurations.nix +++ b/maintainers/scripts/haskell/test-configurations.nix @@ -66,6 +66,28 @@ let if !builtins.isList files then [ files ] else files ); + packageSetsWithVersionedHead = pkgs.haskell.packages // ( + let + headSet = pkgs.haskell.packages.ghcHEAD; + # Determine the next GHC release version following GHC HEAD. + # GHC HEAD always has an uneven, tentative version number, e.g. 9.7. + # GHC releases always have even numbers, i.e. GHC 9.8 is branched off from + # GHC HEAD 9.7. Since we use the to be release number for GHC HEAD's + # configuration file, we need to calculate this here. + headVersion = lib.pipe headSet.ghc.version [ + lib.versions.splitVersion + (lib.take 2) + lib.concatStrings + lib.strings.toInt + (builtins.add 1) + toString + ]; + in + { + "ghc${headVersion}" = headSet; + } + ); + setsForFile = fileName: let # extract the unique part of the config's file name @@ -77,12 +99,12 @@ let builtins.match "ghc-([0-9]+).([0-9]+).x" configName ); # return all package sets under haskell.packages matching the version components - setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) ( + setsForVersion = builtins.map (name: packageSetsWithVersionedHead.${name}) ( builtins.filter (setName: lib.hasPrefix "ghc${configVersion}" setName && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName)) ) ( - builtins.attrNames pkgs.haskell.packages + builtins.attrNames packageSetsWithVersionedHead ) ); diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix index d4ddaa9576587..50ccb14577bc1 100644 --- a/maintainers/scripts/haskell/transitive-broken-packages.nix +++ b/maintainers/scripts/haskell/transitive-broken-packages.nix @@ -12,5 +12,5 @@ let (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); in '' - ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} + ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} '' diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index f1f04cdf45043..4fee4330843ff 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -40,6 +40,7 @@ sed -r \ -e 's|^constraints:||' \ -e 's|^ +| - |' \ -e 's|,$||' \ + -e '/^with-compiler:/d' \ -e '/installed$/d' \ -e '/^$/d' \ < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}" @@ -57,15 +58,20 @@ sed -r \ -e '/ distribution-nixpkgs /d' \ -e '/ jailbreak-cabal /d' \ -e '/ language-nix /d' \ + -e '/ hackage-db /d' \ -e '/ cabal-install /d' \ -e '/ lsp /d' \ -e '/ lsp-types /d' \ -e '/ lsp-test /d' \ -e '/ hie-bios /d' \ + -e '/ ShellCheck /d' \ + -e '/ Agda /d' \ < "${tmpfile_new}" >> $stackage_config # Explanations: # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. # lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage. +# ShellCheck: latest version of command-line dev tool. +# Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs. if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 8c39d289f7aaa..86fecbc3d87c9 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -15,8 +15,29 @@ # password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.) # Those fields are specified under `upload` on the `cabal` man page. +if test -z "$CABAL_DIR"; then + dirs=( + "$HOME/.cabal" + "${XDG_CONFIG_HOME:-$HOME/.config}/cabal" + ) + missing=true + + for dir in "${dirs[@]}"; do + if test -d "$dir"; then + export CABAL_DIR="$dir" + missing=false + break + fi + done + + if $missing; then + echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2 + exit 101 + fi +fi + package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" -username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") -password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") +username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") +password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv echo diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 49bc50ae61314..e93ceeebc94f7 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -11,6 +11,7 @@ compat53,,,,0.7-1,,vcunat cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat +cyan,,,,,, cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, @@ -18,6 +19,7 @@ fennel,,,,,,misterio77 fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, +haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, @@ -31,13 +33,14 @@ lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, -lpeglabel,,,,,, +lpeglabel,,,,1.6.0,, lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, +lua-curl,,,,,, lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, @@ -64,6 +67,7 @@ luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, luafilesystem,,,,1.8.0-1,,flosse +lualdap,,,,,,aanderse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc @@ -79,7 +83,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.43.0-0,, +luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc markdown,,,,,, @@ -99,6 +103,9 @@ sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp +teal-language-server,,,http://luarocks.org/dev,,, +telescope.nvim,,,,,5.1, +telescope-manix,,,,,, tl,,,,,,mephistophiles vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 9f9833d406073..bf48a53186119 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -9,15 +9,14 @@ stdenv.mkDerivation { perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; - phases = [ "installPhase" ]; + dontUnpack = true; - installPhase = - '' - mkdir -p $out/bin - cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan - patchShebangs $out/bin/nix-generate-from-cpan - wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB - ''; + installPhase = '' + mkdir -p $out/bin + cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan + patchShebangs $out/bin/nix-generate-from-cpan + wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB + ''; meta = { maintainers = with lib.maintainers; [ eelco ]; diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 3341fea29106b..7c6cfd4fed7f0 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,4 +1,7 @@ -# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py +# python library used to update plugins: +# - pkgs/applications/editors/vim/plugins/update.py +# - pkgs/applications/editors/kakoune/plugins/update.py +# - maintainers/scripts/update-luarocks-packages # format: # $ nix run nixpkgs.python3Packages.black -c black update.py @@ -315,10 +318,10 @@ 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) + log.debug("Running command %s", " ".join(cmd)) out = subprocess.check_output(cmd) - data = json.loads(out) - return data + data = json.loads(out) + return data class Editor: @@ -344,12 +347,39 @@ class Editor: self.cache_file = cache_file or f"{name}-plugin-cache.json" self.nixpkgs_repo = None + def add(self, args): + '''CSV spec''' + log.debug("called the 'add' command") + fetch_config = FetchConfig(args.proc, args.github_token) + editor = self + for plugin_line in args.add_plugins: + log.debug("using plugin_line", plugin_line) + pdesc = PluginDesc.load_from_string(fetch_config, plugin_line) + log.debug("loaded as pdesc", pdesc) + append = [ pdesc ] + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append) + plugin, _ = prefetch_plugin(pdesc, ) + autocommit = not args.no_commit + if autocommit: + commit( + editor.nixpkgs_repo, + "{drv_name}: init at {version}".format( + drv_name=editor.get_drv_name(plugin.normalized_name), + version=plugin.version + ), + [args.outfile, args.input_file], + ) + + # Expects arguments generated by 'update' subparser + def update(self, args ): + '''CSV spec''' + print("the update member function should be overriden in subclasses") + def get_current_plugins(self) -> List[Plugin]: """To fill the cache""" data = run_nix_expr(self.get_plugins) plugins = [] 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 @@ -358,7 +388,7 @@ class Editor: '''CSV spec''' return load_plugins_from_csv(config, plugin_file) - def generate_nix(self, plugins, outfile: str): + def generate_nix(self, _plugins, _outfile: str): '''Returns nothing for now, writes directly to outfile''' raise NotImplementedError() @@ -395,34 +425,28 @@ class Editor: return rewrite_input(*args, **kwargs) def create_parser(self): - parser = argparse.ArgumentParser( + common = argparse.ArgumentParser( + add_help=False, description=(f""" Updates nix derivations for {self.name} plugins.\n By default from {self.default_in} to {self.default_out}""" ) ) - parser.add_argument( - "--add", - dest="add_plugins", - default=[], - action="append", - help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo", - ) - parser.add_argument( + common.add_argument( "--input-names", "-i", dest="input_file", default=self.default_in, help="A list of plugins in the form owner/repo", ) - parser.add_argument( + common.add_argument( "--out", "-o", dest="outfile", default=self.default_out, help="Filename to save generated nix code", ) - parser.add_argument( + common.add_argument( "--proc", "-p", dest="proc", @@ -430,7 +454,7 @@ class Editor: default=30, help="Number of concurrent processes to spawn. Setting --github-token allows higher values.", ) - parser.add_argument( + common.add_argument( "--github-token", "-t", type=str, @@ -438,16 +462,61 @@ class Editor: help="""Allows to set --proc to higher values. Uses GITHUB_API_TOKEN environment variables as the default value.""", ) - parser.add_argument( + common.add_argument( "--no-commit", "-n", action="store_true", default=False, help="Whether to autocommit changes" ) - parser.add_argument( + common.add_argument( "--debug", "-d", choices=LOG_LEVELS.keys(), default=logging.getLevelName(logging.WARN), help="Adjust log level" ) - return parser + + main = argparse.ArgumentParser( + parents=[common], + description=(f""" + Updates nix derivations for {self.name} plugins.\n + By default from {self.default_in} to {self.default_out}""" + ) + ) + + subparsers = main.add_subparsers(dest="command", required=False) + padd = subparsers.add_parser( + "add", parents=[], + description="Add new plugin", + add_help=False, + ) + padd.set_defaults(func=self.add) + padd.add_argument( + "add_plugins", + default=None, + nargs="+", + help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo", + ) + + pupdate = subparsers.add_parser( + "update", + description="Update all or a subset of existing plugins", + add_help=False, + ) + pupdate.set_defaults(func=self.update) + return main + + def run(self,): + ''' + Convenience function + ''' + parser = self.create_parser() + args = parser.parse_args() + command = args.command or "update" + log.setLevel(LOG_LEVELS[args.debug]) + log.info("Chose to run command: %s", command) + + if not args.no_commit: + self.nixpkgs_repo = git.Repo(self.root, search_parent_directories=True) + + getattr(self, command)(args) + @@ -661,7 +730,6 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: def update_plugins(editor: Editor, args): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" - log.setLevel(LOG_LEVELS[args.debug]) log.info("Start updating plugins") fetch_config = FetchConfig(args.proc, args.github_token) update = editor.get_update(args.input_file, args.outfile, fetch_config) @@ -684,18 +752,3 @@ def update_plugins(editor: Editor, args): [args.outfile, args.input_file, editor.deprecated], ) - for plugin_line in args.add_plugins: - 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, _ = prefetch_plugin(pdesc, ) - if autocommit: - commit( - editor.nixpkgs_repo, - "{drv_name}: init at {version}".format( - drv_name=editor.get_drv_name(plugin.normalized_name), - version=plugin.version - ), - [args.outfile, args.input_file], - ) diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index c5629c829594d..8f04a9be4f174 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -100,11 +100,12 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: date_older_list.remove(line) continue - alias = before_equal.strip() + alias = before_equal + alias_unquoted = before_equal.strip('"') after_equal_list = [x.strip(";:") for x in after_equal.split()] converted = ( - f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" + f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by" f" '{after_equal_list.pop(0)}'\";" f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' ) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index f34aa53626dae..791cd8a1d89d9 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -26,7 +26,8 @@ log = logging.getLogger() log.addHandler(logging.StreamHandler()) ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore -from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment +import pluginupdate +from pluginupdate import update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -70,7 +71,7 @@ class LuaPlugin: return self.name.replace(".", "-") # rename Editor to LangUpdate/ EcosystemUpdater -class LuaEditor(Editor): +class LuaEditor(pluginupdate.Editor): def get_current_plugins(self): return [] @@ -87,6 +88,9 @@ class LuaEditor(Editor): luaPackages.append(plugin) return luaPackages + def update(self, args): + update_plugins(self, args) + def generate_nix( self, results: List[Tuple[LuaPlugin, str]], @@ -203,11 +207,7 @@ def main(): default_out = ROOT.joinpath(GENERATED_NIXFILE) ) - parser = editor.create_parser() - args = parser.parse_args() - - update_plugins(editor, args) - + editor.run() if __name__ == "__main__": diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix index a58674fca8d38..346b0319b08c9 100644 --- a/maintainers/scripts/update-luarocks-shell.nix +++ b/maintainers/scripts/update-luarocks-shell.nix @@ -2,7 +2,7 @@ }: with nixpkgs; let - pyEnv = python3.withPackages(ps: [ ps.GitPython ]); + pyEnv = python3.withPackages(ps: [ ps.gitpython ]); in mkShell { packages = [ diff --git a/maintainers/scripts/update-octave-packages b/maintainers/scripts/update-octave-packages new file mode 100755 index 0000000000000..00a1646184d52 --- /dev/null +++ b/maintainers/scripts/update-octave-packages @@ -0,0 +1,468 @@ +#!/usr/bin/env nix-shell +#!nix-shell update-octave-shell.nix -i python3 + +""" +Update a Octave package expression by passing in the `.nix` file, or the directory containing it. +You can pass in multiple files or paths. + +You'll likely want to use +`` + $ ./update-octave-libraries ../../pkgs/development/octave-modules/**/default.nix +`` +to update all non-pinned libraries in that folder. +""" + +import argparse +import os +import pathlib +import re +import requests +import yaml +from concurrent.futures import ThreadPoolExecutor as Pool +from packaging.version import Version as _Version +from packaging.version import InvalidVersion +from packaging.specifiers import SpecifierSet +import collections +import subprocess +import tempfile + +INDEX = "https://raw.githubusercontent.com/gnu-octave/packages/main/packages" +"""url of Octave packages' source on GitHub""" + +EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip'] +"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned.""" + +PRERELEASES = False + +GIT = "git" + +NIXPGKS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip() + +import logging +logging.basicConfig(level=logging.INFO) + + +class Version(_Version, collections.abc.Sequence): + + def __init__(self, version): + super().__init__(version) + # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21` + # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882 + self.raw_version = version + + def __getitem__(self, i): + return self._version.release[i] + + def __len__(self): + return len(self._version.release) + + def __iter__(self): + yield from self._version.release + + +def _get_values(attribute, text): + """Match attribute in text and return all matches. + + :returns: List of matches. + """ + regex = '{}\s+=\s+"(.*)";'.format(attribute) + regex = re.compile(regex) + values = regex.findall(text) + return values + +def _get_unique_value(attribute, text): + """Match attribute in text and return unique match. + + :returns: Single match. + """ + values = _get_values(attribute, text) + n = len(values) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return values[0] + else: + raise ValueError("no value found for {}".format(attribute)) + +def _get_line_and_value(attribute, text): + """Match attribute in text. Return the line and the value of the attribute.""" + regex = '({}\s+=\s+"(.*)";)'.format(attribute) + regex = re.compile(regex) + value = regex.findall(text) + n = len(value) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return value[0] + else: + raise ValueError("no value found for {}".format(attribute)) + + +def _replace_value(attribute, value, text): + """Search and replace value of attribute in text.""" + old_line, old_value = _get_line_and_value(attribute, text) + new_line = old_line.replace(old_value, value) + new_text = text.replace(old_line, new_line) + return new_text + + +def _fetch_page(url): + r = requests.get(url) + if r.status_code == requests.codes.ok: + return list(yaml.safe_load_all(r.content))[0] + else: + raise ValueError("request for {} failed".format(url)) + + +def _fetch_github(url): + headers = {} + token = os.environ.get('GITHUB_API_TOKEN') + if token: + headers["Authorization"] = f"token {token}" + r = requests.get(url, headers=headers) + + if r.status_code == requests.codes.ok: + return r.json() + else: + raise ValueError("request for {} failed".format(url)) + + +SEMVER = { + 'major' : 0, + 'minor' : 1, + 'patch' : 2, +} + + +def _determine_latest_version(current_version, target, versions): + """Determine latest version, given `target`, returning the more recent version. + """ + current_version = Version(current_version) + + def _parse_versions(versions): + for v in versions: + try: + yield Version(v) + except InvalidVersion: + pass + + versions = _parse_versions(versions) + + index = SEMVER[target] + + ceiling = list(current_version[0:index]) + if len(ceiling) == 0: + ceiling = None + else: + ceiling[-1]+=1 + ceiling = Version(".".join(map(str, ceiling))) + + # We do not want prereleases + versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) + + if ceiling is not None: + versions = SpecifierSet(f"<{ceiling}").filter(versions) + + return (max(sorted(versions))).raw_version + + +def _get_latest_version_octave_packages(package, extension, current_version, target): + """Get latest version and hash from Octave Packages.""" + url = "{}/{}.yaml".format(INDEX, package) + yaml = _fetch_page(url) + + versions = list(map(lambda pv: pv['id'], yaml['versions'])) + version = _determine_latest_version(current_version, target, versions) + + try: + releases = [v if v['id'] == version else None for v in yaml['versions']] + except KeyError as e: + raise KeyError('Could not find version {} for {}'.format(version, package)) from e + for release in releases: + if release['url'].endswith(extension): + sha256 = release['sha256'] + break + else: + sha256 = None + return version, sha256, None + + +def _get_latest_version_github(package, extension, current_version, target): + def strip_prefix(tag): + return re.sub("^[^0-9]*", "", tag) + + def get_prefix(string): + matches = re.findall(r"^([^0-9]*)", string) + return next(iter(matches), "") + + # when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set + # this allows us to work with packages which live outside of octave-modules + attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"octavePackages.{package}") + try: + homepage = subprocess.check_output( + ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\ + .decode('utf-8') + except Exception as e: + raise ValueError(f"Unable to determine homepage: {e}") + owner_repo = homepage[len("https://github.com/"):] # remove prefix + owner, repo = owner_repo.split("/") + + url = f"https://api.github.com/repos/{owner}/{repo}/releases" + all_releases = _fetch_github(url) + releases = list(filter(lambda x: not x['prerelease'], all_releases)) + + if len(releases) == 0: + raise ValueError(f"{homepage} does not contain any stable releases") + + versions = map(lambda x: strip_prefix(x['tag_name']), releases) + version = _determine_latest_version(current_version, target, versions) + + release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases)) + prefix = get_prefix(release['tag_name']) + try: + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\ + .decode('utf-8').strip() + except: + # this may fail if they have both a branch and a tag of the same name, attempt tag name + tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags") + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\ + .decode('utf-8').strip() + + + return version, sha256, prefix + +def _get_latest_version_git(package, extension, current_version, target): + """NOTE: Unimplemented!""" + # attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"octavePackages.{package}") + # try: + # download_url = subprocess.check_output( + # ["nix", "--extra-experimental-features", "nix-command", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.url"])\ + # .decode('utf-8') + # except Exception as e: + # raise ValueError(f"Unable to determine download link: {e}") + + # with tempfile.TemporaryDirectory(prefix=attr_path) as new_clone_location: + # subprocess.run(["git", "clone", download_url, new_clone_location]) + # newest_commit = subprocess.check_output( + # ["git" "rev-parse" "$(git branch -r)" "|" "tail" "-n" "1"]).decode('utf-8') + pass + + +FETCHERS = { + 'fetchFromGitHub' : _get_latest_version_github, + 'fetchurl' : _get_latest_version_octave_packages, + 'fetchgit' : _get_latest_version_git, +} + + +DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' + + +FORMATS = { + 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, +} + +def _determine_fetcher(text): + # Count occurrences of fetchers. + nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) + if nfetchers == 0: + raise ValueError("no fetcher.") + elif nfetchers > 1: + raise ValueError("multiple fetchers.") + else: + # Then we check which fetcher to use. + for fetcher in FETCHERS.keys(): + if 'src = {}'.format(fetcher) in text: + return fetcher + + +def _determine_extension(text, fetcher): + """Determine what extension is used in the expression. + + If we use: + - fetchPypi, we check if format is specified. + - fetchurl, we determine the extension from the url. + - fetchFromGitHub we simply use `.tar.gz`. + """ + if fetcher == 'fetchurl': + url = _get_unique_value('url', text) + extension = os.path.splitext(url)[1] + + elif fetcher == 'fetchFromGitHub' or fetcher == 'fetchgit': + if "fetchSubmodules" in text: + raise ValueError("fetchFromGitHub fetcher doesn't support submodules") + extension = "tar.gz" + + return extension + + +def _update_package(path, target): + + # Read the expression + with open(path, 'r') as f: + text = f.read() + + # Determine pname. Many files have more than one pname + pnames = _get_values('pname', text) + + # Determine version. + version = _get_unique_value('version', text) + + # First we check how many fetchers are mentioned. + fetcher = _determine_fetcher(text) + + extension = _determine_extension(text, fetcher) + + # Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo + successful_fetch = False + for pname in pnames: + if fetcher == "fetchgit": + logging.warning(f"You must update {pname} MANUALLY!") + return { 'path': path, 'target': target, 'pname': pname, + 'old_version': version, 'new_version': version } + try: + new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target) + successful_fetch = True + break + except ValueError: + continue + + if not successful_fetch: + raise ValueError(f"Unable to find correct package using these pnames: {pnames}") + + if new_version == version: + logging.info("Path {}: no update available for {}.".format(path, pname)) + return False + elif Version(new_version) <= Version(version): + raise ValueError("downgrade for {}.".format(pname)) + if not new_sha256: + raise ValueError("no file available for {}.".format(pname)) + + text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts + # sri hashes have been the default format since nix 2.4+ + sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + + + # fetchers can specify a sha256, or a sri hash + try: + text = _replace_value('sha256', sri_hash, text) + except ValueError: + text = _replace_value('hash', sri_hash, text) + + if fetcher == 'fetchFromGitHub': + # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` + # in which no string value is meant to be substituted. However, we can just overwrite the previous value. + regex = '(rev\s+=\s+[^;]*;)' + regex = re.compile(regex) + matches = regex.findall(text) + n = len(matches) + + if n == 0: + raise ValueError("Unable to find rev value for {}.".format(pname)) + else: + # forcefully rewrite rev, incase tagging conventions changed for a release + match = matches[0] + text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') + # incase there's no prefix, just rewrite without interpolation + text = text.replace('"${version}";', 'version;') + + with open(path, 'w') as f: + f.write(text) + + logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) + + result = { + 'path' : path, + 'target': target, + 'pname': pname, + 'old_version' : version, + 'new_version' : new_version, + #'fetcher' : fetcher, + } + + return result + + +def _update(path, target): + + # We need to read and modify a Nix expression. + if os.path.isdir(path): + path = os.path.join(path, 'default.nix') + + # If a default.nix does not exist, we quit. + if not os.path.isfile(path): + logging.info("Path {}: does not exist.".format(path)) + return False + + # If file is not a Nix expression, we quit. + if not path.endswith(".nix"): + logging.info("Path {}: does not end with `.nix`.".format(path)) + return False + + try: + return _update_package(path, target) + except ValueError as e: + logging.warning("Path {}: {}".format(path, e)) + return False + + +def _commit(path, pname, old_version, new_version, pkgs_prefix="octave: ", **kwargs): + """Commit result. + """ + + msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}' + + try: + subprocess.check_call([GIT, 'add', path]) + subprocess.check_call([GIT, 'commit', '-m', msg]) + except subprocess.CalledProcessError as e: + subprocess.check_call([GIT, 'checkout', path]) + raise subprocess.CalledProcessError(f'Could not commit {path}') from e + + return True + + +def main(): + + epilog = """ +environment variables: + GITHUB_API_TOKEN\tGitHub API token used when updating github packages + """ + parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog) + parser.add_argument('package', type=str, nargs='+') + parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') + parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') + parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use octavePackages.${pname}: instead of octave: ${pname}: when making commits') + + args = parser.parse_args() + target = args.target + + packages = list(map(os.path.abspath, args.package)) + + logging.info("Updating packages...") + + # Use threads to update packages concurrently + with Pool() as p: + results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages))) + + logging.info("Finished updating packages.") + + commit_options = {} + if args.use_pkgs_prefix: + logging.info("Using octavePackages. prefix for commits") + commit_options["pkgs_prefix"] = "octavePackages." + + # Commits are created sequentially. + if args.commit: + logging.info("Committing updates...") + # list forces evaluation + list(map(lambda x: _commit(**x, **commit_options), results)) + logging.info("Finished committing updates") + + count = len(results) + logging.info("{} package(s) updated".format(count)) + + +if __name__ == '__main__': + main() diff --git a/maintainers/scripts/update-octave-shell.nix b/maintainers/scripts/update-octave-shell.nix new file mode 100644 index 0000000000000..51d4844c79f34 --- /dev/null +++ b/maintainers/scripts/update-octave-shell.nix @@ -0,0 +1,12 @@ +{ nixpkgs ? import ../.. { } +}: +with nixpkgs; +let + pyEnv = python3.withPackages(ps: with ps; [ packaging requests toolz pyyaml ]); +in +mkShell { + packages = [ + pyEnv + nix-prefetch-scripts + ]; +} diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 4a6024c40380b..8717808daaf04 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,3 @@ -#!/bin/sh -build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"` -python=${build}/bin/python -exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ - +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git +exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 6543a6259828c..3aff32caf581a 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,3 +1,10 @@ +/* + To run: + + nix-shell maintainers/scripts/update.nix + + See https://nixos.org/manual/nixpkgs/unstable/#var-passthru-updateScript +*/ { package ? null , maintainer ? null , predicate ? null @@ -8,8 +15,6 @@ , commit ? null }: -# TODO: add assert statements - let pkgs = import ./../../default.nix ( if include-overlays == false then diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 7ae08958a1646..bbed2bda5e03f 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -100,7 +100,7 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra # Git can only handle a single index operation at a time async with merge_lock: await check_subprocess('git', 'add', *change['files'], cwd=worktree) - commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + commit_message = '{attrPath}: {oldVersion} -> {newVersion}'.format(**change) if 'commitMessage' in change: commit_message = change['commitMessage'] elif 'commitBody' in change: diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c75f9aa717739..cbf4b0dc480d6 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -81,6 +81,7 @@ with lib.maintainers; { # Verify additions to this team with at least one already existing member of the team. members = [ cdepillabout + wraithm ]; scope = "Group registration for packages maintained by Bitnomial."; shortName = "Bitnomial employees"; @@ -141,12 +142,24 @@ with lib.maintainers; { # gares has no entry in the maintainers list siraben vbgl + alizter ]; scope = "Maintain the Coq theorem prover and related packages."; shortName = "Coq"; enableFeatureFreezePing = true; }; + cuda = { + members = [ + connorbaker + samuela + SomeoneSerge + ]; + scope = "Maintain CUDA-enabled packages"; + shortName = "Cuda"; + githubTeams = [ "cuda-maintainers" ]; + }; + darwin = { members = [ toonn @@ -168,6 +181,15 @@ with lib.maintainers; { shortName = "Cosmopolitan"; }; + deepin = { + members = [ + rewine + ]; + scope = "Maintain deepin desktop environment and related packages."; + shortName = "DDE"; + enableFeatureFreezePing = true; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ @@ -210,6 +232,7 @@ with lib.maintainers; { docs = { members = [ + asymmetric ryantm ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; @@ -276,10 +299,13 @@ with lib.maintainers; { golang = { members = [ - c00w kalbasit mic92 zowoq + qbit + ]; + githubTeams = [ + "golang" ]; scope = "Maintain Golang compilers."; shortName = "Go"; @@ -302,6 +328,19 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + graalvm-ce = { + members = [ + bandresen + hlolli + glittershark + babariviere + ericdallo + thiagokokada + ]; + scope = "Maintain GraalVM Community Edition packages."; + shortName = "GraalVM-CE"; + }; + haskell = { members = [ cdepillabout @@ -397,6 +436,38 @@ with lib.maintainers; { shortName = "Linux Kernel"; }; + lisp = { + members = [ + raskin + lukego + nagy + uthar + hraban + ]; + githubTeams = [ + "lisp" + ]; + scope = "Maintain the Lisp ecosystem."; + shortName = "lisp"; + enableFeatureFreezePing = true; + }; + + llvm = { + members = [ + dtzWill + ericson2314 + lovek323 + primeos + qyliss + raitobezarius + rrbutani + sternenseemann + ]; + scope = "Maintain LLVM package sets and related packages"; + shortName = "LLVM"; + enableFeatureFreezePing = true; + }; + lumiguide = { # Verify additions by approval of an already existing member of the team. members = [ @@ -452,6 +523,7 @@ with lib.maintainers; { mate = { members = [ + bobby285271 j03 romildo ]; @@ -474,6 +546,17 @@ with lib.maintainers; { shortName = "Matrix"; }; + minimal-bootstrap = { + members = [ + artturin + emilytrau + ericson2314 + jk + ]; + scope = "Maintain the minimal-bootstrap toolchain and related packages."; + shortName = "Minimal Bootstrap"; + }; + mobile = { members = [ samueldr @@ -506,6 +589,18 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + node = { + members = [ + lilyinstarlight + marsam + winter + yuka + ]; + scope = "Maintain Node.js runtimes and build tooling."; + shortName = "Node.js"; + enableFeatureFreezePing = true; + }; + numtide = { members = [ mic92 @@ -663,11 +758,15 @@ with lib.maintainers; { rust = { members = [ - andir - lnl7 + figsoda mic92 + tjni + winter zowoq ]; + githubTeams = [ + "rust" + ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; shortName = "Rust"; enableFeatureFreezePing = true; @@ -731,6 +830,7 @@ with lib.maintainers; { vim = { members = [ + figsoda jonringer softinio teto @@ -741,7 +841,9 @@ with lib.maintainers; { xfce = { members = [ + bobby285271 romildo + muscaln ]; scope = "Maintain Xfce desktop environment and related packages."; shortName = "Xfce"; |