Add SPDX List v3.16 to LicenseListVersion and the file format changelog

haskell · May 10, 2022 · 17924f9 · 17924f9
1 parent f26a066
commit 17924f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Cabal-syntax/src/Distribution/SPDX/LicenseListVersion.hs b/Cabal-syntax/src/Distribution/SPDX/LicenseListVersion.hs
@@ -12,9 +12,11 @@ data LicenseListVersion
     | LicenseListVersion_3_6
     | LicenseListVersion_3_9
     | LicenseListVersion_3_10
+    | LicenseListVersion_3_16
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
+cabalSpecVersionToSPDXListVersion CabalSpecV3_8 = LicenseListVersion_3_16
 cabalSpecVersionToSPDXListVersion CabalSpecV3_6 = LicenseListVersion_3_10
 cabalSpecVersionToSPDXListVersion CabalSpecV3_4 = LicenseListVersion_3_9
 cabalSpecVersionToSPDXListVersion CabalSpecV3_0 = LicenseListVersion_3_6

diff --git a/doc/file-format-changelog.rst b/doc/file-format-changelog.rst
@@ -49,6 +49,9 @@ relative to the respective preceding *published* version.
   allowed of the form ``foo/**/literalFile``. Prior, double-star
   wildcards required the trailing filename itself be a wildcard.
 
+* License fields use identifiers from SPDX License List version
+  ``3.16 2022-02-06``
+
 
 ``cabal-version: 3.6``
 ----------------------