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

clarify type name

Browse source
This commit is contained in:
Daylin Morgan 2025-02-08 16:55:25 -06:00
parent 593eba6ba4
commit 9e40305052
Signed by: daylin
GPG key ID: 950D13E9719334AD
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,25 +53,25 @@ proc nixosRebuild*(subcmd: NixosRebuildSubcmd, args: openArray[string] = [], rem
quitWithCmd cmd quitWithCmd cmd
type type
Derivation = object DrvPath = object
storePath*, hash*, name*: string path*, hash*, name*: string
DryRunOutput = object DryRunOutput = object
toBuild: seq[Derivation] toBuild: seq[DrvPath]
toFetch: seq[Derivation] toFetch: seq[DrvPath]
func toDerivation*(pkg: string): Derivation = func toDerivation*(pkg: string): DrvPath =
let path = pkg.strip() let path = pkg.strip()
let s = path.split("-", 1) let s = path.split("-", 1)
result.storePath = path result.path = path
result.hash = s[0].rsplit("/")[^1] result.hash = s[0].rsplit("/")[^1]
result.name = s[^1].replace(".drv","") result.name = s[^1].replace(".drv","")
func toDerivations(lines: seq[string]): seq[Derivation] = func toDerivations(lines: seq[string]): seq[DrvPath] =
for pkg in lines: for pkg in lines:
result.add (toDerivation pkg) result.add (toDerivation pkg)
proc cmpDrv(x, y: Derivation): int = proc cmpDrv(x, y: DrvPath): int =
cmp(x.name, y.name) cmp(x.name, y.name)
proc parseDryRunOutput(err: string): DryRunOutput = proc parseDryRunOutput(err: string): DryRunOutput =
@ -115,7 +115,7 @@ proc trunc*(s: string, limit: int): string =
else: else:
s[0..(limit-4)] & "..." s[0..(limit-4)] & "..."
proc display(msg: string, drvs: seq[Derivation]) = proc display(msg: string, drvs: seq[DrvPath]) =
echo fmt"{msg}: [bold cyan]{drvs.len()}[/]".bb echo fmt"{msg}: [bold cyan]{drvs.len()}[/]".bb
if drvs.len > 0: if drvs.len > 0:
let maxLen = min(max drvs.mapIt(it.name.len), 40) let maxLen = min(max drvs.mapIt(it.name.len), 40)
@ -139,7 +139,7 @@ proc toBuildNixosConfiguration(): seq[string] =
capture = {CaptStderr} capture = {CaptStderr}
) )
let output = parseDryRunOutput err let output = parseDryRunOutput err
return output.toBuild.mapIt(it.storePath) return output.toBuild.mapIt(it.path)
type type
DerivationOutput = object DerivationOutput = object
@ -252,7 +252,7 @@ proc systemPathDrvsToBuild*(): seq[string] =
func splitDrv(drv: string): tuple[name, hash:string] = func splitDrv(drv: string): tuple[name, hash:string] =
let s = drv.split("-", 1) let s = drv.split("-", 1)
(s[1].replace(".drv^*",""),s[0].split("/")[^1]) (s[1].replace(".drv",""),s[0].split("/")[^1])
proc writeDervationsToStepSummary(drvs: seq[string]) = proc writeDervationsToStepSummary(drvs: seq[string]) =
let rows = collect( let rows = collect(