diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index b313fc0b53d..2975e1007ab 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -14,25 +14,23 @@ let withSystemLibs = map (libname: "--with-system-${libname}"); - year = "2017"; + year = "2018"; version = year; # keep names simple for now common = rec { src = fetchurl { - url = # "ftp://tug.org/historic/systems/texlive/${year}/" - #"http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" - # FIXME: a proper mirror, though tarballs.nixos.org saves this case ATM - # http://146.185.144.154/texlive-2016 - # + "/texlive-${year}0523b-source.tar.xz"; - "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0524-source.tar.xz"; - sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"; + urls = [ + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz" + "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz" + ]; + sha256 = "0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y"; }; patches = [ (fetchurl { - name = "texlive-poppler-0.59.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin&id=6308ec39bce2a4d735f6ff8a4e94473748d7b450; - sha256 = "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n"; + name = "texlive-poppler-0.64.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin; + sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w"; }) ]; @@ -83,6 +81,8 @@ core = stdenv.mkDerivation rec { for i in texk/kpathsea/mktex*; do sed -i '/^mydir=/d' "$i" done + cp -pv texk/web2c/pdftexdir/pdftoepdf{-newpoppler.cc,.cc} + cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler.cc,.cc} ''; preConfigure = '' @@ -165,7 +165,7 @@ inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex name = "texlive-core-big.bin-${version}"; - inherit (common) src; + inherit (common) src patches; hardeningDisable = [ "format" ]; @@ -180,16 +180,14 @@ core-big = stdenv.mkDerivation { #TODO: upmendex # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex ]; - patches = common.patches ++ [ ./luatex-gcc7.patch ]; - configureScript = ":"; # we use static libtexlua, because it's only used by a single binary postConfigure = '' mkdir ./WorkDir && cd ./WorkDir - for path in libs/{teckit,lua52} texk/web2c; do + for path in libs/{teckit,lua52,lua53} texk/web2c; do ( - if [[ "$path" == "libs/lua52" ]]; then + if [[ "$path" =~ "libs/lua5" ]]; then extraConfig="--enable-static --disable-shared" else extraConfig="" diff --git a/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch b/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch deleted file mode 100644 index cdaa968bd42..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://www.tug.org/pipermail/tex-live/2017-June/040192.html ---- - texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++ - texk/web2c/luatexdir/luaffi/ffi.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - ---- a/texk/web2c/luatexdir/luaffi/ctype.c -+++ b/texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000 -@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st - - lua_pop(L, 1); /* mt */ - cd = (struct cdata*) lua_touserdata(L, idx); -+ if (!cd) { -+ lua_pushnil(L); -+ return NULL; -+ } - *ct = cd->type; - lua_getuservalue(L, idx); - ---- a/texk/web2c/luatexdir/luaffi/ffi.h -+++ b/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000 -@@ -370,7 +370,7 @@ __declspec(align(16)) - #endif - struct cdata { - const struct ctype type --#ifdef __GNUC__ -+#if 0 /* def __GNUC__ */ - __attribute__ ((aligned(16))) - #endif - ;