fixup oizys spinners

This commit is contained in:
Daylin Morgan 2024-11-21 14:37:11 -06:00
parent 262dea646b
commit cdb3cc4eb8
Signed by: daylin
GPG key ID: 950D13E9719334AD
5 changed files with 8 additions and 6 deletions

View file

@ -8,7 +8,7 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-IWdlWC+j2h15WjVXXdDyxDZsb0/Ti1+jy6RfmqHFkjs="; nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA=";
meta = { meta = {
description = "nix begat oizys"; description = "nix begat oizys";

View file

@ -3,12 +3,12 @@
"packages": { "packages": {
"hwylterm": { "hwylterm": {
"version": "0.1.0", "version": "0.1.0",
"vcsRevision": "ef573dc0f8bf39f80704f92cfab39e1b9af82492", "vcsRevision": "3cf572ea4afa6f895eb0897bfb8e6e35f8f1e953",
"url": "https://github.com/daylinmorgan/hwylterm", "url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "ccb51201898b5e913ffee1e18bdf4d9fc4004386" "sha1": "bf33d39e2a451b89fbbff6418569ccd5428b6bfd"
} }
}, },
"jsony": { "jsony": {

View file

@ -13,5 +13,5 @@ bin = @["oizys"]
requires "nim >= 2.0.8" requires "nim >= 2.0.8"
requires "jsony" requires "jsony"
requires "zippy" requires "zippy"
requires "https://github.com/daylinmorgan/hwylterm#HEAD" requires "https://github.com/daylinmorgan/hwylterm#3cf572ea"

View file

@ -59,8 +59,11 @@ proc runCmdCaptWithSpinner*(
msg: string = "", msg: string = "",
capture: set[CaptureGrp] = {CaptStdout} capture: set[CaptureGrp] = {CaptStdout}
): tuple[output, err: string] = ): tuple[output, err: string] =
var
output, err: string
code: int
withSpinner(msg): withSpinner(msg):
let (output, err, code) = runCmdCapt(cmd, capture) (output, err, code) = runCmdCapt(cmd, capture)
if code != 0: if code != 0:
stderr.writeLine("stdout\n" & output) stderr.writeLine("stdout\n" & output)
stderr.writeLine("stderr\n" & err) stderr.writeLine("stderr\n" & err)

View file

@ -204,7 +204,6 @@ proc getOizysDerivations(): seq[OizysDerivation] =
toBuildDrvs = toBuildNixosConfiguration() toBuildDrvs = toBuildNixosConfiguration()
systemPathDrvs = getSystemPathDrvs() systemPathDrvs = getSystemPathDrvs()
toActullyBuildDrvs = systemPathDrvs.filterIt(it in toBuildDrvs and not isIgnored(it)) toActullyBuildDrvs = systemPathDrvs.filterIt(it in toBuildDrvs and not isIgnored(it))
for name, drv in nixDerivationShow(toActullyBuildDrvs): for name, drv in nixDerivationShow(toActullyBuildDrvs):
result.add OizysDerivation( result.add OizysDerivation(
name: name, name: name,