diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 246 | ||||
-rw-r--r-- | maintainers/scripts/README.md | 4 | ||||
l--------- | maintainers/scripts/check-by-name.sh | 1 | ||||
-rwxr-xr-x | maintainers/scripts/doc/list-systemd-manpages.zsh | 33 | ||||
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 3 | ||||
-rw-r--r-- | maintainers/team-list.nix | 14 |
6 files changed, 280 insertions, 21 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 694160be6612d..e33a6077f44e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -388,6 +388,12 @@ fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; }]; }; + adam248 = { + email = "adamjbutler091@gmail.com"; + github = "adam248"; + githubId = 85082674; + name = "Adam J. Butler"; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -605,6 +611,12 @@ githubId = 4717906; name = "Jakub Skokan"; }; + ajaxbits = { + email = "contact@ajaxbits.com"; + github = "ajaxbits"; + githubId = 45179933; + name = "Alex Jackson"; + }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; @@ -699,6 +711,15 @@ githubId = 20405311; name = "Aksh Gupta"; }; + al3xtjames = { + email = "nix@alextjam.es"; + github = "al3xtjames"; + githubId = 5672538; + name = "Alex James"; + keys = [{ + fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; + }]; + }; alanpearce = { email = "alan@alanpearce.eu"; github = "alanpearce"; @@ -1269,9 +1290,11 @@ githubId = 6060545; matrix = "@anpin:matrix.org"; name = "Pavel Anpin"; - keys = [{ - fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; - }]; + keys = [ + { fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; } + # compare with https://keybase.io/anpin/pgp_keys.asc + { fingerprint = "DADF F3EA 06DC 8C1B 100A 24DB 312E 8F17 91C5 DA8C"; } + ]; }; anpryl = { email = "anpryl@gmail.com"; @@ -2040,6 +2063,12 @@ githubId = 80325; name = "Benjamin Andresen"; }; + barab-i = { + email = "barab_i@outlook.com"; + github = "barab-i"; + githubId = 92919899; + name = "Barab I"; + }; baracoder = { email = "baracoder@googlemail.com"; github = "baracoder"; @@ -2609,6 +2638,12 @@ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; + br337 = { + email = "brian.porumb@proton.me"; + github = "br337"; + githubId = 49288125; + name = "Brian Porumb"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -2716,6 +2751,12 @@ githubId = 53131727; name = "Bryan Albuquerque"; }; + bryango = { + name = "Bryan Lai"; + email = "bryanlais@gmail.com"; + github = "bryango"; + githubId = 26322692; + }; bryanhonof = { name = "Bryan Honof"; email = "bryanhonof@gmail.com"; @@ -3737,6 +3778,12 @@ githubId = 1740337; name = "Chris Ostrouchov"; }; + cottand = { + email = "nico@dcotta.eu"; + github = "cottand"; + githubId = 45274424; + name = "Nico D'Cotta"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -4156,6 +4203,15 @@ githubId = 118536343; name = "David Hamelin"; }; + david-r-cox = { + email = "david@integrated-reasoning.com"; + github = "david-r-cox"; + githubId = 4259949; + name = "David Cox"; + keys = [{ + fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; + }]; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; @@ -4228,6 +4284,12 @@ fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; }]; }; + dblsaiko = { + email = "me@dblsaiko.net"; + github = "2xsaiko"; + githubId = 3987560; + name = "Marco Rebhan"; + }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; @@ -5371,6 +5433,13 @@ githubId = 231483; name = "Jack Kelly"; }; + endle = { + email = "lizhenbo@yahoo.com"; + github = "Endle"; + githubId = 3221521; + name = "Zhenbo Li"; + matrix = "@zhenbo:matrix.org"; + }; endocrimes = { email = "dani@builds.terrible.systems"; github = "endocrimes"; @@ -5610,6 +5679,12 @@ githubId = 2147649; name = "Euan Kemp"; }; + eureka-cpu = { + email = "github.eureka@gmail.com"; + github = "eureka-cpu"; + githubId = 57543709; + name = "Chris O'Brien"; + }; evalexpr = { name = "Jonathan Wilkins"; email = "nixos@wilkins.tech"; @@ -5676,6 +5751,12 @@ githubId = 454695; name = "Artur Taranchiev"; }; + ewuuwe = { + email = "ewu.uweq@pm.me"; + github = "ewuuwe"; + githubId = 63652646; + name = "Xaver Oswald"; + }; exarkun = { email = "exarkun@twistedmatrix.com"; github = "exarkun"; @@ -5729,6 +5810,12 @@ githubId = 25955146; name = "eyJhb"; }; + eymeric = { + name = "Eymeric Dechelette"; + email = "hatchchcien@protonmail.com"; + github = "hatch01"; + githubId = 42416805; + }; f2k1de = { name = "f2k1de"; email = "hi@f2k1.de"; @@ -6738,8 +6825,6 @@ }; gm6k = { email = "nix@quidecco.pl"; - github = "zeuner"; - githubId = 2545850; name = "Isidor Zeuner"; }; gmemstr = { @@ -8156,12 +8241,6 @@ githubId = 1358764; name = "Jamie Magee"; }; - jammerful = { - email = "jammerful@gmail.com"; - github = "jammerful"; - githubId = 20176306; - name = "jammerful"; - }; janik = { name = "Janik"; email = "janik@aq0.de"; @@ -8840,6 +8919,12 @@ githubId = 6321578; name = "John Rinehart"; }; + john-rodewald = { + email = "jnrodewald99@gmail.com"; + github = "john-rodewald"; + githubId = 51028009; + name = "John Rodewald"; + }; john-shaffer = { email = "jdsha@proton.me"; github = "john-shaffer"; @@ -9016,6 +9101,12 @@ githubId = 752510; name = "Martin Potier"; }; + jpts = { + email = "james+nixpkgs@cleverley-prance.uk"; + github = "jpts"; + githubId = 5352661; + name = "James Cleverley-Prance"; + }; jqqqqqqqqqq = { email = "jqqqqqqqqqq@gmail.com"; github = "jqqqqqqqqqq"; @@ -9372,6 +9463,7 @@ katexochen = { github = "katexochen"; githubId = 49727155; + matrix = "@katexochen:matrix.org"; name = "Paul Meyer"; }; kayhide = { @@ -10701,6 +10793,16 @@ githubId = 8555953; name = "Laure Tavard"; }; + ltstf1re = { + email = "ltstf1re@disroot.org"; + github = "lsf1re"; + githubId = 153414530; + matrix = "@ltstf1re:converser.eu"; + name = "Little Starfire"; + keys = [{ + fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; + }]; + }; lu15w1r7h = { email = "lwirth2000@gmail.com"; github = "LU15W1R7H"; @@ -10866,6 +10968,12 @@ githubId = 2486026; name = "Luca Fulchir"; }; + luleyleo = { + email = "git@leopoldluley.de"; + github = "luleyleo"; + githubId = 10746692; + name = "Leopold Luley"; + }; lumi = { email = "lumi@pew.im"; github = "lumi-me-not"; @@ -10963,9 +11071,6 @@ github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; - keys = [{ - fingerprint = "62B9 9C26 F046 721E 26B0 04F6 D006 A998 C6AB FDF1"; - }]; }; ma9e = { email = "sean@lfo.team"; @@ -11215,6 +11320,12 @@ github = "marius851000"; githubId = 22586596; }; + mariuskimmina = { + email = "mar.kimmina@gmail.com"; + name = "Marius Kimmina"; + github = "mariuskimmina"; + githubId = 38843153; + }; markbeep = { email = "mrkswrn@gmail.com"; github = "markbeep"; @@ -11307,6 +11418,12 @@ githubId = 585424; name = "Massimo Gengarelli"; }; + matdibu = { + email = "contact@mateidibu.dev"; + github = "matdibu"; + githubId = 24750154; + name = "Matei Dibu"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -13096,6 +13213,15 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nicolas-goudry = { + email = "goudry.nicolas@gmail.com"; + github = "nicolas-goudry"; + githubId = 8753998; + name = "Nicolas Goudry"; + keys = [{ + fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; + }]; + }; nicoo = { email = "nicoo@debian.org"; github = "nbraud"; @@ -13138,6 +13264,13 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + niklaskorz = { + name = "Niklas Korz"; + email = "niklas@niklaskorz.de"; + matrix = "@niklaskorz:korz.dev"; + github = "niklaskorz"; + githubId = 590517; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; @@ -13443,6 +13576,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + nudelsalat = { + email = "nudelsalat@clouz.de"; + name = "Fabian Dreßler"; + github = "Noodlesalat"; + githubId = 12748782; + }; nukaduka = { email = "ksgokte@gmail.com"; github = "NukaDuka"; @@ -13481,7 +13620,8 @@ name = "Nathan Viets"; }; nyanbinary = { - email = "vextium@skiff.com"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; github = "nyabinary"; githubId = 97130632; name = "Niko"; @@ -13881,6 +14021,12 @@ github = "p3psi-boo"; githubId = 43925055; }; + pabloaul = { + email = "contact@nojus.org"; + github = "pabloaul"; + githubId = 35423980; + name = "Nojus Dulskis"; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "Pablo1107"; @@ -14036,6 +14182,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + paulsmith = { + email = "paulsmith@pobox.com"; + github = "paulsmith"; + name = "Paul Smith"; + githubId = 1210; + }; paumr = { github = "paumr"; name = "Michael Bergmeister"; @@ -15902,6 +16054,15 @@ github = "rumpelsepp"; githubId = 1961699; }; + running-grass = { + name = "Leo Liu"; + email = "hi@grass.show"; + github = "running-grass"; + githubId = 17241154; + keys = [{ + fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; + }]; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -16835,6 +16996,11 @@ githubId = 50401154; name = "Simone Ruffini"; }; + simonhammes = { + github = "simonhammes"; + githubId = 10352679; + name = "Simon Hammes"; + }; simonkampe = { email = "simon.kampe+nix@gmail.com"; github = "simonkampe"; @@ -16910,6 +17076,12 @@ githubId = 8017899; name = "Sivaram Balakrishnan"; }; + sixstring982 = { + email = "sixstring982@gmail.com"; + github = "sixstring982"; + githubId = 1328977; + name = "Trent Small"; + }; sjagoe = { email = "simon@simonjagoe.com"; github = "sjagoe"; @@ -17024,6 +17196,12 @@ fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; }]; }; + smrehman = { + name = "Syed Moiz Ur Rehman"; + email = "smrehman@proton.me"; + github = "syedmoizurrehman"; + githubId = 17818950; + }; sna = { email = "abouzahra.9@wright.edu"; github = "S-NA"; @@ -17144,6 +17322,13 @@ githubId = 151924; name = "John Anderson"; }; + soopyc = { + name = "Cassie Cheung"; + email = "me@soopy.moe"; + github = "soopyc"; + githubId = 13762043; + matrix = "@sophie:nue.soopy.moe"; + }; sophrosyne = { email = "joshuaortiz@tutanota.com"; github = "sophrosyne97"; @@ -18411,6 +18596,11 @@ github = "NoneTirex"; githubId = 26038207; }; + tirimia = { + name = "Theodor-Alexandru Irimia"; + github = "tirimia"; + githubId = 11174371; + }; titanous = { email = "jonathan@titanous.com"; github = "titanous"; @@ -18554,8 +18744,6 @@ }; tomkoid = { email = "tomaszierl@outlook.com"; - github = "Tomkoid"; - githubId = 67477750; name = "Tomkoid"; }; tomodachi94 = { @@ -18849,6 +19037,13 @@ matrix = "@ty:tjll.net"; name = "Tyler Langlois"; }; + tylervick = { + email = "nix@tylervick.com"; + github = "tylervick"; + githubId = 1395852; + name = "Tyler Vick"; + matrix = "@tylervick:matrix.org"; + }; tymscar = { email = "oscar@tymscar.com"; github = "tymscar"; @@ -18869,7 +19064,7 @@ }; uakci = { name = "uakci"; - email = "uakci@uakci.pl"; + email = "git@uakci.space"; github = "uakci"; githubId = 6961268; }; @@ -19396,6 +19591,12 @@ githubId = 3413119; name = "Vonfry"; }; + vonixxx = { + email = "vonixxx@tuta.io"; + github = "vonixxx"; + githubId = 144771550; + name = "Luca Uricariu"; + }; votava = { email = "votava@gmail.com"; github = "janvotava"; @@ -20406,6 +20607,15 @@ githubId = 1557253; name = "Lennart Eichhorn"; }; + zedseven = { + name = "Zacchary Dempsey-Plante"; + email = "zacc@ztdp.ca"; + github = "zedseven"; + githubId = 25164338; + keys = [{ + fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; + }]; + }; zendo = { name = "zendo"; email = "linzway@qq.com"; diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 2b99a4e751141..f8fc7aff955d3 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -9,6 +9,10 @@ What follows is a (very incomplete) overview of available scripts. ## Metadata +### `check-by-name.sh` + +An alias for `pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh`, see [documentation](../../pkgs/test/nixpkgs-check-by-name/scripts/README.md). + ### `get-maintainer.sh` `get-maintainer.sh [selector] value` returns a JSON object describing diff --git a/maintainers/scripts/check-by-name.sh b/maintainers/scripts/check-by-name.sh new file mode 120000 index 0000000000000..545dbedf0a317 --- /dev/null +++ b/maintainers/scripts/check-by-name.sh @@ -0,0 +1 @@ +../../pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh \ No newline at end of file diff --git a/maintainers/scripts/doc/list-systemd-manpages.zsh b/maintainers/scripts/doc/list-systemd-manpages.zsh new file mode 100755 index 0000000000000..6737a4d3fef19 --- /dev/null +++ b/maintainers/scripts/doc/list-systemd-manpages.zsh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i zsh -p zsh +set -euo pipefail + +# cd into nixpkgs' root, get the store path of `systemd.man` +cd "$(dirname "$0")/../../.." +SYSTEMD_MAN_DIR="$(nix-build -A systemd.man)/share/man" + +# For each manual section +for section in {1..8}; do + sec_dir="${SYSTEMD_MAN_DIR}/man${section}" + + # skip section 3 (library calls) + ! [[ $section -eq 3 ]] || continue + + # for each manpage in that section (potentially none) + for manpage in ${sec_dir}/*(N); do + # strip the directory prefix and (compressed) manpage suffix + page="$(basename "$manpage" ".${section}.gz")" + + # if this is the manpage of a service unit + if [[ "$page" =~ ".*\.service" ]]; then + # ... and a manpage exists without the `.service` suffix + potential_alias="${sec_dir}/${page%\.service}.${section}.gz" + ! [[ -e "${potential_alias}" && + # ... which points to the same file, then skip + "$(gunzip -c "${potential_alias}")" == ".so ${page}.${section}" ]] || continue + fi + + # else produce a JSON fragment, with the link to the upstream manpage (as HTML) + echo " \"${page}(${section})\": \"https://www.freedesktop.org/software/systemd/man/${page}.html\"," + done +done diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1a581a450c260..6a70792bf02c9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -21,6 +21,7 @@ fzy,,,,,,mrcjkb gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat +image.nvim,,,,,,teto inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, @@ -95,8 +96,8 @@ mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +nlua,,,,,,teto 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, diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9885c9cfcf999..35aba906cffed 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -290,6 +290,7 @@ with lib.maintainers; { members = [ theuni dpausp + frlan leona ]; scope = "Team for Flying Circus employees who collectively maintain packages."; @@ -318,6 +319,7 @@ with lib.maintainers; { imincik nh2 nialov + r-burns sikmir willcohen ]; @@ -402,6 +404,16 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + helsinki-systems = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + ajs124 + das_j + ]; + scope = "Group registration for packages maintained by Helsinki Systems"; + shortName = "Helsinki Systems employees"; + }; + home-assistant = { members = [ fab @@ -512,7 +524,6 @@ with lib.maintainers; { dtzWill ericson2314 lovek323 - primeos qyliss raitobezarius rrbutani @@ -755,7 +766,6 @@ with lib.maintainers; { podman = { members = [ - adisbladis saschagrunert vdemeester ]; |