From ba2391c8d0be2c234fa4aecaea4aabcfb54f5e88 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 09:54:57 +0100
Subject: [PATCH] various: fix maintainer teams

The maintainers field currently expects actual maintainers only, not
entire teams. These can be added via `meta.teams` or via
`<team>.members` for NixOS tests, which don't support teams, yet.
---
 nixos/tests/nominatim.nix                                     | 4 ++--
 pkgs/by-name/py/pyroscope/package.nix                         | 2 +-
 pkgs/development/python-modules/rpy2-rinterface/default.nix   | 2 +-
 .../6/miopen/test-frugally-deep-model-loading.nix             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix
index 3919f245abd1..cff589f2807e 100644
--- a/nixos/tests/nominatim.nix
+++ b/nixos/tests/nominatim.nix
@@ -11,8 +11,8 @@ in
   name = "nominatim";
   meta = {
     maintainers = with lib.teams; [
-      geospatial
-      ngi
+      geospatial.members
+      ngi.members
     ];
   };
 
diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix
index d7396634b116..18f2bf17ecff 100644
--- a/pkgs/by-name/py/pyroscope/package.nix
+++ b/pkgs/by-name/py/pyroscope/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/grafana/pyroscope";
     changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = [ lib.teams.mercury ];
+    teams = [ lib.teams.mercury ];
     mainProgram = "pyroscope";
   };
 })
diff --git a/pkgs/development/python-modules/rpy2-rinterface/default.nix b/pkgs/development/python-modules/rpy2-rinterface/default.nix
index 13b20da717c8..cdc47e8e4df4 100644
--- a/pkgs/development/python-modules/rpy2-rinterface/default.nix
+++ b/pkgs/development/python-modules/rpy2-rinterface/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Python interface to R";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib; [ teams.sage ];
+    teams = with lib.teams; [ sage ];
   };
 }
diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
index 36cadd774a65..7f82083d2349 100644
--- a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
+++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Test that frugally-deep can load MIOpen model files";
-    maintainers = with lib.teams; [ rocm ];
+    teams = with lib.teams; [ rocm ];
     platforms = lib.platforms.linux;
   };
 }