Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
730 changed files with 3907 additions and 1907 deletions
+7 -1
View File
@@ -143,7 +143,7 @@ core = stdenv.mkDerivation rec {
description = "Basic binaries for TeX Live";
homepage = "http://www.tug.org/texlive";
license = lib.licenses.gpl2;
maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ];
maintainers = with maintainers; [ veprbl lovek323 raskin jwiegley ];
platforms = platforms.all;
};
};
@@ -185,6 +185,12 @@ 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
# ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found
make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
fi
)
done
'';