diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee70963eb5e0..8620e3e7744f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1247,12 +1247,6 @@ githubId = 962885; name = "Andrew Chambers"; }; - andrew-d = { - email = "andrew@du.nham.ca"; - github = "andrew-d"; - githubId = 1079173; - name = "Andrew Dunham"; - }; andrewrk = { email = "superjoe30@gmail.com"; github = "andrewrk"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9bb1799b3222..37097fca2668 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -32,7 +32,6 @@ with lib.maintainers; { acme = { members = [ aanderse - andrew-d arianvp emily flokli diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix index 7f130b709fc9..5c9447b07118 100644 --- a/nixos/tests/gvisor.nix +++ b/nixos/tests/gvisor.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "gvisor"; meta = with pkgs.lib.maintainers; { - maintainers = [ andrew-d ]; + maintainers = [ ]; }; nodes = { diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 7ff575acab66..54f7287513b1 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://xournalpp.github.io/"; changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ andrew-d sikmir ]; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; mainProgram = "xournalpp"; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 70c395066107..99d2f65bf14c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -66,7 +66,7 @@ let description = "Open Source Continuous File Synchronization"; changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + maintainers = with maintainers; [ joko peterhoeg ]; mainProgram = target; platforms = platforms.unix; }; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 72b6f305d3c6..620923377add 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; mainProgram = "dsd"; }; } diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix index 0a83adc5953c..4389f6b1f92b 100644 --- a/pkgs/by-name/gv/gvisor/package.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -46,7 +46,7 @@ buildGoModule { description = "Application Kernel for Containers"; homepage = "https://github.com/google/gvisor"; license = licenses.asl20; - maintainers = with maintainers; [ andrew-d gpl ]; + maintainers = with maintainers; [ gpl ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index dccb738a30f4..d67e18476a91 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index cb45787e1403..d2f6b1ee8aec 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 48a4cba83ddb..ae2e7b87ded1 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/m2crypto/m2crypto"; changelog = "https://gitlab.com/m2crypto/m2crypto/-/blob/${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix index e228c8223f4f..ec570892412c 100644 --- a/pkgs/tools/X11/xloadimage/default.nix +++ b/pkgs/tools/X11/xloadimage/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ andrew-d ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 4ca386c1374a..763c3a2ae370 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { description = "Easily rename multiple files using your text editor"; license = licenses.mit; homepage = "https://github.com/laurent22/massren"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; mainProgram = "massren"; }; } diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 80e6898630d2..a393af84c024 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orf/gping"; changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}"; license = licenses.mit; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; mainProgram = "gping"; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d2f882832c3b..32f4f4583378 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11383,7 +11383,7 @@ with self; { propagatedBuildInputs = [ DateCalc ]; meta = { description = "Finnish APRS Parser (Fabulous APRS Parser)"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; };