diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 989f49b6d9a8..dbd4fed1474d 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, libxslt, texlive +{ lib, stdenv, fetchurl, python3, libxslt, texlive , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions @@ -21,14 +21,15 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.11"; + pname = "dblatex"; + version = "0.3.12"; src = fetchurl { - url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv"; + url = "mirror://sourceforge/dblatex/${pname}3-${version}.tar.bz2"; + sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; - buildInputs = [ python2 libxslt tex ] + buildInputs = [ python3 libxslt tex ] ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python2.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + ${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; };