public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texlive: use python3 by default

Browse Source 
There is one python helper script still written for: Utility for writing
Bengali in Rapid Roman Format. But this one does not seem super relevant
This commit is contained in:
Jörg Thalheim 2020-12-17 21:51:10 +01:00
parent 54f104bf25
commit 35c4d1d079
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -2,7 +2,7 @@
, texlive , texlive
, zlib, libiconv, libpng, libX11 , zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
, perl, perlPackages, python2Packages, pkgconfig , perl, perlPackages, python3Packages, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash
, makeWrapper, shortenPerlShebang , makeWrapper, shortenPerlShebang
@ -321,13 +321,13 @@ latexindent = perlPackages.buildPerlPackage rec {
}; };
pygmentex = python2Packages.buildPythonApplication rec { pygmentex = python3Packages.buildPythonApplication rec {
pname = "pygmentex"; pname = "pygmentex";
inherit (src) version; inherit (src) version;
src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs);
propagatedBuildInputs = with python2Packages; [ pygments chardet ]; propagatedBuildInputs = with python3Packages; [ pygments chardet ];
dontBuild = true; dontBuild = true;

2
pkgs/tools/typesetting/tex/texlive/combine.nix
View File

@ -27,7 +27,7 @@ let
[ "de-macro" "pythontex" "dviasm" "texliveonfly" ]; [ "de-macro" "pythontex" "dviasm" "texliveonfly" ];
pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens";
extraInputs = 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; ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;
}; };

6
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -4,7 +4,7 @@
*/ */
{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
, callPackage, ghostscriptX, harfbuzz, poppler_min , callPackage, ghostscriptX, harfbuzz, poppler_min
, makeWrapper, python, ruby, perl , makeWrapper, python3, ruby, perl
, useFixedHashes ? true , useFixedHashes ? true
, recurseIntoAttrs , recurseIntoAttrs
}: }:
@ -25,7 +25,7 @@ let
# function for creating a working environment from a set of TL packages # function for creating a working environment from a set of TL packages
combine = import ./combine.nix { combine = import ./combine.nix {
inherit bin combinePkgs buildEnv lib makeWrapper writeText 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 ghostscript = ghostscriptX; # could be without X, probably, but we use X above
}; };
@ -110,7 +110,7 @@ let
#"ftp://tug.org/texlive/historic/2019/tlnet-final/archive" #"ftp://tug.org/texlive/historic/2019/tlnet-final/archive"
# Daily snapshots hosted by one of the texlive release managers # Daily snapshots hosted by one of the texlive release managers
https://texlive.info/tlnet-archive/2020/10/09/tlnet/archive "https://texlive.info/tlnet-archive/2020/10/09/tlnet/archive"
]; ];
src = fetchurl { inherit urls sha512; }; src = fetchurl { inherit urls sha512; };