diff options
| author | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-04 20:02:25 +0000 |
|---|---|---|
| committer | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-04 20:02:25 +0000 |
| commit | 80cd75f4cb07ab7b48e750b783be8eee721445f3 (patch) | |
| tree | 4b3bc4a844c1ed36603014f247783f6149d3e839 | |
| parent | 388c14edc589b5d7152a2ceedcd26d6a8977baf4 (diff) | |
| download | nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar.gz nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar.bz2 nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar.lz nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar.xz nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.tar.zst nixpkgs-80cd75f4cb07ab7b48e750b783be8eee721445f3.zip | |
texlive: export schemes at top level
| -rw-r--r-- | pkgs/test/texlive/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 70813466882..db94d3070ca 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -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. diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 11eeec0d5dd..bb505f4062b 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -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; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6e9ae80df6..960184512ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |