Skip to content

Commit

Permalink
Regenerate licence files
Browse files Browse the repository at this point in the history
Useless since we are going to have to do it again before a release,
needed to make CI green (“Check that diff is clean”).
  • Loading branch information
ffaf1 committed Sep 14, 2024
1 parent bfe5e0a commit aa53d46
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import qualified Text.PrettyPrint as Disp

-- | SPDX License Exceptions identifiers list v3.23
data LicenseExceptionId
= DS389_exception -- ^ @389-exception@, 389 Directory Server Exception
= N_389_exception -- ^ @389-exception@, 389 Directory Server Exception
| Asterisk_exception -- ^ @Asterisk-exception@, Asterisk exception, SPDX License List 3.23
| Autoconf_exception_2_0 -- ^ @Autoconf-exception-2.0@, Autoconf exception 2.0
| Autoconf_exception_3_0 -- ^ @Autoconf-exception-3.0@, Autoconf exception 3.0
Expand Down Expand Up @@ -132,7 +132,7 @@ instance NFData LicenseExceptionId where

-- | License SPDX identifier, e.g. @"BSD-3-Clause"@.
licenseExceptionId :: LicenseExceptionId -> String
licenseExceptionId DS389_exception = "389-exception"
licenseExceptionId N_389_exception = "389-exception"
licenseExceptionId Asterisk_exception = "Asterisk-exception"
licenseExceptionId Autoconf_exception_2_0 = "Autoconf-exception-2.0"
licenseExceptionId Autoconf_exception_3_0 = "Autoconf-exception-3.0"
Expand Down Expand Up @@ -202,7 +202,7 @@ licenseExceptionId X11vnc_openssl_exception = "x11vnc-openssl-exception"

-- | License name, e.g. @"GNU General Public License v2.0 only"@
licenseExceptionName :: LicenseExceptionId -> String
licenseExceptionName DS389_exception = "389 Directory Server Exception"
licenseExceptionName N_389_exception = "389 Directory Server Exception"
licenseExceptionName Asterisk_exception = "Asterisk exception"
licenseExceptionName Autoconf_exception_2_0 = "Autoconf exception 2.0"
licenseExceptionName Autoconf_exception_3_0 = "Autoconf exception 3.0"
Expand Down Expand Up @@ -436,7 +436,7 @@ stringLookup_3_23 = Map.fromList $ map (\i -> (licenseExceptionId i, i)) $
-- | License exceptions in all SPDX License lists
bulkOfLicenses :: [LicenseExceptionId]
bulkOfLicenses =
[ DS389_exception
[ N_389_exception
, Autoconf_exception_2_0
, Autoconf_exception_3_0
, Bison_exception_2_2
Expand Down
10 changes: 5 additions & 5 deletions Cabal-syntax/src/Distribution/SPDX/LicenseId.hs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import qualified Text.PrettyPrint as Disp

-- | SPDX License identifiers list v3.23
data LicenseId
= NullBSD -- ^ @0BSD@, BSD Zero Clause License
= N_0BSD -- ^ @0BSD@, BSD Zero Clause License
| AAL -- ^ @AAL@, Attribution Assurance License
| Abstyles -- ^ @Abstyles@, Abstyles License
| AdaCore_doc -- ^ @AdaCore-doc@, AdaCore Doc License, SPDX License List 3.23
Expand Down Expand Up @@ -727,7 +727,7 @@ licenseIdMigrationMessage = go where

-- | License SPDX identifier, e.g. @"BSD-3-Clause"@.
licenseId :: LicenseId -> String
licenseId NullBSD = "0BSD"
licenseId N_0BSD = "0BSD"
licenseId AAL = "AAL"
licenseId Abstyles = "Abstyles"
licenseId AdaCore_doc = "AdaCore-doc"
Expand Down Expand Up @@ -1340,7 +1340,7 @@ licenseId ZPL_2_1 = "ZPL-2.1"

-- | License name, e.g. @"GNU General Public License v2.0 only"@
licenseName :: LicenseId -> String
licenseName NullBSD = "BSD Zero Clause License"
licenseName N_0BSD = "BSD Zero Clause License"
licenseName AAL = "Attribution Assurance License"
licenseName Abstyles = "Abstyles License"
licenseName AdaCore_doc = "AdaCore Doc License"
Expand Down Expand Up @@ -1955,7 +1955,7 @@ licenseName ZPL_2_1 = "Zope Public License 2.1"
--
-- See <https://opensource.org/licenses/alphabetical>.
licenseIsOsiApproved :: LicenseId -> Bool
licenseIsOsiApproved NullBSD = True
licenseIsOsiApproved N_0BSD = True
licenseIsOsiApproved AAL = True
licenseIsOsiApproved AFL_1_1 = True
licenseIsOsiApproved AFL_1_2 = True
Expand Down Expand Up @@ -2832,7 +2832,7 @@ stringLookup_3_23 = Map.fromList $ map (\i -> (licenseId i, i)) $
-- | Licenses in all SPDX License lists
bulkOfLicenses :: [LicenseId]
bulkOfLicenses =
[ NullBSD
[ N_0BSD
, AAL
, Abstyles
, Adobe_2006
Expand Down

0 comments on commit aa53d46

Please sign in to comment.