Skip to content

Commit 84cb6c2

Browse files
committed
add missing license list constructor
1 parent f39ea11 commit 84cb6c2

File tree

4 files changed

+406
-7
lines changed

4 files changed

+406
-7
lines changed

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

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

33-
-- | SPDX License Exceptions identifiers list v3.25
33+
-- | SPDX License Exceptions identifiers list v3.26
3434
data LicenseExceptionId
3535
= N_389_exception -- ^ @389-exception@, 389 Directory Server Exception
3636
| Asterisk_exception -- ^ @Asterisk-exception@, Asterisk exception, SPDX License List 3.23, SPDX License List 3.25, SPDX License List 3.26
@@ -123,7 +123,7 @@ instance Binary LicenseExceptionId where
123123

124124
-- note: remember to bump version each time the definition changes
125125
instance Structured LicenseExceptionId where
126-
structure p = set typeVersion 306 $ nominalStructure p
126+
structure p = set typeVersion 307 $ nominalStructure p
127127

128128
instance Pretty LicenseExceptionId where
129129
pretty = Disp.text . licenseExceptionId
@@ -478,6 +478,61 @@ licenseExceptionIdList LicenseListVersion_3_25 =
478478
, X11vnc_openssl_exception
479479
]
480480
++ bulkOfLicenses
481+
licenseExceptionIdList LicenseListVersion_3_26 =
482+
[ Asterisk_exception
483+
, Asterisk_linking_protocols_exception
484+
, Autoconf_exception_generic_3_0
485+
, Autoconf_exception_generic
486+
, Autoconf_exception_macro
487+
, Bison_exception_1_24
488+
, CGAL_linking_exception
489+
, Cryptsetup_OpenSSL_exception
490+
, Digia_Qt_LGPL_exception_1_1
491+
, Erlang_otp_linking_exception
492+
, Fmt_exception
493+
, GCC_exception_2_0_note
494+
, Gmsh_exception
495+
, GNAT_exception
496+
, GNOME_examples_exception
497+
, GNU_compiler_exception
498+
, GPL_3_0_389_ds_base_exception
499+
, GPL_3_0_interface_exception
500+
, GPL_3_0_linking_exception
501+
, GPL_3_0_linking_source_exception
502+
, GPL_CC_1_0
503+
, GStreamer_exception_2005
504+
, GStreamer_exception_2008
505+
, Harbour_exception
506+
, Independent_modules_exception
507+
, KiCad_libraries_exception
508+
, LGPL_3_0_linking_exception
509+
, Libpri_OpenH323_exception
510+
, LLGPL
511+
, LLVM_exception
512+
, Mxml_exception
513+
, OCaml_LGPL_linking_exception
514+
, OpenJDK_assembly_exception_1_0
515+
, PCRE2_exception
516+
, Polyparse_exception
517+
, PS_or_PDF_font_exception_20170817
518+
, QPL_1_0_INRIA_2004_exception
519+
, Qt_GPL_exception_1_0
520+
, Qt_LGPL_exception_1_1
521+
, Romic_exception
522+
, RRDtool_FLOSS_exception_2_0
523+
, SANE_exception
524+
, SHL_2_0
525+
, SHL_2_1
526+
, Stunnel_exception
527+
, SWI_exception
528+
, Swift_exception
529+
, Texinfo_exception
530+
, UBDL_exception
531+
, Universal_FOSS_exception_1_0
532+
, Vsftpd_openssl_exception
533+
, X11vnc_openssl_exception
534+
]
535+
++ bulkOfLicenses
481536

482537
-- | Create a 'LicenseExceptionId' from a 'String'.
483538
mkLicenseExceptionId :: LicenseListVersion -> String -> Maybe LicenseExceptionId
@@ -489,6 +544,7 @@ mkLicenseExceptionId LicenseListVersion_3_10 s = Map.lookup s stringLookup_3_10
489544
mkLicenseExceptionId LicenseListVersion_3_16 s = Map.lookup s stringLookup_3_16
490545
mkLicenseExceptionId LicenseListVersion_3_23 s = Map.lookup s stringLookup_3_23
491546
mkLicenseExceptionId LicenseListVersion_3_25 s = Map.lookup s stringLookup_3_25
547+
mkLicenseExceptionId LicenseListVersion_3_26 s = Map.lookup s stringLookup_3_26
492548

493549
stringLookup_3_0 :: Map String LicenseExceptionId
494550
stringLookup_3_0 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
@@ -522,6 +578,10 @@ stringLookup_3_25 :: Map String LicenseExceptionId
522578
stringLookup_3_25 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
523579
licenseExceptionIdList LicenseListVersion_3_25
524580

581+
stringLookup_3_26 :: Map String LicenseExceptionId
582+
stringLookup_3_26 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
583+
licenseExceptionIdList LicenseListVersion_3_26
584+
525585
-- | License exceptions in all SPDX License lists
526586
bulkOfLicenses :: [LicenseExceptionId]
527587
bulkOfLicenses =

0 commit comments

Comments
 (0)