From 21ae98f5f09610dd241d53269993f8fe8a2a49a7 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Wed, 18 May 2022 15:53:02 -0700
Subject: [PATCH 1/2] sageWithDoc: add sage-with-env to buildInputs

---
 pkgs/applications/science/math/sage/sagedoc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 67d754caff3..8573bc27ae0 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # 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
+    sage-with-env
     python3
     maxima
     tachyon

From 727e5a14735d5df31d5b6a4e7ec10a4ea1d02834 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Fri, 20 May 2022 11:03:25 -0700
Subject: [PATCH 2/2] sageWithDoc: cleanup sagedoc.nix

---
 .../science/math/sage/default.nix             |  3 +-
 .../science/math/sage/sagedoc.nix             | 29 +------------------
 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 8573bc27ae0..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
-    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"