diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 1515 | ||||
-rwxr-xr-x | maintainers/scripts/check-cherry-picks.sh | 97 | ||||
-rw-r--r-- | maintainers/scripts/eval-release.nix | 2 | ||||
-rwxr-xr-x | maintainers/scripts/kde/collect-missing-deps.py | 12 | ||||
-rw-r--r-- | maintainers/scripts/kde/utils.py | 5 | ||||
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 56 | ||||
-rwxr-xr-x | maintainers/scripts/mdize-module.sh | 83 | ||||
-rw-r--r-- | maintainers/scripts/nixpkgs-lint.nix | 8 | ||||
-rw-r--r-- | maintainers/scripts/pluginupdate.py | 4 | ||||
-rw-r--r-- | maintainers/team-list.nix | 71 |
10 files changed, 1503 insertions, 350 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c50bdc8b904a..d474941b8a958 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -58,6 +58,10 @@ nix-build lib/tests/maintainers.nix See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. + + When adding a new maintainer, be aware of the current commit conventions + documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) + file located in the root of the Nixpkgs repo. */ { _0b11stan = { @@ -203,6 +207,12 @@ fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; }]; }; + _48cf = { + name = "czapek"; + email = "czapek1337@gmail.com"; + github = "48cf"; + githubId = 32851089; + }; _6543 = { email = "6543@obermui.de"; github = "6543"; @@ -218,6 +228,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _8aed = { + email = "8aed@riseup.net"; + github = "8aed"; + githubId = 140662578; + name = "Huit Aed"; + }; _8-bit-fox = { email = "sebastian@markwaerter.de"; github = "8-bit-fox"; @@ -256,6 +272,18 @@ githubId = 381298; name = "9R"; }; + _9yokuro = { + email = "xzstd099@protonmail.com"; + github = "9yokuro"; + githubId = 119095935; + name = "9yokuro"; + }; + A1ca7raz = { + email = "aya@wtm.moe"; + github = "A1ca7raz"; + githubId = 7345998; + name = "A1ca7raz"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -407,6 +435,18 @@ githubId = 1517066; name = "Aiken Cairncross"; }; + a-camarillo = { + name = "Anthony Camarillo"; + email = "anthony.camarillo.96@gmail.com"; + github = "a-camarillo"; + githubId = 58638902; + }; + acesyde = { + name = "Pierre-Emmanuel Mercier"; + email = "acesyde@gmail.com"; + github = "acesyde"; + githubId = 958435; + }; aciceri = { name = "Andrea Ciceri"; email = "andrea.ciceri@autistici.org"; @@ -537,6 +577,15 @@ fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; }]; }; + aduh95 = { + email = "duhamelantoine1995@gmail.com"; + github = "aduh95"; + githubId = 14309773; + name = "Antoine du Hamel"; + keys = [{ + fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; + }]; + }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; github = "AerialX"; @@ -649,6 +698,12 @@ fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; }]; }; + aimpizza = { + email = "rickomo.us@gmail.com"; + name = "Rick Omonsky"; + github = "AimPizza"; + githubId = 64905268; + }; aiotter = { email = "git@aiotter.com"; github = "aiotter"; @@ -740,6 +795,12 @@ github = "akgrant43"; githubId = 2062166; }; + akhilmhdh = { + email = "akhilmhdh@infisical.com"; + github = "akhilmhdh"; + githubId = 31166322; + name = "Akhil Mohan"; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; @@ -772,6 +833,12 @@ githubId = 20405311; name = "Aksh Gupta"; }; + aktaboot = { + email = "akhtaboo@protonmail.com"; + github = "aktaboot"; + githubId = 120214979; + name = "aktaboot"; + }; al3xtjames = { email = "nix@alextjam.es"; github = "al3xtjames"; @@ -1028,6 +1095,12 @@ fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; }]; }; + aman9das = { + email = "amandas62640@gmail.com"; + github = "Aman9das"; + githubId = 39594914; + name = "Aman Das"; + }; amanjeev = { email = "aj@amanjeev.com"; github = "amanjeev"; @@ -1052,12 +1125,6 @@ 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"; @@ -1122,12 +1189,30 @@ githubId = 858965; name = "Andrew Morsillo"; }; + amyipdev = { + email = "amy@amyip.net"; + github = "amyipdev"; + githubId = 46307646; + name = "Amy Parker"; + keys = [{ + fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5"; + }]; + }; amz-x = { email = "mail@amz-x.com"; github = "amz-x"; githubId = 18249234; name = "Christopher Crouse"; }; + anas = { + email = "anas.elgarhy.dev@gmail.com"; + github = "0x61nas"; + githubId = 44965145; + name = "Anas Elgarhy"; + keys = [{ + fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; + }]; + }; AnatolyPopov = { email = "aipopov@live.ru"; github = "AnatolyPopov"; @@ -1213,12 +1298,6 @@ 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"; @@ -1231,11 +1310,12 @@ githubId = 29887; name = "Andrew Smith"; }; - andsild = { - email = "andsild@gmail.com"; - github = "andsild"; - githubId = 3808928; - name = "Anders Sildnes"; + Andy3153 = { + name = "Andrei Dobrete"; + email = "andy3153@protonmail.com"; + matrix = "@andy3153:matrix.org"; + github = "Andy3153"; + githubId = 53472302; }; andys8 = { github = "andys8"; @@ -1330,12 +1410,6 @@ githubId = 81317317; name = "Anna Aurora"; }; - a-n-n-a-l-e-e = { - github = "a-n-n-a-l-e-e"; - githubId = 150648636; - matrix = "@a-n-n-a-l-e-e:matrix.org"; - name = "annalee"; - }; anoa = { matrix = "@andrewm:amorgan.xyz"; email = "andrew@amorgan.xyz"; @@ -1382,6 +1456,7 @@ github = "anthonyroussel"; githubId = 220084; name = "Anthony Roussel"; + matrix = "@anthonyrsl:matrix.org"; keys = [{ fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; }]; @@ -1425,6 +1500,24 @@ githubId = 4194320; name = "Anton Schirg"; }; + anytimetraveler = { + email = "simon@simonscode.org"; + github = "AnyTimeTraveler"; + githubId = 19378309; + name = "Simon Struck"; + }; + aorith = { + email = "aomanu+nixpkgs@gmail.com"; + github = "aorith"; + githubId = 5411704; + name = "Manuel Sanchez Pinar"; + }; + aos = { + email = "n@aos.sh"; + github = "aos"; + githubId = 25783780; + name = "aos"; + }; apeschar = { email = "albert@peschar.net"; github = "apeschar"; @@ -1546,6 +1639,12 @@ githubId = 160646; name = "Patrick Jackson"; }; + arduano = { + email = "leonid.shchurov@gmail.com"; + github = "arduano"; + githubId = 13347712; + name = "Leo Shchurov"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1734,6 +1833,12 @@ githubId = 816777; name = "Ashley Gillman"; }; + ashgoldofficial = { + email = "ashley.goldwater@gmail.com"; + github = "ASHGOLDOFFICIAL"; + githubId = 104313094; + name = "Andrey Shaat"; + }; ashkitten = { email = "ashlea@protonmail.com"; github = "ashkitten"; @@ -1752,10 +1857,15 @@ githubId = 11037075; name = "Ashley Hooper"; }; - ashvith-shetty = { - github = "Ashvith10"; - githubId = 113123021; - name = "Ashvith Shetty"; + ashuramaruzxc = { + email = "ashuramaru@tenjin-dk.com"; + matrix = "@tenjin:mozilla.org"; + github = "ashuramaruzxc"; + githubId = 72100551; + name = "Mariia Holovata"; + keys = [{ + fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; + }]; }; asininemonkey = { email = "nixpkgs@asininemonkey.com"; @@ -1784,12 +1894,25 @@ fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; }]; }; + assistant = { + email = "assistant.moetron@gmail.com"; + github = "Assistant"; + githubId = 2748721; + matrix = "@assistant:pygmalion.chat"; + name = "Assistant Moetron"; + }; astavie = { email = "astavie@pm.me"; github = "astavie"; githubId = 7745457; name = "Astavie"; }; + astindev = { + email = "astindev@pm.me"; + github = "astindev"; + githubId = 52360869; + name = "Astin"; + }; astro = { email = "astro@spaceboyz.net"; github = "astro"; @@ -1805,6 +1928,12 @@ fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; }]; }; + astronaut0212 = { + email = "goatastronaut0212@proton.me"; + github = "goatastronaut0212"; + githubId = 119769817; + name = "goatastronaut0212"; + }; astsmtl = { email = "astsmtl@yandex.ru"; github = "astsmtl"; @@ -1891,7 +2020,7 @@ }; atry = { name = "Bo Yang"; - email = "atry@fb.com"; + email = "yang-bo@yang-bo.com"; github = "Atry"; githubId = 601530; }; @@ -1958,6 +2087,12 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; + aveltras = { + email = "romain.viallard@outlook.fr"; + github = "aveltras"; + githubId = 790607; + name = "Romain Viallard"; + }; averagebit = { email = "averagebit@pm.me"; github = "averagebit"; @@ -1971,10 +2106,10 @@ name = "averelld"; }; avery = { - email = "averyl+nixos@protonmail.com"; - github = "AveryLychee"; - githubId = 9147625; - name = "Avery Lychee"; + email = "nixpkgs@avery.cafe"; + github = "coolavery"; + githubId = 76545554; + name = "Avery"; }; avh4 = { email = "gruen0aermel@gmail.com"; @@ -2024,12 +2159,6 @@ githubId = 135230; name = "Aycan iRiCAN"; }; - ayes-web = { - email = "ayes2022@protonmail.com"; - github = "ayes-web"; - githubId = 52951851; - name = "ayes-web"; - }; aynish = { github = "Chickensoupwithrice"; githubId = 22575913; @@ -2073,15 +2202,6 @@ fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; }]; }; - babariviere = { - email = "me@babariviere.com"; - github = "babariviere"; - githubId = 12128029; - name = "Bastien Rivière"; - keys = [{ - fingerprint = "74AA 9AB4 E6FF 872B 3C5A CB3E 3903 5CC0 B75D 1142"; - }]; - }; babbaj = { name = "babbaj"; email = "babbaj45@gmail.com"; @@ -2217,6 +2337,12 @@ githubId = 576355; name = "Bas van Dijk"; }; + BatteredBunny = { + email = "ayes2022@protonmail.com"; + github = "BatteredBunny"; + githubId = 52951851; + name = "BatteredBunny"; + }; BattleCh1cken = { email = "BattleCh1cken@larkov.de"; github = "BattleCh1cken"; @@ -2592,6 +2718,12 @@ githubId = 30630233; name = "Timo Triebensky"; }; + birkb = { + email = "birk@batchworks.de"; + github = "birkb"; + githubId = 10164833; + name = "Birk Bohne"; + }; bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; @@ -2680,6 +2812,12 @@ github = "bmwalters"; githubId = 4380777; }; + bnlrnz = { + github = "bnlrnz"; + githubId = 11310385; + name = "Ben Lorenz"; + email = "bnlrnz@gmail.com"; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; @@ -2717,6 +2855,12 @@ githubId = 150560585; name = "Dmitry Ivankov"; }; + bonsairobo = { + email = "duncanfairbanks6@gmail.com"; + github = "bonsairobo"; + githubId = 3229981; + name = "Duncan Fairbanks"; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -2872,6 +3016,12 @@ fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; }]; }; + b-rodrigues = { + email = "bruno@brodrigues.co"; + github = "b-rodrigues"; + githubId = 2998834; + name = "Bruno Rodrigues"; + }; broke = { email = "broke@in-fucking.space"; github = "broke"; @@ -2891,6 +3041,14 @@ githubId = 184563; name = "Bruno Paz"; }; + brsvh = { + email = "bsc@brsvh.org"; + github = "brsvh"; + githubId = 63050399; + keys = [ { fingerprint = "7B74 0DB9 F2AC 6D3B 226B C530 78D7 4502 D92E 0218"; } ]; + matrix = "@brsvh:mozilla.org"; + name = "Burgess Chang"; + }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; matrix = "@bryanasdev000:matrix.org"; @@ -2947,6 +3105,12 @@ githubId = 37375448; name = "Buildit"; }; + buurro = { + email = "marcoburro98@gmail.com"; + github = "buurro"; + githubId = 9320677; + name = "Marco Burro"; + }; bwc9876 = { email = "bwc9876@gmail.com"; github = "Bwc9876"; @@ -3098,6 +3262,16 @@ githubId = 3212452; name = "Cameron Nemo"; }; + cameronraysmith = { + email = "cameronraysmith@gmail.com"; + matrix = "@cameronraysmith:matrix.org"; + github = "cameronraysmith"; + githubId = 420942; + name = "Cameron Smith"; + keys = [{ + fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; + }]; + }; camillemndn = { email = "camillemondon@free.fr"; github = "camillemndn"; @@ -3239,6 +3413,12 @@ matrix = "@cawilliamson:nixos.dev"; name = "Christopher A. Williamson"; }; + cbarrete = { + github = "cbarrete"; + githubId = 62146989; + matrix = "@cedric:cbarrete.com"; + name = "Cédric Barreteau"; + }; cbleslie = { email = "cameronleslie@gmail.com"; github = "cbleslie"; @@ -3428,6 +3608,16 @@ githubId = 28303440; name = "Max Hausch"; }; + cherrykitten = { + email = "contact@cherrykitten.dev"; + github = "cherrykitten"; + githubId = 20300586; + matrix = "@sammy:cherrykitten.dev"; + name = "CherryKitten"; + keys = [{ + fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; + }]; + }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; @@ -3485,11 +3675,11 @@ githubId = 1118859; name = "Scott Worley"; }; - ChlorideCull = { - email = "nixrelated@chcl.se"; - github = "ChlorideCull"; - githubId = 4977063; - name = "Sebastian Johansson"; + chmouel = { + email = "chmouel@chmouel.com"; + github = "chmouel"; + githubId = 98980; + name = "Chmouel Boudjnah"; }; choochootrain = { email = "hurshal@imap.cc"; @@ -3592,6 +3782,15 @@ github = "ciferkey"; githubId = 101422; }; + cig0 = { + name = "Martín Cigorraga"; + email = "cig0.github@gmail.com"; + github = "cig0"; + githubId = 394089; + keys = [{ + fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; + }]; + }; cigrainger = { name = "Christopher Grainger"; email = "chris@amplified.ai"; @@ -3637,6 +3836,12 @@ githubId = 136485; name = "Chad Jablonski"; }; + cjshearer = { + email = "cjshearer@live.com"; + github = "cjshearer"; + githubId = 7173077; + name = "Cody Shearer"; + }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; @@ -3671,6 +3876,15 @@ githubId = 199180; name = "Claes Wallin"; }; + clebs = { + email = "borja.clemente@gmail.com"; + github = "clebs"; + githubId = 1059661; + name = "Borja Clemente"; + keys = [{ + fingerprint = "C4E1 58BD FD33 3C77 B6C7 178E 2539 757E F64C 60DD"; + }]; + }; cleeyv = { email = "cleeyv@riseup.net"; github = "cleeyv"; @@ -3696,6 +3910,13 @@ githubId = 46303707; name = "Christian Lütke-Stetzkamp"; }; + clot27 = { + name = "Clot"; + email = "adityayadav11082@protonmail.com"; + github = "clot27"; + githubId = 69784758; + matrix = "@clot27:matrix.org"; + }; clr-cera = { email = "clrcera05@gmail.com"; github = "clr-cera"; @@ -3748,6 +3969,14 @@ githubId = 180339; name = "Andrew Cobb"; }; + coca = { + github = "Coca162"; + githubId = 62479942; + name = "Coca"; + keys = [{ + fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; + }]; + }; coconnor = { email = "coreyoconnor@gmail.com"; github = "coreyoconnor"; @@ -3763,6 +3992,16 @@ fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; }]; }; + codebam = { + name = "Sean Behan"; + email = "codebam@riseup.net"; + matrix = "@codebam:fedora.im"; + github = "codebam"; + githubId = 6035884; + keys = [{ + fingerprint = "42CD E212 593C F2FD C723 48A8 0F6D 5021 A87F 92BA"; + }]; + }; codec = { email = "codec@fnord.cx"; github = "codec"; @@ -4095,6 +4334,11 @@ githubId = 111202; name = "Henry Bubert"; }; + cryptoluks = { + github = "cryptoluks"; + githubId = 9020527; + name = "cryptoluks"; + }; CrystalGamma = { email = "nixos@crystalgamma.de"; github = "CrystalGamma"; @@ -4140,6 +4384,17 @@ githubId = 16950437; name = "cwyc"; }; + cybershadow = { + name = "Vladimir Panteleev"; + email = "nixpkgs@cy.md"; + matrix = "@cybershadow:cy.md"; + github = "CyberShadow"; + githubId = 160894; + + keys = [{ + fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; + }]; + }; cynerd = { name = "Karel Kočí"; email = "cynerd@email.cz"; @@ -4268,12 +4523,6 @@ githubId = 990767; name = "Daniel Olsen"; }; - danderson = { - email = "dave@natulte.net"; - github = "danderson"; - githubId = 1918; - name = "David Anderson"; - }; daneads = { email = "me@daneads.com"; github = "daneads"; @@ -4344,6 +4593,13 @@ fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; }]; }; + dan-theriault = { + email = "nix@theriault.codes"; + github = "Dan-Theriault"; + githubId = 13945563; + matrix = "@dan:matrix.org"; + name = "Daniel Theriault"; + }; dariof4 = { name = "dariof4"; email = "dazedtank@gmail.com"; @@ -4357,6 +4613,12 @@ github = "DarkOnion0"; githubId = 68606322; }; + daru-san = { + name = "Daru"; + email = "zadarumaka@proton.me"; + github = "Daru-san"; + githubId = 135046711; + }; das-g = { email = "nixpkgs@raphael.dasgupta.ch"; github = "das-g"; @@ -4395,9 +4657,14 @@ github = "DataHearth"; githubId = 28595242; name = "DataHearth"; - keys = [{ - fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; - }]; + keys = [ + { + fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; + } + { + fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; + } + ]; }; davegallant = { name = "Dave Gallant"; @@ -4490,6 +4757,12 @@ githubId = 11422515; name = "David Sánchez"; }; + dav-wolff = { + email = "dav-wolff@outlook.com"; + github = "dav-wolff"; + githubId = 130931508; + name = "David Wolff"; + }; dawidd6 = { email = "dawidd0811@gmail.com"; github = "dawidd6"; @@ -4671,12 +4944,6 @@ githubId = 150736012; email = "me+git@delliott.xyz"; }; - delroth = { - email = "delroth@gmail.com"; - github = "delroth"; - githubId = 202798; - name = "Pierre Bourdon"; - }; delta = { email = "d4delta@outlook.fr"; github = "D4Delta"; @@ -4951,6 +5218,12 @@ github = "DimitarNestorov"; githubId = 8790386; }; + diniamo = { + name = "diniamo"; + email = "diniamo53@gmail.com"; + github = "diniamo"; + githubId = 55629891; + }; diogotcorreia = { name = "Diogo Correia"; email = "me@diogotc.com"; @@ -5239,12 +5512,24 @@ fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; }]; }; + dragonginger = { + email = "dragonginger10@gmail.com"; + github = "dragonginger10"; + githubId = 20759788; + name = "JP Lippold"; + }; dramaturg = { email = "seb@ds.ag"; github = "dramaturg"; githubId = 472846; name = "Sebastian Krohn"; }; + drawbu = { + email = "clement21.boillot@gmail.com"; + github = "drawbu"; + githubId = 69208565; + name = "Clément Boillot"; + }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; @@ -5333,6 +5618,12 @@ fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; }]; }; + dudymas = { + email = "jeremy.white@cloudposse.com"; + github = "dudymas"; + githubId = 928448; + name = "Jeremy White"; + }; dukc = { email = "ajieskola@gmail.com"; github = "dukc"; @@ -5358,6 +5649,12 @@ fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; }]; }; + dvn0 = { + email = "git@dvn.me"; + github = "dvn0"; + githubId = 10859387; + name = "Devan Carpenter"; + }; dwarfmaster = { email = "nixpkgs@dwarfmaster.net"; github = "dwarfmaster"; @@ -5376,6 +5673,12 @@ githubId = 6689924; name = "David Terry"; }; + dylan-gonzalez = { + email = "dylcg10@gmail.com"; + github = "dylan-gonzalez"; + githubId = 45161987; + name = "Dylan Gonzalez"; + }; dylanmtaylor = { email = "dylan@dylanmtaylor.com"; github = "dylanmtaylor"; @@ -5560,6 +5863,11 @@ githubId = 54799; name = "Edward Tjörnhammar"; }; + eeedean = { + github = "eeedean"; + githubId = 8173116; + name = "Dean Eckert"; + }; eelco = { email = "edolstra+nixpkgs@gmail.com"; github = "edolstra"; @@ -5688,6 +5996,15 @@ githubId = 4576666; name = "Eliza Velasquez"; }; + eljamm = { + name = "Fedi Jamoussi"; + email = "fedi.jamoussi@protonmail.ch"; + github = "eljamm"; + githubId = 83901271; + keys = [{ + fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F"; + }]; + }; elkowar = { email = "thereal.elkowar@gmail.com"; github = "elkowar"; @@ -5736,6 +6053,12 @@ githubId = 122112154; name = "Edgar Lee"; }; + elrohirgt = { + email = "elrohirgt@gmail.com"; + github = "ElrohirGT"; + githubId = 45268815; + name = "Flavio Galán"; + }; elvishjerricco = { email = "elvishjerricco@gmail.com"; matrix = "@elvishjerricco:matrix.org"; @@ -5743,6 +6066,12 @@ githubId = 1365692; name = "Will Fancher"; }; + elysasrc = { + name = "Elysa"; + github = "ElysaSrc"; + githubId = 101974839; + email = "elysasrc@proton.me"; + }; emantor = { email = "rouven+nixos@czerwinskis.de"; github = "Emantor"; @@ -5824,12 +6153,6 @@ name = "Zhenbo Li"; matrix = "@zhenbo:matrix.org"; }; - endocrimes = { - email = "dani@builds.terrible.systems"; - github = "endocrimes"; - githubId = 1330683; - name = "Danielle Lancashire"; - }; enorris = { name = "Eric Norris"; email = "erictnorris@gmail.com"; @@ -5853,6 +6176,13 @@ githubId = 418227; name = "Jean-Philippe Braun"; }; + eopb = { + email = "ethanboxx@gmail.com"; + github = "eopb"; + githubId = 8074468; + matrix = "@efun:matrix.org"; + name = "Ethan Brierley"; + }; eownerdead = { name = "EOWNERDEAD"; email = "eownerdead@disroot.org"; @@ -6292,6 +6622,15 @@ githubId = 225893; name = "James Cook"; }; + fangpen = { + email = "hello@fangpenlin.com"; + github = "fangpenlin"; + githubId = 201615; + name = "Fang-Pen Lin"; + keys = [{ + fingerprint = "7130 3454 A7CD 0F0A 941A F9A3 2A26 9964 AD29 2131"; + }]; + }; farcaller = { name = "Vladimir Pouzanov"; email = "farcaller@gmail.com"; @@ -6334,6 +6673,12 @@ githubId = 4246921; name = "Florian Beeres"; }; + fccapria = { + email = "francesco@capria.eu"; + github = "fccapria"; + githubId = 62179193; + name = "Francesco Carmelo Capria"; + }; fd = { email = "simon.menke@gmail.com"; github = "fd"; @@ -6346,16 +6691,6 @@ githubId = 541748; name = "Felipe Espinoza"; }; - federicoschonborn = { - name = "Federico Damián Schonborn"; - email = "federicoschonborn@disroot.org"; - github = "FedericoSchonborn"; - githubId = 62166915; - matrix = "@FedericoDSchonborn:matrix.org"; - keys = [ - { fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; } - ]; - }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; @@ -6375,6 +6710,16 @@ githubId = 9959940; name = "Andreas Fehn"; }; + felbinger = { + name = "Nico Felbinger"; + email = "nico@felbinger.eu"; + matrix = "@nico:felbinger.eu"; + github = "felbinger"; + githubId = 26925347; + keys = [{ + fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; + }]; + }; felipeqq2 = { name = "Felipe Silva"; email = "nixpkgs@felipeqq2.rocks"; @@ -6425,6 +6770,12 @@ githubId = 5198058; name = "Udo Sauer"; }; + ferrine = { + email = "justferres@yandex.ru"; + github = "ferrine"; + githubId = 11705326; + name = "Max Kochurov"; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; @@ -6588,12 +6939,6 @@ githubId = 5918766; name = "Franz Thoma"; }; - fogti = { - name = "Alain Fogtia Zscheile"; - email = "fogti+devel@ytrizja.de"; - github = "fogti"; - githubId = 1618343; - }; foo-dogsquared = { email = "foodogsquared@foodogsquared.one"; github = "foo-dogsquared"; @@ -6619,6 +6964,12 @@ fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; }]; }; + Forden = { + email = "forden@zuku.tech"; + github = "Forden"; + githubId = 24463229; + name = "Forden"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; @@ -6733,6 +7084,12 @@ githubId = 46672819; name = "Frido Friedemann"; }; + friedow = { + email = "christian@friedow.com"; + github = "friedow"; + githubId = 17351844; + name = "Christian Friedow"; + }; friedrichaltheide = { github = "friedrichaltheide"; githubId = 11352905; @@ -6855,15 +7212,6 @@ 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; @@ -6916,6 +7264,15 @@ githubId = 1313787; name = "Gabriella Gonzalez"; }; + gabyx = { + email = "gnuetzi@gmail.com"; + github = "gabyx"; + githubId = 647437; + name = "Gabriel Nützi"; + keys = [{ + fingerprint = "90AE CCB9 7AD3 4CE4 3AED 9402 E969 172A B075 7EB8"; + }]; + }; gador = { email = "florian.brandes@posteo.de"; github = "gador"; @@ -7046,6 +7403,12 @@ githubId = 40209356; name = "Gabriel Doriath Döhler"; }; + gdifolco = { + email = "gautier.difolco@gmail.com"; + github = "blackheaven"; + githubId = 1362807; + name = "Gautier Di Folco"; + }; gdinh = { email = "nix@contact.dinh.ai"; github = "gdinh"; @@ -7082,6 +7445,16 @@ fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; }]; }; + geoffreyfrogeye = { + name = "Geoffrey Frogeye"; + email = "geoffrey@frogeye.fr"; + matrix = "@geoffrey:frogeye.fr"; + github = "GeoffreyFrogeye"; + githubId = 1685403; + keys = [{ + fingerprint = "4FBA 930D 314A 0321 5E2C DB0A 8312 C8CA C1BA C289"; + }]; + }; georgesalkhouri = { name = "Georges Alkhouri"; email = "incense.stitch_0w@icloud.com"; @@ -7226,18 +7599,18 @@ githubId = 104317939; name = "gilice"; }; - gilligan = { - email = "tobias.pflug@gmail.com"; - github = "gilligan"; - githubId = 27668; - name = "Tobias Pflug"; - }; gin66 = { email = "jochen@kiemes.de"; github = "gin66"; githubId = 5549373; name = "Jochen Kiemes"; }; + giodamelio = { + name = "Giovanni d'Amelio"; + email = "gio@damelio.net"; + github = "giodamelio"; + githubId = 441646; + }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; @@ -7370,6 +7743,12 @@ fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; }]; }; + Golo300 = { + email = "lanzingertm@gmail.com"; + github = "Golo300"; + githubId = 58785758; + name = "Tim Lanzinger"; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; @@ -7445,6 +7824,12 @@ githubId = 76716; name = "Graham Christensen"; }; + grahamnorris = { + email = "oss@grahamjnorris.com"; + github = "grahamnorris"; + githubId = 66037909; + name = "Graham J. Norris"; + }; gravndal = { email = "gaute.ravndal+nixos@gmail.com"; github = "gravndal"; @@ -7472,6 +7857,14 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greaka = { + email = "git@greaka.de"; + github = "greaka"; + githubId = 2805834; + name = "Greaka"; + keys = + [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; }]; + }; greg = { email = "greg.hellings@gmail.com"; github = "greg-hellings"; @@ -7580,6 +7973,18 @@ githubId = 10654650; name = "Guillaume Koenig"; }; + guillaumematheron = { + email = "guillaume_nix@matheron.eu"; + github = "guillaumematheron"; + githubId = 1949438; + name = "Guillaume Matheron"; + }; + guitargeek = { + email = "jonas.rembser@cern.ch"; + github = "guitargeek"; + githubId = 6578603; + name = "Jonas Rembser"; + }; guserav = { github = "guserav"; githubId = 28863828; @@ -7657,6 +8062,18 @@ githubId = 22756350; name = "Emile Hansmaennel"; }; + HannahMR = { + name = "Hannah Rosenberg"; + email = "hannah@velascommerce.com"; + github = "HannahMR"; + githubId = 9088467; + }; + hannesgith = { + email = "nix@h-h.win"; + github = "hannesgith"; + githubId = 33062605; + name = "Hannes Hattenbach"; + }; hansjoergschurr = { email = "commits@schurr.at"; github = "hansjoergschurr"; @@ -8019,6 +8436,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hogcycle = { + email = "nate@gysli.ng"; + github = "hogcycle"; + githubId = 57007241; + name = "hogcycle"; + }; holgerpeters = { name = "Holger Peters"; email = "holger.peters@posteo.de"; @@ -8289,6 +8712,12 @@ github = "Icy-Thought"; githubId = 53710398; }; + id3v1669 = { + name = "id3v1669"; + email = "id3v1669@gmail.com"; + github = "id3v1669"; + githubId = 57532211; + }; idlip = { name = "Dilip"; email = "igoldlip@gmail.com"; @@ -8301,6 +8730,12 @@ githubId = 1550265; name = "Dominic Steinitz"; }; + ifd3f = { + github = "ifd3f"; + githubId = 7308591; + email = "astrid@astrid.tech"; + name = "ifd3f"; + }; iFreilicht = { github = "iFreilicht"; githubId = 9742635; @@ -8374,6 +8809,12 @@ githubId = 3948275; name = "Harikrishnan R"; }; + ilya-epifanov = { + email = "mail@ilya.network"; + github = "ilya-epifanov"; + githubId = 92526; + name = "Ilya"; + }; ilya-fedin = { email = "fedin-ilja2010@ya.ru"; github = "ilya-fedin"; @@ -8447,6 +8888,12 @@ fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; }]; }; + imrying = { + email = "philiprying@gmail.com"; + github = "imrying"; + githubId = 36996706; + name = "Philip Rying"; + }; imuli = { email = "i@imu.li"; github = "imuli"; @@ -8563,6 +9010,12 @@ githubId = 137306; name = "Michele Catalano"; }; + isabelroses = { + email = "isabel@isabelroses.com"; + github = "isabelroses"; + githubId = 71222764; + name = "Isabel Roses"; + }; isaozler = { email = "isaozler@gmail.com"; github = "isaozler"; @@ -8716,6 +9169,15 @@ github = "j4m3s-s"; githubId = 9413812; }; + ja1den = { + name = "Jaiden Douglas"; + email = "contact@ja1den.me"; + github = "ja1den"; + githubId = 49811314; + keys = [{ + fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; + }]; + }; jab = { name = "Joshua Bronson"; email = "jabronson@gmail.com"; @@ -8864,6 +9326,12 @@ githubId = 6789916; name = "Jason Odoom"; }; + javaes = { + email = "jan+dev@vanesdonk.de"; + github = "javaes"; + githubId = 1131529; + name = "Jan van Esdonk"; + }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; @@ -8939,6 +9407,12 @@ github = "joshua-cooper"; githubId = 35612334; }; + jcaesar = { + name = "Julius Michaelis"; + matrix = "@julius:mtx.liftm.de"; + github = "jcaesar"; + githubId = 1753388; + }; jceb = { name = "Jan Christoph Ebersbach"; email = "jceb@e-jc.de"; @@ -9017,6 +9491,12 @@ githubId = 2377; name = "Jonathan del Strother"; }; + jdev082 = { + email = "jdev0894@gmail.com"; + github = "jdev082"; + githubId = 92550746; + name = "jdev082"; + }; jdreaver = { email = "johndreaver@gmail.com"; github = "jdreaver"; @@ -9197,12 +9677,6 @@ githubId = 6445082; name = "Joseph Lukasik"; }; - jgoux = { - email = "hi@jgoux.dev"; - github = "jgoux"; - githubId = 1443499; - name = "Julien Goux"; - }; jhh = { email = "jeff@j3ff.io"; github = "jhh"; @@ -9291,6 +9765,12 @@ fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; }]; }; + jlbribeiro = { + email = "nix@jlbribeiro.com"; + github = "jlbribeiro"; + githubId = 1015816; + name = "José Ribeiro"; + }; jleightcap = { email = "jack@leightcap.com"; github = "jleightcap"; @@ -9373,6 +9853,12 @@ githubId = 54179289; name = "Jason Miller"; }; + jn-sena = { + email = "jn-sena@proton.me"; + github = "jn-sena"; + githubId = 45771313; + name = "Sena"; + }; jnsgruk = { email = "jon@sgrs.uk"; github = "jnsgruk"; @@ -9502,6 +9988,12 @@ githubId = 32305209; name = "John Children"; }; + johnjohnstone = { + email = "jjohnstone@riseup.net"; + github = "johnjohnstone"; + githubId = 3208498; + name = "John Johnstone"; + }; johnmh = { email = "johnmh@openblox.org"; github = "JohnMH"; @@ -9532,6 +10024,12 @@ githubId = 51028009; name = "John Rodewald"; }; + johnrtitor = { + email = "masumrezarock100@gmail.com"; + github = "johnrtitor"; + githubId = 50095635; + name = "Masum Reza"; + }; john-shaffer = { email = "jdsha@proton.me"; github = "john-shaffer"; @@ -9544,6 +10042,12 @@ githubId = 25030997; name = "Yuki Okushi"; }; + johnylpm = { + email = "joaoluisparreira@gmail.com"; + github = "Johny-LPM"; + githubId = 168684553; + name = "João Marques"; + }; jojosch = { name = "Johannes Schleifenbaum"; email = "johannes@js-webcoding.de"; @@ -9617,6 +10121,12 @@ githubId = 8580434; name = "Jonny Bolton"; }; + jonochang = { + name = "Jono Chang"; + email = "j.g.chang@gmail.com"; + github = "jonochang"; + githubId = 13179; + }; jonringer = { email = "jonringer117@gmail.com"; matrix = "@jonringer:matrix.org"; @@ -9691,6 +10201,11 @@ github = "jpagex"; githubId = 635768; }; + jpaju = { + name = "Jaakko Paju"; + github = "jpaju"; + githubId = 36770267; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -9775,6 +10290,11 @@ githubId = 107689; name = "Josh Holland"; }; + jshort = { + github = "jshort"; + githubId = 1186444; + name = "James Short"; + }; jsierles = { email = "joshua@hey.com"; matrix = "@jsierles:matrix.org"; @@ -9802,7 +10322,7 @@ githubId = 27734541; }; jtbx = { - email = "jtbx@duck.com"; + email = "jeremy@baxters.nz"; name = "Jeremy Baxter"; github = "jtbx"; githubId = 92071952; @@ -10006,6 +10526,12 @@ github = "k3a"; githubId = 966992; }; + k3yss = { + email = "rsi.dev17@gmail.com"; + name = "Rishi Kumar"; + github = "k3yss"; + githubId = 96657880; + }; k900 = { name = "Ilya K."; email = "me@0upti.me"; @@ -10037,6 +10563,11 @@ githubId = 6544084; name = "Kai Harries"; }; + kai-tub = { + name = "Kai Norman Clasen"; + github = "kai-tub"; + githubId = 46302524; + }; kalbasit = { email = "wael.nasreddine@gmail.com"; matrix = "@kalbasit:matrix.org"; @@ -10158,6 +10689,12 @@ githubId = 26346867; name = "K.B.Dharun Krishna"; }; + kbudde = { + email = "kris@budd.ee"; + github = "kbudde"; + githubId = 1072181; + name = "Kris Budde"; + }; kcalvinalvin = { email = "calvin@kcalvinalvin.info"; github = "kcalvinalvin"; @@ -10170,15 +10707,6 @@ github = "keenanweaver"; githubId = 37268985; }; - keksbg = { - email = "keksbg@riseup.net"; - name = "Stella"; - github = "keksbg"; - githubId = 10682187; - keys = [{ - fingerprint = "AB42 1F18 5A19 A160 AD77 9885 3D6D CA5B 6F2C 2A7A"; - }]; - }; keldu = { email = "mail@keldu.de"; github = "keldu"; @@ -10336,6 +10864,12 @@ githubId = 845652; name = "Kier Davis"; }; + kiike = { + email = "me@enric.me"; + github = "kiike"; + githubId = 464625; + name = "Enric Morales"; + }; kilianar = { email = "mail@kilianar.de"; github = "kilianar"; @@ -10619,6 +11153,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kotatsuyaki = { + email = "kotatsuyaki@mail.kotatsu.dev"; + github = "kotatsuyaki"; + githubId = 17219127; + name = "kotatsuyaki"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -10790,12 +11330,24 @@ githubId = 15742918; name = "Sergey Kuznetsov"; }; + kvendingoldo = { + email = "kvendingoldo@gmail.com"; + github = "kvendingoldo"; + githubId = 11614750; + name = "Alexander Sharov"; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; githubId = 2422454; name = "Kai Wohlfahrt"; }; + kylecarbs = { + name = "Kyle Carberry"; + email = "kyle@carberry.com"; + github = "kylecarbs"; + githubId = 7122116; + }; kylehendricks = { name = "Kyle Hendricks"; email = "kyle-github@mail.hendricks.nu"; @@ -10850,6 +11402,12 @@ }]; name = "Yaroslav Bolyukin"; }; + lachrymal = { + email = "lachrymalfutura@gmail.com"; + name = "lachrymaL"; + github = "lachrymaLF"; + githubId = 13716477; + }; lafrenierejm = { email = "joseph@lafreniere.xyz"; github = "lafrenierejm"; @@ -11009,6 +11567,14 @@ githubId = 887072; name = "Alexander Lebedev"; }; + lebensterben = { + name = "Lucius Hu"; + github = "lebensterben"; + githubId = 1222865; + keys = [{ + fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; + }]; + }; lecoqjacob = { name = "Jacob LeCoq"; email = "lecoqjacob@gmail.com"; @@ -11036,6 +11602,11 @@ githubId = 4158274; name = "Michiel Leenaars"; }; + legojames = { + github = "jrobinson-uk"; + githubId = 4701504; + name = "James Robinson"; + }; leifhelm = { email = "jakob.leifhelm@gmail.com"; github = "leifhelm"; @@ -11062,7 +11633,7 @@ name = "Daniel Kuehn"; }; lelgenio = { - email = "lelgenio@disroot.org"; + email = "lelgenio@lelgenio.com"; github = "lelgenio"; githubId = 31388299; name = "Leonardo Eugênio"; @@ -11299,6 +11870,13 @@ fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; }]; }; + link2xt = { + email = "link2xt@testrun.org"; + githubId = 18373967; + github = "link2xt"; + matrix = "@link2xt:matrix.org"; + name = "link2xt"; + }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; @@ -11403,12 +11981,6 @@ 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"; @@ -11438,6 +12010,12 @@ github = "LongerHV"; githubId = 46924944; }; + lonyelon = { + email = "sergio@lony.xyz"; + name = "Sergio Miguéns Iglesias"; + github = "lonyelon"; + githubId = 18664655; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; @@ -11511,6 +12089,14 @@ githubId = 10626; name = "Andreas Wagner"; }; + lpostula = { + email = "lois@postu.la"; + github = "loispostula"; + githubId = 1423612; + name = "Loïs Postula"; + keys = + [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; }]; + }; lrewega = { email = "lrewega@c32.ca"; github = "lrewega"; @@ -11645,18 +12231,18 @@ fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; }]; }; + luftmensch-luftmensch = { + email = "valentinobocchetti59@gmail.com"; + name = "Valentino Bocchetti"; + github = "luftmensch-luftmensch"; + githubId = 65391343; + }; 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"; @@ -11701,6 +12287,12 @@ githubId = 30468956; name = "Lukas Heiligenbrunner"; }; + lukaslihotzki = { + email = "lukas@lihotzki.de"; + github = "lukaslihotzki"; + githubId = 10326063; + name = "Lukas Lihotzki"; + }; lukaswrz = { email = "lukas@wrz.one"; github = "lukaswrz"; @@ -12000,6 +12592,11 @@ githubId = 18661391; name = "Malte Janz"; }; + malteneuss = { + github = "malteneuss"; + githubId = 5301202; + name = "Malte Neuss"; + }; malte-v = { email = "nixpkgs@mal.tc"; github = "malte-v"; @@ -12141,10 +12738,11 @@ githubId = 26470037; name = "Markus Kowalewski"; }; - marsam = { - github = "marsam"; - githubId = 65531; - name = "Mario Rodas"; + marmolak = { + email = "hack.robin@gmail.com"; + github = "marmolak"; + githubId = 1709273; + name = "Robin Hack"; }; marsupialgutz = { email = "mars@possums.xyz"; @@ -12275,6 +12873,12 @@ githubId = 952712; name = "Matt Christ"; }; + matteopacini = { + email = "m@matteopacini.me"; + github = "matteo-pacini"; + githubId = 3139724; + name = "Matteo Pacini"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -12315,6 +12919,12 @@ githubId = 427866; name = "Matthias Beyer"; }; + matthiasq = { + email = "matthias.queitsch@mailbox.org"; + github = "matthias-Q"; + githubId = 35303817; + name = "Matthias Queitsch"; + }; MatthieuBarthel = { email = "matthieu@imatt.ch"; name = "Matthieu Barthel"; @@ -12348,6 +12958,16 @@ githubId = 11810057; name = "Matt Snider"; }; + MattSturgeon = { + email = "matt@sturgeon.me.uk"; + github = "MattSturgeon"; + githubId = 5046562; + matrix = "@mattsturg:matrix.org"; + name = "Matt Sturgeon"; + keys = [{ + fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299"; + }]; + }; matusf = { email = "matus.ferech@gmail.com"; github = "matusf"; @@ -12429,6 +13049,12 @@ fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; }]; }; + maxstrid = { + email = "mxwhenderson@gmail.com"; + github = "maxstrid"; + githubId = 115441224; + name = "Maxwell Henderson"; + }; maxux = { email = "root@maxux.net"; github = "maxux"; @@ -12602,6 +13228,12 @@ githubId = 14259816; name = "Abin Simon"; }; + me-and = { + name = "Adam Dinwoodie"; + email = "nix.thunder.wayne@post.dinwoodie.org"; + github = "me-and"; + githubId = 1397507; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; @@ -12841,7 +13473,7 @@ }]; }; michaelpj = { - email = "michaelpj@gmail.com"; + email = "me@michaelpj.com"; github = "michaelpj"; githubId = 1699466; name = "Michael Peyton Jones"; @@ -13130,6 +13762,12 @@ matrix = "@mjm:beeper.com"; name = "Matt Moriarity"; }; + mjoerg = { + name = "Martin Joerg"; + email = "martin.joerg@gmail.com"; + github = "mjoerg"; + githubId = 147256; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -13173,6 +13811,12 @@ fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; }]; }; + mksafavi = { + name = "MK Safavi"; + email = "mksafavi@gmail.com"; + github = "mksafavi"; + githubId = 50653293; + }; mktip = { email = "mo.issa.ok+nix@gmail.com"; github = "mktip"; @@ -13182,6 +13826,12 @@ fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; }]; }; + mlaradji = { + name = "Mohamed Laradji"; + email = "mlaradji@pm.me"; + github = "mlaradji"; + githubId = 33703663; + }; mlatus = { email = "wqseleven@gmail.com"; github = "Ninlives"; @@ -13274,6 +13924,15 @@ fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; }]; }; + momeemt = { + name = "Mutsuha Asada"; + email = "me@momee.mt"; + github = "momeemt"; + githubId = 43488453; + keys = [{ + fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; + }]; + }; monaaraj = { name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; @@ -13321,6 +13980,12 @@ githubId = 830082; name = "Nathan Moos"; }; + moraxyc = { + name = "Moraxyc Xu"; + email = "nix@qaq.li"; + github = "Moraxyc"; + githubId = 69713071; + }; moredread = { email = "code@apb.name"; github = "Moredread"; @@ -13370,12 +14035,6 @@ githubId = 20026143; name = "Katona László"; }; - MP2E = { - email = "MP2E@archlinux.us"; - github = "MP2E"; - githubId = 167708; - name = "Cray Elliott"; - }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; @@ -13491,21 +14150,18 @@ githubId = 3856390; email = "mschwaig+nixpkgs@eml.cc"; }; - msfjarvis = { - github = "msfjarvis"; - githubId = 13348378; - name = "Harsh Shandilya"; - email = "nixos@msfjarvis.dev"; - keys = [{ - fingerprint = "8F87 050B 0F9C B841 1515 7399 B784 3F82 3355 E9B9"; - }]; - }; msiedlarek = { email = "mikolaj@siedlarek.pl"; github = "msiedlarek"; githubId = 133448; name = "Mikołaj Siedlarek"; }; + msladecek = { + email = "martin.sladecek+nixpkgs@gmail.com"; + name = "Martin Sladecek"; + github = "msladecek"; + githubId = 7304317; + }; mslingsby = { email = "morten.slingsby@eviny.no"; github = "MortenSlingsby"; @@ -13828,8 +14484,23 @@ githubId = 56316606; name = "Amneesh Singh"; }; + naxdy = { + name = "Naxdy"; + email = "naxdy@naxdy.org"; + matrix = "@naxdy:naxdy.org"; + github = "Naxdy"; + githubId = 4532582; + keys = [{ + fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; + }]; + }; + nayala = { + name = "Nia"; + matrix = "@fly:asra.gr"; + }; nazarewk = { name = "Krzysztof Nazarewski"; + email = "nixpkgs@kdn.im"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -14059,6 +14730,12 @@ githubId = 399535; name = "Niklas Hambüchen"; }; + nhnn = { + matrix = "@nhnn:nhnn.dev"; + github = "thenhnn"; + githubId = 162156666; + name = "nhnn"; + }; nhooyr = { email = "anmol@aubble.com"; github = "nhooyr"; @@ -14307,6 +14984,18 @@ githubId = 6930756; name = "Nicolas Mattia"; }; + nmishin = { + email = "sanduku.default@gmail.com"; + github = "Nmishin"; + githubId = 4242897; + name = "Nikolai Mishin"; + }; + noaccos = { + name = "Francesco Noacco"; + email = "francesco.noacco2000@gmail.com"; + github = "noaccOS"; + githubId = 24324352; + }; nobbz = { name = "Norbert Melzer"; email = "timmelzer+nixpkgs@gmail.com"; @@ -14325,6 +15014,12 @@ githubId = 42322511; name = "Patryk Kwiatek"; }; + nokazn = { + email = "me@nokazn.me"; + github = "nokazn"; + githubId = 41154684; + name = "nokazn"; + }; nomeata = { email = "mail@joachim-breitner.de"; github = "nomeata"; @@ -14403,12 +15098,6 @@ githubId = 126072875; name = "nova madeline"; }; - novenary = { - email = "streetwalkermc@gmail.com"; - github = "9ary"; - githubId = 1155030; - name = "novenary"; - }; novoxd = { email = "radnovox@gmail.com"; github = "novoxd"; @@ -14533,6 +15222,12 @@ githubId = 16027994; name = "Nathan Viets"; }; + nyadiia = { + email = "nyadiia@pm.me"; + github = "nyadiia"; + githubId = 43252360; + name = "Nadia"; + }; nyanbinary = { email = "nyanbinary@keemail.me"; matrix = "@niko:conduit.rs"; @@ -14558,6 +15253,19 @@ githubId = 127548; name = "Judson Lester"; }; + nyawox = { + name = "nyawox"; + email = "nyawox.git@gmail.com"; + github = "nyawox"; + githubId = 93813719; + }; + nydragon = { + name = "nydragon"; + github = "nydragon"; + email = "nix@ccnlc.eu"; + githubId = 56591727; + keys = [ { fingerprint = "25FF 8464 F062 7EC0 0129 6A43 14AA 30A8 65EA 1209"; } ]; + }; nzbr = { email = "nixos@nzbr.de"; github = "nzbr"; @@ -14574,6 +15282,12 @@ githubId = 30825096; name = "Ning Zhang"; }; + o0th = { + email = "o0th@pm.me"; + name = "Sabato Luca Guadagno"; + github = "o0th"; + githubId = 22490354; + }; oaksoaj = { email = "oaksoaj@riseup.net"; name = "Oaksoaj"; @@ -14662,6 +15376,12 @@ githubId = 7249506; name = "oida"; }; + ok-nick = { + email = "nick.libraries@gmail.com"; + github = "ok-nick"; + githubId = 25470747; + name = "Nick"; + }; olcai = { email = "dev@timan.info"; github = "olcai"; @@ -14771,6 +15491,12 @@ github = "ony"; githubId = 11265; }; + oo-infty = { + name = "Justin Chen"; + email = "oo-infty@outlook.com"; + github = "oo-infty"; + githubId = 42143810; + }; ooliver1 = { name = "Oliver Wilkes"; email = "oliverwilkes2006@icloud.com"; @@ -14854,6 +15580,13 @@ githubId = 104593071; name = "Oliver Schmidt"; }; + osslate = { + email = "fionn@kelleher.email"; + github = "osslate"; + githubId = 773673; + matrix = "@osslate:fsfe.org"; + name = "Fionn Kelleher"; + }; ostrolucky = { email = "gabriel.ostrolucky@gmail.com"; github = "ostrolucky"; @@ -15021,6 +15754,12 @@ githubId = 1788628; name = "pandaman"; }; + pandapip1 = { + email = "gavinnjohn@gmail.com"; + github = "Pandapip1"; + githubId = 45835846; + name = "Gavin John"; + }; panicgh = { email = "nbenes.gh@xandea.de"; github = "panicgh"; @@ -15075,12 +15814,27 @@ githubId = 72527881; name = "PassiveLemon"; }; + pathob = { + email = "patrick@hobusch.net"; + github = "pathob"; + githubId = 4580157; + name = "Patrick Hobusch"; + }; patka = { email = "patka@patka.dev"; github = "patka-123"; githubId = 69802930; name = "patka"; }; + patrickdag = { + email = "patrick-nixos@failmail.dev"; + github = "PatrickDaG"; + githubId = 58092422; + name = "Patrick"; + keys = [{ + fingerprint = "5E4C 3D74 80C2 35FE 2F0B D23F 7DD6 A72E C899 617D"; + }]; + }; patricksjackson = { email = "patrick@jackson.dev"; github = "patricksjackson"; @@ -15214,6 +15968,12 @@ githubId = 1368952; name = "Pedro Lara Campos"; }; + peefy = { + email = "xpf6677@gmail.com"; + github = "Peefy"; + githubId = 22744597; + name = "Peefy"; + }; peelz = { email = "peelz.dev+nixpkgs@gmail.com"; github = "notpeelz"; @@ -15346,6 +16106,12 @@ fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; }]; }; + phdyellow = { + name = "Phil Dyer"; + email = "phildyer@protonmail.com"; + github = "PhDyellow"; + githubId = 7740661; + }; phfroidmont = { name = "Paul-Henri Froidmont"; email = "nix.contact-j9dw4d@froidmont.org"; @@ -15396,6 +16162,12 @@ githubId = 43863; name = "Philip Taron"; }; + philtaken = { + email = "philipp.herzog@protonmail.com"; + github = "philtaken"; + githubId = 13309623; + name = "Philipp Herzog"; + }; phip1611 = { email = "phip1611@gmail.com"; github = "phip1611"; @@ -15482,6 +16254,12 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pigeonf = { + email = "fnoegip+nixpkgs@gmail.com"; + github = "PigeonF"; + githubId = 7536431; + name = "Jonas Fierlings"; + }; pimeys = { email = "julius@nauk.io"; github = "pimeys"; @@ -15578,6 +16356,13 @@ githubId = 4056630; name = "Patrick Steinhardt"; }; + pkulak = { + name = "Phil Kulak"; + email = "phil@kulak.us"; + matrix = "@phil:kulak.us"; + github = "pkulak"; + githubId = 502905; + }; plabadens = { name = "Pierre Labadens"; email = "labadens.pierre+nixpkgs@gmail.com"; @@ -15771,6 +16556,12 @@ githubId = 4201956; name = "pongo1231"; }; + poptart = { + email = "poptart@hosakacorp.net"; + github = "terrorbyte"; + githubId = 1601039; + name = "Cale Black"; + }; portothree = { name = "Gustavo Porto"; email = "gus@p8s.co"; @@ -15910,6 +16701,12 @@ githubId = 3153638; name = "Profpatsch"; }; + proggerx = { + email = "x@proggers.ru"; + github = "ProggerX"; + githubId = 88623613; + name = "ProggerX"; + }; proglodyte = { email = "proglodyte23@gmail.com"; github = "proglodyte"; @@ -16064,6 +16861,12 @@ githubId = 5636; name = "Steve Purcell"; }; + purrpurrn = { + email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com"; + github = "purrpurrn"; + githubId = 142632643; + name = "purrpurrn"; + }; putchar = { email = "slim.cadoux@gmail.com"; matrix = "@putch4r:matrix.org"; @@ -16083,12 +16886,28 @@ github = "PhilippWoelfel"; githubId = 19400064; }; + pyle = { + name = "Adam Pyle"; + email = "adam@pyle.dev"; + github = "pyle"; + githubId = 7279609; + }; pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; githubId = 4579165; name = "Danny Bautista"; }; + pyrox0 = { + name = "Pyrox"; + email = "pyrox@pyrox.dev"; + matrix = "@pyrox:pyrox.dev"; + github = "pyrox0"; + githubId = 35778371; + keys = [{ + fingerprint = "4CA9 72FB ADC8 1416 0F10 3138 FE1D 8A7D 620C 611F"; + }]; + }; pyxels = { email = "pyxels.dev@gmail.com"; github = "Pyxels"; @@ -16154,6 +16973,18 @@ matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; }; + qubasa = { + email = "consulting@qube.email"; + github = "Qubasa"; + githubId = 22085373; + name = "Luis Hebendanz"; + }; + qubitnano = { + name = "qubitnano"; + email = "qubitnano@protonmail.com"; + github = "qubitnano"; + githubId = 146656568; + }; queezle = { email = "git@queezle.net"; github = "queezle42"; @@ -16187,6 +17018,18 @@ githubId = 39039420; name = "Quinn Dougherty"; }; + qusic = { + email = "qusicx@gmail.com"; + github = "Qusic"; + githubId = 2141853; + name = "Bang Lee"; + }; + qwqawawow = { + email = "eihqnh@outlook.com"; + github = "qwqawawow"; + githubId = 40905037; + name = "qwqawawow"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -16197,12 +17040,24 @@ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; + qyriad = { + email = "qyriad@qyriad.me"; + github = "Qyriad"; + githubId = 1542224; + matrix = "@qyriad:katesiria.org"; + name = "Qyriad"; + }; r3dl3g = { email = "redleg@rothfuss-web.de"; github = "r3dl3g"; githubId = 35229674; name = "Armin Rothfuss"; }; + r3n3gad3p3arl = { + github = "r3n3gad3p3arl"; + githubId = 20760527; + name = "Madelyn"; + }; raboof = { email = "arnout@bzzt.net"; matrix = "@raboof:matrix.org"; @@ -16389,12 +17244,24 @@ githubId = 25647735; name = "Victor Freire"; }; + ravenz46 = { + email = "goldraven0406@gmail.com"; + github = "RAVENz46"; + githubId = 86608952; + name = "RAVENz46"; + }; rawkode = { email = "david.andrew.mckay@gmail.com"; github = "rawkode"; githubId = 145816; name = "David McKay"; }; + raylas = { + email = "r@raymond.sh"; + github = "raylas"; + githubId = 8099415; + name = "Raymond Douglas"; + }; rayslash = { email = "stevemathewjoy@tutanota.com"; github = "rayslash"; @@ -16445,6 +17312,15 @@ githubId = 52847440; name = "Ryan Burns"; }; + rconybea = { + email = "n1xpkgs@hushmail.com"; + github = "rconybea"; + githubId = 8570969; + name = "Roland Conybeare"; + keys = [{ + fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; + }]; + }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; @@ -16494,6 +17370,12 @@ githubId = 18155001; name = "Gabe Dunn"; }; + redyf = { + email = "mateusalvespereira7@gmail.com"; + github = "redyf"; + githubId = 98139059; + name = "Mateus Alves"; + }; reedrw = { email = "reedrw5601@gmail.com"; github = "reedrw"; @@ -16637,6 +17519,13 @@ githubId = 12279531; name = "Ricardo Guevara"; }; + rhelmot = { + name = "Audrey Dutcher"; + github = "rhelmot"; + githubId = 2498805; + email = "audrey@rhelmot.io"; + matrix = "@rhelmot:matrix.org"; + }; rhendric = { name = "Ryan Hendrickson"; github = "rhendric"; @@ -16727,6 +17616,12 @@ githubId = 37246692; name = "Riley Inman"; }; + rinx = { + email = "rintaro.okamura@gmail.com"; + github = "rinx"; + githubId = 1588935; + name = "Rintaro Okamura"; + }; riotbib = { email = "lennart@cope.cool"; github = "riotbib"; @@ -16916,6 +17811,12 @@ githubId = 69053978; name = "rogarb"; }; + rohanssrao = { + email = "rohanssrao@gmail.com"; + github = "rohanssrao"; + githubId = 17805516; + name = "Rohan Rao"; + }; rollf = { email = "rolf.schroeder@limbus-medtec.com"; github = "rollf"; @@ -16978,6 +17879,12 @@ github = "rosehobgoblin"; githubId = 84164410; }; + roshaen = { + name = "Roshan Kumar"; + email = "roshaen09@gmail.com"; + github = "roshaen"; + githubId = 58213083; + }; rossabaker = { name = "Ross A. Baker"; email = "ross@rossabaker.com"; @@ -16987,8 +17894,12 @@ RossComputerGuy = { name = "Tristan Ross"; email = "tristan.ross@midstall.com"; + matrix = "@rosscomputerguy:matrix.org"; github = "RossComputerGuy"; githubId = 19699320; + keys = [{ + fingerprint = "FD5D F7A8 85BB 378A 0157 5356 B09C 4220 3566 9AF8"; + }]; }; rostan-t = { name = "Rostan Tabet"; @@ -17008,6 +17919,11 @@ githubId = 7439756; name = "Rowan Goemans"; }; + roydubnium = { + github = "RoyDubnium"; + githubId = 72664566; + name = "Roy Davison"; + }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; @@ -17066,6 +17982,11 @@ githubId = 19433256; name = "Radoslaw Sniezek"; }; + rster2002 = { + name = "Bjørn"; + github = "rster2002"; + githubId = 26026518; + }; rsynnest = { email = "contact@rsynnest.com"; github = "rsynnest"; @@ -17158,6 +18079,12 @@ githubId = 2660; name = "Russell Sim"; }; + rutherther = { + name = "Rutherther"; + email = "rutherther@proton.me"; + github = "rutherther"; + githubId = 12197024; + }; ruuda = { email = "dev+nix@veniogames.com"; github = "ruuda"; @@ -17293,6 +18220,14 @@ fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; }]; }; + ryze = { + name = "Ryze"; + github = "ryze312"; + githubId = 50497128; + keys = [{ + fingerprint = "73D5 BFF5 0AD7 F3C1 AF1A AC24 9B29 6C5C EAEA AAC1"; + }]; + }; rzetterberg = { email = "richard.zetterberg@gmail.com"; github = "rzetterberg"; @@ -17316,6 +18251,12 @@ fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; }]; }; + sailord = { + name = "Sailord"; + email = "sailord328@gmail.com"; + github = "Sail0rd"; + githubId = 55802415; + }; samalws = { email = "sam@samalws.com"; name = "Sam Alws"; @@ -17346,6 +18287,12 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samemrecebi = { + name = "Emre Çebi"; + email = "emre@cebi.io"; + github = "samemrecebi"; + githubId = 64419750; + }; samhug = { email = "s@m-h.ug"; github = "samhug"; @@ -17450,7 +18397,7 @@ name = "Sanskar Gurdasani"; }; sarahec = { - email = "sarahec@nextquestion.net"; + email = "seclark@nextquestion.net"; github = "sarahec"; githubId = 11277967; name = "Sarah Clark"; @@ -17695,6 +18642,17 @@ fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; }]; }; + sebrut = { + email = "kontakt@sebastian-rutofski.de"; + github = "sebrut"; + githubId = 3962409; + name = "Sebastian Rutofski"; + keys = [ + { + fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547"; + } + ]; + }; sebtm = { email = "mail@sebastian-sellmeier.de"; github = "SebTM"; @@ -17717,6 +18675,11 @@ github = "sei40kr"; githubId = 11665236; }; + seineeloquenz = { + name = "Alexander Linder"; + github = "SeineEloquenz"; + githubId = 34923333; + }; seirl = { name = "Antoine Pietri"; email = "antoine.pietri1@gmail.com"; @@ -17810,6 +18773,11 @@ githubId = 863807; name = "Serge Guelton"; }; + sergioribera = { + github = "SergioRibera"; + githubId = 56278796; + name = "Sergio Ribera"; + }; sersorrel = { email = "ash@sorrel.sh"; github = "sersorrel"; @@ -18553,6 +19521,12 @@ githubId = 20756843; name = "Sofi"; }; + soyouzpanda = { + name = "soyouzpanda"; + email = "soyouzpanda@soyouzpanda.fr"; + github = "soyouzpanda"; + githubId = 23421201; + }; soywod = { name = "Clément DOUIN"; email = "clement.douin@posteo.net"; @@ -18661,12 +19635,6 @@ githubId = 16364318; name = "Jeffrey Harmon"; }; - srapenne = { - email = "solene@perso.pw"; - github = "rapenne-s"; - githubId = 248016; - name = "Solène Rapenne"; - }; srghma = { email = "srghma@gmail.com"; github = "srghma"; @@ -18749,12 +19717,6 @@ githubId = 2798728; name = "Filip Czaplicki"; }; - star-szr = { - email = "nixpkgs@szr.fastmail.com"; - github = "star-szr"; - githubId = 327943; - name = "Scott Zhu Reeves"; - }; starzation = { email = "nixpkgs@starzation.net"; github = "starzation"; @@ -18823,6 +19785,15 @@ githubId = 89950; name = "Stéphan Kochen"; }; + stephen-huan = { + name = "Stephen Huan"; + email = "stephen.huan@cgdct.moe"; + github = "stephen-huan"; + githubId = 20411956; + keys = [{ + fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; + }]; + }; stephenmw = { email = "stephen@q5comm.com"; github = "stephenmw"; @@ -19005,11 +19976,11 @@ githubId = 1939855; name = "Kimmo Suominen"; }; - superbo = { - email = "supernbo@gmail.com"; - github = "SuperBo"; - githubId = 2666479; - name = "Y Nguyen"; + supa = { + email = "supa.codes@gmail.com"; + github = "0Supa"; + githubId = 36031171; + name = "Supa"; }; superherointj = { email = "sergiomarcelo@yandex.com"; @@ -19103,6 +20074,12 @@ github = "sweenu"; githubId = 7051978; }; + swendel = { + name = "Sebastian Wendel"; + email = "nixpkgs.aiX5ph@srx.digital"; + github = "SebastianWendel"; + githubId = 919570; + }; swesterfeld = { email = "stefan@space.twc.de"; github = "swesterfeld"; @@ -19134,6 +20111,12 @@ githubId = 12841859; name = "Syboxez Blank"; }; + syedahkam = { + email = "smahkam57@gmail.com"; + github = "SyedAhkam"; + githubId = 52673095; + name = "Syed Ahkam"; + }; symphorien = { email = "symphorien_nixpkgs@xlumurb.eu"; matrix = "@symphorien:xlumurb.eu"; @@ -19186,6 +20169,12 @@ fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; }]; }; + t4sm5n = { + email = "t4sm5n@gmail.com"; + github = "t4sm5n"; + githubId = 28858039; + name = "Tuomas Mäkinen"; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; @@ -19377,6 +20366,12 @@ githubId = 2389333; name = "Andy Tockman"; }; + tcmal = { + email = "me@aria.rip"; + github = "tcmal"; + githubId = 4183876; + name = "Aria Shrimpton"; + }; teatwig = { email = "nix@teatwig.net"; name = "tea"; @@ -19602,15 +20597,11 @@ github = "thefossguy"; githubId = 44400303; }; - thehedgeh0g = { - name = "The Hedgehog"; - email = "hedgehog@mrhedgehog.xyz"; - matrix = "@mrhedgehog:jupiterbroadcasting.com"; - github = "pyrox0"; - githubId = 35778371; - keys = [{ - fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; - }]; + thehans255 = { + name = "Hans Jorgensen"; + email = "foss-contact@thehans255.com"; + github = "thehans255"; + githubId = 15896573; }; thekostins = { name = "Konstantin"; @@ -19886,12 +20877,6 @@ github = "tirimia"; githubId = 11174371; }; - titanous = { - email = "jonathan@titanous.com"; - github = "titanous"; - githubId = 13026; - name = "Jonathan Rudenberg"; - }; tjni = { email = "43ngvg@masqt.com"; matrix = "@tni:matrix.org"; @@ -19954,6 +20939,11 @@ githubId = 9853194; name = "Philipp Bartsch"; }; + toast = { + name = "Toast"; + github = "toast003"; + githubId = 39011842; + }; toastal = { email = "toastal+nix@posteo.net"; matrix = "@toastal:mozilla.org"; @@ -19964,6 +20954,12 @@ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; }]; }; + toasteruwu = { + email = "Aki@ToasterUwU.com"; + github = "ToasterUwU"; + githubId = 43654377; + name = "Aki"; + }; tobiasBora = { email = "tobias.bora.list@gmail.com"; github = "tobiasBora"; @@ -19976,18 +20972,18 @@ githubId = 858790; name = "Tobias Mayer"; }; + tobz619 = { + email = "toloke@yahoo.co.uk"; + github = "tobz619"; + githubId = 93312805; + name = "Tobi Oloke"; + }; tochiaha = { email = "tochiahan@proton.me"; github = "Tochiaha"; githubId = 74688871; name = "Tochukwu Ahanonu"; }; - tokudan = { - email = "git@danielfrank.net"; - github = "tokudan"; - githubId = 692610; - name = "Daniel Frank"; - }; tomahna = { email = "kevin.rauscher@tomahna.fr"; github = "Tomahna"; @@ -20033,11 +21029,14 @@ name = "Tomkoid"; }; tomodachi94 = { - email = "tomodachi94+nixpkgs@protonmail.com"; + email = "tomodachi94@protonmail.com"; matrix = "@tomodachi94:matrix.org"; github = "tomodachi94"; githubId = 68489118; name = "Tomodachi94"; + keys = [{ + fingerprint = "B208 D6E5 B8ED F47D 5687 627B 2E27 5F21 C4D5 54A3"; + }]; }; tomsiewert = { email = "tom@siewert.io"; @@ -20163,6 +21162,11 @@ githubId = 9870613; name = "Hubert Mühlhans"; }; + trishtzy = { + github = "trishtzy"; + githubId = 5356506; + name = "Tricia Tan"; + }; trobert = { email = "thibaut.robert@gmail.com"; github = "trobert"; @@ -20307,12 +21311,6 @@ githubId = 131159000; name = "Nitin Passa"; }; - twitchyliquid64 = { - name = "Tom"; - email = "twitchyliquid64@ciphersink.net"; - github = "twitchyliquid64"; - githubId = 6328589; - }; twz123 = { name = "Tom Wieczorek"; email = "tom@bibbu.net"; @@ -20388,6 +21386,12 @@ githubId = 20206121; name = "umlx5h"; }; + uncenter = { + name = "uncenter"; + email = "uncenter@uncenter.dev"; + github = "uncenter"; + githubId = 47499684; + }; unclamped = { name = "Maru"; email = "clear6860@tutanota.com"; @@ -20926,6 +21930,12 @@ githubId = 357664; name = "Viktor Petersson"; }; + vpochapuis = { + email = "vincent.professional@chapuis.ovh"; + github = "vpochapuis"; + githubId = 75721408; + name = "Vincent Chapuis"; + }; vq = { email = "vq@erq.se"; github = "vq"; @@ -20938,6 +21948,12 @@ name = "Kostas Karachalios"; githubId = 81346; }; + vringar = { + email = "git@zabka.it"; + github = "vringar"; + name = "Stefan Zabka"; + githubId = 13276717; + }; vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; @@ -21072,6 +22088,12 @@ github = "wegank"; githubId = 9713184; }; + weitzj = { + name = "Jan Weitz"; + email = "nixpkgs@janweitz.de"; + github = "weitzj"; + githubId = 829277; + }; welteki = { email = "welteki@pm.me"; github = "welteki"; @@ -21178,6 +22200,16 @@ fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; }]; }; + willbush = { + email = "git@willbush.dev"; + matrix = "@willbush:matrix.org"; + github = "willbush"; + githubId = 2023546; + name = "Will Bush"; + keys = [{ + fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; + }]; + }; willcohen = { github = "willcohen"; githubId = 5185341; @@ -21347,6 +22379,12 @@ github = "wr0belj"; githubId = 40501814; }; + wr7 = { + name = "wr7"; + email = "d-wr7@outlook.com"; + github = "wr7"; + githubId = 53203261; + }; wraithm = { name = "Matthew Wraith"; email = "wraithm@gmail.com"; @@ -21440,6 +22478,12 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + XBagon = { + name = "XBagon"; + email = "xbagon@outlook.de"; + github = "XBagon"; + githubId = 1523292; + }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; @@ -21480,12 +22524,6 @@ githubId = 36407913; name = "Uli Baum"; }; - xfix = { - email = "kamila@borowska.pw"; - github = "KamilaBorowska"; - githubId = 1297598; - name = "Kamila Borowska"; - }; xfnw = { email = "xfnw+nixos@riseup.net"; github = "xfnw"; @@ -21500,7 +22538,8 @@ }; xgwq = { name = "XGWQ"; - email = "nixos@xnee.de"; + email = "nixos.xgwq@xnee.net"; + keys = [{ fingerprint = "6489 9EF2 A256 5C04 7426 686C 8337 A748 74EB E129"; }]; matrix = "@xgwq:nerdberg.de"; github = "peterablehmann"; githubId = 36541313; @@ -21540,6 +22579,11 @@ githubId = 46590321; name = "xrelkd"; }; + xtrayambak = { + github = "xTrayambak"; + githubId = 59499552; + name = "Trayambak Rai"; + }; xurei = { email = "olivier.bourdoux@gmail.com"; github = "xurei"; @@ -21581,6 +22625,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yah = { + email = "yah@singularpoint.cc"; + github = "wangxiaoerYah"; + githubId = 48443038; + name = "Yah"; + }; yajo = { email = "yajo.sk8@gmail.com"; github = "yajo"; @@ -21759,6 +22809,11 @@ githubId = 40352765; name = "Yoctocell"; }; + yomaq = { + name = "yomaq"; + github = "yomaq"; + githubId = 112864332; + }; yorickvp = { email = "yorickvanpelt@gmail.com"; matrix = "@yorickvp:matrix.org"; @@ -21886,6 +22941,12 @@ githubId = 179548; name = "Yves Fischer"; }; + YvesStraten = { + email = "yves.straten@gmail.com"; + github = "YvesStraten"; + githubId = 65394961; + name = "Yves Straten"; + }; yvt = { email = "i@yvt.jp"; github = "yvt"; @@ -21995,6 +23056,12 @@ fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; }]; }; + zelkourban = { + name = "zelkourban"; + email = "zelo.urban@gmail.com"; + github = "zelkourban"; + githubId = 33812622; + }; zendo = { name = "zendo"; email = "linzway@qq.com"; @@ -22062,12 +23129,24 @@ githubId = 3248; name = "zimbatm"; }; + zimeg = { + email = "zim@o526.net"; + github = "zimeg"; + githubId = 18134219; + name = "zimeg"; + }; Zimmi48 = { email = "theo.zimmermann@telecom-paris.fr"; github = "Zimmi48"; githubId = 1108325; name = "Théo Zimmermann"; }; + zlepper = { + name = "Rasmus Hansen"; + github = "zlepper"; + githubId = 1499810; + email = "hansen13579@gmail.com"; + }; zmitchell = { name = "Zach Mitchell"; email = "zmitchell@fastmail.com"; @@ -22108,12 +23187,6 @@ githubId = 51886259; name = "Zokre Zyl"; }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; @@ -22155,12 +23228,6 @@ 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"; diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh new file mode 100755 index 0000000000000..e7ffe2bf4c73d --- /dev/null +++ b/maintainers/scripts/check-cherry-picks.sh @@ -0,0 +1,97 @@ +#!/usr/bin/env bash +# Find alleged cherry-picks + +set -e + +if [ $# != "2" ] ; then + echo "usage: check-cherry-picks.sh base_rev head_rev" + exit 2 +fi + +PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??} +problem=0 + +while read new_commit_sha ; do + if [ -z "$new_commit_sha" ] ; then + continue # skip empty lines + fi + if [ "$GITHUB_ACTIONS" = 'true' ] ; then + echo "::group::Commit $new_commit_sha" + else + echo "=================================================" + fi + git rev-list --max-count=1 --format=medium "$new_commit_sha" + echo "-------------------------------------------------" + + original_commit_sha=$( + git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \ + | grep -Ei -m1 "cherry.*[0-9a-f]{40}" \ + | grep -Eoi -m1 '[0-9a-f]{40}' + ) + if [ "$?" != "0" ] ; then + echo " ? Couldn't locate original commit hash in message" + [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup:: + continue + fi + + set -f # prevent pathname expansion of patterns + for branch_pattern in $PICKABLE_BRANCHES ; do + set +f # re-enable pathname expansion + + while read -r picked_branch ; do + if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then + echo " ✔ $original_commit_sha present in branch $picked_branch" + + range_diff_common='git range-diff + --no-notes + --creation-factor=100 + '"$original_commit_sha~..$original_commit_sha"' + '"$new_commit_sha~..$new_commit_sha"' + ' + + if $range_diff_common --no-color | grep -E '^ {4}[+-]{2}' > /dev/null ; then + if [ "$GITHUB_ACTIONS" = 'true' ] ; then + echo ::endgroup:: + echo -n "::warning ::" + else + echo -n " ⚠ " + fi + echo "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:" + + $range_diff_common --color + + echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \ + "be drawn to it and github actions have no way of doing that but to raise a 'failure'" + problem=1 + else + echo " ✔ $original_commit_sha highly similar to $new_commit_sha" + $range_diff_common --color + [ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup:: + fi + + # move on to next commit + continue 3 + fi + done <<< "$( + git for-each-ref \ + --format="%(refname)" \ + "refs/remotes/origin/$branch_pattern" + )" + done + + if [ "$GITHUB_ACTIONS" = 'true' ] ; then + echo ::endgroup:: + echo -n "::error ::" + else + echo -n " ✘ " + fi + echo "$original_commit_sha not found in any pickable branch" + + problem=1 +done <<< "$( + git rev-list \ + -E -i --grep="cherry.*[0-9a-f]{40}" --reverse \ + "$1..$2" +)" + +exit $problem diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 10acfe3284470..fb830981683f3 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -5,7 +5,7 @@ let trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); - rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; + rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ]; # Add the ‘recurseForDerivations’ attribute to ensure that # nix-instantiate recurses into nested attribute sets. diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py index f3943338b57fb..3ec1411986c85 100755 --- a/maintainers/scripts/kde/collect-missing-deps.py +++ b/maintainers/scripts/kde/collect-missing-deps.py @@ -28,6 +28,7 @@ OK_MISSING_BY_PACKAGE = { "discover": { "rpm-ostree-1", # we don't have rpm-ostree (duh) "Snapd", # we don't have snaps and probably never will + "packagekitqt6", # intentionally disabled }, "elisa": { "UPNPQT", # upstream says it's broken @@ -36,6 +37,9 @@ OK_MISSING_BY_PACKAGE = { "Sphinx", # only used for docs, bloats closure size "QCollectionGenerator" }, + "gwenview": { + "Tiff", # duplicate? + }, "kio-extras-kf5": { "KDSoapWSDiscoveryClient", # actually vendored on KF5 version }, @@ -76,6 +80,11 @@ OK_MISSING_BY_PACKAGE = { "plasma-desktop": { "scim", # upstream is dead, not packaged in Nixpkgs }, + "poppler-qt6": { + "gobject-introspection-1.0", # we don't actually want to build the GTK variant + "gdk-pixbuf-2.0", + "gtk+-3.0", + }, "powerdevil": { "DDCUtil", # cursed, intentionally disabled }, @@ -83,6 +92,9 @@ OK_MISSING_BY_PACKAGE = { "Qt6Qml", # tests only "Qt6Quick", }, + "skladnik": { + "POVRay", # too expensive to rerender all the assets + }, "syntax-highlighting": { "XercesC", # only used for extra validation at build time } diff --git a/maintainers/scripts/kde/utils.py b/maintainers/scripts/kde/utils.py index 7a82c4955c6b4..b3a00093d7038 100644 --- a/maintainers/scripts/kde/utils.py +++ b/maintainers/scripts/kde/utils.py @@ -122,10 +122,7 @@ class KDERepoMetadata: dep_graph={}, ) - dep_specs = [ - "dependency-data-common", - "dependency-data-kf6-qt6" - ] + dep_specs = ["dependency-data-stable-kf6-qt6"] dep_graph = collections.defaultdict(set) for spec in dep_specs: diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fd6c59c0b46fc..4097a4c688820 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,26 +1,29 @@ -name,src,ref,server,version,luaversion,maintainers +name,rockspec,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat busted,,,,,, -cassowary,,,,,,marsam alerque +cassowary,,,,,,alerque cldr,,,,,,alerque compat53,,,,,,vcunat -cosmo,,,,,,marsam +commons.nvim,,,,,,mrcjkb +cosmo,,,,,, coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -digestif,https://github.com/astoff/digestif.git,,,,5.3, +digestif,,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 fidget.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque +funnyfiles.nvim,,,,,,mrcjkb +fzf-lua,,,,,,mrcjkb fzy,,,,,,mrcjkb -gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, -haskell-tools.nvim,,,,,, +gitsigns.nvim,https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec,,,,5.1, +haskell-tools.nvim,,,,,,mrcjkb http,,,,0.3-0,,vcunat image.nvim,,,,,,teto inspect,,,,,, @@ -28,7 +31,7 @@ jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, ldoc,,,,,, lgi,,,,,, -linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, +linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,, ljsyscall,,,,,5.1,lblasc lmathx,,,,,5.3,alexshpilkin lmpfrlib,,,,,5.3,alexshpilkin @@ -51,13 +54,13 @@ 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-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/main/lua-rtoml-0.2-0.rockspec,,,,,lblasc +lua-subprocess,https://raw.githubusercontent.com/0x0ade/lua-subprocess/master/subprocess-scm-1.rockspec,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, lua-zlib,,,,,,koral lua_cliargs,,,,,, -luabitop,https://github.com/teto/luabitop.git,,,,, +luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,, luacheck,,,,,, luacov,,,,,, luadbi,,,,,, @@ -73,23 +76,28 @@ lualdap,,,,,,aanderse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc +luaprompt,,,,,,Freed-Wu luarepl,,,,,, +luarocks,,,,,,mrcjkb teto luarocks-build-rust-mlua,,,,,,mrcjkb +luarocks-build-treesitter-parser,,,,,,mrcjkb luasec,,,,,,flosse luasnip,,,,,, luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, +luatext,,,,,, luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, +lua-utils.nvim,,,,,,mrcjkb lua-yajl,,,,,,pstn lua-iconv,,,,7.0.0,, luuid,,,,20120509-2,, luv,,,,1.44.2-1,, -lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto +lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc magick,,,,,5.1,donovanglover markdown,,,,,, @@ -97,21 +105,28 @@ mediator_lua,,,,,, middleclass,,,,,, mimetypes,,,,,, mpack,,,,,, -moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn +neotest,,,,,,mrcjkb nlua,,,,,,teto nui.nvim,,,,,,mrcjkb -nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, +nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,, nvim-nio,,,,,,mrcjkb -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,,,,, -rocks.nvim,,,,,5.1,teto mrcjkb +pathlib.nvim,,,,,, +penlight,,,,,,alerque +plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plenary.nvim-scm-1.rockspec,,,,5.1, +psl,,,,0.3,, +rapidjson,,,,,, rest.nvim,,,,,5.1,teto +rocks.nvim,,,,,,mrcjkb +rocks-git.nvim,,,,,,mrcjkb +rocks-config.nvim,,,,,,mrcjkb +rocks-dev.nvim,,,,,,mrcjkb +rtp.nvim,,,,,,mrcjkb rustaceanvim,,,,,,mrcjkb -say,https://github.com/Olivine-Labs/say.git,,,,, +say,,,,,, serpent,,,,,,lockejan sqlite,,,,,, -std._debug,https://github.com/lua-stdlib/_debug.git,,,,, +std._debug,,,,,, std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, @@ -121,6 +136,7 @@ tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb -vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, +tree-sitter-norg,,,,,5.1,mrcjkb +vstruct,,,,,, vusted,,,,,,figsoda xml2lua,,,,,,teto diff --git a/maintainers/scripts/mdize-module.sh b/maintainers/scripts/mdize-module.sh deleted file mode 100755 index e2d2e5467aa98..0000000000000 --- a/maintainers/scripts/mdize-module.sh +++ /dev/null @@ -1,83 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=. -i bash -p delta jq perl - -set -euo pipefail -shopt -s inherit_errexit - -cat <<'EOF' -This script attempts to automatically convert option descriptions from -DocBook syntax to markdown. Naturally this process is incomplete and -imperfect, so any changes generated by this script MUST be reviewed. - -Possible problems include: incorrectly replaced tags, badly formatted -markdown, DocBook tags this script doesn't recognize remaining in the -output and crashing the docs build, incorrect escaping of markdown -metacharacters, incorrect unescaping of XML entities—and the list goes on. - -Always review the generated changes! - -Some known limitations: - - Does not transform literalDocBook items - - Replacements can occur in non-option code, such as string literals - - -EOF - - - -build-options-json() { - nix-build --no-out-link --expr ' - let - sys = import ./nixos/default.nix { - configuration = {}; - }; - in - [ - sys.config.system.build.manual.optionsJSON - ] - ' -} - - - -git diff --quiet || { - echo "Worktree is dirty. Please stash or commit first." - exit 1 -} - -echo "Building options.json ..." -old_options=$(build-options-json) - -echo "Applying replacements ..." -perl -pi -e ' - BEGIN { - undef $/; - } - - s,<literal>([^`]*?)</literal>,`$1`,smg; - s,<replaceable>([^»]*?)</replaceable>,«$1»,smg; - s,<filename>([^`]*?)</filename>,{file}`$1`,smg; - s,<option>([^`]*?)</option>,{option}`$1`,smg; - s,<code>([^`]*?)</code>,`$1`,smg; - s,<command>([^`]*?)</command>,{command}`$1`,smg; - s,<link xlink:href="(.+?)" ?/>,<$1>,smg; - s,<link xlink:href="(.+?)">(.*?)</link>,[$2]($1),smg; - s,<package>([^`]*?)</package>,`$1`,smg; - s,<emphasis>([^*]*?)</emphasis>,*$1*,smg; - s,<citerefentry>\s* - <refentrytitle>\s*(.*?)\s*</refentrytitle>\s* - <manvolnum>\s*(.*?)\s*</manvolnum>\s* - </citerefentry>,{manpage}`$1($2)`,smgx; - s,^( +description =),\1 lib.mdDoc,smg; -' "$@" - -echo "Building options.json again ..." -new_options=$(build-options-json) - - -! cmp -s {$old_options,$new_options}/share/doc/nixos/options.json && { - diff -U10 \ - <(jq . <$old_options/share/doc/nixos/options.json) \ - <(jq . <$new_options/share/doc/nixos/options.json) \ - | delta -} diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index b400ce034b3e0..979ec286d8090 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -1,18 +1,22 @@ { stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { - name = "nixpkgs-lint-1"; + pname = "nixpkgs-lint"; + version = "1"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl perlPackages.XMLSimple ]; dontUnpack = true; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p $out/bin cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint + # make the built version hermetic + substituteInPlace $out/bin/nixpkgs-lint \ + --replace-fail "#! /usr/bin/env nix-shell" "#! ${lib.getExe perl}" wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB ''; diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 056abda85bfd7..8ae86e2e93a49 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,7 +1,7 @@ # 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 +# - pkgs/development/lua-modules/updater/updater.py # format: # $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py @@ -108,7 +108,7 @@ class Repo: @property def name(self): - return self.uri.split("/")[-1] + return self.uri.strip("/").split("/")[-1] @property def branch(self): diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 60c5c7dadf55a..2bc124d6066a9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -32,7 +32,6 @@ with lib.maintainers; { acme = { members = [ aanderse - andrew-d arianvp emily flokli @@ -46,7 +45,6 @@ with lib.maintainers; { bazel = { members = [ mboes - marsam uri-canva cbley olebedev @@ -99,7 +97,6 @@ with lib.maintainers; { budgie = { members = [ bobby285271 - federicoschonborn ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; @@ -146,6 +143,15 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + cloudposse = { + members = [ + dudymas + ]; + scope = "Maintain atmos and applications made by the Cloud Posse team."; + shortName = "CloudPosse"; + enableFeatureFreezePing = true; + }; + coq = { members = [ cohencyril @@ -230,7 +236,6 @@ with lib.maintainers; { members = [ cole-h grahamc - hoverbear ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; @@ -256,9 +261,9 @@ with lib.maintainers; { }; docs = { - members = [ - asymmetric - ryantm + members = [ ]; + githubTeams = [ + "documentation-team" ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; shortName = "Docs"; @@ -339,6 +344,16 @@ with lib.maintainers; { shortName = "freedesktop.org packaging"; }; + fslabs = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + greaka + lpostula + ]; + scope = "Group registration for packages maintained by Foresight Spatial Labs."; + shortName = "Foresight Spatial Labs employees"; + }; + gcc = { members = [ synthetica @@ -352,6 +367,7 @@ with lib.maintainers; { geospatial = { members = [ imincik + l0b0 nh2 nialov sikmir @@ -371,7 +387,6 @@ with lib.maintainers; { krav talyz yayayayaka - yuka ]; scope = "Maintain gitlab packages."; shortName = "gitlab"; @@ -399,7 +414,6 @@ with lib.maintainers; { hedning jtojnar dasj19 - amaxine ]; githubTeams = [ "gnome" @@ -414,7 +428,6 @@ with lib.maintainers; { bandresen hlolli glittershark - babariviere ericdallo thiagokokada ]; @@ -442,6 +455,7 @@ with lib.maintainers; { # Verify additions to this team with at least one already existing member of the team. members = [ das_j + conni2461 ]; scope = "Group registration for packages maintained by Helsinki Systems"; shortName = "Helsinki Systems employees"; @@ -457,6 +471,14 @@ with lib.maintainers; { shortName = "Home Assistant"; }; + infisical = { + members = [ + akhilmhdh + ]; + scope = "Maintain Infisical"; + shortName = "Infisical"; + }; + iog = { members = [ cleverca22 @@ -475,6 +497,7 @@ with lib.maintainers; { ryantm lassulus yayayayaka + asymmetric ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; @@ -507,6 +530,7 @@ with lib.maintainers; { cpages dschrempf edwtjo + kazenyuk minijackson peterhoeg sephalon @@ -519,7 +543,6 @@ with lib.maintainers; { members = [ aanderse edwtjo - MP2E thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; @@ -563,6 +586,9 @@ with lib.maintainers; { rrbutani sternenseemann ]; + githubTeams = [ + "llvm" + ]; scope = "Maintain LLVM package sets and related packages"; shortName = "LLVM"; enableFeatureFreezePing = true; @@ -662,6 +688,7 @@ with lib.maintainers; { dandellion sumnerevans nickcao + teutat3s ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; shortName = "Matrix"; @@ -708,6 +735,16 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + lix = { + members = [ + raitobezarius + qyriad + ]; + scope = "Maintain the Lix package manager inside of Nixpkgs."; + shortName = "Lix ecosystem"; + enableFeatureFreezePing = true; + }; + module-system = { members = [ infinisil @@ -721,7 +758,6 @@ with lib.maintainers; { node = { members = [ lilyinstarlight - marsam winter ]; scope = "Maintain Node.js runtimes and build tooling."; @@ -787,6 +823,7 @@ with lib.maintainers; { aanderse drupol ma27 + patka talyz ]; githubTeams = [ @@ -819,7 +856,6 @@ with lib.maintainers; { python = { members = [ - fridh hexa jonringer tjni @@ -849,8 +885,10 @@ with lib.maintainers; { r = { members = [ + b-rodrigues bcdarwin jbedo + kupac ]; scope = "Maintain the R programming language and related packages."; shortName = "R"; @@ -891,7 +929,6 @@ with lib.maintainers; { ruby = { members = [ - marsam ]; scope = "Maintain the Ruby interpreter and related packages."; shortName = "Ruby"; @@ -925,6 +962,12 @@ with lib.maintainers; { shortName = "SageMath"; }; + sdl = { + members = [ ]; + scope = "Maintain SDL libraries."; + shortName = "SDL"; + }; + sphinx = { members = [ ]; scope = "Maintain Sphinx related packages."; |