diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-27 18:28:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 18:28:31 +0000 |
| commit | bef2fbcd27e27342ce0227e715f63b135a6d2258 (patch) | |
| tree | 84131bad52abead9018d16f4349fb1855df29d33 /pkgs/tools/typesetting | |
| parent | 2137c13b409525616ce92598e3440c088096044a (diff) | |
| parent | 0b5fd3b7847445f3683ff60c8b896a7f2adc3b0e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index f66469f5ba43..fd1815efa945 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -2,7 +2,7 @@ , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext -, perl, perlPackages, python2Packages, pkg-config +, perl, perlPackages, python3Packages, pkg-config , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang @@ -321,13 +321,13 @@ latexindent = perlPackages.buildPerlPackage rec { }; -pygmentex = python2Packages.buildPythonApplication rec { +pygmentex = python3Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); - propagatedBuildInputs = with python2Packages; [ pygments chardet ]; + propagatedBuildInputs = with python3Packages; [ pygments chardet ]; dontBuild = true; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index bf7b7952f514..9993263c1f6f 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -29,7 +29,7 @@ let [ "de-macro" "pythontex" "dviasm" "texliveonfly" ]; pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; extraInputs = - lib.optional (lib.any pkgNeedsPython splitBin.wrong) python + lib.optional (lib.any pkgNeedsPython splitBin.wrong) python3 ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index cc30024ca0f3..72b54f5ebef5 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, python, ruby, perl +, makeWrapper, python3, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -25,7 +25,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python ruby perl; + stdenv python3 ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; |