colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: drop remove unnecessary env var

Browse Source 
and the associated obsolete functions

support for log nesting was removed in 2017 6669a3b477
This commit is contained in:
Artturin 2023-01-15 23:45:50 +02:00
parent 4e880e7240
commit 856f3a46b2
5 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View File

@ -22,9 +22,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl autoconf ]; nativeBuildInputs = [ perl autoconf ];
buildInputs = [ autoconf ]; buildInputs = [ autoconf ];
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the

3
pkgs/development/tools/misc/automake/automake-1.15.x.nix
View File

@ -16,9 +16,6 @@ stdenv.mkDerivation rec {
patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ];
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths
doInstallCheck = false; # runs the same thing, fails the same tests doInstallCheck = false; # runs the same thing, fails the same tests

3
pkgs/development/tools/misc/automake/automake-1.16.x.nix
View File

@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths
doInstallCheck = false; # runs the same thing, fails the same tests doInstallCheck = false; # runs the same thing, fails the same tests

31
pkgs/stdenv/generic/setup.sh
View File

@ -125,11 +125,6 @@ _eval() {
###################################################################### ######################################################################
# Logging. # Logging.
# Obsolete.
stopNest() { true; }
header() { echo "$1"; }
closeNest() { true; }
# Prints a command such that all word splits are unambiguous. We need # Prints a command such that all word splits are unambiguous. We need
# to split the command in three parts because the middle format string # to split the command in three parts because the middle format string
# will be, and must be, repeated for each argument. The first argument # will be, and must be, repeated for each argument. The first argument
@ -798,10 +793,6 @@ unset _HOST_PATH
unset _XDG_DATA_DIRS unset _XDG_DATA_DIRS
# Make GNU Make produce nested output.
export NIX_INDENT_MAKE=1
# Normalize the NIX_BUILD_CORES variable. The value might be 0, which # Normalize the NIX_BUILD_CORES variable. The value might be 0, which
# means that we're supposed to try and auto-detect the number of # means that we're supposed to try and auto-detect the number of
# available CPU cores at run-time. # available CPU cores at run-time.
@ -1033,7 +1024,7 @@ _defaultUnpack() {
unpackFile() { unpackFile() {
curSrc="$1" curSrc="$1"
header "unpacking source archive $curSrc" 3 echo "unpacking source archive $curSrc"
if ! runOneHook unpackCmd "$curSrc"; then if ! runOneHook unpackCmd "$curSrc"; then
echo "do not know how to unpack source archive $curSrc" echo "do not know how to unpack source archive $curSrc"
exit 1 exit 1
@ -1130,7 +1121,7 @@ patchPhase() {
fi fi
for i in "${patchesArray[@]}"; do for i in "${patchesArray[@]}"; do
header "applying patch $i" 3 echo "applying patch $i"
local uncompress=cat local uncompress=cat
case "$i" in case "$i" in
*.gz) *.gz)
@ -1494,15 +1485,15 @@ distPhase() {
showPhaseHeader() { showPhaseHeader() {
local phase="$1" local phase="$1"
case "$phase" in case "$phase" in
unpackPhase) header "unpacking sources";; unpackPhase) echo "unpacking sources";;
patchPhase) header "patching sources";; patchPhase) echo "patching sources";;
configurePhase) header "configuring";; configurePhase) echo "configuring";;
buildPhase) header "building";; buildPhase) echo "building";;
checkPhase) header "running tests";; checkPhase) echo "running tests";;
installPhase) header "installing";; installPhase) echo "installing";;
fixupPhase) header "post-installation fixup";; fixupPhase) echo "post-installation fixup";;
installCheckPhase) header "running install tests";; installCheckPhase) echo "running install tests";;
*) header "$phase";; *) echo "$phase";;
esac esac
} }

2
pkgs/tools/package-management/nix/nix-perl.nix
View File

@ -40,6 +40,4 @@ stdenv.mkDerivation {
]; ];
preConfigure = "export NIX_STATE_DIR=$TMPDIR"; preConfigure = "export NIX_STATE_DIR=$TMPDIR";
preBuild = "unset NIX_INDENT_MAKE";
} }