From bafae5bf436a988527a79273c19058cd9e4a4a65 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 7 Sep 2024 21:16:37 +0200 Subject: [PATCH 1/2] lib/licenses: set spdx for Ubuntu font license --- lib/licenses.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9affe6a2d63c..3a630c9fbdb7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1223,6 +1223,7 @@ lib.mapAttrs mkLicense ({ }; ufl = { + spdxId = "Ubuntu-font-1.0"; fullName = "Ubuntu Font License 1.0"; url = "https://ubuntu.com/legal/font-licence"; }; From 568bb8c275e0460888c805fbddfcc991ac898dbe Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 7 Sep 2024 21:24:31 +0200 Subject: [PATCH 2/2] lib/licenses: remove urls from licenses that have a spdxId if the licenses have a spdxId the url get auto-generated from it. --- lib/licenses.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 3a630c9fbdb7..b35e007f9403 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -115,7 +115,6 @@ lib.mapAttrs mkLicense ({ arphicpl = { spdxId = "Arphic-1999"; fullName = "Arphic Public License"; - url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; }; artistic1 = { @@ -236,7 +235,6 @@ lib.mapAttrs mkLicense ({ bsl11 = { spdxId = "BUSL-1.1"; fullName = "Business Source License 1.1"; - url = "https://mariadb.com/bsl11"; free = false; redistributable = true; }; @@ -249,13 +247,11 @@ lib.mapAttrs mkLicense ({ cal10 = { spdxId = "CAL-1.0"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; - url = "https://opensource.org/licenses/CAL-1.0"; }; caldera = { spdxId = "Caldera"; fullName = "Caldera License"; - url = "http://www.lemis.com/grog/UNIX/ancient-source-all.pdf"; }; capec = { @@ -459,7 +455,6 @@ lib.mapAttrs mkLicense ({ ecl20 = { fullName = "Educational Community License, Version 2.0"; - url = "https://opensource.org/licenses/ECL-2.0"; shortName = "ECL 2.0"; spdxId = "ECL-2.0"; }; @@ -477,7 +472,6 @@ lib.mapAttrs mkLicense ({ elastic20 = { spdxId = "Elastic-2.0"; fullName = "Elastic License 2.0"; - url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt"; free = false; }; @@ -671,7 +665,6 @@ lib.mapAttrs mkLicense ({ iasl = { spdxId = "Intel-ACPI"; fullName = "Intel ACPI Software License Agreement"; - url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; icu = { @@ -697,7 +690,6 @@ lib.mapAttrs mkLicense ({ info-zip = { spdxId = "Info-ZIP"; fullName = "Info-ZIP License"; - url = "https://infozip.sourceforge.net/license.html"; }; inria-compcert = { @@ -882,7 +874,6 @@ lib.mapAttrs mkLicense ({ miros = { spdxId = "MirOS"; fullName = "MirOS License"; - url = "https://opensource.org/licenses/MirOS"; }; mit = { @@ -939,7 +930,6 @@ lib.mapAttrs mkLicense ({ mulan-psl2 = { spdxId = "MulanPSL-2.0"; fullName = "Mulan Permissive Software License, Version 2"; - url = "https://license.coscl.org.cn/MulanPSL2"; }; naist-2003 = { @@ -974,7 +964,6 @@ lib.mapAttrs mkLicense ({ fullName = "Netdata Cloud UI License v1.0"; free = false; redistributable = true; # Only if used in Netdata products. - url = "https://raw.githubusercontent.com/netdata/netdata/master/web/gui/v2/LICENSE.md"; }; nistSoftware = { @@ -1072,7 +1061,6 @@ lib.mapAttrs mkLicense ({ parity70 = { spdxId = "Parity-7.0.0"; fullName = "Parity Public License 7.0.0"; - url = "https://paritylicense.com/versions/7.0.0.html"; }; php301 = { @@ -1094,7 +1082,6 @@ lib.mapAttrs mkLicense ({ psfl = { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; - url = "https://docs.python.org/license.html"; }; publicDomain = { @@ -1225,7 +1212,6 @@ lib.mapAttrs mkLicense ({ ufl = { spdxId = "Ubuntu-font-1.0"; fullName = "Ubuntu Font License 1.0"; - url = "https://ubuntu.com/legal/font-licence"; }; unfree = { @@ -1269,7 +1255,6 @@ lib.mapAttrs mkLicense ({ upl = { spdxId = "UPL-1.0"; fullName = "Universal Permissive License"; - url = "https://oss.oracle.com/licenses/upl/"; }; vim = { @@ -1335,7 +1320,6 @@ lib.mapAttrs mkLicense ({ xfig = { spdxId = "Xfig"; fullName = "xfig"; - url = "https://mcj.sourceforge.net/authors.html#xfig"; }; xinetd = {