diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-06 00:11:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-06 00:11:55 +0000 |
commit | 6a7b8348a1d7d9ea8b62dfcf98e205088a97ef1a (patch) | |
tree | 4ed0d5350aaddbebb24248e45f2a8c29206b1c99 /maintainers | |
parent | 391e94a986322a002a084574ccf2fd73814872b1 (diff) | |
parent | 96e569cb29daa8dbcec62d4c6f947d40fd4a8a76 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 23 | ||||
-rw-r--r-- | maintainers/scripts/update.py | 2 | ||||
-rw-r--r-- | maintainers/team-list.nix | 21 |
3 files changed, 39 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index effcb8e3c955a..093755a13e8f9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2409,12 +2409,6 @@ githubId = 91694; name = "Javier Candeira"; }; - candyc1oud = { - email = "candyc1oud@outlook.com"; - github = "candyc1oud"; - githubId = 113157395; - name = "Candy Cloud"; - }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; @@ -3395,6 +3389,11 @@ githubId = 1298344; name = "Daniel Fullmer"; }; + dansbandit = { + github = "dansbandit"; + githubId = 4530687; + name = "dansbandit"; + }; danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; @@ -6986,6 +6985,12 @@ githubId = 17029738; name = "Jean-Charles Quillet"; }; + jedsek = { + email = "jedsek@qq.com"; + github = "jedsek"; + githubId = 63626406; + name = "Jedsek"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; @@ -8188,6 +8193,12 @@ github = "konradmalik"; githubId = 13033392; }; + konst-aa = { + email = "konstantin.astafurov@gmail.com"; + github = "konst-aa"; + githubId = 40547702; + name = "Konstantin Astafurov"; + }; koozz = { email = "koozz@linux.com"; github = "koozz"; diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 7ae08958a1646..bbed2bda5e03f 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -100,7 +100,7 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra # Git can only handle a single index operation at a time async with merge_lock: await check_subprocess('git', 'add', *change['files'], cwd=worktree) - commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + commit_message = '{attrPath}: {oldVersion} -> {newVersion}'.format(**change) if 'commitMessage' in change: commit_message = change['commitMessage'] elif 'commitBody' in change: diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 31a296790181d..9c2f4680d89c8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -294,6 +294,9 @@ with lib.maintainers; { zowoq qbit ]; + githubTeams = [ + "golang" + ]; scope = "Maintain Golang compilers."; shortName = "Go"; enableFeatureFreezePing = true; @@ -423,6 +426,21 @@ with lib.maintainers; { shortName = "Linux Kernel"; }; + lisp = { + members = [ + raskin + lukego + nagy + uthar + ]; + githubTeams = [ + "lisp" + ]; + scope = "Maintain the Lisp ecosystem."; + shortName = "lisp"; + enableFeatureFreezePing = true; + }; + llvm = { members = [ dtzWill @@ -723,6 +741,9 @@ with lib.maintainers; { winter zowoq ]; + githubTeams = [ + "rust" + ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; shortName = "Rust"; enableFeatureFreezePing = true; |