Unverified Commit 3cad140b authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #325380 from emilazy/push-sxmlkyptonuy 

Fix license field names
parents 0ef8a3c2 bf451f01

lib/licenses.nix

+3 −3
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ in mkLicense lset) ({ 


  ncbiPd = {

    spdxId = "NCBI-PD";

    fullname = "NCBI Public Domain Notice";

    fullName = "NCBI Public Domain Notice";

    # Due to United States copyright law, anything with this "license" does not have a copyright in the

    # jurisdiction of the United States. However, other jurisdictions may assign the United States

    # government copyright to the work, and the license explicitly states that in such a case, no license
@@ -1161,7 +1161,7 @@ in mkLicense lset) ({ 
    shortName = "TSL";

    fullName = "Timescale License Agreegment";

    url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";

    unfree = true;

    free = false;

  };



  tcltk = {
@@ -1297,7 +1297,7 @@ in mkLicense lset) ({ 


  zsh = {

    url = "https://github.com/zsh-users/zsh/blob/master/LICENCE";

    fulllName = "Zsh License";

    fullName = "Zsh License";

  };



  zpl20 = {

pkgs/development/cuda-modules/cutensor/extension.nix

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ let 
          maintainers = prevAttrs.meta.maintainers ++ [ lib.maintainers.obsidian-systems-maintenance ];

          license = lib.licenses.unfreeRedistributable // {

            shortName = "cuTENSOR EULA";

            name = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";

            fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";

            url = "https://docs.nvidia.com/cuda/cutensor/license.html";

          };

        };