add SPDX license data version 3.26 (#11014)

* add SPDX license data version 3.26

* Update changelog.d/pr-11014

Co-authored-by: ffaf1 <[email protected]>

* fix typo in changelog

* add missing license list constructor

---------

Co-authored-by: ffaf1 <[email protected]>

Author: geekosaur

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

@@ -15,9 +15,11 @@ data LicenseListVersion
   | LicenseListVersion_3_16
   | LicenseListVersion_3_23
   | LicenseListVersion_3_25
+  | LicenseListVersion_3_26
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
+cabalSpecVersionToSPDXListVersion CabalSpecV3_16 = LicenseListVersion_3_26
 cabalSpecVersionToSPDXListVersion CabalSpecV3_14 = LicenseListVersion_3_25
 cabalSpecVersionToSPDXListVersion CabalSpecV3_12 = LicenseListVersion_3_23
 cabalSpecVersionToSPDXListVersion CabalSpecV3_8 = LicenseListVersion_3_16

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

@@ -18,7 +18,7 @@ tests = testGroup "Distribution.Utils.Structured"
     [ testCase "VersionRange" $
       md5Check (Proxy :: Proxy VersionRange) 0x39396fc4f2d751aaa1f94e6d843f03bd
     , testCase "SPDX.License" $
-      md5Check (Proxy :: Proxy License) 0xd3d4a09f517f9f75bc3d16370d5a853a
+      md5Check (Proxy :: Proxy License) 0xf90ab6c2e4ffbc71b2e8c12531e50356
     -- The difference is in encoding of newtypes
     , testCase "GenericPackageDescription" $ md5CheckGenericPackageDescription (Proxy :: Proxy GenericPackageDescription)
     , testCase "LocalBuildInfo" $ md5CheckLocalBuildInfo (Proxy :: Proxy LocalBuildInfo)
@@ -29,8 +29,8 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
 
 md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
 md5CheckGenericPackageDescription proxy = md5Check proxy
-    0x42685b0be2909b20bfcd2f32c503ec7b
+    0xc039c6741dead5203ad2b33bd3bf4dc8
 
 md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
 md5CheckLocalBuildInfo proxy = md5Check proxy
-    0x3d5f7afb3f2f9d8a8ea0e9487a74a006
+    0xea86b170fa32ac289cbd1fb6174b5cbf

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

@@ -100,7 +100,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 3.23 3.25
+SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16 3.23 3.25 3.26
 
 $(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.meta.project gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)

Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

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

Makefile

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

cabal-dev-scripts/src/GenSPDX.hs

@@ -33,12 +33,14 @@ data SPDXLicenseListVersion
     | SPDXLicenseListVersion_3_16
     | SPDXLicenseListVersion_3_23
     | SPDXLicenseListVersion_3_25
+    | SPDXLicenseListVersion_3_26
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 allVers :: Set.Set SPDXLicenseListVersion
 allVers =  Set.fromList [minBound .. maxBound]
 
 prettyVer :: SPDXLicenseListVersion -> Text
+prettyVer SPDXLicenseListVersion_3_26 = "SPDX License List 3.26"
 prettyVer SPDXLicenseListVersion_3_25 = "SPDX License List 3.25"
 prettyVer SPDXLicenseListVersion_3_23 = "SPDX License List 3.23"
 prettyVer SPDXLicenseListVersion_3_16 = "SPDX License List 3.16"
@@ -49,6 +51,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_26 = "_3_26"
 suffixVer SPDXLicenseListVersion_3_25 = "_3_25"
 suffixVer SPDXLicenseListVersion_3_23 = "_3_23"
 suffixVer SPDXLicenseListVersion_3_16 = "_3_16"
@@ -62,22 +65,23 @@ suffixVer SPDXLicenseListVersion_3_0  = "_3_0"
 -- Per version
 -------------------------------------------------------------------------------
 
-data PerV a = PerV a a a a a a a a
+data PerV a = PerV a a 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_23 (PerV _ _ _ _ _ _ x _) = x
-    index SPDXLicenseListVersion_3_25 (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
+    index SPDXLicenseListVersion_3_25 (PerV _ _ _ _ _ _ _ x _) = x
+    index SPDXLicenseListVersion_3_26 (PerV _ _ _ _ _ _ _ _ x) = x
 
     tabulate f = PerV
         (f SPDXLicenseListVersion_3_0)
@@ -88,6 +92,7 @@ instance Representable SPDXLicenseListVersion PerV where
         (f SPDXLicenseListVersion_3_16)
         (f SPDXLicenseListVersion_3_23)
         (f SPDXLicenseListVersion_3_25)
+        (f SPDXLicenseListVersion_3_26)
 
 -------------------------------------------------------------------------------
 -- Sorting

cabal-dev-scripts/src/GenSPDXExc.hs

@@ -0,0 +1,9 @@
+synopsis: add SPDX license data version 3.26
+packages: Cabal
+prs: #11014
+
+description: {
+
+- Update SPDX license list to version 3.26.0 2024-12-30
+
+}