From c5478461d835c38445fef659ab45cd8d2814a2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Jan 2026 21:44:35 +0100 Subject: [PATCH] treewide: take packages from C3D2 we agreed I (sandro) take --- nixos/modules/services/misc/portunus.nix | 2 +- nixos/modules/services/web-apps/librespeed.nix | 2 +- nixos/modules/services/web-apps/pretalx.nix | 4 +--- nixos/tests/web-apps/pretalx.nix | 4 ++-- pkgs/by-name/le/ledfx/package.nix | 2 +- pkgs/by-name/li/librespeed-rust/package.nix | 2 +- pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix | 2 +- pkgs/by-name/me/mediagoblin/package.nix | 2 +- pkgs/by-name/me/mediawiki/package.nix | 2 +- pkgs/by-name/nc/ncpamixer/package.nix | 2 +- pkgs/by-name/po/portunus/package.nix | 6 ++++-- pkgs/by-name/pr/pretalx/package.nix | 6 ++++-- pkgs/servers/xmpp/prosody/default.nix | 2 +- 13 files changed, 20 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index 700d1a6871bb..5bd5504201c4 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -313,5 +313,5 @@ in ]; }; - meta.maintainers = [ lib.maintainers.majewsky ] ++ lib.teams.c3d2.members; + meta.maintainers = pkgs.portunus.meta.maintainers; } diff --git a/nixos/modules/services/web-apps/librespeed.nix b/nixos/modules/services/web-apps/librespeed.nix index 69728e93d6e4..15e7a19047d9 100644 --- a/nixos/modules/services/web-apps/librespeed.nix +++ b/nixos/modules/services/web-apps/librespeed.nix @@ -441,5 +441,5 @@ in }; }; - meta.maintainers = lib.teams.c3d2.members; + meta.maintainers = pkgs.librespeed-rust.meta.maintainers; } diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 00ea66a4c82e..f1f56ffb0d51 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -30,9 +30,7 @@ let in { - meta = { - maintainers = with lib.maintainers; [ hexa ] ++ lib.teams.c3d2.members; - }; + meta.maintainers = pkgs.pretalx.meta.maintainers; options.services.pretalx = { enable = lib.mkEnableOption "pretalx"; diff --git a/nixos/tests/web-apps/pretalx.nix b/nixos/tests/web-apps/pretalx.nix index c226d607ad00..03fa6684b8b5 100644 --- a/nixos/tests/web-apps/pretalx.nix +++ b/nixos/tests/web-apps/pretalx.nix @@ -1,8 +1,8 @@ -{ lib, ... }: +{ pkgs, ... }: { name = "pretalx"; - meta.maintainers = lib.teams.c3d2.members; + meta.maintainers = pkgs.pretalx.meta.maintainers; nodes = { pretalx = diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix index 4d4ac302d230..1443ba9f7a0d 100644 --- a/pkgs/by-name/le/ledfx/package.nix +++ b/pkgs/by-name/le/ledfx/package.nix @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/LedFx/LedFx"; changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; license = lib.licenses.gpl3Only; - teams = [ lib.teams.c3d2 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "ledfx"; }; } diff --git a/pkgs/by-name/li/librespeed-rust/package.nix b/pkgs/by-name/li/librespeed-rust/package.nix index 345526b093d2..69d0417a1782 100644 --- a/pkgs/by-name/li/librespeed-rust/package.nix +++ b/pkgs/by-name/li/librespeed-rust/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "Very lightweight speed test implementation in Rust"; homepage = "https://github.com/librespeed/speedtest-rust"; license = lib.licenses.lgpl3Plus; - teams = with lib.teams; [ c3d2 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "librespeed-rs"; }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix index c520f6e30e51..a5ffbdf837f2 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "LDAP3 auth provider for Synapse"; homepage = "https://github.com/matrix-org/matrix-synapse-ldap3"; license = lib.licenses.asl20; - teams = [ lib.teams.c3d2 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 43cc073f3ded..f9a71182c4ca 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -175,6 +175,6 @@ python.pkgs.buildPythonApplication rec { description = "Free software media publishing platform that anyone can run"; homepage = "https://mediagoblin.org/"; license = lib.licenses.agpl3Plus; - teams = [ lib.teams.c3d2 ]; + teams = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 1d5a58c1ecec..44d2c3a23a54 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -40,6 +40,6 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://www.mediawiki.org/"; platforms = lib.platforms.all; - teams = [ lib.teams.c3d2 ]; + teams = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index 58559d74d03b..63bd4f94fd5c 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = lib.licenses.mit; platforms = lib.platforms.linux; - teams = [ lib.teams.c3d2 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "ncpamixer"; }; } diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix index 34a305a3affc..156b033bd2ed 100644 --- a/pkgs/by-name/po/portunus/package.nix +++ b/pkgs/by-name/po/portunus/package.nix @@ -28,7 +28,9 @@ buildGoModule rec { homepage = "https://github.com/majewsky/portunus"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ majewsky ]; - teams = [ lib.teams.c3d2 ]; + maintainers = with lib.maintainers; [ + majewsky + SuperSandro2000 + ]; }; } diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 16422945d960..c9db67140ba9 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -42,8 +42,10 @@ let homepage = "https://github.com/pretalx/pretalx"; changelog = "https://docs.pretalx.org/changelog/#${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hexa ]; - teams = [ lib.teams.c3d2 ]; + maintainers = with lib.maintainers; [ + hexa + SuperSandro2000 + ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 3641e8884f4d..6132bb9f901e 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ toastal mirror230469 + SuperSandro2000 ]; - teams = with lib.teams; [ c3d2 ]; }; })