Merge pull request #105042 from Infinisil/remove-release-tryEval

release-lib: Don't use tryEval for packagePlatforms
This commit is contained in:
Eelco Dolstra 2020-11-30 14:06:30 +01:00 committed by GitHub
commit 3a9c57c93b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -142,15 +142,13 @@ rec {
/* Recursively map a (nested) set of derivations to an isomorphic
set of meta.platforms values. */
packagePlatforms = mapAttrs (name: value:
let res = builtins.tryEval (
if isDerivation value then
value.meta.hydraPlatforms
or (value.meta.platforms or [ "x86_64-linux" ])
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else
[]);
in if res.success then res.value else []
[]
);