Unverified Commit 0699e4fc authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

texlive: 2025.20260202 -> 2025-final (#495954)

parents 56839123 aa491a7e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -670,6 +670,7 @@ rec {
        "explcheck"
        "extractbb"
        "fontinst"
        "git-latexdiff"
        "ht*"
        "installfont-tl"
        "kanji-config-updmap-sys"
@@ -685,7 +686,6 @@ rec {
        "runtexfile"
        "texconfig"
        "texconfig-sys"
        "texexec"
        "texlinks"
        "texmfstart"
        "typeoutfileinfo"
@@ -706,6 +706,7 @@ rec {
        "luatools"
        "make4ht"
        "pmxchords"
        "runtexfile"
        "tex4ebook"
        "texblend"
        "texdoc"
+45 −34
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@
  lib,
  stdenv,
  fetchurl,
  fetchzip,
  fetchFromGitHub,
  fetchpatch,
  unzip,
  buildPackages,
  texlive,
  zlib,
@@ -138,12 +138,19 @@ let
  binPackages = lib.getAttrs (corePackages ++ coreBigPackages) tlpdb;

  common = {
    # initial TeX Live 2025 release
    # src = fetchurl {
    #   urls = [
    #     "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
    #     "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
    #   ];
    #   hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
    # };

    # 2025.2 update
    src = fetchurl {
      urls = [
        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
        "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
      ];
      hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
      url = "https://github.com/TeX-Live/texlive-source/archive/refs/tags/svn74917.tar.gz";
      hash = "sha256-QgUN5LOFeD6Jt0ENF6Uwi516D8PH+TXZ+MCO8bCTHqE=";
    };

    prePatch = ''
@@ -536,25 +543,21 @@ rec {
  # https://github.com/gucci-on-fleek/context-packaging
  context =
    let
      # The latest release of the context-packaging repo before the CTAN version in tlpdb.nix
      # https://github.com/gucci-on-fleek/context-packaging
      context_packaging_release = "2026-01-08-23-30-A";
      version = "2.11.08";
      level = "20260217";
    in
    stdenv.mkDerivation {
      pname = "luametatex";
      version = "2.11.08";
      version = "${version}-${level}";

      src = fetchzip {
        name = "luametatex.src.zip";
        url = "https://github.com/gucci-on-fleek/context-packaging/releases/download/${context_packaging_release}/luametatex.src.zip";
        hash = "sha256-PY1rrgLFAXR7YRcJMx1ob9dQc1PFoBSpi1xLQGM4Lko=";
        stripRoot = false;
      };
      src = texlive.pkgs.context.texsource + "/source/context/base/luametatex-${level}.src.zip";
      sourceRoot = ".";

      enableParallelBuilding = true;
      nativeBuildInputs = [
        cmake
        ninja
        unzip
      ];

      meta = {
@@ -684,22 +687,30 @@ rec {
    };
  };

  asymptote = args.asymptote.overrideAttrs (
  asymptote =
    let
      version = "3.09";
    in
    args.asymptote.overrideAttrs (
      finalAttrs: prevAttrs: {
      version = texlive.pkgs.asymptote.version;
        version =
          assert lib.assertMsg (version == texlive.pkgs.asymptote.version)
            "asymptote: TeX Live version (${texlive.pkgs.asymptote.version}) different from source in bin.nix (${version}), please update it";
          version;

        # keep local src and patches even if duplicated in the top level asymptote
        # so that top level updates do not break texlive
        src = fetchurl {
          url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
        hash = "sha256-NcFtCjvdhppW5O//Rjj4HDqIsva2ZNGWRxAV2/TGmoc=";
          hash = "sha256-unM6mfyq8MCajo8wtG/ksr4E6mQNK/A03gGIa9Fxeuc=";
        };

        texContainer = texlive.pkgs.asymptote.tex;
        texdocContainer = texlive.pkgs.asymptote.texdoc;

      # build issue with asymptote 2.95 has been fixed
      postConfigure = "";
        preConfigure = prevAttrs.preConfigure + ''
          substituteInPlace Makefile.in --replace-fail '/bin/ls' 'ls'
        '';
      }
    );

+4 −4
Original line number Diff line number Diff line
@@ -105,12 +105,12 @@ let
  version = {
    # day of the snapshot being taken
    year = "2026";
    month = "02";
    day = "02";
    month = "03";
    day = "01";
    # TeX Live version
    texliveYear = 2025;
    # final (historic) release or snapshot
    final = false;
    final = true;
  };

  # The tarballs on CTAN mirrors for the current release are constantly
@@ -148,7 +148,7 @@ let
        # use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
        # TODO make this less hacky
        (if version.final then mirrors else [ (lib.last mirrors) ]);
    hash = "sha256-GxJXqY6plT3wngKiuqiZUst4eTZIylUdhN2ojUApIpU=";
    hash = "sha256-Vt8DjpBwo9WH7s613vPxVLLKzM7zbUKVu0ngYYl3w0o=";
  };

  tlpdbNix =
+1522 −1450

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ lib.recursiveUpdate orig rec {
  #### overrides of texlive.tlpdb

  #### nonstandard script folders
  context-legacy.scriptsFolder = "context/ruby";
  cyrillic-bin.scriptsFolder = "texlive-extra";
  fontinst.scriptsFolder = "texlive-extra";
  mptopdf.scriptsFolder = "context/perl";
@@ -257,11 +258,6 @@ lib.recursiveUpdate orig rec {
    "mtxrun.lua" = tl.context.tex + "/scripts/context/lua/mtxrun.lua";
  };

  context-legacy.binlinks = {
    texexec = tl.context-legacy.tex + "/scripts/context/ruby/texexec.rb";
    texmfstart = tl.context-legacy.tex + "/scripts/context/ruby/texmfstart.rb";
  };

  dvipdfmx.binlinks = {
    # even though 'ebb' was removed from the Makefile, this symlink is still
    # part of the binary container of dvipdfmx
@@ -312,6 +308,10 @@ lib.recursiveUpdate orig rec {
    sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath cjk-gs-integrate.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/cjk-gs-integrate
  '';

  context-legacy.postFixup = ''
    sed -i 's!File.dirname(\$0)!'"'"'${tl.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
  '';

  cyrillic-bin.postFixup = ''
    sed -i '2iPATH="${lib.makeBinPath cyrillic-bin.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/rumakeindex
  '';
Loading