From 9e40305052ab8afc848311eb0994a400102cf309 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Sat, 8 Feb 2025 16:55:25 -0600
Subject: [PATCH] clarify type name

---
 pkgs/oizys/src/oizys/nix.nim | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/oizys/src/oizys/nix.nim b/pkgs/oizys/src/oizys/nix.nim
index 28d88e9..020ec0e 100644
--- a/pkgs/oizys/src/oizys/nix.nim
+++ b/pkgs/oizys/src/oizys/nix.nim
@@ -53,25 +53,25 @@ proc nixosRebuild*(subcmd: NixosRebuildSubcmd, args: openArray[string] = [], rem
   quitWithCmd cmd
 
 type
-  Derivation = object
-    storePath*, hash*, name*: string
+  DrvPath = object
+    path*, hash*, name*: string
 
   DryRunOutput = object
-    toBuild: seq[Derivation]
-    toFetch: seq[Derivation]
+    toBuild: seq[DrvPath]
+    toFetch: seq[DrvPath]
 
-func toDerivation*(pkg: string): Derivation =
+func toDerivation*(pkg: string): DrvPath =
   let path = pkg.strip()
   let s = path.split("-", 1)
-  result.storePath = path
+  result.path = path
   result.hash = s[0].rsplit("/")[^1]
   result.name = s[^1].replace(".drv","")
 
-func toDerivations(lines: seq[string]): seq[Derivation] =
+func toDerivations(lines: seq[string]): seq[DrvPath] =
   for pkg in lines:
     result.add (toDerivation pkg)
 
-proc cmpDrv(x, y: Derivation): int = 
+proc cmpDrv(x, y: DrvPath): int = 
   cmp(x.name, y.name)
 
 proc parseDryRunOutput(err: string): DryRunOutput =
@@ -115,7 +115,7 @@ proc trunc*(s: string, limit: int): string =
   else:
     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
   if drvs.len > 0:
     let maxLen = min(max drvs.mapIt(it.name.len), 40)
@@ -139,7 +139,7 @@ proc toBuildNixosConfiguration(): seq[string] =
     capture = {CaptStderr}
   )
   let output = parseDryRunOutput err
-  return output.toBuild.mapIt(it.storePath)
+  return output.toBuild.mapIt(it.path)
 
 type
   DerivationOutput = object
@@ -252,7 +252,7 @@ proc systemPathDrvsToBuild*(): seq[string] =
 
 func splitDrv(drv: string): tuple[name, hash:string] =
   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]) =
   let rows = collect(