nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

various: fix "list contains" check (#363191)

Browse Source
This commit is contained in:
Philip Taron 2024-12-09 09:17:28 -08:00 committed by GitHub
commit fdee9525f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/build-support/wrapper.nix
View File

@ -75,7 +75,7 @@ runCommand
# well :D.
local varSlice="$var[*]"
# ''${..-} to hack around old bash empty array problem
case "''${!varSlice-}" in
case " ''${!varSlice-} " in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice

6
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch
View File

@ -108,7 +108,7 @@ index fc498985e..b5d204d0d 100755
if [ $ERRORS -ne 0 ]; then
- FAILURES_FILES="${FAILURES_FILES} ${_TESTNAME}\n"
- ((FAILURES+=$ERRORS))
+ if [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* ]]; then
+ if [[ " $ERROR_EXCEPTIONS " == *" $_TESTNAME "* ]]; then
+ EXCEPTED_FAILURES_FILES="${EXCEPTED_FAILURES_FILES} ${_TESTNAME}\n"
+ ((EXCEPTED_FAILURES+=$ERRORS))
+ else
@ -117,7 +117,7 @@ index fc498985e..b5d204d0d 100755
+ fi
elif [ $WARNINGS -ne 0 ]; then
- if [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
+ if [[ $EXCEPTIONS == *" $_TESTNAME "* ]]; then
+ if [[ " $EXCEPTIONS " == *" $_TESTNAME "* ]]; then
EXCEPTED_FILES="${EXCEPTED_FILES} ${_TESTNAME}\n"
((EXCEPTED+=$WARNINGS))
else
@ -125,7 +125,7 @@ index fc498985e..b5d204d0d 100755
((FATAL_WARNINGS+=$WARNINGS))
fi
- elif [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
+ elif [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* || $EXCEPTIONS == *" $_TESTNAME "* ]]; then
+ elif [[ " $ERROR_EXCEPTIONS " == *" $_TESTNAME "* || " $EXCEPTIONS " == *" $_TESTNAME "* ]]; then
WOOT_FILES="${WOOT_FILES} ${_TESTNAME}\n"
fi
done

2
pkgs/development/interpreters/tcl/tcl-package-hook.sh
View File

@ -23,7 +23,7 @@ _addToTclLibPath() {
if [[ -z "${TCLLIBPATH-}" ]]; then
export TCLLIBPATH="$tclPkg"
else
if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then
if [[ "$TCLLIBPATH " != *"$tclPkg "* ]]; then
export TCLLIBPATH="${TCLLIBPATH} $tclPkg"
fi
fi

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

@ -683,7 +683,7 @@ findInputs() {
# shellcheck disable=SC1087
local varSlice="$var[*]"
# ${..-} to hack around old bash empty array problem
case "${!varSlice-}" in
case " ${!varSlice-} " in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice