packages.bonfire-docs: fix license generation for multiple licenses

new: packages.wezterm: pass for cache

packages/blender/default.nix

@@ -0,0 +1,13 @@
+{
+  bonLib,
+  lib,
+  pkgs,
+  ...
+}:
+(pkgs.blender.override {cudaSupport = true;}).overrideAttrs (old: {
+  meta =
+    old.meta
+    // {
+      description = old.meta.description + " (CUDA enabled)";
+    };
+})

packages/bonfire-docs/default.nix

@@ -53,15 +53,18 @@ in
     dontConfigure = true;
     doCheck = false;
 
-    buildPhase = ''
+    buildPhase = let
+      nixosModulesDocsList = map (module_: "ln -s ${module_.commonMarkdown} src/nixosModules/${module_.name}.md") nixosModulesDoc.documentation;
+      packageDocsList = map (package_: "ln -s ${package_.commonMarkdown} src/packages/${package_.name}.md") packagesDoc.documentation;
+    in ''
       runHook preBuild
 
       ln -s ${../../README.md} src/README.md
 
-      ${lib.concatStringsSep "\n" (map (module_: "ln -s ${module_.commonMarkdown} src/nixosModules/${module_.name}.md") nixosModulesDoc.documentation)}
+      ${lib.concatStringsSep "\n" nixosModulesDocsList}
       substituteInPlace src/SUMMARY.md --replace '{{nixosModulesSummary}}' '${lib.concatStringsSep "\n" nixosModulesDoc.summary}'
 
-      ${lib.concatStringsSep "\n" (map (package_: "ln -s ${package_.commonMarkdown} src/packages/${package_.name}.md") packagesDoc.documentation)}
+      ${lib.concatStringsSep "\n" packageDocsList}
       substituteInPlace src/SUMMARY.md --replace '{{packagesSummary}}' '${lib.concatStringsSep "\n" packagesDoc.summary}'
 
       mdbook build

packages/bonfire-docs/packagesDoc.nix

@@ -46,7 +46,19 @@
 
     license = lib.optionalString (drv.meta ? license) "License: ${
       if lib.isList drv.meta.license
-      then (map (license: "[${drv.meta.license.fullName}](${drv.meta.license.url})") drv.meta.license)
+      then
+        lib.concatStringsSep ", " (map (license: let
+          licenseName =
+            if license.free
+            then license.fullName
+            else if license ? shortName
+            then license.shortName
+            else license.fullName;
+        in
+          if license ? url
+          then "[${licenseName}](${license.url})"
+          else licenseName)
+        drv.meta.license)
       else "[${drv.meta.license.fullName}](${drv.meta.license.url})"
     }";
 

packages/default.nix

@@ -18,6 +18,7 @@
     craneLib = inputs.crane.mkLib pkgs;
     fenixPkgs = inputs.fenix.packages.${system};
     nixvimPkgs = inputs.nixvim.legacyPackages.${system};
+    weztermPkgs = inputs.wezterm.packages.${system};
   };
 in
   bonLib.collectPackages platformInputs {
@@ -76,6 +77,20 @@ in
       builder = {pkgs, ...}: pkgs.callPackage;
     };
 
+    # Pass for cache
+
+    blender = {
+      source = ./blender;
+      platforms = ["x86_64-linux"];
+      builder = {...}: import;
+    };
+
+    wezterm = {
+      source = ./wezterm;
+      platforms = ["x86_64-linux"];
+      builder = {...}: import;
+    };
+
     # Container images
 
     nix-minimal = {

packages/wezterm/default.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  weztermPkgs,
+  ...
+}:
+weztermPkgs.default.overrideAttrs (old: {
+  pname = "wezterm";
+
+  meta =
+    old.meta
+    // {
+      homepage = "https://github.com/wez/wezterm";
+      description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
+      license = lib.licenses.mit;
+    };
+})