diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9594a7b5f7e5..6217932bdac9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -359,18 +359,6 @@ with lib.maintainers; github = "flutter"; }; - flyingcircus = { - # Verify additions by approval of an already existing member of the team. - members = [ - theuni - frlan - leona - osnyx - ]; - scope = "Team for Flying Circus employees who collectively maintain packages."; - shortName = "Flying Circus employees"; - }; - forgejo = { members = [ adamcstephens diff --git a/nixos/modules/services/mail/mailpit.nix b/nixos/modules/services/mail/mailpit.nix index c3b888f15c9b..6a9b2c1eb366 100644 --- a/nixos/modules/services/mail/mailpit.nix +++ b/nixos/modules/services/mail/mailpit.nix @@ -101,6 +101,4 @@ in } ) instances; }; - - meta.maintainers = lib.teams.flyingcircus.members; } diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix index 9574859293d1..ebbd0d6a911e 100644 --- a/nixos/modules/services/networking/knot-resolver.nix +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -33,8 +33,7 @@ in { meta.maintainers = [ lib.maintainers.vcunat # upstream developer - ] - ++ lib.teams.flyingcircus.members; + ]; ###### interface options.services.knot-resolver = { diff --git a/nixos/tests/mailpit.nix b/nixos/tests/mailpit.nix index 5f92b5030fda..6d1112fc9347 100644 --- a/nixos/tests/mailpit.nix +++ b/nixos/tests/mailpit.nix @@ -1,7 +1,6 @@ { lib, ... }: { name = "mailpit"; - meta.maintainers = lib.teams.flyingcircus.members; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 9562cb7e4e2b..3819c18bdaae 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -46,13 +46,10 @@ machine.wait_for_unit("phpfpm-matomo.service") ''; - meta.maintainers = - with lib.maintainers; - [ - florianjacob - mmilata - twey - boozedog - ] - ++ lib.teams.flyingcircus.members; + meta.maintainers = with lib.maintainers; [ + florianjacob + mmilata + twey + boozedog + ]; } diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 9d41e4baffdf..1a3ef44f497b 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -73,7 +73,7 @@ let type: makeTest { name = "oci-containers-podman-rootless-${type}"; - meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ]; + meta.maintainers = [ lib.maintainers.ma27 ]; nodes = { podman = { pkgs, ... }: diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index 30775761f563..1362bcc5e217 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -11,7 +11,6 @@ let package: makeTest { name = "postgresql_anonymizer-${package.name}"; - meta.maintainers = lib.teams.flyingcircus.members; nodes.machine = { pkgs, ... }: diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index 0054e53d6dc8..bc800de255a6 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -143,7 +143,6 @@ let maintainers = [ lib.maintainers.vcunat # upstream developer ]; - teams = [ lib.teams.flyingcircus ]; mainProgram = "kresd"; }; }); diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index e0747f575663..5f237d0ac2dd 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -118,6 +118,5 @@ stdenv.mkDerivation (finalAttrs: { boozedog niklaskorz ]; - teams = [ lib.teams.flyingcircus ]; }; }) diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix index 09124ee49285..981349517a7d 100644 --- a/pkgs/by-name/pg/pg-dump-anon/package.nix +++ b/pkgs/by-name/pg/pg-dump-anon/package.nix @@ -33,7 +33,6 @@ buildGoModule rec { meta = { description = "Export databases with data being anonymized with the anonymizer extension"; homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/"; - teams = [ lib.teams.flyingcircus ]; license = lib.licenses.postgresql; mainProgram = "pg_dump_anon"; }; diff --git a/pkgs/by-name/pr/proftpd/package.nix b/pkgs/by-name/pr/proftpd/package.nix index c9b901b41c41..aa2604dea245 100644 --- a/pkgs/by-name/pr/proftpd/package.nix +++ b/pkgs/by-name/pr/proftpd/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.proftpd.org/"; - teams = [ lib.teams.flyingcircus ]; license = lib.licenses.gpl2Plus; mainProgram = "proftpd"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index 686830ac1118..b344bd27f760 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command line tool for RabbitMQ that uses the HTTP API"; - teams = [ lib.teams.flyingcircus ]; homepage = "https://www.rabbitmq.com/docs/management-cli"; license = with lib.licenses; [ mit diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 125cc007e43b..a461fedc51ee 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -207,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: { Long-term support release. ''; license = lib.licenses.gpl2Only; - teams = [ lib.teams.flyingcircus ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index f7ae2b9e6abf..d6e65a6fb97b 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -219,7 +219,6 @@ stdenv.mkDerivation (finalAttrs: { Long-term support release. ''; license = lib.licenses.gpl2Only; - teams = [ lib.teams.flyingcircus ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 23958e28a7cc..a0ff5c359edf 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -24,7 +24,7 @@ buildPgrxExtension { passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql; meta = { - inherit (pg-dump-anon.meta) homepage teams license; + inherit (pg-dump-anon.meta) homepage license; description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix index a5411e49746e..4c6fc5583a5f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix @@ -68,7 +68,6 @@ buildPgrxExtension (finalAttrs: { # Upstream removed support for PostgreSQL 13 on 0.9.0: https://github.com/timescale/pgvectorscale/releases/tag/0.9.0 broken = lib.versionOlder postgresql.version "14"; homepage = "https://github.com/timescale/pgvectorscale"; - teams = [ lib.teams.flyingcircus ]; description = "Complement to pgvector for high performance, cost efficient vector search on large workloads"; license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 368e2ddf9b56..eb1240a7b215 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -136,7 +136,6 @@ let description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = lib.licenses.bsd2; - teams = [ lib.teams.flyingcircus ]; platforms = lib.platforms.unix; }; }; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 686178c57952..551998daa98e 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -110,6 +110,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.izorkin ]; - teams = [ lib.teams.flyingcircus ]; }; })