diff options
| -rw-r--r-- | pkgs/applications/science/misc/simgrid/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/xen/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/parsing/ragel/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/skribilo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
7 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 23815442da7..002c383dcaf 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -3,7 +3,7 @@ # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 , fortranSupport ? false, gfortran -, buildDocumentation ? false, transfig, ghostscript, doxygen +, buildDocumentation ? false, fig2dev, ghostscript, doxygen , buildJavaBindings ? false, openjdk , modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw , debug ? false @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl python3 valgrind ] ++ optionals fortranSupport [ gfortran ] ++ optionals buildJavaBindings [ openjdk ] - ++ optionals buildDocumentation [ transfig ghostscript doxygen ] + ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; #buildInputs = optional luaSupport lua5; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 0a2febd0589..c85e7011668 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -18,7 +18,7 @@ config: # Documentation # python2Packages.markdown -, transfig, ghostscript, texinfo, pandoc +, fig2dev, ghostscript, texinfo, pandoc , binutils-unwrapped @@ -81,7 +81,7 @@ stdenv.mkDerivation (rec { python2Packages.wrapPython # Documentation - python2Packages.markdown transfig ghostscript texinfo pandoc + python2Packages.markdown fig2dev ghostscript texinfo pandoc # Others ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index c23b352dece..8e000cd0fc2 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm +{ lib, stdenv, fetchurl, fig2dev, tex, ghostscript, colm , build-manual ? false }: @@ -13,7 +13,7 @@ let inherit sha256; }; - buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; + buildInputs = lib.optional build-manual [ fig2dev ghostscript tex ]; preConfigure = lib.optionalString build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index e80c4326651..85031f90084 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,7 +10,7 @@ , makeWrapper , pkg-config , ploticus -, transfig +, fig2dev , enableEmacs ? false, emacs , enableLout ? true, lout , enableTex ? true, tex @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec{ guile-reader imagemagick ploticus - transfig + fig2dev ] ++ optional enableEmacs emacs ++ optional enableLout lout diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index dbd4fed1474..1411fb2d99b 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python3, libxslt, texlive -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null +, enableAllFeatures ? false, imagemagick ? null, fig2dev ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions inherit (texlive) scheme-basic epstopdf anysize appendix changebar @@ -15,7 +15,7 @@ assert enableAllFeatures -> imagemagick != null && - transfig != null && + fig2dev != null && inkscape != null && fontconfig != null && ghostscript != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python3 libxslt tex ] - ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; + ++ lib.optionals enableAllFeatures [ imagemagick fig2dev ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have # that yet. In Ubuntu, texindy is a part of the xindy package. @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ - -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ + -e 's|cmd = "fig2dev|cmd = "${fig2dev}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ -i "$file" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e5e2cc5637c..deea68f496f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1188,6 +1188,7 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 trang = jing-trang; # Added 2018-04-25 + transfig = fig2dev; # Added 2022-02-15 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 transmission_gtk = transmission-gtk; # Added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d37a6e8efb0..e6480d4d03b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10952,10 +10952,6 @@ with pkgs; ts = callPackage ../tools/system/ts { }; - transfig = callPackage ../tools/graphics/transfig { - libpng = libpng12; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; |