buildPython*: fix mismerge

This commit is contained in:
K900
2025-02-03 19:11:59 +03:00
parent a1c5ba6f4b
commit 51575400a3
@@ -437,11 +437,9 @@ let
}
// optionalAttrs (attrs.doCheck or true) (
optionalAttrs (disabledTestPaths != [ ]) {
disabledTestPaths = escapeShellArgs disabledTestPaths;
disabledTestPaths = disabledTestPaths;
}
// optionalAttrs (attrs ? disabledTests) {
# `escapeShellArgs` should be used as well as `disabledTestPaths`,
# but some packages rely on existing raw strings.
disabledTests = attrs.disabledTests;
}
// optionalAttrs (attrs ? pytestFlags) {