Skip to content

Commit d4ce905

Browse files
authored
texlive: 2025.20250603 -> 2025.20250703 (#422381)
2 parents d772658 + d8c58b7 commit d4ce905

7 files changed

Lines changed: 1234 additions & 989 deletions

File tree

pkgs/test/texlive/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,9 @@ rec {
636636
# pfarrei: require working kpse to find lua module
637637
"a5toa4"
638638

639+
# show-pdf-tags: require working kpse to find lualatex and lua modules
640+
"show-pdf-tags"
641+
639642
# bibexport: requires kpsewhich
640643
"bibexport"
641644

pkgs/tools/typesetting/tex/texlive/UPGRADING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ hashes for the relevant package, or for all packages.
7474

7575
### Upgrading the ConTeXt binaries
7676

77-
The LuaMetaTeX sources required for ConTeXt are distributed separately from the
78-
TeX Live tarballs and must be updated manually (see `texlive.bin.context`). You
79-
must use the latest tarball at https://tug.org/svn/texlive/trunk/Master/source/
80-
whose revision number is less than or equal to that of the package `context`.
77+
ConTeXt in TeX Live is packaged as described
78+
[here](https://github.com/gucci-on-fleek/context-packaging). With every update
79+
to the ConTeXt package, the LuaMetaTeX compiler also needs to be updated. For
80+
this, we fetch the source from the releases of the above repo. Make sure to
81+
update this in `texlive.bin.context`, when updating TeX Live.
8182

8283
### Updating the licensing information
8384

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

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchurl,
5+
fetchzip,
56
fetchFromGitHub,
67
fetchpatch,
78
buildPackages,
@@ -533,35 +534,42 @@ rec {
533534
enableParallelBuilding = true;
534535
};
535536

536-
# the LuaMetaTeX engine (distributed since TeX Live 2023) must be built separately
537-
# the sources used by TL are stored in the source TL repo
538-
# for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live
539-
context = stdenv.mkDerivation rec {
540-
pname = "luametatex";
541-
version = "2.11.07";
542-
543-
src = fetchurl {
544-
name = "luametatex-${version}.tar.xz";
545-
url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?pathrev=75382&view=co";
546-
hash = "sha256-ou04WcKnyEJTkUV4HhlGwDTscdEJTflGv0cpN69qkWE=";
547-
};
548-
549-
enableParallelBuilding = true;
550-
nativeBuildInputs = [
551-
cmake
552-
ninja
553-
];
537+
# The LuaMetaTeX engine (distributed since TeX Live 2023) must be built separately.
538+
# For details on how TeX Live packages ConTeXt, see
539+
# https://github.com/gucci-on-fleek/context-packaging
540+
context =
541+
let
542+
# The latest release of the context-packaging repo before the CTAN version in tlpdb.nix
543+
# https://github.com/gucci-on-fleek/context-packaging
544+
context_packaging_release = "2025-06-12-14-21-B";
545+
in
546+
stdenv.mkDerivation rec {
547+
pname = "luametatex";
548+
version = "2.11.07";
549+
550+
src = fetchzip {
551+
name = "luametatex.src.zip";
552+
url = "https://github.com/gucci-on-fleek/context-packaging/releases/download/${context_packaging_release}/luametatex.src.zip";
553+
hash = "sha256-9TLTIUSqA3g8QP9EF+tQ4VfLLLQwMrbeXPPy58uFWDo=";
554+
stripRoot = false;
555+
};
554556

555-
meta = with lib; {
556-
description = "LUAMETATEX engine is a follow up on LUATEX and is again part of CONTEXT development";
557-
homepage = "https://www.pragma-ade.nl/luametatex-1.htm";
558-
license = licenses.gpl2Plus;
559-
maintainers = with lib.maintainers; [
560-
apfelkuchen6
561-
xworld21
557+
enableParallelBuilding = true;
558+
nativeBuildInputs = [
559+
cmake
560+
ninja
562561
];
562+
563+
meta = with lib; {
564+
description = "LUAMETATEX engine is a follow up on LUATEX and is again part of CONTEXT development";
565+
homepage = "https://www.pragma-ade.nl/luametatex-1.htm";
566+
license = licenses.gpl2Plus;
567+
maintainers = with lib.maintainers; [
568+
apfelkuchen6
569+
xworld21
570+
];
571+
};
563572
};
564-
};
565573

566574
dvisvgm = stdenv.mkDerivation rec {
567575
pname = "dvisvgm";

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ let
101101
version = {
102102
# day of the snapshot being taken
103103
year = "2025";
104-
month = "06";
104+
month = "07";
105105
day = "03";
106106
# TeX Live version
107107
texliveYear = 2025;
@@ -141,7 +141,7 @@ let
141141
# use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
142142
# TODO make this less hacky
143143
(if version.final then mirrors else [ (lib.last mirrors) ]);
144-
hash = "sha256-K8BoBuMRv5Lp5+trLF5PZOTjzW86i0ZL/jKqP6n7LwA=";
144+
hash = "sha256-hTWTs5meP6X7+bBGEHP9pDv8eJTfvBZFKX0WeK8+aZg=";
145145
};
146146

147147
tlpdbNix =
@@ -334,6 +334,7 @@ let
334334
bsd3
335335
cc-by-sa-40
336336
eupl12
337+
fdl13Only
337338
free
338339
gfl
339340
gfsl

0 commit comments

Comments
 (0)