diff options
author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-09 17:32:20 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-09 17:32:20 -0800 |
commit | cf1a3325008cbb8a550d76a763760795cbebf4a1 (patch) | |
tree | 01392f80906edd287dc53a1c6de88bd2d2f9980a /pkgs/stdenv | |
parent | 3ce29d43869824d6621015678858ddc4c45301c9 (diff) |
Revert "stdenv: log build hooks as they run"
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 35928e08107f2..9c918b12f96ef 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -50,42 +50,6 @@ getAllOutputNames() { ###################################################################### # Hook handling. -# Log a hook, to be run before the hook is actually called. -# This only logs explicit hooks; "implicit" hooks, those specified directly -# in a derivation's arguments, are logged in `_callImplicitHook` instead. -_logHook() { - local hookKind="$1" - local hookExpr="$2" - shift 2 - - if declare -F "$hookExpr" > /dev/null 2>&1; then - echo "calling '$hookKind' function hook '$hookExpr'" "$@" - elif type -p "$hookExpr" > /dev/null; then - echo "sourcing '$hookKind' script hook '$hookExpr'" - elif [[ "$hookExpr" != "_callImplicitHook"* ]]; then - # Here we have a string hook to eval. - # Join lines onto one with literal \n characters unless NIX_DEBUG >= 2. - local exprToOutput - if (( "${NIX_DEBUG:-0}" >= 2 )); then - exprToOutput="$hookExpr" - else - while IFS= read -r hookExprLine; do - # These lines often have indentation, - # so let's remove leading whitespace. - hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}" - # If this line wasn't entirely whitespace, - # then add it to our output. - if [[ -n "$hookExprLine" ]]; then - exprToOutput+="$hookExprLine\\n " - fi - done <<< "$hookExpr" - - # And then remove the final, unnecessary, \n - exprToOutput="${exprToOutput%%\\n }" - fi - echo "evaling '$hookKind' string hook '$exprToOutput'" - fi -} # Run all hooks with the specified name in the order in which they # were added, stopping if any fails (returns a non-zero exit @@ -100,7 +64,6 @@ runHook() { # Hack around old bash being bad and thinking empty arrays are # undefined. for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do - _logHook "$hookName" "$hook" "$@" _eval "$hook" "$@" done @@ -118,7 +81,6 @@ runOneHook() { local hook ret=1 # Hack around old bash like above for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do - _logHook "$hookName" "$hook" "$@" if _eval "$hook" "$@"; then ret=0 break @@ -138,13 +100,10 @@ _callImplicitHook() { local def="$1" local hookName="$2" if declare -F "$hookName" > /dev/null; then - echo "calling implicit '$hookName' function hook" "$hookName" elif type -p "$hookName" > /dev/null; then - echo "sourcing implicit '$hookName' script hook" source "$hookName" elif [ -n "${!hookName:-}" ]; then - echo "evaling implicit '$hookName' string hook" eval "${!hookName}" else return "$def" @@ -685,7 +644,6 @@ activatePackage() { (( hostOffset <= targetOffset )) || exit 1 if [ -f "$pkg" ]; then - echo "sourcing setup hook '$pkg'" source "$pkg" fi @@ -709,7 +667,6 @@ activatePackage() { fi if [[ -f "$pkg/nix-support/setup-hook" ]]; then - echo "sourcing setup hook '$pkg/nix-support/setuphook'" source "$pkg/nix-support/setup-hook" fi } |