From 3280fce729208100762506869d9fc1c3be70aede Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 11 Apr 2025 06:53:43 +0200
Subject: [PATCH 1/2] aporetic: add `meta` attribute

---
 pkgs/by-name/ap/aporetic/package.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
index acfd47d95aca..54b2f4f50673 100644
--- a/pkgs/by-name/ap/aporetic/package.nix
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -17,9 +17,9 @@ let
   version = "1.1.0";
   src = fetchFromGitHub {
     owner = "protesilaos";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI=";
+    repo = "aporetic";
+    tag = version;
+    hash = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI=";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
   makeIosevkaFont =
@@ -45,21 +45,22 @@ let
             };
 
             npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8=";
-
-            meta = with lib; {
-              inherit (src.meta) homepage;
-              description = ''
-                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;
-              platforms = iosevka.meta.platforms;
-              maintainers = [ maintainers.DamienCassou ];
-            };
           }
         );
     });
 in
 symlinkJoin {
   inherit pname version;
+
   paths = (builtins.map makeIosevkaFont sets);
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = ''
+      Custom build of Iosevka with different style and metrics than the default. This is the successor to my "Iosevka Comfy" fonts.
+    '';
+    license = lib.licenses.ofl;
+    platforms = iosevka.meta.platforms;
+    maintainers = [ lib.maintainers.DamienCassou ];
+  };
 }

From b3b3e378563705c6988ab5848638f753f07189ae Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 11 Apr 2025 06:55:59 +0200
Subject: [PATCH 2/2] aporetic-bin: init at 1.1.0

---
 pkgs/by-name/ap/aporetic-bin/package.nix | 39 ++++++++++++++++++++++++
 pkgs/by-name/ap/aporetic/package.nix     |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ap/aporetic-bin/package.nix

diff --git a/pkgs/by-name/ap/aporetic-bin/package.nix b/pkgs/by-name/ap/aporetic-bin/package.nix
new file mode 100644
index 000000000000..fe9d0b1753d2
--- /dev/null
+++ b/pkgs/by-name/ap/aporetic-bin/package.nix
@@ -0,0 +1,39 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "aporetic-bin";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "protesilaos";
+    repo = "aporetic";
+    tag = finalAttrs.version;
+    hash = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    cp -r $src/{aporetic-sans-mono,aporetic-sans,aporetic-serif-mono,aporetic-serif} $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/protesilaos/aporetic";
+    description = ''
+      Custom build of Iosevka with different style and metrics than the default. This is the successor to my "Iosevka Comfy" fonts.
+    '';
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      DamienCassou
+      drupol
+    ];
+  };
+})
diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
index 54b2f4f50673..e16b39318fd3 100644
--- a/pkgs/by-name/ap/aporetic/package.nix
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -57,7 +57,7 @@ symlinkJoin {
   meta = {
     inherit (src.meta) homepage;
     description = ''
-      Custom build of Iosevka with different style and metrics than the default. This is the successor to my "Iosevka Comfy" fonts.
+      Custom build of Iosevka with different style and metrics than the default, successor to my "Iosevka Comfy" fonts
     '';
     license = lib.licenses.ofl;
     platforms = iosevka.meta.platforms;