mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-15 05:59:17 +03:00
treewide: Replace transfig with fig2dev
Reasons: - transfig never get upstream update since it was added to nixpkgs 2006, according to [fig2dev Debian changelog][1], upstream maintainership was taken over at 2016, and renamed to fig2dev. - [Debian][2], [ArchLinux][3], [HomeBrew][4] all use fig2dev to replace transfig. - transfig builds [failed][5] on aarch64-darwin, fig2dev builds fine. - One less package to maintain. [1]: https://salsa.debian.org/debian/fig2dev/-/blob/debian/1%253.2.6_beta-1/debian/changelog [2]: https://packages.debian.org/bullseye/transfig [3]: https://archlinux.org/packages/community/x86_64/fig2dev/ [4]: https://formulae.brew.sh/formula/fig2dev [5]: https://hydra.nixos.org/build/163404782/nixlog/2
This commit is contained in:
parent
0ee4629994
commit
e8f3914985
7 changed files with 13 additions and 16 deletions
|
@ -3,7 +3,7 @@
|
||||||
# Lua 5.3 needed and not available now
|
# Lua 5.3 needed and not available now
|
||||||
#, luaSupport ? false, lua5
|
#, luaSupport ? false, lua5
|
||||||
, fortranSupport ? false, gfortran
|
, fortranSupport ? false, gfortran
|
||||||
, buildDocumentation ? false, transfig, ghostscript, doxygen
|
, buildDocumentation ? false, fig2dev, ghostscript, doxygen
|
||||||
, buildJavaBindings ? false, openjdk
|
, buildJavaBindings ? false, openjdk
|
||||||
, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
|
, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
|
||||||
, debug ? false
|
, debug ? false
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake perl python3 valgrind ]
|
nativeBuildInputs = [ cmake perl python3 valgrind ]
|
||||||
++ optionals fortranSupport [ gfortran ]
|
++ optionals fortranSupport [ gfortran ]
|
||||||
++ optionals buildJavaBindings [ openjdk ]
|
++ optionals buildJavaBindings [ openjdk ]
|
||||||
++ optionals buildDocumentation [ transfig ghostscript doxygen ]
|
++ optionals buildDocumentation [ fig2dev ghostscript doxygen ]
|
||||||
++ optionals modelCheckingSupport [ libunwind libevent elfutils ];
|
++ optionals modelCheckingSupport [ libunwind libevent elfutils ];
|
||||||
|
|
||||||
#buildInputs = optional luaSupport lua5;
|
#buildInputs = optional luaSupport lua5;
|
||||||
|
|
|
@ -18,7 +18,7 @@ config:
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
# python2Packages.markdown
|
# python2Packages.markdown
|
||||||
, transfig, ghostscript, texinfo, pandoc
|
, fig2dev, ghostscript, texinfo, pandoc
|
||||||
|
|
||||||
, binutils-unwrapped
|
, binutils-unwrapped
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ stdenv.mkDerivation (rec {
|
||||||
python2Packages.wrapPython
|
python2Packages.wrapPython
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
python2Packages.markdown transfig ghostscript texinfo pandoc
|
python2Packages.markdown fig2dev ghostscript texinfo pandoc
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))
|
] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm
|
{ lib, stdenv, fetchurl, fig2dev, tex, ghostscript, colm
|
||||||
, build-manual ? false
|
, build-manual ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ let
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optional build-manual [ transfig ghostscript tex ];
|
buildInputs = lib.optional build-manual [ fig2dev ghostscript tex ];
|
||||||
|
|
||||||
preConfigure = lib.optionalString build-manual ''
|
preConfigure = lib.optionalString build-manual ''
|
||||||
sed -i "s/build_manual=no/build_manual=yes/g" DIST
|
sed -i "s/build_manual=no/build_manual=yes/g" DIST
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ploticus
|
, ploticus
|
||||||
, transfig
|
, fig2dev
|
||||||
, enableEmacs ? false, emacs
|
, enableEmacs ? false, emacs
|
||||||
, enableLout ? true, lout
|
, enableLout ? true, lout
|
||||||
, enableTex ? true, tex
|
, enableTex ? true, tex
|
||||||
|
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec{
|
||||||
guile-reader
|
guile-reader
|
||||||
imagemagick
|
imagemagick
|
||||||
ploticus
|
ploticus
|
||||||
transfig
|
fig2dev
|
||||||
]
|
]
|
||||||
++ optional enableEmacs emacs
|
++ optional enableEmacs emacs
|
||||||
++ optional enableLout lout
|
++ optional enableLout lout
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, python3, libxslt, texlive
|
{ 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
|
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
|
||||||
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
|
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
assert enableAllFeatures ->
|
assert enableAllFeatures ->
|
||||||
imagemagick != null &&
|
imagemagick != null &&
|
||||||
transfig != null &&
|
fig2dev != null &&
|
||||||
inkscape != null &&
|
inkscape != null &&
|
||||||
fontconfig != null &&
|
fontconfig != null &&
|
||||||
ghostscript != null;
|
ghostscript != null;
|
||||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ python3 libxslt tex ]
|
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
|
# TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
|
||||||
# that yet. In Ubuntu, texindy is a part of the xindy package.
|
# 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-match"|"${fontconfig.bin}/bin/fc-match"|g' \
|
||||||
-e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
|
-e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
|
||||||
-e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|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 = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
|
||||||
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
|
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
|
||||||
-i "$file"
|
-i "$file"
|
||||||
|
|
|
@ -1188,6 +1188,7 @@ mapAliases ({
|
||||||
torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
|
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
|
torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
|
||||||
trang = jing-trang; # Added 2018-04-25
|
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-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_gtk = transmission-gtk; # Added 2018-01-06
|
||||||
transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06
|
transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06
|
||||||
|
|
|
@ -10952,10 +10952,6 @@ with pkgs;
|
||||||
|
|
||||||
ts = callPackage ../tools/system/ts { };
|
ts = callPackage ../tools/system/ts { };
|
||||||
|
|
||||||
transfig = callPackage ../tools/graphics/transfig {
|
|
||||||
libpng = libpng12;
|
|
||||||
};
|
|
||||||
|
|
||||||
ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
|
ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
|
||||||
|
|
||||||
ttwatch = callPackage ../tools/misc/ttwatch { };
|
ttwatch = callPackage ../tools/misc/ttwatch { };
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue