From cdb3cc4eb829651000f29bfd7979563dbd92ccd1 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Thu, 21 Nov 2024 14:37:11 -0600
Subject: [PATCH] fixup oizys spinners

---
 pkgs/oizys/default.nix        | 2 +-
 pkgs/oizys/nimble.lock        | 4 ++--
 pkgs/oizys/oizys.nimble       | 2 +-
 pkgs/oizys/src/oizys/exec.nim | 5 ++++-
 pkgs/oizys/src/oizys/nix.nim  | 1 -
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/oizys/default.nix b/pkgs/oizys/default.nix
index 57ff330..c2b3848 100644
--- a/pkgs/oizys/default.nix
+++ b/pkgs/oizys/default.nix
@@ -8,7 +8,7 @@ buildNimblePackage {
   verions = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-IWdlWC+j2h15WjVXXdDyxDZsb0/Ti1+jy6RfmqHFkjs=";
+  nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA=";
 
   meta = {
     description = "nix begat oizys";
diff --git a/pkgs/oizys/nimble.lock b/pkgs/oizys/nimble.lock
index 3babe60..c36d735 100644
--- a/pkgs/oizys/nimble.lock
+++ b/pkgs/oizys/nimble.lock
@@ -3,12 +3,12 @@
   "packages": {
     "hwylterm": {
       "version": "0.1.0",
-      "vcsRevision": "ef573dc0f8bf39f80704f92cfab39e1b9af82492",
+      "vcsRevision": "3cf572ea4afa6f895eb0897bfb8e6e35f8f1e953",
       "url": "https://github.com/daylinmorgan/hwylterm",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "ccb51201898b5e913ffee1e18bdf4d9fc4004386"
+        "sha1": "bf33d39e2a451b89fbbff6418569ccd5428b6bfd"
       }
     },
     "jsony": {
diff --git a/pkgs/oizys/oizys.nimble b/pkgs/oizys/oizys.nimble
index b507448..1155fdb 100644
--- a/pkgs/oizys/oizys.nimble
+++ b/pkgs/oizys/oizys.nimble
@@ -13,5 +13,5 @@ bin           = @["oizys"]
 requires "nim >= 2.0.8"
 requires "jsony"
 requires "zippy"
-requires "https://github.com/daylinmorgan/hwylterm#HEAD"
+requires "https://github.com/daylinmorgan/hwylterm#3cf572ea"
 
diff --git a/pkgs/oizys/src/oizys/exec.nim b/pkgs/oizys/src/oizys/exec.nim
index cc12003..742bbca 100644
--- a/pkgs/oizys/src/oizys/exec.nim
+++ b/pkgs/oizys/src/oizys/exec.nim
@@ -59,8 +59,11 @@ proc runCmdCaptWithSpinner*(
   msg: string = "",
   capture: set[CaptureGrp] = {CaptStdout}
 ): tuple[output, err: string] =
+  var
+    output, err: string
+    code: int
   withSpinner(msg):
-    let (output, err, code) = runCmdCapt(cmd, capture)
+    (output, err, code) = runCmdCapt(cmd, capture)
   if code != 0:
     stderr.writeLine("stdout\n" & output)
     stderr.writeLine("stderr\n" & err)
diff --git a/pkgs/oizys/src/oizys/nix.nim b/pkgs/oizys/src/oizys/nix.nim
index d32a833..6335d20 100644
--- a/pkgs/oizys/src/oizys/nix.nim
+++ b/pkgs/oizys/src/oizys/nix.nim
@@ -204,7 +204,6 @@ proc getOizysDerivations(): seq[OizysDerivation] =
     toBuildDrvs = toBuildNixosConfiguration()
     systemPathDrvs = getSystemPathDrvs()
     toActullyBuildDrvs = systemPathDrvs.filterIt(it in toBuildDrvs and not isIgnored(it))
-
   for name, drv in nixDerivationShow(toActullyBuildDrvs):
     result.add OizysDerivation(
         name: name,