diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5e2a4d0d56c5..cee0882ce6cc 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1433,7 +1433,7 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or unittestCheckHook ]; - unittestFlagsArray = [ + unittestFlags = [ "-s" "tests" "-v" ]; } diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh index 64ecb13cbc71..8795b680a310 100644 --- a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh @@ -5,7 +5,14 @@ unittestCheckPhase() { echo "Executing unittestCheckPhase" runHook preCheck - eval "@pythonCheckInterpreter@ -m unittest discover $unittestFlagsArray" + local -a flagsArray=() + + # Compatibility layer to the obsolete unittestFlagsArray + eval "flagsArray+=(${unittestFlagsArray[*]-})" + + concatTo flagsArray unittestFlags + echoCmd 'unittest flags' "${flagsArray[@]}" + @pythonCheckInterpreter@ -m unittest discover "${flagsArray[@]}" runHook postCheck echo "Finished executing unittestCheckPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 7b1e212bbaf9..4aea3d8fe5e8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -108,6 +108,7 @@ let "disabledTests" "pytestFlags" "pytestFlagsArray" + "unittestFlags" "unittestFlagsArray" "outputs" "stdenv" @@ -446,6 +447,9 @@ let // optionalAttrs (attrs ? pytestFlagsArray) { pytestFlagsArray = attrs.pytestFlagsArray; } + // optionalAttrs (attrs ? unittestFlags) { + unittestFlags = attrs.unittestFlags; + } // optionalAttrs (attrs ? unittestFlagsArray) { unittestFlagsArray = attrs.unittestFlagsArray; }