diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 19acdb48878e..85f64d357539 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17630,12 +17630,6 @@ } ]; }; - mockersf = { - email = "francois.mockers@vleue.com"; - github = "mockersf"; - githubId = 8672791; - name = "François Mockers"; - }; modderme123 = { email = "modderme123@gmail.com"; github = "milomg"; @@ -19317,12 +19311,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 8c4d4bd7933d..d830b30a3ec0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -363,17 +363,6 @@ with lib.maintainers; github = "freedesktop"; }; - fslabs = { - # 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."; - 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; }; }