use hydrajobs

This commit is contained in:
Daylin Morgan 2025-02-18 00:11:03 -06:00
parent 4a13d52025
commit 3a7ad33196
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 17 additions and 28 deletions

View file

@ -89,17 +89,22 @@ let
} }
); );
formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper); formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper);
systemPaths =
(readDir ../hosts) hydraJobs = {
|> mapAttrs ( systemPackages =
name: _: (readDir ../hosts)
self.nixosConfigurations.othalan.config.environment.systemPackages |> mapAttrs (
|> map (pkg: { hostname: _:
name = pkg.name; self.nixosConfigurations."${hostname}".config.environment.systemPackages
value = pkg; |> map (drv: {
}) name = drv.name;
|> listToAttrs value = drv;
); })
|> listToAttrs
);
inherit (self) packages;
};
}; };
in in
{ {

View file

@ -49,22 +49,6 @@ let
] ]
++ (selfModules ''oizys'') ++ (selfModules ''oizys'')
++ (nixosModules ''lix-module|sops-nix'') ++ (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); ++ (hostFiles hostName);
specialArgs = commonSpecialArgs // { specialArgs = commonSpecialArgs // {

View file

@ -232,7 +232,7 @@ proc missingDrvNixEvalJobs*(): HashSet[NixEvalOutput] =
for host in getHosts(): for host in getHosts():
let (o, _) = runCmdCaptWithSpinner( 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") bb"running [b]nix-eval-jobs[/] for system path: " & host.bb("bold")
) )
output.add o output.add o