From 856f3a46b2f64d4481ced392e1ebc86f09551521 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 15 Jan 2023 23:45:50 +0200 Subject: [PATCH] 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 --- .../tools/misc/automake/automake-1.11.x.nix | 3 -- .../tools/misc/automake/automake-1.15.x.nix | 3 -- .../tools/misc/automake/automake-1.16.x.nix | 3 -- pkgs/stdenv/generic/setup.sh | 31 +++++++------------ .../tools/package-management/nix/nix-perl.nix | 2 -- 5 files changed, 11 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 4f9a92d362bc..161dca6f1805 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl 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 # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 470827c2b45e..f0df759ee2cf 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { 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 doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 65d6185f50c0..0d9572c6f314 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { 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 doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5fba54dbcced..be68c76d6384 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -125,11 +125,6 @@ _eval() { ###################################################################### # Logging. -# 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 # will be, and must be, repeated for each argument. The first argument @@ -798,10 +793,6 @@ unset _HOST_PATH 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 # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. @@ -1033,7 +1024,7 @@ _defaultUnpack() { unpackFile() { curSrc="$1" - header "unpacking source archive $curSrc" 3 + echo "unpacking source archive $curSrc" if ! runOneHook unpackCmd "$curSrc"; then echo "do not know how to unpack source archive $curSrc" exit 1 @@ -1130,7 +1121,7 @@ patchPhase() { fi for i in "${patchesArray[@]}"; do - header "applying patch $i" 3 + echo "applying patch $i" local uncompress=cat case "$i" in *.gz) @@ -1494,15 +1485,15 @@ distPhase() { showPhaseHeader() { local phase="$1" case "$phase" in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - installCheckPhase) header "running install tests";; - *) header "$phase";; + unpackPhase) echo "unpacking sources";; + patchPhase) echo "patching sources";; + configurePhase) echo "configuring";; + buildPhase) echo "building";; + checkPhase) echo "running tests";; + installPhase) echo "installing";; + fixupPhase) echo "post-installation fixup";; + installCheckPhase) echo "running install tests";; + *) echo "$phase";; esac } diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 3c44dbdbe144..0796a0914f1f 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -40,6 +40,4 @@ stdenv.mkDerivation { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; }