diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/tools/typesetting/tex | |
parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/tools/typesetting/tex')
-rw-r--r-- | pkgs/tools/typesetting/tex/auctex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix | 35 |
2 files changed, 22 insertions, 17 deletions
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 8624fdf96af79..6723526ff629a 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.88"; + version = "11.89"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "0gy89nzha20p6m7kpv2nl1fnsfka9scc3mw1lz66fp6czganfs3i"; + sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 223f72c678551..5cd5515400de0 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -10,24 +10,29 @@ rec { , extraFiles ? [] , compressBlanksInIndex ? true , packages ? [] + , texPackages ? {} , copySources ? false }: assert generatePDF -> !generatePS; - + + let + tex = pkgs.texlive.combine texPackages; + in + pkgs.stdenv.mkDerivation { name = "doc"; - + builder = ./run-latex.sh; copyIncludes = ./copy-includes.pl; - + inherit rootFile generatePDF generatePS extraFiles compressBlanksInIndex copySources; includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLaTeXIncludes {inherit rootFile;}); - - buildInputs = [ pkgs.tetex pkgs.perl ] ++ packages; + + buildInputs = [ tex pkgs.perl ] ++ packages; }; @@ -41,7 +46,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -72,7 +77,7 @@ rec { in pkgs.lib.fold foundDeps [] deps; }; - + findLhs2TeXIncludes = { rootFile @@ -80,7 +85,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -103,10 +108,10 @@ rec { builder = ./dot2pdf.sh; inherit dotGraph fontsConf; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz + pkgs.perl pkgs.graphviz ]; }; - + dot2ps = { dotGraph @@ -117,7 +122,7 @@ rec { builder = ./dot2ps.sh; inherit dotGraph; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz pkgs.ghostscript + pkgs.perl pkgs.graphviz pkgs.ghostscript ]; }; @@ -132,7 +137,7 @@ rec { includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLhs2TeXIncludes {rootFile = source;}); }; - + animateDot = dotGraph: nrFrames: pkgs.stdenv.mkDerivation { name = "dot-frames"; builder = ./animatedot.sh; @@ -163,7 +168,7 @@ rec { # Convert a Postscript file to a PNG image, trimming it so that - # there is no unnecessary surrounding whitespace. + # there is no unnecessary surrounding whitespace. postscriptToPNG = { postscript }: @@ -173,7 +178,7 @@ rec { inherit postscript; buildInputs = [pkgs.imagemagick pkgs.ghostscript]; - + buildCommand = '' if test -d $postscript; then input=$(ls $postscript/*.ps) @@ -240,5 +245,5 @@ rec { "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; - + } |