mara/hyperhive
mara/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Activity

module-eval: give the Grafana stand-in a mainProgram, so upstream's getExe stops warning

Browse source
This commit is contained in:
damocles 2026-11-05 09:26:30 +01:00 • committed by mara
commit 3a77e869eb
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nix/module-eval/grafana.nix
View file

@ -18,6 +18,7 @@ let
nixosSystem nixosSystem
; ;
}) })
grafanaStub
hive hive
runGroup runGroup
; ;
@ -27,7 +28,7 @@ let
deploy.grafana.datasourceUrl = "http://127.0.0.1:19999"; deploy.grafana.datasourceUrl = "http://127.0.0.1:19999";
deploy.grafana.logsDatasourceUrl = "http://127.0.0.1:19998"; deploy.grafana.logsDatasourceUrl = "http://127.0.0.1:19998";
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
}; };
# A host that tries to move the socket directory; reading the option throws. # A host that tries to move the socket directory; reading the option throws.
@ -35,7 +36,7 @@ let
deploy.grafana.enable = true; deploy.grafana.enable = true;
deploy.grafana.socketDir = "/run/test-grafana-sock"; deploy.grafana.socketDir = "/run/test-grafana-sock";
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
}; };
# Same pairing `nix/module-eval/bao-otel-collector.nix` uses for its own # Same pairing `nix/module-eval/bao-otel-collector.nix` uses for its own
@ -55,7 +56,7 @@ let
grafanaWithAuthelia = hive { grafanaWithAuthelia = hive {
deploy.grafana.enable = true; deploy.grafana.enable = true;
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
deploy.authelia.enable = true; deploy.authelia.enable = true;
deploy.bao.clientCertFile = "/etc/pki/bao-client.pem"; deploy.bao.clientCertFile = "/etc/pki/bao-client.pem";
deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem"; deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem";
@ -70,7 +71,7 @@ let
grafanaRemoteAuthelia = hive { grafanaRemoteAuthelia = hive {
deploy.grafana.enable = true; deploy.grafana.enable = true;
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
swarm.authelia.url = "https://auth.example.invalid"; swarm.authelia.url = "https://auth.example.invalid";
deploy.bao.clientCertFile = "/etc/pki/bao-client.pem"; deploy.bao.clientCertFile = "/etc/pki/bao-client.pem";
deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem"; deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem";
@ -86,7 +87,7 @@ let
grafanaNoIdentity = hive { grafanaNoIdentity = hive {
deploy.grafana.enable = true; deploy.grafana.enable = true;
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
swarm.authelia.url = "https://auth.example.invalid"; swarm.authelia.url = "https://auth.example.invalid";
# Declares a vhost that binds its own `listen`, which the gateway refuses. # Declares a vhost that binds its own `listen`, which the gateway refuses.
gateway.vhosts."own-listen.t.local".listen = [ ]; gateway.vhosts."own-listen.t.local".listen = [ ];

8
nix/module-eval/lib.nix
View file

@ -301,9 +301,17 @@ let
); );
in in
builtins.foldl' (acc: v: builtins.seq v acc) true vals; builtins.foldl' (acc: v: builtins.seq v acc) true vals;
# A stand-in for the Grafana package in the cases that do not run it. Upstream's
# Grafana module takes the executable's name from `meta.mainProgram`, and
# warns when a package has none.
grafanaStub = pkgs.emptyDirectory // {
meta.mainProgram = "grafana";
};
in in
{ {
inherit hive hiveWith; inherit hive hiveWith;
inherit grafanaStub;
inherit hiveWithController; inherit hiveWithController;
inherit agent; inherit agent;
inherit agentWith; inherit agentWith;

3
nix/module-eval/secret-publisher.nix
View file

@ -18,6 +18,7 @@ let
nixosSystem nixosSystem
; ;
}) })
grafanaStub
hive hive
runGroup runGroup
; ;
@ -56,7 +57,7 @@ let
grafanaRemoteAuthelia = hive { grafanaRemoteAuthelia = hive {
deploy.grafana.enable = true; deploy.grafana.enable = true;
deploy.grafana.plugins = [ ]; deploy.grafana.plugins = [ ];
deploy.grafana.package = pkgs.emptyDirectory; deploy.grafana.package = grafanaStub;
swarm.authelia.url = "https://auth.example.invalid"; swarm.authelia.url = "https://auth.example.invalid";
deploy.bao.clientCertFile = "/etc/pki/bao-client.pem"; deploy.bao.clientCertFile = "/etc/pki/bao-client.pem";
deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem"; deploy.bao.clientKeyFile = "/etc/pki/bao-client-key.pem";