diff options
Diffstat (limited to 'pkgs/applications/science/math/sage/sagedoc.nix')
| -rw-r--r-- | pkgs/applications/science/math/sage/sagedoc.nix | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 228b5aa2c609c..5e2191486bf08 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -11,11 +11,6 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ - # for patchShebangs below - python3 - ]; - unpackPhase = '' export SAGE_DOC_OVERRIDE="$PWD/share/doc/sage" export SAGE_DOC_SRC_OVERRIDE="$PWD/docsrc" @@ -29,18 +24,6 @@ stdenv.mkDerivation rec { export HOME="$TMPDIR/sage_home" mkdir -p "$HOME" - # run bootstrap script to generate Sage spkg docs, because unfortunately some unrelated doc - # pages link to them. it needs a few ugly (but self-contained) hacks for a standalone run. - cp -r "${src}/build" "$HOME" - chmod -R 755 "$HOME/build" - sed -i "/assert/d" "$HOME/build/sage_bootstrap/env.py" - sed -i "s|sage-bootstrap-python|python3|" "$HOME/build/bin/sage-package" - patchShebangs "$HOME/build/bin/sage-package" - pushd "$SAGE_DOC_SRC_OVERRIDE" - sed -i "s|OUTPUT_DIR=\"src/doc/|OUTPUT_DIR=\"$SAGE_DOC_SRC_OVERRIDE/|" bootstrap - PATH="$HOME/build/bin:$PATH" SAGE_ROOT="${src}" ./bootstrap - popd - # adapted from src/doc/Makefile (doc-src target), which tries to call Sage from PATH mkdir -p $SAGE_DOC_SRC_OVERRIDE/en/reference/repl ${sage-with-env}/bin/sage -advanced > $SAGE_DOC_SRC_OVERRIDE/en/reference/repl/options.txt @@ -51,12 +34,10 @@ stdenv.mkDerivation rec { # jupyter-sphinx calls the sagemath jupyter kernel during docbuild export JUPYTER_PATH=${jupyter-kernel-specs} - # sage --docbuild unsets JUPYTER_PATH, so we call sage_docbuild directly - # https://trac.sagemath.org/ticket/33650#comment:32 - ${sage-with-env}/bin/sage --python3 -m sage_docbuild \ + ${sage-with-env}/bin/sage --docbuild \ --mathjax \ --no-pdf-links \ - all html < /dev/null + all html ''; installPhase = '' @@ -80,7 +61,7 @@ stdenv.mkDerivation rec { # sagemath_doc_html tests assume sage tests are being run, so we # compromise: we run standard tests, but only on files containing # relevant tests. as of Sage 9.6, there are only 4 such files. - grep -PRl "#.*optional.*sagemath_doc_html" ${src}/src/sage{,_docbuild} | \ + grep -PRl "#.*(optional|needs).*sagemath_doc_html" ${src}/src/sage{,_docbuild} | \ xargs ${sage-with-env}/bin/sage -t --optional=sage,sagemath_doc_html ''; } |