BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

texlive: export schemes at top level

Browse source
This commit is contained in:
Vincenzo Mantova 2023-11-04 20:02:25 +00:00
parent 388c14edc5
commit 80cd75f4cb
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/test/texlive/default.nix
View file

@ -623,7 +623,7 @@ rec {
(savedLicensesAttrNames scheme) != (correctLicensesAttrNames scheme);
incorrectSchemes = lib.filterAttrs
(n: hasLicenseMismatch)
texlive.combined;
(texlive.combined // texlive.schemes);
prettyPrint = name: scheme:
''
license info for ${name} is incorrect! Note that order is enforced.

7
pkgs/tools/typesetting/tex/texlive/default.nix
View file

@ -194,6 +194,11 @@ let
)
);
schemes = lib.listToAttrs (map (s: {
name = "texlive" + s;
value = lib.addMetaAttrs { license = licenses.${"scheme-" + (lib.toLower s)}; } (buildTeXEnv { requiredTeXPackages = ps: [ ps.${"scheme-" + (lib.toLower s)} ]; });
}) [ "Basic" "BookPub" "ConTeXt" "Full" "GUST" "InfraOnly" "Medium" "Minimal" "Small" "TeTeX" ]);
in
allPkgLists // {
pkgs = tl;
@ -213,6 +218,8 @@ in
combined = assert assertions; combined;
inherit schemes;
# convenience alias
withPackages = (buildTeXEnv { }).withPackages;
}

1
pkgs/top-level/all-packages.nix
View file

@ -5446,6 +5446,7 @@ with pkgs;
# TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive
texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { });
inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX;
fop = callPackage ../tools/typesetting/fop {
jdk = openjdk8;