diff options
-rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
-rw-r--r-- | nixos/modules/services/network-filesystems/webdav.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/rime-data/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lm-sensors/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/webdav/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c2c0d56dfee4e..207ee62cff251 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8967,12 +8967,6 @@ githubId = 8641; name = "Pierre Carrier"; }; - pengmeiyu = { - email = "pengmyu@gmail.com"; - github = "pmeiyu"; - githubId = 8529551; - name = "Peng Mei Yu"; - }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; @@ -9248,6 +9242,12 @@ githubId = 178496; name = "Philipp Middendorf"; }; + pmy = { + email = "pmy@xqzp.net"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; diff --git a/nixos/modules/services/network-filesystems/webdav.nix b/nixos/modules/services/network-filesystems/webdav.nix index 4086a0f5d5620..48602390bd74d 100644 --- a/nixos/modules/services/network-filesystems/webdav.nix +++ b/nixos/modules/services/network-filesystems/webdav.nix @@ -103,5 +103,5 @@ in }; }; - meta.maintainers = with maintainers; [ pengmeiyu ]; + meta.maintainers = with maintainers; [ pmy ]; } diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix index 371a07d3ec1a9..fbf65bc12a9f6 100644 --- a/pkgs/data/misc/rime-data/default.nix +++ b/pkgs/data/misc/rime-data/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation { # rime-cantonese cc-by-40 ]; - maintainers = [ maintainers.pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 3590f87e37ade..c40a379405436 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; description = "Tools for reading hardware sensors"; license = with licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; platforms = platforms.linux; mainProgram = "sensors"; }; diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 2e6a6a891ecfb..4a3aca9f6e918 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index af3fcbe4e2ccc..d415b6b5a45df 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://rime.im/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ pengmeiyu ]; + maintainers = with maintainers; [ pmy ]; }; } |