Merge pull request #9837 from ffaf1/update-licences-master

Update licence list

Cabal-syntax/src/Distribution/SPDX/LicenseListVersion.hs

@@ -13,9 +13,11 @@ data LicenseListVersion
   | LicenseListVersion_3_9
   | LicenseListVersion_3_10
   | LicenseListVersion_3_16
+  | LicenseListVersion_3_23
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
+cabalSpecVersionToSPDXListVersion CabalSpecV3_12 = LicenseListVersion_3_23
 cabalSpecVersionToSPDXListVersion CabalSpecV3_8 = LicenseListVersion_3_16
 cabalSpecVersionToSPDXListVersion CabalSpecV3_6 = LicenseListVersion_3_10
 cabalSpecVersionToSPDXListVersion CabalSpecV3_4 = LicenseListVersion_3_9

Makefile

@@ -55,7 +55,7 @@ SPDX_EXCEPTION_HS:=Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
 .PHONY: spdx
 spdx : $(SPDX_LICENSE_HS) $(SPDX_EXCEPTION_HS)
 
-SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16
+SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16 3.23
 
 $(SPDX_LICENSE_HS) : templates/SPDX.LicenseId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDX.hs license-list-data/licenses-3.0.json license-list-data/licenses-3.2.json
 	cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)

cabal-dev-scripts/src/GenSPDX.hs

@@ -35,6 +35,7 @@ main = generate =<< O.execParser opts where
         <*> licenses "3.9"
         <*> licenses "3.10"
         <*> licenses "3.16"
+        <*> licenses "3.23"
 
     template = O.strArgument $ mconcat
         [ O.metavar "SPDX.LicenseId.template.hs"

cabal-dev-scripts/src/GenSPDXExc.hs

@@ -34,6 +34,7 @@ main = generate =<< O.execParser opts where
         <*> licenses "3.9"
         <*> licenses "3.10"
         <*> licenses "3.16"
+        <*> licenses "3.23"
 
     template = O.strArgument $ mconcat
         [ O.metavar "SPDX.LicenseExceptionId.template.hs"

cabal-dev-scripts/src/GenUtils.hs

@@ -32,12 +32,14 @@ data SPDXLicenseListVersion
     | SPDXLicenseListVersion_3_9
     | SPDXLicenseListVersion_3_10
     | SPDXLicenseListVersion_3_16
+    | SPDXLicenseListVersion_3_23
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 allVers :: Set.Set SPDXLicenseListVersion
 allVers =  Set.fromList [minBound .. maxBound]
 
 prettyVer :: SPDXLicenseListVersion -> Text
+prettyVer SPDXLicenseListVersion_3_23 = "SPDX License List 3.23"
 prettyVer SPDXLicenseListVersion_3_16 = "SPDX License List 3.16"
 prettyVer SPDXLicenseListVersion_3_10 = "SPDX License List 3.10"
 prettyVer SPDXLicenseListVersion_3_9  = "SPDX License List 3.9"
@@ -46,6 +48,7 @@ prettyVer SPDXLicenseListVersion_3_2  = "SPDX License List 3.2"
 prettyVer SPDXLicenseListVersion_3_0  = "SPDX License List 3.0"
 
 suffixVer :: SPDXLicenseListVersion -> String
+suffixVer SPDXLicenseListVersion_3_23 = "_3_23"
 suffixVer SPDXLicenseListVersion_3_16 = "_3_16"
 suffixVer SPDXLicenseListVersion_3_10 = "_3_10"
 suffixVer SPDXLicenseListVersion_3_9  = "_3_9"
@@ -57,20 +60,21 @@ suffixVer SPDXLicenseListVersion_3_0  = "_3_0"
 -- Per version
 -------------------------------------------------------------------------------
 
-data PerV a = PerV a a a a a a
+data PerV a = PerV a a a a a a a
   deriving (Show, Functor, Foldable, Traversable)
 
 class Functor f => Representable i f | f -> i where
     index    :: i -> f a -> a
     tabulate :: (i -> a) -> f a
 
 instance Representable SPDXLicenseListVersion PerV where
-    index SPDXLicenseListVersion_3_0  (PerV x _ _ _ _ _) = x
-    index SPDXLicenseListVersion_3_2  (PerV _ x _ _ _ _) = x
-    index SPDXLicenseListVersion_3_6  (PerV _ _ x _ _ _) = x
-    index SPDXLicenseListVersion_3_9  (PerV _ _ _ x _ _) = x
-    index SPDXLicenseListVersion_3_10 (PerV _ _ _ _ x _) = x
-    index SPDXLicenseListVersion_3_16 (PerV _ _ _ _ _ x) = x
+    index SPDXLicenseListVersion_3_0  (PerV x _ _ _ _ _ _) = x
+    index SPDXLicenseListVersion_3_2  (PerV _ x _ _ _ _ _) = x
+    index SPDXLicenseListVersion_3_6  (PerV _ _ x _ _ _ _) = x
+    index SPDXLicenseListVersion_3_9  (PerV _ _ _ x _ _ _) = x
+    index SPDXLicenseListVersion_3_10 (PerV _ _ _ _ x _ _) = x
+    index SPDXLicenseListVersion_3_16 (PerV _ _ _ _ _ x _) = x
+    index SPDXLicenseListVersion_3_23 (PerV _ _ _ _ _ _ x) = x
 
     tabulate f = PerV
         (f SPDXLicenseListVersion_3_0)
@@ -79,6 +83,7 @@ instance Representable SPDXLicenseListVersion PerV where
         (f SPDXLicenseListVersion_3_9)
         (f SPDXLicenseListVersion_3_10)
         (f SPDXLicenseListVersion_3_16)
+        (f SPDXLicenseListVersion_3_23)
 
 -------------------------------------------------------------------------------
 -- Sorting

changelog.d/pr-spdx

@@ -0,0 +1,10 @@
+synopsis: Update SPDX License List to version `3.23 2024-02-08`
+packages: Cabal-syntax
+prs: #9818
+
+description: {
+
+- LicenseId and LicenseExceptionId now conform to SPDX License List
+  version 3.23 2024-02-08.
+
+}

doc/file-format-changelog.rst

@@ -19,6 +19,13 @@ relative to the respective preceding *published* version.
     versions of the ``Cabal`` library denote unreleased development
     branches which have no stability guarantee.
 
+``cabal-version: 3.12``
+-----------------------
+
+* License fields use identifiers from SPDX License List version
+  ``3.23 2024-02-08``.
+
+
 ``cabal-version: 3.8``
 ----------------------