From 9083624cfc09d96f44d76048ba9124bcd36522b1 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 11 Nov 2017 21:35:53 +0100 Subject: [PATCH] lib.licenses: add Open Software License OSL and derivatives (AFL and NPOSL) --- lib/licenses.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 7c713c7aa8d4..1f2c448470b3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -15,7 +15,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { afl21 = spdx { spdxId = "AFL-2.1"; - fullName = "Academic Free License"; + fullName = "Academic Free License v2.1"; + }; + + afl3 = spdx { + spdxId = "AFL-3.0"; + fullName = "Academic Free License v3.0"; }; agpl3 = spdx { @@ -426,6 +431,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Notion modified LGPL"; }; + nposl3 = spdx { + spdxId = "NPOSL-3.0"; + fullName = "Non-Profit Open Software License 3.0"; + }; + ofl = spdx { spdxId = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; @@ -441,7 +451,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; - osl = spdx { + osl21 = spdx { + spdxId = "OSL-2.1"; + fullName = "Open Software License 2.1"; + }; + + osl3 = spdx { spdxId = "OSL-3.0"; fullName = "Open Software License 3.0"; };