diff options
author | Peter Simons <simons@cryp.to> | 2012-02-04 09:31:07 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-02-04 09:31:07 +0000 |
commit | b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b (patch) | |
tree | dae06b8d3eb2404f7045e567c8610e4d43d82f2b | |
parent | dbafd99a0aaa3b65067cf48d840353f230327368 (diff) | |
download | nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar.gz nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar.bz2 nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar.lz nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar.xz nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.tar.zst nixpkgs-b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b.zip |
Moved all LaTeX expressions into tools/typesetting hierarchy.
svn path=/nixpkgs/trunk/; revision=32028
-rw-r--r-- | pkgs/tools/typesetting/tex/auctex/default.nix (renamed from pkgs/misc/tex/auctex/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix (renamed from pkgs/misc/tex/dblatex/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/disser/default.nix (renamed from pkgs/misc/tex/disser/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/latex2html/default.nix (renamed from pkgs/misc/tex/latex2html/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/lazylist/builder.sh (renamed from pkgs/misc/tex/lazylist/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/lazylist/default.nix (renamed from pkgs/misc/tex/lazylist/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/lkproof/default.nix (renamed from pkgs/misc/tex/lkproof/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/animatedot.sh (renamed from pkgs/misc/tex/nix/animatedot.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/copy-includes.pl (renamed from pkgs/misc/tex/nix/copy-includes.pl) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix (renamed from pkgs/misc/tex/nix/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/dot2pdf.sh (renamed from pkgs/misc/tex/nix/dot2pdf.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/dot2ps.sh (renamed from pkgs/misc/tex/nix/dot2ps.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/find-includes.pl (renamed from pkgs/misc/tex/nix/find-includes.pl) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh (renamed from pkgs/misc/tex/nix/find-lhs2tex-includes.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/lhs2tex.sh (renamed from pkgs/misc/tex/nix/lhs2tex.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/run-latex.sh (renamed from pkgs/misc/tex/nix/run-latex.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/pgf/1.x.nix (renamed from pkgs/misc/tex/pgf/1.x.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/pgf/2.x.nix (renamed from pkgs/misc/tex/pgf/2.x.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/polytable/builder.sh (renamed from pkgs/misc/tex/polytable/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/polytable/default.nix (renamed from pkgs/misc/tex/polytable/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tetex/default.nix (renamed from pkgs/misc/tex/tetex/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tetex/environment.patch (renamed from pkgs/misc/tex/tetex/environment.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tetex/getline.patch (renamed from pkgs/misc/tex/tetex/getline.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tetex/setup-hook.sh (renamed from pkgs/misc/tex/tetex/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/tex4ht/default.nix (renamed from pkgs/misc/tex/tex4ht/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/aggregate.nix (renamed from pkgs/misc/tex/texlive/aggregate.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/beamer.nix (renamed from pkgs/misc/tex/texlive/beamer.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/cm-super.nix (renamed from pkgs/misc/tex/texlive/cm-super.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/context.nix (renamed from pkgs/misc/tex/texlive/context.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix (renamed from pkgs/misc/tex/texlive/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/extra.nix (renamed from pkgs/misc/tex/texlive/extra.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/moderncv.nix (renamed from pkgs/misc/tex/texlive/moderncv.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/pgf.nix (renamed from pkgs/misc/tex/texlive/pgf.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/setup-hook.sh (renamed from pkgs/misc/tex/texlive/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/xcolor.nix (renamed from pkgs/misc/tex/texlive/xcolor.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 42 |
36 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/misc/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 6ca85167aed..6ca85167aed 100644 --- a/pkgs/misc/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 05f4bd7a9fa..05f4bd7a9fa 100644 --- a/pkgs/misc/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix diff --git a/pkgs/misc/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix index eee695ea3e9..eee695ea3e9 100644 --- a/pkgs/misc/tex/disser/default.nix +++ b/pkgs/tools/typesetting/tex/disser/default.nix diff --git a/pkgs/misc/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix index 354cb6d22b0..354cb6d22b0 100644 --- a/pkgs/misc/tex/latex2html/default.nix +++ b/pkgs/tools/typesetting/tex/latex2html/default.nix diff --git a/pkgs/misc/tex/lazylist/builder.sh b/pkgs/tools/typesetting/tex/lazylist/builder.sh index 140b07f7be7..140b07f7be7 100644 --- a/pkgs/misc/tex/lazylist/builder.sh +++ b/pkgs/tools/typesetting/tex/lazylist/builder.sh diff --git a/pkgs/misc/tex/lazylist/default.nix b/pkgs/tools/typesetting/tex/lazylist/default.nix index 19637793b00..19637793b00 100644 --- a/pkgs/misc/tex/lazylist/default.nix +++ b/pkgs/tools/typesetting/tex/lazylist/default.nix diff --git a/pkgs/misc/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 2d3a1e5f19c..2d3a1e5f19c 100644 --- a/pkgs/misc/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix diff --git a/pkgs/misc/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index 2e1868d4beb..2e1868d4beb 100644 --- a/pkgs/misc/tex/nix/animatedot.sh +++ b/pkgs/tools/typesetting/tex/nix/animatedot.sh diff --git a/pkgs/misc/tex/nix/copy-includes.pl b/pkgs/tools/typesetting/tex/nix/copy-includes.pl index 2cec62fc7cb..2cec62fc7cb 100644 --- a/pkgs/misc/tex/nix/copy-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/copy-includes.pl diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index f5a34fb67a2..f5a34fb67a2 100644 --- a/pkgs/misc/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix diff --git a/pkgs/misc/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index 0a9610c00ff..0a9610c00ff 100644 --- a/pkgs/misc/tex/nix/dot2pdf.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh diff --git a/pkgs/misc/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh index 1269108d6f5..1269108d6f5 100644 --- a/pkgs/misc/tex/nix/dot2ps.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh diff --git a/pkgs/misc/tex/nix/find-includes.pl b/pkgs/tools/typesetting/tex/nix/find-includes.pl index 41675e939f6..41675e939f6 100644 --- a/pkgs/misc/tex/nix/find-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/find-includes.pl diff --git a/pkgs/misc/tex/nix/find-lhs2tex-includes.sh b/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh index 2dc12aa517a..2dc12aa517a 100644 --- a/pkgs/misc/tex/nix/find-lhs2tex-includes.sh +++ b/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh diff --git a/pkgs/misc/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh index 6edca4baf8a..6edca4baf8a 100644 --- a/pkgs/misc/tex/nix/lhs2tex.sh +++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 6c18721eed6..6c18721eed6 100644 --- a/pkgs/misc/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh diff --git a/pkgs/misc/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 672ae6fdfce..672ae6fdfce 100644 --- a/pkgs/misc/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix diff --git a/pkgs/misc/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 5e73d12959c..5e73d12959c 100644 --- a/pkgs/misc/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix diff --git a/pkgs/misc/tex/polytable/builder.sh b/pkgs/tools/typesetting/tex/polytable/builder.sh index 1138b8e6789..1138b8e6789 100644 --- a/pkgs/misc/tex/polytable/builder.sh +++ b/pkgs/tools/typesetting/tex/polytable/builder.sh diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/tools/typesetting/tex/polytable/default.nix index 71674d85b04..71674d85b04 100644 --- a/pkgs/misc/tex/polytable/default.nix +++ b/pkgs/tools/typesetting/tex/polytable/default.nix diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 5e0fb38c3bd..5e0fb38c3bd 100644 --- a/pkgs/misc/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix diff --git a/pkgs/misc/tex/tetex/environment.patch b/pkgs/tools/typesetting/tex/tetex/environment.patch index 6e652849b77..6e652849b77 100644 --- a/pkgs/misc/tex/tetex/environment.patch +++ b/pkgs/tools/typesetting/tex/tetex/environment.patch diff --git a/pkgs/misc/tex/tetex/getline.patch b/pkgs/tools/typesetting/tex/tetex/getline.patch index c82c1b3ac36..c82c1b3ac36 100644 --- a/pkgs/misc/tex/tetex/getline.patch +++ b/pkgs/tools/typesetting/tex/tetex/getline.patch diff --git a/pkgs/misc/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index d79c4fae419..d79c4fae419 100644 --- a/pkgs/misc/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh diff --git a/pkgs/misc/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 90d134fcd4e..90d134fcd4e 100644 --- a/pkgs/misc/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 1723f481906..1723f481906 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index 5ff2c89316a..5ff2c89316a 100644 --- a/pkgs/misc/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 4f15afdc381..4f15afdc381 100644 --- a/pkgs/misc/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix index b502b0f2108..b502b0f2108 100644 --- a/pkgs/misc/tex/texlive/context.nix +++ b/pkgs/tools/typesetting/tex/texlive/context.nix diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 69fb5d7e415..69fb5d7e415 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 598bdd08aef..598bdd08aef 100644 --- a/pkgs/misc/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 9e3f68f36b1..9e3f68f36b1 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix index fac520290f0..fac520290f0 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/pkgs/tools/typesetting/tex/texlive/pgf.nix diff --git a/pkgs/misc/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index d79c4fae419..d79c4fae419 100644 --- a/pkgs/misc/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix index 4e8d5eeb30b..4e8d5eeb30b 100644 --- a/pkgs/misc/tex/texlive/xcolor.nix +++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ec62d3e904..5cd24af482e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8491,7 +8491,7 @@ let ataripp = callPackage ../misc/emulators/atari++ { }; - auctex = callPackage ../misc/tex/auctex { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; busybox = callPackage ../misc/busybox { enableStatic = true; @@ -8509,7 +8509,7 @@ let darcnes = callPackage ../misc/emulators/darcnes { }; - dblatex = callPackage ../misc/tex/dblatex { }; + dblatex = callPackage ../tools/typesetting/tex/dblatex { }; dosbox = callPackage ../misc/emulators/dosbox { }; @@ -8565,7 +8565,7 @@ let keynav = callPackage ../tools/X11/keynav { }; - lazylist = callPackage ../misc/tex/lazylist { }; + lazylist = callPackage ../tools/typesetting/tex/lazylist { }; lilypond = callPackage ../misc/lilypond { inherit (gtkLibs) pango; @@ -8624,11 +8624,11 @@ let DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; - latex2html = callPackage ../misc/tex/latex2html/default.nix { + latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix { tex = tetex; }; - lkproof = callPackage ../misc/tex/lkproof { }; + lkproof = callPackage ../tools/typesetting/tex/lkproof { }; mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5; @@ -8643,13 +8643,13 @@ let # Keep the old PGF since some documents don't render properly with # 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 { }; - polytable = callPackage ../misc/tex/polytable { }; + polytable = callPackage ../tools/typesetting/tex/polytable { }; uae = callPackage ../misc/emulators/uae { }; @@ -8679,13 +8679,13 @@ let 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 gd t1lib freetype icu perl expat curl libjpeg bison python fontconfig flex; @@ -8713,35 +8713,35 @@ let Just installing a few packages doesn't work. */ 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; }; - texLiveExtra = builderDefsPackage (import ../misc/tex/texlive/extra.nix) { + texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) { inherit texLive; }; - texLiveCMSuper = builderDefsPackage (import ../misc/tex/texlive/cm-super.nix) { + texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) { inherit texLive; }; - texLiveLatexXColor = builderDefsPackage (import ../misc/tex/texlive/xcolor.nix) { + texLiveLatexXColor = builderDefsPackage (import ../tools/typesetting/tex/texlive/xcolor.nix) { inherit texLive; }; - texLivePGF = builderDefsPackage (import ../misc/tex/texlive/pgf.nix) { + texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) { inherit texLiveLatexXColor texLive; }; - texLiveBeamer = builderDefsPackage (import ../misc/tex/texlive/beamer.nix) { + texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) { inherit texLiveLatexXColor texLivePGF texLive; }; - texLiveModerncv = builderDefsPackage (import ../misc/tex/texlive/moderncv.nix) { + texLiveModerncv = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderncv.nix) { inherit texLive unzip; }; |