diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2019-10-31 19:50:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-31 19:50:12 +0100 |
commit | bca9437d1eae9519b61a58f2593f25f65494f8e9 (patch) | |
tree | bc74933a26cae359a64bcbb98a3c03844b690fa4 /pkgs/data/fonts | |
parent | 62193ec416a770925eb3bbe389a7480f76af92eb (diff) | |
parent | a9e88bb2e9c145f5508721229f561fde946ea4d0 (diff) | |
download | nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar.gz nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar.bz2 nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar.lz nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar.xz nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.tar.zst nixpkgs-bca9437d1eae9519b61a58f2593f25f65494f8e9.zip |
Merge pull request #72049 from babariviere/iosevka-v2.3.2
iosevka: 2.3.0 -> 2.3.2
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r-- | pkgs/data/fonts/iosevka/default.nix | 44 | ||||
-rw-r--r-- | pkgs/data/fonts/iosevka/package.json | 2 |
2 files changed, 26 insertions, 20 deletions
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index a1461032f1b..fb00fff130f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, pkgs, fetchFromGitHub -, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc +{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal +, ttfautohint-nox, otfcc # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -13,27 +13,30 @@ # ]; # }; , privateBuildPlan ? null -# Extra parameters. Can be used for ligature mapping. + # Extra parameters. Can be used for ligature mapping. + # It must be a raw toml string. + # + # Ex: + # [[iosevka.compLig]] + # unicode = 57808 # 0xe1d0 + # featureTag = 'XHS0' + # sequence = "+>" , extraParameters ? null -# Custom font set name. Required if any custom settings above. -, set ? null -}: + # Custom font set name. Required if any custom settings above. +, set ? null }: assert (privateBuildPlan != null) -> set != null; stdenv.mkDerivation rec { - pname = - if set != null - then "iosevka-${set}" - else "iosevka"; + pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "Iosevka"; rev = "v${version}"; - sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv"; + sha256 = "0s0vdvp1sn8p2pi2xm9n05pabk30ki7wjlmr0zz0nkhidb8apw6k"; }; nativeBuildInputs = [ @@ -44,9 +47,10 @@ stdenv.mkDerivation rec { ttfautohint-nox ]; - privateBuildPlanJSON = builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; - extraParametersJSON = builtins.toJSON { ${pname} = extraParameters; }; - passAsFile = [ "privateBuildPlanJSON" "extraParametersJSON" ]; + privateBuildPlanJSON = + builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; + inherit extraParameters; + passAsFile = [ "privateBuildPlanJSON" "extraParameters" ]; configurePhase = '' runHook preConfigure @@ -55,9 +59,11 @@ stdenv.mkDerivation rec { ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> parameters.toml - remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml + cat "$extraParametersPath" >> parameters.toml ''} - ln -s ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/node_modules . + ln -s ${ + nodePackages."iosevka-build-deps-../../data/fonts/iosevka" + }/lib/node_modules/iosevka-build-deps/node_modules . runHook postConfigure ''; @@ -76,8 +82,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://be5invis.github.io/Iosevka; - downloadPage = https://github.com/be5invis/Iosevka/releases; + homepage = "https://be5invis.github.io/Iosevka"; + downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' Slender monospace sans-serif and slab-serif typeface inspired by Pragmata Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. diff --git a/pkgs/data/fonts/iosevka/package.json b/pkgs/data/fonts/iosevka/package.json index ae162a97538..e6221b28392 100644 --- a/pkgs/data/fonts/iosevka/package.json +++ b/pkgs/data/fonts/iosevka/package.json @@ -1,6 +1,6 @@ { "name": "iosevka-build-deps", - "version": "2.3.0", + "version": "2.3.2", "scripts": { "build": "verda -f verdafile.js" }, |