diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 153 | ||||
-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 | 2 | ||||
-rw-r--r-- | maintainers/team-list.nix | 13 |
6 files changed, 198 insertions, 8 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dd95159b17ea8..4d25885ed7324 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -605,6 +605,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"; @@ -2716,6 +2722,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 +3749,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"; @@ -4228,6 +4246,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 +5395,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 +5641,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 +5713,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 +5772,12 @@ githubId = 25955146; name = "eyJhb"; }; + eymeric = { + name = "Eymeric Dechelette"; + email = "hatchchcien@protonmail.com"; + github = "hatch01"; + githubId = 42416805; + }; f2k1de = { name = "f2k1de"; email = "hi@f2k1.de"; @@ -8154,12 +8203,6 @@ githubId = 1358764; name = "Jamie Magee"; }; - jammerful = { - email = "jammerful@gmail.com"; - github = "jammerful"; - githubId = 20176306; - name = "jammerful"; - }; janik = { name = "Janik"; email = "janik@aq0.de"; @@ -8832,6 +8875,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"; @@ -9008,6 +9057,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"; @@ -9364,6 +9419,7 @@ katexochen = { github = "katexochen"; githubId = 49727155; + matrix = "@katexochen:matrix.org"; name = "Paul Meyer"; }; kayhide = { @@ -10693,6 +10749,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"; @@ -11207,6 +11273,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"; @@ -11299,6 +11371,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"; @@ -13088,6 +13166,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"; @@ -13473,7 +13560,8 @@ name = "Nathan Viets"; }; nyanbinary = { - email = "vextium@skiff.com"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; github = "nyabinary"; githubId = 97130632; name = "Niko"; @@ -14674,6 +14762,11 @@ githubId = 146413; name = "Tobias Poschwatta"; }; + poweredbypie = { + name = "poweredbypie"; + github = "poweredbypie"; + githubId = 67135060; + }; PowerUser64 = { email = "blakelysnorth@gmail.com"; github = "PowerUser64"; @@ -15895,6 +15988,15 @@ github = "rumpelsepp"; githubId = 1961699; }; + running-grass = { + name = "Leo Liu"; + email = "467195537@qq.com"; + github = "running-grass"; + githubId = 17241154; + keys = [{ + fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; + }]; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -16289,6 +16391,11 @@ githubId = 5104601; name = "schnusch"; }; + Schweber = { + github = "Schweber"; + githubId = 64630479; + name = "Schweber"; + }; sciencentistguy = { email = "jamie@quigley.xyz"; name = "Jamie Quigley"; @@ -16898,6 +17005,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"; @@ -18399,6 +18512,11 @@ github = "NoneTirex"; githubId = 26038207; }; + tirimia = { + name = "Theodor-Alexandru Irimia"; + github = "tirimia"; + githubId = 11174371; + }; titanous = { email = "jonathan@titanous.com"; github = "titanous"; @@ -18577,6 +18695,12 @@ githubId = 1486805; name = "Toon Nolten"; }; + tornax = { + email = "tornax@pm.me"; + github = "TornaxO7"; + githubId = 50843046; + name = "tornax"; + }; toschmidt = { email = "tobias.schmidt@in.tum.de"; github = "toschmidt"; @@ -19376,6 +19500,12 @@ githubId = 3413119; name = "Vonfry"; }; + vonixxx = { + email = "vonixxx@tuta.io"; + github = "vonixxx"; + githubId = 144771550; + name = "Luca Uricariu"; + }; votava = { email = "votava@gmail.com"; github = "janvotava"; @@ -20386,6 +20516,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..32530d3ea3cd1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -95,8 +95,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 b872142c313c6..c80055f254fe0 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 @@ -429,6 +441,7 @@ with lib.maintainers; { cleeyv ryantm lassulus + yayayayaka ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; |