@@ -7,12 +7,11 @@ with builtins; let
8 dropFour = s: substring 0 (stringLength s - 4) s;
8 dropFour = s: substring 0 (stringLength s - 4) s;
9 toSpdx = lic: with lic;
9 toSpdx = lic: with lic;
10− { spdxId = licenseId
10+ { spdxId = licenseId;
11− ; shortName = licenseId
11+ shortName = licenseId;
12− ; fullName = name
12+ fullName = name;
13− ; url = dropFour detailsUrl + "html"
13+ url = dropFour detailsUrl + "html";
14− ; free = isOsiApproved
14+ free = isOsiApproved || lic.isFsfLibre or false;
17 toNamedValue = lic: { name = lic.spdxId; value = lic; };
16 toNamedValue = lic: { name = lic.spdxId; value = lic; };