3
0
Fork 0
forked from mirrors/nixpkgs

Moved all LaTeX expressions into tools/typesetting hierarchy.

svn path=/nixpkgs/trunk/; revision=32028
This commit is contained in:
Peter Simons 2012-02-04 09:31:07 +00:00
parent dbafd99a0a
commit b69d6bf7e0
36 changed files with 21 additions and 21 deletions

View file

@ -8491,7 +8491,7 @@ let
ataripp = callPackage ../misc/emulators/atari++ { }; ataripp = callPackage ../misc/emulators/atari++ { };
auctex = callPackage ../misc/tex/auctex { }; auctex = callPackage ../tools/typesetting/tex/auctex { };
busybox = callPackage ../misc/busybox { busybox = callPackage ../misc/busybox {
enableStatic = true; enableStatic = true;
@ -8509,7 +8509,7 @@ let
darcnes = callPackage ../misc/emulators/darcnes { }; darcnes = callPackage ../misc/emulators/darcnes { };
dblatex = callPackage ../misc/tex/dblatex { }; dblatex = callPackage ../tools/typesetting/tex/dblatex { };
dosbox = callPackage ../misc/emulators/dosbox { }; dosbox = callPackage ../misc/emulators/dosbox { };
@ -8565,7 +8565,7 @@ let
keynav = callPackage ../tools/X11/keynav { }; keynav = callPackage ../tools/X11/keynav { };
lazylist = callPackage ../misc/tex/lazylist { }; lazylist = callPackage ../tools/typesetting/tex/lazylist { };
lilypond = callPackage ../misc/lilypond { lilypond = callPackage ../misc/lilypond {
inherit (gtkLibs) pango; inherit (gtkLibs) pango;
@ -8624,11 +8624,11 @@ let
DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
latex2html = callPackage ../misc/tex/latex2html/default.nix { latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix {
tex = tetex; tex = tetex;
}; };
lkproof = callPackage ../misc/tex/lkproof { }; lkproof = callPackage ../tools/typesetting/tex/lkproof { };
mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
lua = lua5; lua = lua5;
@ -8643,13 +8643,13 @@ let
# Keep the old PGF since some documents don't render properly with # Keep the old PGF since some documents don't render properly with
# the new one. # the new one.
pgf1 = callPackage ../misc/tex/pgf/1.x.nix { }; pgf1 = callPackage ../tools/typesetting/tex/pgf/1.x.nix { };
pgf2 = callPackage ../misc/tex/pgf/2.x.nix { }; pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { };
pjsip = callPackage ../applications/networking/pjsip { }; pjsip = callPackage ../applications/networking/pjsip { };
polytable = callPackage ../misc/tex/polytable { }; polytable = callPackage ../tools/typesetting/tex/polytable { };
uae = callPackage ../misc/emulators/uae { }; uae = callPackage ../misc/emulators/uae { };
@ -8679,13 +8679,13 @@ let
splix = callPackage ../misc/cups/drivers/splix { }; splix = callPackage ../misc/cups/drivers/splix { };
tetex = callPackage ../misc/tex/tetex { }; tetex = callPackage ../tools/typesetting/tex/tetex { };
tex4ht = callPackage ../misc/tex/tex4ht { }; tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
texFunctions = import ../misc/tex/nix pkgs; texFunctions = import ../tools/typesetting/tex/nix pkgs;
texLive = builderDefsPackage (import ../misc/tex/texlive) { texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
inherit builderDefs zlib bzip2 ncurses libpng ed inherit builderDefs zlib bzip2 ncurses libpng ed
gd t1lib freetype icu perl expat curl gd t1lib freetype icu perl expat curl
libjpeg bison python fontconfig flex; libjpeg bison python fontconfig flex;
@ -8713,35 +8713,35 @@ let
Just installing a few packages doesn't work. Just installing a few packages doesn't work.
*/ */
texLiveAggregationFun = texLiveAggregationFun =
(builderDefsPackage (import ../misc/tex/texlive/aggregate.nix)); (builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix));
texDisser = callPackage ../misc/tex/disser {}; texDisser = callPackage ../tools/typesetting/tex/disser {};
texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix) { texLiveContext = builderDefsPackage (import ../tools/typesetting/tex/texlive/context.nix) {
inherit texLive; inherit texLive;
}; };
texLiveExtra = builderDefsPackage (import ../misc/tex/texlive/extra.nix) { texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
inherit texLive; inherit texLive;
}; };
texLiveCMSuper = builderDefsPackage (import ../misc/tex/texlive/cm-super.nix) { texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {
inherit texLive; inherit texLive;
}; };
texLiveLatexXColor = builderDefsPackage (import ../misc/tex/texlive/xcolor.nix) { texLiveLatexXColor = builderDefsPackage (import ../tools/typesetting/tex/texlive/xcolor.nix) {
inherit texLive; inherit texLive;
}; };
texLivePGF = builderDefsPackage (import ../misc/tex/texlive/pgf.nix) { texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) {
inherit texLiveLatexXColor texLive; inherit texLiveLatexXColor texLive;
}; };
texLiveBeamer = builderDefsPackage (import ../misc/tex/texlive/beamer.nix) { texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) {
inherit texLiveLatexXColor texLivePGF texLive; inherit texLiveLatexXColor texLivePGF texLive;
}; };
texLiveModerncv = builderDefsPackage (import ../misc/tex/texlive/moderncv.nix) { texLiveModerncv = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderncv.nix) {
inherit texLive unzip; inherit texLive unzip;
}; };