From 56ceb0cc7d7fb242736b3f1bbf15917046dca9c6 Mon Sep 17 00:00:00 2001 From: George Huebner Date: Sat, 23 Mar 2024 20:03:44 -0500 Subject: [PATCH] singular: bump texinfo from 4 to 7 texinfo4 fails to compile on aarch64-darwin, and singular is no longer constrained to use an older version --- pkgs/applications/science/math/singular/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index a6c64066d88e..d079134aec76 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -13,12 +13,9 @@ , doxygen , graphviz , latex2html -# upstream generates docs with texinfo 4. later versions of texinfo -# use letters instead of numbers for post-appendix chapters, and we -# want it to match the upstream format because sage depends on it. -, texinfo4 +, texinfo , texliveSmall -, enableDocs ? true +, enableDocs ? !stdenv.isDarwin , enableGfanlib ? true }: @@ -85,7 +82,7 @@ stdenv.mkDerivation rec { doxygen graphviz latex2html - texinfo4 + texinfo texliveSmall ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ];