diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6a45c1d74c55..ed6aa31bd6f1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -836,15 +836,6 @@ with lib.maintainers; shortName = "coqui-ai TTS"; }; - wdz = { - members = [ - johannwagner - yuka - ]; - scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; - shortName = "WDZ GmbH"; - }; - windows = { members = [ RossSmyth diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 0fd7e40e38d4..497cd38a4b09 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -824,5 +824,8 @@ in }; - meta.maintainers = with lib.maintainers; [ netali ] ++ lib.teams.wdz.members; + meta.maintainers = with lib.maintainers; [ + netali + johannwagner + ]; } diff --git a/nixos/modules/services/networking/fastnetmon-advanced.nix b/nixos/modules/services/networking/fastnetmon-advanced.nix index c57b5a6b6600..87ed120291f9 100644 --- a/nixos/modules/services/networking/fastnetmon-advanced.nix +++ b/nixos/modules/services/networking/fastnetmon-advanced.nix @@ -245,5 +245,5 @@ in }) ]; - meta.maintainers = lib.teams.wdz.members; + meta.maintainers = with lib.maintainers; [ yureka-wdz ]; } diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index 40533ae760e1..f88af4745040 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -420,5 +420,5 @@ in ]; }; - meta.maintainers = with lib.maintainers; [ yuka ]; + meta.maintainers = with lib.maintainers; [ yureka-wdz ]; } diff --git a/nixos/tests/fastnetmon-advanced.nix b/nixos/tests/fastnetmon-advanced.nix index 99ef0513b1b4..e9bce4f8eb9f 100644 --- a/nixos/tests/fastnetmon-advanced.nix +++ b/nixos/tests/fastnetmon-advanced.nix @@ -2,7 +2,7 @@ { name = "fastnetmon-advanced"; - meta.maintainers = lib.teams.wdz.members; + meta.maintainers = with lib.maintainers; [ yureka-wdz ]; nodes = { bird = diff --git a/nixos/tests/librenms.nix b/nixos/tests/librenms.nix index d4aff22392cf..995c83c959d1 100644 --- a/nixos/tests/librenms.nix +++ b/nixos/tests/librenms.nix @@ -6,7 +6,7 @@ let in { name = "librenms"; - meta.maintainers = lib.teams.wdz.members; + meta.maintainers = with lib.maintainers; [ johannwagner ]; nodes.librenms = { time.timeZone = "Europe/Berlin"; diff --git a/nixos/tests/web-apps/peering-manager.nix b/nixos/tests/web-apps/peering-manager.nix index 8f4e1d731ae8..34ea331edb49 100644 --- a/nixos/tests/web-apps/peering-manager.nix +++ b/nixos/tests/web-apps/peering-manager.nix @@ -2,8 +2,8 @@ { name = "peering-manager"; - meta = with lib.maintainers; { - maintainers = [ yuka ]; + meta = { + maintainers = with lib.maintainers; [ yureka-wdz ]; }; nodes.machine = diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 64c9a3f1fcc9..465367e1db1b 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -61,7 +61,9 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/pierky/arouteserver"; changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ marcel ]; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ + marcel + johannwagner + ]; }; } diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 64f4f10bced2..f5ed39a603b1 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rtbrick/bngblaster/"; changelog = "https://github.com/rtbrick/bngblaster/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ johannwagner ]; badPlatforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index d485a4f3f5ec..878abc12c1f0 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -76,8 +76,10 @@ stdenvNoCC.mkDerivation rec { meta = { homepage = "https://github.com/camunda/camunda-modeler"; description = "Integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; - teams = [ lib.teams.wdz ]; - maintainers = with lib.maintainers; [ vringar ]; + maintainers = with lib.maintainers; [ + vringar + johannwagner + ]; license = lib.licenses.mit; inherit (electron.meta) platforms; mainProgram = "camunda-modeler"; diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix index 851c19015a20..2c2061dac530 100644 --- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix +++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://fastnetmon.com"; changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ yureka-wdz ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index e01fffa4ad45..a9b7dd75f9e4 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}"; license = lib.licenses.eupl12; platforms = lib.platforms.linux; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ yureka-wdz ]; mainProgram = "fernglas"; }; } diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix index 8e850775621b..2bf54da029e2 100644 --- a/pkgs/by-name/ip/iperf3d/package.nix +++ b/pkgs/by-name/ip/iperf3d/package.nix @@ -30,7 +30,9 @@ rustPlatform.buildRustPackage rec { mainProgram = "iperf3d"; homepage = "https://github.com/wobcom/iperf3d"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ netali ]; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ + netali + johannwagner + ]; }; } diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index a7378039daf6..1be5211f501a 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -157,6 +157,6 @@ py.pkgs.buildPythonPackage rec { description = "Internet Routing Registry database server, processing IRR objects in the RPSL format"; license = lib.licenses.mit; homepage = "https://github.com/irrdnet/irrd"; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ yureka-wdz ]; }; } diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index 31cb5f668c15..b5013a3df553 100644 --- a/pkgs/by-name/li/libdict/package.nix +++ b/pkgs/by-name/li/libdict/package.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/rtbrick/libdict/releases/tag/${finalAttrs.version}"; description = "C library of key-value data structures"; license = lib.licenses.bsd2; - teams = [ lib.teams.wdz ]; }; }) diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 9cd9ca43e7cb..a39e7fa29ef5 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -128,8 +128,10 @@ phpPackage.buildComposerProject2 rec { description = "Auto-discovering PHP/MySQL/SNMP based network monitoring"; homepage = "https://www.librenms.org/"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ netali ]; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ + netali + johannwagner + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix index a2741a1be1a2..3ec659ab791b 100644 --- a/pkgs/by-name/ou/oui/package.nix +++ b/pkgs/by-name/ou/oui/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "MAC Address CLI Toolkit"; homepage = "https://github.com/thatmattlove/oui"; license = with lib.licenses; [ bsd3 ]; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ johannwagner ]; mainProgram = "oui"; }; } diff --git a/pkgs/by-name/ox/oxidized/package.nix b/pkgs/by-name/ox/oxidized/package.nix index 78ab4a5998c2..7409599618d9 100644 --- a/pkgs/by-name/ox/oxidized/package.nix +++ b/pkgs/by-name/ox/oxidized/package.nix @@ -32,8 +32,8 @@ bundlerApp { maintainers = with lib.maintainers; [ nicknovitski liberodark + johannwagner ]; - teams = with lib.teams; [ wdz ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix index 9a43f810719e..bab7c5c14e7a 100644 --- a/pkgs/by-name/pe/peering-manager/package.nix +++ b/pkgs/by-name/pe/peering-manager/package.nix @@ -91,7 +91,7 @@ python.pkgs.buildPythonApplication rec { license = lib.licenses.asl20; description = "BGP sessions management tool"; mainProgram = "peering-manager"; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ yureka-wdz ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix index bdce061689b9..6dcb6359e7bf 100644 --- a/pkgs/development/php-packages/rrd/default.nix +++ b/pkgs/development/php-packages/rrd/default.nix @@ -27,6 +27,5 @@ buildPecl { description = "PHP bindings to RRD tool system"; license = lib.licenses.bsd0; homepage = "https://github.com/php/pecl-processing-rrd"; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix index a57bc4c1667a..bf625f816d92 100644 --- a/pkgs/development/python-modules/aggregate6/default.nix +++ b/pkgs/development/python-modules/aggregate6/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/job/aggregate6"; license = with lib.licenses; [ bsd2 ]; maintainers = with lib.maintainers; [ marcel ]; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/asgi-logger/default.nix b/pkgs/development/python-modules/asgi-logger/default.nix index 25dd2ce78865..37eb243e07e3 100644 --- a/pkgs/development/python-modules/asgi-logger/default.nix +++ b/pkgs/development/python-modules/asgi-logger/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { description = "Access logger for ASGI servers"; homepage = "https://github.com/Kludex/asgi-logger"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index 909bae457e7e..af42fd3f0bbb 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { ''; changelog = "https://github.com/netinvent/command_runner/releases/tag/${src.tag}"; license = lib.licenses.bsd3; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 6814eda82296..b30d32d603e8 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -75,6 +75,5 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/coredis"; changelog = "https://github.com/alisaifee/coredis/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/imia/default.nix b/pkgs/development/python-modules/imia/default.nix index 03b580573d49..d7d0955a7128 100644 --- a/pkgs/development/python-modules/imia/default.nix +++ b/pkgs/development/python-modules/imia/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { changelog = "https://github.com/alex-oleshkevich/imia/releases/tag/v${version}"; homepage = "https://github.com/alex-oleshkevich/imia"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix index 6bb6c83726ed..f1dc33548944 100644 --- a/pkgs/development/python-modules/py-radix-sr/default.nix +++ b/pkgs/development/python-modules/py-radix-sr/default.nix @@ -43,6 +43,5 @@ buildPythonPackage rec { isc bsdOriginal ]; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 0b9ec11e0d7a..242d725ae3aa 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { homepage = "https://github.com/peering-manager/pyixapi/"; changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${src.tag}"; license = lib.licenses.asl20; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix index d2fe91b4f40f..e808c507d9a3 100644 --- a/pkgs/development/python-modules/smtpdfix/default.nix +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -46,6 +46,5 @@ buildPythonPackage rec { homepage = "https://github.com/bebleo/smtpdfix"; changelog = "https://github.com/bebleo/smtpdfix/releases/tag/v${version}"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/starlette-wtf/default.nix b/pkgs/development/python-modules/starlette-wtf/default.nix index 8f94ac03fe3b..354188dfb264 100644 --- a/pkgs/development/python-modules/starlette-wtf/default.nix +++ b/pkgs/development/python-modules/starlette-wtf/default.nix @@ -43,6 +43,5 @@ buildPythonPackage rec { changelog = "https://github.com/muicss/starlette-wtf/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/muicss/starlette-wtf"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix index 6b5308b66256..7a6bd55ca1b4 100644 --- a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix +++ b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { homepage = "https://github.com/LaunchPlatform/wtforms-bootstrap5"; changelog = "https://github.com/LaunchPlatform/wtforms-bootstrap5/releases/tag/${version}"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 59d5645af5e5..b49331dd7ecd 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -22,6 +22,6 @@ buildGoModule rec { mainProgram = "junos_exporter"; homepage = "https://github.com/czerwonk/junos_exporter"; license = lib.licenses.mit; - teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ johannwagner ]; }; }