summary refs log tree commit diff
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2022-05-21 04:31:03 +0000
committerGitHub <noreply@github.com>2022-05-21 04:31:03 +0000
commit91c498f0f2505d6f1af5a0151312d282deba201b (patch)
tree38aab1955821c21bdcf184a6e849fce95bd4e182
parent97fe999a9da5ca4c4032b6aad4937e5d88ae114a (diff)
parent727e5a14735d5df31d5b6a4e7ec10a4ea1d02834 (diff)
downloadnixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar.gz
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar.bz2
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar.lz
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar.xz
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.tar.zst
nixpkgs-91c498f0f2505d6f1af5a0151312d282deba201b.zip
Merge pull request #173543 from collares/sage-gdlib
sageWithDoc: clean up sagedoc.nix
-rw-r--r--pkgs/applications/science/math/sage/default.nix3
-rw-r--r--pkgs/applications/science/math/sage/sagedoc.nix29
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 84b511de8fc..44ae4041121 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -78,8 +78,7 @@ let
 
   # The documentation for sage, building it takes a lot of ram.
   sagedoc = callPackage ./sagedoc.nix {
-    inherit sage-with-env;
-    inherit python3 maxima jupyter-kernel-specs;
+    inherit sage-with-env jupyter-kernel-specs;
   };
 
   # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run.
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 67d754caff3..650b6d3b141 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -2,10 +2,6 @@
 , sage-with-env
 , python3
 , jupyter-kernel-specs
-, maxima
-, tachyon
-, jmol
-, cddlib
 }:
 
 stdenv.mkDerivation rec {
@@ -13,30 +9,7 @@ stdenv.mkDerivation rec {
   pname = "sagedoc";
   src = sage-with-env.env.lib.src;
 
-
-  # Building the documentation has many dependencies, because all documented
-  # modules are imported and because matplotlib is used to produce plots.
-  buildInputs = [
-    sage-with-env.env.lib
-    python3
-    maxima
-    tachyon
-    jmol
-    cddlib
-  ] ++ (with python3.pkgs; [
-    sage-docbuild
-    psutil
-    future
-    sphinx
-    scipy
-    sympy
-    matplotlib
-    pillow
-    networkx
-    ipykernel
-    ipywidgets
-    jupyter-client
-  ]);
+  strictDeps = true;
 
   unpackPhase = ''
     export SAGE_DOC_OVERRIDE="$PWD/share/doc/sage"