BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #274692 from ryanccn/iosevka

Browse source 
iosevka: 27.3.5 -> 28.1.0
This commit is contained in:
Weijia Wang 2024-03-08 21:14:33 +01:00 committed by GitHub
commit e16df3d96b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/data/fonts/iosevka/comfy.nix
View file

@ -4,21 +4,21 @@ let
sets = [
# Family | Shapes | Spacing | Style | Ligatures |
# ------------------------+--------+---------+------------+-----------|
"comfy" # Sans | Compact | Monospaced | Yes |
"comfy-fixed" # Sans | Compact | Monospaced | No |
"comfy-duo" # Sans | Compact | Duospaced | Yes |
"comfy" # | Sans | Compact | Monospaced | Yes |
"comfy-fixed" # | Sans | Compact | Monospaced | No |
"comfy-duo" # | Sans | Compact | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-motion" # Slab | Compact | Monospaced | Yes |
"comfy-motion-fixed" # Slab | Compact | Monospaced | No |
"comfy-motion-duo" # Slab | Compact | Duospaced | Yes |
"comfy-motion" # | Slab | Compact | Monospaced | Yes |
"comfy-motion-fixed" # | Slab | Compact | Monospaced | No |
"comfy-motion-duo" # | Slab | Compact | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-wide" # Sans | Wide | Monospaced | Yes |
"comfy-wide-fixed" # Sans | Wide | Monospaced | No |
"comfy-wide-duo" # Sans | Wide | Duospaced | Yes |
"comfy-wide" # | Sans | Wide | Monospaced | Yes |
"comfy-wide-fixed" # | Sans | Wide | Monospaced | No |
"comfy-wide-duo" # | Sans | Wide | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-wide-motion" # Slab | Wide | Monospaced | Yes |
"comfy-wide-motion" # | Slab | Wide | Monospaced | Yes |
"comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No |
"comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes |
"comfy-wide-motion-duo" # | Slab | Wide | Duospaced | Yes |
];
version = "1.4.0";
src = fetchFromGitHub {
@ -34,6 +34,7 @@ let
inherit set privateBuildPlan;
buildNpmPackage = args: superBuildNpmPackage
(args // {
pname = "iosevka-${set}";
inherit version;
src = fetchFromGitHub {
@ -45,6 +46,14 @@ let
npmDepsHash = "sha256-c+ltdh5e3+idclYfqp0Xh9IUwoj7XYP1uzJG6+a5gFU=";
installPhase = ''
runHook preInstall
fontdir="$out/share/fonts/truetype"
install -d "$fontdir"
install "dist/$pname/ttf"/* "$fontdir"
runHook postInstall
'';
meta = with lib; {
inherit (src.meta) homepage;
description = ''

40
pkgs/data/fonts/iosevka/default.nix
View file

@ -54,17 +54,17 @@ assert (privateBuildPlan != null) -> set != null;
assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
version = "27.3.5";
pname = "Iosevka${toString set}";
version = "28.1.0";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I=";
hash = "sha256-cYnGJ7Z0PDRZtC/vz8hX/+mqk7iVkajFTfNGgRW+edQ=";
};
npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg=";
npmDepsHash = "sha256-bzQ7dc7UiC++0DxnQHusu6Ym7rd7GgeA6bGSnnla1nk=";
nativeBuildInputs = [
remarshal
@ -88,23 +88,23 @@ buildNpmPackage rec {
) [ "buildPlan" ];
configurePhase = ''
runHook preConfigure
${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
''}
${lib.optionalString (builtins.isString privateBuildPlan
&& (!lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
cp "$buildPlanPath" private-build-plans.toml
runHook preConfigure
${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
''}
${lib.optionalString (builtins.isString privateBuildPlan
&& (lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
cp "$buildPlan" private-build-plans.toml
${lib.optionalString (builtins.isString privateBuildPlan
&& (!lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
cp "$buildPlanPath" private-build-plans.toml
''}
${lib.optionalString (builtins.isString privateBuildPlan
&& (lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
cp "$buildPlan" private-build-plans.toml
''}
${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> params/parameters.toml
cat "$extraParametersPath" >> params/parameters.toml
''}
${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> params/parameters.toml
cat "$extraParametersPath" >> params/parameters.toml
''}
runHook postConfigure
runHook postConfigure
'';
buildPhase = ''
@ -118,7 +118,7 @@ buildNpmPackage rec {
runHook preInstall
fontdir="$out/share/fonts/truetype"
install -d "$fontdir"
install "dist/$pname/ttf"/* "$fontdir"
install "dist/$pname/TTF"/* "$fontdir"
runHook postInstall
'';