From b69d6bf7e099a6d8e5bec8dd2a1d337d3fcd4a3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Feb 2012 09:31:07 +0000
Subject: [PATCH] Moved all LaTeX expressions into tools/typesetting hierarchy.

svn path=/nixpkgs/trunk/; revision=32028
---
 .../typesetting}/tex/auctex/default.nix       |  0
 .../typesetting}/tex/dblatex/default.nix      |  0
 .../typesetting}/tex/disser/default.nix       |  0
 .../typesetting}/tex/latex2html/default.nix   |  0
 .../typesetting}/tex/lazylist/builder.sh      |  0
 .../typesetting}/tex/lazylist/default.nix     |  0
 .../typesetting}/tex/lkproof/default.nix      |  0
 .../typesetting}/tex/nix/animatedot.sh        |  0
 .../typesetting}/tex/nix/copy-includes.pl     |  0
 .../typesetting}/tex/nix/default.nix          |  0
 .../typesetting}/tex/nix/dot2pdf.sh           |  0
 .../typesetting}/tex/nix/dot2ps.sh            |  0
 .../typesetting}/tex/nix/find-includes.pl     |  0
 .../tex/nix/find-lhs2tex-includes.sh          |  0
 .../typesetting}/tex/nix/lhs2tex.sh           |  0
 .../typesetting}/tex/nix/run-latex.sh         |  0
 .../typesetting}/tex/pgf/1.x.nix              |  0
 .../typesetting}/tex/pgf/2.x.nix              |  0
 .../typesetting}/tex/polytable/builder.sh     |  0
 .../typesetting}/tex/polytable/default.nix    |  0
 .../typesetting}/tex/tetex/default.nix        |  0
 .../typesetting}/tex/tetex/environment.patch  |  0
 .../typesetting}/tex/tetex/getline.patch      |  0
 .../typesetting}/tex/tetex/setup-hook.sh      |  0
 .../typesetting}/tex/tex4ht/default.nix       |  0
 .../typesetting}/tex/texlive/aggregate.nix    |  0
 .../typesetting}/tex/texlive/beamer.nix       |  0
 .../typesetting}/tex/texlive/cm-super.nix     |  0
 .../typesetting}/tex/texlive/context.nix      |  0
 .../typesetting}/tex/texlive/default.nix      |  0
 .../typesetting}/tex/texlive/extra.nix        |  0
 .../typesetting}/tex/texlive/moderncv.nix     |  0
 .../typesetting}/tex/texlive/pgf.nix          |  0
 .../typesetting}/tex/texlive/setup-hook.sh    |  0
 .../typesetting}/tex/texlive/xcolor.nix       |  0
 pkgs/top-level/all-packages.nix               | 42 +++++++++----------
 36 files changed, 21 insertions(+), 21 deletions(-)
 rename pkgs/{misc => tools/typesetting}/tex/auctex/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/dblatex/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/disser/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/latex2html/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/lazylist/builder.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/lazylist/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/lkproof/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/animatedot.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/copy-includes.pl (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/dot2pdf.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/dot2ps.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/find-includes.pl (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/find-lhs2tex-includes.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/lhs2tex.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/nix/run-latex.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/pgf/1.x.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/pgf/2.x.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/polytable/builder.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/polytable/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/tetex/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/tetex/environment.patch (100%)
 rename pkgs/{misc => tools/typesetting}/tex/tetex/getline.patch (100%)
 rename pkgs/{misc => tools/typesetting}/tex/tetex/setup-hook.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/tex4ht/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/aggregate.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/beamer.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/cm-super.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/context.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/default.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/extra.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/moderncv.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/pgf.nix (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/setup-hook.sh (100%)
 rename pkgs/{misc => tools/typesetting}/tex/texlive/xcolor.nix (100%)

diff --git a/pkgs/misc/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
similarity index 100%
rename from pkgs/misc/tex/auctex/default.nix
rename to pkgs/tools/typesetting/tex/auctex/default.nix
diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
similarity index 100%
rename from pkgs/misc/tex/dblatex/default.nix
rename to pkgs/tools/typesetting/tex/dblatex/default.nix
diff --git a/pkgs/misc/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix
similarity index 100%
rename from pkgs/misc/tex/disser/default.nix
rename to pkgs/tools/typesetting/tex/disser/default.nix
diff --git a/pkgs/misc/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
similarity index 100%
rename from pkgs/misc/tex/latex2html/default.nix
rename to pkgs/tools/typesetting/tex/latex2html/default.nix
diff --git a/pkgs/misc/tex/lazylist/builder.sh b/pkgs/tools/typesetting/tex/lazylist/builder.sh
similarity index 100%
rename from pkgs/misc/tex/lazylist/builder.sh
rename to pkgs/tools/typesetting/tex/lazylist/builder.sh
diff --git a/pkgs/misc/tex/lazylist/default.nix b/pkgs/tools/typesetting/tex/lazylist/default.nix
similarity index 100%
rename from pkgs/misc/tex/lazylist/default.nix
rename to pkgs/tools/typesetting/tex/lazylist/default.nix
diff --git a/pkgs/misc/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix
similarity index 100%
rename from pkgs/misc/tex/lkproof/default.nix
rename to pkgs/tools/typesetting/tex/lkproof/default.nix
diff --git a/pkgs/misc/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh
similarity index 100%
rename from pkgs/misc/tex/nix/animatedot.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/copy-includes.pl
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/default.nix
rename to pkgs/tools/typesetting/tex/nix/default.nix
diff --git a/pkgs/misc/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
similarity index 100%
rename from pkgs/misc/tex/nix/dot2pdf.sh
rename to pkgs/tools/typesetting/tex/nix/dot2pdf.sh
diff --git a/pkgs/misc/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh
similarity index 100%
rename from pkgs/misc/tex/nix/dot2ps.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/find-includes.pl
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/find-lhs2tex-includes.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/lhs2tex.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/nix/run-latex.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/pgf/1.x.nix
rename to 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
similarity index 100%
rename from pkgs/misc/tex/pgf/2.x.nix
rename to 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
similarity index 100%
rename from pkgs/misc/tex/polytable/builder.sh
rename to pkgs/tools/typesetting/tex/polytable/builder.sh
diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/tools/typesetting/tex/polytable/default.nix
similarity index 100%
rename from pkgs/misc/tex/polytable/default.nix
rename to pkgs/tools/typesetting/tex/polytable/default.nix
diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
similarity index 100%
rename from pkgs/misc/tex/tetex/default.nix
rename to pkgs/tools/typesetting/tex/tetex/default.nix
diff --git a/pkgs/misc/tex/tetex/environment.patch b/pkgs/tools/typesetting/tex/tetex/environment.patch
similarity index 100%
rename from pkgs/misc/tex/tetex/environment.patch
rename to pkgs/tools/typesetting/tex/tetex/environment.patch
diff --git a/pkgs/misc/tex/tetex/getline.patch b/pkgs/tools/typesetting/tex/tetex/getline.patch
similarity index 100%
rename from pkgs/misc/tex/tetex/getline.patch
rename to 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
similarity index 100%
rename from pkgs/misc/tex/tetex/setup-hook.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/tex4ht/default.nix
rename to pkgs/tools/typesetting/tex/tex4ht/default.nix
diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/aggregate.nix
rename to pkgs/tools/typesetting/tex/texlive/aggregate.nix
diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/beamer.nix
rename to 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
similarity index 100%
rename from pkgs/misc/tex/texlive/cm-super.nix
rename to 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
similarity index 100%
rename from pkgs/misc/tex/texlive/context.nix
rename to pkgs/tools/typesetting/tex/texlive/context.nix
diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/default.nix
rename to pkgs/tools/typesetting/tex/texlive/default.nix
diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/extra.nix
rename to pkgs/tools/typesetting/tex/texlive/extra.nix
diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/moderncv.nix
rename to pkgs/tools/typesetting/tex/texlive/moderncv.nix
diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix
similarity index 100%
rename from pkgs/misc/tex/texlive/pgf.nix
rename to 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
similarity index 100%
rename from pkgs/misc/tex/texlive/setup-hook.sh
rename to 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
similarity index 100%
rename from pkgs/misc/tex/texlive/xcolor.nix
rename to pkgs/tools/typesetting/tex/texlive/xcolor.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ec62d3e9042..5cd24af482e2 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;
   };