daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-02-23 03:45:50 -06:00
Code Issues Projects Releases Packages Wiki Activity

use sets and fixup multihost cache build

Browse source
This commit is contained in:
Daylin Morgan 2025-02-17 22:57:24 -06:00
parent 315a741882
commit 0f017f5f13
Signed by: daylin
GPG key ID: 950D13E9719334AD
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/oizys/src/oizys/nix.nim
View file

@ -224,7 +224,7 @@ proc getSystemPathInputDrvs*(): seq[string] =
for inputDrv, _ in drv.inputDrvs: for inputDrv, _ in drv.inputDrvs:
inputDrv inputDrv
proc missingDrvNixEvalJobs*(): seq[NixEvalOutput] = proc missingDrvNixEvalJobs*(): HashSet[NixEvalOutput] =
## get all derivations not cached using nix-eval-jobs ## get all derivations not cached using nix-eval-jobs
var cmd = "nix-eval-jobs" var cmd = "nix-eval-jobs"
cmd.addArgs "--flake", "--check-cache-status" cmd.addArgs "--flake", "--check-cache-status"
@ -232,27 +232,28 @@ proc missingDrvNixEvalJobs*(): seq[NixEvalOutput] =
for host in getHosts(): for host in getHosts():
let (o, _) = runCmdCaptWithSpinner( let (o, _) = runCmdCaptWithSpinner(
cmd & (getFlake() & "#systemPaths." & host), fmt"{cmd} {getFlake()}#systemPaths.{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
var cached: seq[NixEvalOutput] var cached: HashSet[NixEvalOutput]
var ignored: seq[NixEvalOutput] var ignored: HashSet[NixEvalOutput]
for line in output.strip().splitLines(): for line in output.strip().splitLines():
let output = line.fromJson(NixEvalOutput) let output = line.fromJson(NixEvalOutput)
if output.isCached: if output.isCached:
cached.add output cached.incl output
elif output.name.isIgnored(): elif output.name.isIgnored():
ignored.add output ignored.incl output
else: else:
result.add output result.incl output
debug "cached derivations: ", bb($cached.len, "yellow") debug "cached derivations: ", bb($cached.len, "yellow")
debug "ignored derivations: ", bb($ignored.len, "yellow") debug "ignored derivations: ", bb($ignored.len, "yellow")
result = result.toSet().toSeq() func fmtDrvsForNix*(drvs: HashSet[NixEvalOutput]): string {.inline.} =
drvs.mapIt(it.drvPath & "^*").join(" ")
func fmtDrvsForNix*(drvs: seq[NixEvalOutput]): string {.inline.} = func fmtDrvsForNix*(drvs: seq[NixEvalOutput]): string {.inline.} =
drvs.mapIt(it.drvPath & "^*").join(" ") drvs.mapIt(it.drvPath & "^*").join(" ")