texlive: switch to the new withPackages API

docs/reference/options.md

@@ -6276,20 +6276,26 @@ boolean
 
 
 
-Packages available to TeX Live
+Extra packages to add to the base TeX Live set
 
 
 
 *Type:*
-non-empty (list of string)
+list of string
 
 
 
 *Default:*
+` [ ] `
+
+
+
+*Example:*
 
 ```
 [
-  "collection-basic"
+  "algorithms"
+  "latexmk"
 ]
 ```
 
@@ -6312,7 +6318,12 @@ unspecified value
 
 
 *Default:*
-` pkgs.texlive `
+` pkgs.texliveSmall `
+
+
+
+*Example:*
+` pkgs.texliveBasic `
 
 *Declared by:*
  - [https://github.com/cachix/devenv/blob/main/src/modules/languages/texlive.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/texlive.nix)

docs/supported-languages/texlive.md

@@ -30,20 +30,26 @@ boolean
 
 
 
-Packages available to TeX Live
+Extra packages to add to the base TeX Live set
 
 
 
 *Type:*
-non-empty (list of string)
+list of string
 
 
 
 *Default:*
+` [ ] `
+
+
+
+*Example:*
 
 ```
 [
-  "collection-basic"
+  "algorithms"
+  "latexmk"
 ]
 ```
 
@@ -61,4 +67,9 @@ unspecified value
 
 
 *Default:*
-` pkgs.texlive `
+` pkgs.texliveSmall `
+
+
+
+*Example:*
+` pkgs.texliveBasic `

examples/texlive/.test.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+which latexmk

examples/texlive/devenv.nix

@@ -1,8 +1,14 @@
 { pkgs, ... }:
 
 {
+  # https://nixos.org/manual/nixpkgs/stable/#sec-language-texlive
   languages.texlive = {
     enable = true;
-    packages = [ "scheme-small" "biblatex" "latexmk" ];
+
+    # Choose a base package set.
+    base = pkgs.texliveSmall;
+
+    # Add extra packages to the base set.
+    packages = [ "latexmk" ];
   };
 }

src/modules/languages/texlive.nix

@@ -2,22 +2,23 @@
 let
   cfg = config.languages.texlive;
 
-  base = cfg.base;
-  packages = lib.genAttrs cfg.packages (name: base.${name} or (throw "No such texlive package ${name}"));
-  package = base.combine packages;
+  getPackage = ps: name: ps.${name} or (throw "No such texlive package ${name}");
+  package = cfg.base.withPackages (ps: builtins.map (getPackage ps) cfg.packages);
 in
 {
   options.languages.texlive = {
     enable = lib.mkEnableOption "TeX Live";
     base = lib.mkOption {
-      default = pkgs.texlive;
-      defaultText = lib.literalExpression "pkgs.texlive";
+      default = pkgs.texliveSmall;
+      defaultText = lib.literalExpression "pkgs.texliveSmall";
+      example = lib.literalExpression "pkgs.texliveBasic";
       description = "TeX Live package set to use";
     };
     packages = lib.mkOption {
-      type = lib.types.nonEmptyListOf lib.types.str;
-      default = [ "collection-basic" ];
-      description = "Packages available to TeX Live";
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      example = [ "algorithms" "latexmk" ];
+      description = "Extra packages to add to the base TeX Live set";
     };
   };
   config = lib.mkIf cfg.enable {