treewide: switch instances of lib.teams.*.members to the new meta.teams attribute

.git-blame-ignore-revs

@@ -263,3 +263,6 @@ a4f7e161b380b35b2f7bc432659a95fd71254ad8
 
 # nix-builder-vm: nixfmt-rfc-style
 a034fb50f79816c6738fb48b48503b09ea3b0132
+
+# treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
+05580f4b4433fda48fff30f60dfd303d6ee05d21

pkgs/applications/audio/codecserver/default.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Modular audio codec server";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
-    maintainers = teams.c3d2.members;
+    teams = [ teams.c3d2 ];
     mainProgram = "codecserver";
   };
 }

pkgs/applications/display-managers/lightdm/default.nix

@@ -128,6 +128,6 @@ stdenv.mkDerivation rec {
     description = "Cross-desktop display manager";
     platforms = platforms.linux;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+    teams = [ teams.pantheon ];
   };
 }

pkgs/applications/editors/android-studio-for-platform/common.nix

@@ -188,7 +188,8 @@ runCommand drvName
       # binaries are also distributed as proprietary software (unlike the
       # source-code itself).
       platforms = [ "x86_64-linux" ];
-      maintainers = teams.android.members ++ (with maintainers; [ robbins ]);
+      maintainers = with maintainers; [ robbins ];
+      teams = [ teams.android ];
       mainProgram = pname;
     };
   }

pkgs/applications/editors/android-studio/common.nix

@@ -324,11 +324,19 @@ let
           platforms = [ "x86_64-linux" ];
           maintainers =
             rec {
-              stable =
-                lib.teams.android.members
-                ++ (with lib.maintainers; [
-                  alapshin
-                ]);
+              stable = with lib.maintainers; [
+                alapshin
+              ];
+              beta = stable;
+              canary = stable;
+              dev = stable;
+            }
+            ."${channel}";
+          teams =
+            rec {
+              stable = with lib.teams; [
+                android
+              ];
               beta = stable;
               canary = stable;
               dev = stable;

pkgs/applications/editors/jetbrains/default.nix

@@ -55,7 +55,8 @@ let
       + lib.optionalString meta.isOpenSource (
         if fromSource then " (built from source)" else " (patched binaries from jetbrains)"
       );
-    maintainers = lib.teams.jetbrains.members ++ map (x: lib.maintainers."${x}") meta.maintainers;
+    maintainers = map (x: lib.maintainers."${x}") meta.maintainers;
+    teams = [ lib.teams.jetbrains ];
     license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree;
     sourceProvenance =
       if fromSource then

pkgs/applications/editors/neovim/wrapper.nix

@@ -364,7 +364,7 @@ let
             homepage
             mainProgram
             license
-            maintainers
+            teams
             platforms
             ;
 

pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix

@@ -25,7 +25,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep";
     homepage = "https://github.com/Azure/bicep/tree/main/src/vscode-bicep";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ] ++ lib.teams.stridtech.members;
+    teams = [ lib.teams.stridtech ];
   };
 }
 

pkgs/applications/emulators/libretro/mkLibretroCore.nix

@@ -94,7 +94,7 @@ stdenv.mkDerivation (
       inherit mainProgram;
       inherit (retroarch-bare.meta) platforms;
       homepage = "https://www.libretro.com/";
-      maintainers = with lib.maintainers; [ ] ++ lib.teams.libretro.members;
+      teams = [ lib.teams.libretro ];
     } // (args.meta or { });
   }
   // extraArgs

pkgs/applications/gis/grass/default.nix

@@ -165,7 +165,8 @@ stdenv.mkDerivation (finalAttrs: {
     description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
     homepage = "https://grass.osgeo.org/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ];
+    maintainers = with maintainers; [ mpickering ];
+    teams = [ teams.geospatial ];
     platforms = platforms.all;
     mainProgram = "grass";
   };

pkgs/applications/gis/qgis/unwrapped-ltr.nix

@@ -201,7 +201,8 @@ mkDerivation rec {
     description = "Free and Open Source Geographic Information System";
     homepage = "https://www.qgis.org";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; teams.geospatial.members ++ [ lsix ];
+    maintainers = with maintainers; [ lsix ];
+    teams = [ teams.geospatial ];
     platforms = with platforms; linux;
   };
 }

pkgs/applications/gis/qgis/unwrapped.nix

@@ -197,7 +197,8 @@ mkDerivation rec {
     description = "Free and Open Source Geographic Information System";
     homepage = "https://www.qgis.org";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; teams.geospatial.members ++ [ lsix ];
+    maintainers = with maintainers; [ lsix ];
+    teams = [ teams.geospatial ];
     platforms = with platforms; linux;
   };
 }

