diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix | |
parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix index a10672f3a092..603c1a585c79 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { jmol cddlib ] ++ (with python3.pkgs; [ + sage_docbuild psutil future sphinx @@ -44,13 +45,6 @@ stdenv.mkDerivation rec { chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE" ''; - postPatch = '' - # src/doc/bootstrap generates installation instructions for - # arch, debian, fedora, cygwin and homebrew. as a hack, disable - # including the generated files. - sed -i "/literalinclude/d" $SAGE_DOC_SRC_OVERRIDE/en/installation/source.rst - ''; - buildPhase = '' export SAGE_NUM_THREADS="$NIX_BUILD_CORES" export HOME="$TMPDIR/sage_home" @@ -59,13 +53,13 @@ stdenv.mkDerivation rec { # needed to link them in the sage docs using intersphinx export PPLPY_DOCS=${python3.pkgs.pplpy.doc}/share/doc/pplpy - # adapted from src/doc/bootstrap + # adapted from src/doc/bootstrap (which we don't run) OUTPUT_DIR="$SAGE_DOC_SRC_OVERRIDE/en/reference/repl" mkdir -p "$OUTPUT_DIR" OUTPUT="$OUTPUT_DIR/options.txt" ${sage-with-env}/bin/sage -advanced > "$OUTPUT" - ${sage-with-env}/bin/sage -python -m sage_setup.docbuild \ + ${sage-with-env}/bin/sage --docbuild \ --mathjax \ --no-pdf-links \ all html |