ci-root: fix grafana-packages in a hacky way

This commit is contained in:
Luke Granger-Brown 2020-12-31 01:36:01 +00:00
parent b2d8acd4b9
commit 214d81f198

View file

@ -8,7 +8,8 @@ let
lib = pkgs.lib;
prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; });
ciMachines = prefixAttrs "machine" depot.ops.nixos.systems;
ciPackages = prefixAttrs "pkg" depot.nix.pkgs;
ciPackages = prefixAttrs "pkg" (builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" ]);
ciGrafanaPlugins = prefixAttrs "pkg-grafana-plugins" depot.nix.pkgs.grafana-plugins;
ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images);
ciOther = prefixAttrs "other" {
@ -16,5 +17,5 @@ let
twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage;
};
in
pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciDocker ++ ciOther)
pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciGrafanaPlugins ++ ciDocker ++ ciOther)