diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 141c3024604..4829cdb792d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2289,6 +2289,12 @@ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; + d-xo = { + email = "hi@d-xo.org"; + github = "d-xo"; + githubId = 6689924; + name = "David Terry"; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -11716,12 +11722,6 @@ githubId = 1962985; name = "Vincenzo Mantova"; }; - xwvvvvwx = { - email = "davidterry@posteo.de"; - github = "xwvvvvwx"; - githubId = 6689924; - name = "David Terry"; - }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; diff --git a/nixos/tests/bazarr.nix b/nixos/tests/bazarr.nix index b8cd8ef38b4..c3337611aa2 100644 --- a/nixos/tests/bazarr.nix +++ b/nixos/tests/bazarr.nix @@ -7,7 +7,7 @@ let in { name = "bazarr"; - meta.maintainers = with maintainers; [ xwvvvvwx ]; + meta.maintainers = with maintainers; [ d-xo ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index 8cf8c307de3..961c2e15c30 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "wg-quick"; meta = with pkgs.lib.maintainers; { - maintainers = [ xwvvvvwx ]; + maintainers = [ d-xo ]; }; nodes = { diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix index 0d6f33ca3ac..64a8da8b971 100644 --- a/pkgs/applications/blockchains/lndconnect/default.nix +++ b/pkgs/applications/blockchains/lndconnect/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "Generate QRCode to connect apps to lnd Resources"; license = licenses.mit; homepage = "https://github.com/LN-Zap/lndconnect"; - maintainers = [ maintainers.xwvvvvwx ]; + maintainers = [ maintainers.d-xo ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/turbo-geth/default.nix b/pkgs/applications/blockchains/turbo-geth/default.nix index b1548212a69..58c0b45337e 100644 --- a/pkgs/applications/blockchains/turbo-geth/default.nix +++ b/pkgs/applications/blockchains/turbo-geth/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://github.com/ledgerwatch/turbo-geth/"; description = "Ethereum node and geth fork focused on scalability and modularity"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index e2314687d8b..e91192d53de 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -58,7 +58,7 @@ appimageTools.wrapType2 { description = "A decentralized app for code collaboration"; homepage = "https://radicle.xyz/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 11931199999..187508a9981 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Microsoft/GSL"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; + maintainers = with maintainers; [ thoughtpolice yuriaisaka ]; }; } diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 1e9df5be234..4b5f277fc53 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; license = licenses.boost; platforms = platforms.all; - maintainers = with maintainers; [ primeos xwvvvvwx ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 42bc0c39129..7650e375b41 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/LedgerHQ/ledgerctl"; description = "A library to control Ledger devices"; license = licenses.mit; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; }; } diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 63a8b13f4f8..112e6d2567e 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 5972d781bd1..416731eb8db 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ]; platforms = platforms.unix; }; }