Skip to content

Commit f39ea11

Browse files
committed
fix typo in changelog
1 parent 0e76e4f commit f39ea11

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

changelog.d/pr-11014

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ prs: #11014
44

55
description: {
66

7-
- Update SPDX license listo to version 3.26.0 2024-12-30
7+
- Update SPDX license list to version 3.26.0 2024-12-30
88

99
}

templates/SPDX.LicenseExceptionId.template.hs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import qualified Text.PrettyPrint as Disp
2929
-- LicenseExceptionId
3030
-------------------------------------------------------------------------------
3131

32-
-- | SPDX License Exceptions identifiers list v3.25
32+
-- | SPDX License Exceptions identifiers list v3.26
3333
data LicenseExceptionId
3434
{{ licenseIds }}
3535
deriving (Eq, Ord, Enum, Bounded, Show, Read, Data, Generic)
@@ -44,7 +44,7 @@ instance Binary LicenseExceptionId where
4444

4545
-- note: remember to bump version each time the definition changes
4646
instance Structured LicenseExceptionId where
47-
structure p = set typeVersion 306 $ nominalStructure p
47+
structure p = set typeVersion 307 $ nominalStructure p
4848

4949
instance Pretty LicenseExceptionId where
5050
pretty = Disp.text . licenseExceptionId
@@ -104,6 +104,9 @@ licenseExceptionIdList LicenseListVersion_3_23 =
104104
licenseExceptionIdList LicenseListVersion_3_25 =
105105
{{licenseList_perv.v_3_25}}
106106
++ bulkOfLicenses
107+
licenseExceptionIdList LicenseListVersion_3_26 =
108+
{{licenseList_perv.v_3_26}}
109+
++ bulkOfLicenses
107110

108111
-- | Create a 'LicenseExceptionId' from a 'String'.
109112
mkLicenseExceptionId :: LicenseListVersion -> String -> Maybe LicenseExceptionId
@@ -115,6 +118,7 @@ mkLicenseExceptionId LicenseListVersion_3_10 s = Map.lookup s stringLookup_3_10
115118
mkLicenseExceptionId LicenseListVersion_3_16 s = Map.lookup s stringLookup_3_16
116119
mkLicenseExceptionId LicenseListVersion_3_23 s = Map.lookup s stringLookup_3_23
117120
mkLicenseExceptionId LicenseListVersion_3_25 s = Map.lookup s stringLookup_3_25
121+
mkLicenseExceptionId LicenseListVersion_3_26 s = Map.lookup s stringLookup_3_26
118122

119123
stringLookup_3_0 :: Map String LicenseExceptionId
120124
stringLookup_3_0 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
@@ -148,6 +152,10 @@ stringLookup_3_25 :: Map String LicenseExceptionId
148152
stringLookup_3_25 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
149153
licenseExceptionIdList LicenseListVersion_3_25
150154

155+
stringLookup_3_26 :: Map String LicenseExceptionId
156+
stringLookup_3_26 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
157+
licenseExceptionIdList LicenseListVersion_3_26
158+
151159
-- | License exceptions in all SPDX License lists
152160
bulkOfLicenses :: [LicenseExceptionId]
153161
bulkOfLicenses =

templates/SPDX.LicenseId.template.hs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import qualified Text.PrettyPrint as Disp
3232
-- LicenseId
3333
-------------------------------------------------------------------------------
3434

35-
-- | SPDX License identifiers list v3.25
35+
-- | SPDX License identifiers list v3.26
3636
data LicenseId
3737
{{ licenseIds }}
3838
deriving (Eq, Ord, Enum, Bounded, Show, Read, Data)
@@ -49,7 +49,7 @@ instance Binary LicenseId where
4949

5050
-- note: remember to bump version each time the definition changes
5151
instance Structured LicenseId where
52-
structure p = set typeVersion 306 $ nominalStructure p
52+
structure p = set typeVersion 307 $ nominalStructure p
5353

5454
instance Pretty LicenseId where
5555
pretty = Disp.text . licenseId
@@ -181,6 +181,9 @@ licenseIdList LicenseListVersion_3_23 =
181181
licenseIdList LicenseListVersion_3_25 =
182182
{{licenseList_perv.v_3_25}}
183183
++ bulkOfLicenses
184+
licenseIdList LicenseListVersion_3_26 =
185+
{{licenseList_perv.v_3_26}}
186+
++ bulkOfLicenses
184187

185188
-- | Create a 'LicenseId' from a 'String'.
186189
mkLicenseId :: LicenseListVersion -> String -> Maybe LicenseId
@@ -192,6 +195,7 @@ mkLicenseId LicenseListVersion_3_10 s = Map.lookup s stringLookup_3_10
192195
mkLicenseId LicenseListVersion_3_16 s = Map.lookup s stringLookup_3_16
193196
mkLicenseId LicenseListVersion_3_23 s = Map.lookup s stringLookup_3_23
194197
mkLicenseId LicenseListVersion_3_25 s = Map.lookup s stringLookup_3_25
198+
mkLicenseId LicenseListVersion_3_26 s = Map.lookup s stringLookup_3_26
195199

196200
stringLookup_3_0 :: Map String LicenseId
197201
stringLookup_3_0 = Map.fromList $ map (\i -> (licenseId i, i)) $
@@ -225,6 +229,10 @@ stringLookup_3_25 :: Map String LicenseId
225229
stringLookup_3_25 = Map.fromList $ map (\i -> (licenseId i, i)) $
226230
licenseIdList LicenseListVersion_3_25
227231

232+
stringLookup_3_26 :: Map String LicenseId
233+
stringLookup_3_26 = Map.fromList $ map (\i -> (licenseId i, i)) $
234+
licenseIdList LicenseListVersion_3_26
235+
228236
-- | Licenses in all SPDX License lists
229237
bulkOfLicenses :: [LicenseId]
230238
bulkOfLicenses =

0 commit comments

Comments
 (0)