From 9848790a97bd1f975f3675f8bea6bf36891533a0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 May 2026 04:44:17 +0200 Subject: [PATCH] lkajsdklajhsdkajsd --- justfile | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/justfile b/justfile index a54ea37..34d621a 100644 --- a/justfile +++ b/justfile @@ -394,7 +394,8 @@ __build_packages $system $outdir +$attrpaths: else ln -s /build-failure-"$attrpath" "$dst" ln -s /build-failure-"$attrpath" "$dst2b" - nice -n5 nix log --option substituters "" ".#$attrpath" --system "$system" ${_JUST_NIX_INSTANTIATE_ARGS:-} > "$dst".log 2>/dev/null ||: + #nice -n5 nix log --option substituters "" ".#$attrpath" --system "$system" ${_JUST_NIX_INSTANTIATE_ARGS:-} > "$dst".log 2>/dev/null ||: + nice -n5 nix log --option substituters "" --file default.nix ".$attrpath" --system "$system" ${_JUST_NIX_INSTANTIATE_ARGS:-} > "$dst".log 2>/dev/null ||: ln -sr "$dst".log "$dst2b".log fi fi @@ -453,18 +454,20 @@ _build_package_sources $system +packages: ) ||: done { - # printf "#!/usr/bin/env -S nom-build\n" - printf "#!/usr/bin/env -S nom build -f\n" - printf "let pkgs = import ./. { }; in {\n" + # echo "#!/usr/bin/env -S nom-build" + echo "#!/usr/bin/env -S nom build -f" + echo "let pkgs = import ./. { }; in {" for package in "${packages[@]}"; do # printf " # ./build.nix -A %q" "$package" printf " # ./build.nix %q\n" "$package" printf " %s = pkgs.%s.overrideAttrs { src = ./results-src-writeable/%s.src; };\n" "$package" "$package" "$package" done - printf "}\n" - # printf "# ./build.nix$(printf " -A %q" "${packages[@]}")\n" - printf "# ./build.nix$(printf " %q" "${packages[@]}")\n" - printf "# ./build.nix\n" + echo "}" + echo "# nom-build ./build.nix$(printf " -A %q" "${packages[@]}")" + echo "# nix-build ./build.nix$(printf " -A %q" "${packages[@]}")" + echo "# ./build.nix$(printf " %q" "${packages[@]}")" + echo "# ./build.nix" + printf "# git -C ./results-src-writeable/%s.src diff\n" "${packages[@]}" } >build.nix chmod +x build.nix @@ -565,12 +568,17 @@ bisect-script $repro_script $bad_commit=`cd "$invokedir"; HEADER="Bad commit" ju "--no-checkout Do not checkout the new working tree, instead just update BISECT_HEAD " ) readarray -td $'\n' args < <(gum choose --no-limit -- "${possible_args[@]}" | cut -d' ' -f1) - (set -x - $GIT bisect start "${args[@]}" "$bad_commit" "$good_commit" -- - $GIT bisect run "$repro_script" - ) - echo >&2 "Continue with '$GIT bisect run \"$repro_script\"'" - echo >&2 "Conclude with 'git bisect reset'" + if [[ "${#args[@]}" -eq 0 && "${args[0]}" = "" ]]; then + args=() + fi + if gum confirm "git bisect start ${args[*]} $bad_commit $good_commit"; then + (set -x + $GIT bisect start "${args[@]}" "$bad_commit" "$good_commit" -- + $GIT bisect run "$repro_script" + ) + echo >&2 "Continue with '$GIT bisect run \"$repro_script\"'" + echo >&2 "Conclude with 'git bisect reset'" + fi # === pr helper ===