From 12a0eb60ab16f0e20f644218e197929a6c147640 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 10 Feb 2025 13:56:05 -0600 Subject: [PATCH] don't lock if it's not around --- pkgs/oizys/src/oizys.nim | 8 ++++++-- pkgs/oizys/src/oizys/context.nim | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/oizys/src/oizys.nim b/pkgs/oizys/src/oizys.nim index d1c214d..1cd2cd0 100644 --- a/pkgs/oizys/src/oizys.nim +++ b/pkgs/oizys/src/oizys.nim @@ -191,7 +191,11 @@ hwylCli: currently just runs `jq < flake.lock '.nodes | keys[] | select(contains("_"))' -r` """ run: - discard runCmd("nix flake lock") # use absolute value for flake.lock? - quitWithCmd("""jq '.nodes | keys[] | select(contains("_"))' -r flake.lock""") + if not isLocal(): + quit "`oizys lock` should be run with a local flake" + + discard runCmd("nix flake lock " & getFlake()) + let lockfile = getFlake() / "flake.lock" + quitWithCmd(fmt"""jq '.nodes | keys[] | select(contains("_"))' -r {lockFile}""") diff --git a/pkgs/oizys/src/oizys/context.nim b/pkgs/oizys/src/oizys/context.nim index 400f789..6f07502 100644 --- a/pkgs/oizys/src/oizys/context.nim +++ b/pkgs/oizys/src/oizys/context.nim @@ -57,3 +57,4 @@ proc getHosts*(): seq[string] = return oc.hosts proc getFlake*(): string = return oc.flake proc isResetCache*(): bool = return oc.resetCache proc isCi*(): bool = return oc.ci +proc isLocal*(): bool = return oc.flake.dirExists