From 98e830efe2c7294850e89f0e2aef669c2f06a588 Mon Sep 17 00:00:00 2001 From: oleks Date: Wed, 25 Jan 2017 23:05:02 +0100 Subject: [PATCH 1/2] licenses: add EUPL v1.1 license --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index e5784ce22022..e45c09696498 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -191,6 +191,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + eupl11 = { + fullName = "EUPL v1.1"; + url = https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11; + }; + fdl12 = spdx { spdxId = "GFDL-1.2"; fullName = "GNU Free Documentation License v1.2"; From 15219fe15e6607b543b3ad80f3c3b0bb0f1c38b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 25 Jan 2017 23:31:25 +0100 Subject: [PATCH 2/2] licenses.eupl11: unify with the other licenses ... as it *is* present in the SPDX list. --- lib/licenses.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index e45c09696498..90c1cc177cb3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -191,9 +191,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; - eupl11 = { - fullName = "EUPL v1.1"; - url = https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11; + eupl11 = spdx { + spdxId = "EUPL-1.1"; + fullname = "European Union Public License 1.1"; }; fdl12 = spdx {