From 17c0585cd15523974510827a47f142b6105fb27c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 09:33:33 +0200 Subject: [PATCH] [Backport release-21.05] texlive: allow substitutes for texlive packages (#126866) * texlive: allow substitutes for texlive packages (cherry picked from commit 0f1e7e09b56cc8d98c5d02b87dd2626be9456d9c) (cherry picked from commit 54cd3b840d4043322da7cfefd3a7d8ee80d68bc4) Co-authored-by: Vincenzo Mantova --- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 4ba42cbce57..f7bd02d8af5 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -131,6 +131,7 @@ let in if sha512 == "" then # hash stripped from pkgs.nix to save space -> fetch&unpack in a single step + # currently unused as we prefer to keep the sha512 hashes for reproducibility fetchurl { inherit urls; sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!" @@ -144,8 +145,7 @@ let // passthru else runCommand "texlive-${tlName}" - ( { # lots of derivations, not meant to be cached - preferLocalBuild = true; allowSubstitutes = false; + ( { inherit passthru; } // lib.optionalAttrs (fixedHash != null) { outputHash = fixedHash;