diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/tools/typesetting/tex | |
parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/typesetting/tex')
-rw-r--r-- | nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 4ba42cbce570..f7bd02d8af53 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/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; |