summary refs log tree commit diff
path: root/pkgs/stdenv/generic/setup.sh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-07-24 14:25:57 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-07-24 14:30:46 +0200
commit6669a3b47711dc967df0ea8ff93fa9857aad015d (patch)
treeaac25aa9a208a7e4f1dbc19255a81ea12418b247 /pkgs/stdenv/generic/setup.sh
parent9f345ce2c7b2b9878ea2d520f04f82435c6e227d (diff)
downloadnixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar.gz
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar.bz2
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar.lz
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar.xz
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.tar.zst
nixlib-6669a3b47711dc967df0ea8ff93fa9857aad015d.zip
stdenv: Remove log nesting
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
-rw-r--r--pkgs/stdenv/generic/setup.sh36
1 files changed, 4 insertions, 32 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 35fe8fd69504..8ee72c962566 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -77,32 +77,10 @@ _eval() {
 ######################################################################
 # Logging.
 
-nestingLevel=0
-
-startNest() {
-    # Assert natural as sanity check.
-    let nestingLevel+=1 "nestingLevel>=0"
-    echo -en "\033[$1p"
-}
-
-stopNest() {
-    # Assert natural as sanity check.
-    let nestingLevel-=1 "nestingLevel>=0"
-    echo -en "\033[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while [ $nestingLevel -gt 0 ]; do
-        stopNest
-    done
-}
+# Obsolete.
+stopNest() { true; }
+header() { echo "$1"; }
+closeNest() { true; }
 
 # Prints a command such that all word splits are unambiguous. We need
 # to split the command in three parts because the middle format string
@@ -123,8 +101,6 @@ exitHandler() {
     exitCode=$?
     set +e
 
-    closeNest
-
     if [ -n "$showBuildStats" ]; then
         times > "$NIX_BUILD_TOP/.times"
         local -a times=($(cat "$NIX_BUILD_TOP/.times"))
@@ -593,7 +569,6 @@ unpackFile() {
         echo "do not know how to unpack source archive $curSrc"
         exit 1
     fi
-    stopNest
 }
 
 
@@ -688,7 +663,6 @@ patchPhase() {
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
         # shellcheck disable=SC2086
         $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1}
-        stopNest
     done
 
     runHook postPatch
@@ -973,8 +947,6 @@ genericBuild() {
             echo
             echo "@ phase-succeeded $out $curPhase"
         fi
-
-        stopNest
     done
 }