From f1043edf0023b65b217fe8ac6fbd1f23b70b6cf8 Mon Sep 17 00:00:00 2001 From: Mayeu Date: Fri, 8 May 2026 22:11:49 +0200 Subject: [PATCH] fix: handle nix 2.34+ show-derivation format in build proviso nix 2.34 wraps the derivation map under a `derivations` key alongside a `version` field. The previous jq pipeline iterated top-level keys and choked on the numeric `version`. Unwrap with `(.derivations // .)` so both old and new formats work. --- src/std/fwlib/actions/build-proviso.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/std/fwlib/actions/build-proviso.sh b/src/std/fwlib/actions/build-proviso.sh index 94a49329..8bfcfe3d 100644 --- a/src/std/fwlib/actions/build-proviso.sh +++ b/src/std/fwlib/actions/build-proviso.sh @@ -35,7 +35,8 @@ fi if ! ( command nix show-derivation ''${uncached[@]} 2>/dev/null | command jq --exit-status \ - ' with_entries( + ' (.derivations // .) + | with_entries( select(.value|.env.preferLocalBuild != "1") ) | any ' 1>/dev/null