diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-23 18:01:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 18:01:15 +0000 |
commit | 4688cd53b60d045633225e628d37f64105fb81ff (patch) | |
tree | 1b343637fd47334ad548cd6e46a60ffdd89fbaab /lib | |
parent | 52c286ee5b3b8f5c521b17411782311a313f2e4c (diff) | |
parent | 7ce8e7c4cf90492a631e96bcfe70724104914381 (diff) |
Merge master into staging-next
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 0c4d9d8bc9e13..cf8caff2a780f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -109,6 +109,11 @@ in mkLicense lset) ({ fullName = "Apache License 2.0"; }; + asl20-llvm = { + spdxId = "Apache-2.0 WITH LLVM-exception"; + fullName = "Apache License 2.0 with LLVM Exceptions"; + }; + bitstreamVera = { spdxId = "Bitstream-Vera"; fullName = "Bitstream Vera Font License"; @@ -657,11 +662,6 @@ in mkLicense lset) ({ url = "https://opensource.franz.com/preamble.html"; }; - llvm-exception = { - spdxId = "LLVM-exception"; - fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License - }; - lppl12 = { spdxId = "LPPL-1.2"; fullName = "LaTeX Project Public License v1.2"; |