Commit e2e33e61 authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

texlive.bin.core-big: enable upmendex

parent 830ec779

pkgs/test/texlive/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ rec { 
      # (1) binaries requiring --help or -h

      help = [ "arlatex" "bundledoc" "cachepic" "checklistings" "dvipos" "extractres" "fig4latex" "fragmaster"

        "kpsewhere" "latex-git-log" "ltxfileinfo" "mendex" "perltex" "pn2pdf" "psbook" "psnup" "psresize" "purifyeps"

        "simpdftex" "tex2xindy" "texluac" "texluajitc" "urlbst" "yplan" ];

        "simpdftex" "tex2xindy" "texluac" "texluajitc" "upmendex" "urlbst" "yplan" ];

      shortHelp = [ "adhocfilelist" "authorindex" "bbl2bib" "bibdoiadd" "bibmradd" "biburl2doi" "bibzbladd" "ctanupload"

        "disdvi" "dvibook" "dviconcat" "getmapdl" "latex2man" "listings-ext.sh" "pygmentex" ];

      # (2) binaries that return non-zero exit code even if correctly asked for help

pkgs/tools/typesetting/tex/texlive/bin.nix

+4 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ core = stdenv.mkDerivation rec { 


inherit (core-big) metafont mflua metapost luatex luahbtex xetex;

luajittex = core.big.luajittex or null;

core-big = stdenv.mkDerivation { #TODO: upmendex

core-big = stdenv.mkDerivation {

  pname = "texlive-core-big.bin";

  inherit version;
@@ -260,7 +260,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex 
      texk/{afm2pl,bibtex-x,chktex,cjkutils,detex,dtl,dvi2tty,dvidvi,dviljk,dviout-util} \

      texk/{dvipdfm-x,dvipng,dvipos,dvipsk,dvisvgm,gregorio,gsftopk,kpathsea} \

      texk/{lcdf-typetools,makeindexk,makejvf,mendexk,musixtnt,ps2pk,psutils,ptexenc} \

      texk/{seetexk,tex4htk,texlive,ttf2pk2,ttfdump,upmendex,xdvik} \

      texk/{seetexk,tex4htk,texlive,ttf2pk2,ttfdump,xdvik} \

      utils/{asymptote,autosp,axodraw2,devnag,lacheck,m-tx,pmx,ps2eps,t1utils,texdoctk} \

      utils/{tpic2pdftex,vlna,xindy,xml2pmx,xpdfopen}

    mkdir WorkDir
@@ -274,8 +274,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex 
      ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "hitex" "pdftex"

        "web-progs" "synctex"

      ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ])

    /* disable all packages, re-enable web2c package */

    ++ [ "--disable-all-pkgs" "--enable-web2c" ]

    /* disable all packages, re-enable upmendex, web2c packages */

    ++ [ "--disable-all-pkgs" "--enable-upmendex" "--enable-web2c" ]

    /* kpathsea requires specifying the kpathsea location manually */

    ++ [ "--with-kpathsea-includes=${core.dev}/include" ];

pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ in lib.recursiveUpdate orig rec { 


  # remove man

  texlive-scripts.binfiles = lib.remove "man" orig.texlive-scripts.binfiles;



  # upmendex is "TODO" in bin.nix

  uptex.binfiles = lib.remove "upmendex" orig.uptex.binfiles;



  # xindy is broken on some platforms unfortunately

  xindy.binfiles = if bin ? xindy

    then lib.subtractLists [ "xindy.mem" "xindy.run" ] orig.xindy.binfiles