commit a126a8545a4acb8d7c91acbc1ed7dfb3c24a1e86 · pyrox.dev/nixpkgs

+34 -17

doc/languages-frameworks/texlive.section.md

···

       98
       98
        
       

     

       99
       99
        
       ## Custom packages {#sec-language-texlive-custom-packages}

     

       100
       100
        
       

     

       101
       101
       -
       You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.

     

       101
       101
       +
       You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its `"tex"` output, according to the [TeX Directory Structure](https://tug.ctan.org/tds/tds.html). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.

     

       102
       102
       +
       

     

       103
       103
       +
       The functions `texlive.combine` and `texlive.withPackages` recognise the following outputs:

     

       102
       104
        
       

     

       103
       103
       -
       Such derivation must then be listed in the attribute `pkgs` of an attribute set passed to `texlive.combine`, for instance by passing `extraPkgs = { pkgs = [ custom_package ]; };`. Within Nixpkgs, `pkgs` should be part of the derivation itself, allowing users to call `texlive.combine { inherit (texlive) scheme-small; inherit some_tex_package; }`.

     

       105
       105
       +
       - `"out"`: contents are linked in the TeX Live environment, and binaries in the `$out/bin` folder are wrapped;

     

       106
       106
       +
       - `"tex"`: linked in `$TEXMFDIST`; files should follow the TDS (for instance `$tex/tex/latex/foiltex/foiltex.cls`);

     

       107
       107
       +
       - `"texdoc"`, `"texsource"`: ignored by default, treated as `"tex"`;

     

       108
       108
       +
       - `"tlpkg"`: linked in `$TEXMFROOT/tlpkg`;

     

       109
       109
       +
       - `"man"`, `"info"`, ...: the other outputs are combined into separate outputs.

     

       104
       110
        
       

     

       105
       105
       -
       Here is a (very verbose) example where the attribute `pkgs` is attached to the derivation itself, which requires creating a fixed point. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.

     

       111
       111
       +
       When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bin"`, `"run"`, `"doc"`, `"source"`, `"tlpkg"` to the above outputs.

     

       112
       112
       +
       

     

       113
       113
       +
       Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.

     

       106
       114
        
       

     

       107
       115
        
       ```nix

     

       108
       116
        
       with import <nixpkgs> {};

     

       109
       117
        
       

     

       110
       118
        
       let

     

       111
       111
       -
         foiltex = stdenvNoCC.mkDerivation (finalAttrs: {

     

       119
       119
       +
         foiltex = stdenvNoCC.mkDerivation {

     

       112
       120
        
           pname = "latex-foiltex";

     

       113
       121
        
           version = "2.1.4b";

     

       114
       114
       -
           passthru = {

     

       115
       115
       -
             pkgs = [ finalAttrs.finalPackage ];

     

       116
       116
       -
             tlDeps = with texlive; [ latex ];

     

       117
       117
       -
             tlType = "run";

     

       118
       118
       -
           };

     

       122
       122
       +
       

     

       123
       123
       +
           outputs = [ "tex" "texdoc" ];

     

       124
       124
       +
           passthru.tlDeps = with texlive; [ latex ];

     

       119
       125
        
       

     

       120
       126
        
           srcs = [

     

       121
       127
        
             (fetchurl {

     
···

       138
       144
        
             runHook postUnpack

     

       139
       145
        
           '';

     

       140
       146
        
       

     

       141
       141
       -
           nativeBuildInputs = [ texlive.combined.scheme-small ];

     

       147
       147
       +
           nativeBuildInputs = [

     

       148
       148
       +
             (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ]))

     

       149
       149
       +
             # multiple-outputs.sh fails if $out is not defined

     

       150
       150
       +
             (writeShellScript "force-tex-output.sh" ''

     

       151
       151
       +
               out="''${tex-}"

     

       152
       152
       +
             '')

     

       153
       153
       +
           ];

     

       142
       154
        
       

     

       143
       155
        
           dontConfigure = true;

     

       144
       156
        
       

     
···

       148
       160
        
             # Generate the style files

     

       149
       161
        
             latex foiltex.ins

     

       150
       162
        
       

     

       163
       163
       +
             # Generate the documentation

     

       164
       164
       +
             export HOME=.

     

       165
       165
       +
             latexmk -pdf foiltex.dtx

     

       166
       166
       +
       

     

       151
       167
        
             runHook postBuild

     

       152
       168
        
           '';

     

       153
       169
        
       

     

       154
       170
        
           installPhase = ''

     

       155
       171
        
             runHook preInstall

     

       156
       172
        
       

     

       157
       157
       -
             path="$out/tex/latex/foiltex"

     

       173
       173
       +
             path="$tex/tex/latex/foiltex"

     

       174
       174
       +
             mkdir -p "$path"

     

       175
       175
       +
             cp *.{cls,def,clo,sty} "$path/"

     

       176
       176
       +
       

     

       177
       177
       +
             path="$texdoc/doc/tex/latex/foiltex"

     

       158
       178
        
             mkdir -p "$path"

     

       159
       159
       -
             cp *.{cls,def,clo} "$path/"

     

       179
       179
       +
             cp *.pdf "$path/"

     

       160
       180
        
       

     

       161
       181
        
             runHook postInstall

     

       162
       182
        
           '';

     
···

       167
       187
        
             maintainers = with maintainers; [ veprbl ];

     

       168
       188
        
             platforms = platforms.all;

     

       169
       189
        
           };

     

       170
       170
       -
         });

     

       190
       190
       +
         };

     

       171
       191
        
       

     

       172
       172
       -
         latex_with_foiltex = texlive.combine {

     

       173
       173
       -
           inherit (texlive) scheme-small;

     

       174
       174
       -
           inherit foiltex;

     

       175
       175
       -
         };

     

       192
       192
       +
         latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]);

     

       176
       193
        
       in

     

       177
       194
        
         runCommand "test.pdf" {

     

       178
       195
        
           nativeBuildInputs = [ latex_with_foiltex ];

nixos/doc/manual/release-notes/rl-2311.section.md

···

       553
       553
        
       

     

       554
       554
        
       - The argument `vendorSha256` of `buildGoModule` is deprecated. Use `vendorHash` instead. ([\#259999](https://github.com/NixOS/nixpkgs/pull/259999))

     

       555
       555
        
       

     

       556
       556
       +
       - TeX Live environments can now be built with the new `texlive.withPackages`. The procedure for creating custom TeX packages has been changed, see the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#sec-language-texlive-custom-packages) for more details.

     

       557
       557
       +
       

     

       556
       558
        
       ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

     

       557
       559
        
       

     

       558
       560
        
       - Node.js v14, v16 has been removed as they were end of life. Any dependent packages that contributors were not able to reasonably upgrade were dropped after a month of notice to their maintainers, were **removed**.

+1 -1

pkgs/tools/typesetting/tex/texlive/build-tex-env.nix

···

       58
       58
        
               keySet = p: {

     

       59
       59
        
                 key = ((p.name or "${p.pname}-${p.version}") + "-" + p.tlOutputName or p.outputName or "");

     

       60
       60
        
                 inherit p;

     

       61
       61
       -
                 tlDeps = p.tlDeps or (p.requiredTeXPackages or (_: [ ]) [ ]);

     

       61
       61
       +
                 tlDeps = if p ? tlDeps then ensurePkgSets p.tlDeps else (p.requiredTeXPackages or (_: [ ]) tl);

     

       62
       62
        
               };

     

       63
       63
        
             in

     

       64
       64
        
             # texlive.combine: the wrapper already resolves all dependencies