texlive: 2023.20240114 -> 2023-final
This commit is contained in:
@@ -44,12 +44,12 @@ let
|
||||
version = {
|
||||
# day of the snapshot being taken
|
||||
year = "2024";
|
||||
month = "01";
|
||||
day = "14";
|
||||
month = "03";
|
||||
day = "16";
|
||||
# TeX Live version
|
||||
texliveYear = 2023;
|
||||
# final (historic) release or snapshot
|
||||
final = false;
|
||||
final = true;
|
||||
};
|
||||
|
||||
# The tarballs on CTAN mirrors for the current release are constantly
|
||||
@@ -79,7 +79,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-eUG0KVfFPkjOczCsu2GAPRQcvcPrEIGqIsJNRc+AHDs=";
|
||||
hash = "sha256-w+04GBFDk/P/XvW7T9PotGD0nQslMkV9codca2urNK4=";
|
||||
};
|
||||
|
||||
tlpdbNix = runCommand "tlpdb.nix" {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,91 @@
|
||||
--- 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
|
||||
@@ -291,11 +291,6 @@ in lib.recursiveUpdate orig rec {
|
||||
'';
|
||||
|
||||
#### other script fixes
|
||||
# wrong $0 expectations
|
||||
bibcop.postFixup = ''
|
||||
substituteInPlace "$out"/bin/bibcop --replace-fail "basename(\$0) eq 'bibcop.pl'" "basename(\$0) eq 'bibcop'"
|
||||
'';
|
||||
|
||||
# misc tab and python3 fixes
|
||||
ebong.postFixup = ''
|
||||
sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/ /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong
|
||||
@@ -361,6 +356,14 @@ 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 writes 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" < ${./mtxrun-local-vars.patch}
|
||||
fi
|
||||
'';
|
||||
|
||||
texdoc = {
|
||||
extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
|
||||
extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user