Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fe043784a61c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39495404a3ee
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 7, 2019

  1. asciidoc: replace tetex by texlive (#56782)

    @dotlambda @xeji
    dotlambda authored and xeji committed Mar 7, 2019
    Copy the full SHA
    3949540 View commit details
Showing with 8 additions and 5 deletions.
  1. +6 −5 pkgs/tools/typesetting/asciidoc/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
11 changes: 6 additions & 5 deletions pkgs/tools/typesetting/asciidoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, highlight ? null
, pygments ? null
, graphviz ? null
, tetex ? null
, texlive ? null
, dblatexFull ? null
, libxslt ? null
, w3m ? null
@@ -47,7 +47,7 @@ assert enableStandardFeatures ->
highlight != null &&
pygments != null &&
graphviz != null &&
tetex != null &&
texlive != null &&
dblatexFull != null &&
libxslt != null &&
w3m != null &&
@@ -220,8 +220,8 @@ stdenv.mkDerivation rec {
-e "s|fdp|${graphviz}/bin/fdp|g" \
-i "filters/graphviz/graphviz2png.py"
sed -e "s|run('latex|run('${tetex}/bin/latex|g" \
-e "s|cmd = 'dvipng'|cmd = '${tetex}/bin/dvipng'|g" \
sed -e "s|run('latex|run('${texlive}/bin/latex|g" \
-e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \
-i "filters/latex/latex2png.py"
sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \
@@ -238,7 +238,8 @@ stdenv.mkDerivation rec {
# use it to work around an impurity in the tetex package; tetex tools
# cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
# We can remove PATH= when those impurities are fixed.
sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \
# TODO: Is this still necessary when using texlive?
sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ texlive coreutils gnused ]}')|" \
-e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1745,11 +1745,13 @@ in

asciidoc-full = appendToName "full" (asciidoc.override {
inherit (python2Packages) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
enableStandardFeatures = true;
});

asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override {
inherit (python2Packages) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
enableStandardFeatures = true;
enableExtraPlugins = true;
});