lol

stdenv: drop remove unnecessary env var

and the associated obsolete functions

support for log nesting was removed in 2017 https://github.com/nixos/nixpkgs/commit/6669a3b47711dc967df0ea8ff93fa9857aad015d

Artturin 856f3a46 4e880e72

+11 -31
-3
pkgs/development/tools/misc/automake/automake-1.11.x.nix
··· 22 nativeBuildInputs = [ perl autoconf ]; 23 buildInputs = [ autoconf ]; 24 25 - # Disable indented log output from Make, otherwise "make.test" will 26 - # fail. 27 - preCheck = "unset NIX_INDENT_MAKE"; 28 doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests 29 30 # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
··· 22 nativeBuildInputs = [ perl autoconf ]; 23 buildInputs = [ autoconf ]; 24 25 doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests 26 27 # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-3
pkgs/development/tools/misc/automake/automake-1.15.x.nix
··· 16 17 patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; 18 19 - # Disable indented log output from Make, otherwise "make.test" will 20 - # fail. 21 - preCheck = "unset NIX_INDENT_MAKE"; 22 doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths 23 doInstallCheck = false; # runs the same thing, fails the same tests 24
··· 16 17 patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; 18 19 doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths 20 doInstallCheck = false; # runs the same thing, fails the same tests 21
-3
pkgs/development/tools/misc/automake/automake-1.16.x.nix
··· 15 16 setupHook = ./setup-hook.sh; 17 18 - # Disable indented log output from Make, otherwise "make.test" will 19 - # fail. 20 - preCheck = "unset NIX_INDENT_MAKE"; 21 doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths 22 doInstallCheck = false; # runs the same thing, fails the same tests 23
··· 15 16 setupHook = ./setup-hook.sh; 17 18 doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths 19 doInstallCheck = false; # runs the same thing, fails the same tests 20
+11 -20
pkgs/stdenv/generic/setup.sh
··· 125 ###################################################################### 126 # Logging. 127 128 - # Obsolete. 129 - stopNest() { true; } 130 - header() { echo "$1"; } 131 - closeNest() { true; } 132 - 133 # Prints a command such that all word splits are unambiguous. We need 134 # to split the command in three parts because the middle format string 135 # will be, and must be, repeated for each argument. The first argument ··· 798 unset _XDG_DATA_DIRS 799 800 801 - # Make GNU Make produce nested output. 802 - export NIX_INDENT_MAKE=1 803 - 804 - 805 # Normalize the NIX_BUILD_CORES variable. The value might be 0, which 806 # means that we're supposed to try and auto-detect the number of 807 # available CPU cores at run-time. ··· 1033 1034 unpackFile() { 1035 curSrc="$1" 1036 - header "unpacking source archive $curSrc" 3 1037 if ! runOneHook unpackCmd "$curSrc"; then 1038 echo "do not know how to unpack source archive $curSrc" 1039 exit 1 ··· 1130 fi 1131 1132 for i in "${patchesArray[@]}"; do 1133 - header "applying patch $i" 3 1134 local uncompress=cat 1135 case "$i" in 1136 *.gz) ··· 1494 showPhaseHeader() { 1495 local phase="$1" 1496 case "$phase" in 1497 - unpackPhase) header "unpacking sources";; 1498 - patchPhase) header "patching sources";; 1499 - configurePhase) header "configuring";; 1500 - buildPhase) header "building";; 1501 - checkPhase) header "running tests";; 1502 - installPhase) header "installing";; 1503 - fixupPhase) header "post-installation fixup";; 1504 - installCheckPhase) header "running install tests";; 1505 - *) header "$phase";; 1506 esac 1507 } 1508
··· 125 ###################################################################### 126 # Logging. 127 128 # Prints a command such that all word splits are unambiguous. We need 129 # to split the command in three parts because the middle format string 130 # will be, and must be, repeated for each argument. The first argument ··· 793 unset _XDG_DATA_DIRS 794 795 796 # Normalize the NIX_BUILD_CORES variable. The value might be 0, which 797 # means that we're supposed to try and auto-detect the number of 798 # available CPU cores at run-time. ··· 1024 1025 unpackFile() { 1026 curSrc="$1" 1027 + echo "unpacking source archive $curSrc" 1028 if ! runOneHook unpackCmd "$curSrc"; then 1029 echo "do not know how to unpack source archive $curSrc" 1030 exit 1 ··· 1121 fi 1122 1123 for i in "${patchesArray[@]}"; do 1124 + echo "applying patch $i" 1125 local uncompress=cat 1126 case "$i" in 1127 *.gz) ··· 1485 showPhaseHeader() { 1486 local phase="$1" 1487 case "$phase" in 1488 + unpackPhase) echo "unpacking sources";; 1489 + patchPhase) echo "patching sources";; 1490 + configurePhase) echo "configuring";; 1491 + buildPhase) echo "building";; 1492 + checkPhase) echo "running tests";; 1493 + installPhase) echo "installing";; 1494 + fixupPhase) echo "post-installation fixup";; 1495 + installCheckPhase) echo "running install tests";; 1496 + *) echo "$phase";; 1497 esac 1498 } 1499
-2
pkgs/tools/package-management/nix/nix-perl.nix
··· 40 ]; 41 42 preConfigure = "export NIX_STATE_DIR=$TMPDIR"; 43 - 44 - preBuild = "unset NIX_INDENT_MAKE"; 45 }
··· 40 ]; 41 42 preConfigure = "export NIX_STATE_DIR=$TMPDIR"; 43 }