pkgs/oizys-nim/src/oizys/exec.nim

@@ -19,23 +19,11 @@ proc runCmd*(cmd: string): int =
 proc runCmdCapt*(cmd: string): tuple[stdout, stderr: string, exitCode: int] =
   let args = cmd.splitWhitespace()
   let p = startProcess(args[0], args = args[1..^1], options = {poUsePath})
-  let ostrm = outputStream p
-  let errstrm = errorStream p
-  result.exitCode = -1
-  var line = newStringOfCap(120)
-  while true:
-    if ostrm.readLine(line):
-      result.stdout.add line & '\n'
-    if errstrm.readLine(line):
-      result.stderr.add line & '\n'
-    result.exitCode = peekExitCode(p)
-    if result.exitCode != -1: break
-  
-  # result = (
-  #   readAll p.outputStream,
-  #   readAll p.errorStream,
-  #   waitForExit p
-  # )
+  result = (
+    readAll p.outputStream,
+    readAll p.errorStream,
+    waitForExit p
+  )
   close p
 
 proc runCmdCaptWithSpinner*(cmd: string, msg: string = ""): tuple[output, err: string] =

pkgs/oizys-nim/src/oizys/nix.nim

@@ -110,8 +110,6 @@ proc toBuildNixosConfiguration(): seq[string] =
   var cmd = nixCommand("build")
   cmd.addArg "--dry-run"
   cmd.addArgs nixosConfigAttrs()
-  debug "trying with ouptut"
-  discard execCmd(cmd)
   let (_, err) = runCmdCaptWithSpinner(cmd, "running dry run build for: " & getHosts().join(" "))
   let output = parseDryRunOutput err
   return output.toBuild.mapIt(it.storePath)