mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-05 20:19:16 +03:00
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.
This commit is contained in:
parent
7d4b8a1097
commit
e42705c982
@ -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";
|
||||
|
@ -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" ];
|
||||
};
|
||||
|
@ -15,6 +15,6 @@ appleDerivation' stdenvNoCC {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -37,6 +37,6 @@ appleDerivation' stdenvNoCC {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
@ -183,6 +183,6 @@ appleDerivation' stdenv {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -17,6 +17,6 @@ appleDerivation {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -181,6 +181,6 @@ appleDerivation' stdenv {
|
||||
description = "The Mac OS libc/libSystem (tapi library with pure headers)";
|
||||
maintainers = with maintainers; [ copumpkin gridaphobe ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -34,6 +34,6 @@ appleDerivation' stdenvNoCC {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -187,7 +187,7 @@ let
|
||||
} // (if builtins.isFunction attrs then attrs finalAttrs else attrs) // {
|
||||
meta = (with lib; {
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
}) // (attrs.meta or {});
|
||||
});
|
||||
|
||||
|
@ -11,6 +11,6 @@ appleDerivation' stdenvNoCC {
|
||||
description = "Impure primitive symlinks to the Mac OS native dyld, along with headers";
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -12,6 +12,6 @@ appleDerivation {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin lnl7 ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -38,6 +38,6 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) {
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
};
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ symlinkJoin rec {
|
||||
meta = with lib; {
|
||||
description = "MacOS Compiler Tools";
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ stdenv.mkDerivation {
|
||||
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
|
||||
homepage = "http://www.opensource.apple.com/source/cctools/";
|
||||
description = "MacOS Compiler Tools (cross-platform port)";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.apple-psl20;
|
||||
maintainers = with lib.maintainers; [ matthewbauer ];
|
||||
};
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
|
||||
AppKit Xplugin Foundation
|
||||
];
|
||||
meta = with lib; {
|
||||
license = licenses.apsl20;
|
||||
license = licenses.apple-psl20;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
};
|
||||
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "HFS/HFS+ user space utils";
|
||||
license = lib.licenses.apsl20;
|
||||
license = lib.licenses.apple-psl20;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/apple-oss-distributions/pdisk";
|
||||
license = with licenses; [
|
||||
hpnd # original license statements seems to match this (in files that are shared with mac-fdisk)
|
||||
apsl10 # new files
|
||||
apple-psl10 # new files
|
||||
];
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.unix;
|
||||
|
Loading…
Reference in New Issue
Block a user