From 3ecb49c6af7923b0730f0a228c6e3c6abdfd69e8 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Mon, 15 Dec 2025 15:59:27 -0500
Subject: [PATCH 1/2] typstPackages: Fix typstPackages attribute set structure

Accidentally made it nested.
---
 pkgs/by-name/ty/typst/typst-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix
index 7f9673f5fc44..056c6e344fcd 100644
--- a/pkgs/by-name/ty/typst/typst-packages.nix
+++ b/pkgs/by-name/ty/typst/typst-packages.nix
@@ -34,16 +34,13 @@ lib.makeScope newScope (
       # 1. Create a list of versioned packages
       # Only recurse 2 levels deep because the leaf attrs are the pkgspec attrs
       (lib.mapAttrsToListRecursiveCond (path: _: (lib.length path) < 2) (
-        path: packageSpec:
+        path:
         let
           # Path is always [ path version ]
           pname = lib.head path;
           version = lib.last path;
         in
-        {
-          name = toPackageName pname version;
-          value = makeVersionedPackage pname version packageSpec;
-        }
+        makeVersionedPackage pname version
       ))
       # 2. Transform the list into a flat attrset
       lib.listToAttrs

From 38d1bd5c9455c653f7f6b9d989b3306220661ad4 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Mon, 15 Dec 2025 16:11:12 -0500
Subject: [PATCH 2/2] typstPackages: Fix homepage inheritance

---
 pkgs/by-name/ty/typst/typst-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix
index 056c6e344fcd..a32f92cc95a0 100644
--- a/pkgs/by-name/ty/typst/typst-packages.nix
+++ b/pkgs/by-name/ty/typst/typst-packages.nix
@@ -17,13 +17,13 @@ lib.makeScope newScope (
       name = toPackageName pname version;
 
       value = buildUniversePackage {
+        homepage = packageSpec.homepage or null;
         inherit pname version;
         inherit (packageSpec)
           hash
           description
           license
           typstDeps
-          homepage
           ;
       };
     };