iosevka: 3.7.1 -> 4.5.0, revise build plan system

This commit is contained in:
Riley Inman 2021-02-08 18:47:20 -05:00 committed by Cole Helbling
parent 0f3b7ea1dd
commit 21a6759463
3 changed files with 660 additions and 851 deletions

View File

@ -1,31 +1,51 @@
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
, ttfautohint-nox
# Custom font set options.
# See https://typeof.net/Iosevka/customizer
# Can be a raw TOML string, or a Nix attrset.
# Custom font set options.
# See https://github.com/be5invis/Iosevka#build-your-own-style
# Ex:
# privateBuildPlan = {
# family = "Iosevka Expanded";
#
# design = [
# "sans"
# "expanded"
# ];
# };
# Ex:
# privateBuildPlan = ''
# [buildPlans.iosevka-custom]
# family = "Iosevka Custom"
# spacing = "normal"
# serifs = "sans"
#
# [buildPlans.iosevka-custom.variants.design]
# capital-j = "serifless"
#
# [buildPlans.iosevka-custom.variants.italic]
# i = "tailed"
# '';
# Or:
# privateBuildPlan = {
# family = "Iosevka Custom";
# spacing = "normal";
# serifs = "sans";
#
# variants = {
# design.capital-j = "serifless";
# italic.i = "tailed";
# };
# }
, privateBuildPlan ? null
# Extra parameters. Can be used for ligature mapping.
# It must be a raw toml string.
#
# It must be a raw TOML string.
# Ex:
# [[iosevka.compLig]]
# unicode = 57808 # 0xe1d0
# featureTag = 'XHS0'
# sequence = "+>"
# extraParameters = ''
# [[iosevka.compLig]]
# unicode = 57808 # 0xe1d0
# featureTag = 'XHS0'
# sequence = "+>"
# '';
, extraParameters ? null
# Custom font set name. Required if any custom settings above.
, set ? null }:
assert (privateBuildPlan != null) -> set != null;
assert (extraParameters != null) -> set != null;
let
# We don't know the attribute name for the Iosevka package as it
@ -54,15 +74,21 @@ stdenv.mkDerivation rec {
ttfautohint-nox
];
privateBuildPlanJSON =
builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
buildPlan =
if builtins.isAttrs privateBuildPlan
then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }
else privateBuildPlan;
inherit extraParameters;
passAsFile = [ "privateBuildPlanJSON" "extraParameters" ];
passAsFile = [ "buildPlan" "extraParameters" ];
configurePhase = ''
runHook preConfigure
${lib.optionalString (privateBuildPlan != null) ''
remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml
${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
''}
${lib.optionalString (builtins.isString privateBuildPlan) ''
cp "$buildPlanPath" private-build-plans.toml
''}
${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> params/parameters.toml

View File

@ -115,7 +115,7 @@
, "indium"
, "insect"
, "ionic"
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"}
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"}
, "jake"
, "javascript-typescript-langserver"
, "joplin"

File diff suppressed because it is too large Load Diff