texlive.bin.context: 2.11.02 -> 2.10.08 (#298414)

LMTX 2.11.02 is the new version shipped by TeX Live 2024, not 2023.

This reverts commits 7992ab336b,
4a2f32b16c and other ConTeXt patches
that were fixing issues caused by using the wrong version of LMTX.

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

@@ -308,11 +308,11 @@ chktex = stdenv.mkDerivation {
 # for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live
 context = stdenv.mkDerivation rec {
   pname = "luametatex";
-  version = "2.11.02";
+  version = "2.10.08";
 
   src = fetchurl {
-    url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?revision=70616&view=co";
-    hash = "sha256-o7esoBBTTYEstkd7l34BWxew3fIRdVcFiGxrT1/KP1o=";
+    url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?revision=67034&view=co";
+    hash = "sha256-3JeOUQ63jJOZWTxFCoyWjfcrspmdmC/yqgS1JaLfTWk=";
   };
 
   enableParallelBuilding = true;

pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix

@@ -828,7 +828,7 @@ conditext-55387={run="0g6clck3v75yvg7gv42w24zv18vi5jcg1q9k663cxldix77lkgbc";doc=
 confproc-29349={run="1s4mv0g2x5mfxnkp0i29wa3ncbx9fa05qqf734fjppdzsgic079i";doc="021kbis3c73gnavrjhqa34fsbq5c94lmjym2d4ny2wpk9xagh994";source="0dpghxh9mq2sr7aqgcj15h6b4xh7x5hvdzph6606izpff8ac7h8c";};
 constants-15878={run="11naj0z8ppb6h07r7cff0lcmr8zgc29kp3x7spi60zi6cq2546gk";doc="1wgvq0x1kjgd0bs0024fkh7wis9aw9qryd7y0igrbgdgc722pjnp";source="01skagh044v62vw12kmibgd6y42z5r1glrsvi9y0h76vs52jz7hr";};
 conteq-37868={run="1h7b98qw9hl73gh4zidy59z4rly9afnvmah75jgvh0k1v1hm09df";doc="0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy";source="1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8";};
-context-69665={run="1z6knaa8mffb4ds36k1h15qymh7f2aw9fwq38jw5cqzna6s8zzs0";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
+context-69665={run="1r8gkrrrq1ps1cp058m1jv8922zsx3hw6c5vsmxpbwckrp5sirwh";doc="1nh2yf7vb800cnnmzic5hmy4w5kxd38y1py1xjg7madphb9zdc60";};
 context-calendar-examples-66947={run="0asc49mn24ql4fk73089viy3s6wff865xk8af7h67ffsb5qjnld8";doc="0wza057wz18yf2zl1j77hddzimwnraw5wg1579ncksywvhnmx3rp";};
 context-collating-marks-68696={run="12vqvbp7ns9r5nc7p7nrlsll3jp3hc4xi9wjyjq8lrmd8ly3v26w";doc="0nawd3x4rl73s4mhpq2wd1sqa8i6k2n0a39sqcaf21zx99mpiqp0";};
 context-cyrillicnumbers-47085={run="1gk4ncbfzilj98s7k7s43k6vb3il511k434aj34fsvqh5x9x4aw2";doc="0f7r9qgfc8h92jprjqa24q4vpz4bqrrns3glhmwh3qmk1f2gyw73";};

pkgs/tools/typesetting/tex/texlive/mtx-local-vars.patch

@@ -1,106 +0,0 @@
---- a/scripts/context/lua/mtxrun.lua	1970-01-01 01:00:01
-+++ b/cont-lmt/scripts/context/lua/mtxrun.lua	2024-03-11 08:34:49
-@@ -2435,19 +2433,22 @@
-   tables[t]=tcopy
-  end
-  for i,v in next,t do 
-+  local k
-   if type(i)=="table" then
-    if tables[i] then
--    i=tables[i]
-+    k=tables[i]
-    else
--    i=copy(i,tables)
-+    k=copy(i,tables)
-    end
-+  else
-+   k=i
-   end
-   if type(v)~="table" then
--   tcopy[i]=v
-+   tcopy[k]=v
-   elseif tables[v] then
--   tcopy[i]=tables[v]
-+   tcopy[k]=tables[v]
-   else
--   tcopy[i]=copy(v,tables)
-+   tcopy[k]=copy(v,tables)
-   end
-  end
-  local mt=getmetatable(t)
-@@ -12982,10 +13037,10 @@
-    else
-     value=is_boolean(value,value,true) 
-    end
--   w=topattern(w,true,true)
-+   local p=topattern(w,true,true)
-    for name,functions in sortedhash(data) do
-     if done[name] then
--    elseif find(name,w) then
-+    elseif find(name,p) then
-      done[name]=true
-      for i=1,#functions do
-       functions[i](value)
-@@ -13554,9 +13610,9 @@
-    if v then
-     v.state=value
-    else
--    c=topattern(c,true,true)
-+    local p=topattern(c,true,true)
-     for k,v in next,data do
--     if find(k,c) then
-+     if find(k,p) then
-       v.state=value
-      end
-     end
-@@ -14499,10 +14556,7 @@
-       realtime=realtime+real
-      end
-      totaltime=totaltime+total
--     if line<0 then
--      line=0
--     end
--     dataset[#dataset+1]={ real,total,count,name,source,line }
-+     dataset[#dataset+1]={ real,total,count,name,source,line<0 and 0 or line }
-     end
-    end
-   end
-@@ -21135,10 +21251,10 @@
-  str=lpegmatch(stripper_1,str)
-  if validate then
-   for s in gmatch(str,"[^,]+") do
--   s=validate(s)
--   if s then
-+   local v=validate(s)
-+   if v then
-     n=n+1
--    t[n]=s
-+    t[n]=v
-    end
-   end
-  else
-@@ -23552,7 +23690,8 @@
-   local result={}
-   local status={}
-   local done={}
--  for k,r in next,results do
-+  for k=1,#results do
-+   local r=results[k]
-    local method,list=r[1],r[2]
-    if method and list then
-     for i=1,#list do
---- a/scripts/context/lua/mtx-context.lua	1970-01-01 01:00:01
-+++ b/scripts/context/lua/mtx-context.lua	2024-03-11 08:34:49
-@@ -613,8 +615,11 @@
-     -- context flags get prepended by c: ... this will move to the sbx module
-     local t = { }
-     for k, v in table.sortedhash(flags) do
-+        local p
-         if prefix then
--            k = format("c:%s",k)
-+            p = format("c:%s",k)
-+        else
-+            p = k
-         end
-         if not v or v == "" or v == '""' then
-             -- no need to flag false

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

@@ -356,14 +356,6 @@ in lib.recursiveUpdate orig rec {
   # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README
   arabi-add.license = [  "lppl13c" ];
 
-  # mtxrun.lua and mtx-context.lua write to const loop variables which is forbidden in recent LuaTeX
-  # patch manually generated by diffing against a recent cont-lmt.zip
-  context.postUnpack = ''
-    if [[ -f "$out"/scripts/context/lua/mtxrun.lua ]] ; then
-      patch -p1 -d "$out" < ${./mtx-local-vars.patch}
-    fi
-  '';
-
   texdoc = {
     extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
     extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";