Add Typst Universe Patches

Author: RossSmyth

default.nix

@@ -24,15 +24,27 @@ in {
       meta ? {},
       fonts ? [],
       typstUniverse ? true,
+      universePatches ? [],
       extraPackages ? {},
       file ? "main.typ",
       format ? "pdf",
       ...
     } @ args: let
-      universe' = lib.optionalString typstUniverse ''
-        mkdir -p $XDG_DATA_HOME/typst/packages
-        cp -r ${universe}/packages/preview $XDG_DATA_HOME/typst/packages/
-      '';
+      universe' = let
+        patchedUni =
+          if universePatches == []
+          then universe
+          else
+            final.applyPatches {
+              name = "universe-patched";
+              src = universe;
+              patches = universePatches;
+            };
+      in
+        lib.optionalString typstUniverse ''
+          mkdir -p $XDG_DATA_HOME/typst/packages
+          cp -r ${patchedUni}/packages/preview $XDG_DATA_HOME/typst/packages/
+        '';
 
       userPackages = lib.attrsets.foldlAttrs (shString: namespace: paths:
         lib.lists.foldl (accum: path: let
@@ -60,7 +72,7 @@ in {
       strictDeps = true;
 
       env.TYPST_FONT_PATHS = "${fontsDrv}";
-      
+
       buildPhase =
         args.buildPhase
         or (''

flake.nix

@@ -24,7 +24,7 @@
     checks.x86_64-linux = let
       pkgs = import nixpkgs {
         system = "x86_64-linux";
-        overlays = [ (import self) ];
+        overlays = [(import self)];
       };
     in
       builtins.removeAttrs (pkgs.callPackage ./tests {}) ["override" "overrideDerivation"];

template/flake.nix

@@ -25,7 +25,7 @@
 
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [ (import press) ];
+      overlays = [(import press)];
     };
   in {
     packages.${system}.default = pkgs.buildTypstDocument {
@@ -57,7 +57,11 @@
       ];
       # [Optional] Patches to the Typst document
       # Default: []
-      typstPatches = []
+      typstPatches = [];
+      # [Optional] Patches to the Typst Universe repo
+      # To apply a patch, it much be a patch to the entire Typst Packages repo.
+      # Default: []
+      univerPatches = [];
     };
   };
 }

tests/default.nix

@@ -35,7 +35,16 @@
       ./patch.patch
     ];
   });
-    
+
+  patchUni = buildTypstDocument (self: {
+    name = "patchUni";
+    src = ./documents;
+    file = "patchUni.typ";
+    universePatches = [
+      ./universe.patch
+    ];
+  });
+
   gitImport = buildTypstDocument (self: {
     name = "gitImport";
     src = ./documents;

tests/documents/patchUni.typ

@@ -0,0 +1,5 @@
+#import "@preview/note-me:0.5.0": bote
+
+#bote[
+  Success!
+]

tests/universe.patch

@@ -0,0 +1,19 @@
+--- a/packages/preview/note-me/0.5.0/lib.typ
++++ b/packages/preview/note-me/0.5.0/lib.typ
+@@ -1,2 +1,2 @@
+-#import "note-me.typ": admonition, note, tip, important, warning, caution
+-#import "note-me-more.typ": todo
+\ No newline at end of file
++#import "note-me.typ": admonition, bote, tip, important, warning, caution
++#import "note-me-more.typ": todo
+--- a/packages/preview/note-me/0.5.0/note-me.typ
++++ b/packages/preview/note-me/0.5.0/note-me.typ
+@@ -80,7 +80,7 @@
+   ],
+ )
+ 
+-#let note(title: "Note", children) = admonition(
++#let bote(title: "Note", children) = admonition(
+   icon-path: "icons/info.svg",
+   title: title,
+   color: rgb(9, 105, 218),