From 51c30f86acb5c2ce6cf5ae317cb2e3d091b0e6f1 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 4 Nov 2024 12:42:19 -0600 Subject: [PATCH] don't evaluate ignore drv --- .github/workflows/update.yml | 2 ++ pkgs/oizys/src/oizys/nix.nim | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 1c129c8..5d2fe08 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -69,6 +69,8 @@ jobs: --host "othalan" --flake . --debug + -- + --print-build-logs - name: Commit Updates uses: daylin-bot/actions/commit-and-push@main diff --git a/pkgs/oizys/src/oizys/nix.nim b/pkgs/oizys/src/oizys/nix.nim index e3234e1..a768180 100644 --- a/pkgs/oizys/src/oizys/nix.nim +++ b/pkgs/oizys/src/oizys/nix.nim @@ -198,15 +198,14 @@ proc getOizysDerivations(): seq[OizysDerivation] = let toBuildDrvs = toBuildNixosConfiguration() systemPathDrvs = getSystemPathDrvs() - toActullyBuildDrvs = systemPathDrvs.filterIt(it in toBuildDrvs) + toActullyBuildDrvs = systemPathDrvs.filterIt(it in toBuildDrvs and not isIgnored(it)) for name, drv in nixDerivationShow(toActullyBuildDrvs): - if not isIgnored(name): - result.add OizysDerivation( + result.add OizysDerivation( name: name, output: drv.outputs.`out`.path, drv: drv, - ) + ) # TODO: remove this proc proc systemPathDrvsToBuild(): seq[string] =