diff options
Diffstat (limited to 'maintainers')
47 files changed, 8966 insertions, 2549 deletions
diff --git a/maintainers/README.md b/maintainers/README.md new file mode 100644 index 0000000000000..5bb9c58db024b --- /dev/null +++ b/maintainers/README.md @@ -0,0 +1,167 @@ +# Nixpkgs Maintainers + +Unlike other packaging ecosystems, the maintainer doesn't have exclusive +control over the packages and modules they maintain. This more fluid approach +is one reason why we scale to so many packages. + +## Definition and role of the maintainer + +The main responsibility of a maintainer is to keep the packages they maintain +in a functioning state, and keep up with updates. In order to do that, they +are empowered to make decisions over the packages they maintain. + +That being said, the maintainer is not alone proposing changes to the +packages. Anybody (both bots and humans) can send PRs to bump or tweak the +package. + +We also allow other non-maintainer committers to merge changes to the package, +provided enough time and priority has been given to the maintainer. + +For most packages, we expect committers to wait at least a week before merging +changes not endorsed by a package maintainer (which may be themselves). This should leave enough time +for the maintainers to provide feedback. + +For critical packages, this convention needs to be negotiated with the +maintainer. A critical package is one that causes mass-rebuild, or where an +author is listed in the [`CODEOWNERS`](../.github/CODEOWNERS) file. + +In case of critical security updates, the [security team](https://nixos.org/community/teams/security) might override these +heuristics in order to get the fixes in as fast as possible. + +In case of conflict, the maintainer takes priority and is allowed to revert +the changes. This can happen for example if the maintainer was on holiday. + +### How to become a maintainer + +We encourage people who care about a package to assign themselves as a +maintainer. Commit access to the Nixpkgs repository is not required for that. + +In order to do so, add yourself to the +[`maintainer-list.nix`](./maintainer-list.nix), and then to the desired +package's `meta.maintainers` list, and send a PR with the changes. + +### How to lose maintainer status + +Maintainers who have become inactive on a given package can be removed. This +helps us keep an accurate view of the state of maintenance in Nixpkgs. + +The inactivity measure is currently not strictly enforced. We would typically +look at it if we notice that the author hasn't reacted to package-related +notifications for more than 3 months. + +Removing the maintainer happens by making a PR on the package, adding that +person as a reviewer, and then waiting a week for a reaction. + +The maintainer is welcome to come back at any time. + +### Tools for maintainers + +When a pull request is made against a package, OfBorg will notify the +appropriate maintainer(s). + +## Reviewing contributions + +### Individual maintainer list + +When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the following +checks should be performed: + +- If the user has specified a GPG key, verify that the commit is + signed by their key. + + First, validate that the commit adding the maintainer is signed by + the key the maintainer listed. Check out the pull request and + compare its signing key with the listed key in the commit. + + If the commit is not signed or it is signed by a different user, ask + them to either recommit using that key or to remove their key + information. + + Given a maintainer entry like this: + + ``` nix + { + example = { + email = "user@example.com"; + name = "Example User"; + keys = [{ + fingerprint = "0000 0000 2A70 6423 0AED 3C11 F04F 7A19 AAA6 3AFE"; + }]; + } + }; + ``` + + First receive their key from a keyserver: + + $ gpg --recv-keys 0xF04F7A19AAA63AFE + gpg: key 0xF04F7A19AAA63AFE: public key "Example <user@example.com>" imported + gpg: Total number processed: 1 + gpg: imported: 1 + + Then check the commit is signed by that key: + + $ git log --show-signature + commit b87862a4f7d32319b1de428adb6cdbdd3a960153 + gpg: Signature made Wed Mar 12 13:32:24 2003 +0000 + gpg: using RSA key 000000002A7064230AED3C11F04F7A19AAA63AFE + gpg: Good signature from "Example User <user@example.com> + Author: Example User <user@example.com> + Date: Wed Mar 12 13:32:24 2003 +0000 + + maintainers: adding example + + and validate that there is a `Good signature` and the printed key + matches the user's submitted key. + + Note: GitHub's "Verified" label does not display the user's full key + fingerprint, and should not be used for validating the key matches. + +- If the user has specified a `github` account name, ensure they have + also specified a `githubId` and verify the two match. + + Maintainer entries that include a `github` field must also include + their `githubId`. People can and do change their GitHub name + frequently, and the ID is used as the official and stable identity + of the maintainer. + + Given a maintainer entry like this: + + ``` nix + { + example = { + email = "user@example.com"; + name = "Example User"; + github = "ghost"; + githubId = 10137; + } + }; + ``` + + First, make sure that the listed GitHub handle matches the author of + the commit. + + Then, visit the URL `https://api.github.com/users/ghost` and + validate that the `id` field matches the provided `githubId`. + +### Maintainer teams + +Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) +when a group is collectively responsible for a collection of packages. +Use taste and personal judgement when deciding if a team is warranted. + +Teams are allowed to define their own rules about membership. + +For example, some teams will represent a business or other group which +wants to carefully track its members. Other teams may be very open about +who can join, and allow anybody to participate. + +When reviewing changes to a team, read the team's scope and the context +around the member list for indications about the team's membership +policy. + +In any case, request reviews from the existing team members. If the team +lists no specific membership policy, feel free to merge changes to the +team after giving the existing members a few days to respond. + +*Important:* If a team says it is a closed group, do not merge additions +to the team without an approval by at least one existing member. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fccde8a3e9db6..69e319863d0f6 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"; }]; @@ -18,13 +19,16 @@ where - `handle` is the handle you are going to use in nixpkgs expressions, - - `name` is your, preferably real, name, + - `name` is a name that people would know and recognize you by, - `email` is your maintainer email address, - `matrix` is your Matrix user ID, - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - `keys` is a list of your PGP/GPG key 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. @@ -46,7 +50,8 @@ More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. When editing this file: - * keep the list alphabetically sorted + * keep the list alphabetically sorted, check with: + nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix * test the validity of the format with: nix-build lib/tests/maintainers.nix @@ -59,6 +64,12 @@ githubId = 64707304; name = "Dmitry Kulikov"; }; + _0x120581f = { + email = "nixpkgs@0x120581f.dev"; + name = "0x120581f"; + github = "0x120581f"; + githubId = 130835755; + }; _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; matrix = "@0x4a6f:matrix.org"; @@ -72,7 +83,7 @@ _0xB10C = { email = "nixpkgs@b10c.me"; name = "0xB10C"; - github = "0xb10c"; + github = "0xB10C"; githubId = 19157360; }; _0xbe7a = { @@ -97,6 +108,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 +123,43 @@ }; _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; + }; + _21eleven = { + name = "Noah Lidell"; + email = "noahlidell@gmail.com"; + github = "21eleven"; + githubId = 8813855; + }; _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 +189,38 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _8-bit-fox = { + email = "sebastian@markwaerter.de"; + github = "8-bit-fox"; + githubId = 43320117; + name = "Sebastian Marquardt"; + }; + _9999years = { + email = "rbt@fastmail.com"; + github = "9999years"; + githubId = 15312184; + name = "Rebecca Turner"; + }; + _999eagle = { + email = "github@999eagle.moe"; + matrix = "@sophie:catgirl.cloud"; + github = "999eagle"; + githubId = 1221984; + name = "Sophie Tauchert"; + keys = [{ + fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; + }]; + }; + _9glenda = { + email = "plan9git@proton.me"; + matrix = "@9front:matrix.org"; + github = "9glenda"; + githubId = 69043370; + name = "9glenda"; + keys = [{ + fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; + }]; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -186,6 +246,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"; @@ -239,6 +311,12 @@ githubId = 1174810; name = "Nikolay Amiantov"; }; + abdiramen = { + email = "abdirahman.osmanthus@gmail.com"; + github = "Abdiramen"; + githubId = 15805292; + name = "Abdirahman Osman"; + }; abhi18av = { email = "abhi18av@gmail.com"; github = "abhi18av"; @@ -269,6 +347,12 @@ githubId = 2321000; name = "Ruslan Babayev"; }; + abustany = { + email = "adrien@bustany.org"; + github = "abustany"; + githubId = 2526296; + name = "Adrien Bustany"; + }; acairncross = { email = "acairncross@gmail.com"; github = "acairncross"; @@ -287,6 +371,15 @@ githubId = 124545; name = "Anthony Cowley"; }; + acuteenvy = { + matrix = "@acuteenvy:matrix.org"; + github = "acuteenvy"; + githubId = 126529524; + name = "Lena"; + keys = [{ + fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; + }]; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -306,6 +399,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 +418,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 +425,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"; @@ -356,6 +449,19 @@ githubId = 1250775; name = "Adolfo E. García Castro"; }; + adriandole = { + email = "adrian@dole.tech"; + github = "adriandole"; + githubId = 25236206; + name = "Adrian Dole"; + }; + adriangl = { + email = "adrian@lauterer.it"; + matrix = "@adriangl:pvv.ntnu.no"; + github = "adrlau"; + githubId = 25004152; + name = "Adrian Gunnar Lauterer"; + }; AdsonCicilioti = { name = "Adson Cicilioti"; email = "adson.cicilioti@live.com"; @@ -368,6 +474,15 @@ githubId = 315003; name = "Adam Saponara"; }; + adtya = { + email = "adtya@adtya.xyz"; + github = "adtya"; + githubId = 22346805; + name = "Adithya Nair"; + keys = [{ + fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; + }]; + }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; github = "AerialX"; @@ -434,6 +549,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahoneybun = { + email = "aaron@system76.com"; + github = "ahoneybun"; + githubId = 4884946; + name = "Aaron Honeycutt"; + }; ahrzb = { email = "ahrzb5@gmail.com"; github = "ahrzb"; @@ -470,12 +591,11 @@ githubId = 44871469; name = "Etienne Wodey"; }; - ajs124 = { - email = "nix@ajs124.de"; - matrix = "@andreas.schraegle:helsinki-systems.de"; - github = "ajs124"; - githubId = 1229027; - name = "Andreas Schrägle"; + aither64 = { + email = "aither@havefun.cz"; + github = "aither64"; + githubId = 4717906; + name = "Jakub Skokan"; }; ajgrf = { email = "a@ajgrf.com"; @@ -483,24 +603,31 @@ githubId = 10733175; name = "Alex Griffin"; }; + ajs124 = { + email = "nix@ajs124.de"; + matrix = "@andreas.schraegle:helsinki-systems.de"; + github = "ajs124"; + githubId = 1229027; + name = "Andreas Schrägle"; + }; 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 +640,24 @@ githubId = 1318982; name = "Anders Claesson"; }; + akechishiro = { + email = "akechishiro-aur+nixpkgs@lahfa.xyz"; + github = "AkechiShiro"; + githubId = 14914796; + name = "Samy Lahfa"; + }; + a-kenji = { + email = "aks.kenji@protonmail.com"; + github = "a-kenji"; + githubId = 65275785; + name = "Alexander Kenji Berthold"; + }; + akgrant43 = { + name = "Alistair Grant"; + email = "akg1012@fastmail.com.au"; + github = "akgrant43"; + githubId = 2062166; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; @@ -540,6 +685,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 +703,36 @@ githubId = 43479487; name = "Titouan Biteau"; }; + albertchae = { + github = "albertchae"; + githubId = 217050; + name = "Albert Chae"; + }; + aldoborrero = { + email = "aldoborrero+nixos@pm.me"; + github = "aldoborrero"; + githubId = 82811; + name = "Aldo Borrero"; + }; + alejandrosame = { + email = "alejandrosanchzmedina@gmail.com"; + matrix = "@alejandrosame:matrix.org"; + github = "alejandrosame"; + githubId = 1078000; + name = "Alejandro Sánchez Medina"; + }; + 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"; @@ -600,6 +781,12 @@ github = "Alexnortung"; githubId = 1552267; }; + alexoundos = { + email = "alexoundos@gmail.com"; + github = "AleXoundOS"; + githubId = 464913; + name = "Alexander Tomokhov"; + }; alexshpilkin = { email = "ashpilkin@gmail.com"; github = "alexshpilkin"; @@ -622,18 +809,18 @@ 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"; githubId = 5053729; name = "Alias Gram"; }; + alias-dev = { + email = "alias-dev@protonmail.com"; + github = "alias-dev"; + githubId = 30437811; + name = "Alex Andrews"; + }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alistairbill"; @@ -646,6 +833,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,14 +857,11 @@ githubId = 5892756; name = "Alec Snyder"; }; - AluisioASG = { - name = "Aluísio Augusto Silva Gonçalves"; - email = "aluisio@aasg.name"; - github = "AluisioASG"; - githubId = 1904165; - keys = [{ - fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; - }]; + allusive = { + email = "jasper@allusive.dev"; + name = "Allusive"; + github = "allusive-dev"; + githubId = 99632976; }; almac = { email = "alma.cemerlic@gmail.com"; @@ -679,12 +869,30 @@ 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"; @@ -700,11 +908,17 @@ fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; }]; }; + alxsimon = { + email = "alexis.simon@normalesup.org"; + github = "alxsimon"; + githubId = 9567176; + name = "Alexis Simon"; + }; 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"; }]; @@ -715,6 +929,12 @@ githubId = 160476; name = "Amanjeev Sethi"; }; + amanse = { + email = "amansetiarjp@gmail.com"; + github = "amanse"; + githubId = 13214574; + name = "Aman Setia"; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "Amar1729"; @@ -727,6 +947,12 @@ githubId = 153175; name = "Andrew Marshall"; }; + amaxine = { + email = "max@ine.dev"; + github = "amaxine"; + githubId = 35892750; + name = "Maxine Aubrey"; + }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; @@ -739,6 +965,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 +1005,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 +1017,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"; @@ -826,6 +1049,7 @@ }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; + matrix = "@anderson_torres:matrix.org"; github = "AndersonTorres"; githubId = 5954806; name = "Anderson Torres"; @@ -860,6 +1084,12 @@ githubId = 123550; name = "André Silva"; }; + andresnav = { + email = "nix@andresnav.com"; + github = "andres-nav"; + githubId = 118762770; + name = "Andres Navarro"; + }; andrestylianos = { email = "andre.stylianos@gmail.com"; github = "andrestylianos"; @@ -872,24 +1102,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"; @@ -897,7 +1133,6 @@ name = "Anders Sildnes"; }; andys8 = { - email = "andys8@users.noreply.github.com"; github = "andys8"; githubId = 13085980; name = "Andy"; @@ -908,6 +1143,17 @@ githubId = 2085567; name = "Aneesh Agrawal"; }; + an-empty-string = { + name = "Tris Emmy Wilson"; + email = "tris@tris.fyi"; + github = "an-empty-string"; + githubId = 681716; + }; + angaz = { + name = "Angus Dippenaar"; + github = "angaz"; + githubId = 10219618; + }; angristan = { email = "angristan@pm.me"; github = "angristan"; @@ -915,7 +1161,7 @@ name = "Stanislas Lange"; }; AngryAnt = { - name = "Emil Johansen"; + name = "Emil \"AngryAnt\" Johansen"; email = "git@eej.dk"; matrix = "@angryant:envs.net"; github = "AngryAnt"; @@ -960,17 +1206,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"; @@ -979,6 +1232,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"; @@ -991,6 +1260,9 @@ githubId = 48802534; name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; + keys = [{ + fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; + }]; }; anthonyroussel = { email = "anthony@roussel.dev"; @@ -1019,6 +1291,15 @@ githubId = 20933385; name = "Anton Latukha"; }; + antonmosich = { + email = "anton@mosich.at"; + github = "antonmosich"; + githubId = 27223336; + name = "Anton Mosich"; + keys = [ { + fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; + } ]; + }; antono = { email = "self@antono.info"; github = "antono"; @@ -1043,6 +1324,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"; @@ -1058,6 +1355,18 @@ githubId = 914687; name = "Alexis Praga"; }; + aprl = { + email = "aprl@acab.dev"; + github = "cutestnekoaqua"; + githubId = 30842467; + name = "April John"; + }; + aqrln = { + email = "nix@aqrln.net"; + github = "aqrln"; + githubId = 4923335; + name = "Alexey Orlenko"; + }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; @@ -1070,6 +1379,18 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + arcayr = { + email = "nix@arcayr.online"; + github = "arcayr"; + githubId = 11192354; + name = "Elliot Speck"; + }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; @@ -1077,7 +1398,6 @@ name = "Blaž Hrastnik"; }; arcnmx = { - email = "arcnmx@users.noreply.github.com"; github = "arcnmx"; githubId = 13426784; name = "arcnmx"; @@ -1088,6 +1408,12 @@ githubId = 59743220; name = "Vinícius Müller"; }; + arcuru = { + email = "patrick@jackson.dev"; + github = "arcuru"; + githubId = 160646; + name = "Patrick Jackson"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1100,6 +1426,18 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + argrat = { + email = "n.bertazzo@protonmail.com"; + github = "argrat"; + githubId = 98821629; + name = "Nicolò Bertazzo"; + }; + arian-d = { + email = "arianxdehghani@gmail.com"; + github = "arian-d"; + githubId = 40076285; + name = "Arian Dehghani"; + }; arianvp = { email = "arian.vanputten@gmail.com"; github = "arianvp"; @@ -1130,6 +1468,12 @@ githubId = 10400299; name = "Arjan Schrijver"; }; + arjix = { + email = "arjix@protonmail.com"; + github = "arjix"; + githubId = 62168569; + name = "arjix"; + }; arkivm = { email = "vikram186@gmail.com"; github = "arkivm"; @@ -1193,6 +1537,19 @@ githubId = 37193992; name = "Arthur Teisseire"; }; + arti5an = { + email = "artis4n@outlook.com"; + github = "arti5an"; + githubId = 14922630; + name = "Richard Smith"; + }; + artturin = { + email = "artturin@artturin.com"; + matrix = "@artturin:matrix.org"; + github = "Artturin"; + githubId = 56650223; + name = "Artturi N"; + }; arturcygan = { email = "arczicygan@gmail.com"; github = "arcz"; @@ -1212,6 +1569,15 @@ githubId = 1482768; name = "Benjamin Asbach"; }; + asciimoth = { + name = "Andrew"; + email = "ascii@moth.contact"; + github = "asciimoth"; + githubId = 91414737; + keys = [{ + fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F"; + }]; + }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; github = "ashalkhakov"; @@ -1230,24 +1596,41 @@ 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"; + }; + ashvith-shetty = { + github = "Ashvith10"; + githubId = 113123021; + name = "Ashvith Shetty"; + }; + aske = { + email = "aske@fmap.me"; + github = "aske"; + githubId = 869771; + name = "Kirill Boltaev"; + }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; githubId = 453170; name = "Alastair Pharo"; }; + astavie = { + email = "astavie@pm.me"; + github = "astavie"; + githubId = 7745457; + name = "Astavie"; + }; astro = { email = "astro@spaceboyz.net"; github = "astro"; @@ -1284,6 +1667,22 @@ fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; }]; }; + atalii = { + email = "taliauster@gmail.com"; + github = "atalii"; + githubId = 120901234; + name = "tali auster"; + matrix = "@atalii:matrix.org"; + }; + ataraxiasjel = { + email = "nix@ataraxiadev.com"; + github = "AtaraxiaSjel"; + githubId = 5314145; + name = "Dmitriy"; + keys = [{ + fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; + }]; + }; atemu = { name = "Atemu"; email = "atemu.main+nixpkgs@gmail.com"; @@ -1296,6 +1695,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"; @@ -1308,6 +1713,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"; @@ -1338,6 +1754,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"; @@ -1350,17 +1772,38 @@ 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"; githubId = 1217745; name = "Aldwin Vlasblom"; }; - aveltras = { - email = "romain.viallard@outlook.fr"; - github = "aveltras"; - githubId = 790607; - name = "Romain Viallard"; + averelld = { + email = "averell+nixos@rxd4.com"; + github = "averelld"; + githubId = 687218; + name = "averelld"; }; avery = { email = "averyl+nixos@protonmail.com"; @@ -1368,18 +1811,21 @@ githubId = 9147625; name = "Avery Lychee"; }; - averelld = { - email = "averell+nixos@rxd4.com"; - github = "averelld"; - githubId = 687218; - name = "averelld"; - }; avh4 = { email = "gruen0aermel@gmail.com"; github = "avh4"; githubId = 1222; name = "Aaron VonderHaar"; }; + aviallon = { + email = "antoine-nixos@lesviallon.fr"; + github = "aviallon"; + githubId = 7479436; + name = "Antoine Viallon"; + keys = [{ + fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; + }]; + }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; @@ -1401,24 +1847,22 @@ 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"; + aynish = { + github = "Chickensoupwithrice"; + githubId = 22575913; + name = "Anish Lakhwara"; }; azahi = { name = "Azat Bahawi"; @@ -1430,11 +1874,18 @@ 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"; + azazak123 = { + email = "azazaka2002@gmail.com"; + matrix = "@ne_dvoeshnik:matrix.org"; + name = "Volodymyr Antonov"; + github = "azazak123"; + githubId = 50211158; + }; + azd325 = { + email = "tim.kleinschmidt@gmail.com"; + github = "Azd325"; + githubId = 426541; + name = "Tim Kleinschmidt"; }; azuwis = { email = "azuwis@gmail.com"; @@ -1442,12 +1893,6 @@ 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"; @@ -1458,12 +1903,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 = { @@ -1475,6 +1920,12 @@ fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; }]; }; + babeuh = { + name = "Raphael Le Goaller"; + email = "babeuh@rlglr.fr"; + github = "babeuh"; + githubId = 60193302; + }; bachp = { email = "pascal.bach@nextrem.ch"; matrix = "@bachp:matrix.org"; @@ -1488,6 +1939,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"; @@ -1563,6 +2024,16 @@ fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; }]; }; + bastaynav = { + name = "Ivan Bastrakov"; + email = "bastaynav@proton.me"; + matrix = "@bastaynav:matrix.org"; + github = "bastaynav"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; basvandijk = { email = "v.dijk.bas@gmail.com"; github = "basvandijk"; @@ -1581,6 +2052,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"; @@ -1588,12 +2069,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"; @@ -1606,6 +2103,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"; @@ -1630,6 +2133,12 @@ githubId = 11135; name = "Berk D. Demir"; }; + bddvlpr = { + email = "luna@bddvlpr.com"; + github = "bddvlpr"; + githubId = 17461028; + name = "Luna Simons"; + }; bdesham = { email = "benjamin@esham.io"; github = "bdesham"; @@ -1648,6 +2157,12 @@ github = "beardhatcode"; githubId = 662538; }; + beeb = { + name = "Valentin Bersier"; + email = "hi@beeb.li"; + github = "beeb"; + githubId = 703631; + }; beezow = { name = "beezow"; email = "zbeezow@gmail.com"; @@ -1661,15 +2176,49 @@ 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"; + }]; + }; + Benjamin-L = { + name = "Benjamin Lee"; + email = "benjamin@computer.surgery"; + matrix = "@benjamin:computer.surgery"; + github = "Benjamin-L"; + githubId = 6504174; + keys = [{ + fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; + }]; + }; + benkuhn = { + email = "ben@ben-kuhn.com"; + github = "ben-kuhn"; + githubId = 16821405; + name = "Ben Kuhn"; + }; benley = { email = "benley@gmail.com"; github = "benley"; @@ -1682,15 +2231,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"; @@ -1704,11 +2244,17 @@ name = "Ben Pye"; }; benwbooth = { - email = "benwbooth@gmail.com"; + email = "benwboooth@gmail.com"; github = "benwbooth"; githubId = 75972; name = "Ben Booth"; }; + benwis = { + name = "Ben Wishovich"; + email = "ben@benw.is"; + github = "benwis"; + githubId = 6953353; + }; berberman = { email = "berberman@yandex.com"; matrix = "@berberman:mozilla.org"; @@ -1716,6 +2262,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"; @@ -1746,6 +2301,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"; @@ -1758,6 +2322,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"; @@ -1788,12 +2358,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"; @@ -1836,6 +2400,15 @@ github = "blaggacao"; githubId = 7548295; }; + blankparticle = { + name = "BlankParticle"; + email = "blankparticle@gmail.com"; + github = "BlankParticle"; + githubId = 130567419; + keys = [{ + fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; + }]; + }; blanky0230 = { email = "blanky0230@gmail.com"; github = "blanky0230"; @@ -1855,6 +2428,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"; @@ -1898,6 +2477,12 @@ githubId = 50839; name = "Brian Jones"; }; + boltzmannrain = { + email = "boltzmannrain@gmail.com"; + github = "boltzmannrain"; + githubId = 150560585; + name = "Dmitry Ivankov"; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -1908,26 +2493,24 @@ fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; }]; }; + booniepepper = { + name = "J.R. Hill"; + email = "justin@so.dang.cool"; + github = "booniepepper"; + githubId = 17605298; + }; bootstrap-prime = { email = "bootstrap.prime@gmail.com"; github = "bootstrap-prime"; 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"; - }]; + boozedog = { + email = "code@booze.dog"; + github = "boozedog"; + githubId = 1410808; + matrix = "@boozedog:matrix.org"; + name = "David A. Buser"; }; borisbabic = { email = "boris.ivan.babic@gmail.com"; @@ -1947,12 +2530,33 @@ 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"; githubId = 4621; name = "Brad Ediger"; }; + brahyerr = { + name = "Bryant Pham"; + email = "bp@1829847@gmail.com"; + github = "brahyerr"; + githubId = 120991075; + }; brainrape = { email = "martonboros@gmail.com"; github = "brainrake"; @@ -1971,12 +2575,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"; @@ -1995,45 +2617,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"; @@ -2056,6 +2639,18 @@ 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"; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -2087,12 +2682,6 @@ githubId = 37375448; name = "Buildit"; }; - bburdette = { - email = "bburdette@protonmail.com"; - github = "bburdette"; - githubId = 157330; - name = "Ben Burdette"; - }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; @@ -2105,18 +2694,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"; @@ -2135,6 +2724,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"; @@ -2150,18 +2745,39 @@ } ]; }; - 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:nixos.dev"; + 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"; + } + ]; + }; + CaitlinDavitt = { + email = "CaitlinDavitt@gmail.com"; + github = "CaitlinDavitt"; + githubId = 48105979; + name = "Caitlin Davitt"; + }; calavera = { email = "david.calavera@gmail.com"; github = "calavera"; @@ -2169,6 +2785,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"; @@ -2181,6 +2803,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + camelpunch = { + email = "me@andrewbruce.net"; + github = "camelpunch"; + githubId = 141733; + name = "Andrew Bruce"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -2193,6 +2821,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"; @@ -2205,12 +2839,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"; @@ -2223,6 +2851,21 @@ github = "scaredmushroom"; githubId = 45340040; }; + CaptainJawZ = { + email = "CaptainJawZ@outlook.com"; + name = "Danilo Reyes"; + github = "CaptainJawZ"; + githubId = 43111068; + }; + CardboardTurkey = { + name = "Kiran Ostrolenk"; + email = "kiran@ostrolenk.co.uk"; + github = "CardboardTurkey"; + githubId = 34030186; + keys = [{ + fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; + }]; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -2235,6 +2878,12 @@ githubId = 82591; name = "Carl Sverre"; }; + carlthome = { + name = "Carl Thomé"; + email = "carlthome@gmail.com"; + github = "carlthome"; + githubId = 1595907; + }; carpinchomug = { email = "aki.suda@protonmail.com"; github = "carpinchomug"; @@ -2265,6 +2914,18 @@ 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"; + githubId = 25623213; + name = "Philipp Böschen"; + }; caugner = { email = "nixos@caugner.de"; github = "caugner"; @@ -2278,12 +2939,30 @@ 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"; }; + cbourjau = { + email = "christianb@posteo.de"; + github = "cbourjau"; + githubId = 3288058; + name = "Christian Bourjau"; + }; + cbrewster = { + email = "cbrewster@hey.com"; + github = "cbrewster"; + githubId = 9086315; + name = "Connor Brewster"; + }; cburstedde = { email = "burstedde@ins.uni-bonn.de"; github = "cburstedde"; @@ -2293,6 +2972,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"; @@ -2300,11 +2985,12 @@ githubId = 64804; name = "Dennis Gosnell"; }; - ccellado = { - email = "annplague@gmail.com"; - github = "ccellado"; - githubId = 44584960; - name = "Denis Khalmatov"; + cdmistman = { + name = "Colton Donnelly"; + email = "colton@donn.io"; + matrix = "@donnellycolton:matrix.org"; + github = "cdmistman"; + githubId = 23486351; }; ceedubs = { email = "ceedubs@gmail.com"; @@ -2350,6 +3036,12 @@ } ]; }; + Ch1keen = { + email = "gihoong7@gmail.com"; + github = "Ch1keen"; + githubId = 40013212; + name = "Han Jeongjun"; + }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; @@ -2368,6 +3060,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"; @@ -2380,11 +3084,15 @@ githubId = 6608071; name = "Charles Huyghues-Despointes"; }; - chaoflow = { - email = "flo@chaoflow.net"; - github = "chaoflow"; - githubId = 89596; - name = "Florian Friesdorf"; + chayleaf = { + email = "chayleaf-nix@pavluk.org"; + github = "chayleaf"; + githubId = 9590981; + keys = [{ + fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; + }]; + matrix = "@chayleaf:matrix.pavluk.org"; + name = "Anna Pavlyuk"; }; chekoopa = { email = "chekoopa@mail.ru"; @@ -2392,6 +3100,12 @@ githubId = 1689801; name = "Mikhail Chekan"; }; + chen = { + email = "i@cuichen.cc"; + github = "cu1ch3n"; + githubId = 80438676; + name = "Chen Cui"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -2437,8 +3151,14 @@ githubId = 14790226; name = "Hubert Jasudowicz"; }; + c-h-johnson = { + name = "Charles Johnson"; + email = "charles@charlesjohnson.name"; + github = "c-h-johnson"; + githubId = 138403247; + }; chkno = { - email = "chuck@intelligence.org"; + email = "scottworley@scottworley.com"; github = "chkno"; githubId = 1118859; name = "Scott Worley"; @@ -2461,18 +3181,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"; @@ -2493,7 +3213,7 @@ }; christianharke = { email = "christian@harke.ch"; - github = "christianharke"; + github = "rake5k"; githubId = 13007345; name = "Christian Harke"; keys = [{ @@ -2501,7 +3221,6 @@ }]; }; christophcharles = { - email = "23055925+christophcharles@users.noreply.github.com"; github = "christophcharles"; githubId = 23055925; name = "Christoph Charles"; @@ -2512,6 +3231,20 @@ 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"; + }]; + }; + chrpinedo = { + github = "chrpinedo"; + githubId = 2324630; + name = "Christian Pinedo"; + }; chuahou = { email = "human+github@chuahou.dev"; github = "chuahou"; @@ -2567,7 +3300,7 @@ }; citadelcore = { email = "alex@arctarus.co.uk"; - github = "CitadelCore"; + github = "VertexA115"; githubId = 5567402; name = "Alex Zero"; keys = [{ @@ -2592,6 +3325,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"; @@ -2602,18 +3341,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"; @@ -2632,6 +3359,12 @@ githubId = 71959829; name = "Cleeyv"; }; + clerie = { + email = "nix@clerie.de"; + github = "clerie"; + githubId = 9381848; + name = "clerie"; + }; cleverca22 = { email = "cleverca22@gmail.com"; matrix = "@cleverca22:matrix.org"; @@ -2639,6 +3372,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"; @@ -2672,6 +3411,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"; @@ -2684,12 +3430,36 @@ githubId = 34317; name = "Corey O'Connor"; }; + code-asher = { + email = "ash@coder.com"; + github = "code-asher"; + githubId = 45609798; + name = "Asher"; + keys = [{ + fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; + }]; + }; + codec = { + email = "codec@fnord.cx"; + github = "codec"; + githubId = 118829; + name = "codec"; + }; CodeLongAndProsper90 = { github = "CodeLongAndProsper90"; githubId = 50145141; email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codifryed = { + email = "gb@guyboldon.com"; + name = "Guy Boldon"; + github = "codifryed"; + githubId = 27779510; + keys = [{ + fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; + }]; + }; codsl = { email = "codsl@riseup.net"; github = "codsl"; @@ -2702,6 +3472,12 @@ githubId = 5561189; name = "Cody Opel"; }; + coffeeispower = { + email = "tiagodinis33@proton.me"; + github = "coffee-is-power"; + name = "Tiago Dinis"; + githubId = 92828847; + }; cofob = { name = "Egor Ternovoy"; email = "cofob@riseup.net"; @@ -2731,6 +3507,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"; @@ -2744,16 +3537,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"; @@ -2767,42 +3550,24 @@ githubId = 244239; name = "Mauricio Collares"; }; + coloquinte = { + email = "gabriel.gouvine_nix@m4x.org"; + github = "coloquinte"; + githubId = 4102525; + name = "Gabriel Gouvine"; + }; + 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"; @@ -2816,11 +3581,18 @@ name = "Changsheng Wu"; githubId = 2083950; }; - contrun = { - email = "uuuuuu@protonmail.com"; - github = "contrun"; - githubId = 32609395; - name = "B YI"; + conni2461 = { + email = "simon.hauser@outlook.com"; + github = "Conni2461"; + name = "Simon Hauser"; + githubId = 15233006; + }; + connorbaker = { + email = "connor.baker@tweag.io"; + matrix = "@connorbaker:matrix.org"; + github = "connorbaker"; + name = "Connor Baker"; + githubId = 3880346; }; conradmearns = { email = "conradmearns+github@pm.me"; @@ -2828,6 +3600,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"; @@ -2843,6 +3633,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"; @@ -2855,6 +3663,11 @@ githubId = 411324; name = "Carles Pagès"; }; + cpcloud = { + name = "Phillip Cloud"; + github = "cpcloud"; + githubId = 417981; + }; cpu = { email = "daniel@binaryparadox.net"; github = "cpu"; @@ -2906,6 +3719,12 @@ githubId = 1222362; name = "Matías Lang"; }; + criyle = { + email = "i+nixos@goj.ac"; + name = "Yang Gao"; + githubId = 6821729; + github = "criyle"; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; @@ -2916,6 +3735,15 @@ fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; + Cryolitia = { + name = "Beiyan Cryolitia"; + email = "Cryolitia@gmail.com"; + github = "Cryolitia"; + githubId = 23723294; + keys = [{ + fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; + }]; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -2934,22 +3762,22 @@ githubId = 398996; name = "Christopher Singley"; }; - cstrahan = { - email = "charles@cstrahan.com"; - github = "cstrahan"; - githubId = 143982; - name = "Charles Strahan"; - }; cswank = { email = "craigswank@gmail.com"; github = "cswank"; githubId = 490965; name = "Craig Swank"; }; + ctron = { + email = "ctron@dentrassi.de"; + github = "ctron"; + githubId = 202474; + name = "Jens Reimann"; + }; 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"; @@ -2967,6 +3795,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"; @@ -2994,21 +3841,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"; @@ -3045,6 +3877,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"; @@ -3066,12 +3904,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"; @@ -3079,6 +3911,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"; @@ -3103,6 +3941,36 @@ githubId = 1298344; name = "Daniel Fullmer"; }; + danielrolls = { + email = "daniel.rolls.27@googlemail.com"; + github = "danielrolls"; + githubId = 50051176; + name = "Daniel Rolls"; + }; + danielsidhion = { + email = "nixpkgs@sidhion.com"; + github = "DanielSidhion"; + githubId = 160084; + name = "Daniel Sidhion"; + }; + daniyalsuri6 = { + email = "daniyal.suri@gmail.com"; + github = "daniyalsuri6"; + githubId = 107034852; + name = "Daniyal Suri"; + }; + dannixon = { + email = "dan@dan-nixon.com"; + github = "DanNixon"; + githubId = 4037377; + name = "Dan Nixon"; + matrix = "@dannixon:matrix.org"; + }; + dansbandit = { + github = "dansbandit"; + githubId = 4530687; + name = "dansbandit"; + }; danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; @@ -3113,11 +3981,11 @@ fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; }]; }; - dan4ik605743 = { - email = "6057430gu@gmail.com"; - github = "dan4ik605743"; - githubId = 86075850; - name = "Danil Danevich"; + dariof4 = { + name = "dariof4"; + email = "dazedtank@gmail.com"; + github = "dariof4"; + githubId = 9992814; }; darkonion0 = { name = "Alexandre Peruggia"; @@ -3132,13 +4000,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"; @@ -3148,6 +4009,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"; @@ -3155,23 +4023,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"; @@ -3187,16 +4054,34 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "davidarmstronglewis"; + github = "oceanlewis"; 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"; @@ -3206,18 +4091,42 @@ 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"; + }; + dawidd6 = { + email = "dawidd0811@gmail.com"; + github = "dawidd6"; + githubId = 9713907; + name = "Dawid Dziurla"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; githubId = 49904992; name = "Dawid Sowa"; }; + dbalan = { + email = "nix@dbalan.in"; + github = "dbalan"; + githubId = 223910; + name = "Dhananjay Balan"; + }; dbeckwith = { email = "djbsnx@gmail.com"; github = "dbeckwith"; @@ -3257,6 +4166,12 @@ githubId = 75067; name = "Daniel Duan"; }; + de11n = { + email = "nixpkgs-commits@deshaw.com"; + github = "de11n"; + githubId = 130508846; + name = "Elliot Cameron"; + }; dearrude = { name = "Ebrahim Nejati"; email = "dearrude@tfwno.gf"; @@ -3266,6 +4181,27 @@ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; + declan = { + name = "Declan Rixon"; + email = "declan.fraser.rixon@gmail.com"; + github = "DeclanRixon"; + githubId = 57464835; + }; + deejayem = { + email = "nixpkgs.bu5hq@simplelogin.com"; + github = "deejayem"; + githubId = 2564003; + name = "David Morgan"; + keys = [{ + fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; + }]; + }; + deemp = { + email = "deempleton@gmail.com"; + github = "deemp"; + githubId = 48378098; + name = "Danila Danko"; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -3278,6 +4214,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"; @@ -3291,7 +4238,6 @@ githubId = 1153808; }; deliciouslytyped = { - email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped"; githubId = 47436522; name = "deliciouslytyped"; @@ -3308,6 +4254,12 @@ githubId = 12224254; name = "Delta"; }; + delta231 = { + email = "swstkbaranwal@gmail.com"; + github = "Delta456"; + githubId = 28479139; + name = "Swastik Baranwal"; + }; deltadelta = { email = "contact@libellules.eu"; name = "Dara Ly"; @@ -3326,6 +4278,12 @@ githubId = 5503422; name = "Dmitriy Demin"; }; + demine = { + email = "riches_tweaks0o@icloud.com"; + github = "demine0"; + githubId = 51992962; + name = "Nikita Demin"; + }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; @@ -3344,6 +4302,12 @@ githubId = 706758; name = "Christian Gerbrandt"; }; + derdennisop = { + email = "dennish@wuitz.de"; + github = "derdennisop"; + githubId = 52411861; + name = "Dennis"; + }; derekcollison = { email = "derek@nats.io"; github = "derekcollison"; @@ -3387,6 +4351,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"; @@ -3399,6 +4382,13 @@ githubId = 17111639; name = "Devin Singh"; }; + devpikachu = { + email = "andrei.hava@proton.me"; + matrix = "@andrei:matrix.detpikachu.dev"; + github = "devpikachu"; + githubId = 30475873; + name = "Andrei Hava"; + }; devusb = { email = "mhelton@devusb.us"; github = "devusb"; @@ -3411,6 +4401,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"; @@ -3429,6 +4425,21 @@ 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"; + }]; + }; + dgollings = { + email = "daniel.gollings+nixpkgs@gmail.com"; + github = "dgollings"; + githubId = 2032823; + name = "Daniel Gollings"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -3448,7 +4459,6 @@ name = "David Leung"; }; DianaOlympos = { - email = "DianaOlympos@noreply.github.com"; github = "DianaOlympos"; githubId = 15774340; name = "Thomas Depierre"; @@ -3473,7 +4483,6 @@ }; diogox = { name = "Diogo Xavier"; - email = "13244408+diogox@users.noreply.github.com"; github = "diogox"; githubId = 13244408; }; @@ -3507,11 +4516,14 @@ githubId = 14034137; name = "Mostly Void"; }; - dizfer = { - email = "david@izquierdofernandez.com"; - github = "DIzFer"; - githubId = 8852888; - name = "David Izquierdo"; + ditsuke = { + name = "Tushar"; + email = "hello@ditsuke.com"; + github = "ditsuke"; + githubId = 72784348; + keys = [{ + fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; + }]; }; djacu = { email = "daniel.n.baker@gmail.com"; @@ -3561,6 +4573,11 @@ githubId = 997543; name = "Dmitry Malikov"; }; + DMills27 = { + github = "DMills27"; + githubId = 5251658; + name = "Dominic Mills"; + }; DmitryTsygankov = { email = "dmitry.tsygankov@gmail.com"; github = "DmitryTsygankov"; @@ -3585,6 +4602,12 @@ githubId = 1708810; name = "Daniel Vianna"; }; + dmytrokyrychuk = { + email = "dmytro@kyrych.uk"; + github = "dmytrokyrychuk"; + githubId = 699961; + name = "Dmytro Kyrychuk"; + }; dnr = { email = "dnr@dnr.im"; github = "dnr"; @@ -3603,18 +4626,47 @@ githubId = 126339; name = "Domen Kozar"; }; + DomesticMoth = { + name = "Andrew"; + email = "silkmoth@protonmail.com"; + github = "asciimoth"; + 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"; }; + donovanglover = { + github = "donovanglover"; + githubId = 2374245; + name = "Donovan Glover"; + keys = [{ + fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; + }]; + }; + doriath = { + email = "tomasz.zurkowski@gmail.com"; + github = "doriath"; + githubId = 150959; + name = "Tomasz Zurkowski"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; githubId = 10998835; name = "Doron Behar"; }; + dotemup = { + email = "dotemup.designs+nixpkgs@gmail.com"; + github = "dotemup"; + githubId = 11077277; + name = "Dote"; + }; dotlambda = { email = "rschuetz17@gmail.com"; matrix = "@robert:funklause.de"; @@ -3631,12 +4683,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"; @@ -3652,6 +4698,23 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + dpc = { + email = "dpc@dpc.pw"; + github = "dpc"; + githubId = 9209; + matrix = "@dpc:matrix.org"; + name = "Dawid Ciężarkiewicz"; + keys = [{ + fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; + }]; + }; + DPDmancul = { + name = "Davide Peressoni"; + email = "davide.peressoni@tuta.io"; + matrix = "@dpd-:matrix.org"; + github = "DPDmancul"; + githubId = 3186857; + }; dpercy = { email = "dpercy@dpercy.dev"; github = "dpercy"; @@ -3664,6 +4727,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"; @@ -3689,7 +4761,6 @@ name = "Dominik Ritter"; }; drperceptron = { - email = "92106371+drperceptron@users.noreply.github.com"; github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; @@ -3697,6 +4768,13 @@ fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; }]; }; + DrSensor = { + name = "Fahmi Akbar Wildana"; + email = "sensorfied@gmail.com"; + matrix = "@drsensor:matrix.org"; + github = "DrSensor"; + githubId = 4953069; + }; drupol = { name = "Pol Dellaiera"; email = "pol.dellaiera@protonmail.com"; @@ -3707,12 +4785,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"; @@ -3734,6 +4806,21 @@ githubId = 1931963; name = "David Sferruzza"; }; + dsuetin = { + name = "Danil Suetin"; + email = "suetin085+nixpkgs@protonmail.com"; + matrix = "@dani0854:matrix.org"; + github = "dani0854"; + githubId = 32674935; + keys = [{ + fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; + }]; + }; + dsymbol = { + name = "dsymbol"; + github = "dsymbol"; + githubId = 88138099; + }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; @@ -3758,6 +4845,16 @@ fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }]; }; + dunxen = { + email = "git@dunxen.dev"; + matrix = "@dunxen:x0f.org"; + github = "dunxen"; + githubId = 3072149; + name = "Duncan Dean"; + keys = [{ + fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; + }]; + }; dwarfmaster = { email = "nixpkgs@dwarfmaster.net"; github = "dwarfmaster"; @@ -3770,6 +4867,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"; @@ -3789,11 +4898,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"; @@ -3819,13 +4932,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"; @@ -3841,6 +4947,11 @@ githubId = 7875; name = "Rommel Martinez"; }; + eclairevoyant = { + github = "eclairevoyant"; + githubId = 848000; + name = "éclairevoyant"; + }; edanaher = { email = "nixos@edanaher.net"; github = "edanaher"; @@ -3859,65 +4970,26 @@ githubId = 1516017; name = "Ed Cragg"; }; + eddsteel = { + email = "edd@eddsteel.com"; + github = "eddsteel"; + githubId = 206872; + name = "Edd Steel"; + keys = [{ + fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0"; + }]; + }; edef = { email = "edef@edef.eu"; github = "edef1c"; githubId = 50854; name = "edef"; }; - 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"; + edeneast = { + email = "edenofest@gmail.com"; + github = "edeneast"; + githubId = 2746374; + name = "edeneast"; }; ederoyd46 = { email = "matt@ederoyd.co.uk"; @@ -3925,6 +4997,22 @@ githubId = 119483; name = "Matthew Brown"; }; + edlimerkaj = { + name = "Edli Merkaj"; + email = "edli.merkaj@identinet.io"; + github = "edlimerkaj"; + githubId = 71988351; + }; + 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"; github = "eduarrrd"; @@ -3955,6 +5043,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"; @@ -3973,6 +5067,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"; @@ -4004,23 +5104,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"; @@ -4047,11 +5141,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"; @@ -4059,6 +5153,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"; @@ -4067,10 +5191,47 @@ }; 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"; + }; + emilylange = { + email = "nix@emilylange.de"; + github = "emilylange"; + githubId = 55066419; + name = "Emily Lange"; + }; + emilytrau = { + name = "Emily Trau"; + email = "emily+nix@downunderctf.com"; + github = "emilytrau"; + githubId = 13267947; + }; emmabastas = { email = "emma.bastas@protonmail.com"; matrix = "@emmabastas:matrix.org"; @@ -4091,12 +5252,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"; @@ -4110,7 +5283,6 @@ name = "Ente"; }; Enzime = { - email = "enzime@users.noreply.github.com"; github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; @@ -4145,6 +5317,15 @@ githubId = 147284; name = "Jason Felice"; }; + ercao = { + email = "vip@ercao.cn"; + github = "ercao"; + githubId = 51725284; + name = "ercao"; + keys = [{ + fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; + }]; + }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; @@ -4195,6 +5376,20 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + ericthemagician = { + email = "eric@ericyen.com"; + matrix = "@eric:jupiterbroadcasting.com"; + github = "EricTheMagician"; + githubId = 323436; + name = "Eric Yen"; + }; + erikarvstedt = { + email = "erik.arvstedt@gmail.com"; + matrix = "@erikarvstedt:matrix.org"; + github = "erikarvstedt"; + githubId = 36110478; + name = "Erik Arvstedt"; + }; erikbackman = { email = "contact@ebackman.net"; github = "erikbackman"; @@ -4219,6 +5414,11 @@ githubId = 1583484; name = "Andrey Golovizin"; }; + errnoh = { + github = "errnoh"; + githubId = 373946; + name = "Erno Hopearuoho"; + }; ersin = { email = "me@ersinakinci.com"; github = "ersinakinci"; @@ -4231,8 +5431,12 @@ githubId = 1855930; name = "Ertugrul Söylemez"; }; + esau79p = { + github = "EsAu79p"; + githubId = 21313906; + name = "EsAu"; + }; esclear = { - email = "esclear@users.noreply.github.com"; github = "esclear"; githubId = 7432848; name = "Daniel Albert"; @@ -4265,12 +5469,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"; @@ -4297,12 +5513,25 @@ 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"; githubId = 1847524; name = "Evan Stoll"; }; + evanrichter = { + email = "evanjrichter@gmail.com"; + github = "evanrichter"; + githubId = 330292; + name = "Evan Richter"; + }; evax = { email = "nixos@evax.fr"; github = "evax"; @@ -4316,11 +5545,17 @@ name = "Eric Evenchick"; }; evenbrenden = { - email = "evenbrenden@gmail.com"; + email = "packages@anythingexternal.com"; github = "evenbrenden"; githubId = 2512008; name = "Even Brenden"; }; + evilmav = { + email = "elenskiy.ilya@gmail.com"; + github = "evilmav"; + githubId = 6803717; + name = "Ilya Elenskiy"; + }; evils = { email = "evils.devils@protonmail.com"; matrix = "@evils:nixos.dev"; @@ -4330,7 +5565,7 @@ }; ewok = { email = "ewok@ewok.ru"; - github = "ewok"; + github = "ewok-old"; githubId = 454695; name = "Artur Taranchiev"; }; @@ -4368,6 +5603,12 @@ fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; }]; }; + exploitoverload = { + email = "nix@exploitoverload.com"; + github = "exploitoverload"; + githubId = 99678549; + name = "Asier Armenteros"; + }; extends = { email = "sharosari@gmail.com"; github = "ImExtends"; @@ -4381,11 +5622,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"; @@ -4436,6 +5677,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"; @@ -4448,6 +5695,12 @@ githubId = 1276854; name = "Florian Peter"; }; + farnoy = { + email = "jakub@okonski.org"; + github = "farnoy"; + githubId = 345808; + name = "Jakub Okoński"; + }; fbeffa = { email = "beffa@fbengineering.ch"; github = "fedeinthemix"; @@ -4466,12 +5719,28 @@ githubId = 4246921; name = "Florian Beeres"; }; + fd = { + email = "simon.menke@gmail.com"; + github = "fd"; + githubId = 591; + name = "Simon Menke"; + }; fdns = { email = "fdns02@gmail.com"; github = "fdns"; 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"; @@ -4493,10 +5762,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 = "felix@albrigtsen.it"; + github = "felixalbrigtsen"; + githubId = 64613093; + name = "Felix Albrigtsen"; + matrix = "@felixalb:feal.no"; }; felixscheinost = { name = "Felix Scheinost"; @@ -4526,6 +5803,13 @@ } ]; }; + fernsehmuell = { + email = "fernsehmuel@googlemail.com"; + matrix = "@fernsehmuell:matrix.org"; + github = "fernsehmuell"; + githubId = 5198058; + name = "Udo Sauer"; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; @@ -4552,18 +5836,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"; @@ -4582,6 +5866,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"; @@ -4598,17 +5888,24 @@ githubId = 2489598; name = "Felix Breidenstein"; }; + flemzord = { + email = "maxence@maireaux.fr"; + github = "flemzord"; + githubId = 1952914; + name = "Maxence Maireaux"; + }; flexagoon = { email = "flexagoon@pm.me"; github = "flexagoon"; githubId = 66178592; name = "Pavel Zolotarevskiy"; }; - flexw = { - email = "felix.weilbach@t-online.de"; - github = "FlexW"; - githubId = 19961516; - name = "Felix Weilbach"; + flexiondotorg = { + name = "Martin Wimpress"; + email = "martin@wimpress.org"; + matrix = "@wimpress:matrix.org"; + github = "flexiondotorg"; + githubId = 304639; }; fliegendewurst = { email = "arne.keller@posteo.de"; @@ -4623,7 +5920,6 @@ name = "Florian Klink"; }; florentc = { - email = "florentc@users.noreply.github.com"; github = "florentc"; githubId = 1149048; name = "Florent Ch."; @@ -4670,17 +5966,27 @@ githubId = 5918766; name = "Franz Thoma"; }; - fooker = { - email = "fooker@lab.sh"; - github = "fooker"; - githubId = 405105; - name = "Dustin Frisch"; + fogti = { + name = "Alain Fogtia Zscheile"; + email = "fogti+devel@ytrizja.de"; + github = "fogti"; + githubId = 1618343; }; foo-dogsquared = { - email = "foo.dogsquared@gmail.com"; + email = "foodogsquared@foodogsquared.one"; github = "foo-dogsquared"; githubId = 34962634; + matrix = "@foodogsquared:matrix.org"; name = "Gabriel Arazas"; + keys = [{ + fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; + }]; + }; + fooker = { + email = "fooker@lab.sh"; + github = "fooker"; + githubId = 405105; + name = "Dustin Frisch"; }; foolnotion = { email = "bogdan.burlacu@pm.me"; @@ -4703,13 +6009,6 @@ githubId = 92793; name = "Friedrich von Never"; }; - fortuneteller2k = { - email = "lythe1107@gmail.com"; - matrix = "@fortuneteller2k:matrix.org"; - github = "fortuneteller2k"; - githubId = 20619776; - name = "fortuneteller2k"; - }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; @@ -4725,13 +6024,29 @@ githubId = 84968; name = "Florian Paul Schmidt"; }; - + fptje = { + email = "fpeijnenburg@gmail.com"; + github = "FPtje"; + githubId = 1202014; + name = "Falco Peijnenburg"; + }; fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; githubId = 119691; name = "Michael Gough"; }; + franciscod = { + github = "franciscod"; + githubId = 726447; + name = "Francisco Demartino"; + }; + franzmondlichtmann = { + name = "Franz Schroepf"; + email = "franz-schroepf@t-online.de"; + github = "franzmondlichtmann"; + githubId = 105480088; + }; freax13 = { email = "erbse.13@gmx.de"; github = "Freax13"; @@ -4744,8 +6059,19 @@ githubId = 7551358; name = "Frede Emil"; }; + frederictobiasc = { + email = "dev@ntr.li"; + github = "frederictobiasc"; + githubId = 26125115; + name = "Frédéric Christ"; + }; + Freed-Wu = { + email = "wuzhenyu@ustc.edu"; + github = "Freed-Wu"; + githubId = 32936898; + name = "Wu Zhenyu"; + }; freezeboy = { - email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; githubId = 13279982; name = "freezeboy"; @@ -4756,6 +6082,18 @@ githubId = 609279; name = "Isaac Shapira"; }; + freyacodes = { + email = "freya@arbjerg.dev"; + github = "freyacodes"; + githubId = 2582617; + name = "Freya Arbjerg"; + }; + fricklerhandwerk = { + email = "valentin@fricklerhandwerk.de"; + github = "fricklerhandwerk"; + githubId = 6599296; + name = "Valentin Gagarin"; + }; fridh = { email = "fridh@fridh.nl"; github = "FRidh"; @@ -4774,17 +6112,27 @@ 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"; + matrix = "@frogamic:beeper.com"; + keys = [{ + fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; + }]; + }; + 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"; @@ -4792,11 +6140,32 @@ githubId = 134872; name = "Sergei Lukianov"; }; - frontsideair = { - email = "photonia@gmail.com"; - github = "frontsideair"; - githubId = 868283; - name = "Fatih Altinok"; + fryuni = { + name = "Luiz Ferraz"; + email = "luiz@lferraz.com"; + github = "Fryuni"; + githubId = 11063910; + keys = [{ + fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; + }]; + }; + fsagbuya = { + email = "fa@m-labs.ph"; + github = "fsagbuya"; + githubId = 77672306; + name = "Florian Agbuya"; + }; + 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"; @@ -4816,6 +6185,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "fugidev"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -4830,27 +6205,65 @@ }; fuzen = { email = "me@fuzen.cafe"; - github = "Fuzen-py"; + github = "LovingMelody"; githubId = 17859309; name = "Fuzen"; }; + fuzzdk = { + github = "fuzzdk"; + githubId = 12715461; + name = "Anders Bo Rasmussen"; + }; + fwam = { + name = "Legion Orsetti"; + email = "fwam@queereen.dev"; + github = "fwam"; + githubId = 113541944; + keys = [{ + fingerprint = "3822 20B8 57ED 0602 3786 8A7A 18E1 AE22 D704 B4FC"; + }]; + }; + fwc = { + github = "fwc"; + githubId = 29337229; + name = "mtths"; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; 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"; githubId = 606000; name = "Gabriel Adomnicai"; }; - Gabriel439 = { - email = "Gabriel439@gmail.com"; + GabrielDougherty = { + email = "contact@gabrieldougherty.com"; + github = "GabrielDougherty"; + githubId = 10541219; + name = "Gabriel Dougherty"; + }; + Gabriella439 = { + email = "GenuineGabriella@gmail.com"; github = "Gabriella439"; githubId = 1313787; - name = "Gabriel Gonzalez"; + name = "Gabriella Gonzalez"; }; gador = { email = "florian.brandes@posteo.de"; @@ -4861,23 +6274,48 @@ fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; }]; }; + gaelreyrol = { + email = "me@gaelreyrol.dev"; + matrix = "@Zevran:matrix.org"; + name = "Gaël Reyrol"; + github = "gaelreyrol"; + githubId = 498465; + keys = [{ + fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61"; + }]; + }; GaetanLepage = { email = "gaetan@glepage.com"; github = "GaetanLepage"; githubId = 33058747; name = "Gaetan Lepage"; }; + galagora = { + email = "lightningstrikeiv@gmail.com"; + github = "Galagora"; + githubId = 45048741; + name = "Alwanga Oyango"; + }; + galaxy = { + email = "galaxy@dmc.chat"; + matrix = "@galaxy:mozilla.org"; + name = "The Galaxy"; + github = "ga1aksy"; + githubId = 148551648; + keys = [{ + fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; + }]; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; githubId = 7047019; name = "Florent Becker"; }; - galagora = { - email = "lightningstrikeiv@gmail.com"; - github = "Galagora"; - githubId = 45048741; - name = "Alwanga Oyango"; + galen = { + github = "galenhuntington"; + githubId = 1851962; + name = "Galen Huntington"; }; gamb = { email = "adam.gamble@pm.me"; @@ -4885,6 +6323,12 @@ 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"; @@ -4909,6 +6353,11 @@ githubId = 2430469; name = "Gavin Rogers"; }; + gaykitty = { + github = "gaykitty"; + githubId = 126119280; + name = "Kitty Pride"; + }; gazally = { email = "gazally@runbox.com"; github = "gazally"; @@ -4927,6 +6376,19 @@ githubId = 37017396; name = "gbtb"; }; + gdamjan = { + email = "gdamjan@gmail.com"; + matrix = "@gdamjan:spodeli.org"; + github = "gdamjan"; + githubId = 81654; + name = "Damjan Georgievski"; + }; + gdd = { + email = "gabriel.doriath.dohler@ens.fr"; + github = "gabriel-doriath-dohler"; + githubId = 40209356; + name = "Gabriel Doriath Döhler"; + }; gdinh = { email = "nix@contact.dinh.ai"; github = "gdinh"; @@ -4939,6 +6401,21 @@ githubId = 313929; name = "Gabriel Ebner"; }; + geluk = { + email = "johan+nix@geluk.io"; + github = "geluk"; + githubId = 1516985; + name = "Johan Geluk"; + }; + 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"; @@ -4972,12 +6449,47 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + gepbird = { + email = "gutyina.gergo.2@gmail.com"; + github = "gepbird"; + githubId = 29818440; + name = "Gutyina Gergő"; + keys = [ + { fingerprint = "RoAfvqa6w1l8Vdm3W60TDXurYwJ6h03VEGD+wDNGEwc"; } + { fingerprint = "MP2UpIRtJpbFFqyucP431H/FPCfn58UhEUTro4lXtRs"; } + ]; + }; + gerg-l = { + email = "gregleyda@proton.me"; + github = "Gerg-L"; + githubId = 88247690; + name = "Greg Leyda"; + }; + geri1701 = { + email = "geri@sdf.org"; + github = "geri1701"; + githubId = 67984144; + name = "Gerhard Schwanzer"; + }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; githubId = 10353047; name = "Tobias Happ"; }; + getchoo = { + email = "getchoo@tuta.io"; + github = "getchoo"; + githubId = 48872998; + name = "Seth"; + }; + getpsyched = { + name = "Priyanshu Tripathi"; + email = "priyanshutr@proton.me"; + matrix = "@getpsyched:matrix.org"; + github = "getpsyched"; + githubId = 43472218; + }; gfrascadorio = { email = "gfrascadorio@tutanota.com"; github = "gfrascadorio"; @@ -5003,12 +6515,27 @@ githubId = 127353; name = "Geoffrey Huntley"; }; + gigglesquid = { + email = "jack.connors@protonmail.com"; + github = "gigglesquid"; + githubId = 3685154; + name = "Jack connors"; + keys = [{ + fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; + }]; + }; gila = { email = "jeffry.molanus@gmail.com"; github = "gila"; githubId = 15957973; name = "Jeffry Molanus"; }; + gilice = { + email = "gilice@proton.me"; + github = "gilice"; + githubId = 104317939; + name = "gilice"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -5027,12 +6554,36 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giomf = { + email = "giomf@mailbox.org"; + github = "giomf"; + githubId = 35076723; + name = "Guillaume Fournier"; + }; + giorgiga = { + email = "giorgio.gallo@bitnic.it"; + github = "giorgiga"; + githubId = 471835; + name = "Giorgio Gallo"; + }; + GirardR1006 = { + email = "julien.girard2@cea.fr"; + github = "GirardR1006"; + githubId = 19275558; + name = "Julien Girard-Satabin"; + }; 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"; @@ -5066,12 +6617,37 @@ githubId = 1447245; name = "Robin Gloster"; }; + gm6k = { + email = "nix@quidecco.pl"; + name = "Isidor Zeuner"; + }; + gmemstr = { + email = "git@gmem.ca"; + github = "gmemstr"; + githubId = 1878840; + name = "Gabriel Simmer"; + }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; githubId = 25820499; name = "Roman Kretschmer"; }; + goatchurchprime = { + email = "julian@goatchurch.org.uk"; + github = "goatchurchprime"; + githubId = 677254; + name = "Julian Todd"; + }; + gobidev = { + email = "adrian.groh@t-online.de"; + github = "Gobidev"; + githubId = 50576978; + name = "Adrian Groh"; + keys = [{ + fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; + }]; + }; goertzenator = { email = "daniel.goertzen@gmail.com"; github = "goertzenator"; @@ -5084,6 +6660,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"; @@ -5096,14 +6681,11 @@ githubId = 1621335; name = "Andrew Trachenko"; }; - gordias = { - name = "Gordias"; - email = "gordias@disroot.org"; - github = "gordiasdot"; - githubId = 94724133; - keys = [{ - fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; - }]; + gotcha = { + email = "gotcha@bubblenet.be"; + github = "gotcha"; + githubId = 105204; + name = "Godefroid Chapelle"; }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; @@ -5162,6 +6744,12 @@ githubId = 4656860; name = "Gaute Ravndal"; }; + gray-heron = { + email = "ave+nix@cezar.info"; + github = "gray-heron"; + githubId = 7032646; + name = "Cezary Siwek"; + }; graysonhead = { email = "grayson@graysonhead.net"; github = "graysonhead"; @@ -5177,6 +6765,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"; @@ -5201,17 +6795,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"; @@ -5219,12 +6807,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"; @@ -5237,12 +6819,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"; @@ -5262,7 +6856,6 @@ name = "Guillaume Koenig"; }; guserav = { - email = "guserav@users.noreply.github.com"; github = "guserav"; githubId = 28863828; name = "guserav"; @@ -5286,6 +6879,22 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + h7x4 = { + name = "h7x4"; + email = "h7x4@nani.wtf"; + matrix = "@h7x4:nani.wtf"; + github = "h7x4"; + githubId = 14929991; + keys = [{ + 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"; @@ -5337,6 +6946,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"; @@ -5344,12 +6959,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"; @@ -5359,6 +6968,18 @@ fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; }]; }; + harrisonthorne = { + email = "harrisonthorne@proton.me"; + github = "muni-corn"; + githubId = 33523827; + name = "Harrison Thorne"; + }; + haruki7049 = { + email = "tontonkirikiri@gmail.com"; + github = "haruki7049"; + githubId = 64677724; + name = "haruki7049"; + }; harvidsen = { email = "harvidsen@gmail.com"; github = "harvidsen"; @@ -5390,6 +7011,12 @@ githubId = 1379411; name = "Georg Haas"; }; + hbjydev = { + email = "hayden@kuraudo.io"; + github = "hbjydev"; + githubId = 22327045; + name = "Hayden Young"; + }; hbunke = { email = "bunke.hendrik@gmail.com"; github = "hbunke"; @@ -5429,17 +7056,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"; @@ -5454,6 +7093,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"; @@ -5491,6 +7136,21 @@ githubId = 41522204; name = "hexchen"; }; + hexclover = { + email = "hexclover@outlook.com"; + github = "hexclover"; + githubId = 47456195; + name = "hexclover"; + }; + 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"; @@ -5515,11 +7175,12 @@ github = "higebu"; githubId = 733288; }; - hiljusti = { - name = "J.R. Hill"; - email = "hiljusti@so.dang.cool"; - github = "hiljusti"; - githubId = 17605298; + + hikari = { + email = "HikariNee@protonmail.com"; + github = "HikariNee"; + githubId = 72349937; + name = "Hikari"; }; hirenashah = { email = "hiren@hiren.io"; @@ -5527,6 +7188,7 @@ githubId = 19825977; name = "Hiren Shah"; }; + hiro98 = { email = "hiro@protagon.space"; github = "vale981"; @@ -5536,6 +7198,12 @@ fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; }]; }; + hitsmaxft = { + name = "Bhe Hongtyu"; + email = "mfthits@gmail.com"; + github = "hitsmaxft"; + githubId = 352727; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; @@ -5557,43 +7225,49 @@ 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; + hmajid2301 = { + name = "Haseeb Majid"; + email = "hello@haseebmajid.dev"; + github = "hmajid2301"; + githubId = 998807; keys = [{ - fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; + fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9"; }]; }; - 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"; @@ -5618,13 +7292,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"; @@ -5632,18 +7299,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"; @@ -5668,18 +7335,70 @@ 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"; + }]; + }; + hubble = { + name = "Hubble the Wolverine"; + email = "hubblethewolverine@gmail.com"; + matrix = "@hubofeverything:bark.lgbt"; + github = "the-furry-hubofeverything"; + githubId = 53921912; + }; 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"; + }]; + }; + hulr = { + github = "hulr"; + githubId = 17255815; + name = "hulr"; + }; + humancalico = { + email = "humancalico@disroot.org"; + github = "humancalico"; + githubId = 51334444; + name = "Akshat Agarwal"; + }; + huyngo = { + email = "huyngo@disroot.org"; + github = "Huy-Ngo"; + name = "Ngô Ngọc Đức Huy"; + githubId = 19296926; + keys = [{ + fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; + }]; + }; hypersw = { email = "baltic@hypersw.net"; github = "hypersw"; @@ -5720,7 +7439,6 @@ name = "Imran Hossain"; }; iagoq = { - email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; @@ -5741,6 +7459,12 @@ githubId = 69209; name = "Ian Duncan"; }; + ianliu = { + email = "ian.liu88@gmail.com"; + github = "ianliu"; + githubId = 30196; + name = "Ian Liu Rodrigues"; + }; ianmjones = { email = "ian@ianmjones.com"; github = "ianmjones"; @@ -5774,6 +7498,11 @@ github = "icewind1991"; githubId = 1283854; }; + icyrockcom = { + github = "icyrockcom"; + githubId = 785140; + name = "icyrock"; + }; icy-thought = { name = "Icy-Thought"; email = "gilganyx@pm.me"; @@ -5781,14 +7510,26 @@ github = "Icy-Thought"; githubId = 53710398; }; + idlip = { + name = "Dilip"; + email = "igoldlip@gmail.com"; + github = "idlip"; + githubId = 117019901; + }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; githubId = 1550265; name = "Dominic Steinitz"; }; + iFreilicht = { + github = "iFreilicht"; + githubId = 9742635; + matrix = "@ifreilicht:matrix.org"; + email = "nixpkgs@mail.felix-uhl.de"; + name = "Felix Uhl"; + }; ifurther = { - email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; @@ -5817,6 +7558,12 @@ githubId = 25505957; name = "Ilian"; }; + iliayar = { + email = "iliayar3@gmail.com"; + github = "iliayar"; + githubId = 17529355; + name = "Ilya Yaroshevskiy"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -5830,13 +7577,6 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; - not-my-segfault = { - email = "michal@tar.black"; - matrix = "@michal:tar.black"; - github = "not-my-segfault"; - githubId = 30374463; - name = "Michal S."; - }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; @@ -5863,7 +7603,7 @@ }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; - github = "ilya-kolpakov"; + github = "1pakch"; githubId = 592849; name = "Ilya Kolpakov"; }; @@ -5875,7 +7615,7 @@ }; imalison = { email = "IvanMalison@gmail.com"; - github = "IvanMalison"; + github = "colonelpanic8"; githubId = 1246619; name = "Ivan Malison"; }; @@ -5891,6 +7631,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"; @@ -5914,18 +7661,24 @@ fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; }]; }; - imsofi = { - email = "sofi+git@mailbox.org"; - github = "imsofi"; - githubId = 20756843; - name = "Sofi"; - }; imuli = { email = "i@imu.li"; github = "imuli"; githubId = 4085046; name = "Imuli"; }; + inclyc = { + email = "i@lyc.dev"; + github = "inclyc"; + githubId = 36667224; + name = "Yingchi Long"; + }; + indexyz = { + email = "indexyz@pm.me"; + github = "5aaee9"; + githubId = 7685264; + name = "Indexyz"; + }; ineol = { email = "leo.stefanesco@gmail.com"; github = "ineol"; @@ -5948,18 +7701,60 @@ 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"; + }]; + }; + invokes-su = { + email = "nixpkgs-commits@deshaw.com"; + github = "invokes-su"; + githubId = 88038050; + name = "Souvik Sen"; + }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "iogamaster"; + githubId = 67164465; + }; + ionutnechita = { + email = "ionut_n2001@yahoo.com"; + github = "ionutnechita"; + githubId = 9405900; + name = "Ionut Nechita"; + }; iopq = { email = "iop_jr@yahoo.com"; github = "iopq"; githubId = 1817528; name = "Igor Polyakov"; }; + iquerejeta = { + github = "iquerejeta"; + githubId = 31273774; + name = "Inigo Querejeta-Azurmendi"; + }; irenes = { name = "Irene Knapp"; email = "ireneista@gmail.com"; @@ -5976,6 +7771,12 @@ githubId = 137306; name = "Michele Catalano"; }; + isaozler = { + email = "isaozler@gmail.com"; + github = "isaozler"; + githubId = 1378630; + name = "Isa Ozler"; + }; isgy = { name = "isgy"; email = "isgy@teiyg.com"; @@ -6004,18 +7805,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"; @@ -6026,7 +7815,6 @@ }]; }; ivankovnatsky = { - email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -6034,6 +7822,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"; @@ -6058,17 +7864,23 @@ githubId = 20320695; name = "Matan Bendix Shenhav"; }; + iynaix = { + email = "iynaix@gmail.com"; + github = "iynaix"; + githubId = 94313; + name = "Xianyi Lin"; + }; izorkin = { email = "Izorkin@gmail.com"; github = "Izorkin"; 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"; @@ -6082,70 +7894,64 @@ 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"; github = "j4m3s-s"; githubId = 9413812; }; + jacbart = { + name = "Jack Bartlett"; + email = "jacbart@gmail.com"; + github = "jacbart"; + githubId = 7909687; + }; + jacfal = { + name = "Jakub Pravda"; + email = "me@jakubpravda.net"; + github = "jakub-pravda"; + githubId = 16310411; + }; jacg = { name = "Jacek Generowicz"; email = "jacg@my-post-office.net"; 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"; githubId = 7558482; name = "Jack Gerrits"; }; + jaduff = { + email = "jdduffpublic@proton.me"; + github = "jaduff"; + githubId = 10690970; + name = "James Duff"; + }; jagajaga = { email = "ars.seroka@gmail.com"; github = "jagajaga"; 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"; @@ -6176,6 +7982,23 @@ githubId = 2212681; name = "Jakub Grzgorz Sokołowski"; }; + jakuzure = { + email = "shin@posteo.jp"; + github = "jakuzure"; + githubId = 11823547; + name = "jakuzure"; + }; + jali-clarke = { + email = "jinnah.ali-clarke@outlook.com"; + name = "Jinnah Ali-Clarke"; + github = "jali-clarke"; + githubId = 17733984; + }; + james-atkins = { + name = "James Atkins"; + github = "james-atkins"; + githubId = 9221409; + }; jamiemagee = { email = "jamie.magee@gmail.com"; github = "JamieMagee"; @@ -6188,6 +8011,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"; @@ -6200,18 +8030,42 @@ 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"; githubId = 488556; name = "Javier Aguirre"; }; + javimerino = { + email = "merino.jav@gmail.com"; + name = "Javi Merino"; + github = "JaviMerino"; + githubId = 44926; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; - email = "jayesh@bhoot.sh"; - github = "jayeshbhoot"; + email = "jb@jayeshbhoot.com"; + github = "jyssh"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -6237,6 +8091,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"; @@ -6270,6 +8144,12 @@ githubId = 8685505; name = "Jen-Chieh Shen"; }; + jcspeegs = { + email = "justin@speegs.com"; + github = "jcspeegs"; + githubId = 34928409; + name = "Justin Speegle"; + }; jcumming = { email = "jack@mudshark.org"; github = "jcumming"; @@ -6339,6 +8219,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"; @@ -6357,6 +8243,13 @@ githubId = 1608697; name = "Jens Binkert"; }; + jeremiahs = { + email = "jeremiah@secrist.xyz"; + github = "JeremiahSecrist"; + githubId = 26032621; + matrix = "@jeremiahs:matrix.org"; + name = "Jeremiah Secrist"; + }; jeremyschlatter = { email = "github@jeremyschlatter.com"; github = "jeremyschlatter"; @@ -6369,12 +8262,24 @@ githubId = 854319; name = "Matt McHenry"; }; + jerrysm64 = { + email = "jerry.starke@icloud.com"; + github = "jerrysm64"; + githubId = 42114389; + name = "Jerry Starke"; + }; jeschli = { email = "jeschli@gmail.com"; github = "0mbi"; githubId = 10786794; name = "Markus Hihn"; }; + jessemoore = { + email = "jesse@jessemoore.dev"; + github = "jesseDMoore1994"; + githubId = 30251156; + name = "Jesse Moore"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; @@ -6408,6 +8313,15 @@ githubId = 18501; name = "Julien Langlois"; }; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; @@ -6424,6 +8338,18 @@ 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"; + }; + jgarcia = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; @@ -6454,6 +8380,18 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jgoux = { + email = "hi@jgoux.dev"; + github = "jgoux"; + githubId = 1443499; + name = "Julien Goux"; + }; + jhh = { + email = "jeff@j3ff.io"; + github = "jhh"; + githubId = 14412; + name = "Jeff Hutchison"; + }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; @@ -6466,6 +8404,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"; @@ -6505,10 +8449,22 @@ }; 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"; + }; + jl178 = { + email = "jeredlittle1996@gmail.com"; + github = "jl178"; + githubId = 72664723; + name = "Jered Little"; + }; jlamur = { email = "contact@juleslamur.fr"; github = "jlamur"; @@ -6518,6 +8474,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"; @@ -6548,6 +8510,12 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + jmbaur = { + email = "jaredbaur@fastmail.com"; + github = "jmbaur"; + githubId = 45740526; + name = "Jared Baur"; + }; jmc-figueira = { email = "business+nixos@jmc-figueira.dev"; github = "jmc-figueira"; @@ -6576,6 +8544,18 @@ githubId = 2308444; name = "Joshua Gilman"; }; + jmillerpdt = { + email = "jcmiller@pdtpartners.com"; + github = "jmillerpdt"; + githubId = 54179289; + name = "Jason Miller"; + }; + jnsgruk = { + email = "jon@sgrs.uk"; + github = "jnsgruk"; + githubId = 668505; + name = "Jon Seager"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; @@ -6612,6 +8592,11 @@ githubId = 3967312; name = "Jocelyn Thode"; }; + joedevivo = { + github = "joedevivo"; + githubId = 55951; + name = "Joe DeVivo"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; @@ -6624,6 +8609,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"; @@ -6637,17 +8628,23 @@ 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"; + johannwagner = { + email = "nix@wagner.digital"; + github = "johannwagner"; + githubId = 12380026; + name = "Johann Wagner"; }; johanot = { email = "write@ownrisk.dk"; @@ -6679,6 +8676,12 @@ githubId = 2576152; name = "John M. Harris, Jr."; }; + johnpyp = { + name = "John Paul Penaloza"; + email = "johnpyp.dev@gmail.com"; + github = "johnpyp"; + githubId = 20625636; + }; johnramsden = { email = "johnramsden@riseup.net"; github = "johnramsden"; @@ -6691,6 +8694,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"; @@ -6747,7 +8756,7 @@ }; jonnybolton = { email = "jonnybolton@gmail.com"; - github = "jonnybolton"; + github = "jonnynightingale"; githubId = 8580434; name = "Jonny Bolton"; }; @@ -6758,6 +8767,19 @@ 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"; + github = "jordanisaacs"; + githubId = 19742638; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; @@ -6770,6 +8792,24 @@ github = "jorsn"; githubId = 4646725; }; + joscha = { + name = "Joscha Loos"; + email = "j.loos@posteo.net"; + github = "jooooscha"; + githubId = 57965027; + }; + josephst = { + name = "Joseph Stahl"; + email = "hello@josephstahl.com"; + github = "josephst"; + githubId = 1269177; + }; + joshniemela = { + name = "Joshua Niemelä"; + email = "josh@jniemela.dk"; + github = "joshniemela"; + githubId = 88747315; + }; joshuafern = { name = "Joshua Fern"; email = "joshuafern@protonmail.com"; @@ -6782,6 +8822,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"; @@ -6794,6 +8840,12 @@ githubId = 1918771; name = "Joe Doyle"; }; + jpentland = { + email = "joe.pentland@gmail.com"; + github = "jpentland"; + githubId = 1135582; + name = "Joe Pentland"; + }; jperras = { email = "joel@nerderati.com"; github = "jperras"; @@ -6874,6 +8926,18 @@ name = "John Soo"; githubId = 10039785; }; + jsusk = { + email = "joshua@suskalo.org"; + github = "IGJoshua"; + name = "Joshua Suskalo"; + githubId = 27734541; + }; + jtbx = { + email = "jtbx@duck.com"; + name = "Jeremy Baxter"; + github = "jtbx"; + githubId = 92071952; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -6904,7 +8968,7 @@ }; juaningan = { email = "juaningan@gmail.com"; - github = "uningan"; + github = "oneingan"; githubId = 810075; name = "Juan Rodal"; }; @@ -6914,6 +8978,12 @@ githubId = 1189739; name = "Julio Borja Barra"; }; + jue89 = { + email = "me@jue.yt"; + github = "jue89"; + githubId = 6105784; + name = "Juergen Fitschen"; + }; jugendhacker = { name = "j.r"; email = "j.r@jugendhacker.de"; @@ -6933,12 +9003,25 @@ githubId = 1792886; name = "Julien Malka"; }; + juliusrickert = { + email = "nixpkgs@juliusrickert.de"; + github = "juliusrickert"; + githubId = 5007494; + name = "Julius Rickert"; + }; julm = { email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; githubId = 21160136; name = "Julien Moutinho"; }; + Julow = { + email = "jules@j3s.fr"; + matrix = "@juloo:matrix.org"; + github = "Julow"; + githubId = 2310568; + name = "Jules Aguillon"; + }; jumper149 = { email = "felixspringer149@gmail.com"; github = "jumper149"; @@ -6951,12 +9034,24 @@ githubId = 2469618; name = "Junji Hashimoto"; }; + jurraca = { + email = "julienu@pm.me"; + github = "jurraca"; + githubId = 5124422; + name = "Julien Urraca"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; githubId = 662666; name = "Justinas Stankevičius"; }; + justinlime = { + email = "justinlime1999@gmail.com"; + github = "justinlime"; + githubId = 119710965; + name = "Justin Fields"; + }; justinlovinger = { email = "git@justinlovinger.com"; github = "JustinLovinger"; @@ -7008,12 +9103,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"; @@ -7039,6 +9128,15 @@ githubId = 386765; matrix = "@k900:0upti.me"; }; + kachick = { + email = "kachick1@gmail.com"; + github = "kachick"; + githubId = 1180335; + name = "Kenichi Kamiya"; + keys = [{ + fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; + }]; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -7061,6 +9159,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"; @@ -7112,6 +9217,17 @@ githubId = 1927188; name = "karolchmist"; }; + kashw2 = { + email = "supra4keanu@hotmail.com"; + github = "kashw2"; + githubId = 15855440; + name = "Keanu Ashwell"; + }; + katexochen = { + github = "katexochen"; + githubId = 49727155; + name = "Paul Meyer"; + }; kayhide = { email = "kayhide@gmail.com"; github = "kayhide"; @@ -7124,12 +9240,31 @@ 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"; githubId = 37185887; name = "Calvin Kim"; }; + keenanweaver = { + email = "keenanweaver@protonmail.com"; + name = "Keenan Weaver"; + github = "keenanweaver"; + githubId = 37268985; + }; keksbg = { email = "keksbg@riseup.net"; name = "Stella"; @@ -7146,7 +9281,6 @@ name = "Claudius Holeksa"; }; ken-matsui = { - email = "nix@kmatsui.me"; github = "ken-matsui"; githubId = 26405363; name = "Ken Matsui"; @@ -7182,6 +9316,11 @@ githubId = 762421; name = "Pierre Thierry"; }; + keto = { + github = "TheRealKeto"; + githubId = 24854941; + name = "Keto"; + }; ketzacoatl = { email = "ketzacoatl@protonmail.com"; github = "ketzacoatl"; @@ -7220,6 +9359,27 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + kgtkr = { + email = "contact@kgtkr.net"; + github = "kgtkr"; + githubId = 17868838; + name = "kgtkr"; + keys = [{ + fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; + }]; + }; + khaneliman = { + email = "khaneliman12@gmail.com"; + github = "khaneliman"; + githubId = 1778670; + name = "Austin Horstman"; + }; + khaser = { + email = "a-horohorin@mail.ru"; + github = "khaser"; + githubId = 59027018; + name = "Andrey Khorokhorin"; + }; kho-dialga = { email = "ivandashenyou@gmail.com"; github = "Kho-Dialga"; @@ -7247,6 +9407,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"; @@ -7259,12 +9425,23 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + github = "Kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; githubId = 845652; name = "Kier Davis"; }; + kilianar = { + email = "mail@kilianar.de"; + github = "kilianar"; + githubId = 105428155; + name = "kilianar"; + }; kilimnik = { email = "mail@kilimnik.de"; github = "kilimnik"; @@ -7301,12 +9478,31 @@ 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"; }; + kip93 = { + name = "Leandro Reina Kiperman"; + email = "leandro@kip93.net"; + matrix = "@kip93:matrix.org"; + github = "kip93"; + githubId = 26793632; + }; + kira-bruneau = { + email = "kira.bruneau@pm.me"; + name = "Kira Bruneau"; + github = "kira-bruneau"; + githubId = 382041; + }; kirelagin = { email = "kirelagin@gmail.com"; matrix = "@kirelagin:matrix.org"; @@ -7320,6 +9516,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"; @@ -7350,6 +9557,12 @@ github = "kjeremy"; githubId = 4325700; }; + kkharji = { + name = "kkharji"; + email = "kkharji@protonmail.com"; + github = "kkharji"; + githubId = 65782666; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -7403,12 +9616,24 @@ github = "KnairdA"; githubId = 498373; }; + knarkzel = { + email = "knarkzel@gmail.com"; + name = "Knarkzel"; + github = "Knarkzel"; + githubId = 85593302; + }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; githubId = 3287933; name = "Josef Kemetmüller"; }; + knightpp = { + email = "knightpp@proton.me"; + github = "knightpp"; + githubId = 28928944; + name = "Danylo Kondratiev"; + }; knl = { email = "nikola@knezevic.co"; github = "knl"; @@ -7439,6 +9664,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"; @@ -7451,18 +9689,18 @@ githubId = 524268; name = "Koral"; }; + koralowiec = { + email = "qnlgzyrw@anonaddy.me"; + github = "koralowiec"; + githubId = 36413794; + name = "Arek Kalandyk"; + }; koslambrou = { email = "koslambrou@gmail.com"; github = "koslambrou"; githubId = 2037002; name = "Konstantinos"; }; - kototama = { - email = "kototama@posteo.jp"; - github = "kototama"; - githubId = 128620; - name = "Kototama"; - }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -7499,6 +9737,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"; @@ -7511,6 +9755,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"; @@ -7523,17 +9779,23 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; - kristian-brucaj = { - email = "kbrucaj@gmail.com"; - github = "Kristian-Brucaj"; - githubId = 8893110; - name = "Kristian Brucaj"; + krostar = { + email = "alexis.destrez@pm.me"; + github = "krostar"; + githubId = 5759930; + name = "Alexis Destrez"; }; - kristoff3r = { - email = "k.soeholm@gmail.com"; - github = "kristoff3r"; - githubId = 160317; - name = "Kristoffer Søholm"; + krupkat = { + github = "krupkat"; + githubId = 6817216; + name = "Tomas Krupka"; + matrix = "@krupkat:matrix.org"; + }; + krzaczek = { + name = "Pawel Krzaczkowski"; + email = "pawel@printu.pl"; + github = "krzaczek"; + githubId = 5773701; }; ktf = { email = "giulio.eulisse@cern.ch"; @@ -7559,12 +9821,23 @@ githubId = 894884; name = "Jakub Kozłowski"; }; + kupac = { + github = "Kupac"; + githubId = 8224569; + name = "László Kupcsik"; + }; kurnevsky = { email = "kurnevsky@gmail.com"; github = "kurnevsky"; githubId = 2943605; name = "Evgeny Kurnevsky"; }; + kuwii = { + name = "kuwii"; + email = "kuwii.someone@gmail.com"; + github = "kuwii"; + githubId = 10705175; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; @@ -7577,6 +9850,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"; @@ -7597,15 +9876,11 @@ 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"; + l0b0 = { + email = "victor@engmark.name"; + github = "l0b0"; + githubId = 168301; + name = "Victor Engmark"; }; l3af = { email = "L3afMeAlon3@gmail.com"; @@ -7629,12 +9904,32 @@ }]; 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"; + }; + lagoja = { + github = "Lagoja"; + githubId =750845; + name = "John Lago"; + }; 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"; @@ -7647,18 +9942,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"; @@ -7666,6 +9965,18 @@ githubId = 621759; name = "Lassulus"; }; + laurailway = { + email = "laurailway.git@posteo.net"; + github = "LAURAilway"; + githubId = 118690640; + name = "Laura"; + }; + laurent-f1z1 = { + email = "laurent.nixpkgs@fainsin.bzh"; + github = "Laurent2916"; + githubId = 21087104; + name = "Laurent Fainsin"; + }; layus = { email = "layus.on@gmail.com"; github = "layus"; @@ -7684,18 +9995,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"; @@ -7757,21 +10056,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"; + leifhelm = { + email = "jakob.leifhelm@gmail.com"; + github = "leifhelm"; + githubId = 31693262; + name = "Jakob Leifhelm"; keys = [{ - fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; + fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; }]; }; leixb = { @@ -7790,6 +10081,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"; @@ -7812,6 +10109,12 @@ githubId = 1572058; name = "Leonardo Cecchi"; }; + leonid = { + email = "belyaev.l@northeastern.edu"; + github = "leonidbelyaev"; + githubId = 77865363; + name = "Leonid Belyaev"; + }; leshainc = { email = "leshainc@fomalhaut.me"; github = "LeshaInc"; @@ -7826,7 +10129,7 @@ }; lethalman = { email = "lucabru@src.gnome.org"; - github = "lethalman"; + github = "lucabrunox"; githubId = 480920; name = "Luca Bruno"; }; @@ -7882,6 +10185,12 @@ githubId = 1769386; name = "Liam Diprose"; }; + liberatys = { + email = "liberatys@hey.com"; + name = "Nick Anthony Flueckiger"; + github = "liberatys"; + githubId = 35100156; + }; libjared = { email = "jared@perrycode.com"; github = "libjared"; @@ -7907,12 +10216,36 @@ githubId = 24509182; name = "Arnaud Pascal"; }; + lightquantum = { + email = "self@lightquantum.me"; + github = "PhotonQuantum"; + githubId = 18749973; + name = "Yanning Chen"; + matrix = "@self:lightquantum.me"; + }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; githubId = 3696783; name = "Leroy Hopson"; }; + liketechnik = { + name = "Florian Warzecha"; + + email = "liketechnik@disroot.org"; + github = "liketechnik"; + githubId = 24209689; + + keys = [{ + fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; + }]; + }; + lillycham = { + email = "lillycat332@gmail.com"; + github = "lillycat332"; + githubId = 54189319; + name = "Lilly Cham"; + }; lilyball = { email = "lily@sb.org"; github = "lilyball"; @@ -7966,6 +10299,19 @@ githubId = 725613; name = "Linus Arver"; }; + linuxissuper = { + email = "m+nix@linuxistcool.de"; + matrix = "@m:linuxistcool.de"; + github = "linuxissuper"; + githubId = 74221543; + name = "Moritz Goltdammer"; + }; + lionello = { + email = "lio@lunesu.com"; + github = "lionello"; + githubId = 591860; + name = "Lionello Lunesu"; + }; livnev = { email = "lev@liv.nev.org.uk"; github = "livnev"; @@ -7975,54 +10321,17 @@ 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"; + liyangau = { + email = "d@aufomm.com"; + github = "liyangau"; + githubId = 71299093; + name = "Li Yang"; }; - 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"; @@ -8042,12 +10351,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"; @@ -8064,24 +10367,77 @@ fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; }]; }; + locochoco = { + email = "contact@locochoco.dev"; + github = "loco-choco"; + githubId = 58634087; + name = "Ivan Pancheniak"; + }; lodi = { email = "anthony.lodi@gmail.com"; github = "lodi"; 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"; }; + lord-valen = { + name = "Lord Valen"; + matrix = "@lord-valen:matrix.org"; + github = "Lord-Valen"; + githubId = 46138807; + }; + 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"; @@ -8100,6 +10456,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"; @@ -8153,12 +10527,36 @@ githubId = 8555953; name = "Laure Tavard"; }; + lu15w1r7h = { + email = "lwirth2000@gmail.com"; + github = "LU15W1R7H"; + githubId = 37505890; + name = "Luis Wirth"; + }; luc65r = { email = "lucas@ransan.tk"; github = "luc65r"; githubId = 59375051; name = "Lucas Ransan"; }; + LucaGuerra = { + email = "luca@guerra.sh"; + github = "LucaGuerra"; + githubId = 35580196; + name = "Luca Guerra"; + }; + 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"; @@ -8171,12 +10569,27 @@ githubId = 2487922; name = "Lars Jellema"; }; + ludat = { + email = "lucas6246@gmail.com"; + github = "ludat"; + githubId = 4952044; + name = "Lucas David Traverso"; + }; ludo = { email = "ludo@gnu.org"; github = "civodul"; githubId = 1168435; name = "Ludovic Courtès"; }; + ludovicopiero = { + email = "lewdovico@gnuweeb.org"; + github = "ludovicopiero"; + githubId = 44255157; + name = "Ludovico Piero"; + keys = [{ + fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; + }]; + }; lufia = { email = "lufia@lufia.org"; github = "lufia"; @@ -8192,17 +10605,61 @@ 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"; + }; + luisdaranda = { + email = "luisdomingoaranda@gmail.com"; + github = "propet"; + githubId = 8515861; + name = "Luis D. Aranda Sánchez"; + keys = [{ + fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; + }]; + }; + luisnquin = { + email = "lpaandres2020@gmail.com"; + matrix = "@luisnquin:matrix.org"; + github = "luisnquin"; + githubId = 86449787; + name = "Luis Quiñones"; + }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; githubId = 79334; name = "Luis Pedro Coelho"; }; - lukeadams = { - email = "luke.adams@belljar.io"; - github = "lukeadams"; - githubId = 3508077; - name = "Luke Adams"; + 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"; + }]; + }; + lukaswrz = { + email = "lukas@wrz.one"; + github = "lukaswrz"; + githubId = 84395723; + name = "Lukas Wurzinger"; }; lukebfox = { email = "lbentley-fox1@sheffield.ac.uk"; @@ -8235,6 +10692,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"; @@ -8242,12 +10705,31 @@ 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"; + }; + luochen1990 = { + email = "luochen1990@gmail.com"; + github = "luochen1990"; + githubId = 2309868; + name = "Luo Chen"; + }; + lurkki = { + email = "jussi.kuokkanen@protonmail.com"; + github = "Lurkki14"; + githubId = 44469719; + name = "Jussi Kuokkanen"; + }; lux = { email = "lux@lux.name"; - github = "luxferresum"; + github = "luxzeitlos"; githubId = 1208273; matrix = "@lux:ontheblueplanet.com"; name = "Lux"; @@ -8264,6 +10746,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"; @@ -8294,6 +10783,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"; @@ -8307,11 +10799,19 @@ githubId = 42545625; name = "Maas Lalani"; }; - maddiethecafebabe = { - email = "maddie@cafebabe.date"; - github = "maddiethecafebabe"; - githubId = 75337286; - name = "Madeline S."; + macalinao = { + email = "me@ianm.com"; + name = "Ian Macalinao"; + github = "macalinao"; + githubId = 401263; + keys = [{ + fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; + }]; + }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; }; madjar = { email = "georges.dubus@compiletoi.net"; @@ -8332,6 +10832,16 @@ githubId = 93990818; name = "Madoura"; }; + maeve = { + email = "mrey@mailbox.org"; + matrix = "@maeve:catgirl.cloud"; + github = "m-rey"; + githubId = 42996147; + name = "Mæve"; + keys = [{ + fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; + }]; + }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; @@ -8344,6 +10854,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"; @@ -8362,6 +10878,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"; @@ -8386,30 +10908,52 @@ 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"; + malt3 = { + github = "malt3"; + githubId = 1780588; + name = "Malte Poll"; + }; + 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"; githubId = 346094; name = "Michael Alyn Miller"; }; + mangoiv = { + email = "contact@mangoiv.com"; + github = "mangoiv"; + githubId = 40720523; + name = "MangoIV"; + }; + manipuladordedados = { + email = "manipuladordedados@gmail.com"; + github = "manipuladordedados"; + githubId = 1189862; + name = "Valter Nazianzeno"; + }; manojkarthick = { email = "smanojkarthick@gmail.com"; github = "manojkarthick"; @@ -8430,11 +10974,11 @@ githubId = 1651325; name = "maralorn"; }; - marcweber = { - email = "marco-oweber@gmx.de"; - github = "MarcWeber"; - githubId = 34086; - name = "Marc Weber"; + marcovergueira = { + email = "vergueira.marco@gmail.com"; + github = "marcovergueira"; + githubId = 929114; + name = "Marco Vergueira"; }; marcus7070 = { email = "marcus@geosol.com.au"; @@ -8442,30 +10986,37 @@ 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"; githubId = 105451387; name = "Maria"; }; + marie = { + email = "tabmeier12+nix@gmail.com"; + github = "nycodeghg"; + githubId = 37078297; + matrix = "@marie:marie.cologne"; + name = "Marie Ramlow"; + }; marijanp = { name = "Marijan Petričević"; email = "marijan.petricevic94@gmail.com"; @@ -8478,8 +11029,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"; @@ -8490,6 +11058,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"; @@ -8508,11 +11082,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"; @@ -8523,6 +11097,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"; @@ -8535,12 +11115,42 @@ githubId = 29855073; name = "Michael Colicchia"; }; + massimogengarelli = { + email = "massimo.gengarelli@gmail.com"; + github = "massix"; + githubId = 585424; + name = "Massimo Gengarelli"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; githubId = 854770; name = "Matej Cotman"; }; + mateodd25 = { + email = "mateodd@icloud.com"; + github = "mateodd25"; + githubId = 7878181; + name = "Mateo Diaz"; + }; + materus = { + email = "materus@podkos.pl"; + github = "materusPL"; + githubId = 28183516; + name = "Mateusz Słodkowicz"; + }; + 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"; @@ -8559,12 +11169,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"; @@ -8577,6 +11181,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"; @@ -8611,14 +11236,17 @@ 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"; + }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; @@ -8632,19 +11260,28 @@ githubId = 95194; name = "Mauricio Scheffer"; }; - maxhero = { - email = "contact@maxhero.dev"; - github = "themaxhero"; - githubId = 4708337; - name = "Marcelo A. de L. Santos"; + mawis = { + email = "m@tthias.eu"; + github = "mawis"; + githubId = 2042030; + name = "Matthias Wimmer"; + keys = [{ + fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; + }]; }; - max-niederman = { - email = "max@maxniederman.com"; - github = "max-niederman"; - githubId = 19580458; - name = "Max Niederman"; + max-amb = { + email = "max_a@e.email"; + github = "max-amb"; + githubId = 137820334; + name = "Max Ambaum"; + }; + maxbrunet = { + email = "max@brnt.mx"; + github = "maxbrunet"; + githubId = 32458727; + name = "Maxime Brunet"; keys = [{ - fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; + fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; }]; }; maxdamantus = { @@ -8653,30 +11290,51 @@ githubId = 502805; name = "Max Zerzouri"; }; - maxeaubrey = { - email = "maxeaubrey@gmail.com"; - github = "maxeaubrey"; - 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"; + }; 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"; + githubId = 4141584; + name = "Maxime Daniel"; + }; + maxwell-lt = { + email = "maxwell.lt@live.com"; + 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"; @@ -8696,7 +11354,6 @@ name = "Mateusz Mazur"; }; mbaeten = { - email = "mbaeten@users.noreply.github.com"; github = "mbaeten"; githubId = 2649304; name = "M. Baeten"; @@ -8707,6 +11364,12 @@ githubId = 613740; name = "Martin Baillie"; }; + mbalatsko = { + email = "mbalatsko@gmail.com"; + github = "mbalatsko"; + githubId = 15967073; + name = "Maksym Balatsko"; + }; mbbx6spp = { email = "me@susanpotter.net"; github = "mbbx6spp"; @@ -8749,11 +11412,14 @@ githubId = 10420834; name = "Mihai-Drosi Caju"; }; - mcbeth = { - email = "mcbeth@broggs.org"; - github = "mcbeth"; - githubId = 683809; - name = "Jeffrey Brent McBeth"; + mccurdyc = { + email = "mccurdyc22@gmail.com"; + github = "mccurdyc"; + githubId = 5546264; + name = "Colton J. McCurdy"; + keys = [{ + fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; + }]; }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; @@ -8762,13 +11428,15 @@ name = "Matthias C. M. Troffaes"; }; McSinyx = { - email = "mcsinyx@disroot.org"; + email = "cnx@loang.net"; github = "McSinyx"; githubId = 13689192; + matrix = "@cnx:loang.net"; name = "Nguyễn Gia Phong"; - keys = [{ - fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; - }]; + keys = [ + { fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; } + { fingerprint = "838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"; } + ]; }; mcwitt = { email = "mcwitt@gmail.com"; @@ -8803,6 +11471,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"; @@ -8840,11 +11514,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"; @@ -8852,11 +11526,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"; @@ -8870,6 +11550,12 @@ githubId = 3300322; name = "Mitchell Fossen"; }; + mfrw = { + email = "falakreyaz@gmail.com"; + github = "mfrw"; + githubId = 4929861; + name = "Muhammad Falak R Wani"; + }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; @@ -8895,6 +11581,11 @@ githubId = 9469313; name = "Gregoire Martinache"; }; + mgregson = { + github = "mgregson"; + githubId = 333572; + name = "Michael Gregson"; + }; mgttlinger = { email = "megoettlinger@gmail.com"; github = "mgttlinger"; @@ -8908,25 +11599,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"; @@ -8934,6 +11623,16 @@ fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; }]; }; + mib = { + name = "mib"; + email = "mib@kanp.ai"; + matrix = "@mib:kanp.ai"; + github = "mibmo"; + githubId = 87388017; + keys = [{ + fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; + }]; + }; mic92 = { email = "joerg@thalheim.io"; matrix = "@mic92:nixos.dev"; @@ -8951,12 +11650,51 @@ githubId = 1575834; name = "Michael Adler"; }; + michaelBelsanti = { + email = "mbels03@protonmail.com"; + name = "Mike Belsanti"; + github = "michaelBelsanti"; + githubId = 62124625; + }; + michaelCTS = { + email = "michael.vogel@cts.co"; + name = "Michael Vogel"; + github = "michaelCTS"; + githubId = 132582212; + }; + michaeldonovan = { + email = "michael@mdonovan.dev"; + name = "Michael Donovan"; + github = "michaeldonovan"; + githubId = 14077230; + }; + 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"; githubId = 1699466; name = "Michael Peyton Jones"; }; + michaelshmitty = { + name = "Michael Smith"; + email = "shmitty@protonmail.com"; + github = "michaelshmitty"; + githubId = 114845; + }; michalrus = { email = "m@michalrus.com"; github = "michalrus"; @@ -8997,6 +11735,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mig4ng = { + email = "mig4ng@gmail.com"; + github = "mig4ng"; + githubId = 5817039; + name = "Miguel Carneiro"; + }; mightyiam = { email = "mightyiampresence@gmail.com"; github = "mightyiam"; @@ -9009,24 +11753,36 @@ githubId = 43088426; name = "Mihnea Stoian"; }; + mikaelfangel = { + email = "nixpkgs.bottle597@passfwd.com"; + github = "MikaelFangel"; + githubId = 34864484; + name = "Mikael Fangel"; + }; + mikecm = { + email = "mikecmcleod@gmail.com"; + github = "MaxwellDupre"; + githubId = 14096356; + name = "Michael McLeod"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; 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"; @@ -9066,6 +11822,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"; @@ -9097,6 +11859,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"; @@ -9109,12 +11877,43 @@ githubId = 149558; name = "Merlin Gaillard"; }; + mirkolenz = { + name = "Mirko Lenz"; + email = "mirko@mirkolenz.com"; + matrix = "@mlenz:matrix.org"; + github = "mirkolenz"; + githubId = 5160954; + }; mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; githubId = 1776903; name = "Andrew Abbott"; }; + mirrorwitch = { + email = "mirrorwitch@transmom.love"; + github = "mirrorwitch"; + githubId = 146672255; + name = "mirrorwitch"; + keys = [{ + fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; + }]; + }; + Misaka13514 = { + name = "Misaka13514"; + email = "Misaka13514@gmail.com"; + matrix = "@misaka13514:matrix.org"; + github = "Misaka13514"; + githubId = 54669781; + keys = + [{ fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; }]; + }; + mislavzanic = { + email = "mislavzanic3@gmail.com"; + github = "mislavzanic"; + githubId = 48838244; + name = "Mislav Zanic"; + }; misterio77 = { email = "eu@misterio.me"; github = "Misterio77"; @@ -9125,6 +11924,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"; @@ -9137,6 +11942,13 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjm = { + email = "matt@mattmoriarity.com"; + github = "mjm"; + githubId = 1181; + matrix = "@mjm:beeper.com"; + name = "Matt Moriarity"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -9189,6 +12001,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"; @@ -9197,7 +12015,6 @@ }; mlvzk = { name = "mlvzk"; - email = "mlvzk@users.noreply.github.com"; github = "mlvzk"; githubId = 44906333; }; @@ -9214,7 +12031,6 @@ name = "Henri Bourcereau"; }; mmesch = { - email = "mmesch@noreply.github.com"; github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; @@ -9231,6 +12047,12 @@ githubId = 708570; name = "Manuel Mendez"; }; + mmusnjak = { + email = "marko.musnjak@gmail.com"; + github = "mmusnjak"; + githubId = 668956; + name = "Marko Mušnjak"; + }; mnacamura = { email = "m.nacamura@gmail.com"; github = "mnacamura"; @@ -9275,9 +12097,16 @@ name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; matrix = "@mon:tchncs.de"; - github = "MonAaraj"; + github = "ribosomerocker"; githubId = 46468162; }; + moni = { + email = "lythe1107@gmail.com"; + matrix = "@fortuneteller2k:matrix.org"; + github = "moni"; + githubId = 20619776; + name = "moni"; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; @@ -9290,6 +12119,21 @@ 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"; + }]; + }; + moody = { + email = "moody@posixcafe.org"; + github = "majiru"; + githubId = 3579600; + name = "Jacob Moody"; + }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; @@ -9365,17 +12209,12 @@ githubId = 2072185; name = "Marc Scholten"; }; - mpsyco = { - email = "fr.st-amour@gmail.com"; - github = "fstamour"; - githubId = 2881922; - name = "Francis St-Amour"; - }; - mtrsk = { - email = "marcos.schonfinkel@protonmail.com"; - github = "mtrsk"; - githubId = 16356569; - name = "Marcos Benevides"; + mrcjkb = { + email = "marc@jakobi.dev"; + matrix = "@mrcjk:matrix.org"; + name = "Marc Jakobi"; + github = "mrcjkb"; + githubId = 12857160; }; mredaelli = { email = "massimo@typish.io"; @@ -9383,6 +12222,24 @@ 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"; @@ -9401,12 +12258,30 @@ github = "MrTarantoga"; githubId = 53876219; }; + mrtnvgr = { + name = "Egor Martynov"; + github = "mrtnvgr"; + githubId = 48406064; + keys = [{ + fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; + }]; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; githubId = 839693; name = "Ingolf Wanger"; }; + msanft = { + email = "moritz.sanft@outlook.de"; + matrix = "@msanft:matrix.org"; + name = "Moritz Sanft"; + github = "msanft"; + githubId = 58110325; + keys = [{ + fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; + }]; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -9419,6 +12294,12 @@ name = "Maxim Schuwalow"; email = "maxim.schuwalow@gmail.com"; }; + mschwaig = { + name = "Martin Schwaighofer"; + github = "mschwaig"; + githubId = 3856390; + email = "mschwaig+nixpkgs@eml.cc"; + }; msfjarvis = { github = "msfjarvis"; githubId = 13348378; @@ -9434,6 +12315,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"; @@ -9494,6 +12381,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"; @@ -9506,17 +12399,27 @@ githubId = 220262; name = "Ion Mudreac"; }; + multisn8 = { + email = "all-things-nix@multisamplednight.com"; + github = "MultisampledNight"; + githubId = 80128916; + name = "MultisampledNight"; + }; multun = { email = "victor.collod@epita.fr"; github = "multun"; 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"; @@ -9524,6 +12427,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"; @@ -9547,17 +12456,39 @@ 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"; + mxkrsv = { + email = "mxkrsv@disroot.org"; + github = "mxkrsv"; + githubId = 59313755; + name = "Maxim Karasev"; + }; + mxmlnkn = { + github = "mxmlnkn"; + githubId = 6842824; + name = "Maximilian Knespel"; + }; + 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"; @@ -9571,18 +12502,53 @@ githubId = 22817873; name = "Ember Keske"; }; + n3oney = { + name = "Michał Minarowski"; + email = "nixpkgs@neoney.dev"; + github = "n3oney"; + githubId = 30625554; + matrix = "@neoney:matrix.org"; + keys = [{ + fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; + }]; + }; + nadir-ishiguro = { + github = "nadir-ishiguro"; + githubId = 23151917; + name = "nadir-ishiguro"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "Nadrieril"; githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; + nagy = { + email = "danielnagy@posteo.de"; + github = "nagy"; + githubId = 692274; + name = "Daniel Nagy"; + keys = [{ + fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; + }]; + }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; githubId = 1009523; name = "Ashijit Pramanik"; }; + name-snrl = { + github = "name-snrl"; + githubId = 72071763; + name = "Yusup Urazaev"; + }; namore = { email = "namor@hemio.de"; github = "namore"; @@ -9590,11 +12556,15 @@ name = "Roman Naumann"; }; naphta = { - email = "naphta@noreply.github.com"; github = "naphta"; githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -9604,11 +12574,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"; @@ -9616,8 +12585,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"; @@ -9639,7 +12613,6 @@ }; nazarewk = { name = "Krzysztof Nazarewski"; - email = "3494992+nazarewk@users.noreply.github.com"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -9648,7 +12621,6 @@ }]; }; nbr = { - email = "nbr@users.noreply.github.com"; github = "nbr"; githubId = 3819225; name = "Nick Braga"; @@ -9681,6 +12653,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + ne9z = { + email = "yuchen@apvc.uk"; + github = "ne9z"; + githubId = 77314501; + name = "Maurice Zhou"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -9688,18 +12666,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"; @@ -9755,12 +12733,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"; @@ -9776,35 +12748,67 @@ 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"; + }; + netthier = { + email = "netthier@proton.me"; + name = "nett_hier"; + github = "netthier"; + githubId = 66856670; + }; + networkexception = { + name = "networkException"; + email = "nix@nwex.de"; + matrix = "@networkexception:chat.upi.li"; + github = "networkException"; + githubId = 42888162; + keys = [{ + fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; + }]; + }; neverbehave = { email = "i@never.pet"; github = "NeverBehave"; githubId = 17120571; name = "Xinhao Luo"; }; + nevivurn = { + email = "nevivurn@nevi.dev"; + github = "nevivurn"; + githubId = 7698349; + name = "Yongun Seong"; + }; newam = { email = "alex@thinglab.org"; github = "newAM"; 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"; @@ -9825,6 +12829,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"; @@ -9834,11 +12844,11 @@ fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; }]; }; - nichtsfrei = { - email = "philipp.eder@posteo.net"; - github = "nichtsfrei"; - githubId = 1665818; - name = "Philipp Eder"; + nicegamer7 = { + name = "Kermina Awad"; + email = "kerminaawad@gmail.com"; + github = "nicegamer7"; + githubId = 8083772; }; nickcao = { name = "Nick Cao"; @@ -9846,6 +12856,11 @@ github = "NickCao"; githubId = 15247171; }; + nickgerace = { + name = "Nick Gerace"; + github = "nickgerace"; + githubId = 39320683; + }; nickhu = { email = "me@nickhu.co.uk"; github = "NickHu"; @@ -9864,6 +12879,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"; @@ -9879,73 +12903,87 @@ fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; }]; }; + nielsegberts = { + email = "nix@nielsegberts.nl"; + github = "nielsegberts"; + githubId = 368712; + name = "Niels Egberts"; + }; + 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"; }; - ninjatrappeur = { - email = "felix@alternativebit.fr"; - matrix = "@ninjatrappeur:matrix.org"; - github = "NinjaTrappeur"; - githubId = 1219785; - name = "Félix Baylac-Jacqué"; + nilsirl = { + email = "nils@nilsand.re"; + github = "NilsIrl"; + githubId = 26231126; + name = "Nils ANDRÉ-CHANG"; }; - ninjin = { - email = "pontus@stenetorp.se"; - github = "ninjin"; - githubId = 354934; - name = "Pontus Stenetorp"; + nim65s = { + email = "guilhem.saurel@laas.fr"; + matrix = "@gsaurel:laas.fr"; + github = "nim65s"; + githubId = 131929; + name = "Guilhem Saurel"; keys = [{ - fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; + fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; + 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"; github = "nioncode"; githubId = 3159451; name = "Nicolas Schneider"; }; - nkje = { - name = "Niels Kristian Lyshøj Jensen"; - email = "n@nk.je"; - github = "NKJe"; - githubId = 1102306; - keys = [{ - fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; - }]; - }; nitsky = { name = "nitsky"; - 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"; @@ -9962,6 +13000,11 @@ githubId = 66913205; name = "Rick Sanchez"; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -9974,6 +13017,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"; @@ -10041,12 +13099,47 @@ githubId = 3521180; name = "Tom Sydney Kerckhove"; }; + NotAShelf = { + name = "NotAShelf"; + email = "raf@notashelf.dev"; + github = "NotAShelf"; + githubId = 62766066; + matrix = "@raf:notashelf.dev"; + }; + 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"; }; + nova-madeline = { + matrix = "@nova:tchncs.de"; + github = "nova-r"; + githubId = 126072875; + name = "nova madeline"; + }; + novenary = { + email = "streetwalkermc@gmail.com"; + github = "9ary"; + githubId = 1155030; + name = "novenary"; + }; novoxd = { email = "radnovox@gmail.com"; github = "novoxd"; @@ -10059,12 +13152,24 @@ 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"; githubId = 9939720; name = "Philippe Nguyen"; }; + npulidomateo = { + matrix = "@npulidomateo:matrix.org"; + github = "npulidomateo"; + githubId = 13149442; + name = "Nico Pulido-Mateo"; + }; nrdxp = { email = "tim.deh@pm.me"; matrix = "@timdeh:matrix.org"; @@ -10072,6 +13177,18 @@ githubId = 34083928; name = "Tim DeHerrera"; }; + nrhelmi = { + email = "helmiinour@gmail.com"; + github = "NRHelmi"; + githubId = 15707703; + name = "Helmi Nour"; + }; + nrhtr = { + email = "jeremy@jenga.xyz"; + github = "nrhtr"; + githubId = 74261; + name = "Jeremy Parker"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -10096,18 +13213,18 @@ githubId = 22592293; name = "Kartik Gokte"; }; + nullishamy = { + email = "spam@amyerskine.me"; + name = "nullishamy"; + github = "nullishamy"; + githubId = 99221043; + }; nullx76 = { email = "nix@xirion.net"; github = "NULLx76"; githubId = 1809198; name = "Victor Roest"; }; - nullishamy = { - email = "amy.codes@null.net"; - name = "nullishamy"; - github = "nullishamy"; - githubId = 99221043; - }; numinit = { email = "me@numin.it"; github = "numinit"; @@ -10127,6 +13244,12 @@ githubId = 16027994; name = "Nathan Viets"; }; + nyanbinary = { + email = "vextium@skiff.com"; + github = "nyabinary"; + githubId = 97130632; + name = "Niko"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -10161,6 +13284,12 @@ githubId = 30825096; name = "Ning Zhang"; }; + oaksoaj = { + email = "oaksoaj@riseup.net"; + name = "Oaksoaj"; + github = "oaksoaj"; + githubId = 103952141; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; @@ -10173,12 +13302,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"; @@ -10189,6 +13312,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"; @@ -10198,6 +13327,22 @@ fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; }]; }; + octodi = { + name = "octodi"; + email = "octodi@proton.me"; + matrix = "@octodi:matrix.org"; + github = "octodi"; + githubId = 127038896; + }; + 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"; @@ -10216,6 +13361,11 @@ githubId = 585547; name = "Jaka Hudoklin"; }; + offsetcyan = { + github = "offsetcyan"; + githubId = 49906709; + name = "Dakota"; + }; oida = { email = "oida@posteo.de"; github = "oida"; @@ -10241,7 +13391,6 @@ name = "Ole Jørgen Brønner"; }; ollieB = { - email = "1237862+oliverbunting@users.noreply.github.com"; github = "oliverbunting"; githubId = 1237862; name = "Ollie Bunting"; @@ -10259,7 +13408,6 @@ name = "Owen Lynch"; }; omasanori = { - email = "167209+omasanori@users.noreply.github.com"; github = "omasanori"; githubId = 167209; name = "Masanori Ogino"; @@ -10276,41 +13424,65 @@ githubId = 1538622; name = "Michael Reilly"; }; + onedragon = { + name = "YiLong Liu"; + email = "18922251299@163.com"; + github = "jackyliu16"; + githubId = 50787361; + }; + onemoresuza = { + name = "Coutinho de Souza"; + email = "dev@onemoresuza.mailer.me"; + github = "onemoresuza"; + githubId = 106456302; + keys = [{ + fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; + }]; + }; 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"; githubId = 915970; name = "Austin Platt"; }; + onur-ozkan = { + name = "Onur Ozkan"; + email = "contact@onurozkan.dev"; + github = "onur-ozkan"; + githubId = 39852038; + }; ony = { name = "Mykola Orliuk"; email = "virkony@gmail.com"; github = "ony"; githubId = 11265; }; - OPNA2608 = { - email = "christoph.neidahl@gmail.com"; - github = "OPNA2608"; - githubId = 23431373; - name = "Christoph Neidahl"; + ooliver1 = { + name = "Oliver Wilkes"; + email = "oliverwilkes2006@icloud.com"; + github = "ooliver1"; + githubId = 34910574; + keys = [{ + fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; + }]; }; opeik = { email = "sandro@stikic.com"; @@ -10318,6 +13490,12 @@ 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"; @@ -10330,6 +13508,21 @@ githubId = 75299; name = "Malcolm Matalka"; }; + orhun = { + email = "orhunparmaksiz@gmail.com"; + github = "orhun"; + githubId = 24392180; + name = "Orhun Parmaksız"; + keys = [{ + fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; + }]; + }; + orichter = { + email = "richter-oliver@gmx.net"; + github = "ORichterSec"; + githubId = 135209509; + name = "Oliver Richter"; + }; orivej = { email = "orivej@gmx.fr"; github = "orivej"; @@ -10348,12 +13541,26 @@ githubId = 357005; name = "Marco Orovecchia"; }; + orthros = { + github = "orthros"; + githubId = 7820716; + name = "orthros"; + }; osener = { email = "ozan@ozansener.com"; github = "osener"; 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"; @@ -10372,6 +13579,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"; @@ -10420,6 +13633,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"; @@ -10441,7 +13660,7 @@ }; paddygord = { email = "pgpatrickgordon@gmail.com"; - github = "paddygord"; + github = "avaunit02"; githubId = 10776658; name = "Patrick Gordon"; }; @@ -10457,6 +13676,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"; @@ -10476,6 +13701,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"; @@ -10494,13 +13725,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"; @@ -10537,12 +13761,6 @@ githubId = 6931743; name = "pasqui23"; }; - patricksjackson = { - email = "patrick@jackson.dev"; - github = "patricksjackson"; - githubId = 160646; - name = "Patrick Jackson"; - }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; @@ -10564,11 +13782,16 @@ githubId = 15645854; name = "Brad Christensen"; }; - payas = { - email = "relekarpayas@gmail.com"; - github = "bhankas"; - githubId = 24254289; - name = "Payas Relekar"; + paumr = { + github = "paumr"; + name = "Michael Bergmeister"; + githubId = 53442728; + }; + paveloom = { + email = "paveloom@riseup.net"; + github = "paveloom"; + githubId = 49961859; + name = "Pavel Sobolev"; }; pawelpacana = { email = "pawel.pacana@gmail.com"; @@ -10576,12 +13799,40 @@ githubId = 116740; name = "Paweł Pacana"; }; + payas = { + email = "relekarpayas@gmail.com"; + github = "bhankas"; + githubId = 24254289; + name = "Payas Relekar"; + }; pb- = { email = "pbaecher@gmail.com"; github = "pb-"; githubId = 84886; name = "Paul Baecher"; }; + pbar = { + email = "piercebartine@gmail.com"; + github = "pbar1"; + 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"; @@ -10594,15 +13845,10 @@ 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"; + matrix = "@pederbs:pvv.ntnu.no"; github = "pbsds"; githubId = 140964; }; @@ -10618,6 +13864,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"; @@ -10630,18 +13894,18 @@ 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"; githubId = 152312; name = "Periklis Tsirakidis"; }; + perstark = { + email = "perstark.se@gmail.com"; + github = "perstarkse"; + githubId = 63069986; + name = "Per Stark"; + }; petercommand = { email = "petercommand@gmail.com"; github = "petercommand"; @@ -10711,6 +13975,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"; @@ -10727,6 +14001,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"; @@ -10739,12 +14023,30 @@ githubId = 9267430; name = "Philipp Mildenberger"; }; + philiptaron = { + email = "philip.taron@gmail.com"; + github = "philiptaron"; + githubId = 43863; + name = "Philip Taron"; + }; + phip1611 = { + email = "phip1611@gmail.com"; + github = "phip1611"; + githubId = 5737016; + name = "Philipp Schuster"; + }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; githubId = 421510; name = "Noé Rubinstein"; }; + pho = { + email = "phofin@gmail.com"; + github = "pho"; + githubId = 88469; + name = "Jaime Breva"; + }; photex = { email = "photex@gmail.com"; github = "photex"; @@ -10769,6 +14071,13 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + picnoir = { + email = "felix@alternativebit.fr"; + matrix = "@picnoir:alternativebit.fr"; + github = "picnoir"; + githubId = 1219785; + name = "Félix Baylac-Jacqué"; + }; piegames = { name = "piegames"; email = "nix@piegames.de"; @@ -10806,6 +14115,12 @@ githubId = 34967; name = "Julius de Bruijn"; }; + pineapplehunter = { + email = "peshogo+nixpkgs@gmail.com"; + github = "pineapplehunter"; + githubId = 8869894; + name = "Shogo Takata"; + }; pingiun = { email = "nixos@pingiun.com"; github = "pingiun"; @@ -10815,6 +14130,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"; @@ -10824,9 +14145,21 @@ fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; + piperswe = { + email = "contact@piperswe.me"; + github = "piperswe"; + githubId = 1830959; + name = "Piper McCorkle"; + }; + piturnah = { + email = "peterhebden6@gmail.com"; + github = "Piturnah"; + githubId = 20472367; + name = "Peter Hebden"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; - github = "pjbarnoy"; + github = "waaamb"; githubId = 119460; name = "Perry Barnoy"; }; @@ -10842,6 +14175,12 @@ githubId = 3737; name = "Peter Jones"; }; + pjrm = { + email = "pedrojrmagalhaes@gmail.com"; + github = "pjrm"; + githubId = 4622652; + name = "Pedro Magalhães"; + }; pkharvey = { email = "kayharvey@protonmail.com"; github = "pkharvey"; @@ -10854,6 +14193,12 @@ githubId = 610615; name = "Chih-Mao Chen"; }; + pks = { + email = "ps@pks.im"; + github = "pks-t"; + githubId = 4056630; + name = "Patrick Steinhardt"; + }; plabadens = { name = "Pierre Labadens"; email = "labadens.pierre+nixpkgs@gmail.com"; @@ -10866,7 +14211,7 @@ PlayerNameHere = { name = "Dixon Sean Low Yan Feng"; email = "dixonseanlow@protonmail.com"; - github = "PlayerNameHere"; + github = "dixslyf"; githubId = 56017218; keys = [{ fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; @@ -10890,12 +14235,25 @@ githubId = 7839004; name = "Dmitriy Pleshevskiy"; }; + pluiedev = { + email = "hi@pluie.me"; + github = "pluiedev"; + githubId = 22406910; + name = "Leah Amelia Chen"; + }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; githubId = 13000278; name = "Maksim Bronsky"; }; + plusgut = { + name = "Carlo Jeske"; + email = "carlo.jeske+nixpkgs@webentwickler2-0.de"; + github = "plusgut"; + githubId = 277935; + matrix = "@plusgut5:matrix.org"; + }; PlushBeaver = { name = "Dmitry Kozlyuk"; email = "dmitry.kozliuk+nixpkgs@gmail.com"; @@ -10984,12 +14342,24 @@ 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"; githubId = 38314551; name = "Peter Okelmann"; }; + pokon548 = { + email = "nix@bukn.uk"; + github = "pokon548"; + githubId = 65808665; + name = "Bu Kun"; + }; polarmutex = { email = "brian@brianryall.xyz"; github = "polarmutex"; @@ -11009,17 +14379,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"; @@ -11032,6 +14395,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + pongo1231 = { + email = "pongo12310@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"; @@ -11047,6 +14422,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"; @@ -11054,9 +14435,9 @@ githubId = 17690377; }; ppom = { - name = "Paco Pompeani"; - email = "paco@ecomail.io"; - github = "aopom"; + name = "ppom"; + email = "ppom@ecomail.fr"; + github = "ppom0"; githubId = 38916722; }; pradeepchhetri = { @@ -11109,11 +14490,22 @@ } ]; }; - 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"; + }]; + }; + p-rintz = { + email = "nix@rintz.net"; + github = "p-rintz"; + githubId = 13933258; + name = "Philipp Rintz"; + matrix = "@philipp:srv.icu"; }; ProducerMatt = { name = "Matthew Pherigo"; @@ -11139,6 +14531,18 @@ githubId = 406946; name = "Valentin Lorentz"; }; + prominentretail = { + email = "me@jakepark.me"; + github = "ProminentRetail"; + githubId = 94048404; + name = "Jake Park"; + }; + proofconstruction = { + email = "source@proof.construction"; + github = "proofconstruction"; + githubId = 74747193; + name = "Alexander Groleau"; + }; proofofkeags = { email = "keagan.mcclelland@gmail.com"; github = "ProofOfKeags"; @@ -11151,6 +14555,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"; @@ -11166,6 +14585,16 @@ githubId = 33375; name = "Peter Sanford"; }; + pschmitt = { + email = "philipp@schmitt.co"; + github = "pschmitt"; + githubId = 37886; + name = "Philipp Schmitt"; + matrix = "@pschmitt:one.ems.host"; + keys = [{ + fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; + }]; + }; pshirshov = { email = "pshirshov@eml.cc"; github = "pshirshov"; @@ -11227,6 +14656,11 @@ githubId = 37715; name = "Brian McKenna"; }; + pulsation = { + name = "Philippe Sam-Long"; + github = "pulsation"; + githubId = 1838397; + }; purcell = { email = "steve@sanityinc.com"; github = "purcell"; @@ -11246,17 +14680,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"; @@ -11264,6 +14704,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"; @@ -11276,39 +14732,68 @@ githubId = 115877; name = "Kenny Shen"; }; + quadradical = { + email = "nixos@henryhiles.com"; + github = "Henry-Hiles"; + githubId = 71790868; + name = "Henry Hiles"; + }; quag = { email = "quaggy@gmail.com"; github = "quag"; githubId = 35086; name = "Jonathan Wright"; }; + quantenzitrone = { + email = "quantenzitrone@protonmail.com"; + github = "quantenzitrone"; + githubId = 74491719; + matrix = "@quantenzitrone:matrix.org"; + name = "quantenzitrone"; + }; queezle = { email = "git@queezle.net"; github = "queezle42"; 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"; githubId = 18196237; name = "Quentin Inkling"; }; + quentin-m = { + email = "me+nix@quentin-machu.fr"; + github = "Quentin-M"; + githubId = 1332289; + name = "Quentin Machu"; + }; + quinn-dougherty = { + email = "quinnd@riseup.net"; + github = "quinn-dougherty"; + githubId = 39039420; + name = "Quinn Dougherty"; + }; qyliss = { email = "hi@alyssa.is"; 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"; @@ -11322,11 +14807,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"; @@ -11334,6 +14828,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"; @@ -11341,24 +14853,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"; @@ -11373,12 +14878,38 @@ 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"; + }; + rapiteanu = { + email = "rapiteanu.catalin@gmail.com"; + github = "Steinhagen"; + githubId = 4029937; + name = "Viorel-Cătălin Răpițeanu"; + }; + raquelgb = { + email = "raquel.garcia.bautista@gmail.com"; + github = "raquelgb"; + githubId = 1246959; + name = "Raquel García"; + }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; @@ -11399,7 +14930,7 @@ }; ratsclub = { email = "victor@freire.dev.br"; - github = "vtrf"; + github = "ratsclub"; githubId = 25647735; name = "Victor Freire"; }; @@ -11409,12 +14940,24 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.com"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; - github = "razvan-flavius-panda"; + github = "freeman42x"; 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"; @@ -11429,7 +14972,6 @@ }; rbreslow = { name = "Rocky Breslow"; - email = "1774125+rbreslow@users.noreply.github.com"; github = "rbreslow"; githubId = 1774125; keys = [{ @@ -11442,17 +14984,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"; @@ -11467,6 +15015,12 @@ } ]; }; + redbaron = { + email = "ivanov.maxim@gmail.com"; + github = "redbaron"; + githubId = 16624; + name = "Maxim Ivanov"; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -11485,6 +15039,13 @@ githubId = 21069876; name = "Reed Williams"; }; + refi64 = { + name = "Ryan Gonzalez"; + email = "git@refi64.dev"; + matrix = "@refi64:linuxcafe.chat"; + github = "refi64"; + githubId = 1690697; + }; refnil = { email = "broemartino@gmail.com"; github = "refnil"; @@ -11516,7 +15077,6 @@ name = "Ricky Elrod"; }; rembo10 = { - email = "rembo10@users.noreply.github.com"; github = "rembo10"; githubId = 801525; name = "rembo10"; @@ -11527,12 +15087,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"; @@ -11545,12 +15099,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"; @@ -11560,17 +15108,23 @@ fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; }]; }; + rewine = { + email = "lhongxu@outlook.com"; + github = "wineee"; + githubId = 22803888; + name = "Lu Hongxu"; + }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; githubId = 165283; name = "Alexey Kutepov"; }; - rewine = { - email = "lhongxu@outlook.com"; - github = "wineee"; - githubId = 22803888; - name = "Lu Hongxu"; + rexxDigital = { + email = "joellarssonpriv@gmail.com"; + github = "rexxDigital"; + githubId = 44014925; + name = "Rexx Larsson"; }; rgnns = { email = "jglievano@gmail.com"; @@ -11596,11 +15150,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"; @@ -11608,6 +15161,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"; @@ -11621,6 +15180,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"; @@ -11633,6 +15198,12 @@ githubId = 42619; name = "Wei-Ming Yang"; }; + rickvanprim = { + email = "me@rickvanprim.com"; + github = "rickvanprim"; + githubId = 13792812; + name = "James Leitch"; + }; rickynils = { email = "rickynils@gmail.com"; github = "rickynils"; @@ -11654,7 +15225,7 @@ }; rika = { email = "rika@paymentswit.ch"; - github = "NekomimiScience"; + github = "ScarletHg"; githubId = 1810487; name = "Rika"; }; @@ -11665,7 +15236,7 @@ name = "Riley Inman"; }; riotbib = { - email = "github-nix@lnrt.de"; + email = "lennart@cope.cool"; github = "riotbib"; githubId = 43172581; name = "Lennart Mühlenmeier"; @@ -11697,6 +15268,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"; @@ -11709,12 +15286,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"; @@ -11774,6 +15345,12 @@ githubId = 12312980; name = "Robbin C."; }; + robbins = { + email = "nejrobbins@gmail.com"; + github = "robbins"; + githubId = 31457698; + name = "Nathanael Robbins"; + }; roberth = { email = "nixpkgs@roberthensing.nl"; matrix = "@roberthensing:matrix.org"; @@ -11805,18 +15382,42 @@ githubId = 1069318; name = "Robin Lambertz"; }; + robwalt = { + email = "robwalter96@gmail.com"; + github = "robwalt"; + githubId = 26892280; + name = "Robert Walter"; + }; roconnor = { email = "roconnor@theorem.ca"; github = "roconnor"; 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"; @@ -11847,13 +15448,30 @@ }; 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"; }]; }; + rossabaker = { + name = "Ross A. Baker"; + email = "ross@rossabaker.com"; + github = "rossabaker"; + githubId = 142698; + }; + RossComputerGuy = { + name = "Tristan Ross"; + email = "tristan.ross@midstall.com"; + github = "RossComputerGuy"; + githubId = 19699320; + }; + rotaerk = { + name = "Matthew Stewart"; + email = "m.scott.stewart@gmail.com"; + github = "rotaerk"; + githubId = 17690823; + }; rowanG077 = { email = "goemansrowan@gmail.com"; github = "rowanG077"; @@ -11900,6 +15518,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"; }]; @@ -11911,30 +15530,65 @@ 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"; githubId = 47790121; name = "Ryan Burns"; }; + rtimush = { + email = "rtimush@gmail.com"; + github = "rtimush"; + githubId = 831307; + name = "Roman Timushev"; + }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; 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; + }; + rudolfvesely = { + name = "Rudolf Vesely"; + email = "i@rudolfvesely.com"; + github = "rudolfvesely"; + githubId = 13966949; + }; + 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"; @@ -11959,6 +15613,12 @@ githubId = 7365864; name = "Rafael Varago"; }; + rvdp = { + email = "ramses@well-founded.dev"; + github = "R-VdP"; + githubId = 141248; + name = "Ramses"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -11971,20 +15631,52 @@ 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"; githubId = 889991; name = "Ryan Artecona"; }; + ryanccn = { + email = "hello@ryanccn.dev"; + github = "ryanccn"; + githubId = 70191398; + name = "Ryan Cao"; + }; + ryane = { + email = "ryanesc@gmail.com"; + github = "ryane"; + githubId = 7346; + name = "Ryan Eschinger"; + keys = [{ + fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; + }]; + }; + ryangibb = { + email = "ryan@freumh.org"; + github = "ryangibb"; + githubId = 22669046; + name = "Ryan Gibb"; + }; ryanorendorff = { - email = "12442942+ryanorendorff@users.noreply.github.com"; github = "ryanorendorff"; githubId = 12442942; name = "Ryan Orendorff"; @@ -12029,6 +15721,12 @@ githubId = 3280280; name = "Ryne Everett"; }; + ryota-ka = { + email = "ok@ryota-ka.me"; + github = "ryota-ka"; + githubId = 7309170; + name = "Ryota Kameoka"; + }; rytone = { email = "max@ryt.one"; github = "rastertail"; @@ -12085,6 +15783,18 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samhug = { + email = "s@m-h.ug"; + github = "samhug"; + githubId = 171470; + name = "Sam Hug"; + }; + SamirTalwar = { + email = "lazy.git@functional.computer"; + github = "abstracte"; + githubId = 47852; + name = "Samir Talwar"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -12125,6 +15835,12 @@ githubId = 107703; name = "Samuel Rivas"; }; + samueltardieu = { + email = "nixpkgs@sam.rfc1149.net"; + github = "samueltardieu"; + githubId = 44656; + name = "Samuel Tardieu"; + }; samw = { email = "sam@wlcx.cc"; github = "wlcx"; @@ -12164,6 +15880,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"; @@ -12176,6 +15898,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"; @@ -12196,7 +15924,6 @@ }; sbond75 = { name = "sbond75"; - email = "43617712+sbond75@users.noreply.github.com"; github = "sbond75"; githubId = 43617712; }; @@ -12218,17 +15945,11 @@ 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; + schinmai-akamai = { + email = "schinmai@akamai.com"; + github = "schinmai-akamai"; + githubId = 70169773; + name = "Tarun Chinmai Sekar"; }; schmitthenner = { email = "development@schmitthenner.eu"; @@ -12249,7 +15970,6 @@ name = "schneefux"; }; schnusch = { - email = "schnusch@users.noreply.github.com"; github = "schnusch"; githubId = 5104601; name = "schnusch"; @@ -12263,6 +15983,13 @@ fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; }]; }; + scm2342 = { + name = "Sven Mattsen"; + email = "nix@sven.cc"; + matrix = "@scm:matrix.sven.cc"; + github = "scm2342"; + githubId = 154108; + }; scode = { email = "peter.schuller@infidyne.com"; github = "scode"; @@ -12271,7 +15998,6 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - email = "34356756+Scoder12@users.noreply.github.com"; github = "Scoder12"; githubId = 34356756; }; @@ -12301,7 +16027,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 = { @@ -12362,6 +16088,29 @@ 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; + }; + seirl = { + name = "Antoine Pietri"; + email = "antoine.pietri1@gmail.com"; + github = "seirl"; + githubId = 4927883; + matrix = "@seirl:matrix.org"; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -12374,12 +16123,28 @@ githubId = 1286668; name = "Thilo Uttendorfer"; }; + sents = { + email = "finn@krein.moe"; + github = "sents"; + githubId = 26575793; + matrix = "@sents:matrix.org"; + name = "Finn Krein"; + }; sephalon = { email = "me@sephalon.net"; github = "sephalon"; 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"; @@ -12392,6 +16157,16 @@ githubId = 4805746; name = "Sebastian Jordan"; }; + septem9er = { + name = "Septem9er"; + email = "develop@septem9er.de"; + matrix = "@septem9er:fairydust.space"; + github = "septem9er"; + githubId = 33379902; + keys = [{ + fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; + }]; +}; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; @@ -12404,6 +16179,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"; @@ -12419,6 +16200,12 @@ fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; }]; }; + sestrella = { + email = "sestrella.me@gmail.com"; + github = "sestrella"; + githubId = 2049686; + name = "Sebastián Estrella"; + }; seylerius = { name = "Sable Seyler"; email = "sable@seyleri.us"; @@ -12428,6 +16215,13 @@ fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; }]; }; + sfr = { + email = "sol@solfisher.com"; + matrix = "@sfr:enby.space"; + github = "solfisher"; + githubId = 57151943; + name = "Sol Fisher Romanoff"; + }; sfrijters = { email = "sfrijters@gmail.com"; github = "SFrijters"; @@ -12447,7 +16241,6 @@ name = "Sebastian Graf"; }; shadaj = { - email = "shadaj@users.noreply.github.com"; github = "shadaj"; githubId = 543055; name = "Shadaj Laddad"; @@ -12472,16 +16265,11 @@ name = "Scott Hamilton"; }; ShamrockLee = { - name = "Shamrock Lee"; - email = "44064051+ShamrockLee@users.noreply.github.com"; + email = "shamrocklee@posteo.net"; github = "ShamrockLee"; githubId = 44064051; - }; - shanemikel = { - email = "shanepearlman@pm.me"; - github = "shanemikel"; - githubId = 6720672; - name = "Shane Pearlman"; + matrix = "@shamrocklee:matrix.org"; + name = "Yueh-Shun Li"; }; shanesveller = { email = "shane@sveller.dev"; @@ -12492,11 +16280,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"; @@ -12504,6 +16298,21 @@ githubId = 12239057; name = "Shawn8901"; }; + shawndellysse = { + email = "sdellysse@gmail.com"; + github = "sdellysse"; + githubId = 293035; + name = "Shawn Dellysse"; + }; + shayne = { + email = "shaynesweeney@gmail.com"; + github = "shayne"; + githubId = 79330; + name = "Shayne Sweeney"; + keys = [{ + fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; + }]; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; @@ -12534,6 +16343,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"; @@ -12549,12 +16364,24 @@ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; + shivaraj-bh = { + email = "sbh69840@gmail.com"; + name = "Shivaraj B H"; + github = "shivaraj-bh"; + githubId = 23645788; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; 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"; @@ -12573,6 +16400,12 @@ github = "kf5grd"; githubId = 18297490; }; + shortcord = { + name = "Short Cord"; + email = "short@shortcord.com"; + github = "shortcord"; + githubId = 3823744; + }; shou = { email = "x+g@shou.io"; github = "Shou"; @@ -12582,7 +16415,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"; @@ -12594,12 +16427,24 @@ githubId = 6224096; name = "Soner Sayakci"; }; + shymega = { + name = "Dom Rodriguez"; + github = "shymega"; + githubId = 1334592; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "langston-barrett"; githubId = 4294323; name = "Langston Barrett"; }; + sielicki = { + name = "Nicholas Sielicki"; + email = "nix@opensource.nslick.com"; + github = "sielicki"; + githubId = 4522995; + matrix = "@sielicki:matrix.org"; + }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; @@ -12618,6 +16463,12 @@ githubId = 16090; name = "Yann Hodique"; }; + sigmanificient = { + email = "sigmanificient@gmail.com"; + github = "Sigmanificient"; + githubId = 53050011; + name = "Yohann Boniface"; + }; sikmir = { email = "sikmir@disroot.org"; github = "sikmir"; @@ -12633,18 +16484,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"; @@ -12657,8 +16508,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"; @@ -12679,12 +16540,24 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sironheart = { + email = "git@beisenherz.dev"; + github = "Sironheart"; + githubId = 13799656; + name = "Steffen Beisenherz"; + }; sirseruju = { email = "sir.seruju@yandex.ru"; github = "SirSeruju"; githubId = 74881555; name = "Fofanov Sergey"; }; + sitaaax = { + email = "johannes@kle1n.com"; + github = "SitAAAx"; + githubId = 74413170; + name = "Johannes Klein"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; @@ -12715,18 +16588,22 @@ githubId = 158321; name = "Stewart Mackenzie"; }; - skeidel = { - email = "svenkeidel@gmail.com"; - github = "svenkeidel"; - githubId = 266500; - name = "Sven Keidel"; + skovati = { + github = "skovati"; + githubId = 49844593; + name = "skovati"; }; skykanin = { - email = "skykanin@users.noreply.github.com"; github = "skykanin"; githubId = 3789764; name = "skykanin"; }; + slbtty = { + email = "shenlebantongying@gmail.com"; + github = "shenlebantongying"; + githubId = 20123683; + name = "Shenleban Tongying"; + }; sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; @@ -12740,6 +16617,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"; @@ -12780,9 +16666,18 @@ name = "Smitty van Bodegom"; email = "me@smitop.com"; matrix = "@smitop:kde.org"; - github = "Smittyvb"; + github = "syvb"; githubId = 10530973; }; + smona = { + name = "Mel Bourgeois"; + email = "mason.bourgeois@gmail.com"; + github = "Smona"; + githubId = 7091399; + keys = [{ + fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; + }]; + }; sna = { email = "abouzahra.9@wright.edu"; github = "S-NA"; @@ -12801,18 +16696,51 @@ 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; + }; + snowflake = { + email = "snowflake@pissmail.com"; + name = "Snowflake"; + github = "snf1k"; + githubId = 149651684; + matrix = "@snowflake:mozilla.org"; + keys = [{ + fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; + }]; + }; + snpschaaf = { + email = "philipe.schaaf@secunet.com"; + name = "Philippe Schaaf"; + github = "snpschaaf"; + githubId = 105843013; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; githubId = 1437166; name = "Xia Bin"; }; + sochotnicky = { + email = "stanislav+github@ochotnicky.com"; + github = "sochotnicky"; + githubId = 55726; + name = "Stanislav Ochotnický"; + }; softinio = { email = "code@softinio.com"; github = "softinio"; @@ -12825,6 +16753,25 @@ 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"; + }]; + }; + soispha = { + name = "Soispha"; + email = "soispha@vhack.eu"; + matrix = "@soispha:vhack.eu"; + github = "soispha"; + githubId = 132207423; + keys = [{ + fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -12851,6 +16798,16 @@ githubId = 53029739; name = "Joshua Ortiz"; }; + Sorixelle = { + email = "ruby+nixpkgs@srxl.me"; + matrix = "@ruby:isincredibly.gay"; + name = "Ruby Iris Juric"; + github = "Sorixelle"; + githubId = 38685302; + keys = [{ + fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; + }]; + }; sorki = { email = "srk@48.io"; github = "sorki"; @@ -12863,6 +16820,27 @@ githubId = 6277322; name = "Wei Tang"; }; + soupglasses = { + email = "sofi+git@mailbox.org"; + github = "soupglasses"; + githubId = 20756843; + name = "Sofi"; + }; + 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"; + }]; + }; + spacefault = { + github = "spacefault"; + githubId = 74156492; + name = "spacefault"; + }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -12875,12 +16853,24 @@ githubId = 7669898; name = "Katharina Fey"; }; + spalf = { + email = "tom@tombarrett.xyz"; + name = "tom barrett"; + github = "70m6"; + githubId = 105207964; + }; spease = { email = "peasteven@gmail.com"; github = "spease"; githubId = 2825204; name = "Steven Pease"; }; + spectre256 = { + name = "Ellis Gibbons"; + email = "egibbons256@gmail.com"; + github = "spectre256"; + githubId = 72505298; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; matrix = "@sjanssen:matrix.org"; @@ -12888,6 +16878,12 @@ githubId = 2600039; name = "Spencer Janssen"; }; + spikespaz = { + name = "Jacob Birkett"; + email = "support@birkett.dev"; + github = "spikespaz"; + githubId = 12502988; + }; spinus = { email = "tomasz.czyz@gmail.com"; github = "spinus"; @@ -12900,11 +16896,11 @@ githubId = 6391601; name = "Roger Mason"; }; - spwhitt = { - email = "sw@swhitt.me"; - github = "spwhitt"; - githubId = 1414088; - name = "Spencer Whitt"; + sputn1ck = { + email = "kon@kon.ninja"; + github = "sputn1ck"; + githubId = 8904314; + name = "Konstantin Nick"; }; squalus = { email = "squalus@squalus.net"; @@ -12931,7 +16927,6 @@ name = "Sergei Khoma"; }; srgom = { - email = "srgom@users.noreply.github.com"; github = "SRGOM"; githubId = 8103619; name = "SRGOM"; @@ -12943,6 +16938,19 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srid = { + email = "srid@srid.ca"; + matrix = "@srid:matrix.org"; + github = "srid"; + githubId = 3998; + name = "Sridhar Ratnakumar"; + }; + srounce = { + name = "Samuel Rounce"; + email = "me@samuelrounce.co.uk"; + github = "srounce"; + githubId = 60792; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -12967,12 +16975,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"; @@ -12985,6 +17014,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"; @@ -13007,6 +17042,16 @@ 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"; + }]; + }; stephank = { email = "nix@stephank.nl"; matrix = "@skochen:matrix.org"; @@ -13022,7 +17067,6 @@ }; stephenwithph = { name = "StephenWithPH"; - email = "StephenWithPH@users.noreply.github.com"; github = "StephenWithPH"; githubId = 2990492; }; @@ -13053,18 +17097,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"; @@ -13090,10 +17134,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"; @@ -13113,6 +17159,12 @@ githubId = 38893265; name = "StrikerLulu"; }; + stteague = { + email = "stteague505@yahoo.com"; + github = "stteague"; + githubId = 77596767; + name = "Scott Teague"; + }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; @@ -13155,6 +17207,18 @@ githubId = 16734772; name = "Sumner Evans"; }; + sund3RRR = { + email = "evenquantity@gmail.com"; + github = "sund3RRR"; + githubId = 73298492; + name = "Mikhail Kiselev"; + }; + suominen = { + email = "kimmo@suominen.com"; + github = "suominen"; + githubId = 1939855; + name = "Kimmo Suominen"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; @@ -13174,6 +17238,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"; @@ -13192,18 +17262,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"; @@ -13234,6 +17304,18 @@ githubId = 19905904; name = "Simon Weber"; }; + sweenu = { + name = "sweenu"; + email = "contact@sweenu.xyz"; + github = "sweenu"; + githubId = 7051978; + }; + swesterfeld = { + email = "stefan@space.twc.de"; + github = "swesterfeld"; + githubId = 14840066; + name = "Stefan Westerfeld"; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; @@ -13252,6 +17334,13 @@ githubId = 20063502; name = "Sybrand Aarnoutse"; }; + syboxez = { + email = "syboxez@gmail.com"; + matrix = "@Syboxez:matrix.org"; + github = "syboxez"; + githubId = 12841859; + name = "Syboxez Blank"; + }; symphorien = { email = "symphorien_nixpkgs@xlumurb.eu"; matrix = "@symphorien:xlumurb.eu"; @@ -13265,6 +17354,12 @@ githubId = 7075751; name = "Patrick Hilhorst"; }; + sysedwinistrator = { + email = "edwin.mowen@gmail.com"; + github = "sysedwinistrator"; + githubId = 71331875; + name = "Edwin Mackenzie-Owen"; + }; szczyp = { email = "qb@szczyp.com"; github = "Szczyp"; @@ -13289,6 +17384,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"; @@ -13316,12 +17420,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"; @@ -13331,6 +17429,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"; @@ -13381,6 +17485,12 @@ githubId = 1901799; name = "Nathan van Doorn"; }; + taranarmo = { + email = "taranarmo@gmail.com"; + github = "taranarmo"; + githubId = 11619234; + name = "Sergey Volkov"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; @@ -13411,6 +17521,12 @@ githubId = 863327; name = "Tyler Benster"; }; + tbidne = { + email = "tbidne@protonmail.com"; + github = "tbidne"; + githubId = 2856188; + name = "Thomas Bidne"; + }; tboerger = { email = "thomas@webhippie.de"; matrix = "@tboerger:matrix.org"; @@ -13424,6 +17540,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"; @@ -13433,6 +17555,12 @@ }]; name = "David Tchekachev"; }; + tcheronneau = { + email = "nix@mcth.fr"; + github = "tcheronneau"; + githubId = 7914437; + name = "Thomas Cheronneau"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; @@ -13440,13 +17568,12 @@ name = "Andy Tockman"; }; techknowlogick = { - email = "techknowlogick@gitea.io"; + email = "techknowlogick@gitea.com"; github = "techknowlogick"; githubId = 164197; name = "techknowlogick"; }; Technical27 = { - email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; githubId = 38222826; name = "Aamaruvi Yogamani"; @@ -13457,21 +17584,48 @@ 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"; }; + tengkuizdihar = { + name = "Tengku Izdihar"; + email = "tengkuizdihar@gmail.com"; + matrix = "@tengkuizdihar:matrix.org"; + github = "tengkuizdihar"; + githubId = 22078730; + }; + 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"; }; @@ -13534,11 +17688,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"; @@ -13546,6 +17699,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"; @@ -13580,6 +17739,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"; @@ -13592,40 +17758,64 @@ 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"; matrix = "@mrhedgehog:jupiterbroadcasting.com"; - github = "theHedgehog0"; + github = "pyrox0"; githubId = 35778371; keys = [{ 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"; githubId = 3105057; name = "Jan Beinke"; }; + thenonameguy = { + email = "thenonameguy24@gmail.com"; + name = "Krisztian Szabo"; + github = "thenonameguy"; + githubId = 2217181; + }; therealansh = { email = "tyagiansh23@gmail.com"; github = "therealansh"; 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"; @@ -13673,11 +17863,29 @@ 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; + }; + thillux = { + name = "Markus Theil"; + email = "theil.markus@gmail.com"; + github = "thillux"; + githubId = 2171995; + }; + thilobillerbeck = { + name = "Thilo Billerbeck"; + email = "thilo.billerbeck@officerent.de"; + github = "thilobillerbeck"; + githubId = 7442383; + }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; }; thmzlt = { email = "git@thomazleite.com"; @@ -13691,17 +17899,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"; @@ -13721,6 +17935,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"; @@ -13730,12 +17950,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"; @@ -13743,11 +17975,18 @@ github = "TilCreator"; githubId = 18621411; }; + tillkruss = { + name = "Till Krüss"; + email = "till@kruss.io"; + github = "tillkruss"; + githubId = 665029; + }; 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"; @@ -13791,6 +18030,13 @@ githubId = 1292007; name = "Sébastien Maccagnoni"; }; + tiredofit = { + email = "dave@tiredofit.ca"; + github = "tiredofit"; + githubId = 23528985; + name = "Dave Conroy"; + matrix = "@dave:tiredofit.ca"; + }; tirex = { email = "szymon@kliniewski.pl"; name = "Szymon Kliniewski"; @@ -13803,6 +18049,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"; @@ -13824,6 +18080,18 @@ githubId = 1280118; name = "Tomislav Markovski"; }; + tmarkus = { + email = "tobias@markus-regensburg.de"; + github = "hesiod"; + githubId = 3159881; + name = "Tobias Markus"; + }; + tm-drtina = { + email = "tm.drtina@gmail.com"; + github = "tm-drtina"; + githubId = 26902865; + name = "Tomas Drtina"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -13845,7 +18113,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:matrix.org"; + matrix = "@toastal:mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -13853,17 +18121,23 @@ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; }]; }; + 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"; }; - tobiasBora = { - email = "tobias.bora.list@gmail.com"; - github = "tobiasBora"; - githubId = 2164118; - name = "Tobias Bora"; + tochiaha = { + email = "tochiahan@proton.me"; + github = "Tochiaha"; + githubId = 74688871; + name = "Tochukwu Ahanonu"; }; tokudan = { email = "git@danielfrank.net"; @@ -13877,6 +18151,20 @@ githubId = 8577941; name = "Kevin Rauscher"; }; + tomasajt = { + github = "TomaSajt"; + githubId = 62384384; + name = "TomaSajt"; + keys = [{ + fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; + }]; + }; + tomaskala = { + email = "public+nixpkgs@tomaskala.com"; + github = "tomaskala"; + githubId = 7727887; + name = "Tomas Kala"; + }; tomberek = { email = "tomberek@gmail.com"; matrix = "@tomberek:matrix.org"; @@ -13896,11 +18184,16 @@ githubId = 13155277; name = "Tom Houle"; }; - tomsmeets = { - email = "tom.tsmeets@gmail.com"; - github = "TomSmeets"; - githubId = 6740669; - name = "Tom Smeets"; + tomkoid = { + email = "tomaszierl@outlook.com"; + name = "Tomkoid"; + }; + tomodachi94 = { + email = "tomodachi94+nixpkgs@protonmail.com"; + matrix = "@tomodachi94:matrix.org"; + github = "tomodachi94"; + githubId = 68489118; + name = "Tomodachi94"; }; tomsiewert = { email = "tom@siewert.io"; @@ -13909,6 +18202,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"; @@ -13922,6 +18227,12 @@ githubId = 27586264; name = "Tobias Schmidt"; }; + totalchaos = { + email = "basil.keeler@outlook.com"; + github = "totalchaos05"; + githubId = 70387628; + name = "Basil Keeler"; + }; totoroot = { name = "Matthias Thym"; email = "git@thym.at"; @@ -13947,11 +18258,11 @@ githubId = 10110; name = "Travis B. Hartwell"; }; - travisdavis-ops = { - email = "travisdavismedia@gmail.com"; - github = "TravisDavis-ops"; - githubId = 52011418; - name = "Travis Davis"; + traxys = { + email = "quentin+dev@familleboyer.net"; + github = "traxys"; + githubId = 5623227; + name = "Quentin Boyer"; }; TredwellGit = { email = "tredwell@tutanota.com"; @@ -13971,6 +18282,13 @@ githubId = 25440339; name = "Tom Repetti"; }; + trevdev = { + email = "trev@trevdev.ca"; + matrix = "@trevdev:matrix.org"; + github = "trev-dev"; + githubId = 28788713; + name = "Trevor Richards"; + }; trevorj = { email = "nix@trevor.joynson.io"; github = "akatrevorjay"; @@ -14025,24 +18343,42 @@ githubId = 15064765; name = "tshaynik"; }; + tsowell = { + email = "tom@ldtlb.com"; + github = "tsowell"; + githubId = 4044033; + name = "Thomas Sowell"; + }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; 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"; @@ -14082,6 +18418,12 @@ githubId = 9413924; name = "Thorsten Weber"; }; + twesterhout = { + name = "Tom Westerhout"; + matrix = "@twesterhout:matrix.org"; + github = "twesterhout"; + githubId = 14264576; + }; twey = { email = "twey@twey.co.uk"; github = "Twey"; @@ -14103,12 +18445,40 @@ github = "twitchyliquid64"; githubId = 6328589; }; + twz123 = { + name = "Tom Wieczorek"; + email = "tom@bibbu.net"; + github = "twz123"; + githubId = 1215104; + keys = [{ + fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; + }]; + }; + tylerjl = { + email = "tyler+nixpkgs@langlois.to"; + github = "tylerjl"; + githubId = 1733846; + matrix = "@ty:tjll.net"; + name = "Tyler Langlois"; + }; + tymscar = { + email = "oscar@tymscar.com"; + github = "tymscar"; + githubId = 3742502; + name = "Oscar Molnar"; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; githubId = 1983821; name = "Eric Wolf"; }; + u2x1 = { + email = "u2x1@outlook.com"; + github = "u2x1"; + githubId = 30677291; + name = "u2x1"; + }; uakci = { name = "uakci"; email = "uakci@uakci.pl"; @@ -14127,6 +18497,16 @@ githubId = 1607770; name = "Ulrik Strid"; }; + unclamped = { + name = "Maru"; + email = "clear6860@tutanota.com"; + matrix = "@unhidden0174:matrix.org"; + github = "unclamped"; + githubId = 104658278; + keys = [{ + fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; + }]; + }; unclechu = { name = "Viacheslav Lotsmanov"; email = "lotsmanov89@gmail.com"; @@ -14136,6 +18516,15 @@ fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; }]; }; + undefined-moe = { + name = "undefined"; + email = "i@undefined.moe"; + github = "undefined-moe"; + githubId = 29992205; + keys = [{ + fingerprint = "6684 4E7D D213 C75D 8828 6215 C714 A58B 6C1E 0F52"; + }]; + }; unhammer = { email = "unhammer@fsfe.org"; github = "unhammer"; @@ -14165,6 +18554,11 @@ github = "unrooted"; githubId = 30440603; }; + unsolvedcypher = { + name = "Matthew M"; + github = "UnsolvedCypher"; + githubId = 3170853; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -14173,6 +18567,7 @@ }; urandom = { email = "colin@urandom.co.uk"; + matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; keys = [{ @@ -14198,6 +18593,12 @@ githubId = 32751441; name = "urlordjames"; }; + ursi = { + email = "masondeanm@aol.com"; + github = "ursi"; + githubId = 17836748; + name = "Mason Mackaman"; + }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; @@ -14216,6 +18617,18 @@ githubId = 928084; name = "Utku Demir"; }; + uthar = { + email = "galkowskikasper@gmail.com"; + 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"; @@ -14234,6 +18647,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"; @@ -14260,6 +18679,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"; @@ -14305,6 +18730,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"; @@ -14328,6 +18759,18 @@ githubId = 6508; name = "Vincent Demeester"; }; + vdot0x23 = { + name = "Victor Büttner"; + email = "nix.victor@0x23.dk"; + github = "vdot0x23"; + githubId = 40716069; + }; + vector1dev = { + name = "vector1dev"; + matrix = "@vector1dev:vector1.dev"; + github = "vector1dev"; + githubId = 127302590; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; @@ -14355,6 +18798,21 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + vgskye = { + name = "Skye Green"; + email = "me@skye.vg"; + github = "vgskye"; + githubId = 116078858; + keys = [{ + fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; + }]; + }; + victormeriqui = { + name = "Victor Meriqui"; + email = "victor.meriqui@ororatech.com"; + github = "victormeriqui"; + githubId = 1396008; + }; victormignot = { email = "root@victormignot.fr"; github = "victormignot"; @@ -14388,9 +18846,27 @@ githubId = 7953163; name = "Vika Shleina"; keys = [{ - fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; + fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; }]; }; + viktornordling = { + email = "antique_paler_0i@icloud.com"; + github = "viktornordling"; + githubId = 90482; + name = "Viktor Nordling"; + }; + vilsol = { + email = "me@vil.so"; + github = "vilsol"; + githubId = 1759390; + name = "Vilsol"; + }; + viluon = { + email = "nix@viluon.me"; + github = "viluon"; + githubId = 7235381; + name = "Ondřej Kvapil"; + }; vincentbernat = { email = "vincent@bernat.ch"; github = "vincentbernat"; @@ -14400,24 +18876,36 @@ fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; + vinetos = { + name = "vinetos"; + email = "vinetosdev@gmail.com"; + github = "vinetos"; + githubId = 10145351; + }; + 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"; @@ -14485,6 +18973,12 @@ githubId = 7038383; name = "Vojta Káně"; }; + volfyd = { + email = "lb.nix@lisbethmail.com"; + github = "volfyd"; + githubId = 3578382; + name = "Leif Huhn"; + }; volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; @@ -14497,6 +18991,12 @@ githubId = 3413119; name = "Vonfry"; }; + votava = { + email = "votava@gmail.com"; + github = "janvotava"; + githubId = 367185; + name = "Jan Votava"; + }; vq = { email = "vq@erq.se"; github = "vq"; @@ -14527,6 +19027,12 @@ githubId = 16415673; name = "Van Tuan Vo"; }; + vuimuich = { + email = "vuimuich@quantentunnel.de"; + github = "VuiMuich"; + githubId = 4779365; + name = "Johannes Mayrhofer"; + }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; @@ -14548,6 +19054,27 @@ fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; }]; }; + waelwindows = { + email = "waelwindows9922@gmail.com"; + github = "Waelwindows"; + githubId = 5228243; + name = "waelwindows"; + }; + wahtique = { + name = "William Veal Phan"; + email = "williamvphan@yahoo.fr"; + github = "wahtique"; + githubId = 55251330; + keys = [{ + fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; + }]; + }; + waiting-for-dev = { + email = "marc@lamarciana.com"; + github = "waiting-for-dev"; + githubId = 52650; + name = "Marc Busqué"; + }; wakira = { name = "Sheng Wang"; email = "sheng@a64.work"; @@ -14557,6 +19084,13 @@ fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; }]; }; + wamirez = { + email = "wamirez@protonmail.com"; + matrix = "@wamirez:matrix.org"; + github = "wamirez"; + githubId = 24505474; + name = "Daniel Ramirez"; + }; wamserma = { name = "Markus S. Wamser"; email = "github-dev@mail2013.wamser.eu"; @@ -14564,7 +19098,7 @@ githubId = 60148; }; water-sucks = { - email = "varun@cvte.org"; + email = "varun@snare.dev"; name = "Varun Narravula"; github = "water-sucks"; githubId = 68445574; @@ -14581,20 +19115,26 @@ 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"; github = "wdavidw"; githubId = 46896; }; - WeebSorceress = { - name = "WeebSorceress"; - email = "hello@weebsorceress.anonaddy.me"; - matrix = "@weebsorceress:matrix.org"; - github = "WeebSorceress"; - githubId = 106774777; + weathercold = { + name = "Weathercold"; + email = "weathercold.scr@proton.me"; + matrix = "@weathercold:matrix.org"; + github = "Weathercold"; + githubId = 49368953; keys = [{ - fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43"; + fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; }]; }; wegank = { @@ -14603,12 +19143,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"; @@ -14618,6 +19152,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"; @@ -14630,6 +19170,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"; @@ -14639,12 +19185,33 @@ fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; }]; }; + wexder = { + email = "wexder19@gmail.com"; + github = "wexder"; + githubId = 24979302; + name = "Vladimír Zahradník"; + }; wheelsandmetal = { email = "jakob@schmutz.co.uk"; github = "wheelsandmetal"; 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"; + }]; + }; + whiteley = { + email = "mattwhiteley@gmail.com"; + github = "whiteley"; + githubId = 2215; + name = "Matt Whiteley"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -14657,6 +19224,22 @@ githubId = 7121530; name = "Wolf Honoré"; }; + wietsedv = { + email = "wietsedv@proton.me"; + github = "wietsedv"; + githubId = 13139101; + name = "Wietse de Vries"; + }; + wigust = { + name = "Oleg Pykhalov"; + email = "go.wigust@gmail.com"; + github = "wigust"; + githubId = 7709598; + keys = [{ + # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; + }]; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; @@ -14666,17 +19249,37 @@ 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"; + willswats = { + email = "williamstuwatson@gmail.com"; + github = "willswats"; + githubId = 86304139; + name = "William Watson"; + }; + wilsonehusin = { + name = "Wilson E. Husin"; + email = "wilsonehusin@gmail.com"; + github = "wilsonehusin"; + githubId = 14004487; }; winpat = { email = "patrickwinter@posteo.ch"; @@ -14703,22 +19306,30 @@ 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"; githubId = 168610; name = "Ricardo M. Correia"; }; - wjlroe = { - email = "willroe@gmail.com"; - github = "wjlroe"; - githubId = 43315; - name = "William Roe"; + wladmis = { + email = "dev@wladmis.org"; + github = "wladmis"; + githubId = 5000261; + name = "Wladmis"; }; wldhx = { email = "wldhx+nixpkgs@wldhx.me"; @@ -14786,6 +19397,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"; @@ -14807,12 +19424,6 @@ githubId = 20400405; name = "Wucke"; }; - wykurz = { - email = "wykurz@gmail.com"; - github = "wykurz"; - githubId = 483465; - name = "Mateusz Wykurz"; - }; wulfsta = { email = "wulfstawulfsta@gmail.com"; github = "Wulfsta"; @@ -14825,8 +19436,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; @@ -14856,6 +19478,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"; @@ -14864,7 +19492,6 @@ }; xdhampus = { name = "Hampus"; - email = "16954508+xdHampus@users.noreply.github.com"; github = "xdHampus"; githubId = 16954508; }; @@ -14881,19 +19508,19 @@ githubId = 36407913; name = "Uli Baum"; }; + xfix = { + email = "kamila@borowska.pw"; + matrix = "@xfix:matrix.org"; + github = "xfix"; + githubId = 1297598; + name = "Kamila Borowska"; + }; xfnw = { email = "xfnw+nixos@riseup.net"; github = "xfnw"; githubId = 66233223; name = "Owen"; }; - xfix = { - email = "konrad@borowski.pw"; - matrix = "@xfix:matrix.org"; - github = "xfix"; - githubId = 1297598; - name = "Konrad Borowski"; - }; xgroleau = { email = "xgroleau@gmail.com"; github = "xgroleau"; @@ -14906,6 +19533,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"; @@ -14919,7 +19552,6 @@ name = "Guillermo NWDD"; }; xrelkd = { - email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; githubId = 46590321; name = "xrelkd"; @@ -14937,7 +19569,6 @@ name = "Marti Serra"; }; xworld21 = { - email = "1962985+xworld21@users.noreply.github.com"; github = "xworld21"; githubId = 1962985; name = "Vincenzo Mantova"; @@ -14948,6 +19579,12 @@ github = "XYenon"; githubId = 20698483; }; + xyven1 = { + name = "Xyven"; + email = "nix@xyven.dev"; + github = "xyven1"; + githubId = 35360746; + }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; @@ -14960,14 +19597,31 @@ 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; + }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { - email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; githubId = 41838844; name = "Yarny"; @@ -14978,12 +19632,45 @@ githubId = 3705333; name = "Dmitry V."; }; + yavko = { + name = "Yavor Kolev"; + email = "yavornkolev@gmail.com"; + matrix = "@yavor:nikolay.ems.host"; + github = "yavko"; + githubId = 15178513; + keys = [ + {fingerprint = "DC05 7015 ECD7 E68A 6426 EFD8 F07D 19A3 2407 F857";} + {fingerprint = "2874 581F F832 C9E9 AEC6 8D84 E57B F27C 8BB0 80B0";} + ]; + }; yayayayaka = { - email = "nixpkgs@uwu.is"; - matrix = "@lara:uwu.is"; + email = "github@uwu.is"; + matrix = "@yaya:uwu.is"; github = "yayayayaka"; githubId = 73759599; - name = "Lara A."; + name = "Yaya"; + }; + yboettcher = { + name = "Yannik Böttcher"; + github = "yboettcher"; + githubId = 39460066; + email = "yannikboettcher@outlook.de"; + }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; + YellowOnion = { + name = "Daniel Hill"; + email = "daniel@gluo.nz"; + github = "YellowOnion"; + githubId = 364160; + matrix = "@woobilicious:matrix.org"; }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; @@ -14997,6 +19684,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"; @@ -15015,11 +19714,35 @@ 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; + }; + ymstnt = { + name = "YMSTNT"; + github = "ymstnt"; + githubId = 21342713; + }; + yoavlavi = { + email = "yoav@yoavlavi.com"; + github = "yoav-lavi"; + githubId = 14347895; + name = "Yoav Lavi"; }; yochai = { email = "yochai@titat.info"; @@ -15040,6 +19763,20 @@ githubId = 647076; name = "Yorick van Pelt"; }; + YorikSar = { + name = "Yuriy Taraday"; + email = "yorik.sar@gmail.com"; + matrix = "@yorik.sar:matrix.org"; + github = "YorikSar"; + githubId = 428074; + }; + YoshiRulz = { + name = "YoshiRulz"; + email = "OSSYoshiRulz+Nixpkgs@gmail.com"; + matrix = "@YoshiRulz:matrix.org"; + github = "YoshiRulz"; + githubId = 13409956; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; @@ -15052,12 +19789,40 @@ 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"; + }]; + }; + yunfachi = { + email = "yunfachi@gmail.com"; + github = "yunfachi"; + githubId = 73419713; + name = "Yunfachi"; + }; yureien = { email = "contact@sohamsen.me"; github = "Yureien"; @@ -15082,22 +19847,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"; @@ -15109,7 +19858,8 @@ }]; }; yuu = { - email = "yuuyin@protonmail.com"; + email = "yuunix@grrlz.net"; + matrix = "@yuu:matrix.org"; github = "yuuyins"; githubId = 86538850; name = "Yuu Yin"; @@ -15117,6 +19867,16 @@ fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; }]; }; + yvan-sraka = { + email = "yvan@sraka.xyz"; + github = "yvan-sraka"; + githubId = 705213; + keys = [{ + fingerprint = "FE9A 953C 97E4 54FE 6598 BFDD A4FB 3EAA 6F45 2379"; + }]; + matrix = "@/yvan:matrix.org"; + name = "Yvan Sraka"; + }; yvesf = { email = "yvesf+nix@xapek.org"; github = "yvesf"; @@ -15129,36 +19889,69 @@ 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"; }; + zaldnoay = { + email = "zunway@outlook.com"; + github = "zaldnoay"; + githubId = 5986078; + name = "Zunway Liang"; + }; + 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"; @@ -15177,19 +19970,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"; @@ -15199,18 +20007,24 @@ fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; }]; }; + zeri = { + name = "zeri"; + matrix = "@zeri:matrix.org"; + github = "zeri42"; + githubId = 68825133; + }; + zestsystem = { + email = "mk337337@gmail.com"; + github = "zestsystem"; + githubId = 39456023; + name = "Mike Yim"; + }; zfnmxt = { name = "zfnmxt"; email = "zfnmxt@zfnmxt.com"; github = "zfnmxt"; githubId = 37446532; }; - zgrannan = { - email = "zgrannan@gmail.com"; - github = "zgrannan"; - githubId = 1141948; - name = "Zack Grannan"; - }; zhaofengli = { email = "hello@zhaofeng.li"; matrix = "@zhaofeng:zhaofeng.li"; @@ -15218,6 +20032,18 @@ githubId = 2189609; name = "Zhaofeng Li"; }; + zi3m5f = { + name = "zi3m5f"; + email = "k7n3o3a6f@mozmail.com"; + github = "zi3m5f"; + githubId = 113244000; + }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; @@ -15225,17 +20051,57 @@ name = "zimbatm"; }; Zimmi48 = { - email = "theo.zimmermann@univ-paris-diderot.fr"; + email = "theo.zimmermann@telecom-paris.fr"; github = "Zimmi48"; githubId = 1108325; name = "Théo Zimmermann"; }; + zmitchell = { + name = "Zach Mitchell"; + email = "zmitchell@fastmail.com"; + matrix = "@zmitchell:matrix.org"; + github = "zmitchell"; + githubId = 10246891; + }; + znaniye = { + email = "zn4niye@proton.me"; + github = "znaniye"; + githubId = 134703788; + name = "Samuel Silva"; + }; + znewman01 = { + email = "znewman01@gmail.com"; + github = "znewman01"; + githubId = 873857; + name = "Zack Newman"; + }; + 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"; @@ -15249,7 +20115,6 @@ name = "Alexandre Macabies"; }; zowoq = { - email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; githubId = 59103226; name = "zowoq"; @@ -15266,6 +20131,24 @@ 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; + }; + zuzuleinen = { + email = "andrey.boar@gmail.com"; + name = "Andrei Boar"; + github = "zuzuleinen"; + githubId = 944919; + }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; @@ -15278,540 +20161,23 @@ githubId = 20029431; name = "Zyansheep"; }; + zygot = { + email = "stefan.bordei13@gmail.com"; + github = "stefan-bordei"; + githubId = 71881325; + name = "Stefan Bordei"; + }; 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"; - githubId = 1618343; - keys = [{ - fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; - }]; - }; - 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 = "gustavoporto@ya.ru"; - 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; - }; - waelwindows = { - email = "waelwindows9922@gmail.com"; - github = "Waelwindows"; - githubId = 5228243; - name = "waelwindows"; - }; - wuyoli = { - name = "wuyoli"; - email = "wuyoli@tilde.team"; - github = "wuyoli"; - githubId = 104238274; + zzzsy = { + email = "me@zzzsy.top"; + github = "zzzsyyy"; + githubId = 59917878; + name = "Mathias Zhang"; }; } +/* Keep the list alphabetically sorted. */ diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix index 6a4de8a4b9511..83236e6fa91e9 100644 --- a/maintainers/scripts/all-tarballs.nix +++ b/maintainers/scripts/all-tarballs.nix @@ -12,5 +12,5 @@ import ../../pkgs/top-level/release.nix scrubJobs = false; # No need to evaluate on i686. supportedSystems = [ "x86_64-linux" ]; - limitedSupportedSystems = []; + bootstrapConfigs = []; } diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index 326aae47f8c55..c40729a3974ed 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -1,15 +1,18 @@ { maintainer }: let - pkgs = import ./../../default.nix { }; + pkgs = import ./../../default.nix { + config.allowAliases = false; + }; + inherit (pkgs) lib; maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: prefix: set: - (pkgs.lib.flatten - (pkgs.lib.mapAttrsToList + (lib.flatten + (lib.mapAttrsToList (name: pkg: let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg then + if lib.isDerivation pkg && cond name pkg then # Skip packages whose closure fails on evaluation. # This happens for pkgs like `python27Packages.djangoql` # that have disabled Python pkgs as dependencies. @@ -42,7 +45,7 @@ let ) ) (name: name) - ("") + "" pkgs; in 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/debian-patches.sh b/maintainers/scripts/debian-patches.sh index de6be136ca778..1f021c224c3af 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix 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/eval-release.sh b/maintainers/scripts/eval-release.sh index e0dfaf1de74c1..b588c767b6ae0 100755 --- a/maintainers/scripts/eval-release.sh +++ b/maintainers/scripts/eval-release.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" 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/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index 81f6450c5faf0..c953cff5cc487 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -13,12 +13,15 @@ STDOUT->autoflush(1); my $ua = LWP::UserAgent->new(); +if (!defined $ENV{GH_TOKEN}) { + die "Set GH_TOKEN before running this script"; +} + keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; if (!defined $current_user) { print "$k has no github handle\n"; - next; } my $github_id = %$v{'githubId'}; if (!defined $github_id) { @@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) { sleep($ratelimit_reset - time() + 5); } if ($resp->code != 200) { - print $current_user . " likely deleted their github account\n"; + print "$k likely deleted their github account\n"; next; } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if ($current_user ne $api_user) { - print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + if (!defined $current_user) { + print "$k is known on github as $api_user.\n"; + } + elsif (lc($current_user) ne lc($api_user)) { + print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; $data =~ s/github = "$current_user";$/github = "$api_user";/m; 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..2ce3ecb2ae70a 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 (forM_, 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,43 +86,86 @@ 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 , jobsetevalinputs :: JobsetEvalInputs + , builds :: Seq Int } 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) +data HydraSlownessWorkaroundFlag = HydraSlownessWorkaround | NoHydraSlownessWorkaround +data RequestLogsFlag = RequestLogs | NoRequestLogs + main :: IO () main = do args <- getArgs case args of - ["get-report"] -> getBuildReports + ["get-report", "--slow"] -> getBuildReports HydraSlownessWorkaround + ["get-report"] -> getBuildReports NoHydraSlownessWorkaround ["ping-maintainers"] -> printMaintainerPing - ["mark-broken-list"] -> printMarkBrokenList - _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list" + ["mark-broken-list", "--no-request-logs"] -> printMarkBrokenList NoRequestLogs + ["mark-broken-list"] -> printMarkBrokenList RequestLogs + ["eval-info"] -> printEvalInfo + _ -> putStrLn "Usage: get-report [--slow] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info" reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -120,19 +173,43 @@ reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" showT :: Show a => a -> Text 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 - eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay +getBuildReports :: HydraSlownessWorkaroundFlag -> IO () +getBuildReports opt = runReq defaultHttpConfig do + evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"] + eval@Eval{id} <- maybe (liftIO $ fail "No Evaluation 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 <- getEvalBuilds opt id 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) + +getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) +getEvalBuilds NoHydraSlownessWorkaround id = + hydraJSONQuery mempty ["eval", showT id, "builds"] +getEvalBuilds HydraSlownessWorkaround id = do + Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] + forM builds $ \buildId -> do + liftIO $ putStrLn $ "Querying build " <> show buildId + hydraJSONQuery mempty [ "build", showT buildId ] + +hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) +hydraQuery responseType option query = do + let customHeaderOpt = + header + "User-Agent" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes + opts = customHeaderOpt <> customTimeoutOpt <> option + url = foldl' (/:) (https "hydra.nixos.org") query + responseBody <$> req GET url NoReqBody responseType opts + +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 +248,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 +273,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 +286,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 +333,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 +345,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 +397,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 +481,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 +553,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 +597,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 +784,36 @@ 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)) - -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 + let statusSummaries = + fmap (buildToStatusSummary maintainerMap reverseDependencyMap) buildReport + buildSum :: StatusSummary + buildSum = combineStatusSummaries statusSummaries + textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps + Text.putStrLn textBuildSummary + +printMarkBrokenList :: RequestLogsFlag -> IO () +printMarkBrokenList reqLogs = do + (_, 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 + -- We use the last probable error cause found in the build log file. + error_message <- fromMaybe "failure" <$> + case reqLogs of + NoRequestLogs -> pure Nothing + RequestLogs -> 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"] + pure $ 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..9aa9433b8023a 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -10,6 +10,24 @@ set -euo pipefail +do_commit=false +mark_broken_list_flags="" + +for arg in "$@"; do + case "$arg" in + --do-commit) + do_commit=true + ;; + --no-request-logs) + mark_broken_list_flags="$mark_broken_list_flags $arg" + ;; + *) + echo "$0: unknown flag: $arg" + exit 100 + ;; + esac +done + broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml" tmpfile=$(mktemp) @@ -17,7 +35,7 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" +maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | sort -i > "$tmpfile" $EDITOR "$tmpfile" @@ -32,16 +50,17 @@ 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 +if $do_commit; then git add $broken_config 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: 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..cdba24f0c2077 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -53,6 +53,10 @@ if ! gh auth status 2>/dev/null ; then die "You must setup the \`gh\` command. Run \`gh auth login\`." fi +# Make sure this is configured before we start doing anything +push_remote="$(git config branch.haskell-updates.pushRemote \ + || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.')" + # Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. echo "Fetching origin..." git fetch origin >/dev/null @@ -85,11 +89,12 @@ 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..." -git push +echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..." +git push "$push_remote" haskell-updates # Open new PR new_pr_body=$(cat <<EOF @@ -112,6 +117,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-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh index a7cfecbbb0fe8..5aa644a3d0faf 100755 --- a/maintainers/scripts/haskell/update-hackage.sh +++ b/maintainers/scripts/haskell/update-hackage.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=. +#! nix-shell -i bash -p nix curl jq git gnused -I nixpkgs=. # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index f1f04cdf45043..881cf5fd48376 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=. +#! nix-shell -i bash -p nix curl jq git gnused gnugrep -I nixpkgs=. # shellcheck shell=bash set -eu -o pipefail @@ -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,21 @@ 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' \ + -e '/ stack /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..9130941a53661 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: //") -curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +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" https://hackage.haskell.org/distro/NixOS/packages.csv echo diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 49bc50ae61314..78cfca24d96b1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -11,18 +11,19 @@ compat53,,,,0.7-1,,vcunat cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +cyan,,,,,, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, 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,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -31,14 +32,14 @@ lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, -lpeglabel,,,,,, -lpty,,,,,, +lpeglabel,,,,1.6.0,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, -lua-iconv,,,,,, +lua-curl,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -47,6 +48,7 @@ lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, lua-resty-openssl,,,,,, lua-resty-session,,,,,, +lua-rtoml,https://github.com/lblasc/lua-rtoml,,,,,lblasc lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, @@ -64,10 +66,12 @@ 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 luarepl,,,,,, +luarocks-build-rust-mlua,,,,,,mrcjkb luasec,,,,,,flosse luasocket,,,,,, luasql-sqlite3,,,,,,vyp @@ -78,27 +82,36 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, -luv,,,,1.43.0-0,, +luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, +middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, +rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp +teal-language-server,,,http://luarocks.org/dev,,, +telescope.nvim,,,,,5.1, +telescope-manix,,,,,, tl,,,,,,mephistophiles +toml,,,,,,mrcjkb +toml-edit,,,,,5.1,mrcjkb 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/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index ce0599dda0e71..6754f79009ec9 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -6,6 +6,7 @@ use warnings; use CPAN::Meta(); use CPANPLUS::Backend(); +use MIME::Base64; use Module::CoreList; use Getopt::Long::Descriptive qw( describe_options ); use JSON::PP qw( encode_json ); @@ -354,6 +355,11 @@ sub render_license { return $license_line; } +sub sha256_to_sri { + my ($sha256) = @_; + return "sha256-" . encode_base64(pack("H*", $sha256), ''); +} + my ( $opt, $module_name ) = handle_opts(); Log::Log4perl->easy_init( @@ -380,8 +386,9 @@ INFO( "package: ", $module->package, " (", "$pkg_name-$pkg_version", ", ", $attr INFO( "path: ", $module->path ); my $tar_path = $module->fetch(); +my $sri_hash = sha256_to_sri($module->status->checksum_value); INFO( "downloaded to: ", $tar_path ); -INFO( "sha-256: ", $module->status->checksum_value ); +INFO( "hash: ", $sri_hash ); my $pkg_path = $module->extract(); INFO( "unpacked to: ", $pkg_path ); @@ -436,7 +443,7 @@ print <<EOF; version = "$pkg_version"; src = fetchurl { url = "mirror://cpan/${\$module->path}/${\$module->package}"; - sha256 = "${\$module->status->checksum_value}"; + hash = "$sri_hash"; }; EOF print <<EOF if scalar @build_deps > 0; diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 46788edd236e9..cc0f4ef742d11 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,20 +1,23 @@ -# 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 +# $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py +# $ nix run nixpkgs#python3.pkgs.flake8 -- --ignore E501,E265 maintainers/scripts/pluginupdate.py import argparse import csv import functools import http import json +import logging import os import subprocess -import logging import sys import time import traceback @@ -22,14 +25,14 @@ import urllib.error import urllib.parse import urllib.request import xml.etree.ElementTree as ET -from datetime import datetime +from dataclasses import asdict, dataclass +from datetime import UTC, datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union, Any, Callable -from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile -from dataclasses import dataclass, asdict +from typing import Any, Callable, Dict, List, Optional, Tuple, Union +from urllib.parse import urljoin, urlparse import git @@ -38,12 +41,13 @@ ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " LOG_LEVELS = { - logging.getLevelName(level): level for level in [ - logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] + logging.getLevelName(level): level + for level in [logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR] } log = logging.getLogger() + def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ @@ -74,6 +78,7 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa return deco_retry + @dataclass class FetchConfig: proc: int @@ -88,22 +93,21 @@ def make_request(url: str, token=None) -> urllib.request.Request: # a dictionary of plugins and their new repositories -Redirects = Dict['PluginDesc', 'Repo'] +Redirects = Dict["PluginDesc", "Repo"] + class Repo: - def __init__( - self, uri: str, branch: str - ) -> None: + def __init__(self, uri: str, branch: str) -> None: self.uri = uri - '''Url to the repo''' + """Url to the repo""" self._branch = branch # Redirect is the new Repo to use - self.redirect: Optional['Repo'] = None + self.redirect: Optional["Repo"] = None self.token = "dummy_token" @property def name(self): - return self.uri.split('/')[-1] + return self.uri.split("/")[-1] @property def branch(self): @@ -111,6 +115,7 @@ class Repo: def __str__(self) -> str: return f"{self.uri}" + def __repr__(self) -> str: return f"Repo({self.name}, {self.uri})" @@ -122,9 +127,9 @@ class Repo: def latest_commit(self) -> Tuple[str, datetime]: log.debug("Latest commit") loaded = self._prefetch(None) - updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z") + updated = datetime.strptime(loaded["date"], "%Y-%m-%dT%H:%M:%S%z") - return loaded['rev'], updated + return loaded["rev"], updated def _prefetch(self, ref: Optional[str]): cmd = ["nix-prefetch-git", "--quiet", "--fetch-submodules", self.uri] @@ -141,23 +146,23 @@ class Repo: return loaded["sha256"] def as_nix(self, plugin: "Plugin") -> str: - return f'''fetchgit {{ - url = "{self.uri}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}"; - }}''' + return f"""fetchgit {{ + url = "{self.uri}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}"; + }}""" class RepoGitHub(Repo): - def __init__( - self, owner: str, repo: str, branch: str - ) -> None: + def __init__(self, owner: str, repo: str, branch: str) -> None: self.owner = owner self.repo = repo self.token = None - '''Url to the repo''' + """Url to the repo""" super().__init__(self.url(""), branch) - log.debug("Instantiating github repo owner=%s and repo=%s", self.owner, self.repo) + log.debug( + "Instantiating github repo owner=%s and repo=%s", self.owner, self.repo + ) @property def name(self): @@ -210,7 +215,6 @@ class RepoGitHub(Repo): new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch) self.redirect = new_repo - def prefetch(self, commit: str) -> str: if self.has_submodules(): sha256 = super().prefetch(commit) @@ -230,12 +234,12 @@ class RepoGitHub(Repo): else: submodule_attr = "" - return f'''fetchFromGitHub {{ + return f"""fetchFromGitHub {{ owner = "{self.owner}"; repo = "{self.repo}"; rev = "{plugin.commit}"; sha256 = "{plugin.sha256}";{submodule_attr} - }}''' + }}""" @dataclass(frozen=True) @@ -255,15 +259,14 @@ class PluginDesc: return self.repo.name < other.repo.name @staticmethod - def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> 'PluginDesc': + def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc": branch = row["branch"] - repo = make_repo(row['repo'], branch.strip()) + repo = make_repo(row["repo"], branch.strip()) repo.token = config.github_token return PluginDesc(repo, branch.strip(), row["alias"]) - @staticmethod - def load_from_string(config: FetchConfig, line: str) -> 'PluginDesc': + def load_from_string(config: FetchConfig, line: str) -> "PluginDesc": branch = "HEAD" alias = None uri = line @@ -276,6 +279,7 @@ class PluginDesc: repo.token = config.github_token return PluginDesc(repo, branch.strip(), alias) + @dataclass class Plugin: name: str @@ -299,26 +303,47 @@ class Plugin: return copy -def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[PluginDesc]: +def load_plugins_from_csv( + config: FetchConfig, + input_file: Path, +) -> List[PluginDesc]: log.debug("Load plugins from csv %s", input_file) plugins = [] - with open(input_file, newline='') as csvfile: + with open(input_file, newline="") as csvfile: log.debug("Writing into %s", input_file) - reader = csv.DictReader(csvfile,) + reader = csv.DictReader( + csvfile, + ) for line in reader: plugin = PluginDesc.load_from_csv(config, line) plugins.append(plugin) return plugins -def run_nix_expr(expr): - with CleanEnvironment(): - cmd = ["nix", "eval", "--extra-experimental-features", - "nix-command", "--impure", "--json", "--expr", expr] - log.debug("Running command %s", cmd) - out = subprocess.check_output(cmd) - data = json.loads(out) - return data + + +def run_nix_expr(expr, nixpkgs: str): + ''' + :param expr nix expression to fetch current plugins + :param nixpkgs Path towards a nixpkgs checkout + ''' + with CleanEnvironment(nixpkgs) as nix_path: + cmd = [ + "nix", + "eval", + "--extra-experimental-features", + "nix-command", + "--impure", + "--json", + "--expr", + expr, + "--nix-path", + nix_path, + ] + log.debug("Running command: %s", " ".join(cmd)) + out = subprocess.check_output(cmd, timeout=90) + data = json.loads(out) + return data class Editor: @@ -344,26 +369,57 @@ class Editor: self.cache_file = cache_file or f"{name}-plugin-cache.json" self.nixpkgs_repo = None - def get_current_plugins(self) -> List[Plugin]: + 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, nixpkgs) -> List[Plugin]: """To fill the cache""" - data = run_nix_expr(self.get_plugins) + data = run_nix_expr(self.get_plugins, nixpkgs) 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 def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]: - '''CSV spec''' + """CSV spec""" return load_plugins_from_csv(config, plugin_file) - def generate_nix(self, plugins, outfile: str): - '''Returns nothing for now, writes directly to outfile''' + def generate_nix(self, _plugins, _outfile: str): + """Returns nothing for now, writes directly to outfile""" raise NotImplementedError() def get_update(self, input_file: str, outfile: str, config: FetchConfig): - cache: Cache = Cache(self.get_current_plugins(), self.cache_file) + cache: Cache = Cache(self.get_current_plugins(self.nixpkgs), self.cache_file) _prefetch = functools.partial(prefetch, cache=cache) def update() -> dict: @@ -383,7 +439,6 @@ class Editor: return update - @property def attr_path(self): return self.name + "Plugins" @@ -395,34 +450,37 @@ class Editor: return rewrite_input(*args, **kwargs) def create_parser(self): - parser = argparse.ArgumentParser( - description=(f""" + 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", + common.add_argument( + "--nixpkgs", + type=str, + default=os.getcwd(), + help="Adjust log level", ) - parser.add_argument( + common.add_argument( "--input-names", "-i", dest="input_file", + type=Path, 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, + type=Path, help="Filename to save generated nix code", ) - parser.add_argument( + common.add_argument( "--proc", "-p", dest="proc", @@ -430,7 +488,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,28 +496,84 @@ class Editor: help="""Allows to set --proc to higher values. Uses GITHUB_API_TOKEN environment variables as the default value.""", ) - parser.add_argument( - "--no-commit", "-n", action="store_true", default=False, - help="Whether to autocommit changes" + common.add_argument( + "--no-commit", + "-n", + action="store_true", + default=False, + help="Whether to autocommit changes", ) - parser.add_argument( - "--debug", "-d", choices=LOG_LEVELS.keys(), + common.add_argument( + "--debug", + "-d", + choices=LOG_LEVELS.keys(), default=logging.getLevelName(logging.WARN), - help="Adjust log level" + 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) + self.nixpkgs = args.nixpkgs + + self.nixpkgs_repo = git.Repo(args.nixpkgs, search_parent_directories=True) + + getattr(self, command)(args) class CleanEnvironment(object): - def __enter__(self) -> None: - self.old_environ = os.environ.copy() + def __init__(self, nixpkgs): + self.local_pkgs = nixpkgs + + def __enter__(self) -> str: + """ local_pkgs = str(Path(__file__).parent.parent.parent) - os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}" + """ + self.old_environ = os.environ.copy() self.empty_config = NamedTemporaryFile() self.empty_config.write(b"{}") self.empty_config.flush() - os.environ["NIXPKGS_CONFIG"] = self.empty_config.name + return f"localpkgs={self.local_pkgs}" def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: os.environ.update(self.old_environ) @@ -501,14 +615,15 @@ def print_download_error(plugin: PluginDesc, ex: Exception): ] print("\n".join(tb_lines)) + def check_results( results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]] ) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]: - ''' ''' + """ """ failures: List[Tuple[PluginDesc, Exception]] = [] plugins = [] redirects: Redirects = {} - for (pdesc, result, redirect) in results: + for pdesc, result, redirect in results: if isinstance(result, Exception): failures.append((pdesc, result)) else: @@ -525,17 +640,18 @@ def check_results( else: print(f", {len(failures)} plugin(s) could not be downloaded:\n") - for (plugin, exception) in failures: + for plugin, exception in failures: print_download_error(plugin, exception) sys.exit(1) + def make_repo(uri: str, branch) -> Repo: - '''Instantiate a Repo with the correct specialization depending on server (gitub spec)''' + """Instantiate a Repo with the correct specialization depending on server (gitub spec)""" # dumb check to see if it's of the form owner/repo (=> github) or https://... res = urlparse(uri) - if res.netloc in [ "github.com", ""]: - res = res.path.strip('/').split('/') + if res.netloc in ["github.com", ""]: + res = res.path.strip("/").split("/") repo = RepoGitHub(res[0], res[1], branch) else: repo = Repo(uri.strip(), branch) @@ -606,7 +722,6 @@ def prefetch( return (pluginDesc, e, None) - def rewrite_input( config: FetchConfig, input_file: Path, @@ -615,12 +730,14 @@ def rewrite_input( redirects: Redirects = {}, append: List[PluginDesc] = [], ): - plugins = load_plugins_from_csv(config, input_file,) + plugins = load_plugins_from_csv( + config, + input_file, + ) plugins.extend(append) if redirects: - cur_date_iso = datetime.now().strftime("%Y-%m-%d") with open(deprecated, "r") as f: deprecations = json.load(f) @@ -640,8 +757,8 @@ def rewrite_input( with open(input_file, "w") as f: log.debug("Writing into %s", input_file) # fields = dataclasses.fields(PluginDesc) - fieldnames = ['repo', 'branch', 'alias'] - writer = csv.DictWriter(f, fieldnames, dialect='unix', quoting=csv.QUOTE_NONE) + fieldnames = ["repo", "branch", "alias"] + writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE) writer.writeheader() for plugin in sorted(plugins): writer.writerow(asdict(plugin)) @@ -657,11 +774,10 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: print("no changes in working tree to commit") - def update_plugins(editor: Editor, args): - """The main entry function of this module. All input arguments are grouped in the `Editor`.""" + """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) @@ -672,8 +788,16 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) + try: + repo = git.Repo(os.getcwd()) + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') + print(args.outfile) + commit(repo, + f"{editor.attr_path}: update on {updated}", [args.outfile] + ) + except git.InvalidGitRepositoryError as e: + print(f"Not in a git repository: {e}", file=sys.stderr) + sys.exit(1) if redirects: update() @@ -683,19 +807,3 @@ def update_plugins(editor: Editor, args): f"{editor.attr_path}: resolve github repository redirects", [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..3c5f8edc50adf 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -100,13 +100,15 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: date_older_list.remove(line) continue - alias = before_equal.strip() - after_equal_list = [x.strip(";:") for x in after_equal.split()] + alias = before_equal + alias_unquoted = before_equal.strip('"') + replacement = next(x.strip(";:") for x in after_equal.split()) + replacement = replacement.removeprefix("pkgs.") converted = ( - f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" - f" '{after_equal_list.pop(0)}'\";" - f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' + f"{indent}{alias} = throw \"'{alias_unquoted}' has been" + f" renamed to/replaced by '{replacement}'\";" + f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}" ) converted_list.append((line, converted)) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py new file mode 100755 index 0000000000000..1af7ff215ad33 --- /dev/null +++ b/maintainers/scripts/sha-to-sri.py @@ -0,0 +1,228 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i "python3 -I" -p "python3.withPackages(p: with p; [ rich structlog ])" + +from abc import ABC, abstractclassmethod, abstractmethod +from contextlib import contextmanager +from pathlib import Path +from structlog.contextvars import bound_contextvars as log_context +from typing import ClassVar, List, Tuple + +import hashlib, re, structlog + + +logger = structlog.getLogger("sha-to-SRI") + + +class Encoding(ABC): + alphabet: ClassVar[str] + + @classmethod + @property + def name(cls) -> str: + return cls.__name__.lower() + + def toSRI(self, s: str) -> str: + digest = self.decode(s) + assert len(digest) == self.n + + from base64 import b64encode + return f"{self.hashName}-{b64encode(digest).decode()}" + + @classmethod + def all(cls, h) -> 'List[Encoding]': + return [ c(h) for c in cls.__subclasses__() ] + + def __init__(self, h): + self.n = h.digest_size + self.hashName = h.name + + @property + @abstractmethod + def length(self) -> int: + ... + + @property + def regex(self) -> str: + return f"[{self.alphabet}]{{{self.length}}}" + + @abstractmethod + def decode(self, s: str) -> bytes: + ... + + +class Nix32(Encoding): + alphabet = "0123456789abcdfghijklmnpqrsvwxyz" + inverted = { c: i for i, c in enumerate(alphabet) } + + @property + def length(self): + return 1 + (8 * self.n) // 5 + def decode(self, s: str): + assert len(s) == self.length + out = [ 0 for _ in range(self.n) ] + # TODO: Do better than a list of byte-sized ints + + for n, c in enumerate(reversed(s)): + digit = self.inverted[c] + i, j = divmod(5 * n, 8) + out[i] = out[i] | (digit << j) & 0xff + rem = digit >> (8 - j) + if rem == 0: + continue + elif i < self.n: + out[i+1] = rem + else: + raise ValueError(f"Invalid nix32 hash: '{s}'") + + return bytes(out) + +class Hex(Encoding): + alphabet = "0-9A-Fa-f" + + @property + def length(self): + return 2 * self.n + def decode(self, s: str): + from binascii import unhexlify + return unhexlify(s) + +class Base64(Encoding): + alphabet = "A-Za-z0-9+/" + + @property + def format(self) -> Tuple[int, int]: + """Number of characters in data and padding.""" + i, k = divmod(self.n, 3) + return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 + @property + def length(self): + return sum(self.format) + @property + def regex(self): + data, padding = self.format + return f"[{self.alphabet}]{{{data}}}={{{padding}}}" + def decode(self, s): + from base64 import b64decode + return b64decode(s, validate = True) + + +_HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) +ENCODINGS = { + h.name: Encoding.all(h) + for h in _HASHES +} + +RE = { + h: "|".join( + (f"({h}-)?" if e.name == 'base64' else '') + + f"(?P<{h}_{e.name}>{e.regex})" + for e in encodings + ) for h, encodings in ENCODINGS.items() +} + +_DEF_RE = re.compile("|".join( + f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" + for h, re in RE.items() +)) + + +def defToSRI(s: str) -> str: + def f(m: re.Match[str]) -> str: + try: + for h, encodings in ENCODINGS.items(): + if m.group(h) is None: + continue + + for e in encodings: + s = m.group(f"{h}_{e.name}") + if s is not None: + return f'hash = "{e.toSRI(s)}";' + + raise ValueError(f"Match with '{h}' but no subgroup") + raise ValueError("Match with no hash") + + except ValueError as exn: + logger.error( + "Skipping", + exc_info = exn, + ) + return m.group() + + return _DEF_RE.sub(f, s) + + +@contextmanager +def atomicFileUpdate(target: Path): + '''Atomically replace the contents of a file. + + Guarantees that no temporary files are left behind, and `target` is either + left untouched, or overwritten with new content if no exception was raised. + + Yields a pair `(original, new)` of open files. + `original` is the pre-existing file at `target`, open for reading; + `new` is an empty, temporary file in the same filder, open for writing. + + Upon exiting the context, the files are closed; if no exception was + raised, `new` (atomically) replaces the `target`, otherwise it is deleted. + ''' + # That's mostly copied from noto-emoji.py, should DRY it out + from tempfile import mkstemp + fd, _p = mkstemp( + dir = target.parent, + prefix = target.name, + ) + tmpPath = Path(_p) + + try: + with target.open() as original: + with tmpPath.open('w') as new: + yield (original, new) + + tmpPath.replace(target) + + except Exception: + tmpPath.unlink(missing_ok = True) + raise + + +def fileToSRI(p: Path): + with atomicFileUpdate(p) as (og, new): + for i, line in enumerate(og): + with log_context(line=i): + new.write(defToSRI(line)) + + +_SKIP_RE = re.compile( + "(generated by)|(do not edit)", + re.IGNORECASE +) + +if __name__ == "__main__": + from sys import argv, stderr + logger.info("Starting!") + + for arg in argv[1:]: + p = Path(arg) + with log_context(path=str(p)): + try: + if p.name == "yarn.nix" or p.name.find("generated") != -1: + logger.warning("File looks autogenerated, skipping!") + continue + + with p.open() as f: + for line in f: + if line.strip(): + break + + if _SKIP_RE.search(line): + logger.warning("File looks autogenerated, skipping!") + continue + + fileToSRI(p) + except Exception as exn: + logger.error( + "Unhandled exception, skipping file!", + exc_info = exn, + ) + else: + logger.info("Finished processing file") diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh index d65cf3ec5f634..eaa731adccce8 100755 --- a/maintainers/scripts/update-channel-branches.sh +++ b/maintainers/scripts/update-channel-branches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e : ${NIXOS_CHANNELS:=https://nixos.org/channels/} diff --git a/maintainers/scripts/update-dotnet-lockfiles.nix b/maintainers/scripts/update-dotnet-lockfiles.nix new file mode 100644 index 0000000000000..22ceff1ffa996 --- /dev/null +++ b/maintainers/scripts/update-dotnet-lockfiles.nix @@ -0,0 +1,72 @@ +/* + To run: + + nix-shell maintainers/scripts/update-dotnet-lockfiles.nix + + This script finds all the derivations in nixpkgs that have a 'fetch-deps' + attribute, and runs all of them sequentially. This is useful to test changes + to 'fetch-deps', 'nuget-to-nix', or other changes to the dotnet build + infrastructure. Regular updates should be done through the individual packages + update scripts. + */ +let + pkgs = import ../.. {}; + + inherit (pkgs) lib; + + packagesWith = cond: pkgs: + let + packagesWithInner = attrs: + lib.unique ( + lib.concatLists ( + lib.mapAttrsToList (name: elem: + let + result = builtins.tryEval elem; + in + if result.success then + let + value = result.value; + in + if lib.isDerivation value then + lib.optional (cond value) value + else + if lib.isAttrs value && (value.recurseForDerivations or false || value.recurseForRelease or false) then + packagesWithInner value + else [] + else []) attrs)); + in + packagesWithInner pkgs; + + packages = + packagesWith (pkgs: pkgs ? fetch-deps) pkgs; + + helpText = '' + Please run: + + % nix-shell maintainers/scripts/update-dotnet-lockfiles.nix + ''; + + fetchScripts = map (p: p.fetch-deps) packages; + +in pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-dotnet-lockfiles"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "Not possible to update packages using \`nix-build\`" + echo "" + echo "${helpText}" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + unset shellHook # do not contaminate nested shells + set -e + for x in $fetchScripts; do + $x + done + exit + ''; + inherit fetchScripts; +} diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages deleted file mode 100755 index f34aa53626dae..0000000000000 --- a/maintainers/scripts/update-luarocks-packages +++ /dev/null @@ -1,216 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-luarocks-shell.nix -i python3 - -# format: -# $ nix run nixpkgs.python3Packages.black -c black update.py -# type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py -# linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py - -import inspect -import os -import tempfile -import shutil -from dataclasses import dataclass -import subprocess -import csv -import logging -import textwrap -from multiprocessing.dummy import Pool - -from typing import List, Tuple, Optional -from pathlib import Path - -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 - -PKG_LIST="maintainers/scripts/luarocks-packages.csv" -TMP_FILE="$(mktemp)" -GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua" - -HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! -Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages - -You can customize the generated packages in pkgs/development/lua-modules/overrides.nix -*/ -""".format(GENERATED_NIXFILE=GENERATED_NIXFILE) - -FOOTER=""" -} -/* GENERATED - do not edit this file */ -""" - -@dataclass -class LuaPlugin: - name: str - '''Name of the plugin, as seen on luarocks.org''' - src: str - '''address to the git repository''' - ref: Optional[str] - '''git reference (branch name/tag)''' - version: Optional[str] - '''Set it to pin a package ''' - server: Optional[str] - '''luarocks.org registers packages under different manifests. - Its value can be 'http://luarocks.org/dev' - ''' - luaversion: Optional[str] - '''Attribue of the lua interpreter if a package is available only for a specific lua version''' - maintainers: Optional[str] - ''' Optional string listing maintainers separated by spaces''' - - @property - def normalized_name(self) -> str: - return self.name.replace(".", "-") - -# rename Editor to LangUpdate/ EcosystemUpdater -class LuaEditor(Editor): - def get_current_plugins(self): - return [] - - def load_plugin_spec(self, input_file) -> List[LuaPlugin]: - luaPackages = [] - csvfilename=input_file - log.info("Loading package descriptions from %s", csvfilename) - - with open(csvfilename, newline='') as csvfile: - reader = csv.DictReader(csvfile,) - for row in reader: - # name,server,version,luaversion,maintainers - plugin = LuaPlugin(**row) - luaPackages.append(plugin) - return luaPackages - - def generate_nix( - self, - results: List[Tuple[LuaPlugin, str]], - outfilename: str - ): - - with tempfile.NamedTemporaryFile("w+") as f: - f.write(HEADER) - header2 = textwrap.dedent( - # header2 = inspect.cleandoc( - """ - { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: - final: prev: - { - """) - f.write(header2) - for (plugin, nix_expr) in results: - f.write(f"{plugin.normalized_name} = {nix_expr}") - f.write(FOOTER) - f.flush() - - # if everything went fine, move the generated file to its destination - # using copy since move doesn't work across disks - shutil.copy(f.name, outfilename) - - print(f"updated {outfilename}") - - @property - def attr_path(self): - return "luaPackages" - - def get_update(self, input_file: str, outfile: str, config: FetchConfig): - _prefetch = generate_pkg_nix - - def update() -> dict: - plugin_specs = self.load_plugin_spec(input_file) - sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) - - try: - pool = Pool(processes=config.proc) - results = pool.map(_prefetch, sorted_plugin_specs) - finally: - pass - - self.generate_nix(results, outfile) - - redirects = {} - return redirects - - return update - - def rewrite_input(self, input_file: str, *args, **kwargs): - # vim plugin reads the file before update but that shouldn't be our case - # not implemented yet - # fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers'] - # input_file = "toto.csv" - # with open(input_file, newline='') as csvfile: - # writer = csv.DictWriter(csvfile, fieldnames=fieldnames) - # writer.writeheader() - # for row in reader: - # # name,server,version,luaversion,maintainers - # plugin = LuaPlugin(**row) - # luaPackages.append(plugin) - pass - -def generate_pkg_nix(plug: LuaPlugin): - ''' - Generate nix expression for a luarocks package - Our cache key associates "p.name-p.version" to its rockspec - ''' - log.debug("Generating nix expression for %s", plug.name) - custom_env = os.environ.copy() - custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG - - # we add --dev else luarocks wont find all the "scm" (=dev) versions of the - # packages - # , "--dev" - cmd = [ "luarocks", "nix" ] - - if plug.maintainers: - cmd.append(f"--maintainers={plug.maintainers}") - - # if plug.server == "src": - if plug.src != "": - if plug.src is None: - msg = "src must be set when 'version' is set to \"src\" for package %s" % plug.name - log.error(msg) - raise RuntimeError(msg) - log.debug("Updating from source %s", plug.src) - cmd.append(plug.src) - # update the plugin from luarocks - else: - cmd.append(plug.name) - if plug.version and plug.version != "src": - - cmd.append(plug.version) - - if plug.server != "src" and plug.server: - cmd.append(f"--only-server={plug.server}") - - if plug.luaversion: - cmd.append(f"--lua-version={plug.luaversion}") - - log.debug("running %s", ' '.join(cmd)) - - output = subprocess.check_output(cmd, env=custom_env, text=True) - output = "callPackage(" + output.strip() + ") {};\n\n" - return (plug, output) - -def main(): - - editor = LuaEditor("lua", ROOT, '', - default_in = ROOT.joinpath(PKG_LIST), - default_out = ROOT.joinpath(GENERATED_NIXFILE) - ) - - parser = editor.create_parser() - args = parser.parse_args() - - update_plugins(editor, args) - - -if __name__ == "__main__": - - main() - -# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : 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-luarocks-shell.nix b/maintainers/scripts/update-octave-shell.nix index a58674fca8d38..51d4844c79f34 100644 --- a/maintainers/scripts/update-luarocks-shell.nix +++ b/maintainers/scripts/update-octave-shell.nix @@ -2,12 +2,11 @@ }: with nixpkgs; let - pyEnv = python3.withPackages(ps: [ ps.GitPython ]); + pyEnv = python3.withPackages(ps: with ps; [ packaging requests toolz pyyaml ]); in mkShell { packages = [ pyEnv - luarocks-nix 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 34d847b01c207..db66b8fe86893 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"; @@ -121,7 +122,7 @@ with lib.maintainers; { bobby285271 mkg20001 ]; - scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; + scope = "Maintain Cinnamon desktop environment and applications made by the Linux Mint team."; shortName = "Cinnamon"; enableFeatureFreezePing = true; }; @@ -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,13 +181,36 @@ with lib.maintainers; { shortName = "Cosmopolitan"; }; + dotnet = { + members = [ + ivar + mdarocha + corngood + raphaelr + jamiemagee + anpin + ]; + scope = "Maintainers of the .NET build tools and packages"; + shortName = "dotnet"; + }; + + 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 = [ - limeytexan + de11n + invokes-su ]; scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; - shortName = "Shaw employees"; + shortName = "D. E. Shaw employees"; }; determinatesystems = { @@ -191,7 +227,7 @@ with lib.maintainers; { dhall = { members = [ - Gabriel439 + Gabriella439 ehmry ]; scope = "Maintain Dhall and related packages."; @@ -210,6 +246,7 @@ with lib.maintainers; { docs = { members = [ + asymmetric ryantm ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; @@ -249,6 +286,25 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + flutter = { + members = [ mkg20001 RossComputerGuy FlafyDev hacker1024 ]; + scope = "Maintain Flutter and Dart-related packages and build tools"; + shortName = "flutter"; + enableFeatureFreezePing = false; + githubTeams = [ "flutter" ]; + }; + + flyingcircus = { + # Verify additions by approval of an already existing member of the team. + members = [ + theuni + dpausp + leona + ]; + scope = "Team for Flying Circus employees who collectively maintain packages."; + shortName = "Flying Circus employees"; + }; + freedesktop = { members = [ jtojnar ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; @@ -265,12 +321,43 @@ with lib.maintainers; { shortName = "GCC"; }; + geospatial = { + members = [ + imincik + nh2 + sikmir + willcohen + ]; + githubTeams = [ + "geospatial" + ]; + scope = "Maintain geospatial packages."; + shortName = "Geospatial"; + enableFeatureFreezePing = true; + }; + + gitlab = { + members = [ + globin + krav + talyz + yayayayaka + yuka + ]; + scope = "Maintain gitlab packages."; + shortName = "gitlab"; + }; + golang = { members = [ - c00w kalbasit mic92 zowoq + qbit + mfrw + ]; + githubTeams = [ + "golang" ]; scope = "Maintain Golang compilers."; shortName = "Go"; @@ -283,7 +370,7 @@ with lib.maintainers; { hedning jtojnar dasj19 - maxeaubrey + amaxine ]; githubTeams = [ "gnome" @@ -293,11 +380,25 @@ 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 expipiplus1 maralorn + ncfavier sternenseemann ]; githubTeams = [ @@ -311,7 +412,6 @@ with lib.maintainers; { home-assistant = { members = [ fab - globin hexa mic92 ]; @@ -335,19 +435,28 @@ with lib.maintainers; { members = [ cleeyv ryantm - yuka + lassulus ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; }; + jupyter = { + members = [ + GaetanLepage + natsukium + thomasjm + ]; + scope = "Maintain Jupyter and related packages."; + shortName = "Jupyter"; + }; + kubernetes = { members = [ johanot offline saschagrunert srhb - zowoq ]; scope = "Maintain the Kubernetes package and module"; shortName = "Kubernetes"; @@ -388,6 +497,47 @@ 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; + }; + + lomiri = { + members = [ + OPNA2608 + ]; + scope = "Maintain Lomiri desktop environment and related packages."; + shortName = "Lomiri"; + enableFeatureFreezePing = true; + }; + lumiguide = { # Verify additions by approval of an already existing member of the team. members = [ @@ -443,6 +593,7 @@ with lib.maintainers; { mate = { members = [ + bobby285271 j03 romildo ]; @@ -456,15 +607,37 @@ with lib.maintainers; { ma27 fadenb mguentner - ekleog ralith dandellion sumnerevans + nickcao ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; shortName = "Matrix"; }; + minimal-bootstrap = { + members = [ + alejandrosame + artturin + emilytrau + ericson2314 + jk + siraben + ]; + scope = "Maintain the minimal-bootstrap toolchain and related packages."; + shortName = "Minimal Bootstrap"; + }; + + mercury = { + members = [ + _9999years + Gabriella439 + ]; + scope = "Group registry for packages maintained by Mercury"; + shortName = "Mercury Employees"; + }; + mobile = { members = [ samueldr @@ -475,7 +648,6 @@ with lib.maintainers; { nix = { members = [ - Profpatsch eelco grahamc pierron @@ -485,15 +657,24 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - nixos-modules = { + module-system = { members = [ - ericson2314 infinisil - qyliss roberth ]; - scope = "Maintain nixpkgs module system internals."; - shortName = "NixOS Modules / internals"; + scope = "Maintain the Nixpkgs module system."; + shortName = "Module system"; + enableFeatureFreezePing = true; + }; + + node = { + members = [ + lilyinstarlight + marsam + winter + ]; + scope = "Maintain Node.js runtimes and build tooling."; + shortName = "Node.js"; enableFeatureFreezePing = true; }; @@ -509,15 +690,37 @@ with lib.maintainers; { shortName = "Numtide team"; }; + ocaml = { + members = [ + alizter + ]; + githubTeams = [ + "ocaml" + ]; + scope = "Maintain the OCaml compiler and package set."; + shortName = "OCaml"; + enableFeatureFreezePing = true; + }; + openstack = { members = [ - emilytrau SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; shortName = "OpenStack"; }; + ororatech = { + # email: nixdevs@ororatech.com + shortName = "OroraTech GmbH. employees"; + scope = "Team for packages maintained by employees of OroraTech GmbH."; + # Edits to this list should only be done by an already existing member. + members = [ + kip93 + victormeriqui + ]; + }; + pantheon = { members = [ davidak @@ -545,7 +748,6 @@ with lib.maintainers; { aanderse drupol etu - globin ma27 talyz ]; @@ -562,7 +764,6 @@ with lib.maintainers; { adisbladis saschagrunert vdemeester - zowoq ]; githubTeams = [ "podman" @@ -584,6 +785,7 @@ with lib.maintainers; { fridh hexa jonringer + tjni ]; scope = "Maintain the Python interpreter and related packages."; shortName = "Python"; @@ -631,6 +833,18 @@ with lib.maintainers; { shortName = "Release"; }; + rocm = { + members = [ + Madouura + Flakebi + ]; + githubTeams = [ + "rocm-maintainers" + ]; + scope = "Maintain ROCm and related packages."; + shortName = "ROCm"; + }; + ruby = { members = [ marsam @@ -642,11 +856,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; @@ -664,9 +882,7 @@ with lib.maintainers; { }; sphinx = { - members = [ - SuperSandro2000 - ]; + members = [ ]; scope = "Maintain Sphinx related packages."; shortName = "Sphinx"; }; @@ -701,7 +917,6 @@ with lib.maintainers; { tts = { members = [ - hexa mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; @@ -710,6 +925,7 @@ with lib.maintainers; { vim = { members = [ + figsoda jonringer softinio teto @@ -718,12 +934,35 @@ with lib.maintainers; { shortName = "Vim/Neovim"; }; + wdz = { + members = [ + n0emis + vidister + johannwagner + yuka + ]; + scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; + shortName = "WDZ GmbH"; + }; + xfce = { members = [ + bobby285271 romildo + muscaln ]; scope = "Maintain Xfce desktop environment and related packages."; shortName = "Xfce"; enableFeatureFreezePing = true; }; + + zig = { + members = [ + AndersonTorres + figsoda + ]; + scope = "Maintain the Zig compiler toolchain and nixpkgs integration."; + shortName = "Zig"; + enableFeatureFreezePing = true; + }; } |