diff options
author | iliana etaoin <iliana@buttslol.net> | 2024-04-05 20:18:41 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-04-08 20:39:37 +0200 |
commit | e42705c98279f4f602face96269034164b6e77f5 (patch) | |
tree | c8a202a2e4ce0b716b1baed03c7d14548bcf4f73 /lib/licenses.nix | |
parent | 7d4b8a1097f4fe58a18c862dd3de5d5382cd0a1c (diff) |
licenses: rename `apsl{10,20}` -> `apple-psl{10,20}`
Part 1 of #301908. This renames the two versions of the Apple Public Source License seen in nixpkgs; `apsl20` was often confused as being for the widely-used Apache License 2.0.
Diffstat (limited to 'lib/licenses.nix')
-rw-r--r-- | lib/licenses.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 358b77117a362..035907ed921ee 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -93,12 +93,12 @@ in mkLicense lset) ({ url = "https://aomedia.org/license/patent-license/"; }; - apsl10 = { + apple-psl10 = { spdxId = "APSL-1.0"; fullName = "Apple Public Source License 1.0"; }; - apsl20 = { + apple-psl20 = { spdxId = "APSL-2.0"; fullName = "Apple Public Source License 2.0"; }; @@ -1272,6 +1272,18 @@ in mkLicense lset) ({ }; } // { # TODO: remove legacy aliases + apsl10 = { + # deprecated for consistency with `apple-psl20`; use `apple-psl10` + spdxId = "APSL-1.0"; + fullName = "Apple Public Source License 1.0"; + deprecated = true; + }; + apsl20 = { + # deprecated due to confusion with Apache-2.0; use `apple-psl20` + spdxId = "APSL-2.0"; + fullName = "Apple Public Source License 2.0"; + deprecated = true; + }; gpl2 = { spdxId = "GPL-2.0"; fullName = "GNU General Public License v2.0"; |