From c7c87fcdb472497fc4c14d07559fe5ef33199e67 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Wed, 14 Jul 2021 21:09:26 +0200
Subject: [PATCH] pkgs: fix grafanaDashboards access in flake

The `packages` output from the flake needs flake-utils' `flattenTree` to
be valid (because it doesn't support nested sets), but that only works
if I use `recurseIntoAttrs`.
---
 pkgs/default.nix        | 2 +-
 services/monitoring.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2dcc61d..2f4608f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,6 +2,6 @@
 {
   sddm-sugar-candy = pkgs.callPackage ./sddm-sugar-candy {};
   kaleidoscope-udev-rules = pkgs.callPackage ./kaleidoscope-udev-rules {};
-  grafana-dashboards = pkgs.callPackage ./grafana-dashboards {};
+  grafanaDashboards = pkgs.recurseIntoAttrs (pkgs.callPackage ./grafana-dashboards {});
   spot = pkgs.callPackage ./spot {};
 }
diff --git a/services/monitoring.nix b/services/monitoring.nix
index fe66988..ff37171 100644
--- a/services/monitoring.nix
+++ b/services/monitoring.nix
@@ -38,12 +38,12 @@ in {
         dashboards = [
           {
             name = "Node Exporter";
-            options.path = pkgs.packages.grafana-dashboards.node-exporter;
+            options.path = pkgs.packages.grafanaDashboards.node-exporter;
             disableDeletion = true;
           }
           {
             name = "NGINX";
-            options.path = pkgs.packages.grafana-dashboards.nginx;
+            options.path = pkgs.packages.grafanaDashboards.nginx;
             disableDeletion = true;
           }
         ];