Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ fromSPDXLicense (SPDX.License expr) =
SPDX.ELicense simpl Nothing ->
-- Not handled: license exceptions
case simpl of
SPDX.ELicenseId lid -> Known ("lib.licensesSpdx.\"" ++ prettyShow lid ++ "\"")
-- FIXME(@sternenseemann): this is not exactly Known, but a best effort lookup
SPDX.ELicenseId lid -> Known ("lib.meta.getLicenseFromSpdxId \"" ++ prettyShow lid ++ "\"")
_ ->
-- Not handed: the '+' suffix and user-defined licences references.
-- Use the SPDX expression as a free-form license string.
Expand Down
2 changes: 1 addition & 1 deletion cabal2nix/test/golden-test-cases/pandoc.nix.golden
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ mkDerivation {
];
homepage = "https://pandoc.org";
description = "Conversion between markup formats";
license = lib.licensesSpdx."GPL-2.0-or-later";
license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
mainProgram = "pandoc";
}
Loading