Merge pull request #7092 from phadej/spdx-license-list-3.10 (09bf7b4e) · Commits · Glasgow Haskell Compiler / Packages / Cabal · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

Cabal
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

09bf7b4e

Unverified Commit 09bf7b4e authored 4 years ago by Oleg Grenrus Committed by GitHub 4 years ago

Downloads
- Plain Diff

Merge pull request #7092 from phadej/spdx-license-list-3.10

Add SPDX License list 3.10

parents 1d320e8a 885da596

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Cabal/src/Distribution/SPDX/LicenseExceptionId.hs 40 additions, 18 deletions

Cabal/src/Distribution/SPDX/LicenseExceptionId.hs
Cabal/src/Distribution/SPDX/LicenseId.hs 188 additions, 61 deletions

Cabal/src/Distribution/SPDX/LicenseId.hs
Cabal/src/Distribution/SPDX/LicenseListVersion.hs 2 additions, 1 deletion

Cabal/src/Distribution/SPDX/LicenseListVersion.hs
Makefile 4 additions, 2 deletions

Makefile
cabal-dev-scripts/src/GenSPDX.hs 9 additions, 20 deletions

cabal-dev-scripts/src/GenSPDX.hs
cabal-dev-scripts/src/GenSPDXExc.hs 9 additions, 20 deletions

cabal-dev-scripts/src/GenSPDXExc.hs
cabal-dev-scripts/src/GenUtils.hs 60 additions, 21 deletions

cabal-dev-scripts/src/GenUtils.hs
doc/file-format-changelog.rst 3 additions, 0 deletions

doc/file-format-changelog.rst
license-list-data/exceptions-3.10.json 466 additions, 0 deletions

license-list-data/exceptions-3.10.json
license-list-data/licenses-3.10.json 5542 additions, 0 deletions

license-list-data/licenses-3.10.json
templates/SPDX.LicenseExceptionId.template.hs 16 additions, 8 deletions

templates/SPDX.LicenseExceptionId.template.hs
templates/SPDX.LicenseId.template.hs 16 additions, 8 deletions

templates/SPDX.LicenseId.template.hs

with 6355 additions and 159 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment