pyrox.dev / nixpkgs
lol
fork atom

sageWithDoc: make jupyter-sphinx available for docbuild

Mauricio Collares 10b16ea5 e531fc20

+21 -16
unified split
+8 -2
pkgs/applications/science/math/sage/default.nix
··· 48 logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; 49 }; 50 51 three = callPackage ./threejs-sage.nix { }; 52 53 # A bash script setting various environment variables to tell sage where ··· 73 # The documentation for sage, building it takes a lot of ram. 74 sagedoc = callPackage ./sagedoc.nix { 75 inherit sage-with-env; 76 - inherit python3 maxima; 77 }; 78 79 # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. ··· 167 in 168 # A wrapper around sage that makes sure sage finds its docs (if they were build). 169 callPackage ./sage.nix { 170 - inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition; 171 inherit withDoc requireSageTests; 172 }
··· 48 logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; 49 }; 50 51 + jupyter-kernel-specs = pkgs.jupyter-kernel.create { 52 + definitions = pkgs.jupyter-kernel.default // { 53 + sagemath = jupyter-kernel-definition; 54 + }; 55 + }; 56 + 57 three = callPackage ./threejs-sage.nix { }; 58 59 # A bash script setting various environment variables to tell sage where ··· 79 # The documentation for sage, building it takes a lot of ram. 80 sagedoc = callPackage ./sagedoc.nix { 81 inherit sage-with-env; 82 + inherit python3 maxima jupyter-kernel-specs; 83 }; 84 85 # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. ··· 173 in 174 # A wrapper around sage that makes sure sage finds its docs (if they were build). 175 callPackage ./sage.nix { 176 + inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs; 177 inherit withDoc requireSageTests; 178 }
+2
pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
··· 2 , buildPythonPackage 3 , sage-src 4 , sphinx 5 }: 6 7 buildPythonPackage rec { ··· 11 12 propagatedBuildInputs = [ 13 sphinx 14 ]; 15 16 preBuild = ''
··· 2 , buildPythonPackage 3 , sage-src 4 , sphinx 5 + , jupyter-sphinx 6 }: 7 8 buildPythonPackage rec { ··· 12 13 propagatedBuildInputs = [ 14 sphinx 15 + jupyter-sphinx 16 ]; 17 18 preBuild = ''
+3 -12
pkgs/applications/science/math/sage/sage.nix
··· 2 , makeWrapper 3 , sage-tests 4 , sage-with-env 5 - , jupyter-kernel-definition 6 - , jupyter-kernel 7 , sagedoc 8 , withDoc 9 , requireSageTests ··· 12 # A wrapper that makes sure sage finds its docs (if they were build) and the 13 # jupyter kernel spec. 14 15 - let 16 - # generate kernel spec + default kernels 17 - kernel-specs = jupyter-kernel.create { 18 - definitions = jupyter-kernel.default // { 19 - sagemath = jupyter-kernel-definition; 20 - }; 21 - }; 22 - in 23 stdenv.mkDerivation rec { 24 version = src.version; 25 pname = "sage"; ··· 43 --set SAGE_DOC_SRC_OVERRIDE "${src}/src/doc" ${ 44 lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" 45 } \ 46 - --prefix JUPYTER_PATH : "${kernel-specs}" 47 ''; 48 49 doInstallCheck = withDoc; ··· 58 quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m 59 doc = sagedoc; 60 lib = sage-with-env.env.lib; 61 - kernelspec = jupyter-kernel-definition; 62 }; 63 64 meta = with lib; {
··· 2 , makeWrapper 3 , sage-tests 4 , sage-with-env 5 + , jupyter-kernel-specs 6 , sagedoc 7 , withDoc 8 , requireSageTests ··· 11 # A wrapper that makes sure sage finds its docs (if they were build) and the 12 # jupyter kernel spec. 13 14 stdenv.mkDerivation rec { 15 version = src.version; 16 pname = "sage"; ··· 34 --set SAGE_DOC_SRC_OVERRIDE "${src}/src/doc" ${ 35 lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" 36 } \ 37 + --prefix JUPYTER_PATH : "${jupyter-kernel-specs}" 38 ''; 39 40 doInstallCheck = withDoc; ··· 49 quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m 50 doc = sagedoc; 51 lib = sage-with-env.env.lib; 52 + kernelspec = jupyter-kernel-specs.definition.sagemath; 53 }; 54 55 meta = with lib; {
+8 -2
pkgs/applications/science/math/sage/sagedoc.nix
··· 1 { stdenv 2 , sage-with-env 3 , python3 4 , maxima 5 , tachyon 6 , jmol ··· 59 OUTPUT="$OUTPUT_DIR/options.txt" 60 ${sage-with-env}/bin/sage -advanced > "$OUTPUT" 61 62 - ${sage-with-env}/bin/sage --docbuild \ 63 --mathjax \ 64 --no-pdf-links \ 65 - all html 66 ''; 67 68 installPhase = ''
··· 1 { stdenv 2 , sage-with-env 3 , python3 4 + , jupyter-kernel-specs 5 , maxima 6 , tachyon 7 , jmol ··· 60 OUTPUT="$OUTPUT_DIR/options.txt" 61 ${sage-with-env}/bin/sage -advanced > "$OUTPUT" 62 63 + # jupyter-sphinx calls the sagemath jupyter kernel during docbuild 64 + export JUPYTER_PATH=${jupyter-kernel-specs} 65 + 66 + # sage --docbuild unsets JUPYTER_PATH, so we call sage_docbuild directly 67 + # https://trac.sagemath.org/ticket/33650#comment:32 68 + ${sage-with-env}/bin/sage --python3 -m sage_docbuild \ 69 --mathjax \ 70 --no-pdf-links \ 71 + all html < /dev/null 72 ''; 73 74 installPhase = ''