From b847f3078aeb7d5bcac931818e6173810f46ae23 Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Fri, 23 Feb 2024 19:59:09 +0100
Subject: [PATCH 1/4] maintainers: add greaka

(cherry picked from commit 7bda925dacb26d2207c5e3c4b23f7e12d6f4e497)
---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d3118edf4fd4..c2e77eef35f8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7731,6 +7731,14 @@
       fingerprint = "7FC7 98AB 390E 1646 ED4D  8F1F 797F 6238 68CD 00C2";
     }];
   };
+  greaka = {
+    email = "git@greaka.de";
+    github = "greaka";
+    githubId = 2805834;
+    name = "Greaka";
+    keys =
+      [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E  44C5 EE92 A5CD C367 118C"; }];
+  };
   greg = {
     email = "greg.hellings@gmail.com";
     github = "greg-hellings";

From 8ab3d77d283c8394029fcbff6fed7f83f9ea8386 Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Fri, 23 Feb 2024 20:00:05 +0100
Subject: [PATCH 2/4] maintainers: add lpostula

(cherry picked from commit 8d6f8c9ed75a8900b6bd91b2a54c305c38b4cf40)
---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c2e77eef35f8..afe506275a97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11934,6 +11934,14 @@
     githubId = 10626;
     name = "Andreas Wagner";
   };
+  lpostula = {
+    email = "lois@postu.la";
+    github = "loispostula";
+    githubId = 1423612;
+    name = "Loïs Postula";
+    keys =
+      [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D  774C 3819 3C6A 09C3 9ED1"; }];
+  };
   lrewega = {
     email = "lrewega@c32.ca";
     github = "lrewega";

From 21c744b445757dfb7bcdcb7798a76135270b4aab Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Fri, 23 Feb 2024 20:02:40 +0100
Subject: [PATCH 3/4] maintainers/team-list: add fslabs

(cherry picked from commit 0e5f44658ee645b05322c221f0e00b840991a8d2)
---
 maintainers/team-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index e0c1629a6f23..b2539cf31c82 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -345,6 +345,16 @@ with lib.maintainers; {
     shortName = "freedesktop.org packaging";
   };
 
+  fslabs = {
+    # Verify additions to this team with at least one already existing member of the team.
+    members = [
+      greaka
+      lpostula
+    ];
+    scope = "Group registration for packages maintained by Foresight Spatial Labs.";
+    shortName = "Foresight Spatial Labs employees";
+  };
+
   gcc = {
     members = [
       synthetica

From 81366e6c91fc3de209f9a719bd7d0e94728e5ac0 Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Fri, 23 Feb 2024 20:03:51 +0100
Subject: [PATCH 4/4] grafanaPlugins.grafana-oncall-app: init at 1.5.1

(cherry picked from commit 254dbdcc6296ba83381e218bf755b939c91a7f8e)
---
 .../grafana/plugins/grafana-oncall-app/default.nix  | 13 +++++++++++++
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix
new file mode 100644
index 000000000000..6f475f49cfa7
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin {
+  pname = "grafana-oncall-app";
+  version = "1.5.1";
+  zipHash = "sha256-3mC4TJ9ACM9e3e6UKI5vaDwXuW6RjbsOQFJU5v0wjk8=";
+  meta = with lib; {
+    description = "Developer-friendly incident response for Grafana";
+    license = licenses.agpl3Only;
+    maintainers = lib.teams.fslabs.members;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index 8bbd738f7ab9..bd1e775243f7 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -8,6 +8,7 @@
   grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { };
   grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { };
   grafana-clock-panel = callPackage ./grafana-clock-panel { };
+  grafana-oncall-app = callPackage ./grafana-oncall-app { };
   grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
   grafana-polystat-panel = callPackage ./grafana-polystat-panel { };
   grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };