diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 7f9673f5fc44..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 ; }; }; @@ -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