Commit e19ad622 authored by jopejoe1's avatar jopejoe1 Committed by Alyssa Ross
Browse files

lib.licenses: replace gpl2UBDLPlus license with ubdlException

parent 61d0373a

lib/licenses.nix

+5 −5
Original line number Diff line number Diff line
@@ -650,11 +650,6 @@ lib.mapAttrs mkLicense ( 
      fullName = "GNU General Public License v2.0 only";

    };



    gpl2UBDLPlus = {

      fullName = "GNU General Public License v3.0 or later (with UBDL exception)";

      url = "https://spdx.org/licenses/UBDL-exception.html";

    };



    gpl2Oss = {

      fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";

      url = "https://www.mysql.com/about/legal/licensing/foss-exception";
@@ -1326,6 +1321,11 @@ lib.mapAttrs mkLicense ( 
      url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";

    };



    ubdlException = {

      spdxId = "UBDL-exception";

      fullName = "Unmodified Binary Distribution exception";

    };



    ucd = {

      fullName = "Unicode Character Database License";

      url = "https://fedoraproject.org/wiki/Licensing:UCD";

pkgs/by-name/ip/ipxe/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { 
      bsd2

      bsd3

      gpl2Only

      gpl2UBDLPlus

      ubdlException

      isc

      mit

      mpl11