From 0b33339a16b5e3c7a85f00ae7db65d211cf72712 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 21:49:47 +0100 Subject: [PATCH 1/3] maintainers: drop mockersf Inactive since their addition in August 2025. Removing according to the maintainer guidelines. --- maintainers/maintainer-list.nix | 6 ------ maintainers/team-list.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29df4d5cdc6d..6b52c7e7dcfd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17617,12 +17617,6 @@ } ]; }; - mockersf = { - email = "francois.mockers@vleue.com"; - github = "mockersf"; - githubId = 8672791; - name = "François Mockers"; - }; modderme123 = { email = "modderme123@gmail.com"; github = "milomg"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7b95a1030df9..b766cd52d7d8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -398,7 +398,6 @@ with lib.maintainers; # Verify additions to this team with at least one already existing member of the team. members = [ lpostula - mockersf NthTensor ]; scope = "Group registration for packages maintained by Foresight Spatial Labs."; From cedc564f5677542d33b407722a7e5148d99c985a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 21:50:16 +0100 Subject: [PATCH 2/3] maintainers: drop NthTensor Inactive since their addition in August 2025. Removing according to the maintainer guidelines. --- maintainers/maintainer-list.nix | 6 ------ maintainers/team-list.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6b52c7e7dcfd..d77b6698dc81 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19295,12 +19295,6 @@ githubId = 1839979; name = "Niklas Thörne"; }; - NthTensor = { - email = "miles.silberlingcook@gmail.com"; - github = "NthTensor"; - githubId = 16138381; - name = "Miles Silberling-Cook"; - }; nudelsalat = { email = "nudelsalat@clouz.de"; name = "Fabian Dreßler"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b766cd52d7d8..fc6768b08047 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -398,7 +398,6 @@ with lib.maintainers; # Verify additions to this team with at least one already existing member of the team. members = [ lpostula - NthTensor ]; scope = "Group registration for packages maintained by Foresight Spatial Labs."; shortName = "Foresight Spatial Labs employees"; From b43b145639f855bc4041aaa00d4e40ff602eb151 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 21:50:46 +0100 Subject: [PATCH 3/3] teams/fslabs: drop --- maintainers/team-list.nix | 9 --------- .../plugins/grafana-exploretraces-app/default.nix | 2 +- .../grafana/plugins/grafana-lokiexplore-app/default.nix | 2 +- .../grafana/plugins/grafana-oncall-app/default.nix | 2 +- .../grafana/plugins/grafana-pyroscope-app/default.nix | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fc6768b08047..f9cce198d97f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -394,15 +394,6 @@ with lib.maintainers; github = "freedesktop"; }; - fslabs = { - # Verify additions to this team with at least one already existing member of the team. - members = [ - lpostula - ]; - scope = "Group registration for packages maintained by Foresight Spatial Labs."; - shortName = "Foresight Spatial Labs employees"; - }; - gcc = { members = [ synthetica diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix index a5c62f35b612..b443e16cc6fa 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -7,7 +7,7 @@ grafanaPlugin { meta = { description = "Opinionated traces app"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.fslabs ]; + maintainers = with lib.maintainers; [ lpostula ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 5c81315bd639..92b882907fc4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -7,7 +7,7 @@ grafanaPlugin { meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.fslabs ]; + maintainers = with lib.maintainers; [ lpostula ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index fc8617ecd582..2039160a6437 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -7,7 +7,7 @@ grafanaPlugin { meta = { description = "Developer-friendly incident response for Grafana"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.fslabs ]; + maintainers = with lib.maintainers; [ lpostula ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix index 04486f08f241..4b42fbb8c125 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix @@ -7,7 +7,7 @@ grafanaPlugin { meta = { description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.fslabs ]; + maintainers = with lib.maintainers; [ lpostula ]; platforms = lib.platforms.unix; }; }