Commit e42705c9 authored by iliana etaoin's avatar iliana etaoin Committed by Alyssa Ross
Browse files

licenses: rename `apsl{10,20}` -> `apple-psl{10,20}` 

Part 1 of #301908.

This renames the two versions of the Apple Public Source License seen in
nixpkgs; `apsl20` was often confused as being for the widely-used Apache
License 2.0.
parent 7d4b8a10

lib/licenses.nix

+14 −2
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ in mkLicense lset) ({ 
    url = "https://aomedia.org/license/patent-license/";

  };



  apsl10 = {

  apple-psl10 = {

    spdxId = "APSL-1.0";

    fullName = "Apple Public Source License 1.0";

  };



  apsl20 = {

  apple-psl20 = {

    spdxId = "APSL-2.0";

    fullName = "Apple Public Source License 2.0";

  };
@@ -1272,6 +1272,18 @@ in mkLicense lset) ({ 
  };

} // {

  # TODO: remove legacy aliases

  apsl10 = {

    # deprecated for consistency with `apple-psl20`; use `apple-psl10`

    spdxId = "APSL-1.0";

    fullName = "Apple Public Source License 1.0";

    deprecated = true;

  };

  apsl20 = {

    # deprecated due to confusion with Apache-2.0; use `apple-psl20`

    spdxId = "APSL-2.0";

    fullName = "Apple Public Source License 2.0";

    deprecated = true;

  };

  gpl2 = {

    spdxId = "GPL-2.0";

    fullName = "GNU General Public License v2.0";

pkgs/by-name/op/opencflite/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Cross platform port of the macOS CoreFoundation";

    homepage = "https://github.com/gerickson/opencflite";

    license = lib.licenses.apsl20;

    license = lib.licenses.apple-psl20;

    maintainers = with lib.maintainers; [ wegank ];

    platforms = [ "x86_64-linux" ];

  };

pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ appleDerivation' stdenvNoCC { 
  meta = with lib; {

    maintainers = with maintainers; [ copumpkin ];

    platforms   = platforms.darwin;

    license     = licenses.apsl20;

    license     = licenses.apple-psl20;

  };

}

pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ appleDerivation' stdenvNoCC { 
  meta = with lib; {

    maintainers = with maintainers; [ copumpkin ];

    platforms   = platforms.darwin;

    license     = licenses.apsl20;

    license     = licenses.apple-psl20;

  };

}

pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ appleDerivation' stdenv { 
    description = "Apple's common startup stubs for darwin";

    maintainers = with maintainers; [ copumpkin ];

    platforms   = platforms.darwin;

    license     = licenses.apsl20;

    license     = licenses.apple-psl20;

  };

}