diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index a68baa0d8078..e0271485c361 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -471,7 +471,7 @@ in A newly packaged TeX Live 2015 is provided in pkgs.texlive, split into 6500 nix packages. For basic user documentation see - the source. Beware of an issue when installing a too large package set. diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/bin.nix rename to pkgs/tools/typesetting/tex/texlive/bin.nix diff --git a/pkgs/tools/typesetting/tex/texlive-new/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/combine.nix rename to pkgs/tools/typesetting/tex/texlive/combine.nix diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/default.nix rename to pkgs/tools/typesetting/tex/texlive/default.nix diff --git a/pkgs/tools/typesetting/tex/texlive-new/fixHashes.sh b/pkgs/tools/typesetting/tex/texlive/fixHashes.sh similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/fixHashes.sh rename to pkgs/tools/typesetting/tex/texlive/fixHashes.sh diff --git a/pkgs/tools/typesetting/tex/texlive-new/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/fixedHashes.nix rename to pkgs/tools/typesetting/tex/texlive/fixedHashes.nix diff --git a/pkgs/tools/typesetting/tex/texlive-new/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/pkgs.nix rename to pkgs/tools/typesetting/tex/texlive/pkgs.nix diff --git a/pkgs/tools/typesetting/tex/texlive-new/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/setup-hook.sh rename to pkgs/tools/typesetting/tex/texlive/setup-hook.sh diff --git a/pkgs/tools/typesetting/tex/texlive-new/texlinks.diff b/pkgs/tools/typesetting/tex/texlive/texlinks.diff similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/texlinks.diff rename to pkgs/tools/typesetting/tex/texlive/texlinks.diff diff --git a/pkgs/tools/typesetting/tex/texlive-new/texlinks.patch b/pkgs/tools/typesetting/tex/texlive/texlinks.patch similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/texlinks.patch rename to pkgs/tools/typesetting/tex/texlive/texlinks.patch diff --git a/pkgs/tools/typesetting/tex/texlive-new/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed similarity index 100% rename from pkgs/tools/typesetting/tex/texlive-new/tl2nix.sed rename to pkgs/tools/typesetting/tex/texlive/tl2nix.sed diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb682895acbc..8f366a002cf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17332,9 +17332,9 @@ in texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - # All the new TeX Live is inside. See description in default.nix. + # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = recurseIntoAttrs - (callPackage ../tools/typesetting/tex/texlive-new { }); + (callPackage ../tools/typesetting/tex/texlive { }); ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; };