Commit 47b2c8fe authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

texlive: remove 'texlive-' prefix from package names

parent 253025b3

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

+9 −9
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ core = stdenv.mkDerivation rec { 
inherit (core-big) metafont mflua metapost luatex luahbtex xetex;

luajittex = core.big.luajittex or null;

core-big = stdenv.mkDerivation {

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

  pname = "texlive-bin-big";

  inherit version;



  __structuredAttrs = true;
@@ -282,7 +282,7 @@ core-big = stdenv.mkDerivation { 




chktex = stdenv.mkDerivation {

  pname = "texlive-chktex.bin";

  pname = "chktex";

  inherit (texlive.pkgs.chktex) version;



  inherit (common) src;
@@ -303,7 +303,7 @@ chktex = stdenv.mkDerivation { 
# the sources used by TL are stored in the source TL repo

# for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live

context = stdenv.mkDerivation rec {

  pname = "texlive-context.bin";

  pname = "luametatex";

  version = "2.10.08";



  src = fetchurl {
@@ -323,7 +323,7 @@ context = stdenv.mkDerivation rec { 
};



dvisvgm = stdenv.mkDerivation {

  pname = "texlive-dvisvgm.bin";

  pname = "dvisvgm";

  inherit (texlive.pkgs.dvisvgm) version;



  inherit (common) src;
@@ -368,7 +368,7 @@ dvisvgm = stdenv.mkDerivation { 




dvipng = stdenv.mkDerivation {

  pname = "texlive-dvipng.bin";

  pname = "dvipng";

  inherit (texlive.pkgs.dvipng) version;



  inherit (common) src;
@@ -432,7 +432,7 @@ inherit biber; 
inherit biber-ms;

bibtexu = bibtex8;

bibtex8 = stdenv.mkDerivation {

  pname = "texlive-bibtex-x.bin";

  pname = "bibtex-x";

  inherit (texlive.pkgs.bibtexu) version;



  inherit (common) src;
@@ -450,7 +450,7 @@ bibtex8 = stdenv.mkDerivation { 




xdvi = stdenv.mkDerivation {

  pname = "texlive-xdvi.bin";

  pname = "xdvi";

  inherit (texlive.pkgs.xdvi) version;



  inherit (common) src;
@@ -474,7 +474,7 @@ xdvi = stdenv.mkDerivation { 
};



xpdfopen = stdenv.mkDerivation {

  pname = "texlive-xpdfopen.bin";

  pname = "xpdfopen";

  inherit (texlive.pkgs.xpdfopen) version;



  inherit (common) src;
@@ -492,7 +492,7 @@ xpdfopen = stdenv.mkDerivation { 
{



xindy = stdenv.mkDerivation {

  pname = "texlive-xindy.bin";

  pname = "xindy";

  inherit (texlive.pkgs.xindy) version;



  inherit (common) src;

pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix

+8 −13
Original line number Diff line number Diff line
@@ -99,14 +99,12 @@ let 
      # tlpkg is not a true container but a subfolder of the run container

      urlName = pname + (lib.optionalString (tlType != "run" && tlType != "tlpkg") ".${tlType}");

      urls = map (up: "${up}/archive/${urlName}.r${toString revision}.tar.xz") mirrors;

      # TODO switch to simpler "${name}-${tlOutputName}" (requires new fixed hashes)

      container = runCommand "texlive-${pname}${lib.optionalString (tlType != "run") ".${tlType}"}-${version}${extraVersion}"

      container = runCommand "${name}-${tlOutputName}"

        ({

          src = fetchurl { inherit urls sha512; };

          # save outputName as fixed output derivations cannot change nor override outputName

          passthru = passthru // { inherit tlOutputName; };

          # TODO remove tlType from derivation (requires a rebuild)

          inherit meta stripPrefix tlType;

          inherit passthru;

          # save outputName, since fixed output derivations cannot change nor override outputName

          inherit meta stripPrefix tlOutputName;

        } // lib.optionalAttrs (fixedHash != null) {

          outputHash = fixedHash;

          outputHashAlgo = "sha256";
@@ -114,7 +112,7 @@ let 
        })

        (''

          mkdir "$out"

          if [[ "$tlType"  == "tlpkg" ]]; then

          if [[ "$tlOutputName"  == "tlpkg" ]]; then

            tar -xf "$src" \

              --strip-components=1 \

              -C "$out" --anchored --exclude=tlpkg/tlpobj --keep-old-files \
@@ -154,8 +152,7 @@ let 
    tlu = texliveBinaries.luatex;

  };



  # TODO switch to simpler "${name}" (requires a rebuild)

  bin = runCommand "texlive-${pname}.bin-${version}"

  bin = runCommand "${name}"

    {

      inherit meta;

      passthru = passthru // { tlOutputName = "out"; };
@@ -183,8 +180,7 @@ let 
    '';



  # build man, info containers

  # TODO switch to simpler "${name}-man" (requires a rebuild)

  man = builtins.removeAttrs (runCommand "texlive-${pname}.man-${version}${extraVersion}"

  man = builtins.removeAttrs (runCommand "${name}-man"

    {

      inherit meta texdoc;

      passthru = passthru // { tlOutputName = "man"; };
@@ -194,8 +190,7 @@ let 
      ln -s {"$texdoc"/doc,"$out"/share}/man

    '') [ "out" ] // lib.optionalAttrs hasBinfiles { out = bin; };



  # TODO switch to simpler "${name}-info" (requires a rebuild)

  info = builtins.removeAttrs (runCommand "texlive-${pname}.info-${version}${extraVersion}"

  info = builtins.removeAttrs (runCommand "${name}-info"

    {

      inherit meta texdoc;

      passthru = passthru // { tlOutputName = "info"; };