Merge pull request #174139 from collares/sage-kernelspec

sage: fix passthru.kernelspec regression
NixOS · May 26, 2022 · d6ed7b2 · d6ed7b2
2 parents e5e5786 + 8711501
commit d6ed7b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
@@ -172,6 +172,6 @@ let
 in
 # A wrapper around sage that makes sure sage finds its docs (if they were build).
 callPackage ./sage.nix {
-  inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs;
+  inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs;
   inherit withDoc requireSageTests;
 }
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
@@ -2,6 +2,7 @@
 , makeWrapper
 , sage-tests
 , sage-with-env
+, jupyter-kernel-definition
 , jupyter-kernel-specs
 , sagedoc
 , withDoc
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
     quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
     doc = sagedoc;
     lib = sage-with-env.env.lib;
-    kernelspec = jupyter-kernel-specs.definition.sagemath;
+    kernelspec = jupyter-kernel-definition;
   };
 
   meta = with lib; {