From 7c0f98bba54d2ae4aa3941c5dffb4f7061e75cb5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 4 Jun 2023 14:17:58 +0200 Subject: [PATCH 1/5] maintainers: fix formatting/indentation --- maintainers/maintainer-list.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cecc6719828ef3..f4bc69215c9388 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5422,7 +5422,7 @@ githubId = 7551358; name = "Frede Emil"; }; - Freed-Wu = { + Freed-Wu = { email = "wuzhenyu@ustc.edu"; github = "Freed-Wu"; githubId = 32936898; @@ -7655,10 +7655,10 @@ name = "Jocelyn Thode"; }; joedevivo = { - github = "joedevivo"; - githubId = 55951; - name = "Joe DeVivo"; - }; + github = "joedevivo"; + githubId = 55951; + name = "Joe DeVivo"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; @@ -8951,7 +8951,7 @@ github = "leifhelm"; githubId = 31693262; name = "Jakob Leifhelm"; - keys =[{ + keys = [{ fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; }]; }; @@ -10008,7 +10008,7 @@ githubId = 95194; name = "Mauricio Scheffer"; }; - maxbrunet = { + maxbrunet = { email = "max@brnt.mx"; github = "maxbrunet"; githubId = 32458727; @@ -10380,7 +10380,7 @@ name = "Michael Pacheco"; github = "MichaelPachec0"; githubId = 48970112; - keys = [ { + keys = [{ fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; }]; }; From 756e89e6ef61ea52691ee53be9e567f51f124c42 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 4 Jun 2023 16:26:25 +0200 Subject: [PATCH 2/5] maintainers/fix-maintainers.pl: ignore case as this script would otherwise create a bunch of somewhat unnecessary/noisy renames that aren't "actual" renames --- maintainers/scripts/fix-maintainers.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index 81f6450c5faf07..a83df9ec0cf0f4 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -42,7 +42,7 @@ } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if ($current_user ne $api_user) { + if (lc($current_user) ne lc($api_user)) { print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; From 3788de53f963ee6f0c8815dd47e7eca2b72edc92 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 4 Jun 2023 16:26:27 +0200 Subject: [PATCH 3/5] maintainers: update a few changed GitHub usernames --- maintainers/maintainer-list.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f4bc69215c9388..d0eb9a6bebc7b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2943,7 +2943,7 @@ }; citadelcore = { email = "alex@arctarus.co.uk"; - github = "CitadelCore"; + github = "VertexA115"; githubId = 5567402; name = "Alex Zero"; keys = [{ @@ -5531,7 +5531,7 @@ }; fuzen = { email = "me@fuzen.cafe"; - github = "Fuzen-py"; + github = "LovingMelody"; githubId = 17859309; name = "Fuzen"; }; @@ -6768,7 +6768,7 @@ }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; - github = "ilya-kolpakov"; + github = "1pakch"; githubId = 592849; name = "Ilya Kolpakov"; }; @@ -7170,7 +7170,7 @@ jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; - github = "jayeshbhoot"; + github = "bhootjb"; githubId = 1915507; }; jayman2000 = { @@ -7988,7 +7988,7 @@ }; juaningan = { email = "juaningan@gmail.com"; - github = "uningan"; + github = "oneingan"; githubId = 810075; name = "Juan Rodal"; }; From 4bffe265372dc372bcb2f9540bacb9c3e6429ad4 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 4 Jun 2023 16:26:28 +0200 Subject: [PATCH 4/5] maintainers: remove gordias as their GitHub account appears to be deleted --- maintainers/maintainer-list.nix | 9 --------- pkgs/servers/alps/default.nix | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d0eb9a6bebc7b0..787525c1cd328d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5885,15 +5885,6 @@ githubId = 1621335; name = "Andrew Trachenko"; }; - gordias = { - name = "Gordias"; - email = "gordias@disroot.org"; - github = "gordiasdot"; - githubId = 94724133; - keys = [{ - fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; - }]; - }; gotcha = { email = "gotcha@bubblenet.be"; github = "gotcha"; diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index 7815cedd8c86ef..e219d5a8c20147 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -45,6 +45,6 @@ buildGoModule rec { description = "A simple and extensible webmail."; homepage = "https://git.sr.ht/~migadu/alps"; license = licenses.mit; - maintainers = with maintainers; [ gordias booklearner madonius hmenke ]; + maintainers = with maintainers; [ booklearner madonius hmenke ]; }; } From 139013bc42943ebfeecafcdb7cd424f0262bbeac Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 4 Jun 2023 16:26:31 +0200 Subject: [PATCH 5/5] maintainers: remove WeebSorceress as their GitHub account appears to be deleted --- maintainers/maintainer-list.nix | 10 ---------- .../blockchains/ledger-live-desktop/default.nix | 2 +- pkgs/applications/video/adl/default.nix | 2 +- pkgs/applications/video/anime-downloader/default.nix | 2 +- pkgs/development/python-modules/cfscrape/default.nix | 2 +- pkgs/development/python-modules/pySmartDL/default.nix | 2 +- pkgs/development/tools/frece/default.nix | 2 +- pkgs/tools/misc/trackma/default.nix | 2 +- 8 files changed, 7 insertions(+), 17 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 787525c1cd328d..7e0359892458f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16991,16 +16991,6 @@ github = "wdavidw"; githubId = 46896; }; - WeebSorceress = { - name = "WeebSorceress"; - email = "hello@weebsorceress.anonaddy.me"; - matrix = "@weebsorceress:matrix.org"; - github = "WeebSorceress"; - githubId = 106774777; - keys = [{ - fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43"; - }]; - }; wegank = { name = "Weijia Wang"; email = "contact@weijia.wang"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 710712b845ca08..8531456a73d365 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 rec { description = "App for Ledger hardware wallets"; homepage = "https://www.ledger.com/ledger-live/"; license = licenses.mit; - maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ]; + maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/applications/video/adl/default.nix index 621f7246c8abf0..9dbec102a55e5c 100644 --- a/pkgs/applications/video/adl/default.nix +++ b/pkgs/applications/video/adl/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "popcorn anime-downloader + trackma wrapper"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix index 60e89c2fdf6809..04833eb4e82a6c 100644 --- a/pkgs/applications/video/anime-downloader/default.nix +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -49,6 +49,6 @@ python3.pkgs.buildPythonApplication rec { description = "A simple but powerful anime downloader and streamer"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix index 222adbc489af0a..f050217c3fb352 100644 --- a/pkgs/development/python-modules/cfscrape/default.nix +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "A Python module to bypass Cloudflare's anti-bot page"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pySmartDL/default.nix b/pkgs/development/python-modules/pySmartDL/default.nix index 66503bba99dc61..cfad2238fbd017 100644 --- a/pkgs/development/python-modules/pySmartDL/default.nix +++ b/pkgs/development/python-modules/pySmartDL/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "A Smart Download Manager for Python"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix index 2eebf2bcfbe984..64de6d162f0a0f 100644 --- a/pkgs/development/tools/frece/default.nix +++ b/pkgs/development/tools/frece/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/YodaEmbedding/frece"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index 855585dde3f814..17bd117b22e96a 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -76,6 +76,6 @@ python3.pkgs.buildPythonApplication rec { description = "Open multi-site list manager for Unix-like systems (ex-wMAL)"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ WeebSorceress ]; + maintainers = with maintainers; [ ]; }; }