Merge pull request #305975 from toonn/font-joypixels-emoji

joypixels: 6.6.0 -> 8.0.0
This commit is contained in:
toonn 2024-05-31 14:50:58 +02:00 committed by GitHub
commit b6762becf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -20,9 +20,9 @@ let
};
joypixels-free-license = with systemSpecific; {
spdxId = "LicenseRef-JoyPixels-Free-6.0";
fullName = "JoyPixels Free License Agreement 6.0";
url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf";
spdxId = "LicenseRef-JoyPixels-Free";
fullName = "JoyPixels Free License Agreement";
url = "https://cdn.joypixels.com/free-license.pdf";
free = false;
};
@ -43,11 +43,16 @@ let
unfree licenses.
configuration.nix:
nixpkgs.config.allowUnfree = true;
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"joypixels"
];
nixpkgs.config.joypixels.acceptLicense = true;
config.nix:
allowUnfree = true;
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"joypixels"
];
joypixels.acceptLicense = true;
[1]: ${joypixels-free-license.url}
@ -58,15 +63,15 @@ in
stdenv.mkDerivation rec {
pname = "joypixels";
version = "6.6.0";
version = "8.0.0";
src = assert !acceptLicense -> throwLicense;
with systemSpecific; fetchurl {
name = fontFile;
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = {
darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7";
}.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n";
darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv";
}.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw";
};
dontUnpack = true;
@ -82,22 +87,27 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The finest emoji you can use legally (formerly EmojiOne)";
longDescription = ''
Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon
designs and is 100% Unicode 13.1 compatible. We offer the largest
selection of files ranging from png, svg, iconjar, sprites, and fonts.
Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon
designs and is 100% Unicode 15.0 compatible. We offer the largest
selection of files ranging from png, svg, iconjar, and fonts (sprites
available upon request).
'';
homepage = "https://www.joypixels.com/fonts";
hydraPlatforms = []; # Just a binary file download, nothing to cache.
license =
let
free-license = joypixels-free-license;
appendix = joypixels-license-appendix;
in with systemSpecific; {
spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix";
spdxId = "LicenseRef-JoyPixels-Free-with-${capitalized}-Appendix";
fullName = "${free-license.fullName} with ${appendix.fullName}";
url = free-license.url;
appendixUrl = appendix.url;
free = false;
};
maintainers = with maintainers; [ toonn jtojnar ];
# Not quite accurate since it's a font, not a program, but clearly
# indicates we're not actually building it from source.
sourceProvenance = sourceTypes.binaryNativeCode;
};
}