buildPython*: simplify check-related attribute inheritance (#386489)
This commit is contained in:
@@ -50,6 +50,9 @@ let
|
||||
stringLength
|
||||
;
|
||||
|
||||
getOptionalAttrs =
|
||||
names: attrs: lib.getAttrs (lib.intersectLists names (lib.attrNames attrs)) attrs;
|
||||
|
||||
leftPadName =
|
||||
name: against:
|
||||
let
|
||||
@@ -196,8 +199,6 @@ in
|
||||
|
||||
doCheck ? true,
|
||||
|
||||
disabledTestPaths ? [ ],
|
||||
|
||||
# Allow passing in a custom stdenv to buildPython*
|
||||
stdenv ? python.stdenv,
|
||||
|
||||
@@ -437,24 +438,14 @@ let
|
||||
installCheckPhase = attrs.checkPhase;
|
||||
}
|
||||
// optionalAttrs (attrs.doCheck or true) (
|
||||
optionalAttrs (disabledTestPaths != [ ]) {
|
||||
disabledTestPaths = disabledTestPaths;
|
||||
}
|
||||
// optionalAttrs (attrs ? disabledTests) {
|
||||
disabledTests = attrs.disabledTests;
|
||||
}
|
||||
// optionalAttrs (attrs ? pytestFlags) {
|
||||
pytestFlags = attrs.pytestFlags;
|
||||
}
|
||||
// optionalAttrs (attrs ? pytestFlagsArray) {
|
||||
pytestFlagsArray = attrs.pytestFlagsArray;
|
||||
}
|
||||
// optionalAttrs (attrs ? unittestFlags) {
|
||||
unittestFlags = attrs.unittestFlags;
|
||||
}
|
||||
// optionalAttrs (attrs ? unittestFlagsArray) {
|
||||
unittestFlagsArray = attrs.unittestFlagsArray;
|
||||
}
|
||||
getOptionalAttrs [
|
||||
"disabledTestPaths"
|
||||
"disabledTests"
|
||||
"pytestFlags"
|
||||
"pytestFlagsArray"
|
||||
"unittestFlags"
|
||||
"unittestFlagsArray"
|
||||
] attrs
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user