Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f0f1bb64f77
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 774e3cb3481c
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 18, 2020

  1. texlive: fix arara 

    (cherry picked from commit 37d65c8)
cc #97609
    @veprbl
    veprbl committed Sep 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    774e3cb View commit details
Showing with 17 additions and 2 deletions.
  1. +16 −1 pkgs/tools/typesetting/tex/texlive/default.nix
  2. +1 −1 pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
17 changes: 16 additions & 1 deletion pkgs/tools/typesetting/tex/texlive/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
- source: ../../../../../doc/languages-frameworks/texlive.xml
- current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive
*/
{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv
{ stdenv, lib, fetchurl, fetchpatch, runCommand, writeText, buildEnv
, callPackage, ghostscriptX, harfbuzz, poppler_min
, makeWrapper, python, ruby, perl
, useFixedHashes ? true
@@ -57,6 +57,21 @@ let
collection-plaingeneric = orig.collection-plaingeneric // {
deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; };
};

# TODO revert for texlive 2020
arara = lib.recursiveUpdate orig.arara {
postUnpack = let
arara_jar_fix = fetchpatch {
url = "https://github.com/TeX-Live/texlive-source/commit/dbaf12f4a47dcd62bcc96346f65493fda3fec2c8.diff";
sha256 = "148knr8k6sm6fpyj31kdq85yxvzvwp1prjha3f07q24kbar2l830";
};
in ''
if [ -f "$out"/scripts/arara/arara.sh ]; then
cd "$out"/scripts/
patch -p4 <${arara_jar_fix}
fi
'';
};
}); # overrides

# tl =
2 changes: 1 addition & 1 deletion pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
View file
Original file line number Diff line number Diff line change
@@ -553,7 +553,7 @@
"adhocfilelist-2019"="l8ayz7mqaa5lma2bvqb2brc879y0viij";
"adhocfilelist.doc-2019"="gm20nhwq88s1cmch3pcgkqnyahb5gnri";
"adhocfilelist.source-2019"="3qx23im0z07cnk2bd5vrskl153zxy6ff";
"arara-4.0.6"="qk5dq5f0il52m1gp8ckd7ilqbmpkvfmj";
"arara-4.0.6"="6jhbdl9kh0d7iaq9qrl71kqzrmvvx9ya";
"arara.doc-4.0.6"="rvkrcair91scrk763igaj9mmi23n5j7x";
"arara.source-4.0.6"="s7rlspqx9dqsbixbnmnaz9hh7gwkmkfi";
"asymptote-2.49"="ka921kxzvyq3hi5frln4hh7qg1kfgch7";