pkgs/applications/gis/whitebox-tools/default.nix

@@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
     description = "Advanced geospatial data analysis platform";
     license = lib.licenses.mit;
-    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ mpickering ]);
+    maintainers = with lib.maintainers; [ mpickering ];
+    teams = [ lib.teams.geospatial ];
   };
 }

pkgs/applications/graphics/gnome-decoder/default.nix

@@ -92,6 +92,7 @@ clangStdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     mainProgram = "decoder";
-    maintainers = with maintainers; [ zendo ] ++ lib.teams.gnome-circle.members;
+    maintainers = with maintainers; [ zendo ];
+    teams = [ teams.gnome-circle ];
   };
 }

pkgs/applications/graphics/gnome-obfuscate/default.nix

@@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     mainProgram = "obfuscate";
-    maintainers = with maintainers; [ fgaz ] ++ lib.teams.gnome-circle.members;
+    maintainers = with maintainers; [ fgaz ];
+    teams = [ teams.gnome-circle ];
   };
 })

pkgs/applications/misc/collision/default.nix

@@ -108,6 +108,7 @@ crystal.buildCrystalPackage rec {
     homepage = "https://github.com/GeopJr/Collision";
     license = licenses.bsd2;
     mainProgram = "collision";
-    maintainers = with maintainers; [ sund3RRR ] ++ lib.teams.gnome-circle.members;
+    maintainers = with maintainers; [ sund3RRR ];
+    teams = [ teams.gnome-circle ];
   };
 }

pkgs/applications/networking/cluster/cni/plugins.nix

@@ -53,6 +53,6 @@ buildGoModule rec {
     homepage = "https://www.cni.dev/plugins/";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ] ++ teams.podman.members;
+    teams = [ teams.podman ];
   };
 }

pkgs/applications/networking/cluster/k3s/builder.nix

@@ -99,7 +99,7 @@ let
     description = "Lightweight Kubernetes distribution";
     license = lib.licenses.asl20;
     homepage = "https://k3s.io";
-    maintainers = lib.teams.k3s.members;
+    teams = [ lib.teams.k3s ];
     platforms = lib.platforms.linux;
 
     # resolves collisions with other installations of kubectl, crictl, ctr

pkgs/applications/networking/cluster/kubernetes/default.nix

@@ -99,7 +99,7 @@ buildGoModule rec {
     description = "Production-Grade Container Scheduling and Management";
     license = licenses.asl20;
     homepage = "https://kubernetes.io";
-    maintainers = with maintainers; [ ] ++ teams.kubernetes.members;
+    teams = [ teams.kubernetes ];
     platforms = platforms.linux;
   };
 

pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix

@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lightweight matrix client with legacy and mobile browser support";
     homepage = "https://github.com/element-hq/hydrogen-web";
-    maintainers = lib.teams.matrix.members;
+    teams = [ lib.teams.matrix ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     inherit (olm.meta) knownVulnerabilities;

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/evolution";
     description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
     mainProgram = "evolution";
-    maintainers = teams.gnome.members;
+    teams = [ teams.gnome ];
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
   };

pkgs/applications/radio/openwebrx/default.nix

@@ -42,7 +42,7 @@ let
       homepage = "https://github.com/jketterl/js8py";
       description = "Library to decode the output of the js8 binary of JS8Call";
       license = licenses.gpl3Only;
-      maintainers = teams.c3d2.members;
+      teams = [ teams.c3d2 ];
     };
   };
 
@@ -75,7 +75,7 @@ let
       description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware";
       license = licenses.gpl3Only;
       platforms = platforms.unix;
-      maintainers = teams.c3d2.members;
+      teams = [ teams.c3d2 ];
     };
   };
 
@@ -120,6 +120,6 @@ buildPythonApplication rec {
     description = "Simple DSP library and command-line tool for Software Defined Radio";
     mainProgram = "openwebrx";
     license = licenses.gpl3Only;
-    maintainers = teams.c3d2.members;
+    teams = [ teams.c3d2 ];
   };
 }

pkgs/applications/science/chemistry/jmol/default.nix

@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.lgpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ mounium ] ++ teams.sage.members;
+    maintainers = with maintainers; [ mounium ];
+    teams = [ teams.sage ];
   };
 }

pkgs/applications/science/math/R/default.nix

@@ -256,6 +256,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkgConfigModules = [ "libR" ];
     platforms = platforms.all;
 
