From d54a686bbac98b7ece847a4113a433382498a309 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 12 Jan 2026 15:47:27 +0100 Subject: [PATCH] treewide: Take over maintainership from the flyingcircus team The flyingcircus team was dissolved as it's an external team. We (osnyx and me) take over maintainersip as persons. --- nixos/modules/services/mail/mailpit.nix | 5 +++++ nixos/modules/services/networking/knot-resolver.nix | 2 ++ nixos/tests/mailpit.nix | 4 ++++ nixos/tests/matomo.nix | 2 ++ nixos/tests/oci-containers.nix | 6 +++++- nixos/tests/postgresql/anonymizer.nix | 4 ++++ pkgs/by-name/kn/knot-resolver_6/package.nix | 2 ++ pkgs/by-name/ma/matomo/package.nix | 2 ++ pkgs/by-name/pg/pg-dump-anon/package.nix | 4 ++++ pkgs/by-name/pr/proftpd/package.nix | 4 ++++ pkgs/by-name/ra/rabbitmqadmin-ng/package.nix | 4 ++++ pkgs/servers/sql/percona-server/8_0.nix | 4 ++++ pkgs/servers/sql/percona-server/8_4.nix | 4 ++++ pkgs/servers/sql/postgresql/ext/anonymizer.nix | 2 +- pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix | 4 ++++ pkgs/servers/varnish/default.nix | 4 ++++ pkgs/tools/backup/percona-xtrabackup/generic.nix | 6 +++++- 17 files changed, 60 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/mailpit.nix b/nixos/modules/services/mail/mailpit.nix index 6a9b2c1eb366..ff9adc0928b7 100644 --- a/nixos/modules/services/mail/mailpit.nix +++ b/nixos/modules/services/mail/mailpit.nix @@ -101,4 +101,9 @@ in } ) instances; }; + + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; } diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix index ebbd0d6a911e..d943b29b5b73 100644 --- a/nixos/modules/services/networking/knot-resolver.nix +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -33,6 +33,8 @@ in { meta.maintainers = [ lib.maintainers.vcunat # upstream developer + lib.maintainers.leona + lib.maintainers.osnyx ]; ###### interface diff --git a/nixos/tests/mailpit.nix b/nixos/tests/mailpit.nix index 6d1112fc9347..fae05c7f3109 100644 --- a/nixos/tests/mailpit.nix +++ b/nixos/tests/mailpit.nix @@ -1,6 +1,10 @@ { lib, ... }: { name = "mailpit"; + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 3819c18bdaae..8163502e9ef2 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -51,5 +51,7 @@ mmilata twey boozedog + leona + osnyx ]; } diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 1a3ef44f497b..e692e7831688 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -73,7 +73,11 @@ let type: makeTest { name = "oci-containers-podman-rootless-${type}"; - meta.maintainers = [ lib.maintainers.ma27 ]; + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.ma27 + lib.maintainers.osnyx + ]; nodes = { podman = { pkgs, ... }: diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index 1362bcc5e217..a5853e5ed533 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -11,6 +11,10 @@ let package: makeTest { name = "postgresql_anonymizer-${package.name}"; + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; 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 bc800de255a6..2948e78eb238 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -142,6 +142,8 @@ let platforms = lib.platforms.unix; maintainers = [ lib.maintainers.vcunat # upstream developer + lib.maintainers.leona + lib.maintainers.osnyx ]; mainProgram = "kresd"; }; diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 5f237d0ac2dd..b58b4e8feb82 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -117,6 +117,8 @@ stdenv.mkDerivation (finalAttrs: { twey boozedog niklaskorz + leona + osnyx ]; }; }) diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix index 981349517a7d..87cdad5ad56f 100644 --- a/pkgs/by-name/pg/pg-dump-anon/package.nix +++ b/pkgs/by-name/pg/pg-dump-anon/package.nix @@ -33,6 +33,10 @@ buildGoModule rec { meta = { description = "Export databases with data being anonymized with the anonymizer extension"; homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/"; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; 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 aa2604dea245..6e3bd70b8704 100644 --- a/pkgs/by-name/pr/proftpd/package.nix +++ b/pkgs/by-name/pr/proftpd/package.nix @@ -80,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.proftpd.org/"; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; 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 b344bd27f760..0a66b8634a08 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -32,6 +32,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command line tool for RabbitMQ that uses the HTTP API"; homepage = "https://www.rabbitmq.com/docs/management-cli"; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index a461fedc51ee..27d6c1bbdd76 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (finalAttrs: { Long-term support release. ''; license = lib.licenses.gpl2Only; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; 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 d6e65a6fb97b..00146c43365d 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -219,6 +219,10 @@ stdenv.mkDerivation (finalAttrs: { Long-term support release. ''; license = lib.licenses.gpl2Only; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index a0ff5c359edf..84800cb5635a 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 license; + inherit (pg-dump-anon.meta) homepage maintainers 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 4c6fc5583a5f..fc98f7746178 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix @@ -68,6 +68,10 @@ 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"; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; 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 eb1240a7b215..d50f07e7001f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -136,6 +136,10 @@ let description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = lib.licenses.bsd2; + maintainers = [ + lib.maintainers.leona + lib.maintainers.osnyx + ]; platforms = lib.platforms.unix; }; }; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 551998daa98e..eb64e217a550 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -109,6 +109,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.percona.com/software/percona-xtrabackup"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.izorkin ]; + maintainers = [ + lib.maintainers.izorkin + lib.maintainers.leona + lib.maintainers.osnyx + ]; }; })