-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
typst: add initial support for typst packages #369283
base: master
Are you sure you want to change the base?
Conversation
b5ab425
to
0bcf7c9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Welcome to Nixpkgs! This is truly amazing; I've wanted to build Typst packages for a very long time but never got around to it.
Note that the commits should be split as much as possible. Each new typstPackage
should be added in a separate commit. The changes to the base typst
package to wrap it should also be a separate commit.
407f204
to
b14cd40
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding the actual package set, even though we can't import from Universe directly, it might still be a good idea to scrape it for information and build packages automatically. typst.toml
gives us all of the necessary information to build each package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello,
Thanks for tackling this, I have a few comments, let me know if you have questions.
@jtojnar : I know you're busy these days, but if you could have a look at this, it would be great.
Thanks!
Ah that is great. Didn't know they already have that information included. I'll work on the script when I got time, but it will have to be waited for another week or so. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, just one final open question for anyone who knows about packagesFromDirectoryRecursive
.
e753a45
to
7560346
Compare
Would it be a good idea to have some documentation for this ? |
I can write it, but where should I put it?
Not sure if this change should be considered as significant |
All packages from the Typst Universe is here, and I added a maintenance script to generate the attribution set for them. I guess right it's just the style and comments --- e.g., do I need to add some comments at the beginning of the generated list? I am up for suggestions. |
We can preserve the flexibility to override programmatically fetched packages and add manually defined ones without modifying the auto-generated files. We could place the generated file and the manual package definitions inside For the auto-generated files, serialization formats like JSON or TOML would be more structural and contain less boilerplate code. (TOML would be more git diff friendly than JSON as it doesn't have the trailing-comma-forbidding issue). |
We should consider applying There should also be a way to override/extend them (e.g., Tother with #369283 (comment) , we could have a {
lib,
config,
pkgs,
typst ? pkgs.typst,
}:
# TODO: Add splicing support
lib.makeExtensible (
final:
let
typstPackagesFromUniverse = lib.mapAttrs (
name: packageSpec:
final.buildTypstPackage {
# Package definitions based on packageSpec
}
) (lib.importTOML ./typs-packages-from-universe.toml);
in
lib.recurseIntoAttrs {
inherit typst;
buildTypstPackage = pkgs.callPackage ../../../build-support/build-typst-package.nix { };
callPackage = lib.callPackageWith (pkgs // final);
callPackages = lib.callPackagesWith (pkgs // final);
inherit typstPackagesFromUniverse;
}
// typstPackagesFromUniverse
// import ../../../top-level/typst-packages.nix { inherit lib config pkgs; } final
) and {
lib,
config,
pkgs,
}:
final: {
# Manually defined/overridden Typst packages
} |
This makes sense, but I am wondering the need for manually defined/overridden Typst packages in nixpkgs. It is possible for users to override some of packages from the Typst Universe due to outdated versions, or because they want to patch the package for some specific features. Thus it makes sense to make it extensible. However, I don't see the reason to have a part for manually defined Typst packages in nixpkgs --- as we are not going to add new packages because we are assigning the Typst packages into the |
Updated the PR accordingly. Did not include a customized typst package set simply because there is no need of doing so for now (even if we do, it's going to be an empty set). However, the package-combined is there so it would be easy to extend the package set when necessary. |
Considering there's no need for separate registration of overriding, we could further simplify the typstPackages expression into {
lib,
callPackage,
}:
lib.makeExtensible (
final:
lib.recurseIntoAttrs (
lib.mapAttrs (
name: packageSpec:
callPackage (
{
lib,
buildTypstPackage,
fetchurl,
}:
buildTypstPackage {
inherit (packageSpec) pname version;
src = fetchurl {
inherit (packageSpec) url hash;
};
sourceRoot = ".";
typstDeps = builtins.filter (x: x != null) (
lib.map (d: (lib.attrsets.attrByPath [ d ] null final)) packageSpec.typstDeps
);
meta = {
inherit (packageSpec) description;
maintainers = with lib.maintainers; [ cherrypiejam ];
license = lib.map (lib.getAttr lib.licensesSpdx) packageSpec.license;
} // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { });
}
) { }
) (lib.importTOML ./typst-packages-from-universe.toml)
)
) From your previous auto-generated Nix expression, I saw that you expect the Typst packages to take In my previous suggestion, the Some minor changes include:
The file can now be called |
Thanks for the suggestions! Have patched them accordingly |
Now, we have an example of a license not found by its SPDX ID: packages licensed under |
Right the actual case is a bit more complicated. Apparently SPDX could be expressions, which means that it has its own little grammar to construct a logic license through a set of SPDX IDs (specifically, named licenses). Typst packages allow expression strings while it is not possible to perfectly translate the logic expression to Nix, as licenses in Nixpkgs are a list of named licenses (not clear how to diff AND/OR/WITH relations). "+" is also a valid token to represent a single named license id, while the helper functions in nixpkgs do not support parse any of them. The solution for now is simply adhoc --- unparsable SPDX IDs will be replaced to one or more parsable IDs (based on its semantics). This is hardcoded in the maintaining script. The logical relations are simply ignored due to the aforementioned reason in nixpkgs. |
I see the WITH relation is encoded as an independent license in nixpkgs, but the same argument still apply for AND/OR and "+" |
This PR adds initial support to build Typst documents with Typst packages. In particular, it adds a Typst package builder and exposes it at the top level to ease the process of defining new Typst packages. It further adds a new function to the Typst derivation for creating a new Typst environment in which the Typst compiler understands a specific set of packages, namely
typst.withPackages
. Moreover, three Typst packages are defined and collected as a single attribution set as an initial demonstration.Only a few Typst packages are included in this PR for a reason. The Typst Universe (the official site for Typst packages) maintains a single git repo that contains all Typst packages. Each package entry does not necessarily map to the same version specified in their respective git repo published by their authors (if there is). This is because the package authors need to manually move their package and copy the source, instead of a pointer, to the Typst Universe repo. Breaking the Typst Universe repo down to per package requires separate places to store each of them, and due to the aforementioned reason, the exact source may disagree with the original git repo 1. This is why, in my opinion, we might want to collect our own set of Typst packages instead of directly pulling from the Typst Universe repo. For gradual adaption,typst.withPackages
also provides a method to override the predefined set of Typst packages, namelytypst.withPackages.override
, making it easier for end users overriding the existing set of Typst packages and integrating new packages into their project.All packages from the Typst Universe are included in this PR, along with a maintenance script. The script simply generates a set of nix expressions for all packages from the Typst Universe. Each individual package is now fetched as a tarball from the Typst Universe instead of their individual repository.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.
Footnotes
Assuming the author(s) also publish their package in another repo outside of the Typst Universe repo. ↩