summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-09-17 00:16:02 +0000
committerGitHub <noreply@github.com>2022-09-17 00:16:02 +0000
commit83a46ef889d399453b502c984519f10d65a10e99 (patch)
tree3d61fd66ac5609a176232b3e883f0e1a27c555c4 /pkgs/data
parent2921710cec8bd1cdb8b3b976569b52f36fa43099 (diff)
parentd9a1414346059619d9e13ab93e749bbb82e5252a (diff)
downloadnixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar.gz
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar.bz2
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar.lz
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar.xz
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.tar.zst
nixpkgs-83a46ef889d399453b502c984519f10d65a10e99.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/iosevka/comfy.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index 058d0b3a01d..2414a6f4aa1 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -2,20 +2,25 @@
 
 let
   sets = [
+    # The compact, sans-serif set:
     "comfy"
     "comfy-fixed"
     "comfy-duo"
-    "comfy-wide"
-    "comfy-wide-fixed"
+    # The compact, serif set:
     "comfy-motion"
+    "comfy-motion-fixed"
     "comfy-motion-duo"
+    # The wide, sans-serif set:
+    "comfy-wide"
+    "comfy-wide-fixed"
+    "comfy-wide-duo"
   ];
-  version = "0.4.0";
+  version = "1.0.0";
   src = fetchFromSourcehut {
     owner = "~protesilaos";
     repo = "iosevka-comfy";
     rev = version;
-    sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw=";
+    sha256 = "0psbz40hicv3v3x7yq26hy6nfbzml1kha24x6a88rfrncdp6bds7";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
   overrideAttrs = (attrs: {
@@ -24,8 +29,8 @@ let
     meta = with lib; {
       inherit (src.meta) homepage;
       description = ''
-        Custom build of Iosevka with a rounded style and open shapes,
-        adjusted metrics, and overrides for almost all individual glyphs
+        Customised build of the Iosevka typeface, with a consistent
+        rounded style and overrides for almost all individual glyphs
         in both roman (upright) and italic (slanted) variants.
       '';
       license = licenses.ofl;