From 884edcc23a1e7fc6de1186463d76e32e4a7dd667 Mon Sep 17 00:00:00 2001
From: Matthew Wraith <matthew.wraith@bitnomial.com>
Date: Fri, 17 Feb 2023 18:21:01 -0800
Subject: [PATCH 1/2] grafana-dash-n-grab: init at 0.3.1

---
 .../grafana-dash-n-grab/default.nix           | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana-dash-n-grab/default.nix

diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
new file mode 100644
index 000000000000..f3f25370f30e
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
@@ -0,0 +1,37 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "grafana-dash-n-grab";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "esnet";
+    repo = "gdg";
+    sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA=";
+  };
+
+  vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+    "-X github.com/esnet/gdg/version.GitCommit=${src.rev}"
+  ];
+
+  # The test suite tries to communicate with a running version of grafana locally. This fails if
+  # you don't have grafana running.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities";
+    license = licenses.bsd3;
+    homepage = "https://github.com/esnet/gdg";
+    maintainers = with maintainers; [ wraithm ] ++ teams.bitnomial.members;
+    platforms = platforms.unix;
+    mainProgram = "gdg";
+    changelog =
+      "https://github.com/esnet/gdg/releases/tag/v${version}";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e691cacef64..6b138b04461f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24485,6 +24485,8 @@ with pkgs;
 
   grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };
 
+  grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { };
+
   gerbera = callPackage ../servers/gerbera {};
 
   gobetween = callPackage ../servers/gobetween { };

From 92b71b5be970528ad5ad0d4c57abcba1da4c8b94 Mon Sep 17 00:00:00 2001
From: Matthew Wraith <matthew.wraith@bitnomial.com>
Date: Fri, 17 Feb 2023 18:46:36 -0800
Subject: [PATCH 2/2] maintainers: add wraithm

---
 maintainers/maintainer-list.nix                         | 6 ++++++
 maintainers/team-list.nix                               | 1 +
 pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04658beb7f81..254e50c75c4c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15983,6 +15983,12 @@
     github = "wr0belj";
     githubId = 40501814;
   };
+  wraithm = {
+    name = "Matthew Wraith";
+    email = "wraithm@gmail.com";
+    github = "wraithm";
+    githubId = 1512913;
+  };
   wrmilling = {
     name = "Winston R. Milling";
     email = "Winston@Milli.ng";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 4d338675c654..4b3c0176910f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -81,6 +81,7 @@ with lib.maintainers; {
     # Verify additions to this team with at least one already existing member of the team.
     members = [
       cdepillabout
+      wraithm
     ];
     scope = "Group registration for packages maintained by Bitnomial.";
     shortName = "Bitnomial employees";
diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
index f3f25370f30e..ac9ec9f02d7b 100644
--- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
+++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
     description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities";
     license = licenses.bsd3;
     homepage = "https://github.com/esnet/gdg";
-    maintainers = with maintainers; [ wraithm ] ++ teams.bitnomial.members;
+    maintainers = with maintainers; teams.bitnomial.members;
     platforms = platforms.unix;
     mainProgram = "gdg";
     changelog =