texlive: 2021-final -> 2022.20221227 (#208313)

This commit is contained in:
Dmitry Kalinkin 2022-12-30 17:47:58 -05:00 committed by GitHub
parent f12a7d932d
commit 4527d89f4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6002 additions and 4298 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
{ lib, stdenv, fetchurl, perlPackages, shortenPerlShebang, texlive }:
let
biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
@ -24,14 +24,6 @@ perlPackages.buildPerlModule {
src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
patches = [
# Perl 5.36.0 compatibility: https://github.com/plk/biber/pull/411
(fetchpatch {
url = "https://github.com/plk/biber/commit/d9e961710074d266ad6bdf395c98868d91952088.patch";
sha256 = "08fx7mvq78ndnj59xv3crncih7a8201rr31367kphysz2msjbj52";
})
];
buildInputs = with perlPackages; [
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K

View file

@ -14,26 +14,17 @@
let
withSystemLibs = map (libname: "--with-system-${libname}");
year = "2021";
year = "2022";
version = year; # keep names simple for now
common = {
src = fetchurl {
urls = [
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0325-source.tar.xz"
"ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0325-source.tar.xz"
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0321-source.tar.xz"
"ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0321-source.tar.xz"
];
sha256 = "0jsq1p66l46k2qq0gbqmx25flj2nprsz4wrd1ybn286p11kdkvvs";
hash = "sha256-X/o0heUessRJBJZFD8abnXvXy55TNX2S20vNT9YXm1Y=";
};
patches = [
# Pull upstream fix for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/TeX-Live/texlive-source/commit/7748582aeda70ffa02105f6e3e2fc2476e76aac6.patch";
sha256 = "1y59cwa41kbg0i071g488jhi9qg0h8l7hqd69brhx2yj95za8c40";
excludes = [ "texk/xdvik/ChangeLog" ];
})
];
prePatch = ''
for i in texk/kpathsea/mktex*; do
@ -220,8 +211,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
mkdir -p "$path" && cd "$path"
"../../../$path/configure" $configureFlags $extraConfig
if [[ "$path" =~ "libs/pplib" ]]; then
# TODO: revert for texlive 2022
if [[ "$path" =~ "libs/luajit" ]] || [[ "$path" =~ "libs/pplib" ]]; then
# ../../../texk/web2c/mfluadir/luapeg/lpeg.h:29:10: fatal error: 'lua.h' file not found
# ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found
make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
fi
@ -437,7 +428,7 @@ xdvi = stdenv.mkDerivation {
pname = "texlive-xdvi.bin";
inherit version;
inherit (common) src patches;
inherit (common) src;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ core/*kpathsea*/ freetype ghostscript ]

View file

@ -117,20 +117,20 @@ let
};
# for daily snapshots
# snapshot = {
# year = "2022";
# month = "03";
# day = "22";
# };
snapshot = {
year = "2022";
month = "12";
day = "27";
};
tlpdb = fetchurl {
# use the same mirror(s) as urlPrefixes below
urls = [
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
#"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
#"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
#"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
];
hash = "sha256-qSV6OZmGHCom2w85WXm84ohMrGGJLZ2Vzj9talDNiOo=";
hash = "sha256-i8DE3/rZmtp+gODJWeHV1VcCK5cgHUgmywf3Q/agTOA=";
};
# create a derivation that contains an unpacked upstream TL package
@ -151,11 +151,11 @@ let
# (https://tug.org/historic/).
urlPrefixes = args.urlPrefixes or [
# tlnet-final snapshot
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
#"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
#"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
# Daily snapshots hosted by one of the texlive release managers
#"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
];
in runCommand "texlive-${tlName}"
@ -203,8 +203,8 @@ in
(combine {
${pname} = attrs;
extraName = "combined" + lib.removePrefix "scheme" pname;
extraVersion = "-final";
#extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
#extraVersion = "-final";
extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
})
)
{ inherit (tl)

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff