From dd76912be8198a09507824dc42005b86a9e22c9d Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 16 Sep 2022 09:15:48 +0200
Subject: [PATCH 1/4] iosevka-comfy: Rephrase description

Use the description provided by the website.
---
 pkgs/data/fonts/iosevka/comfy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index 058d0b3a01d7..ae16b2dc616b 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -24,8 +24,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;

From fdf632675840d1183926081c3d431f52875b6e7f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 16 Sep 2022 10:10:34 +0200
Subject: [PATCH 2/4] iosevka-comfy: Sort and comment variants

---
 pkgs/data/fonts/iosevka/comfy.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index ae16b2dc616b..c3097f2376de 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -2,13 +2,16 @@
 
 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-duo"
+    # The wide, sans-serif set:
+    "comfy-wide"
+    "comfy-wide-fixed"
   ];
   version = "0.4.0";
   src = fetchFromSourcehut {

From cd455767b0e4938cc9d4a6afc43c360107bf0a88 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 16 Sep 2022 09:16:42 +0200
Subject: [PATCH 3/4] iosevka-comfy: 0.4.0 -> 1.0.0

---
 pkgs/data/fonts/iosevka/comfy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index c3097f2376de..699437bfde3c 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -13,12 +13,12 @@ let
     "comfy-wide"
     "comfy-wide-fixed"
   ];
-  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: {

From e7b76b9153dcfecc19e659dd491c709864fc4f4a Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 16 Sep 2022 09:16:59 +0200
Subject: [PATCH 4/4] iosevka-comfy: Add missing variants

---
 pkgs/data/fonts/iosevka/comfy.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index 699437bfde3c..2414a6f4aa14 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -8,10 +8,12 @@ let
     "comfy-duo"
     # 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 = "1.0.0";
   src = fetchFromSourcehut {