From 1b555c57eced64d3f76a3561d2d30407c6a9ce3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 Dec 2017 20:10:18 +0100 Subject: [PATCH] texlive: more robust way to fetch /cc #30332. Thanks to @vprbl for the http mirror. --- .../tools/typesetting/tex/texlive/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index eb8033d4d9f..68d0c635530 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -110,15 +110,16 @@ let tlName = urlName + "-${version}"; fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes - url = args.url or "${urlPrefix}/${urlName}.tar.xz"; - urlPrefix = args.urlPrefix or - https://gateway.ipfs.io/ipfs/QmRLK45EC828vGXv5YDaBsJBj2LjMjjA2ReLVrXsasRzy7/texlive-2017 - #http://146.185.144.154/texlive-2017 - ; - # XXX XXX XXX FIXME: mirror the snapshot XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX - # ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); - #mirror = "http://ftp.math.utah.edu"; - src = fetchurl { inherit url sha512; }; + urls = args.urls or (if args ? url then [ args.url ] else + map (up: "${up}/${urlName}.tar.xz") urlPrefixes + ); + urlPrefixes = args.urlPrefixes or [ + http://146.185.144.154/texlive-2017 + # IPFS GW is second, as it doesn't have a good time-outing behavior + http://gateway.ipfs.io/ipfs/QmRLK45EC828vGXv5YDaBsJBj2LjMjjA2ReLVrXsasRzy7/texlive-2017 + ]; + + src = fetchurl { inherit urls sha512; }; passthru = { inherit pname tlType version; @@ -132,7 +133,7 @@ let in if sha512 == "" then # hash stripped from pkgs.nix to save space -> fetch&unpack in a single step fetchurl { - inherit url; + inherit urls; sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!" else fixedHash; name = tlName;