diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-13 06:01:45 +0000 |
commit | 49523dec152f68f48ee65b5612d6b6df035f1ecf (patch) | |
tree | ffa8eb3b1d6b4bb454dea8ef2a04a078d530bcdb /maintainers | |
parent | 183df628daa5a3cd433490fbb3e6bcafc814ef26 (diff) | |
parent | 8a68e0b5f5b066adcf26558a383580da64e71456 (diff) | |
download | nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.gz nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.bz2 nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.lz nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.xz nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.zst nixpkgs-49523dec152f68f48ee65b5612d6b6df035f1ecf.zip |
Merge staging-next into staging
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 31 | ||||
-rwxr-xr-x | maintainers/scripts/fix-maintainers.pl | 14 |
2 files changed, 18 insertions, 27 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ad02391aa8..be3e8bb2ff9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3701,6 +3701,12 @@ githubId = 490965; name = "Craig Swank"; }; + ctron = { + email = "ctron@dentrassi.de"; + github = "ctron"; + githubId = 202474; + name = "Jens Reimann"; + }; cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; @@ -3968,7 +3974,7 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "davidarmstronglewis"; + github = "oceanlewis"; githubId = 6754950; name = "David Armstrong Lewis"; }; @@ -11035,12 +11041,6 @@ githubId = 4708337; name = "Marcelo A. de L. Santos"; }; - maxhille = { - email = "mh@lambdasoup.com"; - github = "maxhille"; - githubId = 693447; - name = "Max Hille"; - }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; @@ -15134,15 +15134,6 @@ }]; name = "Rahul Butani"; }; - rs0vere = { - email = "rs0vere@proton.me"; - github = "rs0vere"; - githubId = 140035635; - keys = [{ - fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D"; - }]; - name = "Red Star Over Earth"; - }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -15398,7 +15389,7 @@ }; SamirTalwar = { email = "lazy.git@functional.computer"; - github = "SamirTalwar"; + github = "abstracte"; githubId = 47852; name = "Samir Talwar"; }; @@ -17813,12 +17804,6 @@ githubId = 10110; name = "Travis B. Hartwell"; }; - travisdavis-ops = { - email = "travisdavismedia@gmail.com"; - github = "TravisDavis-ops"; - githubId = 52011418; - name = "Travis Davis"; - }; traxys = { email = "quentin+dev@familleboyer.net"; github = "traxys"; diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index a83df9ec0cf..c953cff5cc4 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -13,12 +13,15 @@ STDOUT->autoflush(1); my $ua = LWP::UserAgent->new(); +if (!defined $ENV{GH_TOKEN}) { + die "Set GH_TOKEN before running this script"; +} + keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; if (!defined $current_user) { print "$k has no github handle\n"; - next; } my $github_id = %$v{'githubId'}; if (!defined $github_id) { @@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) { sleep($ratelimit_reset - time() + 5); } if ($resp->code != 200) { - print $current_user . " likely deleted their github account\n"; + print "$k likely deleted their github account\n"; next; } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if (lc($current_user) ne lc($api_user)) { - print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + if (!defined $current_user) { + print "$k is known on github as $api_user.\n"; + } + elsif (lc($current_user) ne lc($api_user)) { + print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; $data =~ s/github = "$current_user";$/github = "$api_user";/m; |