From b18031c413024ba1b4c96cf7ef8688d98db3f93e Mon Sep 17 00:00:00 2001 From: Madoura <93990818+Madouura@users.noreply.github.com> Date: Sun, 17 Apr 2022 18:13:36 -0500 Subject: [PATCH] treewide/meta: Remove chiiruno and replace with Madouura (#169096) * maintainers: remove chiiruno * nixos/zeronet.nix: replace chiiruno with Madouura * nixos/hydron: replace chiiruno with Madouura * nixos/tests/bcachefs: replace chiiruno with Madouura * lutris: replace chiiruno with Madouura * qtchan: replace chiiruno with Madouura * tinygo: replace chiiruno with Madouura * vlang: replace chiiruno with Madouura * merkletools: replace chiiruno with Madouura * easyjson: replace chiiruno with Madouura * quicktemplate: replace chiiruno with Madouura * statik: replace chiiruno with Madouura * dumb: replace chiiruno with Madouura * sndio: replace chiiruno with Madouura * hydron: replace chiiruno with Madouura * edid-decode-unstable: replace chiiruno with Madouura * tewisay: replace chiiruno with Madouura * svt-av1: replace chiiruno with Madouura --- maintainers/maintainer-list.nix | 6 ------ nixos/modules/services/networking/zeronet.nix | 2 +- nixos/modules/services/web-servers/hydron.nix | 2 +- nixos/tests/bcachefs.nix | 2 +- pkgs/applications/misc/lutris/default.nix | 2 +- pkgs/applications/networking/browsers/qtchan/default.nix | 2 +- pkgs/development/compilers/tinygo/default.nix | 2 +- pkgs/development/compilers/vlang/default.nix | 2 +- pkgs/development/python-modules/merkletools/default.nix | 2 +- pkgs/development/tools/easyjson/default.nix | 2 +- pkgs/development/tools/quicktemplate/default.nix | 2 +- pkgs/development/tools/statik/default.nix | 2 +- pkgs/misc/dumb/default.nix | 2 +- pkgs/misc/sndio/default.nix | 2 +- pkgs/servers/hydron/default.nix | 2 +- pkgs/tools/misc/edid-decode/default.nix | 6 +++--- pkgs/tools/misc/tewisay/default.nix | 6 +++--- pkgs/tools/video/svt-av1/default.nix | 2 +- 18 files changed, 21 insertions(+), 27 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2f21f2192741..a2a1737030f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2089,12 +2089,6 @@ githubId = 18648043; name = "Daniel Cartwright"; }; - chiiruno = { - email = "okinan@protonmail.com"; - github = "chiiruno"; - githubId = 30435868; - name = "Okina Matara"; - }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 3370390a4c62..dd83b7facc11 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -90,5 +90,5 @@ in with lib; { (mkRemovedOptionModule [ "services" "zeronet" "logDir" ] "Zeronet will log by default in /var/lib/zeronet") ]; - meta.maintainers = with maintainers; [ chiiruno ]; + meta.maintainers = with maintainers; [ Madouura ]; } diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index a4a5a435b2e6..46f62a9119f0 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -161,5 +161,5 @@ in with lib; { (mkRenamedOptionModule [ "services" "hydron" "baseDir" ] [ "services" "hydron" "dataDir" ]) ]; - meta.maintainers = with maintainers; [ chiiruno ]; + meta.maintainers = with maintainers; [ Madouura ]; } diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 832cc9c38f01..68ac49d0a6a6 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ]; + meta.maintainers = with pkgs.lib.maintainers; [ Madouura ]; nodes.machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 0446c694fe0d..c8490f0d80ac 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -148,7 +148,7 @@ buildPythonApplication rec { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 9786fad2fdc6..8ad81139fbe9 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { description = "4chan browser in qt5"; homepage = "https://github.com/siavash119/qtchan"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 218b207f2435..935260dbcab9 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -59,6 +59,6 @@ buildGoModule rec { homepage = "https://tinygo.org/"; description = "Go compiler for small places"; license = licenses.bsd3; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 1786c54ac7ef..0c24e67123c6 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 92acdaf58ed4..a57f926a615f 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; homepage = "https://github.com/Tierion/pymerkletools"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 75bfc1d4c14f..69368be74d9a 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -16,6 +16,6 @@ buildGoPackage { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 747a82740f46..9c8c979a4e84 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; mainProgram = "qtc"; }; } diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 48ceea24b70c..6befb42c24d3 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 9b733e00f69c..2a554d99b287 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kode54/dumb"; description = "Module/tracker based music format parser and player library"; license = licenses.free; # Derivative of GPL - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 786c3c3a40a4..7b5774d8054c 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = licenses.isc; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index ba163a719b10..bcd909036e6f 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index f39fc1b55243..2e8af7bcd9c4 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cp edid-decode $out/bin ''; - meta = { + meta = with lib; { description = "EDID decoder and conformance tester"; homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.chiiruno ]; + license = licenses.mit; + maintainers = with maintainers; [ Madouura ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index 3434ac110b35..3ff7259b9e0a 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -26,10 +26,10 @@ buildGoPackage rec { --prefix COWPATH : $out/share/tewisay/cows ''; - meta = { + meta = with lib; { homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = lib.licenses.cc0; - maintainers = [ lib.maintainers.chiiruno ]; + license = licenses.cc0; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 469f76fdc2b2..3c45f2608ebf 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; }