mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-22 15:15:50 -06:00
use hydrajobs
This commit is contained in:
parent
4a13d52025
commit
3a7ad33196
3 changed files with 17 additions and 28 deletions
|
@ -89,17 +89,22 @@ let
|
|||
}
|
||||
);
|
||||
formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper);
|
||||
systemPaths =
|
||||
(readDir ../hosts)
|
||||
|> mapAttrs (
|
||||
name: _:
|
||||
self.nixosConfigurations.othalan.config.environment.systemPackages
|
||||
|> map (pkg: {
|
||||
name = pkg.name;
|
||||
value = pkg;
|
||||
})
|
||||
|> listToAttrs
|
||||
);
|
||||
|
||||
hydraJobs = {
|
||||
systemPackages =
|
||||
(readDir ../hosts)
|
||||
|> mapAttrs (
|
||||
hostname: _:
|
||||
self.nixosConfigurations."${hostname}".config.environment.systemPackages
|
||||
|> map (drv: {
|
||||
name = drv.name;
|
||||
value = drv;
|
||||
})
|
||||
|> listToAttrs
|
||||
);
|
||||
|
||||
inherit (self) packages;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
@ -49,22 +49,6 @@ let
|
|||
]
|
||||
++ (selfModules ''oizys'')
|
||||
++ (nixosModules ''lix-module|sops-nix'')
|
||||
++ [
|
||||
(
|
||||
{ ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
# override what the lix-module set
|
||||
# make sure attic is using this lix
|
||||
nix = inputs.self.${final.system}.lix;
|
||||
})
|
||||
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
]
|
||||
++ (hostFiles hostName);
|
||||
|
||||
specialArgs = commonSpecialArgs // {
|
||||
|
|
|
@ -232,7 +232,7 @@ proc missingDrvNixEvalJobs*(): HashSet[NixEvalOutput] =
|
|||
|
||||
for host in getHosts():
|
||||
let (o, _) = runCmdCaptWithSpinner(
|
||||
fmt"{cmd} {getFlake()}#systemPaths.{host}",
|
||||
fmt"{cmd} {getFlake()}#hydraJobs.systemPackages.{host}",
|
||||
bb"running [b]nix-eval-jobs[/] for system path: " & host.bb("bold")
|
||||
)
|
||||
output.add o
|
||||
|
|
Loading…
Add table
Reference in a new issue