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

Merge pull request #28799 from orivej/stdenv-setup

Browse Source 
stdenv-setup: fix substituteAll with set -eu
This commit is contained in:
John Ericson 2017-09-03 10:26:39 -04:00 committed by GitHub
commit b891d75e69
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/stdenv/generic/make-derivation.nix
View File

@ -49,6 +49,7 @@ rec {
# TODO(@Ericson2314): Make this more modular, and not O(n^2). # TODO(@Ericson2314): Make this more modular, and not O(n^2).
let let
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
# hardeningDisable additionally supports "all".
erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
in if builtins.length erroneousHardeningFlags != 0 in if builtins.length erroneousHardeningFlags != 0
then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} {

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

@ -473,14 +473,14 @@ substitute() {
shift 2 shift 2
if [ ! -f "$input" ]; then if [ ! -f "$input" ]; then
echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2 echo "substitute(): ERROR: file '$input' does not exist" >&2
return 1 return 1
fi fi
local content local content
# read returns non-0 on EOF, so we want read to fail # read returns non-0 on EOF, so we want read to fail
if IFS='' read -r -N 0 content < "$input"; then if IFS='' read -r -N 0 content < "$input"; then
echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2 echo "substitute(): ERROR: File \"$input\" has null bytes, won't process" >&2
return 1 return 1
fi fi
@ -497,10 +497,8 @@ substitute() {
shift 2 shift 2
# check if the used nix attribute name is a valid bash name # check if the used nix attribute name is a valid bash name
if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2 echo "substitute(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
echo " \"$varName\" isn't and therefore was skipped; it might be caused" >&2 return 1
echo " by multi-line phases in variables - see #14907 for details." >&2
continue
fi fi
pattern="@$varName@" pattern="@$varName@"
replacement="${!varName}" replacement="${!varName}"
@ -513,7 +511,7 @@ substitute() {
;; ;;
*) *)
echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2 echo "substitute(): ERROR: Invalid command line argument: $1" >&2
return 1 return 1
;; ;;
esac esac
@ -533,18 +531,16 @@ substituteInPlace() {
} }
# Substitute all environment variables that do not start with an upper-case # Substitute all environment variables that start with a lowercase character and
# character or underscore. Note: other names that aren't bash-valid # are valid Bash names.
# will cause an error during `substitute --subst-var`.
substituteAll() { substituteAll() {
local input="$1" local input="$1"
local output="$2" local output="$2"
local -a args=() local -a args=()
# Select all environment variables that start with a lowercase character. for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
if [ "${NIX_DEBUG:-}" = "1" ]; then if [ "${NIX_DEBUG:-}" = "1" ]; then
echo "@${varName}@ -> '${!varName}'" printf "@%s@ -> %q\n" "${varName}" "${!varName}"
fi fi
args+=("--subst-var" "$varName") args+=("--subst-var" "$varName")
done done