-    maintainers = with maintainers; [ jbedo ] ++ teams.sage.members;
+    maintainers = with maintainers; [ jbedo ];
+    teams = [ teams.sage ];
   };
 })

pkgs/applications/science/math/pari/default.nix

@@ -78,7 +78,8 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ertes ] ++ teams.sage.members;
+    maintainers = with maintainers; [ ertes ];
+    teams = [ teams.sage ];
     platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "gp";
   };

pkgs/applications/science/math/pari/gp2c.nix

@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     inherit (pari.meta)
       license
       maintainers
+      teams
       platforms
       broken
       ;

pkgs/applications/system/monitor/default.nix

@@ -101,7 +101,8 @@ stdenv.mkDerivation rec {
       section in the NixOS manual.
     '';
     homepage = "https://github.com/stsdc/monitor";
-    maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ xiorcale ];
+    teams = [ teams.pantheon ];
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
     mainProgram = "com.github.stsdc.monitor";

pkgs/applications/system/timed/default.nix

@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/sailfishos/timed/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl21Only;
     mainProgram = "timed";
-    maintainers = lib.teams.lomiri.members;
+    teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
       "timed-qt${lib.versions.major qtbase.version}"

pkgs/applications/version-management/danger-gitlab/default.nix

@@ -9,7 +9,7 @@ bundlerApp {
     description = "Gem that exists to ensure all dependencies are set up for Danger with GitLab";
     homepage = "https://github.com/danger/danger-gitlab-gem";
     license = licenses.mit;
-    maintainers = teams.serokell.members;
+    teams = [ teams.serokell ];
     mainProgram = "danger";
   };
 }

pkgs/applications/version-management/gitlab/default.nix

@@ -299,7 +299,7 @@ stdenv.mkDerivation {
     {
       homepage = "http://www.gitlab.com/";
       platforms = platforms.linux;
-      maintainers = teams.gitlab.members;
+      teams = [ teams.gitlab ];
     }
     // (
       if gitlabEnterprise then

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

@@ -31,7 +31,7 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "http://www.gitlab.com/";
     platforms = platforms.linux;
-    maintainers = teams.gitlab.members;
+    teams = [ teams.gitlab ];
     license = licenses.mit;
   };
 }

pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix

@@ -27,6 +27,6 @@ buildKodiAddon rec {
     homepage = "https://a4k-openproject.github.io/a4kSubtitles/";
     description = "Multi-Source Subtitles Addon";
     license = licenses.mit;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/archive_tool/default.nix

@@ -28,6 +28,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/zach-morris/script.module.archive_tool";
     description = "Set of common python functions to work with the Kodi archive virtual file system (vfs) binary addons";
     license = licenses.gpl3Plus;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/arrow/default.nix

@@ -33,6 +33,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/razzeee/script.module.arrow";
     description = "Better dates & times for Python";
     license = licenses.asl20;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/arteplussept/default.nix

@@ -35,6 +35,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept";
     description = "Watch videos available on Arte+7";
     license = licenses.mit;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/certifi/default.nix

@@ -42,6 +42,6 @@ buildKodiAddon rec {
     homepage = "https://certifi.io";
     description = "Python package for providing Mozilla's CA Bundle";
     license = licenses.mpl20;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/chardet/default.nix

@@ -26,6 +26,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/Freso/script.module.chardet";
     description = "Universal encoding detector";
     license = licenses.lgpl2Only;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/controller-topology-project/default.nix

@@ -36,7 +36,7 @@ let
       homepage = "https://github.com/kodi-game/controller-topology-project";
       description = "Models how controllers connect to and map to each other for all gaming history";
       license = with licenses; [ odbl ];
-      maintainers = teams.kodi.members;
+      teams = [ teams.kodi ];
     };
   };
 in

pkgs/applications/video/kodi/addons/dateutil/default.nix

@@ -35,6 +35,6 @@ buildKodiAddon rec {
       asl20
       bsd3
     ];
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/defusedxml/default.nix

@@ -27,6 +27,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/tiran/defusedxml";
     description = "defusing XML bombs and other exploits";
     license = licenses.psfl;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }

pkgs/applications/video/kodi/addons/formula1/default.nix

@@ -31,6 +31,6 @@ buildKodiAddon rec {
     homepage = "https://github.com/jaylinski/kodi-addon-formula1";
     description = "Videos from the Formula 1 website";
     license = licenses.mit;
-    maintainers = teams.kodi.members;
+    teams = [ teams.kodi ];
   };
 }