diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 21:14:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 21:14:33 +0100 |
commit | e16df3d96bbd818dbe942e9b6e736d68bffccf53 (patch) | |
tree | 0df23253a8e020ffe545a5c4bb7eaf584c1e8129 | |
parent | 74302ad5ed53dab5dc158fbfd398c980e1b3b6fb (diff) | |
parent | 68dced8dc74e918deffe15a1b431be9fec8d3270 (diff) |
Merge pull request #274692 from ryanccn/iosevka
iosevka: 27.3.5 -> 28.1.0
-rw-r--r-- | pkgs/data/fonts/iosevka/comfy.nix | 31 | ||||
-rw-r--r-- | pkgs/data/fonts/iosevka/default.nix | 40 |
2 files changed, 40 insertions, 31 deletions
diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index fb788b287635..63dfca58d544 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -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 = '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 6993a1641de5..c379fe7ebb3b 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -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 ''; |