summary refs log tree commit diff
diff options
context:
space:
mode:
authorMauricio Collares <mauricio@collares.org>2022-05-23 08:55:11 -0700
committerMauricio Collares <mauricio@collares.org>2022-05-25 14:54:52 -0700
commit8711501e9612199d5a7014303813f8fae52ccb5e (patch)
tree05dc4de0adaab5ec151c68623cd6dee9b4a20c6c
parentc70995bae3ffc31956104595ee48eaafb8525f44 (diff)
downloadnixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar.gz
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar.bz2
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar.lz
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar.xz
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.tar.zst
nixpkgs-8711501e9612199d5a7014303813f8fae52ccb5e.zip
sage: fix passthru.kernelspec regression
-rw-r--r--pkgs/applications/science/math/sage/default.nix2
-rw-r--r--pkgs/applications/science/math/sage/sage.nix3
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 44ae4041121..f399099d4da 100644
--- 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
index 78fd8d598d0..87f3e1137b1 100644
--- 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; {