about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGeorge Huebner <george@feyor.sh>2024-03-23 20:03:44 -0500
committerMauricio Collares <mauricio@collares.org>2024-03-26 19:26:22 +0100
commit56ceb0cc7d7fb242736b3f1bbf15917046dca9c6 (patch)
tree4667f9755edd3cc44b95f9948fbed9a4a6cde10d
parent8c860b090ac662854bec0135d3549a852448902e (diff)
downloadnixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar.gz
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar.bz2
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar.lz
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar.xz
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.tar.zst
nixlib-56ceb0cc7d7fb242736b3f1bbf15917046dca9c6.zip
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
-rw-r--r--pkgs/applications/science/math/singular/default.nix9
1 files 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 ];