Skip to content

Commit

Permalink
Merge #16391: texlive: 2015 -> 2016
Browse files Browse the repository at this point in the history
Mirroring isn't finalized, but we'll have to fix that on the go.

(Picked from a merge contained in master: bd6e40c)
  • Loading branch information
vcunat committed Sep 13, 2016
2 parents 2c9a5dc + 8481eca commit c03b54c
Show file tree
Hide file tree
Showing 14 changed files with 28,281 additions and 25,952 deletions.
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-1509.xml
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ in
<listitem> <para>
A newly packaged TeX Live 2015 is provided in <literal>pkgs.texlive</literal>,
split into 6500 nix packages. For basic user documentation see
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive-new/default.nix#L1"
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
>the source</link>.
Beware of <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
>an issue</link> when installing a too large package set.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/typesetting/tex/dblatex/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
fancybox fancyvrb float footmisc listings jknapltx/*for mathrsfs.sty*/
multirow overpic pdfpages rotating stmaryrd subfigure titlesec wasysym
multirow overpic pdfpages graphics stmaryrd subfigure titlesec wasysym
# pkgs below don't seem requested by dblatex, but our manual fails without them
ec zapfding symbol eepic times rsfs cs tex4ht courier helvetic ly1;
}
Expand Down
Loading

0 comments on commit c03b54c

Please sign in to comment.