alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pkgs: fix grafanaDashboards access in flake

Browse source 
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`.
This commit is contained in:
Antoine Martin 2021-07-14 21:09:26 +02:00
parent cc825d1e53
commit c7c87fcdb4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/default.nix
View file

@ -2,6 +2,6 @@
{ {
sddm-sugar-candy = pkgs.callPackage ./sddm-sugar-candy {}; sddm-sugar-candy = pkgs.callPackage ./sddm-sugar-candy {};
kaleidoscope-udev-rules = pkgs.callPackage ./kaleidoscope-udev-rules {}; 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 {}; spot = pkgs.callPackage ./spot {};
} }

4
services/monitoring.nix
View file

@ -38,12 +38,12 @@ in {
dashboards = [ dashboards = [
{ {
name = "Node Exporter"; name = "Node Exporter";
options.path = pkgs.packages.grafana-dashboards.node-exporter; options.path = pkgs.packages.grafanaDashboards.node-exporter;
disableDeletion = true; disableDeletion = true;
} }
{ {
name = "NGINX"; name = "NGINX";
options.path = pkgs.packages.grafana-dashboards.nginx; options.path = pkgs.packages.grafanaDashboards.nginx;
disableDeletion = true; disableDeletion = true;
} }
]; ];