Unverified Commit 18d463bb authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

lib/licenses: add missing spdxId and remove urls from licenses that have a spdxId (#340360)

parents 565a4742 568bb8c2

lib/licenses.nix

+1 −16
Original line number Diff line number Diff line
@@ -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 = {
@@ -241,7 +240,6 @@ lib.mapAttrs mkLicense ({ 
  bsl11 = {

    spdxId = "BUSL-1.1";

    fullName = "Business Source License 1.1";

    url = "https://mariadb.com/bsl11";

    free = false;

    redistributable = true;

  };
@@ -254,13 +252,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 = {
@@ -464,7 +460,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";

  };
@@ -482,7 +477,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;

  };
@@ -676,7 +670,6 @@ lib.mapAttrs mkLicense ({ 
  iasl = {

    spdxId = "Intel-ACPI";

    fullName = "Intel ACPI Software License Agreement";

    url = "https://old.calculate-linux.org/packages/licenses/iASL";

  };



  icu = {
@@ -702,7 +695,6 @@ lib.mapAttrs mkLicense ({ 
  info-zip = {

    spdxId = "Info-ZIP";

    fullName = "Info-ZIP License";

    url = "https://infozip.sourceforge.net/license.html";

  };



  inria-compcert = {
@@ -887,7 +879,6 @@ lib.mapAttrs mkLicense ({ 
  miros = {

    spdxId = "MirOS";

    fullName = "MirOS License";

    url = "https://opensource.org/licenses/MirOS";

  };



  mit = {
@@ -949,7 +940,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 = {
@@ -984,7 +974,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 = {
@@ -1082,7 +1071,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 = {
@@ -1104,7 +1092,6 @@ lib.mapAttrs mkLicense ({ 
  psfl = {

    spdxId = "Python-2.0";

    fullName = "Python Software Foundation License version 2";

    url = "https://docs.python.org/license.html";

  };



  publicDomain = {
@@ -1233,8 +1220,8 @@ lib.mapAttrs mkLicense ({ 
  };



  ufl = {

    spdxId = "Ubuntu-font-1.0";

    fullName = "Ubuntu Font License 1.0";

    url = "https://ubuntu.com/legal/font-licence";

  };



  unfree = {
@@ -1278,7 +1265,6 @@ lib.mapAttrs mkLicense ({ 
  upl = {

    spdxId = "UPL-1.0";

    fullName = "Universal Permissive License";

    url = "https://oss.oracle.com/licenses/upl/";

  };



  vim = {
@@ -1344,7 +1330,6 @@ lib.mapAttrs mkLicense ({ 
  xfig = {

    spdxId = "Xfig";

    fullName = "xfig";

    url = "https://mcj.sourceforge.net/authors.html#xfig";

  };



  xinetd = {